Eduardo Habkost 1fb6752ecf pc: Remove PC_COMPAT_2_12 from 3.0 machine-types ...

commit f548222c added PC_COMPAT_2_12 to the 3.0 PC machine-types.
I believe this happened during manual conflict resolution when
applying the patch.

Cc: Xiao Guangrong <xiaoguangrong@tencent.com>
Cc: Juan Quintela <quintela@redhat.com>
Fixes: f548222c24
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608192940.19548-1-ehabkost@redhat.com>
Reviewed-by: Marcel Apfelbaum<marcel.apfelbaum@gmail.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

2018-06-10 21:33:00 -03:00

..

kvm

memory: get rid of memory_region_init_reservation

2018-06-01 14:15:10 +02:00

xen

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

2018-06-01 18:24:16 +01:00

acpi-build.c

pc: rename "hotplug memory" terminology to "device memory"

2018-05-07 10:00:02 -03:00

acpi-build.h

Use scripts/clean-includes to drop redundant qemu/typedefs.h

2016-03-22 22:20:16 +01:00

amd_iommu.c

x86_iommu: Move machine check to x86_iommu_realize()

2018-01-18 21:52:38 +02:00

amd_iommu.h

amd_iommu: avoid needless includes in header file

2017-12-18 17:07:02 +03:00

intel_iommu_internal.h

intel-iommu: Extend address width to 48 bits

2018-01-18 21:52:38 +02:00

intel_iommu.c

intel-iommu: rework the page walk logic

2018-05-23 17:34:05 +03:00

kvmvapic.c

target: Do not include "exec/exec-all.h" if it is not necessary

2018-06-01 14:15:10 +02:00

Makefile.objs

hw/i386: make IOMMUs configurable via default-configs/

2018-03-12 16:12:46 +01:00

multiboot.c

opts: don't silently truncate long option values

2018-05-09 00:13:39 +02:00

multiboot.h

refer to FWCfgState explicitly

2013-06-02 18:14:02 +03:00

pc_piix.c

pc: Remove PC_COMPAT_2_12 from 3.0 machine-types

2018-06-10 21:33:00 -03:00

pc_q35.c

pc: Remove PC_COMPAT_2_12 from 3.0 machine-types

2018-06-10 21:33:00 -03:00

pc_sysfw.c

target/i386: encrypt bios rom

2018-03-13 17:36:05 +01:00

pc.c

Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

2018-06-04 10:15:16 +01:00

trace-events

intel-iommu: rework the page walk logic

2018-05-23 17:34:05 +03:00

vmmouse.c

hw/input/i8042: Extract declarations from i386/pc.h into input/i8042.h

2018-03-12 16:12:48 +01:00

vmport.c

hw/input/i8042: Extract declarations from i386/pc.h into input/i8042.h

2018-03-12 16:12:48 +01:00

x86-iommu.c

x86_iommu: check if machine has PCI bus

2018-01-18 21:52:38 +02:00