motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

compat: remove remaining PC_COMPAT macros

Browse source 
Use static arrays instead.  I decided to rename the conflicting
pc_compat_2_1() function with pc_compat_2_1_fn().

Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-12-12 21:57:53 +04:00
parent a1c3c562e2
commit a310e653ce
3 changed files with 267 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

232
hw/i386/pc.c
View file

@ -72,6 +72,7 @@
#include "qapi/visitor.h"
#include "qom/cpu.h"
#include "hw/nmi.h"
#include "hw/usb.h"
#include "hw/i386/intel_iommu.h"
#include "hw/net/ne2000-isa.h"
@ -551,6 +552,237 @@ GlobalProperty pc_compat_2_1[] = {
};
const size_t pc_compat_2_1_len = G_N_ELEMENTS(pc_compat_2_1);
GlobalProperty pc_compat_2_0[] = {
PC_CPU_MODEL_IDS("2.0.0")
{
.driver = "virtio-scsi-pci",
.property = "any_layout",
.value = "off",
},{
.driver = "PIIX4_PM",
.property = "memory-hotplug-support",
.value = "off",
},
{
.driver = "apic",
.property = "version",
.value = stringify(0x11),
},
{
.driver = "nec-usb-xhci",
.property = "superspeed-ports-first",
.value = "off",
},
{
.driver = "nec-usb-xhci",
.property = "force-pcie-endcap",
.value = "on",
},
{
.driver = "pci-serial",
.property = "prog_if",
.value = stringify(0),
},
{
.driver = "pci-serial-2x",
.property = "prog_if",
.value = stringify(0),
},
{
.driver = "pci-serial-4x",
.property = "prog_if",
.value = stringify(0),
},
{
.driver = "virtio-net-pci",
.property = "guest_announce",
.value = "off",
},
{
.driver = "ICH9-LPC",
.property = "memory-hotplug-support",
.value = "off",
},{
.driver = "xio3130-downstream",
.property = COMPAT_PROP_PCP,
.value = "off",
},{
.driver = "ioh3420",
.property = COMPAT_PROP_PCP,
.value = "off",
},
};
const size_t pc_compat_2_0_len = G_N_ELEMENTS(pc_compat_2_0);
GlobalProperty pc_compat_1_7[] = {
PC_CPU_MODEL_IDS("1.7.0")
{
.driver = TYPE_USB_DEVICE,
.property = "msos-desc",
.value = "no",
},
{
.driver = "PIIX4_PM",
.property = "acpi-pci-hotplug-with-bridge-support",
.value = "off",
},
{
.driver = "hpet",
.property = HPET_INTCAP,
.value = stringify(4),
},
};
const size_t pc_compat_1_7_len = G_N_ELEMENTS(pc_compat_1_7);
GlobalProperty pc_compat_1_6[] = {
PC_CPU_MODEL_IDS("1.6.0")
{
.driver = "e1000",
.property = "mitigation",
.value = "off",
},{
.driver = "qemu64-" TYPE_X86_CPU,
.property = "model",
.value = stringify(2),
},{
.driver = "qemu32-" TYPE_X86_CPU,
.property = "model",
.value = stringify(3),
},{
.driver = "i440FX-pcihost",
.property = "short_root_bus",
.value = stringify(1),
},{
.driver = "q35-pcihost",
.property = "short_root_bus",
.value = stringify(1),
},
};
const size_t pc_compat_1_6_len = G_N_ELEMENTS(pc_compat_1_6);
GlobalProperty pc_compat_1_5[] = {
PC_CPU_MODEL_IDS("1.5.0")
{
.driver = "Conroe-" TYPE_X86_CPU,
.property = "model",
.value = stringify(2),
},{
.driver = "Conroe-" TYPE_X86_CPU,
.property = "min-level",
.value = stringify(2),
},{
.driver = "Penryn-" TYPE_X86_CPU,
.property = "model",
.value = stringify(2),
},{
.driver = "Penryn-" TYPE_X86_CPU,
.property = "min-level",
.value = stringify(2),
},{
.driver = "Nehalem-" TYPE_X86_CPU,
.property = "model",
.value = stringify(2),
},{
.driver = "Nehalem-" TYPE_X86_CPU,
.property = "min-level",
.value = stringify(2),
},{
.driver = "virtio-net-pci",
.property = "any_layout",
.value = "off",
},{
.driver = TYPE_X86_CPU,
.property = "pmu",
.value = "on",
},{
.driver = "i440FX-pcihost",
.property = "short_root_bus",
.value = stringify(0),
},{
.driver = "q35-pcihost",
.property = "short_root_bus",
.value = stringify(0),
},
};
const size_t pc_compat_1_5_len = G_N_ELEMENTS(pc_compat_1_5);
GlobalProperty pc_compat_1_4[] = {
PC_CPU_MODEL_IDS("1.4.0")
{
.driver = "scsi-hd",
.property = "discard_granularity",
.value = stringify(0),
},{
.driver = "scsi-cd",
.property = "discard_granularity",
.value = stringify(0),
},{
.driver = "scsi-disk",
.property = "discard_granularity",
.value = stringify(0),
},{
.driver = "ide-hd",
.property = "discard_granularity",
.value = stringify(0),
},{
.driver = "ide-cd",
.property = "discard_granularity",
.value = stringify(0),
},{
.driver = "ide-drive",
.property = "discard_granularity",
.value = stringify(0),
},{
.driver = "virtio-blk-pci",
.property = "discard_granularity",
.value = stringify(0),
},{
.driver = "virtio-serial-pci",
.property = "vectors",
/* DEV_NVECTORS_UNSPECIFIED as a uint32_t string */
.value = stringify(0xFFFFFFFF),
},{
.driver = "virtio-net-pci",
.property = "ctrl_guest_offloads",
.value = "off",
},{
.driver = "e1000",
.property = "romfile",
.value = "pxe-e1000.rom",
},{
.driver = "ne2k_pci",
.property = "romfile",
.value = "pxe-ne2k_pci.rom",
},{
.driver = "pcnet",
.property = "romfile",
.value = "pxe-pcnet.rom",
},{
.driver = "rtl8139",
.property = "romfile",
.value = "pxe-rtl8139.rom",
},{
.driver = "virtio-net-pci",
.property = "romfile",
.value = "pxe-virtio.rom",
},{
.driver = "486-" TYPE_X86_CPU,
.property = "model",
.value = stringify(0),
},
{
.driver = "n270" "-" TYPE_X86_CPU,
.property = "movbe",
.value = "off",
},
{
.driver = "Westmere" "-" TYPE_X86_CPU,
.property = "pclmulqdq",
.value = "off",
},
};
const size_t pc_compat_1_4_len = G_N_ELEMENTS(pc_compat_1_4);
void gsi_handler(void *opaque, int n, int level)
{
GSIState *s = opaque;