From b4a5b95153ca86eba72ff4a368a24ac31b77bbe5 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Mon, 11 Jan 2016 11:53:33 +0100 Subject: Enable/disable devices for RHEL 7 This commit adds all changes related to changes in supported devices up to qemu-kvm-2.12.0-42.el8. Signed-off-by: Miroslav Rezanina Rebase notes (3.0.0): - Added CONFIG_SCSI - Enabled SMMUV3 - Using CONFIG_VIRTIO_CRYPTO to remove crypto - Added CONFIG_VIRTIO_MMIO for aarch64 - Disabled arvm7v.c compile - Introduced virtio.mak - Disabled make check - Removed test changes (moved to next patch) Merged patches (3.0.0): - a2721f6 Re-enable disabled Hyper-V enlightenments - c670fa1 Disable aarch64 devices reappeared after 2.12 rebase - 3ebdb95 Disable split-irq device - d68f80c Disable AT24Cx i2c eeprom - 3f953e9 Disable CAN bus devices - 284c393 Disable new superio devices - 747643c Disable new pvrdma device - 0d4f38c s390x: Re-enable CONFIG_TERMINAL3270 - 0f725e9 AArch64: Enable CONFIG_FW_CFG_DMA for aarch64 - 67c5a8c Disable ivshmem --- default-configs/aarch64-softmmu.mak | 37 ++++++++++++++++++++++++++++-------- default-configs/pci.mak | 38 ++++++++++++++++++------------------- default-configs/ppc64-softmmu.mak | 25 ++++++++++++++++++------ default-configs/s390x-softmmu.mak | 5 +++-- default-configs/sound.mak | 8 ++++---- default-configs/usb.mak | 14 +++++++------- default-configs/virtio.mak | 5 ++--- default-configs/x86_64-softmmu.mak | 28 +++++++++++++-------------- hw/acpi/ich9.c | 4 ++-- hw/arm/Makefile.objs | 2 +- hw/block/fdc.c | 1 + hw/char/serial-pci.c | 4 ++++ hw/core/Makefile.objs | 9 +++++---- hw/display/cirrus_vga.c | 2 ++ hw/i386/pc.c | 2 ++ hw/ide/piix.c | 5 ++++- hw/ide/via.c | 2 ++ hw/input/pckbd.c | 2 ++ hw/isa/Makefile.objs | 2 +- hw/misc/Makefile.objs | 2 +- hw/misc/ivshmem.c | 11 +++++++++++ hw/net/e1000.c | 2 ++ hw/nvram/Makefile.objs | 2 +- hw/pci-host/piix.c | 4 ++++ hw/ppc/Makefile.objs | 2 +- hw/ppc/spapr.c | 3 ++- hw/ppc/spapr_cpu_core.c | 2 ++ hw/rdma/Makefile.objs | 3 ++- hw/s390x/virtio-ccw.c | 8 ++++++++ hw/usb/ccid-card-emulated.c | 2 ++ hw/vfio/Makefile.objs | 1 - hw/vfio/pci-quirks.c | 5 +++++ hw/virtio/virtio-pci.c | 8 ++++---- qemu-options.hx | 5 ----- redhat/qemu-kvm.spec.template | 2 +- stubs/Makefile.objs | 1 + stubs/ide-isa.c | 13 +++++++++++++ target/arm/cpu.c | 4 +++- target/i386/cpu.c | 35 ++++++++++++++++++++++++++-------- target/ppc/cpu-models.c | 17 ++++++++++++++++- target/s390x/cpu_models.c | 3 +++ target/s390x/kvm.c | 8 ++++++++ vl.c | 2 +- 43 files changed, 241 insertions(+), 99 deletions(-) create mode 100644 stubs/ide-isa.c diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak index 6f790f0..3f27540 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -1,11 +1,32 @@ # Default configuration for aarch64-softmmu -# We support all the 32 bit boards so need all their config -include arm-softmmu.mak - -CONFIG_AUX=y -CONFIG_DDC=y -CONFIG_DPCD=y -CONFIG_XLNX_ZYNQMP=y -CONFIG_XLNX_ZYNQMP_ARM=y CONFIG_ARM_SMMUV3=y +# CONFIG_AUX=y +# CONFIG_DDC=y +# CONFIG_DPCD=y +# CONFIG_XLNX_ZYNQMP=y +# CONFIG_XLNX_ZYNQMP_ARM=y +CONFIG_PCI=y +CONFIG_PCI_TESTDEV=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_MMIO=y +include virtio.mak +CONFIG_ARM_GIC=y +CONFIG_ARM_GIC_KVM=$(CONFIG_KVM) +CONFIG_PL011=y +CONFIG_PL031=y +CONFIG_PFLASH_CFI01=y +CONFIG_PCI_GENERIC=y +CONFIG_ACPI=y +CONFIG_PLATFORM_BUS=y +CONFIG_SMBIOS=y +CONFIG_PL061=y +CONFIG_GPIO_KEY=y +CONFIG_ARM_V7M=y +CONFIG_PCIE_PORT=y +CONFIG_XIO3130=y +CONFIG_IOH3420=y +CONFIG_USB_XHCI=y +CONFIG_USB=y +CONFIG_I2C=y +CONFIG_FW_CFG_DMA=y diff --git a/default-configs/pci.mak b/default-configs/pci.mak index de53d20..70e40ad 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -4,22 +4,22 @@ CONFIG_ISA_BUS=y CONFIG_VIRTIO_PCI=y include virtio.mak CONFIG_USB_UHCI=y -CONFIG_USB_OHCI=y +#CONFIG_USB_OHCI=y CONFIG_USB_EHCI=y CONFIG_USB_XHCI=y CONFIG_USB_XHCI_NEC=y -CONFIG_NE2000_PCI=y -CONFIG_EEPRO100_PCI=y -CONFIG_PCNET_PCI=y -CONFIG_PCNET_COMMON=y +#CONFIG_NE2000_PCI=y +#CONFIG_EEPRO100_PCI=y +#CONFIG_PCNET_PCI=y +#CONFIG_PCNET_COMMON=y CONFIG_AC97=y CONFIG_HDA=y -CONFIG_ES1370=y +#CONFIG_ES1370=y CONFIG_SCSI=y -CONFIG_LSI_SCSI_PCI=y -CONFIG_VMW_PVSCSI_SCSI_PCI=y -CONFIG_MEGASAS_SCSI_PCI=y -CONFIG_MPTSAS_SCSI_PCI=y +#CONFIG_LSI_SCSI_PCI=y +#CONFIG_VMW_PVSCSI_SCSI_PCI=y +#CONFIG_MEGASAS_SCSI_PCI=y +#CONFIG_MPTSAS_SCSI_PCI=y CONFIG_RTL8139_PCI=y CONFIG_E1000_PCI=y CONFIG_E1000E_PCI=y @@ -27,22 +27,22 @@ CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y CONFIG_AHCI=y -CONFIG_ESP=y -CONFIG_ESP_PCI=y +#CONFIG_ESP=y +#CONFIG_ESP_PCI=y CONFIG_SERIAL=y CONFIG_SERIAL_ISA=y CONFIG_SERIAL_PCI=y CONFIG_CAN_BUS=y CONFIG_CAN_SJA1000=y -CONFIG_CAN_PCI=y -CONFIG_IPACK=y +#CONFIG_CAN_PCI=y +#CONFIG_IPACK=y CONFIG_WDT_IB6300ESB=y CONFIG_PCI_TESTDEV=y -CONFIG_NVME_PCI=y -CONFIG_SD=y -CONFIG_SDHCI=y +#CONFIG_NVME_PCI=y +#CONFIG_SD=y +#CONFIG_SDHCI=y CONFIG_EDU=y CONFIG_VGA=y CONFIG_VGA_PCI=y -CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM) -CONFIG_ROCKER=y +#CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM) +#CONFIG_ROCKER=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index b94af6c..30ca76d 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -1,14 +1,27 @@ # Default configuration for ppc64-softmmu -# Include all 32-bit boards -include ppc-softmmu.mak +include usb.mak +include virtio.mak + +## PCI configuration - cut down from the defaults in pci.mak +CONFIG_PCI=y +CONFIG_VIRTIO_PCI=y +CONFIG_USB_XHCI=y +CONFIG_USB_XHCI_NEC=y +CONFIG_WDT_IB6300ESB=y +CONFIG_PCI_TESTDEV=y +CONFIG_USB_OHCI=y +CONFIG_VGA=y +CONFIG_VGA_PCI=y +CONFIG_SERIAL=y +CONFIG_I2C=y # For PowerNV -CONFIG_POWERNV=y +#CONFIG_POWERNV=y CONFIG_IPMI=y -CONFIG_IPMI_LOCAL=y -CONFIG_IPMI_EXTERN=y -CONFIG_ISA_IPMI_BT=y +#CONFIG_IPMI_LOCAL=y +#CONFIG_IPMI_EXTERN=y +#CONFIG_ISA_IPMI_BT=y # For pSeries CONFIG_PSERIES=y diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak index d6b67d5..8b2db3e 100644 --- a/default-configs/s390x-softmmu.mak +++ b/default-configs/s390x-softmmu.mak @@ -1,9 +1,10 @@ CONFIG_PCI=y -CONFIG_VIRTIO_PCI=$(CONFIG_PCI) +#CONFIG_VIRTIO_PCI=$(CONFIG_PCI) include virtio.mak CONFIG_SCLPCONSOLE=y CONFIG_TERMINAL3270=y CONFIG_S390_FLIC=y CONFIG_S390_FLIC_KVM=$(CONFIG_KVM) -CONFIG_VFIO_CCW=$(CONFIG_LINUX) +# Disabled for Red Hat Enterprise Linux: +# CONFIG_VFIO_CCW=$(CONFIG_LINUX) CONFIG_WDT_DIAG288=y diff --git a/default-configs/sound.mak b/default-configs/sound.mak index 4f22c34..1bead9b 100644 --- a/default-configs/sound.mak +++ b/default-configs/sound.mak @@ -1,4 +1,4 @@ -CONFIG_SB16=y -CONFIG_ADLIB=y -CONFIG_GUS=y -CONFIG_CS4231A=y +#CONFIG_SB16=y +#CONFIG_ADLIB=y +#CONFIG_GUS=y +#CONFIG_CS4231A=y diff --git a/default-configs/usb.mak b/default-configs/usb.mak index e42cfea..cef6c0b 100644 --- a/default-configs/usb.mak +++ b/default-configs/usb.mak @@ -1,11 +1,11 @@ CONFIG_USB=y -CONFIG_USB_TABLET_WACOM=y +#CONFIG_USB_TABLET_WACOM=y CONFIG_USB_STORAGE_BOT=y -CONFIG_USB_STORAGE_UAS=y -CONFIG_USB_STORAGE_MTP=y +#CONFIG_USB_STORAGE_UAS=y +#CONFIG_USB_STORAGE_MTP=y CONFIG_SCSI=y CONFIG_USB_SMARTCARD=y -CONFIG_USB_AUDIO=y -CONFIG_USB_SERIAL=y -CONFIG_USB_NETWORK=y -CONFIG_USB_BLUETOOTH=y +#CONFIG_USB_AUDIO=y +#CONFIG_USB_SERIAL=y +#CONFIG_USB_NETWORK=y +#CONFIG_USB_BLUETOOTH=y diff --git a/default-configs/virtio.mak b/default-configs/virtio.mak index 1304849..6330e6b 100644 --- a/default-configs/virtio.mak +++ b/default-configs/virtio.mak @@ -1,10 +1,9 @@ -CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) -CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) +#CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) +#CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX)) CONFIG_VIRTIO=y CONFIG_VIRTIO_9P=y CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_BLK=y -CONFIG_VIRTIO_CRYPTO=y CONFIG_VIRTIO_GPU=y CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_NET=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 0390b43..613fc50 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -4,20 +4,20 @@ include pci.mak include sound.mak include usb.mak CONFIG_QXL=$(CONFIG_SPICE) -CONFIG_VGA_ISA=y +#CONFIG_VGA_ISA=y CONFIG_VGA_CIRRUS=y -CONFIG_VMWARE_VGA=y -CONFIG_VMXNET3_PCI=y +#CONFIG_VMWARE_VGA=y +#CONFIG_VMXNET3_PCI=y CONFIG_VIRTIO_VGA=y CONFIG_VMMOUSE=y CONFIG_IPMI=y -CONFIG_IPMI_LOCAL=y -CONFIG_IPMI_EXTERN=y -CONFIG_ISA_IPMI_KCS=y -CONFIG_ISA_IPMI_BT=y +#CONFIG_IPMI_LOCAL=y +#CONFIG_IPMI_EXTERN=y +#CONFIG_ISA_IPMI_KCS=y +#CONFIG_ISA_IPMI_BT=y CONFIG_SERIAL=y CONFIG_SERIAL_ISA=y -CONFIG_PARALLEL=y +#CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y CONFIG_PCKBD=y @@ -29,11 +29,11 @@ CONFIG_ACPI_MEMORY_HOTPLUG=y CONFIG_ACPI_CPU_HOTPLUG=y CONFIG_APM=y CONFIG_I8257=y -CONFIG_IDE_ISA=y +#CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y -CONFIG_NE2000_ISA=y -CONFIG_HPET=y -CONFIG_APPLESMC=y +#CONFIG_NE2000_ISA=y +#CONFIG_HPET=y +#CONFIG_APPLESMC=y CONFIG_I8259=y CONFIG_PFLASH_CFI01=y CONFIG_TPM_TIS=$(CONFIG_TPM) @@ -58,11 +58,11 @@ CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y CONFIG_SMBIOS=y -CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM) +#CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM) CONFIG_PXB=y CONFIG_ACPI_VMGENID=y CONFIG_FW_CFG_DMA=y CONFIG_I2C=y CONFIG_SEV=$(CONFIG_KVM) CONFIG_VTD=y -CONFIG_AMD_IOMMU=y +#CONFIG_AMD_IOMMU=y diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index c5d8646..a4e87b8 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -446,8 +446,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN; pm->acpi_memory_hotplug.is_enabled = true; pm->cpu_hotplug_legacy = true; - pm->disable_s3 = 0; - pm->disable_s4 = 0; + pm->disable_s3 = 1; + pm->disable_s4 = 1; pm->s4_val = 2; object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index d51fcec..52ec91b 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -16,7 +16,7 @@ obj-$(CONFIG_STRONGARM) += collie.o obj-$(CONFIG_VERSATILE) += vexpress.o versatilepb.o obj-$(CONFIG_ZYNQ) += xilinx_zynq.o -obj-$(CONFIG_ARM_V7M) += armv7m.o +#obj-$(CONFIG_ARM_V7M) += armv7m.o obj-$(CONFIG_EXYNOS4) += exynos4210.o obj-$(CONFIG_PXA2XX) += pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.o diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 2e9c1e1..f284df7 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -599,6 +599,7 @@ static void floppy_drive_class_init(ObjectClass *klass, void *data) k->bus_type = TYPE_FLOPPY_BUS; k->props = floppy_drive_properties; k->desc = "virtual floppy drive"; + k->user_creatable = false; /* RH state preserve */ } static const TypeInfo floppy_drive_info = { diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c index cb0d04c..d426982 100644 --- a/hw/char/serial-pci.c +++ b/hw/char/serial-pci.c @@ -228,6 +228,8 @@ static void multi_2x_serial_pci_class_initfn(ObjectClass *klass, void *data) dc->vmsd = &vmstate_pci_multi_serial; dc->props = multi_2x_serial_pci_properties; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); + /* Disabled for Red Hat Enterprise Linux: */ + dc->user_creatable = false; } static void multi_4x_serial_pci_class_initfn(ObjectClass *klass, void *data) @@ -243,6 +245,8 @@ static void multi_4x_serial_pci_class_initfn(ObjectClass *klass, void *data) dc->vmsd = &vmstate_pci_multi_serial; dc->props = multi_4x_serial_pci_properties; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); + /* Disabled for Red Hat Enterprise Linux: */ + dc->user_creatable = false; } static const TypeInfo serial_pci_info = { diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index eb88ca9..e967fb2 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -16,10 +16,11 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o common-obj-$(CONFIG_SOFTMMU) += loader.o common-obj-$(CONFIG_FITLOADER) += loader-fit.o common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o -common-obj-$(CONFIG_SOFTMMU) += register.o -common-obj-$(CONFIG_SOFTMMU) += or-irq.o -common-obj-$(CONFIG_SOFTMMU) += split-irq.o +# Disabled in Red Hat Enterprise Linux +# common-obj-$(CONFIG_SOFTMMU) += register.o +# obj-$(CONFIG_SOFTMMU) += generic-loader.o +# common-obj-$(CONFIG_SOFTMMU) += or-irq.o +#common-obj-$(CONFIG_SOFTMMU) += split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o -obj-$(CONFIG_SOFTMMU) += generic-loader.o obj-$(CONFIG_SOFTMMU) += null-machine.o diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 7583b18..9fd5665 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -3075,6 +3075,8 @@ static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data) dc->realize = isa_cirrus_vga_realizefn; dc->props = isa_cirrus_vga_properties; set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); + /* Disabled for Red Hat Enterprise Linux: */ + dc->user_creatable = false; } static const TypeInfo isa_cirrus_vga_info = { diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 83a4444..11c287e 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1528,7 +1528,9 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport) ISADevice *i8042, *port92, *vmmouse; serial_hds_isa_init(isa_bus, 0, MAX_ISA_SERIAL_PORTS); +#if 0 /* Disabled for Red Hat Enterprise Linux */ parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS); +#endif for (i = 0; i < MAX_FD; i++) { fd[i] = drive_get(IF_FLOPPY, 0, i); diff --git a/hw/ide/piix.c b/hw/ide/piix.c index a3afe1f..6de12ca 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -253,7 +253,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1; k->class_id = PCI_CLASS_STORAGE_IDE; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); - dc->hotpluggable = false; + /* Disabled for Red Hat Enterprise Linux: */ + dc->user_creatable = false; } static const TypeInfo piix3_ide_info = { @@ -280,6 +281,8 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_STORAGE_IDE; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->hotpluggable = false; + /* Disabled for Red Hat Enterprise Linux: */ + dc->user_creatable = false; } static const TypeInfo piix4_ide_info = { diff --git a/hw/ide/via.c b/hw/ide/via.c index 238f038..e4a5e6d 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -216,6 +216,8 @@ static void via_ide_class_init(ObjectClass *klass, void *data) k->revision = 0x06; k->class_id = PCI_CLASS_STORAGE_IDE; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); + /* Disabled for Red Hat Enterprise Linux: */ + dc->user_creatable = false; } static const TypeInfo via_ide_info = { diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 07c8801..c27a0f8 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -574,6 +574,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data) dc->realize = i8042_realizefn; dc->vmsd = &vmstate_kbd_isa; + /* Disabled for Red Hat Enterprise Linux: */ + dc->user_creatable = false; } static const TypeInfo i8042_info = { diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs index 83e06f6..7de4f44 100644 --- a/hw/isa/Makefile.objs +++ b/hw/isa/Makefile.objs @@ -1,5 +1,5 @@ common-obj-$(CONFIG_ISA_BUS) += isa-bus.o -common-obj-$(CONFIG_ISA_BUS) += isa-superio.o smc37c669-superio.o +#common-obj-$(CONFIG_ISA_BUS) += isa-superio.o smc37c669-superio.o common-obj-$(CONFIG_APM) += apm.o common-obj-$(CONFIG_I82378) += i82378.o common-obj-$(CONFIG_PC87312) += pc87312.o diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 9350900..9c2c404 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -9,7 +9,7 @@ common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o common-obj-$(CONFIG_EDU) += edu.o common-obj-$(CONFIG_PCA9552) += pca9552.o -common-obj-y += unimp.o +#common-obj-y += unimp.o common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o # ARM devices diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 6febbab..0786fb9 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -893,6 +893,13 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp) return; } + /* Migration disabled for Red Hat Enterprise Linux: */ + if (s->master == ON_OFF_AUTO_ON) { + error_setg(errp, "master=on is not supported"); + return; + } + s->master = ON_OFF_AUTO_OFF; + pci_conf = dev->config; pci_conf[PCI_COMMAND] = PCI_COMMAND_IO | PCI_COMMAND_MEMORY; @@ -1183,6 +1190,8 @@ static void ivshmem_doorbell_class_init(ObjectClass *klass, void *data) k->realize = ivshmem_doorbell_realize; dc->props = ivshmem_doorbell_properties; dc->vmsd = &ivshmem_doorbell_vmsd; + /* Disabled for Red Hat Enterprise Linux: */ + dc->user_creatable = false; } static const TypeInfo ivshmem_doorbell_info = { @@ -1352,6 +1361,8 @@ static void ivshmem_class_init(ObjectClass *klass, void *data) dc->desc = "Inter-VM shared memory (legacy)"; dc->props = ivshmem_properties; dc->vmsd = &ivshmem_vmsd; + /* Disabled for Red Hat Enterprise Linux: */ + dc->user_creatable = false; } static const TypeInfo ivshmem_info = { diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 13a9494..742cd0a 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1768,6 +1768,7 @@ static const E1000Info e1000_devices[] = { .revision = 0x03, .phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT, }, +#if 0 /* Disabled for Red Hat Enterprise Linux 7 */ { .name = "e1000-82544gc", .device_id = E1000_DEV_ID_82544GC_COPPER, @@ -1780,6 +1781,7 @@ static const E1000Info e1000_devices[] = { .revision = 0x03, .phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT, }, +#endif }; static void e1000_register_types(void) diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs index a912d25..cbc8bba 100644 --- a/hw/nvram/Makefile.objs +++ b/hw/nvram/Makefile.objs @@ -1,6 +1,6 @@ common-obj-$(CONFIG_DS1225Y) += ds1225y.o common-obj-y += eeprom93xx.o -common-obj-$(CONFIG_I2C) += eeprom_at24c.o +#common-obj-$(CONFIG_I2C) += eeprom_at24c.o common-obj-y += fw_cfg.o common-obj-y += chrp_nvram.o common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 0e60834..3ce4b14 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -787,6 +787,7 @@ static const TypeInfo i440fx_info = { }, }; +#if 0 /* Disabled in Red Hat Enterprise Linux */ /* IGD Passthrough Host Bridge. */ typedef struct { uint8_t offset; @@ -870,6 +871,7 @@ static const TypeInfo igd_passthrough_i440fx_info = { .instance_size = sizeof(PCII440FXState), .class_init = igd_passthrough_i440fx_class_init, }; +#endif static const char *i440fx_pcihost_root_bus_path(PCIHostState *host_bridge, PCIBus *rootbus) @@ -915,7 +917,9 @@ static const TypeInfo i440fx_pcihost_info = { static void i440fx_register_types(void) { type_register_static(&i440fx_info); +#if 0 /* Disabled in Red Hat Enterprise Linux */ type_register_static(&igd_passthrough_i440fx_info); +#endif type_register_static(&piix3_pci_type_info); type_register_static(&piix3_info); type_register_static(&piix3_xen_info); diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index bcab632..70e8780 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -3,7 +3,7 @@ obj-y += ppc.o ppc_booke.o fdt.o # IBM pSeries (sPAPR) obj-$(CONFIG_PSERIES) += spapr.o spapr_caps.o spapr_vio.o spapr_events.o obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o -obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o spapr_rng.o +obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o obj-$(CONFIG_PSERIES) += spapr_cpu_core.o spapr_ovec.o # IBM PowerNV obj-$(CONFIG_POWERNV) += pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.o pnv_occ.o pnv_bmc.o diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 421b2dd..2f8c304 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1303,6 +1303,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, /* /vdevice */ spapr_dt_vdevice(spapr->vio_bus, fdt); +#if 0 /* Disabled in Red Hat Enterprise Linux */ if (object_resolve_path_type("", TYPE_SPAPR_RNG, NULL)) { ret = spapr_rng_populate_dt(fdt); if (ret < 0) { @@ -1310,7 +1311,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, exit(1); } } - +#endif QLIST_FOREACH(phb, &spapr->phbs, list) { ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt); if (ret < 0) { diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index 993759d..fb29eec 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -378,10 +378,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = { .instance_size = sizeof(sPAPRCPUCore), .class_size = sizeof(sPAPRCPUCoreClass), }, +#if 0 /* Disabled for Red Hat Enterprise Linux */ DEFINE_SPAPR_CPU_CORE_TYPE("970_v2.2"), DEFINE_SPAPR_CPU_CORE_TYPE("970mp_v1.0"), DEFINE_SPAPR_CPU_CORE_TYPE("970mp_v1.1"), DEFINE_SPAPR_CPU_CORE_TYPE("power5+_v2.1"), +#endif DEFINE_SPAPR_CPU_CORE_TYPE("power7_v2.3"), DEFINE_SPAPR_CPU_CORE_TYPE("power7+_v2.1"), DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"), diff --git a/hw/rdma/Makefile.objs b/hw/rdma/Makefile.objs index 3504c39..02ca2a9 100644 --- a/hw/rdma/Makefile.objs +++ b/hw/rdma/Makefile.objs @@ -1,5 +1,6 @@ ifeq ($(CONFIG_RDMA),y) obj-$(CONFIG_PCI) += rdma_utils.o rdma_backend.o rdma_rm.o obj-$(CONFIG_PCI) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \ - vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o + vmw/pvrdma_qp_ops.o +#obj-$(CONFIG_PCI) += vmw/pvrdma_main.o endif diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 7ddb378..b131781 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -925,6 +925,8 @@ static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw_dev, Error **errp) NULL); } +#if 0 /* Disabled in Red Hat Enterprise Linux */ + static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp) { VirtIOCryptoCcw *dev = VIRTIO_CRYPTO_CCW(ccw_dev); @@ -942,6 +944,7 @@ static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp) OBJECT(dev->vdev.conf.cryptodev), "cryptodev", NULL); } +#endif static void virtio_ccw_gpu_realize(VirtioCcwDevice *ccw_dev, Error **errp) { @@ -1532,6 +1535,8 @@ static const TypeInfo virtio_ccw_rng = { .class_init = virtio_ccw_rng_class_init, }; +#if 0 /* Disabled in Red Hat Enterprise Linux */ + static Property virtio_ccw_crypto_properties[] = { DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags, VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true), @@ -1568,6 +1573,7 @@ static const TypeInfo virtio_ccw_crypto = { .instance_init = virtio_ccw_crypto_instance_init, .class_init = virtio_ccw_crypto_class_init, }; +#endif static Property virtio_ccw_gpu_properties[] = { DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags, @@ -1888,7 +1894,9 @@ static void virtio_ccw_register(void) #ifdef CONFIG_VHOST_VSOCK type_register_static(&vhost_vsock_ccw_info); #endif +#if 0 /* Disabled in Red Hat Enterprise Linux */ type_register_static(&virtio_ccw_crypto); +#endif type_register_static(&virtio_ccw_gpu); type_register_static(&virtio_ccw_input); type_register_static(&virtio_ccw_input_hid); diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 5c8b3c9..d1cbe54 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -585,6 +585,8 @@ static void emulated_class_initfn(ObjectClass *klass, void *data) set_bit(DEVICE_CATEGORY_INPUT, dc->categories); dc->desc = "emulated smartcard"; dc->props = emulated_card_properties; + /* Disabled for Red Hat Enterprise Linux: */ + dc->user_creatable = false; } static const TypeInfo emulated_card_info = { diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs index a2e7a0a..d38205b 100644 --- a/hw/vfio/Makefile.objs +++ b/hw/vfio/Makefile.objs @@ -2,7 +2,6 @@ ifeq ($(CONFIG_LINUX), y) obj-$(CONFIG_SOFTMMU) += common.o obj-$(CONFIG_PCI) += pci.o pci-quirks.o display.o obj-$(CONFIG_VFIO_CCW) += ccw.o -obj-$(CONFIG_SOFTMMU) += platform.o obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o obj-$(CONFIG_SOFTMMU) += spapr.o diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 481fd08..1c588f5 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -1387,6 +1387,8 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data) set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); dc->desc = "VFIO dummy ISA/LPC bridge for IGD assignment"; dc->hotpluggable = false; + /* Disabled in Red Hat Enterprise Linux */ + dc->user_creatable = false; k->realize = vfio_pci_igd_lpc_bridge_realize; k->class_id = PCI_CLASS_BRIDGE_ISA; } @@ -1580,6 +1582,9 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr) 0, PCI_DEVFN(0x2, 0))) { return; } + + /* Disabled in Red Hat Enterprise Linux */ + return; /* * We need to create an LPC/ISA bridge at PCI bus address 00:1f.0 that we diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 3a01fe9..3567faf 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2003,7 +2003,7 @@ static const TypeInfo virtio_blk_pci_info = { .class_init = virtio_blk_pci_class_init, }; -#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) +#if defined(CONFIG_VHOST_USER_BLK) /* vhost-user-blk */ static Property vhost_user_blk_pci_properties[] = { @@ -2183,7 +2183,7 @@ static const TypeInfo vhost_scsi_pci_info = { }; #endif -#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) +#if defined(CONFIG_VHOST_USER_BLK) /* vhost-user-scsi-pci */ static Property vhost_user_scsi_pci_properties[] = { DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, @@ -2707,7 +2707,7 @@ static void virtio_pci_register_types(void) type_register_static(&virtio_9p_pci_info); #endif type_register_static(&virtio_blk_pci_info); -#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) +#if defined(CONFIG_VHOST_USER_BLK) type_register_static(&vhost_user_blk_pci_info); #endif type_register_static(&virtio_scsi_pci_info); @@ -2717,7 +2717,7 @@ static void virtio_pci_register_types(void) #ifdef CONFIG_VHOST_SCSI type_register_static(&vhost_scsi_pci_info); #endif -#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX) +#if defined(CONFIG_VHOST_USER_SCSI) type_register_static(&vhost_user_scsi_pci_info); #endif #ifdef CONFIG_VHOST_VSOCK diff --git a/qemu-options.hx b/qemu-options.hx index b1bf0f4..37f2aa8 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1811,11 +1811,6 @@ ETEXI DEF("no-hpet", 0, QEMU_OPTION_no_hpet, "-no-hpet disable HPET\n", QEMU_ARCH_I386) -STEXI -@item -no-hpet -@findex -no-hpet -Disable HPET support. -ETEXI DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n" diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 53d3f32..b1360c4 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -43,3 +43,4 @@ stub-obj-y += xen-common.o stub-obj-y += xen-hvm.o stub-obj-y += pci-host-piix.o stub-obj-y += ram-block.o +stub-obj-y += ide-isa.o diff --git a/stubs/ide-isa.c b/stubs/ide-isa.c new file mode 100644 index 0000000..9fd50ef --- /dev/null +++ b/stubs/ide-isa.c @@ -0,0 +1,13 @@ +#include "qemu/osdep.h" +#include "hw/ide.h" +#include + +ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, + DriveInfo *hd0, DriveInfo *hd1) +{ + /* + * In theory the real isa_ide_init() function can return NULL, but no + * caller actually checks for that. Make sure we go out with a clear bang. + */ + abort(); +} diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 64a8005..bc8d09d 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2029,7 +2029,9 @@ static void arm_cpu_register_types(void) type_register_static(&idau_interface_type_info); while (info->name) { - cpu_register(info); + /* RHEL specific: Filter out unsupported cpu models */ + if (!strcmp(info->name, "cortex-a15")) + cpu_register(info); info++; } diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 723e022..338ee37 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1366,14 +1366,14 @@ static X86CPUDefinition builtin_x86_defs[] = { .family = 6, .model = 6, .stepping = 3, - .features[FEAT_1_EDX] = - PPRO_FEATURES | - CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | - CPUID_PSE36, - .features[FEAT_1_ECX] = - CPUID_EXT_SSE3 | CPUID_EXT_CX16, - .features[FEAT_8000_0001_EDX] = - CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX, + .features[FEAT_1_EDX] = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | + CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | + CPUID_MCA | CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | + CPUID_CX8 | CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | + CPUID_PSE | CPUID_DE | CPUID_FP87, + .features[FEAT_1_ECX] = CPUID_EXT_CX16 | CPUID_EXT_SSE3, + .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_NX | + CPUID_EXT2_SYSCALL, .features[FEAT_8000_0001_ECX] = CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM, .xlevel = 0x8000000A, @@ -1603,6 +1603,25 @@ static X86CPUDefinition builtin_x86_defs[] = { .model_id = "Intel(R) Atom(TM) CPU N270 @ 1.60GHz", }, { + .name = "cpu64-rhel6", + .level = 4, + .vendor = CPUID_VENDOR_AMD, + .family = 6, + .model = 13, + .stepping = 3, + .features[FEAT_1_EDX] = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | + CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | + CPUID_MCA | CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | + CPUID_CX8 | CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | + CPUID_PSE | CPUID_DE | CPUID_FP87, + .features[FEAT_1_ECX] = CPUID_EXT_CX16 | CPUID_EXT_SSE3, + .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL, + .features[FEAT_8000_0001_ECX] = CPUID_EXT3_SSE4A | CPUID_EXT3_ABM | + CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM, + .xlevel = 0x8000000A, + .model_id = "QEMU Virtual CPU version (cpu64-rhel6)", + }, + { .name = "Conroe", .level = 10, .vendor = CPUID_VENDOR_INTEL, diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c index 6c9bfde..77cb298 100644 --- a/target/ppc/cpu-models.c +++ b/target/ppc/cpu-models.c @@ -65,6 +65,7 @@ #define POWERPC_DEF(_name, _pvr, _type, _desc) \ POWERPC_DEF_SVR(_name, _desc, _pvr, POWERPC_SVR_NONE, _type) +#if 0 /* Embedded and 32-bit CPUs disabled for Red Hat Enterprise Linux */ /* Embedded PowerPC */ /* PowerPC 401 family */ POWERPC_DEF("401", CPU_POWERPC_401, 401, @@ -739,10 +740,13 @@ "PowerPC 7447A v1.2 (G4)") POWERPC_DEF("7457a_v1.2", CPU_POWERPC_74x7A_v12, 7455, "PowerPC 7457A v1.2 (G4)") +#endif /* 64 bits PowerPC */ #if defined (TARGET_PPC64) +#if 0 /* Disabled for Red Hat Enterprise Linux */ POWERPC_DEF("power5+_v2.1", CPU_POWERPC_POWER5P_v21, POWER5P, "POWER5+ v2.1") +#endif POWERPC_DEF("power7_v2.3", CPU_POWERPC_POWER7_v23, POWER7, "POWER7 v2.3") POWERPC_DEF("power7+_v2.1", CPU_POWERPC_POWER7P_v21, POWER7, @@ -753,14 +757,17 @@ "POWER8 v2.0") POWERPC_DEF("power8nvl_v1.0", CPU_POWERPC_POWER8NVL_v10, POWER8, "POWER8NVL v1.0") +#if 0 /* Disabled for Red Hat Enterprise Linux */ POWERPC_DEF("970_v2.2", CPU_POWERPC_970_v22, 970, "PowerPC 970 v2.2") +#endif POWERPC_DEF("power9_v1.0", CPU_POWERPC_POWER9_DD1, POWER9, "POWER9 v1.0") POWERPC_DEF("power9_v2.0", CPU_POWERPC_POWER9_DD20, POWER9, "POWER9 v2.0") +#if 0 /* Disabled for Red Hat Enterprise Linux */ POWERPC_DEF("970fx_v1.0", CPU_POWERPC_970FX_v10, 970, "PowerPC 970FX v1.0 (G5)") POWERPC_DEF("970fx_v2.0", CPU_POWERPC_970FX_v20, 970, @@ -775,12 +782,14 @@ "PowerPC 970MP v1.0") POWERPC_DEF("970mp_v1.1", CPU_POWERPC_970MP_v11, 970, "PowerPC 970MP v1.1") +#endif #endif /* defined (TARGET_PPC64) */ /***************************************************************************/ /* PowerPC CPU aliases */ PowerPCCPUAlias ppc_cpu_aliases[] = { +#if 0 /* Embedded and 32-bit CPUs disabled for Red Hat Enterprise Linux */ { "403", "403gc" }, { "405", "405d4" }, { "405cr", "405crc" }, @@ -939,20 +948,25 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { { "7447a", "7447a_v1.2" }, { "7457a", "7457a_v1.2" }, { "apollo7pm", "7457a_v1.0" }, +#endif #if defined(TARGET_PPC64) +#if 0 /* Disabled for Red Hat Enterprise Linux */ { "power5+", "power5+_v2.1" }, { "power5gs", "power5+_v2.1" }, +#endif { "power7", "power7_v2.3" }, { "power7+", "power7+_v2.1" }, { "power8e", "power8e_v2.1" }, { "power8", "power8_v2.0" }, { "power8nvl", "power8nvl_v1.0" }, { "power9", "power9_v2.0" }, +#if 0 /* Disabled for Red Hat Enterprise Linux */ { "970", "970_v2.2" }, { "970fx", "970fx_v3.1" }, { "970mp", "970mp_v1.1" }, #endif - +#endif +#if 0 /* Disabled for Red Hat Enterprise Linux */ /* Generic PowerPCs */ #if defined(TARGET_PPC64) { "ppc64", "970fx_v3.1" }, @@ -960,5 +974,6 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { { "ppc32", "604" }, { "ppc", "604" }, { "default", "604" }, +#endif { NULL, NULL } }; diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 604898a..9c469ff 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -373,6 +373,9 @@ static void check_unavailable_features(const S390CPUModel *max_model, (max_model->def->gen == model->def->gen && max_model->def->ec_ga < model->def->ec_ga)) { list_add_feat("type", unavailable); + } else if (model->def->gen < 11 && kvm_enabled()) { + /* Older CPU models are not supported on Red Hat Enterprise Linux */ + list_add_feat("type", unavailable); } /* detect missing features if any to properly report them */ diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index d923cf4..bbcbeed 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -2277,6 +2277,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp) error_setg(errp, "KVM doesn't support CPU models"); return; } + + /* Older CPU models are not supported on Red Hat Enterprise Linux */ + if (model->def->gen < 11) { + error_setg(errp, "KVM: Unsupported CPU type specified: %s", + MACHINE(qdev_get_machine())->cpu_type); + return; + } + prop.cpuid = s390_cpuid_from_cpu_model(model); prop.ibc = s390_ibc_from_cpu_model(model); /* configure cpu features indicated via STFL(e) */ diff --git a/vl.c b/vl.c index 16b913f..4f96203 100644 --- a/vl.c +++ b/vl.c @@ -164,7 +164,7 @@ unsigned int max_cpus; int smp_cores = 1; int smp_threads = 1; int acpi_enabled = 1; -int no_hpet = 0; +int no_hpet = 1; /* Always disabled for Red Hat Enterprise Linux */ int fd_bootchk = 1; static int no_reboot; int no_shutdown = 0; -- 1.8.3.1