|
 |
357786 |
From 9746c4059558e94c983df315f61203f766ceb500 Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
Date: Mon, 11 Jan 2016 11:53:33 +0100
|
|
|
9bac43 |
Subject: Enable/disable devices for RHEL 7
|
|
|
9bac43 |
|
|
|
9bac43 |
This commit adds all changes related to changes in supported devices
|
|
|
9bac43 |
up to qemu-kvm-rhev-2.1.2-16.el7.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
|
|
|
357786 |
Rebase notes (2.12.0):
|
|
|
357786 |
- Disable AMD_IOMMU
|
|
|
357786 |
- New handling of VHOST_USER_* device disabling
|
|
|
357786 |
- Use cpu_type instead of cpu_model
|
|
|
357786 |
- Disabled CONFIG_P4XXX for power64
|
|
|
357786 |
- Disabled sam460ex board tests
|
|
|
357786 |
|
|
|
357786 |
Rebase notes (2.11.0):
|
|
|
357786 |
- Switched order with machine type commit
|
|
|
357786 |
- Removed CONFIG_STELLARIS from aarch64
|
|
|
357786 |
- Blacklist isapc for qom and hmp tests
|
|
|
357786 |
|
|
|
9bac43 |
Rebase notes (2.10.0):
|
|
|
9bac43 |
- replace cannot_instantiate_with_device_add_yet with user_creatable (upstream e90f2a)
|
|
|
9bac43 |
- Comment out default configs instead of removing the options
|
|
|
9bac43 |
- Reenable test_unaligned_write_same
|
|
|
9bac43 |
- Remove default-configs changes for 32bit architectures
|
|
|
9bac43 |
- Removed unnecessary usage of user_creatable
|
|
|
9bac43 |
- Documented arm cpu changes
|
|
|
9bac43 |
|
|
|
9bac43 |
Rebase notes (2.9.0):
|
|
|
9bac43 |
- enabled CONFIG_ARM_V7M for aarch64
|
|
|
9bac43 |
- need to fix cpu mask
|
|
|
9bac43 |
- disabled some irrelevant ppc64 tests
|
|
|
9bac43 |
- Adding pxe-e1000e.rom to Inital redhat commit
|
|
|
9bac43 |
- Context changed in vfio_probe_igd_bar4_quirk (rc3)
|
|
|
9bac43 |
- Remove fdc test
|
|
|
9bac43 |
- Enabled null-co driver
|
|
|
9bac43 |
- Disabled megasas and bios-tables test
|
|
|
9bac43 |
- Disabled netfilter tests for ppc64
|
|
|
9bac43 |
- Disabled ivshmem test for ppc64
|
|
|
9bac43 |
- Disabled numa test for aarhc64
|
|
|
9bac43 |
- Add CONFIG_USB_XHCI_NEC option for ppc64
|
|
|
9bac43 |
- Enable vhost-user-scsi for ppc64 and aarch64
|
|
|
9bac43 |
- Disable ipmi_bt, ipmi_local, impi_extern for ppc64
|
|
|
9bac43 |
|
|
|
9bac43 |
Rebase notes (2.8.0):
|
|
|
9bac43 |
- Removed CONFIG_PIIX_PCI (upstream)
|
|
|
9bac43 |
- Disabled POWERNV
|
|
|
9bac43 |
- Disabled additional occurencies of prom-env-test
|
|
|
9bac43 |
- Disabled additional occurencies of usb-hcd-ohci-test and usb-hcd-uhci-test
|
|
|
9bac43 |
- Disabled unsupported machine types in boot-serieal-test
|
|
|
9bac43 |
- Disabled 2.7 machine type compatibility test in test-x86-cpuid-compat
|
|
|
9bac43 |
- Disabled pnv-xscom-test
|
|
|
9bac43 |
- Disabled RHEl 6 machine types for qom-test (failing acpi setting)
|
|
|
9bac43 |
- Added diffutils BuildRequires and diff usage for make check
|
|
|
9bac43 |
|
|
|
9bac43 |
Rebase notes (2.6.0):
|
|
|
9bac43 |
- disabled prom-env-test
|
|
|
9bac43 |
|
|
|
9bac43 |
Rebase notes (2.4.0):
|
|
|
9bac43 |
- fixed types
|
|
|
9bac43 |
- include CONFIG_PLATFORM_BUS for aarch64
|
|
|
9bac43 |
- disable failing virtio-scsi-test
|
|
|
9bac43 |
|
|
|
9bac43 |
Rebase notes (2.3.0):
|
|
|
9bac43 |
- Added USB=y in 2.3-rc2 (used instead of downstream version fora aarch64)
|
|
|
9bac43 |
|
|
|
357786 |
Merged patches (2.11.):
|
|
|
357786 |
- e6c4563d68 hw: Remove the redundant user_creatable = false from SYS_BUS_DEVICEs
|
|
|
357786 |
- 35474b23b1 hw/pci-host/q35: Remove redundant downstream user_creatable = false
|
|
|
357786 |
- 374294de46 hw/dma/i8257: Remove redundant downstream user_creatable = false
|
|
|
357786 |
- 17abc4f5bd RHEL: Disable vfio-ccw and x-terminal270 devices
|
|
|
357786 |
- b303e792c3 Disable vhost-user-scsi and vhost-user-scsi-pci
|
|
|
357786 |
- 28f294c023 Disable sm501 and sysbus-sm501 devices
|
|
|
357786 |
- d5959fcefc s390x/cpumodel: Disable unsupported CPU models
|
|
|
357786 |
|
|
|
9bac43 |
Merged patches (2.10.0):
|
|
|
9bac43 |
- e9b413e Add PCIe bridge devices for AArch64
|
|
|
9bac43 |
- a522114 s390x/virtio-ccw: Disable crypto device in downstream RHEL builds
|
|
|
9bac43 |
- 15dbf98 Disable unimplemented device
|
|
|
9bac43 |
- 5c0ea49 Disable serial-isa for ppc64
|
|
|
9bac43 |
- 728e7e8 Disable rs6000-mc device
|
|
|
9bac43 |
- 2a11896 ppc64le: Remove isabus-bridge device
|
|
|
9bac43 |
- 5c4df94 Reenable Educational device
|
|
|
9bac43 |
- a936463 aarch64: Enable usb-xhci
|
|
|
9bac43 |
- 984f5cd Enable USB_CONFIG for aarch64
|
|
|
9bac43 |
- f13b783 AArch64: Add pci-testdev
|
|
|
9bac43 |
- 81867af Disable virtio-pci for s390x builds
|
|
|
9bac43 |
- bf5f636 target/ppc: Show POWER9 in -cpu help
|
|
|
9bac43 |
|
|
|
9bac43 |
Merged patches (2.9.0):
|
|
|
9bac43 |
- 9320fc1 Fix unuseds/Fedora build
|
|
|
9bac43 |
- cb16934 config: Remove EHCI from ppc64 builds
|
|
|
9bac43 |
- 626fe4d Disable qemu,register device
|
|
|
9bac43 |
- 783a0b2 Disable vfio-pci-igd-lpc-bridge device
|
|
|
9bac43 |
- bf7c127 Disable new virtio crypto devices
|
|
|
9bac43 |
- a4d3c4e Disable amd iommu devices
|
|
|
9bac43 |
- 5396ebc Disable loader device
|
|
|
9bac43 |
- 1957779 Disable or-irq device
|
|
|
9bac43 |
- 25ee621 Hide new floppy device
|
|
|
9bac43 |
- 2bd29ed Disable devices for for AArch64 QEMU
|
|
|
9bac43 |
|
|
|
9bac43 |
Merged patches (2.7.0):
|
|
|
9bac43 |
- e2944a5 RHEL: Disable unsupported PowerPC CPU models
|
|
|
9bac43 |
- have to add additional "if 0" sections to hw/ppc/spapr_cpu_core.c
|
|
|
9bac43 |
- 81b2836 Remove unsupported VFIO devices from QEMU
|
|
|
9bac43 |
- 1248029 Disable spapr-rng
|
|
|
9bac43 |
- 351e1fb Disable Windows enlightnementas
|
|
|
9bac43 |
- 5760290 Disable mptsas1068 device
|
|
|
9bac43 |
- 0b74460 Disable sd-card
|
|
|
9bac43 |
- 2eaf71c Disable rocker device
|
|
|
9bac43 |
- e0ed699 Disable new ipmi devices
|
|
|
9bac43 |
- disable ipmi tests in bios-tables-test
|
|
|
9bac43 |
- 30e3bee Disable hyperv-testdev
|
|
|
9bac43 |
- 8a9aadf Disable allwiner_ahci device
|
|
|
9bac43 |
- a41119d Disable igd-passthrough-i440FX
|
|
|
9bac43 |
- e305bb4 Disable vfio-platform device
|
|
|
9bac43 |
- a127042 rhel: Revert unwanted inconsequential changes to ivshmem
|
|
|
9bac43 |
- ce1419c rhel: Disable ivshmem-plain migration, ivshmem-doorbell, ivshmem
|
|
|
9bac43 |
- 3f9349b q35: disable s3/s4 by default
|
|
|
9bac43 |
- 2158ca1 i8257: Set no-user flag
|
|
|
9bac43 |
- b2a3bb9 e1000e: add boot rom
|
|
|
9bac43 |
- have to add pxe-e1000e.rom to source files
|
|
|
9bac43 |
|
|
|
9bac43 |
Merged patches (2.6.0):
|
|
|
9bac43 |
- ce3206a qemu-iotests: Fix broken test cases
|
|
|
9bac43 |
- Reduced to disabling test 071 only
|
|
|
9bac43 |
- bb34585 qemu-iotests: Disable 099 (requires blkverify)
|
|
|
9bac43 |
- 81be408 build: reenable local builds to pass --enable-debug (downstream only)
|
|
|
9bac43 |
|
|
|
9bac43 |
Merged patches (2.4.0):
|
|
|
9bac43 |
- fa4fd10 AArch64: Enable ACPI
|
|
|
9bac43 |
- 1219d52 ivshmem: RHEL-only: remove unsupported code
|
|
|
9bac43 |
- 5f6d954 ivshmem: RHEL-only: explicitly remove dead code
|
|
|
9bac43 |
- b88bbf0 Revert "rhel: Drop "ivshmem" device"
|
|
|
9bac43 |
- 8f0aadf Split serial-isa into its own config option
|
|
|
9bac43 |
- 01bff0f rhel: Disable "info irq" and "info pic" for Power
|
|
|
9bac43 |
- b915077 RHEL: Disable remaining unsupported devices for ppc
|
|
|
9bac43 |
- 64cbdc5 Mark onboard devices as cannot_instantiate_with_device_add_yet
|
|
|
9bac43 |
- 4792566 Disable sdhci device
|
|
|
9bac43 |
- bda8169 Disable Educational device
|
|
|
9bac43 |
- a17a8fb rhel: Revert unwanted cannot_instantiate_with_device_add_yet changes
|
|
|
9bac43 |
- 91c76c5 Remove intel-iommu device
|
|
|
9bac43 |
- ec1615d Disable additional e1000 models
|
|
|
9bac43 |
|
|
|
357786 |
(cherry picked from commit 0e72e616b2d80e47c0eb6c5976276e9f8d920e92)
|
|
|
357786 |
|
|
|
357786 |
Conflicts:
|
|
|
357786 |
redhat/qemu-kvm.spec.template
|
|
|
357786 |
|
|
|
357786 |
Conflicts:
|
|
|
357786 |
default-configs/aarch64-softmmu.mak
|
|
|
357786 |
default-configs/pci.mak
|
|
|
357786 |
default-configs/ppc64-softmmu.mak
|
|
|
357786 |
default-configs/s390x-softmmu.mak
|
|
|
357786 |
hw/arm/Makefile.objs
|
|
|
357786 |
hw/core/Makefile.objs
|
|
|
357786 |
hw/i386/Makefile.objs
|
|
|
357786 |
hw/i386/pc.c
|
|
|
357786 |
hw/ppc/Makefile.objs
|
|
|
357786 |
stubs/Makefile.objs
|
|
|
357786 |
tests/Makefile.include
|
|
|
357786 |
tests/boot-serial-test.c
|
|
|
357786 |
tests/qemu-iotests/051
|
|
|
357786 |
|
|
|
357786 |
Conflicts:
|
|
|
357786 |
target/i386/cpu.c
|
|
|
357786 |
tests/boot-serial-test.c
|
|
|
357786 |
|
|
|
357786 |
(cherry picked from commit d62675886ef77b23a774523cb33cc3037b7f7a8b)
|
|
|
9bac43 |
---
|
|
|
357786 |
default-configs/aarch64-softmmu.mak | 35 ++++++++++++++----
|
|
|
357786 |
default-configs/pci.mak | 38 +++++++++----------
|
|
|
357786 |
default-configs/ppc64-softmmu.mak | 30 ++++++++++++---
|
|
|
357786 |
default-configs/s390x-softmmu.mak | 12 +++---
|
|
|
357786 |
default-configs/sound.mak | 8 ++--
|
|
|
357786 |
default-configs/usb.mak | 14 +++----
|
|
|
357786 |
default-configs/x86_64-softmmu.mak | 30 ++++++++-------
|
|
|
357786 |
hw/acpi/ich9.c | 4 +-
|
|
|
357786 |
hw/block/fdc.c | 1 +
|
|
|
357786 |
hw/char/serial-pci.c | 4 ++
|
|
|
357786 |
hw/core/Makefile.objs | 7 ++--
|
|
|
357786 |
hw/display/cirrus_vga.c | 2 +
|
|
|
357786 |
hw/i386/pc.c | 3 +-
|
|
|
357786 |
hw/ide/piix.c | 5 ++-
|
|
|
357786 |
hw/ide/via.c | 2 +
|
|
|
357786 |
hw/input/pckbd.c | 2 +
|
|
|
357786 |
hw/misc/Makefile.objs | 2 +-
|
|
|
357786 |
hw/misc/ivshmem.c | 11 ++++++
|
|
|
357786 |
hw/net/e1000.c | 2 +
|
|
|
357786 |
hw/net/e1000e.c | 2 +-
|
|
|
357786 |
hw/pci-host/piix.c | 4 ++
|
|
|
357786 |
hw/ppc/Makefile.objs | 2 +-
|
|
|
357786 |
hw/ppc/spapr.c | 3 +-
|
|
|
357786 |
hw/ppc/spapr_cpu_core.c | 2 +
|
|
|
357786 |
hw/s390x/virtio-ccw.c | 8 ++++
|
|
|
357786 |
hw/usb/ccid-card-emulated.c | 2 +
|
|
|
357786 |
hw/vfio/Makefile.objs | 3 --
|
|
|
357786 |
hw/vfio/pci-quirks.c | 5 +++
|
|
|
357786 |
hw/virtio/Makefile.objs | 5 ++-
|
|
|
357786 |
hw/virtio/virtio-pci.c | 8 ++--
|
|
|
357786 |
qemu-options.hx | 5 ---
|
|
|
357786 |
redhat/qemu-kvm.spec.template | 4 +-
|
|
|
357786 |
stubs/Makefile.objs | 1 +
|
|
|
357786 |
stubs/ide-isa.c | 13 +++++++
|
|
|
357786 |
target/arm/cpu.c | 4 +-
|
|
|
357786 |
target/i386/cpu.c | 37 +++++++++++++++----
|
|
|
357786 |
target/ppc/cpu-models.c | 17 ++++++++-
|
|
|
357786 |
target/s390x/cpu_models.c | 3 ++
|
|
|
357786 |
target/s390x/kvm.c | 8 ++++
|
|
|
357786 |
tests/Makefile.include | 73 +++++++++++--------------------------
|
|
|
357786 |
tests/bios-tables-test.c | 4 ++
|
|
|
357786 |
tests/boot-order-test.c | 7 ++++
|
|
|
357786 |
tests/boot-serial-test.c | 10 ++---
|
|
|
357786 |
tests/e1000-test.c | 2 +
|
|
|
357786 |
tests/endianness-test.c | 2 +
|
|
|
357786 |
tests/ivshmem-test.c | 10 ++++-
|
|
|
357786 |
tests/qemu-iotests/051 | 12 +++---
|
|
|
357786 |
tests/qemu-iotests/group | 4 +-
|
|
|
357786 |
tests/qom-test.c | 4 +-
|
|
|
357786 |
tests/test-hmp.c | 2 +-
|
|
|
357786 |
tests/test-x86-cpuid-compat.c | 2 +
|
|
|
357786 |
tests/usb-hcd-xhci-test.c | 5 ++-
|
|
|
357786 |
vl.c | 2 +-
|
|
|
357786 |
53 files changed, 318 insertions(+), 169 deletions(-)
|
|
|
9bac43 |
create mode 100644 stubs/ide-isa.c
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
|
|
|
357786 |
index 9ddccf8..001eb8e 100644
|
|
|
9bac43 |
--- a/default-configs/aarch64-softmmu.mak
|
|
|
9bac43 |
+++ b/default-configs/aarch64-softmmu.mak
|
|
|
357786 |
@@ -1,10 +1,29 @@
|
|
|
9bac43 |
# Default configuration for aarch64-softmmu
|
|
|
9bac43 |
|
|
|
9bac43 |
-# We support all the 32 bit boards so need all their config
|
|
|
9bac43 |
-include arm-softmmu.mak
|
|
|
9bac43 |
-
|
|
|
9bac43 |
-CONFIG_AUX=y
|
|
|
9bac43 |
-CONFIG_DDC=y
|
|
|
9bac43 |
-CONFIG_DPCD=y
|
|
|
9bac43 |
-CONFIG_XLNX_ZYNQMP=y
|
|
|
357786 |
-CONFIG_XLNX_ZYNQMP_ARM=y
|
|
|
9bac43 |
+# CONFIG_AUX=y
|
|
|
9bac43 |
+# CONFIG_DDC=y
|
|
|
9bac43 |
+# CONFIG_DPCD=y
|
|
|
9bac43 |
+# CONFIG_XLNX_ZYNQMP=y
|
|
|
357786 |
+# CONFIG_XLNX_ZYNQMP_ARM=y
|
|
|
9bac43 |
+CONFIG_PCI=y
|
|
|
9bac43 |
+CONFIG_PCI_TESTDEV=y
|
|
|
9bac43 |
+CONFIG_VIRTIO_PCI=y
|
|
|
9bac43 |
+CONFIG_VIRTIO=y
|
|
|
9bac43 |
+CONFIG_ARM_GIC=y
|
|
|
9bac43 |
+CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
|
|
|
9bac43 |
+CONFIG_PL011=y
|
|
|
9bac43 |
+CONFIG_PL031=y
|
|
|
9bac43 |
+CONFIG_PFLASH_CFI01=y
|
|
|
9bac43 |
+CONFIG_PCI_GENERIC=y
|
|
|
9bac43 |
+CONFIG_ACPI=y
|
|
|
9bac43 |
+CONFIG_PLATFORM_BUS=y
|
|
|
9bac43 |
+CONFIG_SMBIOS=y
|
|
|
357786 |
+CONFIG_PL061=y
|
|
|
357786 |
+CONFIG_GPIO_KEY=y
|
|
|
9bac43 |
+CONFIG_ARM_V7M=y
|
|
|
9bac43 |
+CONFIG_PCIE_PORT=y
|
|
|
9bac43 |
+CONFIG_XIO3130=y
|
|
|
9bac43 |
+CONFIG_IOH3420=y
|
|
|
9bac43 |
+CONFIG_USB_XHCI=y
|
|
|
9bac43 |
+CONFIG_USB=y
|
|
|
357786 |
+CONFIG_I2C=y
|
|
|
9bac43 |
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
|
|
|
357786 |
index 35e7596..4c8c296 100644
|
|
|
9bac43 |
--- a/default-configs/pci.mak
|
|
|
9bac43 |
+++ b/default-configs/pci.mak
|
|
|
357786 |
@@ -4,21 +4,21 @@ CONFIG_ISA_BUS=y
|
|
|
9bac43 |
CONFIG_VIRTIO_PCI=y
|
|
|
9bac43 |
CONFIG_VIRTIO=y
|
|
|
9bac43 |
CONFIG_USB_UHCI=y
|
|
|
9bac43 |
-CONFIG_USB_OHCI=y
|
|
|
9bac43 |
+#CONFIG_USB_OHCI=y
|
|
|
9bac43 |
CONFIG_USB_EHCI=y
|
|
|
9bac43 |
CONFIG_USB_XHCI=y
|
|
|
9bac43 |
CONFIG_USB_XHCI_NEC=y
|
|
|
9bac43 |
-CONFIG_NE2000_PCI=y
|
|
|
9bac43 |
-CONFIG_EEPRO100_PCI=y
|
|
|
9bac43 |
-CONFIG_PCNET_PCI=y
|
|
|
9bac43 |
-CONFIG_PCNET_COMMON=y
|
|
|
9bac43 |
+#CONFIG_NE2000_PCI=y
|
|
|
9bac43 |
+#CONFIG_EEPRO100_PCI=y
|
|
|
9bac43 |
+#CONFIG_PCNET_PCI=y
|
|
|
9bac43 |
+#CONFIG_PCNET_COMMON=y
|
|
|
9bac43 |
CONFIG_AC97=y
|
|
|
9bac43 |
CONFIG_HDA=y
|
|
|
9bac43 |
-CONFIG_ES1370=y
|
|
|
9bac43 |
-CONFIG_LSI_SCSI_PCI=y
|
|
|
9bac43 |
-CONFIG_VMW_PVSCSI_SCSI_PCI=y
|
|
|
9bac43 |
-CONFIG_MEGASAS_SCSI_PCI=y
|
|
|
9bac43 |
-CONFIG_MPTSAS_SCSI_PCI=y
|
|
|
9bac43 |
+#CONFIG_ES1370=y
|
|
|
9bac43 |
+#CONFIG_LSI_SCSI_PCI=y
|
|
|
9bac43 |
+#CONFIG_VMW_PVSCSI_SCSI_PCI=y
|
|
|
9bac43 |
+#CONFIG_MEGASAS_SCSI_PCI=y
|
|
|
9bac43 |
+#CONFIG_MPTSAS_SCSI_PCI=y
|
|
|
9bac43 |
CONFIG_RTL8139_PCI=y
|
|
|
9bac43 |
CONFIG_E1000_PCI=y
|
|
|
9bac43 |
CONFIG_E1000E_PCI=y
|
|
|
357786 |
@@ -26,24 +26,24 @@ CONFIG_IDE_CORE=y
|
|
|
9bac43 |
CONFIG_IDE_QDEV=y
|
|
|
9bac43 |
CONFIG_IDE_PCI=y
|
|
|
9bac43 |
CONFIG_AHCI=y
|
|
|
9bac43 |
-CONFIG_ESP=y
|
|
|
9bac43 |
-CONFIG_ESP_PCI=y
|
|
|
9bac43 |
+#CONFIG_ESP=y
|
|
|
9bac43 |
+#CONFIG_ESP_PCI=y
|
|
|
9bac43 |
CONFIG_SERIAL=y
|
|
|
9bac43 |
CONFIG_SERIAL_ISA=y
|
|
|
9bac43 |
CONFIG_SERIAL_PCI=y
|
|
|
357786 |
CONFIG_CAN_BUS=y
|
|
|
357786 |
CONFIG_CAN_SJA1000=y
|
|
|
357786 |
CONFIG_CAN_PCI=y
|
|
|
9bac43 |
-CONFIG_IPACK=y
|
|
|
9bac43 |
+#CONFIG_IPACK=y
|
|
|
9bac43 |
CONFIG_WDT_IB6300ESB=y
|
|
|
9bac43 |
CONFIG_PCI_TESTDEV=y
|
|
|
9bac43 |
-CONFIG_NVME_PCI=y
|
|
|
9bac43 |
-CONFIG_SD=y
|
|
|
9bac43 |
-CONFIG_SDHCI=y
|
|
|
9bac43 |
+#CONFIG_NVME_PCI=y
|
|
|
9bac43 |
+#CONFIG_SD=y
|
|
|
9bac43 |
+#CONFIG_SDHCI=y
|
|
|
9bac43 |
CONFIG_EDU=y
|
|
|
9bac43 |
CONFIG_VGA=y
|
|
|
9bac43 |
CONFIG_VGA_PCI=y
|
|
|
9bac43 |
CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
|
|
|
9bac43 |
-CONFIG_ROCKER=y
|
|
|
357786 |
-CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
357786 |
-CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
+#CONFIG_ROCKER=y
|
|
|
357786 |
+#CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
357786 |
+#CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
|
|
|
357786 |
index b94af6c..936ac17 100644
|
|
|
9bac43 |
--- a/default-configs/ppc64-softmmu.mak
|
|
|
9bac43 |
+++ b/default-configs/ppc64-softmmu.mak
|
|
|
357786 |
@@ -1,14 +1,31 @@
|
|
|
9bac43 |
# Default configuration for ppc64-softmmu
|
|
|
9bac43 |
|
|
|
357786 |
-# Include all 32-bit boards
|
|
|
357786 |
-include ppc-softmmu.mak
|
|
|
357786 |
+include sound.mak
|
|
|
357786 |
+include usb.mak
|
|
|
357786 |
+
|
|
|
357786 |
+## PCI configuration - cut down from the defaults in pci.mak
|
|
|
9bac43 |
+CONFIG_PCI=y
|
|
|
9bac43 |
+CONFIG_VIRTIO_PCI=y
|
|
|
9bac43 |
+CONFIG_VIRTIO=y
|
|
|
9bac43 |
+CONFIG_USB_XHCI=y
|
|
|
9bac43 |
+CONFIG_USB_XHCI_NEC=y
|
|
|
9bac43 |
+CONFIG_WDT_IB6300ESB=y
|
|
|
9bac43 |
+CONFIG_PCI_TESTDEV=y
|
|
|
357786 |
+CONFIG_USB_OHCI=y
|
|
|
357786 |
+CONFIG_VGA=y
|
|
|
357786 |
+CONFIG_VGA_PCI=y
|
|
|
357786 |
+CONFIG_SERIAL=y
|
|
|
357786 |
+CONFIG_I2C=y
|
|
|
9bac43 |
+
|
|
|
357786 |
+# For embedded PPCs
|
|
|
357786 |
+#CONFIG_PPC4XX=y
|
|
|
357786 |
|
|
|
357786 |
# For PowerNV
|
|
|
357786 |
-CONFIG_POWERNV=y
|
|
|
357786 |
+#CONFIG_POWERNV=y
|
|
|
9bac43 |
CONFIG_IPMI=y
|
|
|
9bac43 |
-CONFIG_IPMI_LOCAL=y
|
|
|
9bac43 |
-CONFIG_IPMI_EXTERN=y
|
|
|
9bac43 |
-CONFIG_ISA_IPMI_BT=y
|
|
|
9bac43 |
+#CONFIG_IPMI_LOCAL=y
|
|
|
9bac43 |
+#CONFIG_IPMI_EXTERN=y
|
|
|
9bac43 |
+#CONFIG_ISA_IPMI_BT=y
|
|
|
357786 |
|
|
|
9bac43 |
# For pSeries
|
|
|
357786 |
CONFIG_PSERIES=y
|
|
|
357786 |
@@ -17,3 +34,4 @@ CONFIG_XICS=$(CONFIG_PSERIES)
|
|
|
9bac43 |
CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)
|
|
|
357786 |
CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM))
|
|
|
9bac43 |
CONFIG_MEM_HOTPLUG=y
|
|
|
357786 |
+CONFIG_I2C=y
|
|
|
9bac43 |
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
|
|
|
357786 |
index 2f4bfe7..649bf2c 100644
|
|
|
9bac43 |
--- a/default-configs/s390x-softmmu.mak
|
|
|
9bac43 |
+++ b/default-configs/s390x-softmmu.mak
|
|
|
357786 |
@@ -1,11 +1,13 @@
|
|
|
9bac43 |
CONFIG_PCI=y
|
|
|
357786 |
-CONFIG_VIRTIO_PCI=$(CONFIG_PCI)
|
|
|
357786 |
-CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
357786 |
-CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
357786 |
+#CONFIG_VIRTIO_PCI=$(CONFIG_PCI)
|
|
|
357786 |
+#CONFIG_VHOST_USER_SCSI=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
357786 |
+#CONFIG_VHOST_USER_BLK=$(call land,$(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
CONFIG_VIRTIO=y
|
|
|
9bac43 |
CONFIG_SCLPCONSOLE=y
|
|
|
357786 |
-CONFIG_TERMINAL3270=y
|
|
|
357786 |
+# Disabled for Red Hat Enterprise Linux:
|
|
|
357786 |
+# CONFIG_TERMINAL3270=y
|
|
|
357786 |
CONFIG_S390_FLIC=y
|
|
|
357786 |
CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)
|
|
|
357786 |
-CONFIG_VFIO_CCW=$(CONFIG_LINUX)
|
|
|
357786 |
+# Disabled for Red Hat Enterprise Linux:
|
|
|
357786 |
+# CONFIG_VFIO_CCW=$(CONFIG_LINUX)
|
|
|
357786 |
CONFIG_WDT_DIAG288=y
|
|
|
9bac43 |
diff --git a/default-configs/sound.mak b/default-configs/sound.mak
|
|
|
9bac43 |
index 4f22c34..1bead9b 100644
|
|
|
9bac43 |
--- a/default-configs/sound.mak
|
|
|
9bac43 |
+++ b/default-configs/sound.mak
|
|
|
9bac43 |
@@ -1,4 +1,4 @@
|
|
|
9bac43 |
-CONFIG_SB16=y
|
|
|
9bac43 |
-CONFIG_ADLIB=y
|
|
|
9bac43 |
-CONFIG_GUS=y
|
|
|
9bac43 |
-CONFIG_CS4231A=y
|
|
|
9bac43 |
+#CONFIG_SB16=y
|
|
|
9bac43 |
+#CONFIG_ADLIB=y
|
|
|
9bac43 |
+#CONFIG_GUS=y
|
|
|
9bac43 |
+#CONFIG_CS4231A=y
|
|
|
9bac43 |
diff --git a/default-configs/usb.mak b/default-configs/usb.mak
|
|
|
9bac43 |
index f4b8568..a256f84 100644
|
|
|
9bac43 |
--- a/default-configs/usb.mak
|
|
|
9bac43 |
+++ b/default-configs/usb.mak
|
|
|
9bac43 |
@@ -1,10 +1,10 @@
|
|
|
9bac43 |
CONFIG_USB=y
|
|
|
9bac43 |
-CONFIG_USB_TABLET_WACOM=y
|
|
|
9bac43 |
+#CONFIG_USB_TABLET_WACOM=y
|
|
|
9bac43 |
CONFIG_USB_STORAGE_BOT=y
|
|
|
9bac43 |
-CONFIG_USB_STORAGE_UAS=y
|
|
|
9bac43 |
-CONFIG_USB_STORAGE_MTP=y
|
|
|
9bac43 |
+#CONFIG_USB_STORAGE_UAS=y
|
|
|
9bac43 |
+#CONFIG_USB_STORAGE_MTP=y
|
|
|
9bac43 |
CONFIG_USB_SMARTCARD=y
|
|
|
9bac43 |
-CONFIG_USB_AUDIO=y
|
|
|
9bac43 |
-CONFIG_USB_SERIAL=y
|
|
|
9bac43 |
-CONFIG_USB_NETWORK=y
|
|
|
9bac43 |
-CONFIG_USB_BLUETOOTH=y
|
|
|
9bac43 |
+#CONFIG_USB_AUDIO=y
|
|
|
9bac43 |
+#CONFIG_USB_SERIAL=y
|
|
|
9bac43 |
+#CONFIG_USB_NETWORK=y
|
|
|
9bac43 |
+#CONFIG_USB_BLUETOOTH=y
|
|
|
9bac43 |
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
|
|
|
357786 |
index 0390b43..2675606 100644
|
|
|
9bac43 |
--- a/default-configs/x86_64-softmmu.mak
|
|
|
9bac43 |
+++ b/default-configs/x86_64-softmmu.mak
|
|
|
357786 |
@@ -4,20 +4,21 @@ include pci.mak
|
|
|
9bac43 |
include sound.mak
|
|
|
9bac43 |
include usb.mak
|
|
|
9bac43 |
CONFIG_QXL=$(CONFIG_SPICE)
|
|
|
9bac43 |
-CONFIG_VGA_ISA=y
|
|
|
9bac43 |
+#CONFIG_VGA_ISA=y
|
|
|
9bac43 |
+CONFIG_VGA_PCI=y
|
|
|
9bac43 |
CONFIG_VGA_CIRRUS=y
|
|
|
9bac43 |
-CONFIG_VMWARE_VGA=y
|
|
|
357786 |
-CONFIG_VMXNET3_PCI=y
|
|
|
9bac43 |
+#CONFIG_VMWARE_VGA=y
|
|
|
357786 |
+#CONFIG_VMXNET3_PCI=y
|
|
|
9bac43 |
CONFIG_VIRTIO_VGA=y
|
|
|
9bac43 |
CONFIG_VMMOUSE=y
|
|
|
9bac43 |
CONFIG_IPMI=y
|
|
|
9bac43 |
-CONFIG_IPMI_LOCAL=y
|
|
|
9bac43 |
-CONFIG_IPMI_EXTERN=y
|
|
|
9bac43 |
-CONFIG_ISA_IPMI_KCS=y
|
|
|
9bac43 |
-CONFIG_ISA_IPMI_BT=y
|
|
|
9bac43 |
+#CONFIG_IPMI_LOCAL=y
|
|
|
9bac43 |
+#CONFIG_IPMI_EXTERN=y
|
|
|
9bac43 |
+#CONFIG_ISA_IPMI_KCS=y
|
|
|
9bac43 |
+#CONFIG_ISA_IPMI_BT=y
|
|
|
9bac43 |
CONFIG_SERIAL=y
|
|
|
9bac43 |
CONFIG_SERIAL_ISA=y
|
|
|
9bac43 |
-CONFIG_PARALLEL=y
|
|
|
9bac43 |
+#CONFIG_PARALLEL=y
|
|
|
9bac43 |
CONFIG_I8254=y
|
|
|
9bac43 |
CONFIG_PCSPK=y
|
|
|
9bac43 |
CONFIG_PCKBD=y
|
|
|
357786 |
@@ -29,11 +30,11 @@ CONFIG_ACPI_MEMORY_HOTPLUG=y
|
|
|
9bac43 |
CONFIG_ACPI_CPU_HOTPLUG=y
|
|
|
9bac43 |
CONFIG_APM=y
|
|
|
9bac43 |
CONFIG_I8257=y
|
|
|
9bac43 |
-CONFIG_IDE_ISA=y
|
|
|
9bac43 |
+#CONFIG_IDE_ISA=y
|
|
|
9bac43 |
CONFIG_IDE_PIIX=y
|
|
|
9bac43 |
-CONFIG_NE2000_ISA=y
|
|
|
9bac43 |
-CONFIG_HPET=y
|
|
|
9bac43 |
-CONFIG_APPLESMC=y
|
|
|
9bac43 |
+#CONFIG_NE2000_ISA=y
|
|
|
9bac43 |
+#CONFIG_HPET=y
|
|
|
9bac43 |
+#CONFIG_APPLESMC=y
|
|
|
9bac43 |
CONFIG_I8259=y
|
|
|
9bac43 |
CONFIG_PFLASH_CFI01=y
|
|
|
9bac43 |
CONFIG_TPM_TIS=$(CONFIG_TPM)
|
|
|
357786 |
@@ -41,6 +42,7 @@ CONFIG_TPM_CRB=$(CONFIG_TPM)
|
|
|
9bac43 |
CONFIG_MC146818RTC=y
|
|
|
9bac43 |
CONFIG_PCI_PIIX=y
|
|
|
9bac43 |
CONFIG_WDT_IB700=y
|
|
|
9bac43 |
+CONFIG_ISA_BUS=y
|
|
|
9bac43 |
CONFIG_ISA_DEBUG=y
|
|
|
9bac43 |
CONFIG_ISA_TESTDEV=y
|
|
|
9bac43 |
CONFIG_VMPORT=y
|
|
|
357786 |
@@ -58,11 +60,11 @@ CONFIG_XIO3130=y
|
|
|
9bac43 |
CONFIG_IOH3420=y
|
|
|
9bac43 |
CONFIG_I82801B11=y
|
|
|
9bac43 |
CONFIG_SMBIOS=y
|
|
|
9bac43 |
-CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
|
|
|
9bac43 |
+#CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
|
|
|
9bac43 |
CONFIG_PXB=y
|
|
|
9bac43 |
CONFIG_ACPI_VMGENID=y
|
|
|
357786 |
CONFIG_FW_CFG_DMA=y
|
|
|
357786 |
CONFIG_I2C=y
|
|
|
357786 |
CONFIG_SEV=$(CONFIG_KVM)
|
|
|
357786 |
CONFIG_VTD=y
|
|
|
357786 |
-CONFIG_AMD_IOMMU=y
|
|
|
357786 |
+#CONFIG_AMD_IOMMU=y
|
|
|
9bac43 |
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
|
|
|
9bac43 |
index c5d8646..a4e87b8 100644
|
|
|
9bac43 |
--- a/hw/acpi/ich9.c
|
|
|
9bac43 |
+++ b/hw/acpi/ich9.c
|
|
|
9bac43 |
@@ -446,8 +446,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
|
|
|
9bac43 |
static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
|
|
|
9bac43 |
pm->acpi_memory_hotplug.is_enabled = true;
|
|
|
9bac43 |
pm->cpu_hotplug_legacy = true;
|
|
|
9bac43 |
- pm->disable_s3 = 0;
|
|
|
9bac43 |
- pm->disable_s4 = 0;
|
|
|
9bac43 |
+ pm->disable_s3 = 1;
|
|
|
9bac43 |
+ pm->disable_s4 = 1;
|
|
|
9bac43 |
pm->s4_val = 2;
|
|
|
9bac43 |
|
|
|
9bac43 |
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,
|
|
|
9bac43 |
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
|
|
|
357786 |
index cd29e27..3964096 100644
|
|
|
9bac43 |
--- a/hw/block/fdc.c
|
|
|
9bac43 |
+++ b/hw/block/fdc.c
|
|
|
357786 |
@@ -605,6 +605,7 @@ static void floppy_drive_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
k->bus_type = TYPE_FLOPPY_BUS;
|
|
|
9bac43 |
k->props = floppy_drive_properties;
|
|
|
9bac43 |
k->desc = "virtual floppy drive";
|
|
|
9bac43 |
+ k->user_creatable = false; /* RH state preserve */
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo floppy_drive_info = {
|
|
|
9bac43 |
diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
|
|
|
357786 |
index cb0d04c..d426982 100644
|
|
|
9bac43 |
--- a/hw/char/serial-pci.c
|
|
|
9bac43 |
+++ b/hw/char/serial-pci.c
|
|
|
9bac43 |
@@ -228,6 +228,8 @@ static void multi_2x_serial_pci_class_initfn(ObjectClass *klass, void *data)
|
|
|
9bac43 |
dc->vmsd = &vmstate_pci_multi_serial;
|
|
|
9bac43 |
dc->props = multi_2x_serial_pci_properties;
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
|
|
9bac43 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static void multi_4x_serial_pci_class_initfn(ObjectClass *klass, void *data)
|
|
|
9bac43 |
@@ -243,6 +245,8 @@ static void multi_4x_serial_pci_class_initfn(ObjectClass *klass, void *data)
|
|
|
9bac43 |
dc->vmsd = &vmstate_pci_multi_serial;
|
|
|
9bac43 |
dc->props = multi_4x_serial_pci_properties;
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
|
|
9bac43 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo serial_pci_info = {
|
|
|
9bac43 |
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
|
|
|
357786 |
index eb88ca9..2b4491f 100644
|
|
|
9bac43 |
--- a/hw/core/Makefile.objs
|
|
|
9bac43 |
+++ b/hw/core/Makefile.objs
|
|
|
357786 |
@@ -16,10 +16,11 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o
|
|
|
9bac43 |
common-obj-$(CONFIG_SOFTMMU) += loader.o
|
|
|
9bac43 |
common-obj-$(CONFIG_FITLOADER) += loader-fit.o
|
|
|
9bac43 |
common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
|
|
|
9bac43 |
-common-obj-$(CONFIG_SOFTMMU) += register.o
|
|
|
9bac43 |
-common-obj-$(CONFIG_SOFTMMU) += or-irq.o
|
|
|
9bac43 |
+# Disabled in Red Hat Enterprise Linux
|
|
|
9bac43 |
+# common-obj-$(CONFIG_SOFTMMU) += register.o
|
|
|
9bac43 |
+# obj-$(CONFIG_SOFTMMU) += generic-loader.o
|
|
|
9bac43 |
+# common-obj-$(CONFIG_SOFTMMU) += or-irq.o
|
|
|
357786 |
common-obj-$(CONFIG_SOFTMMU) += split-irq.o
|
|
|
357786 |
common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
|
|
|
9bac43 |
|
|
|
9bac43 |
-obj-$(CONFIG_SOFTMMU) += generic-loader.o
|
|
|
9bac43 |
obj-$(CONFIG_SOFTMMU) += null-machine.o
|
|
|
9bac43 |
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
|
|
|
357786 |
index 138ae96..d116651 100644
|
|
|
9bac43 |
--- a/hw/display/cirrus_vga.c
|
|
|
9bac43 |
+++ b/hw/display/cirrus_vga.c
|
|
|
357786 |
@@ -3074,6 +3074,8 @@ static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
dc->realize = isa_cirrus_vga_realizefn;
|
|
|
9bac43 |
dc->props = isa_cirrus_vga_properties;
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
|
|
|
9bac43 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo isa_cirrus_vga_info = {
|
|
|
9bac43 |
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
|
|
|
357786 |
index d36bac8..ab4323d 100644
|
|
|
9bac43 |
--- a/hw/i386/pc.c
|
|
|
9bac43 |
+++ b/hw/i386/pc.c
|
|
|
357786 |
@@ -1525,8 +1525,9 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
|
|
|
357786 |
ISADevice *i8042, *port92, *vmmouse;
|
|
|
9bac43 |
|
|
|
9bac43 |
serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
|
|
|
357786 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
9bac43 |
parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);
|
|
|
9bac43 |
-
|
|
|
9bac43 |
+#endif
|
|
|
357786 |
for (i = 0; i < MAX_FD; i++) {
|
|
|
357786 |
fd[i] = drive_get(IF_FLOPPY, 0, i);
|
|
|
357786 |
create_fdctrl |= !!fd[i];
|
|
|
9bac43 |
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
|
|
|
357786 |
index a3afe1f..6de12ca 100644
|
|
|
9bac43 |
--- a/hw/ide/piix.c
|
|
|
9bac43 |
+++ b/hw/ide/piix.c
|
|
|
357786 |
@@ -253,7 +253,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1;
|
|
|
9bac43 |
k->class_id = PCI_CLASS_STORAGE_IDE;
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
9bac43 |
- dc->hotpluggable = false;
|
|
|
9bac43 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo piix3_ide_info = {
|
|
|
357786 |
@@ -280,6 +281,8 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
k->class_id = PCI_CLASS_STORAGE_IDE;
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
9bac43 |
dc->hotpluggable = false;
|
|
|
9bac43 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo piix4_ide_info = {
|
|
|
9bac43 |
diff --git a/hw/ide/via.c b/hw/ide/via.c
|
|
|
357786 |
index 117ac4d..b1bafe6 100644
|
|
|
9bac43 |
--- a/hw/ide/via.c
|
|
|
9bac43 |
+++ b/hw/ide/via.c
|
|
|
357786 |
@@ -217,6 +217,8 @@ static void via_ide_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
k->revision = 0x06;
|
|
|
9bac43 |
k->class_id = PCI_CLASS_STORAGE_IDE;
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
9bac43 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo via_ide_info = {
|
|
|
9bac43 |
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
|
|
|
357786 |
index f17f18e..66adb83 100644
|
|
|
9bac43 |
--- a/hw/input/pckbd.c
|
|
|
9bac43 |
+++ b/hw/input/pckbd.c
|
|
|
9bac43 |
@@ -570,6 +570,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data)
|
|
|
9bac43 |
|
|
|
9bac43 |
dc->realize = i8042_realizefn;
|
|
|
9bac43 |
dc->vmsd = &vmstate_kbd_isa;
|
|
|
9bac43 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo i8042_info = {
|
|
|
9bac43 |
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
|
|
|
357786 |
index 00e834d..d7430cf 100644
|
|
|
9bac43 |
--- a/hw/misc/Makefile.objs
|
|
|
9bac43 |
+++ b/hw/misc/Makefile.objs
|
|
|
9bac43 |
@@ -8,7 +8,7 @@ common-obj-$(CONFIG_ISA_TESTDEV) += pc-testdev.o
|
|
|
9bac43 |
common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o
|
|
|
9bac43 |
common-obj-$(CONFIG_EDU) += edu.o
|
|
|
9bac43 |
|
|
|
9bac43 |
-common-obj-y += unimp.o
|
|
|
9bac43 |
+#common-obj-y += unimp.o
|
|
|
357786 |
common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o
|
|
|
9bac43 |
|
|
|
357786 |
# ARM devices
|
|
|
9bac43 |
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
|
|
|
357786 |
index 16f0370..bfbfc0e 100644
|
|
|
9bac43 |
--- a/hw/misc/ivshmem.c
|
|
|
9bac43 |
+++ b/hw/misc/ivshmem.c
|
|
|
357786 |
@@ -892,6 +892,13 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp)
|
|
|
9bac43 |
return;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
+ /* Migration disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ if (s->master == ON_OFF_AUTO_ON) {
|
|
|
9bac43 |
+ error_setg(errp, "master=on is not supported");
|
|
|
9bac43 |
+ return;
|
|
|
9bac43 |
+ }
|
|
|
9bac43 |
+ s->master = ON_OFF_AUTO_OFF;
|
|
|
9bac43 |
+
|
|
|
9bac43 |
pci_conf = dev->config;
|
|
|
9bac43 |
pci_conf[PCI_COMMAND] = PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
|
|
|
9bac43 |
|
|
|
357786 |
@@ -1183,6 +1190,8 @@ static void ivshmem_doorbell_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
k->realize = ivshmem_doorbell_realize;
|
|
|
9bac43 |
dc->props = ivshmem_doorbell_properties;
|
|
|
9bac43 |
dc->vmsd = &ivshmem_doorbell_vmsd;
|
|
|
9bac43 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo ivshmem_doorbell_info = {
|
|
|
357786 |
@@ -1352,6 +1361,8 @@ static void ivshmem_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
dc->desc = "Inter-VM shared memory (legacy)";
|
|
|
9bac43 |
dc->props = ivshmem_properties;
|
|
|
9bac43 |
dc->vmsd = &ivshmem_vmsd;
|
|
|
9bac43 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo ivshmem_info = {
|
|
|
9bac43 |
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
|
|
|
357786 |
index 13a9494..742cd0a 100644
|
|
|
9bac43 |
--- a/hw/net/e1000.c
|
|
|
9bac43 |
+++ b/hw/net/e1000.c
|
|
|
357786 |
@@ -1768,6 +1768,7 @@ static const E1000Info e1000_devices[] = {
|
|
|
9bac43 |
.revision = 0x03,
|
|
|
9bac43 |
.phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT,
|
|
|
9bac43 |
},
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */
|
|
|
9bac43 |
{
|
|
|
9bac43 |
.name = "e1000-82544gc",
|
|
|
9bac43 |
.device_id = E1000_DEV_ID_82544GC_COPPER,
|
|
|
357786 |
@@ -1780,6 +1781,7 @@ static const E1000Info e1000_devices[] = {
|
|
|
9bac43 |
.revision = 0x03,
|
|
|
9bac43 |
.phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT,
|
|
|
9bac43 |
},
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
};
|
|
|
9bac43 |
|
|
|
357786 |
static void e1000_register_types(void)
|
|
|
9bac43 |
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
|
|
|
357786 |
index 16a9417..c934c22 100644
|
|
|
9bac43 |
--- a/hw/net/e1000e.c
|
|
|
9bac43 |
+++ b/hw/net/e1000e.c
|
|
|
357786 |
@@ -673,7 +673,7 @@ static void e1000e_class_init(ObjectClass *class, void *data)
|
|
|
9bac43 |
c->vendor_id = PCI_VENDOR_ID_INTEL;
|
|
|
9bac43 |
c->device_id = E1000_DEV_ID_82574L;
|
|
|
9bac43 |
c->revision = 0;
|
|
|
9bac43 |
- c->romfile = "efi-e1000e.rom";
|
|
|
9bac43 |
+ c->romfile = "pxe-e1000e.rom";
|
|
|
9bac43 |
c->class_id = PCI_CLASS_NETWORK_ETHERNET;
|
|
|
9bac43 |
|
|
|
357786 |
dc->desc = "Intel 82574L GbE Controller";
|
|
|
9bac43 |
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
|
|
|
357786 |
index 0e60834..3ce4b14 100644
|
|
|
9bac43 |
--- a/hw/pci-host/piix.c
|
|
|
9bac43 |
+++ b/hw/pci-host/piix.c
|
|
|
357786 |
@@ -787,6 +787,7 @@ static const TypeInfo i440fx_info = {
|
|
|
357786 |
},
|
|
|
9bac43 |
};
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
/* IGD Passthrough Host Bridge. */
|
|
|
9bac43 |
typedef struct {
|
|
|
9bac43 |
uint8_t offset;
|
|
|
357786 |
@@ -870,6 +871,7 @@ static const TypeInfo igd_passthrough_i440fx_info = {
|
|
|
9bac43 |
.instance_size = sizeof(PCII440FXState),
|
|
|
9bac43 |
.class_init = igd_passthrough_i440fx_class_init,
|
|
|
9bac43 |
};
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
|
|
|
9bac43 |
static const char *i440fx_pcihost_root_bus_path(PCIHostState *host_bridge,
|
|
|
9bac43 |
PCIBus *rootbus)
|
|
|
357786 |
@@ -915,7 +917,9 @@ static const TypeInfo i440fx_pcihost_info = {
|
|
|
9bac43 |
static void i440fx_register_types(void)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
type_register_static(&i440fx_info);
|
|
|
9bac43 |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
type_register_static(&igd_passthrough_i440fx_info);
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
type_register_static(&piix3_pci_type_info);
|
|
|
9bac43 |
type_register_static(&piix3_info);
|
|
|
9bac43 |
type_register_static(&piix3_xen_info);
|
|
|
9bac43 |
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
|
|
|
357786 |
index 86d82a6..a46a989 100644
|
|
|
9bac43 |
--- a/hw/ppc/Makefile.objs
|
|
|
9bac43 |
+++ b/hw/ppc/Makefile.objs
|
|
|
9bac43 |
@@ -3,7 +3,7 @@ obj-y += ppc.o ppc_booke.o fdt.o
|
|
|
9bac43 |
# IBM pSeries (sPAPR)
|
|
|
357786 |
obj-$(CONFIG_PSERIES) += spapr.o spapr_caps.o spapr_vio.o spapr_events.o
|
|
|
9bac43 |
obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o
|
|
|
9bac43 |
-obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o spapr_rng.o
|
|
|
9bac43 |
+obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o
|
|
|
9bac43 |
obj-$(CONFIG_PSERIES) += spapr_cpu_core.o spapr_ovec.o
|
|
|
9bac43 |
# IBM PowerNV
|
|
|
9bac43 |
obj-$(CONFIG_POWERNV) += pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.o pnv_occ.o pnv_bmc.o
|
|
|
9bac43 |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
357786 |
index a81570e..6a92b20 100644
|
|
|
9bac43 |
--- a/hw/ppc/spapr.c
|
|
|
9bac43 |
+++ b/hw/ppc/spapr.c
|
|
|
357786 |
@@ -1153,6 +1153,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr,
|
|
|
9bac43 |
/* /vdevice */
|
|
|
9bac43 |
spapr_dt_vdevice(spapr->vio_bus, fdt);
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
if (object_resolve_path_type("", TYPE_SPAPR_RNG, NULL)) {
|
|
|
9bac43 |
ret = spapr_rng_populate_dt(fdt);
|
|
|
9bac43 |
if (ret < 0) {
|
|
|
357786 |
@@ -1160,7 +1161,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr,
|
|
|
9bac43 |
exit(1);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
}
|
|
|
9bac43 |
-
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
QLIST_FOREACH(phb, &spapr->phbs, list) {
|
|
|
9bac43 |
ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt);
|
|
|
9bac43 |
if (ret < 0) {
|
|
|
9bac43 |
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
|
|
|
357786 |
index 94afeb3..1eda854 100644
|
|
|
9bac43 |
--- a/hw/ppc/spapr_cpu_core.c
|
|
|
9bac43 |
+++ b/hw/ppc/spapr_cpu_core.c
|
|
|
357786 |
@@ -240,10 +240,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {
|
|
|
357786 |
.instance_size = sizeof(sPAPRCPUCore),
|
|
|
357786 |
.class_size = sizeof(sPAPRCPUCoreClass),
|
|
|
357786 |
},
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
357786 |
DEFINE_SPAPR_CPU_CORE_TYPE("970_v2.2"),
|
|
|
357786 |
DEFINE_SPAPR_CPU_CORE_TYPE("970mp_v1.0"),
|
|
|
357786 |
DEFINE_SPAPR_CPU_CORE_TYPE("970mp_v1.1"),
|
|
|
357786 |
DEFINE_SPAPR_CPU_CORE_TYPE("power5+_v2.1"),
|
|
|
9bac43 |
+#endif
|
|
|
357786 |
DEFINE_SPAPR_CPU_CORE_TYPE("power7_v2.3"),
|
|
|
357786 |
DEFINE_SPAPR_CPU_CORE_TYPE("power7+_v2.1"),
|
|
|
357786 |
DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"),
|
|
|
9bac43 |
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
|
|
|
357786 |
index e51fbef..8720e46 100644
|
|
|
9bac43 |
--- a/hw/s390x/virtio-ccw.c
|
|
|
9bac43 |
+++ b/hw/s390x/virtio-ccw.c
|
|
|
357786 |
@@ -927,6 +927,8 @@ static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
|
|
9bac43 |
NULL);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
+
|
|
|
9bac43 |
static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
VirtIOCryptoCcw *dev = VIRTIO_CRYPTO_CCW(ccw_dev);
|
|
|
357786 |
@@ -944,6 +946,7 @@ static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
|
|
357786 |
OBJECT(dev->vdev.conf.cryptodev), "cryptodev",
|
|
|
9bac43 |
NULL);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+#endif
|
|
|
357786 |
|
|
|
357786 |
static void virtio_ccw_gpu_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
|
|
357786 |
{
|
|
|
357786 |
@@ -1534,6 +1537,8 @@ static const TypeInfo virtio_ccw_rng = {
|
|
|
9bac43 |
.class_init = virtio_ccw_rng_class_init,
|
|
|
9bac43 |
};
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
+
|
|
|
9bac43 |
static Property virtio_ccw_crypto_properties[] = {
|
|
|
9bac43 |
DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,
|
|
|
9bac43 |
VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),
|
|
|
357786 |
@@ -1571,6 +1576,7 @@ static const TypeInfo virtio_ccw_crypto = {
|
|
|
357786 |
.instance_init = virtio_ccw_crypto_instance_init,
|
|
|
9bac43 |
.class_init = virtio_ccw_crypto_class_init,
|
|
|
9bac43 |
};
|
|
|
9bac43 |
+#endif
|
|
|
357786 |
|
|
|
357786 |
static Property virtio_ccw_gpu_properties[] = {
|
|
|
357786 |
DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,
|
|
|
357786 |
@@ -1895,7 +1901,9 @@ static void virtio_ccw_register(void)
|
|
|
9bac43 |
#ifdef CONFIG_VHOST_VSOCK
|
|
|
9bac43 |
type_register_static(&vhost_vsock_ccw_info);
|
|
|
9bac43 |
#endif
|
|
|
9bac43 |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
type_register_static(&virtio_ccw_crypto);
|
|
|
9bac43 |
+#endif
|
|
|
357786 |
type_register_static(&virtio_ccw_gpu);
|
|
|
357786 |
type_register_static(&virtio_ccw_input);
|
|
|
357786 |
type_register_static(&virtio_ccw_input_hid);
|
|
|
9bac43 |
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
|
|
|
357786 |
index ea42e46..f2d8b0d 100644
|
|
|
9bac43 |
--- a/hw/usb/ccid-card-emulated.c
|
|
|
9bac43 |
+++ b/hw/usb/ccid-card-emulated.c
|
|
|
9bac43 |
@@ -588,6 +588,8 @@ static void emulated_class_initfn(ObjectClass *klass, void *data)
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
|
|
9bac43 |
dc->desc = "emulated smartcard";
|
|
|
9bac43 |
dc->props = emulated_card_properties;
|
|
|
9bac43 |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
static const TypeInfo emulated_card_info = {
|
|
|
9bac43 |
diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
|
|
|
357786 |
index a2e7a0a..b25ca64 100644
|
|
|
9bac43 |
--- a/hw/vfio/Makefile.objs
|
|
|
9bac43 |
+++ b/hw/vfio/Makefile.objs
|
|
|
9bac43 |
@@ -2,8 +2,5 @@ ifeq ($(CONFIG_LINUX), y)
|
|
|
9bac43 |
obj-$(CONFIG_SOFTMMU) += common.o
|
|
|
357786 |
obj-$(CONFIG_PCI) += pci.o pci-quirks.o display.o
|
|
|
9bac43 |
obj-$(CONFIG_VFIO_CCW) += ccw.o
|
|
|
9bac43 |
-obj-$(CONFIG_SOFTMMU) += platform.o
|
|
|
9bac43 |
-obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
|
|
|
9bac43 |
-obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
|
|
|
9bac43 |
obj-$(CONFIG_SOFTMMU) += spapr.o
|
|
|
9bac43 |
endif
|
|
|
9bac43 |
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
|
|
|
357786 |
index e5779a7..cb2f79c 100644
|
|
|
9bac43 |
--- a/hw/vfio/pci-quirks.c
|
|
|
9bac43 |
+++ b/hw/vfio/pci-quirks.c
|
|
|
357786 |
@@ -1193,6 +1193,8 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data)
|
|
|
9bac43 |
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
|
|
|
9bac43 |
dc->desc = "VFIO dummy ISA/LPC bridge for IGD assignment";
|
|
|
9bac43 |
dc->hotpluggable = false;
|
|
|
9bac43 |
+ /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
+ dc->user_creatable = false;
|
|
|
9bac43 |
k->realize = vfio_pci_igd_lpc_bridge_realize;
|
|
|
9bac43 |
k->class_id = PCI_CLASS_BRIDGE_ISA;
|
|
|
9bac43 |
}
|
|
|
357786 |
@@ -1386,6 +1388,9 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
|
|
|
9bac43 |
0, PCI_DEVFN(0x2, 0))) {
|
|
|
9bac43 |
return;
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+
|
|
|
9bac43 |
+ /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
+ return;
|
|
|
9bac43 |
|
|
|
9bac43 |
/*
|
|
|
9bac43 |
* We need to create an LPC/ISA bridge at PCI bus address 00:1f.0 that we
|
|
|
9bac43 |
diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs
|
|
|
9bac43 |
index 765d363..a5a0936 100644
|
|
|
9bac43 |
--- a/hw/virtio/Makefile.objs
|
|
|
9bac43 |
+++ b/hw/virtio/Makefile.objs
|
|
|
9bac43 |
@@ -7,8 +7,9 @@ common-obj-y += virtio-mmio.o
|
|
|
9bac43 |
obj-y += virtio.o virtio-balloon.o
|
|
|
9bac43 |
obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o
|
|
|
9bac43 |
obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o
|
|
|
9bac43 |
-obj-y += virtio-crypto.o
|
|
|
9bac43 |
-obj-$(CONFIG_VIRTIO_PCI) += virtio-crypto-pci.o
|
|
|
9bac43 |
+# Disabled in Red Hat Enterprise Linux
|
|
|
9bac43 |
+#obj-y += virtio-crypto.o
|
|
|
9bac43 |
+#obj-$(CONFIG_VIRTIO_PCI) += virtio-crypto-pci.o
|
|
|
9bac43 |
endif
|
|
|
9bac43 |
|
|
|
9bac43 |
common-obj-$(call lnot,$(CONFIG_LINUX)) += vhost-stub.o
|
|
|
357786 |
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
|
|
|
357786 |
index 1e8ab7b..e3e49d6 100644
|
|
|
357786 |
--- a/hw/virtio/virtio-pci.c
|
|
|
357786 |
+++ b/hw/virtio/virtio-pci.c
|
|
|
357786 |
@@ -1983,7 +1983,7 @@ static const TypeInfo virtio_blk_pci_info = {
|
|
|
357786 |
.class_init = virtio_blk_pci_class_init,
|
|
|
357786 |
};
|
|
|
357786 |
|
|
|
357786 |
-#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX)
|
|
|
357786 |
+#if defined(CONFIG_VHOST_USER_BLK)
|
|
|
357786 |
/* vhost-user-blk */
|
|
|
357786 |
|
|
|
357786 |
static Property vhost_user_blk_pci_properties[] = {
|
|
|
357786 |
@@ -2163,7 +2163,7 @@ static const TypeInfo vhost_scsi_pci_info = {
|
|
|
357786 |
};
|
|
|
357786 |
#endif
|
|
|
357786 |
|
|
|
357786 |
-#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX)
|
|
|
357786 |
+#if defined(CONFIG_VHOST_USER_SCSI)
|
|
|
357786 |
/* vhost-user-scsi-pci */
|
|
|
357786 |
static Property vhost_user_scsi_pci_properties[] = {
|
|
|
357786 |
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors,
|
|
|
357786 |
@@ -2686,7 +2686,7 @@ static void virtio_pci_register_types(void)
|
|
|
357786 |
type_register_static(&virtio_9p_pci_info);
|
|
|
357786 |
#endif
|
|
|
357786 |
type_register_static(&virtio_blk_pci_info);
|
|
|
357786 |
-#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX)
|
|
|
357786 |
+#if defined(CONFIG_VHOST_USER_BLK)
|
|
|
357786 |
type_register_static(&vhost_user_blk_pci_info);
|
|
|
357786 |
#endif
|
|
|
357786 |
type_register_static(&virtio_scsi_pci_info);
|
|
|
357786 |
@@ -2696,7 +2696,7 @@ static void virtio_pci_register_types(void)
|
|
|
357786 |
#ifdef CONFIG_VHOST_SCSI
|
|
|
357786 |
type_register_static(&vhost_scsi_pci_info);
|
|
|
357786 |
#endif
|
|
|
357786 |
-#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX)
|
|
|
357786 |
+#if defined(CONFIG_VHOST_USER_SCSI)
|
|
|
357786 |
type_register_static(&vhost_user_scsi_pci_info);
|
|
|
357786 |
#endif
|
|
|
357786 |
#ifdef CONFIG_VHOST_VSOCK
|
|
|
9bac43 |
diff --git a/qemu-options.hx b/qemu-options.hx
|
|
|
357786 |
index ca4e412..2042dba 100644
|
|
|
9bac43 |
--- a/qemu-options.hx
|
|
|
9bac43 |
+++ b/qemu-options.hx
|
|
|
357786 |
@@ -1811,11 +1811,6 @@ ETEXI
|
|
|
9bac43 |
|
|
|
9bac43 |
DEF("no-hpet", 0, QEMU_OPTION_no_hpet,
|
|
|
9bac43 |
"-no-hpet disable HPET\n", QEMU_ARCH_I386)
|
|
|
9bac43 |
-STEXI
|
|
|
9bac43 |
-@item -no-hpet
|
|
|
9bac43 |
-@findex -no-hpet
|
|
|
9bac43 |
-Disable HPET support.
|
|
|
9bac43 |
-ETEXI
|
|
|
9bac43 |
|
|
|
9bac43 |
DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable,
|
|
|
9bac43 |
"-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"
|
|
|
9bac43 |
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
|
|
|
357786 |
index 2d59d84..dfdfca7 100644
|
|
|
9bac43 |
--- a/stubs/Makefile.objs
|
|
|
9bac43 |
+++ b/stubs/Makefile.objs
|
|
|
357786 |
@@ -43,3 +43,4 @@ stub-obj-y += xen-common.o
|
|
|
9bac43 |
stub-obj-y += xen-hvm.o
|
|
|
357786 |
stub-obj-y += pci-host-piix.o
|
|
|
357786 |
stub-obj-y += ram-block.o
|
|
|
9bac43 |
+stub-obj-y += ide-isa.o
|
|
|
9bac43 |
diff --git a/stubs/ide-isa.c b/stubs/ide-isa.c
|
|
|
9bac43 |
new file mode 100644
|
|
|
357786 |
index 0000000..9fd50ef
|
|
|
9bac43 |
--- /dev/null
|
|
|
9bac43 |
+++ b/stubs/ide-isa.c
|
|
|
9bac43 |
@@ -0,0 +1,13 @@
|
|
|
357786 |
+#include "qemu/osdep.h"
|
|
|
357786 |
+#include "hw/ide.h"
|
|
|
9bac43 |
+#include <stdlib.h>
|
|
|
9bac43 |
+
|
|
|
9bac43 |
+ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq,
|
|
|
9bac43 |
+ DriveInfo *hd0, DriveInfo *hd1)
|
|
|
9bac43 |
+{
|
|
|
9bac43 |
+ /*
|
|
|
9bac43 |
+ * In theory the real isa_ide_init() function can return NULL, but no
|
|
|
9bac43 |
+ * caller actually checks for that. Make sure we go out with a clear bang.
|
|
|
9bac43 |
+ */
|
|
|
9bac43 |
+ abort();
|
|
|
9bac43 |
+}
|
|
|
9bac43 |
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
|
|
|
357786 |
index 022d8c5..4255e9c 100644
|
|
|
9bac43 |
--- a/target/arm/cpu.c
|
|
|
9bac43 |
+++ b/target/arm/cpu.c
|
|
|
357786 |
@@ -1953,7 +1953,9 @@ static void arm_cpu_register_types(void)
|
|
|
357786 |
type_register_static(&idau_interface_type_info);
|
|
|
9bac43 |
|
|
|
9bac43 |
while (info->name) {
|
|
|
9bac43 |
- cpu_register(info);
|
|
|
9bac43 |
+ /* RHEL specific: Filter out unsupported cpu models */
|
|
|
9bac43 |
+ if (!strcmp(info->name, "cortex-a15"))
|
|
|
9bac43 |
+ cpu_register(info);
|
|
|
9bac43 |
info++;
|
|
|
9bac43 |
}
|
|
|
357786 |
|
|
|
9bac43 |
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
|
357786 |
index a20fe26..f483a71 100644
|
|
|
9bac43 |
--- a/target/i386/cpu.c
|
|
|
9bac43 |
+++ b/target/i386/cpu.c
|
|
|
357786 |
@@ -825,14 +825,14 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
357786 |
.family = 6,
|
|
|
357786 |
.model = 6,
|
|
|
357786 |
.stepping = 3,
|
|
|
357786 |
- .features[FEAT_1_EDX] =
|
|
|
357786 |
- PPRO_FEATURES |
|
|
|
357786 |
- CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
|
|
|
357786 |
- CPUID_PSE36,
|
|
|
357786 |
- .features[FEAT_1_ECX] =
|
|
|
357786 |
- CPUID_EXT_SSE3 | CPUID_EXT_CX16,
|
|
|
357786 |
- .features[FEAT_8000_0001_EDX] =
|
|
|
357786 |
- CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
|
|
|
357786 |
+ .features[FEAT_1_EDX] = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR |
|
|
|
357786 |
+ CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV |
|
|
|
357786 |
+ CPUID_MCA | CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC |
|
|
|
357786 |
+ CPUID_CX8 | CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC |
|
|
|
357786 |
+ CPUID_PSE | CPUID_DE | CPUID_FP87,
|
|
|
357786 |
+ .features[FEAT_1_ECX] = CPUID_EXT_CX16 | CPUID_EXT_SSE3,
|
|
|
9bac43 |
+ .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_NX |
|
|
|
9bac43 |
+ CPUID_EXT2_SYSCALL,
|
|
|
9bac43 |
.features[FEAT_8000_0001_ECX] =
|
|
|
9bac43 |
CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM,
|
|
|
9bac43 |
.xlevel = 0x8000000A,
|
|
|
357786 |
@@ -1062,6 +1062,25 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
357786 |
.model_id = "Intel(R) Atom(TM) CPU N270 @ 1.60GHz",
|
|
|
357786 |
},
|
|
|
357786 |
{
|
|
|
357786 |
+ .name = "cpu64-rhel6",
|
|
|
357786 |
+ .level = 4,
|
|
|
357786 |
+ .vendor = CPUID_VENDOR_AMD,
|
|
|
357786 |
+ .family = 6,
|
|
|
357786 |
+ .model = 13,
|
|
|
357786 |
+ .stepping = 3,
|
|
|
357786 |
+ .features[FEAT_1_EDX] = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR |
|
|
|
357786 |
+ CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV |
|
|
|
357786 |
+ CPUID_MCA | CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC |
|
|
|
357786 |
+ CPUID_CX8 | CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC |
|
|
|
357786 |
+ CPUID_PSE | CPUID_DE | CPUID_FP87,
|
|
|
357786 |
+ .features[FEAT_1_ECX] = CPUID_EXT_CX16 | CPUID_EXT_SSE3,
|
|
|
9bac43 |
+ .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
|
|
|
357786 |
+ .features[FEAT_8000_0001_ECX] = CPUID_EXT3_SSE4A | CPUID_EXT3_ABM |
|
|
|
357786 |
+ CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
|
|
|
357786 |
+ .xlevel = 0x8000000A,
|
|
|
357786 |
+ .model_id = "QEMU Virtual CPU version (cpu64-rhel6)",
|
|
|
357786 |
+ },
|
|
|
357786 |
+ {
|
|
|
357786 |
.name = "Conroe",
|
|
|
357786 |
.level = 10,
|
|
|
357786 |
.vendor = CPUID_VENDOR_INTEL,
|
|
|
357786 |
@@ -4764,11 +4783,13 @@ static Property x86_cpu_properties[] = {
|
|
|
9bac43 |
DEFINE_PROP_BOOL("hv-vapic", X86CPU, hyperv_vapic, false),
|
|
|
9bac43 |
DEFINE_PROP_BOOL("hv-time", X86CPU, hyperv_time, false),
|
|
|
9bac43 |
DEFINE_PROP_BOOL("hv-crash", X86CPU, hyperv_crash, false),
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
9bac43 |
DEFINE_PROP_BOOL("hv-reset", X86CPU, hyperv_reset, false),
|
|
|
9bac43 |
DEFINE_PROP_BOOL("hv-vpindex", X86CPU, hyperv_vpindex, false),
|
|
|
9bac43 |
DEFINE_PROP_BOOL("hv-runtime", X86CPU, hyperv_runtime, false),
|
|
|
9bac43 |
DEFINE_PROP_BOOL("hv-synic", X86CPU, hyperv_synic, false),
|
|
|
9bac43 |
DEFINE_PROP_BOOL("hv-stimer", X86CPU, hyperv_stimer, false),
|
|
|
9bac43 |
+#endif
|
|
|
357786 |
DEFINE_PROP_BOOL("hv-frequencies", X86CPU, hyperv_frequencies, false),
|
|
|
9bac43 |
DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true),
|
|
|
9bac43 |
DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false),
|
|
|
9bac43 |
diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
|
|
|
357786 |
index 6c9bfde..77cb298 100644
|
|
|
9bac43 |
--- a/target/ppc/cpu-models.c
|
|
|
9bac43 |
+++ b/target/ppc/cpu-models.c
|
|
|
357786 |
@@ -65,6 +65,7 @@
|
|
|
9bac43 |
#define POWERPC_DEF(_name, _pvr, _type, _desc) \
|
|
|
9bac43 |
POWERPC_DEF_SVR(_name, _desc, _pvr, POWERPC_SVR_NONE, _type)
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Embedded and 32-bit CPUs disabled for Red Hat Enterprise Linux */
|
|
|
9bac43 |
/* Embedded PowerPC */
|
|
|
9bac43 |
/* PowerPC 401 family */
|
|
|
9bac43 |
POWERPC_DEF("401", CPU_POWERPC_401, 401,
|
|
|
357786 |
@@ -739,10 +740,13 @@
|
|
|
9bac43 |
"PowerPC 7447A v1.2 (G4)")
|
|
|
357786 |
POWERPC_DEF("7457a_v1.2", CPU_POWERPC_74x7A_v12, 7455,
|
|
|
9bac43 |
"PowerPC 7457A v1.2 (G4)")
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
/* 64 bits PowerPC */
|
|
|
9bac43 |
#if defined (TARGET_PPC64)
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
357786 |
POWERPC_DEF("power5+_v2.1", CPU_POWERPC_POWER5P_v21, POWER5P,
|
|
|
357786 |
"POWER5+ v2.1")
|
|
|
9bac43 |
+#endif
|
|
|
357786 |
POWERPC_DEF("power7_v2.3", CPU_POWERPC_POWER7_v23, POWER7,
|
|
|
9bac43 |
"POWER7 v2.3")
|
|
|
357786 |
POWERPC_DEF("power7+_v2.1", CPU_POWERPC_POWER7P_v21, POWER7,
|
|
|
357786 |
@@ -753,14 +757,17 @@
|
|
|
9bac43 |
"POWER8 v2.0")
|
|
|
357786 |
POWERPC_DEF("power8nvl_v1.0", CPU_POWERPC_POWER8NVL_v10, POWER8,
|
|
|
9bac43 |
"POWER8NVL v1.0")
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
9bac43 |
POWERPC_DEF("970_v2.2", CPU_POWERPC_970_v22, 970,
|
|
|
9bac43 |
"PowerPC 970 v2.2")
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
|
|
|
357786 |
POWERPC_DEF("power9_v1.0", CPU_POWERPC_POWER9_DD1, POWER9,
|
|
|
9bac43 |
"POWER9 v1.0")
|
|
|
357786 |
POWERPC_DEF("power9_v2.0", CPU_POWERPC_POWER9_DD20, POWER9,
|
|
|
357786 |
"POWER9 v2.0")
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
9bac43 |
POWERPC_DEF("970fx_v1.0", CPU_POWERPC_970FX_v10, 970,
|
|
|
9bac43 |
"PowerPC 970FX v1.0 (G5)")
|
|
|
9bac43 |
POWERPC_DEF("970fx_v2.0", CPU_POWERPC_970FX_v20, 970,
|
|
|
357786 |
@@ -775,12 +782,14 @@
|
|
|
9bac43 |
"PowerPC 970MP v1.0")
|
|
|
9bac43 |
POWERPC_DEF("970mp_v1.1", CPU_POWERPC_970MP_v11, 970,
|
|
|
9bac43 |
"PowerPC 970MP v1.1")
|
|
|
9bac43 |
+#endif
|
|
|
357786 |
#endif /* defined (TARGET_PPC64) */
|
|
|
357786 |
|
|
|
357786 |
/***************************************************************************/
|
|
|
9bac43 |
/* PowerPC CPU aliases */
|
|
|
9bac43 |
|
|
|
9bac43 |
PowerPCCPUAlias ppc_cpu_aliases[] = {
|
|
|
9bac43 |
+#if 0 /* Embedded and 32-bit CPUs disabled for Red Hat Enterprise Linux */
|
|
|
357786 |
{ "403", "403gc" },
|
|
|
357786 |
{ "405", "405d4" },
|
|
|
357786 |
{ "405cr", "405crc" },
|
|
|
357786 |
@@ -939,20 +948,25 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
|
|
|
357786 |
{ "7447a", "7447a_v1.2" },
|
|
|
357786 |
{ "7457a", "7457a_v1.2" },
|
|
|
357786 |
{ "apollo7pm", "7457a_v1.0" },
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
#if defined(TARGET_PPC64)
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
357786 |
{ "power5+", "power5+_v2.1" },
|
|
|
357786 |
{ "power5gs", "power5+_v2.1" },
|
|
|
9bac43 |
+#endif
|
|
|
357786 |
{ "power7", "power7_v2.3" },
|
|
|
357786 |
{ "power7+", "power7+_v2.1" },
|
|
|
357786 |
{ "power8e", "power8e_v2.1" },
|
|
|
357786 |
{ "power8", "power8_v2.0" },
|
|
|
357786 |
{ "power8nvl", "power8nvl_v1.0" },
|
|
|
357786 |
{ "power9", "power9_v2.0" },
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
9bac43 |
{ "970", "970_v2.2" },
|
|
|
9bac43 |
{ "970fx", "970fx_v3.1" },
|
|
|
9bac43 |
{ "970mp", "970mp_v1.1" },
|
|
|
9bac43 |
#endif
|
|
|
9bac43 |
-
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
9bac43 |
/* Generic PowerPCs */
|
|
|
9bac43 |
#if defined(TARGET_PPC64)
|
|
|
357786 |
{ "ppc64", "970fx_v3.1" },
|
|
|
357786 |
@@ -960,5 +974,6 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
|
|
|
9bac43 |
{ "ppc32", "604" },
|
|
|
357786 |
{ "ppc", "604" },
|
|
|
357786 |
{ "default", "604" },
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
{ NULL, NULL }
|
|
|
9bac43 |
};
|
|
|
357786 |
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
|
|
|
357786 |
index 2741b68..c4016e0 100644
|
|
|
357786 |
--- a/target/s390x/cpu_models.c
|
|
|
357786 |
+++ b/target/s390x/cpu_models.c
|
|
|
357786 |
@@ -372,6 +372,9 @@ static void check_unavailable_features(const S390CPUModel *max_model,
|
|
|
357786 |
(max_model->def->gen == model->def->gen &&
|
|
|
357786 |
max_model->def->ec_ga < model->def->ec_ga)) {
|
|
|
357786 |
list_add_feat("type", unavailable);
|
|
|
357786 |
+ } else if (model->def->gen < 11 && kvm_enabled()) {
|
|
|
357786 |
+ /* Older CPU models are not supported on Red Hat Enterprise Linux */
|
|
|
357786 |
+ list_add_feat("type", unavailable);
|
|
|
357786 |
}
|
|
|
357786 |
|
|
|
357786 |
/* detect missing features if any to properly report them */
|
|
|
357786 |
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
|
|
|
357786 |
index fb59d92..fbccceb 100644
|
|
|
357786 |
--- a/target/s390x/kvm.c
|
|
|
357786 |
+++ b/target/s390x/kvm.c
|
|
|
357786 |
@@ -2285,6 +2285,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
|
|
|
357786 |
error_setg(errp, "KVM doesn't support CPU models");
|
|
|
357786 |
return;
|
|
|
357786 |
}
|
|
|
357786 |
+
|
|
|
357786 |
+ /* Older CPU models are not supported on Red Hat Enterprise Linux */
|
|
|
357786 |
+ if (model->def->gen < 11) {
|
|
|
357786 |
+ error_setg(errp, "KVM: Unsupported CPU type specified: %s",
|
|
|
357786 |
+ MACHINE(qdev_get_machine())->cpu_type);
|
|
|
357786 |
+ return;
|
|
|
357786 |
+ }
|
|
|
357786 |
+
|
|
|
357786 |
prop.cpuid = s390_cpuid_from_cpu_model(model);
|
|
|
357786 |
prop.ibc = s390_ibc_from_cpu_model(model);
|
|
|
357786 |
/* configure cpu features indicated via STFL(e) */
|
|
|
9bac43 |
diff --git a/tests/Makefile.include b/tests/Makefile.include
|
|
|
357786 |
index 3b9a5e3..e4125a6 100644
|
|
|
9bac43 |
--- a/tests/Makefile.include
|
|
|
9bac43 |
+++ b/tests/Makefile.include
|
|
|
357786 |
@@ -181,8 +181,6 @@ check-qtest-generic-y += tests/device-introspect-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-generic-y = qdev-monitor.c qmp.c
|
|
|
9bac43 |
|
|
|
9bac43 |
gcov-files-ipack-y += hw/ipack/ipack.c
|
|
|
9bac43 |
-check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-ipack-y += hw/char/ipoctal232.c
|
|
|
9bac43 |
|
|
|
9bac43 |
check-qtest-virtioserial-y += tests/virtio-console-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-virtioserial-y += hw/char/virtio-console.c
|
|
|
357786 |
@@ -214,23 +212,10 @@ check-qtest-pci-y += tests/e1000e-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c
|
|
|
9bac43 |
check-qtest-pci-y += tests/rtl8139-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-pci-y += hw/net/rtl8139.c
|
|
|
9bac43 |
-check-qtest-pci-y += tests/pcnet-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-pci-y += hw/net/pcnet.c
|
|
|
9bac43 |
-gcov-files-pci-y += hw/net/pcnet-pci.c
|
|
|
9bac43 |
-check-qtest-pci-y += tests/eepro100-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-pci-y += hw/net/eepro100.c
|
|
|
9bac43 |
-check-qtest-pci-y += tests/ne2000-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-pci-y += hw/net/ne2000.c
|
|
|
9bac43 |
-check-qtest-pci-y += tests/nvme-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-pci-y += hw/block/nvme.c
|
|
|
9bac43 |
check-qtest-pci-y += tests/ac97-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-pci-y += hw/audio/ac97.c
|
|
|
9bac43 |
-check-qtest-pci-y += tests/es1370-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-pci-y += hw/audio/es1370.c
|
|
|
9bac43 |
check-qtest-pci-y += $(check-qtest-virtio-y)
|
|
|
9bac43 |
gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
|
|
|
9bac43 |
-check-qtest-pci-y += tests/tpci200-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-pci-y += hw/ipack/tpci200.c
|
|
|
9bac43 |
check-qtest-pci-y += $(check-qtest-ipack-y)
|
|
|
9bac43 |
gcov-files-pci-y += $(gcov-files-ipack-y)
|
|
|
9bac43 |
check-qtest-pci-y += tests/display-vga-test$(EXESUF)
|
|
|
357786 |
@@ -244,23 +229,21 @@ check-qtest-pci-y += tests/intel-hda-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-pci-y += hw/audio/intel-hda.c hw/audio/hda-codec.c
|
|
|
9bac43 |
check-qtest-pci-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-pci-y += hw/misc/ivshmem.c
|
|
|
9bac43 |
-check-qtest-pci-y += tests/megasas-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-pci-y += hw/scsi/megasas.c
|
|
|
9bac43 |
+#check-qtest-pci-y += tests/megasas-test$(EXESUF)
|
|
|
9bac43 |
+#gcov-files-pci-y += hw/scsi/megasas.c
|
|
|
9bac43 |
|
|
|
9bac43 |
check-qtest-i386-y = tests/endianness-test$(EXESUF)
|
|
|
9bac43 |
-check-qtest-i386-y += tests/fdc-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-i386-y = hw/block/fdc.c
|
|
|
9bac43 |
+#check-qtest-i386-y += tests/fdc-test$(EXESUF)
|
|
|
9bac43 |
+#gcov-files-i386-y = hw/block/fdc.c
|
|
|
9bac43 |
check-qtest-i386-y += tests/ide-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-i386-y += tests/ahci-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-i386-y += hw/block/hd-geometry.c
|
|
|
9bac43 |
check-qtest-i386-y += tests/boot-order-test$(EXESUF)
|
|
|
9bac43 |
-check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
|
|
|
9bac43 |
+#check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-i386-y += tests/boot-serial-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-i386-y += tests/rtc-test$(EXESUF)
|
|
|
9bac43 |
-check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF)
|
|
|
9bac43 |
-check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-i386-y += tests/drive_del-test$(EXESUF)
|
|
|
357786 |
@@ -269,8 +252,6 @@ check-qtest-i386-y += tests/tco-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
|
|
|
9bac43 |
check-qtest-i386-y += $(check-qtest-pci-y)
|
|
|
9bac43 |
gcov-files-i386-y += $(gcov-files-pci-y)
|
|
|
9bac43 |
-check-qtest-i386-y += tests/vmxnet3-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-i386-y += hw/net/vmxnet3.c
|
|
|
9bac43 |
gcov-files-i386-y += hw/net/net_rx_pkt.c
|
|
|
9bac43 |
gcov-files-i386-y += hw/net/net_tx_pkt.c
|
|
|
9bac43 |
check-qtest-i386-y += tests/pvpanic-test$(EXESUF)
|
|
|
357786 |
@@ -279,8 +260,6 @@ check-qtest-i386-y += tests/i82801b11-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-i386-y += hw/pci-bridge/i82801b11.c
|
|
|
9bac43 |
check-qtest-i386-y += tests/ioh3420-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-i386-y += hw/pci-bridge/ioh3420.c
|
|
|
9bac43 |
-check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
|
9bac43 |
-gcov-files-i386-y += hw/usb/hcd-ohci.c
|
|
|
9bac43 |
check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-i386-y += hw/usb/hcd-uhci.c
|
|
|
9bac43 |
check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
|
|
|
357786 |
@@ -306,7 +285,7 @@ check-qtest-i386-y += tests/migration-test$(EXESUF)
|
|
|
357786 |
check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)
|
|
|
357786 |
check-qtest-i386-y += tests/numa-test$(EXESUF)
|
|
|
357786 |
check-qtest-x86_64-y += $(check-qtest-i386-y)
|
|
|
357786 |
-check-qtest-x86_64-y += tests/sdhci-test$(EXESUF)
|
|
|
357786 |
+#check-qtest-x86_64-y += tests/sdhci-test$(EXESUF)
|
|
|
357786 |
gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
|
|
|
357786 |
gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
|
|
|
357786 |
|
|
|
357786 |
@@ -328,7 +307,7 @@ check-qtest-moxie-y = tests/boot-serial-test$(EXESUF)
|
|
|
9bac43 |
|
|
|
9bac43 |
check-qtest-ppc-y = tests/endianness-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
|
|
|
9bac43 |
-check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
|
|
|
9bac43 |
+#check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-ppc-y += tests/boot-serial-test$(EXESUF)
|
|
|
357786 |
check-qtest-ppc-y += tests/m48t59-test$(EXESUF)
|
|
|
357786 |
@@ -342,19 +321,19 @@ check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
|
|
|
357786 |
check-qtest-ppc64-y += tests/migration-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
|
|
|
9bac43 |
-check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
|
9bac43 |
+#check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-ppc64-y += hw/usb/hcd-ohci.c
|
|
|
9bac43 |
-check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
|
|
|
9bac43 |
+#check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-ppc64-y += hw/usb/hcd-uhci.c
|
|
|
9bac43 |
check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
|
|
|
9bac43 |
gcov-files-ppc64-y += hw/usb/hcd-xhci.c
|
|
|
9bac43 |
check-qtest-ppc64-y += $(check-qtest-virtio-y)
|
|
|
9bac43 |
-check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
|
|
|
357786 |
-check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
|
|
|
357786 |
-check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
|
|
|
9bac43 |
+#check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
|
|
|
357786 |
+#check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
|
|
|
357786 |
+#check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
|
|
|
9bac43 |
check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
|
|
|
9bac43 |
check-qtest-ppc64-y += tests/numa-test$(EXESUF)
|
|
|
9bac43 |
-check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
|
|
|
9bac43 |
+#check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
|
|
|
357786 |
check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)
|
|
|
9bac43 |
|
|
|
9bac43 |
check-qtest-sh4-y = tests/endianness-test$(EXESUF)
|
|
|
357786 |
@@ -379,10 +358,10 @@ gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c
|
|
|
9bac43 |
check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)
|
|
|
9bac43 |
gcov-files-arm-y += hw/timer/arm_mptimer.c
|
|
|
357786 |
check-qtest-arm-y += tests/boot-serial-test$(EXESUF)
|
|
|
357786 |
-check-qtest-arm-y += tests/sdhci-test$(EXESUF)
|
|
|
357786 |
+#check-qtest-arm-y += tests/sdhci-test$(EXESUF)
|
|
|
9bac43 |
|
|
|
9bac43 |
-check-qtest-aarch64-y = tests/numa-test$(EXESUF)
|
|
|
357786 |
-check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
|
|
|
9bac43 |
+#check-qtest-aarch64-y = tests/numa-test$(EXESUF)
|
|
|
357786 |
+#check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
|
|
|
357786 |
check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
|
|
|
9bac43 |
|
|
|
9bac43 |
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
|
|
|
357786 |
@@ -757,17 +736,15 @@ tests/rtc-test$(EXESUF): tests/rtc-test.o
|
|
|
9bac43 |
tests/m48t59-test$(EXESUF): tests/m48t59-test.o
|
|
|
9bac43 |
tests/endianness-test$(EXESUF): tests/endianness-test.o
|
|
|
9bac43 |
tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y)
|
|
|
9bac43 |
-tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)
|
|
|
9bac43 |
+#tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)
|
|
|
9bac43 |
tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y)
|
|
|
9bac43 |
-tests/fdc-test$(EXESUF): tests/fdc-test.o
|
|
|
9bac43 |
+#tests/fdc-test$(EXESUF): tests/fdc-test.o
|
|
|
9bac43 |
tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)
|
|
|
9bac43 |
tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y)
|
|
|
9bac43 |
-tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o
|
|
|
9bac43 |
-tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
|
|
|
9bac43 |
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
|
|
|
9bac43 |
tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y)
|
|
|
9bac43 |
tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y)
|
|
|
9bac43 |
-tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
|
|
|
9bac43 |
+#tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
|
|
|
9bac43 |
tests/boot-sector.o tests/acpi-utils.o $(libqos-obj-y)
|
|
|
9bac43 |
tests/pxe-test$(EXESUF): tests/pxe-test.o tests/boot-sector.o $(libqos-obj-y)
|
|
|
9bac43 |
tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
|
|
|
357786 |
@@ -779,11 +756,8 @@ tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
|
|
|
9bac43 |
tests/e1000-test$(EXESUF): tests/e1000-test.o
|
|
|
9bac43 |
tests/e1000e-test$(EXESUF): tests/e1000e-test.o $(libqos-pc-obj-y)
|
|
|
9bac43 |
tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)
|
|
|
9bac43 |
-tests/pcnet-test$(EXESUF): tests/pcnet-test.o
|
|
|
9bac43 |
-tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
|
|
|
9bac43 |
+#tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
|
|
|
9bac43 |
tests/eepro100-test$(EXESUF): tests/eepro100-test.o
|
|
|
9bac43 |
-tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
|
|
|
9bac43 |
-tests/ne2000-test$(EXESUF): tests/ne2000-test.o
|
|
|
9bac43 |
tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o
|
|
|
9bac43 |
tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y)
|
|
|
357786 |
tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o $(libqos-virtio-obj-y)
|
|
|
357786 |
@@ -802,14 +776,11 @@ tests/test-hmp$(EXESUF): tests/test-hmp.o
|
|
|
357786 |
tests/machine-none-test$(EXESUF): tests/machine-none-test.o
|
|
|
357786 |
tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-virtio-obj-y)
|
|
|
9bac43 |
tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y)
|
|
|
9bac43 |
-tests/nvme-test$(EXESUF): tests/nvme-test.o
|
|
|
9bac43 |
tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o
|
|
|
9bac43 |
tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o
|
|
|
9bac43 |
tests/ac97-test$(EXESUF): tests/ac97-test.o
|
|
|
9bac43 |
-tests/es1370-test$(EXESUF): tests/es1370-test.o
|
|
|
9bac43 |
tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o
|
|
|
9bac43 |
tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o
|
|
|
9bac43 |
-tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
|
|
|
9bac43 |
tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
|
|
|
9bac43 |
tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
|
|
|
9bac43 |
tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
|
|
|
357786 |
@@ -827,14 +798,14 @@ tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
|
|
|
9bac43 |
tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)
|
|
|
9bac43 |
tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y)
|
|
|
9bac43 |
tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
|
|
|
9bac43 |
-tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y)
|
|
|
9bac43 |
+#tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y)
|
|
|
357786 |
tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
|
|
|
9bac43 |
tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
|
|
|
9bac43 |
tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o
|
|
|
357786 |
tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y)
|
|
|
357786 |
tests/numa-test$(EXESUF): tests/numa-test.o
|
|
|
357786 |
tests/vmgenid-test$(EXESUF): tests/vmgenid-test.o tests/boot-sector.o tests/acpi-utils.o
|
|
|
357786 |
-tests/sdhci-test$(EXESUF): tests/sdhci-test.o $(libqos-pc-obj-y)
|
|
|
357786 |
+#tests/sdhci-test$(EXESUF): tests/sdhci-test.o $(libqos-pc-obj-y)
|
|
|
357786 |
|
|
|
357786 |
tests/migration/stress$(EXESUF): tests/migration/stress.o
|
|
|
357786 |
$(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"LINK","$(TARGET_DIR)$@")
|
|
|
9bac43 |
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
|
|
|
357786 |
index bf3e193..715f90c 100644
|
|
|
9bac43 |
--- a/tests/bios-tables-test.c
|
|
|
9bac43 |
+++ b/tests/bios-tables-test.c
|
|
|
357786 |
@@ -736,6 +736,7 @@ static void test_acpi_q35_tcg_cphp(void)
|
|
|
9bac43 |
free_test_data(&data);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
static uint8_t ipmi_required_struct_types[] = {
|
|
|
9bac43 |
0, 1, 3, 4, 16, 17, 19, 32, 38, 127
|
|
|
9bac43 |
};
|
|
|
357786 |
@@ -772,6 +773,7 @@ static void test_acpi_piix4_tcg_ipmi(void)
|
|
|
9bac43 |
&data);
|
|
|
9bac43 |
free_test_data(&data);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
|
|
|
9bac43 |
static void test_acpi_q35_tcg_memhp(void)
|
|
|
9bac43 |
{
|
|
|
357786 |
@@ -875,8 +877,10 @@ int main(int argc, char *argv[])
|
|
|
9bac43 |
qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
|
|
|
9bac43 |
qtest_add_func("acpi/q35", test_acpi_q35_tcg);
|
|
|
9bac43 |
qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
|
|
|
9bac43 |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
qtest_add_func("acpi/piix4/ipmi", test_acpi_piix4_tcg_ipmi);
|
|
|
9bac43 |
qtest_add_func("acpi/q35/ipmi", test_acpi_q35_tcg_ipmi);
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
qtest_add_func("acpi/piix4/cpuhp", test_acpi_piix4_tcg_cphp);
|
|
|
9bac43 |
qtest_add_func("acpi/q35/cpuhp", test_acpi_q35_tcg_cphp);
|
|
|
9bac43 |
qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_tcg_memhp);
|
|
|
9bac43 |
diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
|
|
|
357786 |
index e70f5de..1be0731 100644
|
|
|
9bac43 |
--- a/tests/boot-order-test.c
|
|
|
9bac43 |
+++ b/tests/boot-order-test.c
|
|
|
357786 |
@@ -106,6 +106,7 @@ static void test_pc_boot_order(void)
|
|
|
9bac43 |
test_boot_orders(NULL, read_boot_order_pc, test_cases_pc);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
9bac43 |
static uint8_t read_m48t59(uint64_t addr, uint16_t reg)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
writeb(addr, reg & 0xff);
|
|
|
357786 |
@@ -136,6 +137,7 @@ static uint64_t read_boot_order_pmac(void)
|
|
|
9bac43 |
|
|
|
9bac43 |
return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+#endif /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
9bac43 |
|
|
|
9bac43 |
static const boot_order_test test_cases_fw_cfg[] = {
|
|
|
9bac43 |
{ "", 'c', 'c' },
|
|
|
357786 |
@@ -145,6 +147,7 @@ static const boot_order_test test_cases_fw_cfg[] = {
|
|
|
9bac43 |
{}
|
|
|
9bac43 |
};
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
9bac43 |
static void test_pmac_oldworld_boot_order(void)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
test_boot_orders("g3beige", read_boot_order_pmac, test_cases_fw_cfg);
|
|
|
357786 |
@@ -153,7 +156,9 @@ static void test_pmac_oldworld_boot_order(void)
|
|
|
9bac43 |
static void test_pmac_newworld_boot_order(void)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
test_boot_orders("mac99", read_boot_order_pmac, test_cases_fw_cfg);
|
|
|
9bac43 |
+
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+#endif /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
9bac43 |
|
|
|
9bac43 |
static uint64_t read_boot_order_sun4m(void)
|
|
|
9bac43 |
{
|
|
|
357786 |
@@ -188,11 +193,13 @@ int main(int argc, char *argv[])
|
|
|
9bac43 |
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
|
|
|
9bac43 |
qtest_add_func("boot-order/pc", test_pc_boot_order);
|
|
|
9bac43 |
} else if (strcmp(arch, "ppc") == 0 || strcmp(arch, "ppc64") == 0) {
|
|
|
9bac43 |
+#if 0 /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
9bac43 |
qtest_add_func("boot-order/prep", test_prep_boot_order);
|
|
|
9bac43 |
qtest_add_func("boot-order/pmac_oldworld",
|
|
|
9bac43 |
test_pmac_oldworld_boot_order);
|
|
|
9bac43 |
qtest_add_func("boot-order/pmac_newworld",
|
|
|
9bac43 |
test_pmac_newworld_boot_order);
|
|
|
9bac43 |
+#endif /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
9bac43 |
} else if (strcmp(arch, "sparc") == 0) {
|
|
|
9bac43 |
qtest_add_func("boot-order/sun4m", test_sun4m_boot_order);
|
|
|
9bac43 |
} else if (strcmp(arch, "sparc64") == 0) {
|
|
|
9bac43 |
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
|
|
|
357786 |
index 011525d..dc682c1 100644
|
|
|
9bac43 |
--- a/tests/boot-serial-test.c
|
|
|
9bac43 |
+++ b/tests/boot-serial-test.c
|
|
|
357786 |
@@ -73,7 +73,7 @@ typedef struct testdef {
|
|
|
357786 |
} testdef_t;
|
|
|
357786 |
|
|
|
357786 |
static testdef_t tests[] = {
|
|
|
357786 |
- { "alpha", "clipper", "", "PCI:" },
|
|
|
357786 |
+/* { "alpha", "clipper", "", "PCI:" },
|
|
|
9bac43 |
{ "ppc", "ppce500", "", "U-Boot" },
|
|
|
357786 |
{ "ppc", "prep", "-m 96", "Memory size: 96 MB" },
|
|
|
357786 |
{ "ppc", "40p", "-boot d", "Booting from device d" },
|
|
|
357786 |
@@ -83,14 +83,14 @@ static testdef_t tests[] = {
|
|
|
357786 |
{ "ppc64", "ppce500", "", "U-Boot" },
|
|
|
357786 |
{ "ppc64", "prep", "-boot e", "Booting from device e" },
|
|
|
357786 |
{ "ppc64", "40p", "-m 192", "Memory size: 192 MB" },
|
|
|
357786 |
- { "ppc64", "mac99", "", "PowerPC,970FX" },
|
|
|
357786 |
+ { "ppc64", "mac99", "", "PowerPC,970FX" },*/
|
|
|
9bac43 |
{ "ppc64", "pseries", "", "Open Firmware" },
|
|
|
357786 |
- { "ppc64", "powernv", "-cpu POWER8", "OPAL" },
|
|
|
357786 |
- { "ppc64", "sam460ex", "-device e1000", "8086 100e" },
|
|
|
357786 |
+/* { "ppc64", "powernv", "-cpu POWER8", "OPAL" },
|
|
|
357786 |
+ { "ppc64", "sam460ex", "-device e1000", "8086 100e" },*/
|
|
|
9bac43 |
{ "i386", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
|
9bac43 |
{ "i386", "pc", "-device sga", "SGABIOS" },
|
|
|
9bac43 |
{ "i386", "q35", "-device sga", "SGABIOS" },
|
|
|
9bac43 |
- { "x86_64", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
|
9bac43 |
+ { "x86_64", "pc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
|
9bac43 |
{ "x86_64", "q35", "-device sga", "SGABIOS" },
|
|
|
357786 |
{ "sparc", "LX", "", "TMS390S10" },
|
|
|
357786 |
{ "sparc", "SS-4", "", "MB86904" },
|
|
|
9bac43 |
diff --git a/tests/e1000-test.c b/tests/e1000-test.c
|
|
|
9bac43 |
index 0c5fcdc..0504d33 100644
|
|
|
9bac43 |
--- a/tests/e1000-test.c
|
|
|
9bac43 |
+++ b/tests/e1000-test.c
|
|
|
9bac43 |
@@ -29,8 +29,10 @@ static void test_device(gconstpointer data)
|
|
|
9bac43 |
static const char *models[] = {
|
|
|
9bac43 |
"e1000",
|
|
|
9bac43 |
"e1000-82540em",
|
|
|
9bac43 |
+#if 0 /* Disabled in Red Hat Enterprise Linux 7 */
|
|
|
9bac43 |
"e1000-82544gc",
|
|
|
9bac43 |
"e1000-82545em",
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
};
|
|
|
9bac43 |
|
|
|
9bac43 |
int main(int argc, char **argv)
|
|
|
9bac43 |
diff --git a/tests/endianness-test.c b/tests/endianness-test.c
|
|
|
357786 |
index 546e096..1bd87db 100644
|
|
|
9bac43 |
--- a/tests/endianness-test.c
|
|
|
9bac43 |
+++ b/tests/endianness-test.c
|
|
|
9bac43 |
@@ -34,6 +34,7 @@ static const TestCase test_cases[] = {
|
|
|
9bac43 |
{ "mips64", "mips", 0x14000000, .bswap = true },
|
|
|
9bac43 |
{ "mips64", "malta", 0x10000000, .bswap = true },
|
|
|
9bac43 |
{ "mips64el", "fulong2e", 0x1fd00000 },
|
|
|
9bac43 |
+#if 0 /* Disabled for RHEL, since ISA is not enabled */
|
|
|
9bac43 |
{ "ppc", "g3beige", 0xfe000000, .bswap = true, .superio = "i82378" },
|
|
|
9bac43 |
{ "ppc", "prep", 0x80000000, .bswap = true },
|
|
|
9bac43 |
{ "ppc", "bamboo", 0xe8000000, .bswap = true, .superio = "i82378" },
|
|
|
9bac43 |
@@ -41,6 +42,7 @@ static const TestCase test_cases[] = {
|
|
|
9bac43 |
{ "ppc64", "pseries", (1ULL << 45), .bswap = true, .superio = "i82378" },
|
|
|
9bac43 |
{ "ppc64", "pseries-2.7", 0x10080000000ULL,
|
|
|
9bac43 |
.bswap = true, .superio = "i82378" },
|
|
|
9bac43 |
+#endif /* Disabled for RHEL, since ISA is not enabled */
|
|
|
9bac43 |
{ "sh4", "r2d", 0xfe240000, .superio = "i82378" },
|
|
|
9bac43 |
{ "sh4eb", "r2d", 0xfe240000, .bswap = true, .superio = "i82378" },
|
|
|
9bac43 |
{ "sparc64", "sun4u", 0x1fe02000000LL, .bswap = true },
|
|
|
9bac43 |
diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c
|
|
|
357786 |
index 8af16ee..df2eb50 100644
|
|
|
9bac43 |
--- a/tests/ivshmem-test.c
|
|
|
9bac43 |
+++ b/tests/ivshmem-test.c
|
|
|
357786 |
@@ -257,6 +257,7 @@ static void test_ivshmem_pair(void)
|
|
|
9bac43 |
g_free(data);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
typedef struct ServerThread {
|
|
|
9bac43 |
GThread *thread;
|
|
|
9bac43 |
IvshmemServer *server;
|
|
|
357786 |
@@ -414,9 +415,11 @@ static void test_ivshmem_server_irq(void)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
test_ivshmem_server(false);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
|
|
|
9bac43 |
#define PCI_SLOT_HP 0x06
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Test uses legacy ivshmem, which is disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
static void test_ivshmem_hotplug(void)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
const char *arch = qtest_get_arch();
|
|
|
357786 |
@@ -434,6 +437,7 @@ static void test_ivshmem_hotplug(void)
|
|
|
9bac43 |
qtest_end();
|
|
|
9bac43 |
g_free(opts);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
|
|
|
9bac43 |
static void test_ivshmem_memdev(void)
|
|
|
9bac43 |
{
|
|
|
357786 |
@@ -501,7 +505,7 @@ static gchar *mktempshm(int size, int *fd)
|
|
|
9bac43 |
int main(int argc, char **argv)
|
|
|
9bac43 |
{
|
|
|
9bac43 |
int ret, fd;
|
|
|
9bac43 |
- const char *arch = qtest_get_arch();
|
|
|
9bac43 |
+/* const char *arch = qtest_get_arch(); */
|
|
|
9bac43 |
gchar dir[] = "/tmp/ivshmem-test.XXXXXX";
|
|
|
9bac43 |
|
|
|
9bac43 |
#if !GLIB_CHECK_VERSION(2, 31, 0)
|
|
|
357786 |
@@ -528,14 +532,18 @@ int main(int argc, char **argv)
|
|
|
9bac43 |
tmpserver = g_strconcat(tmpdir, "/server", NULL);
|
|
|
9bac43 |
|
|
|
9bac43 |
qtest_add_func("/ivshmem/single", test_ivshmem_single);
|
|
|
9bac43 |
+#if 0 /* Test uses legacy ivshmem, which is disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
qtest_add_func("/ivshmem/hotplug", test_ivshmem_hotplug);
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
qtest_add_func("/ivshmem/memdev", test_ivshmem_memdev);
|
|
|
9bac43 |
if (g_test_slow()) {
|
|
|
9bac43 |
qtest_add_func("/ivshmem/pair", test_ivshmem_pair);
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux: */
|
|
|
9bac43 |
if (strcmp(arch, "ppc64") != 0) {
|
|
|
9bac43 |
qtest_add_func("/ivshmem/server-msi", test_ivshmem_server_msi);
|
|
|
9bac43 |
qtest_add_func("/ivshmem/server-irq", test_ivshmem_server_irq);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
ret = g_test_run();
|
|
|
9bac43 |
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
|
|
|
357786 |
index f617e25..69d34eb 100755
|
|
|
9bac43 |
--- a/tests/qemu-iotests/051
|
|
|
9bac43 |
+++ b/tests/qemu-iotests/051
|
|
|
357786 |
@@ -168,11 +168,11 @@ run_qemu -drive if=virtio
|
|
|
9bac43 |
case "$QEMU_DEFAULT_MACHINE" in
|
|
|
9bac43 |
pc)
|
|
|
9bac43 |
run_qemu -drive if=none,id=disk -device ide-cd,drive=disk
|
|
|
9bac43 |
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
9bac43 |
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
9bac43 |
run_qemu -drive if=none,id=disk -device ide-drive,drive=disk
|
|
|
9bac43 |
run_qemu -drive if=none,id=disk -device ide-hd,drive=disk
|
|
|
9bac43 |
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
9bac43 |
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
9bac43 |
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
9bac43 |
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
9bac43 |
;;
|
|
|
9bac43 |
*)
|
|
|
9bac43 |
;;
|
|
|
357786 |
@@ -197,11 +197,11 @@ run_qemu -drive file="$TEST_IMG",if=virtio,readonly=on
|
|
|
9bac43 |
case "$QEMU_DEFAULT_MACHINE" in
|
|
|
9bac43 |
pc)
|
|
|
9bac43 |
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-cd,drive=disk
|
|
|
9bac43 |
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
9bac43 |
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
9bac43 |
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-drive,drive=disk
|
|
|
9bac43 |
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-hd,drive=disk
|
|
|
9bac43 |
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
9bac43 |
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
9bac43 |
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
9bac43 |
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
9bac43 |
;;
|
|
|
9bac43 |
*)
|
|
|
9bac43 |
;;
|
|
|
9bac43 |
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
|
|
|
357786 |
index 52a80f3..99777ec 100644
|
|
|
9bac43 |
--- a/tests/qemu-iotests/group
|
|
|
9bac43 |
+++ b/tests/qemu-iotests/group
|
|
|
9bac43 |
@@ -77,7 +77,7 @@
|
|
|
9bac43 |
068 rw auto quick
|
|
|
9bac43 |
069 rw auto quick
|
|
|
9bac43 |
070 rw auto quick
|
|
|
9bac43 |
-071 rw auto quick
|
|
|
9bac43 |
+# 071 rw auto quick -- requires whitelisted blkverify
|
|
|
9bac43 |
072 rw auto quick
|
|
|
9bac43 |
073 rw auto quick
|
|
|
9bac43 |
074 rw auto quick
|
|
|
9bac43 |
@@ -105,7 +105,7 @@
|
|
|
9bac43 |
096 rw auto quick
|
|
|
9bac43 |
097 rw auto backing
|
|
|
9bac43 |
098 rw auto backing quick
|
|
|
9bac43 |
-099 rw auto quick
|
|
|
9bac43 |
+# 099 rw auto quick -- requires whitelisted blkverify
|
|
|
9bac43 |
# 100 was removed, do not reuse
|
|
|
9bac43 |
101 rw auto quick
|
|
|
9bac43 |
102 rw auto quick
|
|
|
9bac43 |
diff --git a/tests/qom-test.c b/tests/qom-test.c
|
|
|
357786 |
index a34ff6b..db0d3ab 100644
|
|
|
9bac43 |
--- a/tests/qom-test.c
|
|
|
9bac43 |
+++ b/tests/qom-test.c
|
|
|
357786 |
@@ -16,7 +16,9 @@
|
|
|
357786 |
#include "libqtest.h"
|
|
|
9bac43 |
|
|
|
9bac43 |
static const char *blacklist_x86[] = {
|
|
|
9bac43 |
- "xenfv", "xenpv", NULL
|
|
|
357786 |
+ "xenfv", "xenpv", "isapc",
|
|
|
9bac43 |
+ "rhel6.6.0", "rhel6.5.0", "rhel6.4.0", "rhel6.3.0",
|
|
|
9bac43 |
+ "rhel6.2.0", "rhel6.1.0", "rhel6.0.0", NULL
|
|
|
9bac43 |
};
|
|
|
9bac43 |
|
|
|
9bac43 |
static const struct {
|
|
|
357786 |
diff --git a/tests/test-hmp.c b/tests/test-hmp.c
|
|
|
357786 |
index 5352c9c..674dd64 100644
|
|
|
357786 |
--- a/tests/test-hmp.c
|
|
|
357786 |
+++ b/tests/test-hmp.c
|
|
|
357786 |
@@ -139,7 +139,7 @@ static void add_machine_test_case(const char *mname)
|
|
|
357786 |
char *path;
|
|
|
357786 |
|
|
|
357786 |
/* Ignore blacklisted machines that have known problems */
|
|
|
357786 |
- if (!strcmp("xenfv", mname) || !strcmp("xenpv", mname)) {
|
|
|
357786 |
+ if (!strcmp("xenfv", mname) || !strcmp("xenpv", mname) || !strcmp("isapc", mname)) {
|
|
|
357786 |
return;
|
|
|
357786 |
}
|
|
|
357786 |
|
|
|
9bac43 |
diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c
|
|
|
357786 |
index 02e4184..9e4a508 100644
|
|
|
9bac43 |
--- a/tests/test-x86-cpuid-compat.c
|
|
|
9bac43 |
+++ b/tests/test-x86-cpuid-compat.c
|
|
|
357786 |
@@ -306,6 +306,7 @@ int main(int argc, char **argv)
|
|
|
9bac43 |
"-cpu 486,xlevel2=0xC0000002,+xstore",
|
|
|
9bac43 |
"xlevel2", 0xC0000002);
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
9bac43 |
/* Check compatibility of old machine-types that didn't
|
|
|
9bac43 |
* auto-increase level/xlevel/xlevel2: */
|
|
|
9bac43 |
|
|
|
357786 |
@@ -356,6 +357,7 @@ int main(int argc, char **argv)
|
|
|
9bac43 |
add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on",
|
|
|
9bac43 |
"-machine pc-i440fx-2.4 -cpu SandyBridge,+npt",
|
|
|
9bac43 |
"xlevel", 0x80000008);
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
|
|
|
9bac43 |
/* Test feature parsing */
|
|
|
9bac43 |
add_feature_test("x86/cpuid/features/plus",
|
|
|
9bac43 |
diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c
|
|
|
357786 |
index 9c14e30..192b7f7 100644
|
|
|
9bac43 |
--- a/tests/usb-hcd-xhci-test.c
|
|
|
9bac43 |
+++ b/tests/usb-hcd-xhci-test.c
|
|
|
9bac43 |
@@ -21,6 +21,7 @@ static void test_xhci_hotplug(void)
|
|
|
9bac43 |
usb_test_hotplug("xhci", 1, NULL);
|
|
|
9bac43 |
}
|
|
|
9bac43 |
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */
|
|
|
9bac43 |
static void test_usb_uas_hotplug(void)
|
|
|
9bac43 |
{
|
|
|
357786 |
qtest_qmp_device_add("usb-uas", "uas", NULL);
|
|
|
357786 |
@@ -34,6 +35,7 @@ static void test_usb_uas_hotplug(void)
|
|
|
357786 |
qtest_qmp_device_del("scsihd");
|
|
|
357786 |
qtest_qmp_device_del("uas");
|
|
|
9bac43 |
}
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
|
|
|
9bac43 |
int main(int argc, char **argv)
|
|
|
9bac43 |
{
|
|
|
357786 |
@@ -43,8 +45,9 @@ int main(int argc, char **argv)
|
|
|
9bac43 |
|
|
|
9bac43 |
qtest_add_func("/xhci/pci/init", test_xhci_init);
|
|
|
9bac43 |
qtest_add_func("/xhci/pci/hotplug", test_xhci_hotplug);
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */
|
|
|
9bac43 |
qtest_add_func("/xhci/pci/hotplug/usb-uas", test_usb_uas_hotplug);
|
|
|
9bac43 |
-
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
qtest_start("-device nec-usb-xhci,id=xhci"
|
|
|
9bac43 |
" -drive id=drive0,if=none,file=null-co://,format=raw");
|
|
|
9bac43 |
ret = g_test_run();
|
|
|
9bac43 |
diff --git a/vl.c b/vl.c
|
|
|
357786 |
index fce1fd1..03950fc 100644
|
|
|
9bac43 |
--- a/vl.c
|
|
|
9bac43 |
+++ b/vl.c
|
|
|
357786 |
@@ -165,7 +165,7 @@ unsigned int max_cpus;
|
|
|
9bac43 |
int smp_cores = 1;
|
|
|
9bac43 |
int smp_threads = 1;
|
|
|
9bac43 |
int acpi_enabled = 1;
|
|
|
9bac43 |
-int no_hpet = 0;
|
|
|
9bac43 |
+int no_hpet = 1; /* Always disabled for Red Hat Enterprise Linux */
|
|
|
9bac43 |
int fd_bootchk = 1;
|
|
|
9bac43 |
static int no_reboot;
|
|
|
9bac43 |
int no_shutdown = 0;
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|