From a36a3ad800b282cef9d72e6d8026470035f8f21c Mon Sep 17 00:00:00 2001
From: Miroslav Rezanina <mrezanin@redhat.com>
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-rhev-2.1.2-16.el7.
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
(cherry picked from commit 7f8f6f97fbd36398d25207aa8aad39edc4f8de06)
Rebase notes (2.9.0):
- enabled CONFIG_ARM_V7M for aarch64
- need to fix cpu mask
- disabled some irrelevant ppc64 tests
- Adding pxe-e1000e.rom to Inital redhat commit
- Context changed in vfio_probe_igd_bar4_quirk (rc3)
Rebase notes (2.8.0):
- Removed CONFIG_PIIX_PCI (upstream)
- Disabled POWERNV
- Disabled additional occurencies of prom-env-test
- Disabled additional occurencies of usb-hcd-ohci-test and usb-hcd-uhci-test
- Disabled unsupported machine types in boot-serieal-test
- Disabled 2.7 machine type compatibility test in test-x86-cpuid-compat
- Disabled pnv-xscom-test
- Disabled RHEl 6 machine types for qom-test (failing acpi setting)
- Added diffutils BuildRequires and diff usage for make check
Rebase notes (2.6.0):
- disabled prom-env-test
Rebase notes (2.4.0):
- fixed types
- include CONFIG_PLATFORM_BUS for aarch64
- disable failing virtio-scsi-test
Rebase notes (2.3.0):
- Added USB=y in 2.3-rc2 (used instead of downstream version fora aarch64)
Merged patches (2.9.0):
- 9320fc1 Fix unuseds/Fedora build
- cb16934 config: Remove EHCI from ppc64 builds
- 626fe4d Disable qemu,register device
- 783a0b2 Disable vfio-pci-igd-lpc-bridge device
- bf7c127 Disable new virtio crypto devices
- a4d3c4e Disable amd iommu devices
- 5396ebc Disable loader device
- 1957779 Disable or-irq device
- 25ee621 Hide new floppy device
- 2bd29ed Disable devices for for AArch64 QEMU
Merged patches (2.7.0):
- e2944a5 RHEL: Disable unsupported PowerPC CPU models
- have to add additional "if 0" sections to hw/ppc/spapr_cpu_core.c
- 81b2836 Remove unsupported VFIO devices from QEMU
- 1248029 Disable spapr-rng
- 351e1fb Disable Windows enlightnementas
- 5760290 Disable mptsas1068 device
- 0b74460 Disable sd-card
- 2eaf71c Disable rocker device
- e0ed699 Disable new ipmi devices
- disable ipmi tests in bios-tables-test
- 30e3bee Disable hyperv-testdev
- 8a9aadf Disable allwiner_ahci device
- a41119d Disable igd-passthrough-i440FX
- e305bb4 Disable vfio-platform device
- a127042 rhel: Revert unwanted inconsequential changes to ivshmem
- ce1419c rhel: Disable ivshmem-plain migration, ivshmem-doorbell, ivshmem
- 3f9349b q35: disable s3/s4 by default
- 2158ca1 i8257: Set no-user flag
- b2a3bb9 e1000e: add boot rom
- have to add pxe-e1000e.rom to source files
Merged patches (2.6.0):
- ce3206a qemu-iotests: Fix broken test cases
- Reduced to disabling test 071 only
- bb34585 qemu-iotests: Disable 099 (requires blkverify)
- 81be408 build: reenable local builds to pass --enable-debug (downstream only)
Merged patches (2.4.0):
- fa4fd10 AArch64: Enable ACPI
- 1219d52 ivshmem: RHEL-only: remove unsupported code
- 5f6d954 ivshmem: RHEL-only: explicitly remove dead code
- b88bbf0 Revert "rhel: Drop "ivshmem" device"
- 8f0aadf Split serial-isa into its own config option
- 01bff0f rhel: Disable "info irq" and "info pic" for Power
- b915077 RHEL: Disable remaining unsupported devices for ppc
- 64cbdc5 Mark onboard devices as cannot_instantiate_with_device_add_yet
- 4792566 Disable sdhci device
- bda8169 Disable Educational device
- a17a8fb rhel: Revert unwanted cannot_instantiate_with_device_add_yet changes
- 91c76c5 Remove intel-iommu device
- ec1615d Disable additional e1000 models
(cherry picked from commit 0d74456ab7a1bf5c0ad53c5b3f6bab17f1798a61)
---
default-configs/aarch64-softmmu.mak | 26 ++++++++++-----
default-configs/arm-softmmu.mak | 3 --
default-configs/i386-softmmu.mak | 2 +-
default-configs/mips-softmmu-common.mak | 1 -
default-configs/pci.mak | 19 -----------
default-configs/ppc-softmmu.mak | 1 -
default-configs/ppc64-softmmu.mak | 56 ++++++++-------------------------
default-configs/ppcemb-softmmu.mak | 13 ++++++++
default-configs/sound.mak | 4 ---
default-configs/usb.mak | 7 -----
default-configs/x86_64-softmmu.mak | 14 ++-------
hw/acpi/ich9.c | 4 +--
hw/block/fdc.c | 3 ++
hw/block/pflash_cfi01.c | 1 +
hw/char/serial-pci.c | 4 +++
hw/core/Makefile.objs | 7 +++--
hw/display/cirrus_vga.c | 2 ++
hw/dma/i8257.c | 2 ++
hw/i386/Makefile.objs | 3 +-
hw/i386/kvm/clock.c | 1 +
hw/i386/kvm/ioapic.c | 1 +
hw/i386/kvmvapic.c | 1 +
hw/i386/pc.c | 3 +-
hw/ide/ahci.c | 5 +++
hw/ide/piix.c | 5 ++-
hw/ide/via.c | 2 ++
hw/input/pckbd.c | 2 ++
hw/intc/ioapic.c | 1 +
hw/isa/isa-bus.c | 1 +
hw/misc/ivshmem.c | 11 +++++++
hw/net/e1000.c | 2 ++
hw/net/e1000e.c | 2 +-
hw/nvram/fw_cfg.c | 3 ++
hw/pci-host/piix.c | 4 +++
hw/pci-host/q35.c | 1 +
hw/ppc/Makefile.objs | 3 +-
hw/ppc/spapr.c | 3 +-
hw/ppc/spapr_cpu_core.c | 6 +++-
hw/usb/ccid-card-emulated.c | 2 ++
hw/vfio/Makefile.objs | 3 --
hw/vfio/pci-quirks.c | 5 +++
hw/virtio/Makefile.objs | 5 +--
hw/virtio/virtio-mmio.c | 1 +
qemu-options.hx | 5 ---
redhat/Makefile.common | 1 +
redhat/qemu-kvm.spec.template | 6 ++--
stubs/Makefile.objs | 1 +
stubs/ide-isa.c | 13 ++++++++
target/arm/cpu.c | 3 +-
target/i386/cpu.c | 15 +++------
target/ppc/cpu-models.c | 15 ++++++++-
tests/Makefile.include | 50 +++++------------------------
tests/bios-tables-test.c | 4 +++
tests/boot-order-test.c | 7 +++++
tests/boot-serial-test.c | 8 ++---
tests/e1000-test.c | 2 ++
tests/endianness-test.c | 2 ++
tests/ivshmem-test.c | 10 +++++-
tests/qemu-iotests/051 | 20 ++++++------
tests/qemu-iotests/group | 4 +--
tests/qom-test.c | 4 ++-
tests/test-x86-cpuid-compat.c | 3 +-
tests/usb-hcd-xhci-test.c | 5 ++-
tests/virtio-scsi-test.c | 9 ++++--
vl.c | 2 +-
65 files changed, 231 insertions(+), 203 deletions(-)
create mode 100644 stubs/ide-isa.c
diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
index abd18c2..38e9291 100644
--- a/default-configs/aarch64-softmmu.mak
+++ b/default-configs/aarch64-softmmu.mak
@@ -1,11 +1,23 @@
# 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
+# Disabled in Red Hat Enterprise Linux
+# CONFIG_AUX=y
+# CONFIG_DDC=y
+# CONFIG_DPCD=y
+# CONFIG_XLNX_ZYNQMP=y
+CONFIG_PCI=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO=y
+CONFIG_STELLARIS=y
+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
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 3ae1bf4..8f41817 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -92,9 +92,6 @@ CONFIG_STM32F2XX_ADC=y
CONFIG_STM32F2XX_SPI=y
CONFIG_STM32F205_SOC=y
-CONFIG_VERSATILE_PCI=y
-CONFIG_VERSATILE_I2C=y
-
CONFIG_PCI_GENERIC=y
CONFIG_VFIO_XGMAC=y
CONFIG_VFIO_AMD_XGBE=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 029e952..aa19ed5 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -30,7 +30,6 @@ CONFIG_APM=y
CONFIG_I8257=y
CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
-CONFIG_NE2000_ISA=y
CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
@@ -40,6 +39,7 @@ CONFIG_MC146818RTC=y
CONFIG_PCI_PIIX=y
CONFIG_WDT_IB700=y
CONFIG_XEN_I386=$(CONFIG_XEN)
+CONFIG_ISA_BUS=y
CONFIG_ISA_DEBUG=y
CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index 7d8f5db..9b4d047 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -25,7 +25,6 @@ CONFIG_I8257=y
CONFIG_PIIX4=y
CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
-CONFIG_NE2000_ISA=y
CONFIG_MIPSNET=y
CONFIG_PFLASH_CFI01=y
CONFIG_I8259=y
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 60dc651..f943baa 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -4,41 +4,22 @@ CONFIG_ISA_BUS=y
CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO=y
CONFIG_USB_UHCI=y
-CONFIG_USB_OHCI=y
CONFIG_USB_EHCI=y
CONFIG_USB_XHCI=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_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
-CONFIG_VMXNET3_PCI=y
CONFIG_IDE_CORE=y
CONFIG_IDE_QDEV=y
CONFIG_IDE_PCI=y
CONFIG_AHCI=y
-CONFIG_ESP=y
-CONFIG_ESP_PCI=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_SERIAL_PCI=y
-CONFIG_IPACK=y
CONFIG_WDT_IB6300ESB=y
CONFIG_PCI_TESTDEV=y
-CONFIG_NVME_PCI=y
-CONFIG_SD=y
-CONFIG_SDHCI=y
-CONFIG_EDU=y
CONFIG_VGA=y
CONFIG_VGA_PCI=y
CONFIG_IVSHMEM=$(CONFIG_EVENTFD)
-CONFIG_ROCKER=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 09c1d45..b9c9f2f 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -31,7 +31,6 @@ CONFIG_PPCE500_PCI=y
CONFIG_IDE_ISA=y
CONFIG_IDE_CMD646=y
CONFIG_IDE_MACIO=y
-CONFIG_NE2000_ISA=y
CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 05c8335..a1fbb8d 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -1,59 +1,29 @@
# Default configuration for ppc64-softmmu
-include pci.mak
+# PCI configuration - cut down from the defaults in pci.mak
+CONFIG_PCI=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO=y
+CONFIG_USB_XHCI=y
+CONFIG_WDT_IB6300ESB=y
+CONFIG_PCI_TESTDEV=y
+CONFIG_ISA_BUS=y
+
include sound.mak
include usb.mak
CONFIG_VIRTIO_VGA=y
-CONFIG_ESCC=y
-CONFIG_M48T59=y
+CONFIG_VGA=y
+CONFIG_VGA_PCI=y
CONFIG_SERIAL=y
-CONFIG_PARALLEL=y
-CONFIG_I8254=y
-CONFIG_PCKBD=y
-CONFIG_FDC=y
-CONFIG_I8257=y
-CONFIG_I82374=y
-CONFIG_OPENPIC=y
-CONFIG_PREP_PCI=y
-CONFIG_I82378=y
-CONFIG_PC87312=y
-CONFIG_MACIO=y
-CONFIG_PCSPK=y
-CONFIG_CUDA=y
-CONFIG_ADB=y
-CONFIG_MAC_NVRAM=y
-CONFIG_MAC_DBDMA=y
-CONFIG_HEATHROW_PIC=y
-CONFIG_GRACKLE_PCI=y
-CONFIG_UNIN_PCI=y
-CONFIG_DEC_PCI=y
-CONFIG_PPCE500_PCI=y
-CONFIG_IDE_ISA=y
-CONFIG_IDE_CMD646=y
-CONFIG_IDE_MACIO=y
-CONFIG_NE2000_ISA=y
-CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
-CONFIG_PTIMER=y
-CONFIG_I8259=y
-CONFIG_XILINX=y
-CONFIG_XILINX_ETHLITE=y
CONFIG_PSERIES=y
-CONFIG_POWERNV=y
-CONFIG_PREP=y
-CONFIG_MAC=y
-CONFIG_E500=y
-CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
-CONFIG_PLATFORM_BUS=y
-CONFIG_ETSEC=y
+#CONFIG_POWERNV=y
CONFIG_LIBDECNUMBER=y
+CONFIG_USB_OHCI=y
# For pSeries
CONFIG_XICS=$(CONFIG_PSERIES)
CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)
CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM))
# For PReP
CONFIG_SERIAL_ISA=y
-CONFIG_MC146818RTC=y
-CONFIG_ISA_TESTDEV=y
CONFIG_MEM_HOTPLUG=y
CONFIG_RS6000_MC=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 7f56004..b261e07 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -8,6 +8,19 @@ CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_I8257=y
CONFIG_OPENPIC=y
+CONFIG_MACIO=y
+CONFIG_CUDA=y
+CONFIG_ADB=y
+CONFIG_MAC_NVRAM=y
+CONFIG_MAC_DBDMA=y
+CONFIG_HEATHROW_PIC=y
+CONFIG_GRACKLE_PCI=y
+CONFIG_UNIN_PCI=y
+CONFIG_DEC_PCI=y
+CONFIG_PPCE500_PCI=y
+CONFIG_IDE_ISA=y
+CONFIG_IDE_CMD646=y
+CONFIG_IDE_MACIO=y
CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
diff --git a/default-configs/sound.mak b/default-configs/sound.mak
index 4f22c34..e69de29 100644
--- a/default-configs/sound.mak
+++ b/default-configs/sound.mak
@@ -1,4 +0,0 @@
-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 f4b8568..4726c3e 100644
--- a/default-configs/usb.mak
+++ b/default-configs/usb.mak
@@ -1,10 +1,3 @@
CONFIG_USB=y
-CONFIG_USB_TABLET_WACOM=y
CONFIG_USB_STORAGE_BOT=y
-CONFIG_USB_STORAGE_UAS=y
-CONFIG_USB_STORAGE_MTP=y
CONFIG_USB_SMARTCARD=y
-CONFIG_USB_AUDIO=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_NETWORK=y
-CONFIG_USB_BLUETOOTH=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index d1d7432..3282539 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -4,19 +4,13 @@ include pci.mak
include sound.mak
include usb.mak
CONFIG_QXL=$(CONFIG_SPICE)
-CONFIG_VGA_ISA=y
+CONFIG_VGA_PCI=y
CONFIG_VGA_CIRRUS=y
-CONFIG_VMWARE_VGA=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_SERIAL=y
CONFIG_SERIAL_ISA=y
-CONFIG_PARALLEL=y
CONFIG_I8254=y
CONFIG_PCSPK=y
CONFIG_PCKBD=y
@@ -28,11 +22,7 @@ CONFIG_ACPI_MEMORY_HOTPLUG=y
CONFIG_ACPI_CPU_HOTPLUG=y
CONFIG_APM=y
CONFIG_I8257=y
-CONFIG_IDE_ISA=y
CONFIG_IDE_PIIX=y
-CONFIG_NE2000_ISA=y
-CONFIG_HPET=y
-CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
CONFIG_TPM_TIS=$(CONFIG_TPM)
@@ -40,6 +30,7 @@ CONFIG_MC146818RTC=y
CONFIG_PCI_PIIX=y
CONFIG_WDT_IB700=y
CONFIG_XEN_I386=$(CONFIG_XEN)
+CONFIG_ISA_BUS=y
CONFIG_ISA_DEBUG=y
CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y
@@ -57,6 +48,5 @@ CONFIG_XIO3130=y
CONFIG_IOH3420=y
CONFIG_I82801B11=y
CONFIG_SMBIOS=y
-CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
CONFIG_PXB=y
CONFIG_ACPI_VMGENID=y
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 5c279bb..9428cbf 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -447,8 +447,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/block/fdc.c b/hw/block/fdc.c
index a328693..f4f038d 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -611,6 +611,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->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
}
static const TypeInfo floppy_drive_info = {
@@ -2879,6 +2880,7 @@ static void sysbus_fdc_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass);
dc->props = sysbus_fdc_properties;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
}
@@ -2905,6 +2907,7 @@ static void sun4m_fdc_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass);
dc->props = sun4m_fdc_properties;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
}
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index 594d4cf..9707c7b 100644
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -926,6 +926,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)
dc->realize = pflash_cfi01_realize;
dc->props = pflash_cfi01_properties;
dc->vmsd = &vmstate_pflash;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
}
diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index 303104d..bfa90ac 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->cannot_instantiate_with_device_add_yet = true;
}
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->cannot_instantiate_with_device_add_yet = true;
}
static const TypeInfo serial_pci_info = {
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
index 91450b2..3170968 100644
--- a/hw/core/Makefile.objs
+++ b/hw/core/Makefile.objs
@@ -15,9 +15,10 @@ 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_PLATFORM_BUS) += platform-bus.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
-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 14008aa..38fa725 100644
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -3077,6 +3077,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->cannot_instantiate_with_device_add_yet = true;
}
static const TypeInfo isa_cirrus_vga_info = {
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
index 8bd82e8..6d1057c 100644
--- a/hw/dma/i8257.c
+++ b/hw/dma/i8257.c
@@ -591,6 +591,8 @@ static void i8257_class_init(ObjectClass *klass, void *data)
dc->reset = i8257_reset;
dc->vmsd = &vmstate_i8257;
dc->props = i8257_properties;
+ /* Disabled for Red Hat Enterprise Linux: */
+ dc->cannot_instantiate_with_device_add_yet = true;
idc->get_transfer_mode = i8257_dma_get_transfer_mode;
idc->has_autoinitialization = i8257_dma_has_autoinitialization;
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 909ead6..a15db94 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -3,7 +3,8 @@ obj-y += multiboot.o
obj-y += pc.o pc_piix.o pc_q35.o
obj-y += pc_sysfw.o
obj-y += x86-iommu.o intel_iommu.o
-obj-y += amd_iommu.o
+# Disabled in Red Hat Enterprise Linux
+# obj-y += amd_iommu.o
obj-$(CONFIG_XEN) += ../xenpv/ xen/
obj-y += kvmvapic.o
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 13eca37..e59106a 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -286,6 +286,7 @@ static void kvmclock_class_init(ObjectClass *klass, void *data)
dc->realize = kvmclock_realize;
dc->vmsd = &kvmclock_vmsd;
dc->props = kvmclock_properties;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
}
static const TypeInfo kvmclock_info = {
diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index 98ca480..9ec1c14 100644
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
@@ -167,6 +167,7 @@ static void kvm_ioapic_class_init(ObjectClass *klass, void *data)
k->post_load = kvm_ioapic_put;
dc->reset = kvm_ioapic_reset;
dc->props = kvm_ioapic_properties;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
}
static const TypeInfo kvm_ioapic_info = {
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index 82a4955..6b1ee98 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -856,6 +856,7 @@ static void vapic_class_init(ObjectClass *klass, void *data)
dc->reset = vapic_reset;
dc->vmsd = &vmstate_vapic;
dc->realize = vapic_realize;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
}
static const TypeInfo vapic_type = {
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index d24388e..815bd65 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1596,8 +1596,9 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
}
serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */
parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);
-
+#endif
a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
i8042 = isa_create_simple(isa_bus, "i8042");
i8042_setup_a20_line(i8042, a20_line[0]);
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index f60826d..d18566f 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1720,6 +1720,7 @@ static void sysbus_ahci_class_init(ObjectClass *klass, void *data)
dc->vmsd = &vmstate_sysbus_ahci;
dc->props = sysbus_ahci_properties;
dc->reset = sysbus_ahci_reset;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
}
@@ -1731,6 +1732,7 @@ static const TypeInfo sysbus_ahci_info = {
.class_init = sysbus_ahci_class_init,
};
+#if 0 /* Disabled in Red Hat Enterprise Linux */
#define ALLWINNER_AHCI_BISTAFR ((0xa0 - ALLWINNER_AHCI_MMIO_OFF) / 4)
#define ALLWINNER_AHCI_BISTCR ((0xa4 - ALLWINNER_AHCI_MMIO_OFF) / 4)
#define ALLWINNER_AHCI_BISTFCTR ((0xa8 - ALLWINNER_AHCI_MMIO_OFF) / 4)
@@ -1824,11 +1826,14 @@ static const TypeInfo allwinner_ahci_info = {
.instance_init = allwinner_ahci_init,
.class_init = allwinner_ahci_class_init,
};
+#endif
static void sysbus_ahci_register_types(void)
{
type_register_static(&sysbus_ahci_info);
+#if 0 /* Disabled in Red Hat Enterprise Linux */
type_register_static(&allwinner_ahci_info);
+#endif
}
type_init(sysbus_ahci_register_types)
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 7e2d767..808aa72 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -254,7 +254,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->cannot_instantiate_with_device_add_yet = true;
}
static const TypeInfo piix3_ide_info = {
@@ -281,6 +282,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->cannot_instantiate_with_device_add_yet = true;
}
static const TypeInfo piix4_ide_info = {
diff --git a/hw/ide/via.c b/hw/ide/via.c
index 5b32ecb..434cc03 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -220,6 +220,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->cannot_instantiate_with_device_add_yet = true;
}
static const TypeInfo via_ide_info = {
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index d414288..78b6c01 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -570,6 +570,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->cannot_instantiate_with_device_add_yet = true;
}
static const TypeInfo i8042_info = {
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index 37c4386..7eb83fe 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -448,6 +448,7 @@ static void ioapic_class_init(ObjectClass *klass, void *data)
k->post_load = ioapic_update_kvm_routes;
dc->reset = ioapic_reset_common;
dc->props = ioapic_properties;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
}
static const TypeInfo ioapic_info = {
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 348e0ea..9acc0cc 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -221,6 +221,7 @@ static void isabus_bridge_class_init(ObjectClass *klass, void *data)
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
dc->fw_name = "isa";
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
}
static const TypeInfo isabus_bridge_info = {
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 82ce837..037c7b5 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -849,6 +849,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;
@@ -1146,6 +1153,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->cannot_instantiate_with_device_add_yet = true;
}
static const TypeInfo ivshmem_doorbell_info = {
@@ -1315,6 +1324,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->cannot_instantiate_with_device_add_yet = true;
}
static const TypeInfo ivshmem_info = {
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 3d86146..d29e9ee 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -1704,6 +1704,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,
@@ -1716,6 +1717,7 @@ static const E1000Info e1000_devices[] = {
.revision = 0x03,
.phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT,
},
+#endif
};
static const TypeInfo e1000_default_info = {
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 6e23493..e849f79 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -665,7 +665,7 @@ static void e1000e_class_init(ObjectClass *class, void *data)
c->vendor_id = PCI_VENDOR_ID_INTEL;
c->device_id = E1000_DEV_ID_82574L;
c->revision = 0;
- c->romfile = "efi-e1000e.rom";
+ c->romfile = "pxe-e1000e.rom";
c->class_id = PCI_CLASS_NETWORK_ETHERNET;
c->is_express = 1;
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 316fca9..6fc63d2 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -1023,6 +1023,7 @@ static void fw_cfg_class_init(ObjectClass *klass, void *data)
dc->reset = fw_cfg_reset;
dc->vmsd = &vmstate_fw_cfg;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
}
static const TypeInfo fw_cfg_info = {
@@ -1101,6 +1102,7 @@ static void fw_cfg_io_class_init(ObjectClass *klass, void *data)
dc->realize = fw_cfg_io_realize;
dc->props = fw_cfg_io_properties;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
}
static const TypeInfo fw_cfg_io_info = {
@@ -1167,6 +1169,7 @@ static void fw_cfg_mem_class_init(ObjectClass *klass, void *data)
dc->realize = fw_cfg_mem_realize;
dc->props = fw_cfg_mem_properties;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
}
static const TypeInfo fw_cfg_mem_info = {
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index f9218aa..7c3b7c1 100644
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -756,6 +756,7 @@ static const TypeInfo i440fx_info = {
.class_init = i440fx_class_init,
};
+#if 0 /* Disabled in Red Hat Enterprise Linux */
/* IGD Passthrough Host Bridge. */
typedef struct {
uint8_t offset;
@@ -844,6 +845,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)
@@ -888,7 +890,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/pci-host/q35.c b/hw/pci-host/q35.c
index 344f77b..8434f6f 100644
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -159,6 +159,7 @@ static void q35_host_class_init(ObjectClass *klass, void *data)
dc->cannot_instantiate_with_device_add_yet = true;
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
dc->fw_name = "pci";
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
}
static void q35_host_initfn(Object *obj)
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 72edbf1..82ccc78 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_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
@@ -13,7 +13,6 @@ endif
obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o
# PowerPC 4xx boards
obj-y += ppc4xx_devs.o ppc405_uc.o
-obj-y += ppc4xx_pci.o
# PReP
obj-$(CONFIG_PREP) += prep.o
obj-$(CONFIG_PREP) += prep_systemio.o
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 596cc11..9bcf6c3 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -983,6 +983,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) {
@@ -990,7 +991,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 6883f09..0bc7c6d 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -219,6 +219,7 @@ err:
}
static const char *spapr_core_models[] = {
+#if 0 /* Disabled for Red Hat Enterprise Linux */
/* 970 */
"970_v2.2",
@@ -231,6 +232,8 @@ static const char *spapr_core_models[] = {
/* POWER5+ */
"POWER5+_v2.1",
+ { .name = "POWER5+_v2.1", .initfn = spapr_cpu_core_POWER5plus_initfn },
+#endif
/* POWER7 */
"POWER7_v2.3",
@@ -245,9 +248,10 @@ static const char *spapr_core_models[] = {
/* POWER8NVL */
"POWER8NVL_v1.0",
-
+#if 0 /* Disabled for Red Hat Enterprise Linux */
/* POWER9 */
"POWER9_v1.0",
+#endif
};
void spapr_cpu_core_class_init(ObjectClass *oc, void *data)
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 9962786..560b787 100644
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -588,6 +588,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->cannot_instantiate_with_device_add_yet = true;
}
static const TypeInfo emulated_card_info = {
diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
index 05e7fbb..e78d433 100644
--- a/hw/vfio/Makefile.objs
+++ b/hw/vfio/Makefile.objs
@@ -1,8 +1,5 @@
ifeq ($(CONFIG_LINUX), y)
obj-$(CONFIG_SOFTMMU) += common.o
obj-$(CONFIG_PCI) += pci.o pci-quirks.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
endif
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index 349085e..d3c5291 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -1189,6 +1189,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->cannot_instantiate_with_device_add_yet = true;
k->realize = vfio_pci_igd_lpc_bridge_realize;
k->class_id = PCI_CLASS_BRIDGE_ISA;
}
@@ -1378,6 +1380,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/Makefile.objs b/hw/virtio/Makefile.objs
index 765d363..a5a0936 100644
--- a/hw/virtio/Makefile.objs
+++ b/hw/virtio/Makefile.objs
@@ -7,8 +7,9 @@ common-obj-y += virtio-mmio.o
obj-y += virtio.o virtio-balloon.o
obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o
obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o
-obj-y += virtio-crypto.o
-obj-$(CONFIG_VIRTIO_PCI) += virtio-crypto-pci.o
+# Disabled in Red Hat Enterprise Linux
+#obj-y += virtio-crypto.o
+#obj-$(CONFIG_VIRTIO_PCI) += virtio-crypto-pci.o
endif
common-obj-$(call lnot,$(CONFIG_LINUX)) += vhost-stub.o
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index 5807aa8..4d0ec31 100644
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -448,6 +448,7 @@ static void virtio_mmio_class_init(ObjectClass *klass, void *data)
dc->realize = virtio_mmio_realizefn;
dc->reset = virtio_mmio_reset;
+ dc->cannot_instantiate_with_device_add_yet = true; /* RH state preserve */
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
dc->props = virtio_mmio_properties;
}
diff --git a/qemu-options.hx b/qemu-options.hx
index 99af8ed..d5a002d 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1545,11 +1545,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 224f04b..17e759d 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -37,3 +37,4 @@ stub-obj-y += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o
stub-obj-y += pc_madt_cpu_entry.o
stub-obj-y += vmgenid.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..5dacaa5
--- /dev/null
+++ b/stubs/ide-isa.c
@@ -0,0 +1,13 @@
+#include <qemu/osdep.h>
+#include <hw/ide.h>
+#include <stdlib.h>
+
+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 04b062c..9e2800d 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -1716,7 +1716,8 @@ static void arm_cpu_register_types(void)
type_register_static(&arm_cpu_type_info);
while (info->name) {
- cpu_register(info);
+ if (!strcmp(info->name, "cortex-a15"))
+ cpu_register(info);
info++;
}
}
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index c3b06d3..dec6c78 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -776,11 +776,8 @@ static X86CPUDefinition builtin_x86_defs[] = {
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_FXSR |
- CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PAT | CPUID_EXT2_CMOV |
- CPUID_EXT2_PGE | CPUID_EXT2_SYSCALL | CPUID_EXT2_APIC |
- CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR | CPUID_EXT2_TSC |
- CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
+ .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,
@@ -1018,11 +1015,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
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_FXSR |
- CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PAT | CPUID_EXT2_CMOV |
- CPUID_EXT2_PGE | CPUID_EXT2_SYSCALL | CPUID_EXT2_APIC |
- CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR | CPUID_EXT2_TSC |
- CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
+ .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,
@@ -4021,11 +4014,13 @@ static Property x86_cpu_properties[] = {
DEFINE_PROP_BOOL("hv-vapic", X86CPU, hyperv_vapic, false),
DEFINE_PROP_BOOL("hv-time", X86CPU, hyperv_time, false),
DEFINE_PROP_BOOL("hv-crash", X86CPU, hyperv_crash, false),
+#if 0 /* Disabled for Red Hat Enterprise Linux */
DEFINE_PROP_BOOL("hv-reset", X86CPU, hyperv_reset, false),
DEFINE_PROP_BOOL("hv-vpindex", X86CPU, hyperv_vpindex, false),
DEFINE_PROP_BOOL("hv-runtime", X86CPU, hyperv_runtime, false),
DEFINE_PROP_BOOL("hv-synic", X86CPU, hyperv_synic, false),
DEFINE_PROP_BOOL("hv-stimer", X86CPU, hyperv_stimer, false),
+#endif
DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true),
DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false),
DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true),
diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
index 4d3e635..7861276 100644
--- a/target/ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c
@@ -70,6 +70,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,
@@ -1101,8 +1102,10 @@
"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 */
#if defined(TODO)
POWERPC_DEF("620", CPU_POWERPC_620, 620,
"PowerPC 620")
@@ -1131,6 +1134,7 @@
POWERPC_DEF("POWER6", CPU_POWERPC_POWER6, POWER6,
"POWER6")
#endif
+#endif
POWERPC_DEF("POWER7_v2.3", CPU_POWERPC_POWER7_v23, POWER7,
"POWER7 v2.3")
POWERPC_DEF("POWER7+_v2.1", CPU_POWERPC_POWER7P_v21, POWER7,
@@ -1141,6 +1145,7 @@
"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")
@@ -1161,6 +1166,7 @@
"PowerPC 970MP v1.0")
POWERPC_DEF("970mp_v1.1", CPU_POWERPC_970MP_v11, 970,
"PowerPC 970MP v1.1")
+#endif
#if defined(TODO)
POWERPC_DEF("Cell", CPU_POWERPC_CELL, 970,
"PowerPC Cell")
@@ -1226,6 +1232,7 @@
/* 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" },
@@ -1381,22 +1388,27 @@ 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 */
{ "POWER3", "630" },
{ "POWER3+", "631" },
{ "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" },
+#if 0 /* Disabled for Red Hat Enterprise Linux */
{ "POWER9", "POWER9_v1.0" },
{ "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" },
@@ -1404,5 +1416,6 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
{ "ppc32", "604" },
{ "ppc", "ppc32" },
{ "default", "ppc" },
+#endif
{ NULL, NULL }
};
diff --git a/tests/Makefile.include b/tests/Makefile.include
index f3de81f..0b94a20 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -142,8 +142,6 @@ check-qtest-generic-y += tests/device-introspect-test$(EXESUF)
gcov-files-generic-y = qdev-monitor.c qmp.c
gcov-files-ipack-y += hw/ipack/ipack.c
-check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
-gcov-files-ipack-y += hw/char/ipoctal232.c
check-qtest-virtioserial-y += tests/virtio-console-test$(EXESUF)
gcov-files-virtioserial-y += hw/char/virtio-console.c
@@ -175,23 +173,10 @@ check-qtest-pci-y += tests/e1000e-test$(EXESUF)
gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c
check-qtest-pci-y += tests/rtl8139-test$(EXESUF)
gcov-files-pci-y += hw/net/rtl8139.c
-check-qtest-pci-y += tests/pcnet-test$(EXESUF)
-gcov-files-pci-y += hw/net/pcnet.c
-gcov-files-pci-y += hw/net/pcnet-pci.c
-check-qtest-pci-y += tests/eepro100-test$(EXESUF)
-gcov-files-pci-y += hw/net/eepro100.c
-check-qtest-pci-y += tests/ne2000-test$(EXESUF)
-gcov-files-pci-y += hw/net/ne2000.c
-check-qtest-pci-y += tests/nvme-test$(EXESUF)
-gcov-files-pci-y += hw/block/nvme.c
check-qtest-pci-y += tests/ac97-test$(EXESUF)
gcov-files-pci-y += hw/audio/ac97.c
-check-qtest-pci-y += tests/es1370-test$(EXESUF)
-gcov-files-pci-y += hw/audio/es1370.c
check-qtest-pci-y += $(check-qtest-virtio-y)
gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
-check-qtest-pci-y += tests/tpci200-test$(EXESUF)
-gcov-files-pci-y += hw/ipack/tpci200.c
check-qtest-pci-y += $(check-qtest-ipack-y)
gcov-files-pci-y += $(gcov-files-ipack-y)
check-qtest-pci-y += tests/display-vga-test$(EXESUF)
@@ -218,8 +203,6 @@ check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
check-qtest-i386-y += tests/boot-serial-test$(EXESUF)
check-qtest-i386-y += tests/pxe-test$(EXESUF)
check-qtest-i386-y += tests/rtc-test$(EXESUF)
-check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF)
-check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
check-qtest-i386-y += tests/drive_del-test$(EXESUF)
@@ -228,8 +211,6 @@ check-qtest-i386-y += tests/tco-test$(EXESUF)
gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
check-qtest-i386-y += $(check-qtest-pci-y)
gcov-files-i386-y += $(gcov-files-pci-y)
-check-qtest-i386-y += tests/vmxnet3-test$(EXESUF)
-gcov-files-i386-y += hw/net/vmxnet3.c
gcov-files-i386-y += hw/net/net_rx_pkt.c
gcov-files-i386-y += hw/net/net_tx_pkt.c
check-qtest-i386-y += tests/pvpanic-test$(EXESUF)
@@ -238,8 +219,6 @@ check-qtest-i386-y += tests/i82801b11-test$(EXESUF)
gcov-files-i386-y += hw/pci-bridge/i82801b11.c
check-qtest-i386-y += tests/ioh3420-test$(EXESUF)
gcov-files-i386-y += hw/pci-bridge/ioh3420.c
-check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
-gcov-files-i386-y += hw/usb/hcd-ohci.c
check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)
gcov-files-i386-y += hw/usb/hcd-uhci.c
check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
@@ -274,7 +253,7 @@ check-qtest-mips64el-y = tests/endianness-test$(EXESUF)
check-qtest-ppc-y = tests/endianness-test$(EXESUF)
check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
-check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
+#check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
check-qtest-ppc-y += tests/boot-serial-test$(EXESUF)
@@ -282,31 +261,27 @@ check-qtest-ppc64-y = tests/spapr-phb-test$(EXESUF)
gcov-files-ppc64-y = ppc64-softmmu/hw/ppc/spapr_pci.c
check-qtest-ppc64-y += tests/endianness-test$(EXESUF)
check-qtest-ppc64-y += tests/boot-order-test$(EXESUF)
-check-qtest-ppc64-y += tests/prom-env-test$(EXESUF)
-check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
+#check-qtest-ppc64-y += tests/prom-env-test$(EXESUF)
+#check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
check-qtest-ppc64-y += tests/drive_del-test$(EXESUF)
check-qtest-ppc64-y += tests/postcopy-test$(EXESUF)
check-qtest-ppc64-y += tests/boot-serial-test$(EXESUF)
check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
check-qtest-ppc64-y += tests/pxe-test$(EXESUF)
-check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
+#check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
gcov-files-ppc64-y += hw/usb/hcd-ohci.c
-check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
+#check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
gcov-files-ppc64-y += hw/usb/hcd-uhci.c
check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
gcov-files-ppc64-y += hw/usb/hcd-xhci.c
check-qtest-ppc64-y += $(check-qtest-virtio-y)
-check-qtest-ppc64-y += tests/test-netfilter$(EXESUF)
-check-qtest-ppc64-y += tests/test-filter-mirror$(EXESUF)
-check-qtest-ppc64-y += tests/test-filter-redirector$(EXESUF)
check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
-check-qtest-ppc64-$(CONFIG_EVENTFD) += tests/ivshmem-test$(EXESUF)
check-qtest-sh4-y = tests/endianness-test$(EXESUF)
check-qtest-sh4eb-y = tests/endianness-test$(EXESUF)
-check-qtest-sparc-y = tests/prom-env-test$(EXESUF)
+#check-qtest-sparc-y = tests/prom-env-test$(EXESUF)
#check-qtest-sparc-y += tests/m48t59-test$(EXESUF)
#gcov-files-sparc-y = hw/timer/m48t59.c
@@ -679,13 +654,11 @@ tests/rtc-test$(EXESUF): tests/rtc-test.o
tests/m48t59-test$(EXESUF): tests/m48t59-test.o
tests/endianness-test$(EXESUF): tests/endianness-test.o
tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y)
-tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)
+#tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)
tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y)
tests/fdc-test$(EXESUF): tests/fdc-test.o
tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)
tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y)
-tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o
-tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y)
tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y)
@@ -701,11 +674,8 @@ tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
tests/e1000-test$(EXESUF): tests/e1000-test.o
tests/e1000e-test$(EXESUF): tests/e1000e-test.o $(libqos-pc-obj-y)
tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)
-tests/pcnet-test$(EXESUF): tests/pcnet-test.o
-tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
+#tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
tests/eepro100-test$(EXESUF): tests/eepro100-test.o
-tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
-tests/ne2000-test$(EXESUF): tests/ne2000-test.o
tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o
tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y)
tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o
@@ -716,20 +686,16 @@ tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o $(libqos-virtio-obj-y)
tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o $(libqos-virtio-obj-y)
tests/virtio-serial-test$(EXESUF): tests/virtio-serial-test.o
tests/virtio-console-test$(EXESUF): tests/virtio-console-test.o
-tests/tpci200-test$(EXESUF): tests/tpci200-test.o
tests/display-vga-test$(EXESUF): tests/display-vga-test.o
tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o
tests/qom-test$(EXESUF): tests/qom-test.o
tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-pc-obj-y)
tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y)
-tests/nvme-test$(EXESUF): tests/nvme-test.o
tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o
tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o
tests/ac97-test$(EXESUF): tests/ac97-test.o
-tests/es1370-test$(EXESUF): tests/es1370-test.o
tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o
tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o
-tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 88dbf97..d361b6f 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -728,6 +728,7 @@ static void test_acpi_q35_tcg_cphp(void)
free_test_data(&data);
}
+#if 0 /* Disabled in Red Hat Enterprise Linux */
static uint8_t ipmi_required_struct_types[] = {
0, 1, 3, 4, 16, 17, 19, 32, 38, 127
};
@@ -764,6 +765,7 @@ static void test_acpi_piix4_tcg_ipmi(void)
&data);
free_test_data(&data);
}
+#endif
static void test_acpi_q35_tcg_memhp(void)
{
@@ -803,8 +805,10 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
qtest_add_func("acpi/q35", test_acpi_q35_tcg);
qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
+#if 0 /* Disabled in Red Hat Enterprise Linux */
qtest_add_func("acpi/piix4/ipmi", test_acpi_piix4_tcg_ipmi);
qtest_add_func("acpi/q35/ipmi", test_acpi_q35_tcg_ipmi);
+#endif
qtest_add_func("acpi/piix4/cpuhp", test_acpi_piix4_tcg_cphp);
qtest_add_func("acpi/q35/cpuhp", test_acpi_q35_tcg_cphp);
qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_tcg_memhp);
diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
index fc1e794..e29c528 100644
--- a/tests/boot-order-test.c
+++ b/tests/boot-order-test.c
@@ -109,6 +109,7 @@ static void test_pc_boot_order(void)
test_boot_orders(NULL, read_boot_order_pc, test_cases_pc);
}
+#if 0 /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
static uint8_t read_m48t59(uint64_t addr, uint16_t reg)
{
writeb(addr, reg & 0xff);
@@ -139,6 +140,7 @@ static uint64_t read_boot_order_pmac(void)
return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE);
}
+#endif /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
static const boot_order_test test_cases_fw_cfg[] = {
{ "", 'c', 'c' },
@@ -148,6 +150,7 @@ static const boot_order_test test_cases_fw_cfg[] = {
{}
};
+#if 0 /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
static void test_pmac_oldworld_boot_order(void)
{
test_boot_orders("g3beige", read_boot_order_pmac, test_cases_fw_cfg);
@@ -156,7 +159,9 @@ static void test_pmac_oldworld_boot_order(void)
static void test_pmac_newworld_boot_order(void)
{
test_boot_orders("mac99", read_boot_order_pmac, test_cases_fw_cfg);
+
}
+#endif /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
static uint64_t read_boot_order_sun4m(void)
{
@@ -191,11 +196,13 @@ int main(int argc, char *argv[])
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
qtest_add_func("boot-order/pc", test_pc_boot_order);
} else if (strcmp(arch, "ppc") == 0 || strcmp(arch, "ppc64") == 0) {
+#if 0 /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
qtest_add_func("boot-order/prep", test_prep_boot_order);
qtest_add_func("boot-order/pmac_oldworld",
test_pmac_oldworld_boot_order);
qtest_add_func("boot-order/pmac_newworld",
test_pmac_newworld_boot_order);
+#endif /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
} else if (strcmp(arch, "sparc") == 0) {
qtest_add_func("boot-order/sun4m", test_sun4m_boot_order);
} else if (strcmp(arch, "sparc64") == 0) {
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
index 11f48b0..4557ce9 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -26,14 +26,14 @@ static testdef_t tests[] = {
{ "alpha", "clipper", "", "PCI:" },
{ "ppc", "ppce500", "", "U-Boot" },
{ "ppc", "prep", "", "Open Hack'Ware BIOS" },
- { "ppc64", "ppce500", "", "U-Boot" },
- { "ppc64", "prep", "", "Open Hack'Ware BIOS" },
+/* { "ppc64", "ppce500", "", "U-Boot" },
+ { "ppc64", "prep", "", "Open Hack'Ware BIOS" }, */
{ "ppc64", "pseries", "", "Open Firmware" },
- { "ppc64", "powernv", "-cpu POWER8", "SkiBoot" },
+/* { "ppc64", "powernv", "-cpu POWER8", "SkiBoot" }, */
{ "i386", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
{ "i386", "pc", "-device sga", "SGABIOS" },
{ "i386", "q35", "-device sga", "SGABIOS" },
- { "x86_64", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
+ { "x86_64", "pc", "-cpu qemu32 -device sga", "SGABIOS" },
{ "x86_64", "q35", "-device sga", "SGABIOS" },
{ "s390x", "s390-ccw-virtio",
"-nodefaults -device sclpconsole,chardev=serial0", "virtio device" },
diff --git a/tests/e1000-test.c b/tests/e1000-test.c
index 0c5fcdc..0504d33 100644
--- a/tests/e1000-test.c
+++ b/tests/e1000-test.c
@@ -29,8 +29,10 @@ static void test_device(gconstpointer data)
static const char *models[] = {
"e1000",
"e1000-82540em",
+#if 0 /* Disabled in Red Hat Enterprise Linux 7 */
"e1000-82544gc",
"e1000-82545em",
+#endif
};
int main(int argc, char **argv)
diff --git a/tests/endianness-test.c b/tests/endianness-test.c
index ed0bf52..58af690 100644
--- a/tests/endianness-test.c
+++ b/tests/endianness-test.c
@@ -34,6 +34,7 @@ static const TestCase test_cases[] = {
{ "mips64", "mips", 0x14000000, .bswap = true },
{ "mips64", "malta", 0x10000000, .bswap = true },
{ "mips64el", "fulong2e", 0x1fd00000 },
+#if 0 /* Disabled for RHEL, since ISA is not enabled */
{ "ppc", "g3beige", 0xfe000000, .bswap = true, .superio = "i82378" },
{ "ppc", "prep", 0x80000000, .bswap = true },
{ "ppc", "bamboo", 0xe8000000, .bswap = true, .superio = "i82378" },
@@ -41,6 +42,7 @@ static const TestCase test_cases[] = {
{ "ppc64", "pseries", (1ULL << 45), .bswap = true, .superio = "i82378" },
{ "ppc64", "pseries-2.7", 0x10080000000ULL,
.bswap = true, .superio = "i82378" },
+#endif /* Disabled for RHEL, since ISA is not enabled */
{ "sh4", "r2d", 0xfe240000, .superio = "i82378" },
{ "sh4eb", "r2d", 0xfe240000, .bswap = true, .superio = "i82378" },
{ "sparc64", "sun4u", 0x1fe02000000LL, .bswap = true },
diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c
index 3776342..6aae100 100644
--- a/tests/ivshmem-test.c
+++ b/tests/ivshmem-test.c
@@ -256,6 +256,7 @@ static void test_ivshmem_pair(void)
g_free(data);
}
+#if 0 /* Disabled for Red Hat Enterprise Linux: */
typedef struct ServerThread {
GThread *thread;
IvshmemServer *server;
@@ -413,9 +414,11 @@ static void test_ivshmem_server_irq(void)
{
test_ivshmem_server(false);
}
+#endif
#define PCI_SLOT_HP 0x06
+#if 0 /* Test uses legacy ivshmem, which is disabled for Red Hat Enterprise Linux: */
static void test_ivshmem_hotplug(void)
{
const char *arch = qtest_get_arch();
@@ -433,6 +436,7 @@ static void test_ivshmem_hotplug(void)
qtest_end();
g_free(opts);
}
+#endif
static void test_ivshmem_memdev(void)
{
@@ -500,7 +504,7 @@ static gchar *mktempshm(int size, int *fd)
int main(int argc, char **argv)
{
int ret, fd;
- const char *arch = qtest_get_arch();
+/* const char *arch = qtest_get_arch(); */
gchar dir[] = "/tmp/ivshmem-test.XXXXXX";
#if !GLIB_CHECK_VERSION(2, 31, 0)
@@ -527,14 +531,18 @@ int main(int argc, char **argv)
tmpserver = g_strconcat(tmpdir, "/server", NULL);
qtest_add_func("/ivshmem/single", test_ivshmem_single);
+#if 0 /* Test uses legacy ivshmem, which is disabled for Red Hat Enterprise Linux: */
qtest_add_func("/ivshmem/hotplug", test_ivshmem_hotplug);
+#endif
qtest_add_func("/ivshmem/memdev", test_ivshmem_memdev);
if (g_test_slow()) {
qtest_add_func("/ivshmem/pair", test_ivshmem_pair);
+#if 0 /* Disabled for Red Hat Enterprise Linux: */
if (strcmp(arch, "ppc64") != 0) {
qtest_add_func("/ivshmem/server-msi", test_ivshmem_server_msi);
qtest_add_func("/ivshmem/server-irq", test_ivshmem_server_irq);
}
+#endif
}
ret = g_test_run();
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 630cb7a..4377199 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -144,9 +144,9 @@ case "$QEMU_DEFAULT_MACHINE" in
pc)
run_qemu -drive if=floppy
run_qemu -drive if=ide,media=cdrom
- run_qemu -drive if=scsi,media=cdrom
+# run_qemu -drive if=scsi,media=cdrom
run_qemu -drive if=ide
- run_qemu -drive if=scsi
+# run_qemu -drive if=scsi
;;
*)
;;
@@ -157,11 +157,11 @@ run_qemu -drive if=virtio
case "$QEMU_DEFAULT_MACHINE" in
pc)
run_qemu -drive if=none,id=disk -device ide-cd,drive=disk
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
run_qemu -drive if=none,id=disk -device ide-drive,drive=disk
run_qemu -drive if=none,id=disk -device ide-hd,drive=disk
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
;;
*)
;;
@@ -175,9 +175,9 @@ case "$QEMU_DEFAULT_MACHINE" in
pc)
run_qemu -drive file="$TEST_IMG",if=floppy,readonly=on
run_qemu -drive file="$TEST_IMG",if=ide,media=cdrom,readonly=on
- run_qemu -drive file="$TEST_IMG",if=scsi,media=cdrom,readonly=on
+# run_qemu -drive file="$TEST_IMG",if=scsi,media=cdrom,readonly=on
run_qemu -drive file="$TEST_IMG",if=ide,readonly=on
- run_qemu -drive file="$TEST_IMG",if=scsi,readonly=on
+# run_qemu -drive file="$TEST_IMG",if=scsi,readonly=on
;;
*)
;;
@@ -188,11 +188,11 @@ run_qemu -drive file="$TEST_IMG",if=virtio,readonly=on
case "$QEMU_DEFAULT_MACHINE" in
pc)
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-cd,drive=disk
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-drive,drive=disk
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-hd,drive=disk
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
;;
*)
;;
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 43142dd..5618034 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -77,7 +77,7 @@
068 rw auto quick
069 rw auto quick
070 rw auto quick
-071 rw auto quick
+# 071 rw auto quick -- requires whitelisted blkverify
072 rw auto quick
073 rw auto quick
074 rw auto quick
@@ -105,7 +105,7 @@
096 rw auto quick
097 rw auto backing
098 rw auto backing quick
-099 rw auto quick
+# 099 rw auto quick -- requires whitelisted blkverify
# 100 was removed, do not reuse
101 rw auto quick
102 rw auto quick
diff --git a/tests/qom-test.c b/tests/qom-test.c
index d48f890..ba999cb 100644
--- a/tests/qom-test.c
+++ b/tests/qom-test.c
@@ -15,7 +15,9 @@
#include "qapi/qmp/types.h"
static const char *blacklist_x86[] = {
- "xenfv", "xenpv", NULL
+ "xenfv", "xenpv",
+ "rhel6.6.0", "rhel6.5.0", "rhel6.4.0", "rhel6.3.0",
+ "rhel6.2.0", "rhel6.1.0", "rhel6.0.0", NULL
};
static const struct {
diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c
index 79a2e69..06fa305 100644
--- a/tests/test-x86-cpuid-compat.c
+++ b/tests/test-x86-cpuid-compat.c
@@ -216,6 +216,7 @@ int main(int argc, char **argv)
"-cpu 486,xlevel2=0xC0000002,+xstore",
"xlevel2", 0xC0000002);
+#if 0 /* Disabled in Red Hat Enterprise Linux */
/* Check compatibility of old machine-types that didn't
* auto-increase level/xlevel/xlevel2: */
@@ -228,6 +229,6 @@ int main(int argc, char **argv)
add_cpuid_test("x86/cpuid/auto-xlevel2/pc-2.7",
"-machine pc-i440fx-2.7 -cpu 486,+xstore",
"xlevel2", 0);
-
+#endif
return g_test_run();
}
diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c
index 22513e9..a017ba3 100644
--- a/tests/usb-hcd-xhci-test.c
+++ b/tests/usb-hcd-xhci-test.c
@@ -21,6 +21,7 @@ static void test_xhci_hotplug(void)
usb_test_hotplug("xhci", 1, NULL);
}
+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */
static void test_usb_uas_hotplug(void)
{
QDict *response;
@@ -77,6 +78,7 @@ static void test_usb_uas_hotplug(void)
g_assert(!strcmp(qdict_get_str(response, "event"), "DEVICE_DELETED"));
QDECREF(response);
}
+#endif
int main(int argc, char **argv)
{
@@ -86,8 +88,9 @@ int main(int argc, char **argv)
qtest_add_func("/xhci/pci/init", test_xhci_init);
qtest_add_func("/xhci/pci/hotplug", test_xhci_hotplug);
+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */
qtest_add_func("/xhci/pci/hotplug/usb-uas", test_usb_uas_hotplug);
-
+#endif
qtest_start("-device nec-usb-xhci,id=xhci"
" -drive id=drive0,if=none,file=/dev/null,format=raw");
ret = g_test_run();
diff --git a/tests/virtio-scsi-test.c b/tests/virtio-scsi-test.c
index 0eabd56..c01fa49 100644
--- a/tests/virtio-scsi-test.c
+++ b/tests/virtio-scsi-test.c
@@ -54,6 +54,7 @@ static void qvirtio_scsi_stop(QOSState *qs)
{
qtest_shutdown(qs);
}
+#if 0
static void qvirtio_scsi_pci_free(QVirtIOSCSI *vs)
{
@@ -67,7 +68,6 @@ static void qvirtio_scsi_pci_free(QVirtIOSCSI *vs)
qvirtio_scsi_stop(vs->qs);
g_free(vs);
}
-
static uint64_t qvirtio_scsi_alloc(QVirtIOSCSI *vs, size_t alloc_size,
const void *data)
{
@@ -80,7 +80,6 @@ static uint64_t qvirtio_scsi_alloc(QVirtIOSCSI *vs, size_t alloc_size,
return addr;
}
-
static uint8_t virtio_scsi_do_command(QVirtIOSCSI *vs, const uint8_t *cdb,
const uint8_t *data_in,
size_t data_in_len,
@@ -181,6 +180,7 @@ static QVirtIOSCSI *qvirtio_scsi_pci_init(int slot)
return vs;
}
+#endif
/* Tests only initialization so far. TODO: Replace with functional tests */
static void pci_nop(void)
{
@@ -220,6 +220,7 @@ static void hotplug(void)
qvirtio_scsi_stop(qs);
}
+#if 0
/* Test WRITE SAME with the lba not aligned */
static void test_unaligned_write_same(void)
{
@@ -243,14 +244,16 @@ static void test_unaligned_write_same(void)
qvirtio_scsi_pci_free(vs);
}
-
+#endif
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
qtest_add_func("/virtio/scsi/pci/nop", pci_nop);
qtest_add_func("/virtio/scsi/pci/hotplug", hotplug);
+#if 0
qtest_add_func("/virtio/scsi/pci/scsi-disk/unaligned-write-same",
test_unaligned_write_same);
+#endif
return g_test_run();
}
diff --git a/vl.c b/vl.c
index 0b4ed52..1f9a692 100644
--- a/vl.c
+++ b/vl.c
@@ -166,7 +166,7 @@ int max_cpus = 1;
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