|
 |
4a2fec |
From 0e72e616b2d80e47c0eb6c5976276e9f8d920e92 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
Date: Mon, 11 Jan 2016 11:53:33 +0100
|
|
|
4a2fec |
Subject: Enable/disable devices for RHEL 7
|
|
|
4a2fec |
|
|
|
4a2fec |
This commit adds all changes related to changes in supported devices
|
|
|
4a2fec |
up to qemu-kvm-rhev-2.1.2-16.el7.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Rebase notes (2.10.0):
|
|
|
4a2fec |
- replace cannot_instantiate_with_device_add_yet with user_creatable (upstream e90f2a)
|
|
|
4a2fec |
- Comment out default configs instead of removing the options
|
|
|
4a2fec |
- Reenable test_unaligned_write_same
|
|
|
4a2fec |
- Remove default-configs changes for 32bit architectures
|
|
|
4a2fec |
- Removed unnecessary usage of user_creatable
|
|
|
4a2fec |
- Documented arm cpu changes
|
|
|
4a2fec |
|
|
|
4a2fec |
Rebase notes (2.9.0):
|
|
|
4a2fec |
- enabled CONFIG_ARM_V7M for aarch64
|
|
|
4a2fec |
- need to fix cpu mask
|
|
|
4a2fec |
- disabled some irrelevant ppc64 tests
|
|
|
4a2fec |
- Adding pxe-e1000e.rom to Inital redhat commit
|
|
|
4a2fec |
- Context changed in vfio_probe_igd_bar4_quirk (rc3)
|
|
|
4a2fec |
- Remove fdc test
|
|
|
4a2fec |
- Enabled null-co driver
|
|
|
4a2fec |
- Disabled megasas and bios-tables test
|
|
|
4a2fec |
- Disabled netfilter tests for ppc64
|
|
|
4a2fec |
- Disabled ivshmem test for ppc64
|
|
|
4a2fec |
- Disabled numa test for aarhc64
|
|
|
4a2fec |
- Add CONFIG_USB_XHCI_NEC option for ppc64
|
|
|
4a2fec |
- Enable vhost-user-scsi for ppc64 and aarch64
|
|
|
4a2fec |
- Disable ipmi_bt, ipmi_local, impi_extern for ppc64
|
|
|
4a2fec |
|
|
|
4a2fec |
Rebase notes (2.8.0):
|
|
|
4a2fec |
- Removed CONFIG_PIIX_PCI (upstream)
|
|
|
4a2fec |
- Disabled POWERNV
|
|
|
4a2fec |
- Disabled additional occurencies of prom-env-test
|
|
|
4a2fec |
- Disabled additional occurencies of usb-hcd-ohci-test and usb-hcd-uhci-test
|
|
|
4a2fec |
- Disabled unsupported machine types in boot-serieal-test
|
|
|
4a2fec |
- Disabled 2.7 machine type compatibility test in test-x86-cpuid-compat
|
|
|
4a2fec |
- Disabled pnv-xscom-test
|
|
|
4a2fec |
- Disabled RHEl 6 machine types for qom-test (failing acpi setting)
|
|
|
4a2fec |
- Added diffutils BuildRequires and diff usage for make check
|
|
|
4a2fec |
|
|
|
4a2fec |
Rebase notes (2.6.0):
|
|
|
4a2fec |
- disabled prom-env-test
|
|
|
4a2fec |
|
|
|
4a2fec |
Rebase notes (2.4.0):
|
|
|
4a2fec |
- fixed types
|
|
|
4a2fec |
- include CONFIG_PLATFORM_BUS for aarch64
|
|
|
4a2fec |
- disable failing virtio-scsi-test
|
|
|
4a2fec |
|
|
|
4a2fec |
Rebase notes (2.3.0):
|
|
|
4a2fec |
- Added USB=y in 2.3-rc2 (used instead of downstream version fora aarch64)
|
|
|
4a2fec |
|
|
|
4a2fec |
Merged patches (2.10.0):
|
|
|
4a2fec |
- e9b413e Add PCIe bridge devices for AArch64
|
|
|
4a2fec |
- a522114 s390x/virtio-ccw: Disable crypto device in downstream RHEL builds
|
|
|
4a2fec |
- 15dbf98 Disable unimplemented device
|
|
|
4a2fec |
- 5c0ea49 Disable serial-isa for ppc64
|
|
|
4a2fec |
- 728e7e8 Disable rs6000-mc device
|
|
|
4a2fec |
- 2a11896 ppc64le: Remove isabus-bridge device
|
|
|
4a2fec |
- 5c4df94 Reenable Educational device
|
|
|
4a2fec |
- a936463 aarch64: Enable usb-xhci
|
|
|
4a2fec |
- 984f5cd Enable USB_CONFIG for aarch64
|
|
|
4a2fec |
- f13b783 AArch64: Add pci-testdev
|
|
|
4a2fec |
- 81867af Disable virtio-pci for s390x builds
|
|
|
4a2fec |
- bf5f636 target/ppc: Show POWER9 in -cpu help
|
|
|
4a2fec |
|
|
|
4a2fec |
Merged patches (2.9.0):
|
|
|
4a2fec |
- 9320fc1 Fix unuseds/Fedora build
|
|
|
4a2fec |
- cb16934 config: Remove EHCI from ppc64 builds
|
|
|
4a2fec |
- 626fe4d Disable qemu,register device
|
|
|
4a2fec |
- 783a0b2 Disable vfio-pci-igd-lpc-bridge device
|
|
|
4a2fec |
- bf7c127 Disable new virtio crypto devices
|
|
|
4a2fec |
- a4d3c4e Disable amd iommu devices
|
|
|
4a2fec |
- 5396ebc Disable loader device
|
|
|
4a2fec |
- 1957779 Disable or-irq device
|
|
|
4a2fec |
- 25ee621 Hide new floppy device
|
|
|
4a2fec |
- 2bd29ed Disable devices for for AArch64 QEMU
|
|
|
4a2fec |
|
|
|
4a2fec |
Merged patches (2.7.0):
|
|
|
4a2fec |
- e2944a5 RHEL: Disable unsupported PowerPC CPU models
|
|
|
4a2fec |
- have to add additional "if 0" sections to hw/ppc/spapr_cpu_core.c
|
|
|
4a2fec |
- 81b2836 Remove unsupported VFIO devices from QEMU
|
|
|
4a2fec |
- 1248029 Disable spapr-rng
|
|
|
4a2fec |
- 351e1fb Disable Windows enlightnementas
|
|
|
4a2fec |
- 5760290 Disable mptsas1068 device
|
|
|
4a2fec |
- 0b74460 Disable sd-card
|
|
|
4a2fec |
- 2eaf71c Disable rocker device
|
|
|
4a2fec |
- e0ed699 Disable new ipmi devices
|
|
|
4a2fec |
- disable ipmi tests in bios-tables-test
|
|
|
4a2fec |
- 30e3bee Disable hyperv-testdev
|
|
|
4a2fec |
- 8a9aadf Disable allwiner_ahci device
|
|
|
4a2fec |
- a41119d Disable igd-passthrough-i440FX
|
|
|
4a2fec |
- e305bb4 Disable vfio-platform device
|
|
|
4a2fec |
- a127042 rhel: Revert unwanted inconsequential changes to ivshmem
|
|
|
4a2fec |
- ce1419c rhel: Disable ivshmem-plain migration, ivshmem-doorbell, ivshmem
|
|
|
4a2fec |
- 3f9349b q35: disable s3/s4 by default
|
|
|
4a2fec |
- 2158ca1 i8257: Set no-user flag
|
|
|
4a2fec |
- b2a3bb9 e1000e: add boot rom
|
|
|
4a2fec |
- have to add pxe-e1000e.rom to source files
|
|
|
4a2fec |
|
|
|
4a2fec |
Merged patches (2.6.0):
|
|
|
4a2fec |
- ce3206a qemu-iotests: Fix broken test cases
|
|
|
4a2fec |
- Reduced to disabling test 071 only
|
|
|
4a2fec |
- bb34585 qemu-iotests: Disable 099 (requires blkverify)
|
|
|
4a2fec |
- 81be408 build: reenable local builds to pass --enable-debug (downstream only)
|
|
|
4a2fec |
|
|
|
4a2fec |
Merged patches (2.4.0):
|
|
|
4a2fec |
- fa4fd10 AArch64: Enable ACPI
|
|
|
4a2fec |
- 1219d52 ivshmem: RHEL-only: remove unsupported code
|
|
|
4a2fec |
- 5f6d954 ivshmem: RHEL-only: explicitly remove dead code
|
|
|
4a2fec |
- b88bbf0 Revert "rhel: Drop "ivshmem" device"
|
|
|
4a2fec |
- 8f0aadf Split serial-isa into its own config option
|
|
|
4a2fec |
- 01bff0f rhel: Disable "info irq" and "info pic" for Power
|
|
|
4a2fec |
- b915077 RHEL: Disable remaining unsupported devices for ppc
|
|
|
4a2fec |
- 64cbdc5 Mark onboard devices as cannot_instantiate_with_device_add_yet
|
|
|
4a2fec |
- 4792566 Disable sdhci device
|
|
|
4a2fec |
- bda8169 Disable Educational device
|
|
|
4a2fec |
- a17a8fb rhel: Revert unwanted cannot_instantiate_with_device_add_yet changes
|
|
|
4a2fec |
- 91c76c5 Remove intel-iommu device
|
|
|
4a2fec |
- ec1615d Disable additional e1000 models
|
|
|
4a2fec |
|
|
|
4a2fec |
(cherry picked from commit a36a3ad800b282cef9d72e6d8026470035f8f21c)
|
|
|
4a2fec |
---
|
|
|
4a2fec |
default-configs/aarch64-softmmu.mak | 33 ++++++++---
|
|
|
4a2fec |
default-configs/pci.mak | 36 ++++++------
|
|
|
4a2fec |
default-configs/ppc64-softmmu.mak | 108 ++++++++++++++++++++----------------
|
|
|
4a2fec |
default-configs/ppcemb-softmmu.mak | 13 +++++
|
|
|
4a2fec |
default-configs/s390x-softmmu.mak | 2 +-
|
|
|
4a2fec |
default-configs/sound.mak | 8 +--
|
|
|
4a2fec |
default-configs/usb.mak | 14 ++---
|
|
|
4a2fec |
default-configs/x86_64-softmmu.mak | 26 +++++----
|
|
|
4a2fec |
hw/acpi/ich9.c | 4 +-
|
|
|
4a2fec |
hw/block/fdc.c | 1 +
|
|
|
4a2fec |
hw/block/pflash_cfi01.c | 1 +
|
|
|
4a2fec |
hw/char/serial-pci.c | 4 ++
|
|
|
4a2fec |
hw/core/Makefile.objs | 7 ++-
|
|
|
4a2fec |
hw/display/cirrus_vga.c | 2 +
|
|
|
4a2fec |
hw/display/sm501.c | 2 +-
|
|
|
4a2fec |
hw/dma/i8257.c | 2 +
|
|
|
4a2fec |
hw/i386/Makefile.objs | 3 +-
|
|
|
4a2fec |
hw/i386/kvm/clock.c | 1 +
|
|
|
4a2fec |
hw/i386/pc.c | 3 +-
|
|
|
4a2fec |
hw/ide/ahci.c | 5 ++
|
|
|
4a2fec |
hw/ide/piix.c | 5 +-
|
|
|
4a2fec |
hw/ide/via.c | 2 +
|
|
|
4a2fec |
hw/input/pckbd.c | 2 +
|
|
|
4a2fec |
hw/isa/isa-bus.c | 1 +
|
|
|
4a2fec |
hw/misc/Makefile.objs | 2 +-
|
|
|
4a2fec |
hw/misc/ivshmem.c | 11 ++++
|
|
|
4a2fec |
hw/net/e1000.c | 2 +
|
|
|
4a2fec |
hw/net/e1000e.c | 2 +-
|
|
|
4a2fec |
hw/pci-host/piix.c | 4 ++
|
|
|
4a2fec |
hw/pci-host/q35.c | 1 +
|
|
|
4a2fec |
hw/ppc/Makefile.objs | 3 +-
|
|
|
4a2fec |
hw/ppc/spapr.c | 3 +-
|
|
|
4a2fec |
hw/ppc/spapr_cpu_core.c | 4 +-
|
|
|
4a2fec |
hw/s390x/virtio-ccw.c | 10 ++++
|
|
|
4a2fec |
hw/usb/ccid-card-emulated.c | 2 +
|
|
|
4a2fec |
hw/vfio/Makefile.objs | 3 -
|
|
|
4a2fec |
hw/vfio/pci-quirks.c | 5 ++
|
|
|
4a2fec |
hw/virtio/Makefile.objs | 5 +-
|
|
|
4a2fec |
hw/virtio/virtio-mmio.c | 1 +
|
|
|
4a2fec |
qemu-options.hx | 5 --
|
|
|
4a2fec |
redhat/build_configure.sh | 2 +-
|
|
|
4a2fec |
redhat/qemu-kvm.spec.template | 5 +-
|
|
|
4a2fec |
stubs/Makefile.objs | 1 +
|
|
|
4a2fec |
stubs/ide-isa.c | 13 +++++
|
|
|
4a2fec |
target/arm/cpu.c | 4 +-
|
|
|
4a2fec |
target/i386/cpu.c | 15 ++---
|
|
|
4a2fec |
target/ppc/cpu-models.c | 17 +++++-
|
|
|
4a2fec |
tests/Makefile.include | 72 +++++++-----------------
|
|
|
4a2fec |
tests/bios-tables-test.c | 4 ++
|
|
|
4a2fec |
tests/boot-order-test.c | 7 +++
|
|
|
4a2fec |
tests/boot-serial-test.c | 8 +--
|
|
|
4a2fec |
tests/e1000-test.c | 2 +
|
|
|
4a2fec |
tests/endianness-test.c | 2 +
|
|
|
4a2fec |
tests/ivshmem-test.c | 10 +++-
|
|
|
4a2fec |
tests/qemu-iotests/051 | 20 +++----
|
|
|
4a2fec |
tests/qemu-iotests/group | 4 +-
|
|
|
4a2fec |
tests/qom-test.c | 4 +-
|
|
|
4a2fec |
tests/test-x86-cpuid-compat.c | 2 +
|
|
|
4a2fec |
tests/usb-hcd-xhci-test.c | 5 +-
|
|
|
4a2fec |
vl.c | 2 +-
|
|
|
4a2fec |
60 files changed, 338 insertions(+), 209 deletions(-)
|
|
|
4a2fec |
create mode 100644 stubs/ide-isa.c
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
|
|
|
4a2fec |
index abd18c2..5d57303 100644
|
|
|
4a2fec |
--- a/default-configs/aarch64-softmmu.mak
|
|
|
4a2fec |
+++ b/default-configs/aarch64-softmmu.mak
|
|
|
4a2fec |
@@ -1,11 +1,30 @@
|
|
|
4a2fec |
# Default configuration for aarch64-softmmu
|
|
|
4a2fec |
|
|
|
4a2fec |
-# We support all the 32 bit boards so need all their config
|
|
|
4a2fec |
-include arm-softmmu.mak
|
|
|
4a2fec |
-
|
|
|
4a2fec |
-CONFIG_AUX=y
|
|
|
4a2fec |
-CONFIG_DDC=y
|
|
|
4a2fec |
-CONFIG_DPCD=y
|
|
|
4a2fec |
-CONFIG_XLNX_ZYNQMP=y
|
|
|
4a2fec |
+# Disabled in Red Hat Enterprise Linux
|
|
|
4a2fec |
+# CONFIG_AUX=y
|
|
|
4a2fec |
+# CONFIG_DDC=y
|
|
|
4a2fec |
+# CONFIG_DPCD=y
|
|
|
4a2fec |
+# CONFIG_XLNX_ZYNQMP=y
|
|
|
4a2fec |
+CONFIG_PCI=y
|
|
|
4a2fec |
+CONFIG_PCI_TESTDEV=y
|
|
|
4a2fec |
+CONFIG_VIRTIO_PCI=y
|
|
|
4a2fec |
+CONFIG_VIRTIO=y
|
|
|
4a2fec |
+CONFIG_STELLARIS=y
|
|
|
4a2fec |
+CONFIG_ARM_GIC=y
|
|
|
4a2fec |
+CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
|
|
|
4a2fec |
+CONFIG_PL011=y
|
|
|
4a2fec |
+CONFIG_PL031=y
|
|
|
4a2fec |
+CONFIG_PFLASH_CFI01=y
|
|
|
4a2fec |
+CONFIG_PCI_GENERIC=y
|
|
|
4a2fec |
+CONFIG_ACPI=y
|
|
|
4a2fec |
+CONFIG_PLATFORM_BUS=y
|
|
|
4a2fec |
+CONFIG_SMBIOS=y
|
|
|
4a2fec |
CONFIG_PL061=y
|
|
|
4a2fec |
CONFIG_GPIO_KEY=y
|
|
|
4a2fec |
+CONFIG_ARM_V7M=y
|
|
|
4a2fec |
+CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
4a2fec |
+CONFIG_PCIE_PORT=y
|
|
|
4a2fec |
+CONFIG_XIO3130=y
|
|
|
4a2fec |
+CONFIG_IOH3420=y
|
|
|
4a2fec |
+CONFIG_USB_XHCI=y
|
|
|
4a2fec |
+CONFIG_USB=y
|
|
|
4a2fec |
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
|
|
|
4a2fec |
index a758630..9bd8452 100644
|
|
|
4a2fec |
--- a/default-configs/pci.mak
|
|
|
4a2fec |
+++ b/default-configs/pci.mak
|
|
|
4a2fec |
@@ -4,43 +4,43 @@ CONFIG_ISA_BUS=y
|
|
|
4a2fec |
CONFIG_VIRTIO_PCI=y
|
|
|
4a2fec |
CONFIG_VIRTIO=y
|
|
|
4a2fec |
CONFIG_USB_UHCI=y
|
|
|
4a2fec |
-CONFIG_USB_OHCI=y
|
|
|
4a2fec |
+#CONFIG_USB_OHCI=y
|
|
|
4a2fec |
CONFIG_USB_EHCI=y
|
|
|
4a2fec |
CONFIG_USB_XHCI=y
|
|
|
4a2fec |
CONFIG_USB_XHCI_NEC=y
|
|
|
4a2fec |
-CONFIG_NE2000_PCI=y
|
|
|
4a2fec |
-CONFIG_EEPRO100_PCI=y
|
|
|
4a2fec |
-CONFIG_PCNET_PCI=y
|
|
|
4a2fec |
-CONFIG_PCNET_COMMON=y
|
|
|
4a2fec |
+#CONFIG_NE2000_PCI=y
|
|
|
4a2fec |
+#CONFIG_EEPRO100_PCI=y
|
|
|
4a2fec |
+#CONFIG_PCNET_PCI=y
|
|
|
4a2fec |
+#CONFIG_PCNET_COMMON=y
|
|
|
4a2fec |
CONFIG_AC97=y
|
|
|
4a2fec |
CONFIG_HDA=y
|
|
|
4a2fec |
-CONFIG_ES1370=y
|
|
|
4a2fec |
-CONFIG_LSI_SCSI_PCI=y
|
|
|
4a2fec |
-CONFIG_VMW_PVSCSI_SCSI_PCI=y
|
|
|
4a2fec |
-CONFIG_MEGASAS_SCSI_PCI=y
|
|
|
4a2fec |
-CONFIG_MPTSAS_SCSI_PCI=y
|
|
|
4a2fec |
+#CONFIG_ES1370=y
|
|
|
4a2fec |
+#CONFIG_LSI_SCSI_PCI=y
|
|
|
4a2fec |
+#CONFIG_VMW_PVSCSI_SCSI_PCI=y
|
|
|
4a2fec |
+#CONFIG_MEGASAS_SCSI_PCI=y
|
|
|
4a2fec |
+#CONFIG_MPTSAS_SCSI_PCI=y
|
|
|
4a2fec |
CONFIG_RTL8139_PCI=y
|
|
|
4a2fec |
CONFIG_E1000_PCI=y
|
|
|
4a2fec |
CONFIG_E1000E_PCI=y
|
|
|
4a2fec |
-CONFIG_VMXNET3_PCI=y
|
|
|
4a2fec |
+#CONFIG_VMXNET3_PCI=y
|
|
|
4a2fec |
CONFIG_IDE_CORE=y
|
|
|
4a2fec |
CONFIG_IDE_QDEV=y
|
|
|
4a2fec |
CONFIG_IDE_PCI=y
|
|
|
4a2fec |
CONFIG_AHCI=y
|
|
|
4a2fec |
-CONFIG_ESP=y
|
|
|
4a2fec |
-CONFIG_ESP_PCI=y
|
|
|
4a2fec |
+#CONFIG_ESP=y
|
|
|
4a2fec |
+#CONFIG_ESP_PCI=y
|
|
|
4a2fec |
CONFIG_SERIAL=y
|
|
|
4a2fec |
CONFIG_SERIAL_ISA=y
|
|
|
4a2fec |
CONFIG_SERIAL_PCI=y
|
|
|
4a2fec |
-CONFIG_IPACK=y
|
|
|
4a2fec |
+#CONFIG_IPACK=y
|
|
|
4a2fec |
CONFIG_WDT_IB6300ESB=y
|
|
|
4a2fec |
CONFIG_PCI_TESTDEV=y
|
|
|
4a2fec |
-CONFIG_NVME_PCI=y
|
|
|
4a2fec |
-CONFIG_SD=y
|
|
|
4a2fec |
-CONFIG_SDHCI=y
|
|
|
4a2fec |
+#CONFIG_NVME_PCI=y
|
|
|
4a2fec |
+#CONFIG_SD=y
|
|
|
4a2fec |
+#CONFIG_SDHCI=y
|
|
|
4a2fec |
CONFIG_EDU=y
|
|
|
4a2fec |
CONFIG_VGA=y
|
|
|
4a2fec |
CONFIG_VGA_PCI=y
|
|
|
4a2fec |
CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
|
|
|
4a2fec |
-CONFIG_ROCKER=y
|
|
|
4a2fec |
+#CONFIG_ROCKER=y
|
|
|
4a2fec |
CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
4a2fec |
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
|
|
|
4a2fec |
index 46c9599..31ef40c 100644
|
|
|
4a2fec |
--- a/default-configs/ppc64-softmmu.mak
|
|
|
4a2fec |
+++ b/default-configs/ppc64-softmmu.mak
|
|
|
4a2fec |
@@ -1,64 +1,76 @@
|
|
|
4a2fec |
# Default configuration for ppc64-softmmu
|
|
|
4a2fec |
|
|
|
4a2fec |
-include pci.mak
|
|
|
4a2fec |
+# PCI configuration - cut down from the defaults in pci.mak
|
|
|
4a2fec |
+CONFIG_PCI=y
|
|
|
4a2fec |
+CONFIG_VIRTIO_PCI=y
|
|
|
4a2fec |
+CONFIG_VIRTIO=y
|
|
|
4a2fec |
+CONFIG_USB_XHCI=y
|
|
|
4a2fec |
+CONFIG_USB_XHCI_NEC=y
|
|
|
4a2fec |
+CONFIG_WDT_IB6300ESB=y
|
|
|
4a2fec |
+CONFIG_PCI_TESTDEV=y
|
|
|
4a2fec |
+CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
4a2fec |
+
|
|
|
4a2fec |
include sound.mak
|
|
|
4a2fec |
include usb.mak
|
|
|
4a2fec |
CONFIG_VIRTIO_VGA=y
|
|
|
4a2fec |
-CONFIG_ESCC=y
|
|
|
4a2fec |
-CONFIG_M48T59=y
|
|
|
4a2fec |
+#CONFIG_ESCC=y
|
|
|
4a2fec |
+#CONFIG_M48T59=y
|
|
|
4a2fec |
CONFIG_IPMI=y
|
|
|
4a2fec |
-CONFIG_IPMI_LOCAL=y
|
|
|
4a2fec |
-CONFIG_IPMI_EXTERN=y
|
|
|
4a2fec |
-CONFIG_ISA_IPMI_BT=y
|
|
|
4a2fec |
+#CONFIG_IPMI_LOCAL=y
|
|
|
4a2fec |
+#CONFIG_IPMI_EXTERN=y
|
|
|
4a2fec |
+#CONFIG_ISA_IPMI_BT=y
|
|
|
4a2fec |
+CONFIG_VGA=y
|
|
|
4a2fec |
+CONFIG_VGA_PCI=y
|
|
|
4a2fec |
CONFIG_SERIAL=y
|
|
|
4a2fec |
-CONFIG_PARALLEL=y
|
|
|
4a2fec |
-CONFIG_I8254=y
|
|
|
4a2fec |
-CONFIG_PCKBD=y
|
|
|
4a2fec |
-CONFIG_FDC=y
|
|
|
4a2fec |
-CONFIG_I8257=y
|
|
|
4a2fec |
-CONFIG_I82374=y
|
|
|
4a2fec |
-CONFIG_OPENPIC=y
|
|
|
4a2fec |
-CONFIG_PREP_PCI=y
|
|
|
4a2fec |
-CONFIG_I82378=y
|
|
|
4a2fec |
-CONFIG_PC87312=y
|
|
|
4a2fec |
-CONFIG_MACIO=y
|
|
|
4a2fec |
-CONFIG_PCSPK=y
|
|
|
4a2fec |
-CONFIG_CUDA=y
|
|
|
4a2fec |
-CONFIG_ADB=y
|
|
|
4a2fec |
-CONFIG_MAC_NVRAM=y
|
|
|
4a2fec |
-CONFIG_MAC_DBDMA=y
|
|
|
4a2fec |
-CONFIG_HEATHROW_PIC=y
|
|
|
4a2fec |
-CONFIG_GRACKLE_PCI=y
|
|
|
4a2fec |
-CONFIG_UNIN_PCI=y
|
|
|
4a2fec |
-CONFIG_DEC_PCI=y
|
|
|
4a2fec |
-CONFIG_PPCE500_PCI=y
|
|
|
4a2fec |
-CONFIG_IDE_ISA=y
|
|
|
4a2fec |
-CONFIG_IDE_CMD646=y
|
|
|
4a2fec |
-CONFIG_IDE_MACIO=y
|
|
|
4a2fec |
-CONFIG_NE2000_ISA=y
|
|
|
4a2fec |
-CONFIG_PFLASH_CFI01=y
|
|
|
4a2fec |
-CONFIG_PFLASH_CFI02=y
|
|
|
4a2fec |
-CONFIG_PTIMER=y
|
|
|
4a2fec |
-CONFIG_I8259=y
|
|
|
4a2fec |
-CONFIG_XILINX=y
|
|
|
4a2fec |
-CONFIG_XILINX_ETHLITE=y
|
|
|
4a2fec |
+#CONFIG_PARALLEL=y
|
|
|
4a2fec |
+#CONFIG_I8254=y
|
|
|
4a2fec |
+#CONFIG_PCKBD=y
|
|
|
4a2fec |
+#CONFIG_FDC=y
|
|
|
4a2fec |
+#CONFIG_I8257=y
|
|
|
4a2fec |
+#CONFIG_I82374=y
|
|
|
4a2fec |
+#CONFIG_OPENPIC=y
|
|
|
4a2fec |
+#CONFIG_PREP_PCI=y
|
|
|
4a2fec |
+#CONFIG_I82378=y
|
|
|
4a2fec |
+#CONFIG_PC87312=y
|
|
|
4a2fec |
+#CONFIG_MACIO=y
|
|
|
4a2fec |
+#CONFIG_PCSPK=y
|
|
|
4a2fec |
+#CONFIG_CUDA=y
|
|
|
4a2fec |
+#CONFIG_ADB=y
|
|
|
4a2fec |
+#CONFIG_MAC_NVRAM=y
|
|
|
4a2fec |
+#CONFIG_MAC_DBDMA=y
|
|
|
4a2fec |
+#CONFIG_HEATHROW_PIC=y
|
|
|
4a2fec |
+#CONFIG_GRACKLE_PCI=y
|
|
|
4a2fec |
+#CONFIG_UNIN_PCI=y
|
|
|
4a2fec |
+#CONFIG_DEC_PCI=y
|
|
|
4a2fec |
+#CONFIG_PPCE500_PCI=y
|
|
|
4a2fec |
+#CONFIG_IDE_ISA=y
|
|
|
4a2fec |
+#CONFIG_IDE_CMD646=y
|
|
|
4a2fec |
+#CONFIG_IDE_MACIO=y
|
|
|
4a2fec |
+#CONFIG_NE2000_ISA=y
|
|
|
4a2fec |
+#CONFIG_PFLASH_CFI01=y
|
|
|
4a2fec |
+#CONFIG_PFLASH_CFI02=y
|
|
|
4a2fec |
+#CONFIG_PTIMER=y
|
|
|
4a2fec |
+#CONFIG_I8259=y
|
|
|
4a2fec |
+#CONFIG_XILINX=y
|
|
|
4a2fec |
+#CONFIG_XILINX_ETHLITE=y
|
|
|
4a2fec |
CONFIG_PSERIES=y
|
|
|
4a2fec |
-CONFIG_POWERNV=y
|
|
|
4a2fec |
-CONFIG_PREP=y
|
|
|
4a2fec |
-CONFIG_MAC=y
|
|
|
4a2fec |
-CONFIG_E500=y
|
|
|
4a2fec |
-CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
|
|
|
4a2fec |
-CONFIG_PLATFORM_BUS=y
|
|
|
4a2fec |
-CONFIG_ETSEC=y
|
|
|
4a2fec |
+#CONFIG_POWERNV=y
|
|
|
4a2fec |
+#CONFIG_PREP=y
|
|
|
4a2fec |
+#CONFIG_MAC=y
|
|
|
4a2fec |
+#CONFIG_E500=y
|
|
|
4a2fec |
+#CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
|
|
|
4a2fec |
+#CONFIG_PLATFORM_BUS=y
|
|
|
4a2fec |
+#CONFIG_ETSEC=y
|
|
|
4a2fec |
CONFIG_LIBDECNUMBER=y
|
|
|
4a2fec |
CONFIG_SM501=y
|
|
|
4a2fec |
+CONFIG_USB_OHCI=y
|
|
|
4a2fec |
# For pSeries
|
|
|
4a2fec |
CONFIG_XICS=$(CONFIG_PSERIES)
|
|
|
4a2fec |
CONFIG_XICS_SPAPR=$(CONFIG_PSERIES)
|
|
|
4a2fec |
CONFIG_XICS_KVM=$(and $(CONFIG_PSERIES),$(CONFIG_KVM))
|
|
|
4a2fec |
# For PReP
|
|
|
4a2fec |
-CONFIG_SERIAL_ISA=y
|
|
|
4a2fec |
-CONFIG_MC146818RTC=y
|
|
|
4a2fec |
-CONFIG_ISA_TESTDEV=y
|
|
|
4a2fec |
+#CONFIG_SERIAL_ISA=y
|
|
|
4a2fec |
+#CONFIG_MC146818RTC=y
|
|
|
4a2fec |
+#CONFIG_ISA_TESTDEV=y
|
|
|
4a2fec |
CONFIG_MEM_HOTPLUG=y
|
|
|
4a2fec |
-CONFIG_RS6000_MC=y
|
|
|
4a2fec |
+#CONFIG_RS6000_MC=y
|
|
|
4a2fec |
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
|
|
|
4a2fec |
index 94340de..cd9d51a 100644
|
|
|
4a2fec |
--- a/default-configs/ppcemb-softmmu.mak
|
|
|
4a2fec |
+++ b/default-configs/ppcemb-softmmu.mak
|
|
|
4a2fec |
@@ -8,6 +8,19 @@ CONFIG_SERIAL=y
|
|
|
4a2fec |
CONFIG_SERIAL_ISA=y
|
|
|
4a2fec |
CONFIG_I8257=y
|
|
|
4a2fec |
CONFIG_OPENPIC=y
|
|
|
4a2fec |
+CONFIG_MACIO=y
|
|
|
4a2fec |
+CONFIG_CUDA=y
|
|
|
4a2fec |
+CONFIG_ADB=y
|
|
|
4a2fec |
+CONFIG_MAC_NVRAM=y
|
|
|
4a2fec |
+CONFIG_MAC_DBDMA=y
|
|
|
4a2fec |
+CONFIG_HEATHROW_PIC=y
|
|
|
4a2fec |
+CONFIG_GRACKLE_PCI=y
|
|
|
4a2fec |
+CONFIG_UNIN_PCI=y
|
|
|
4a2fec |
+CONFIG_DEC_PCI=y
|
|
|
4a2fec |
+CONFIG_PPCE500_PCI=y
|
|
|
4a2fec |
+CONFIG_IDE_ISA=y
|
|
|
4a2fec |
+CONFIG_IDE_CMD646=y
|
|
|
4a2fec |
+CONFIG_IDE_MACIO=y
|
|
|
4a2fec |
CONFIG_PFLASH_CFI01=y
|
|
|
4a2fec |
CONFIG_PFLASH_CFI02=y
|
|
|
4a2fec |
CONFIG_PTIMER=y
|
|
|
4a2fec |
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
|
|
|
4a2fec |
index 51191b7..43dbf34 100644
|
|
|
4a2fec |
--- a/default-configs/s390x-softmmu.mak
|
|
|
4a2fec |
+++ b/default-configs/s390x-softmmu.mak
|
|
|
4a2fec |
@@ -1,5 +1,5 @@
|
|
|
4a2fec |
CONFIG_PCI=y
|
|
|
4a2fec |
-CONFIG_VIRTIO_PCI=y
|
|
|
4a2fec |
+#CONFIG_VIRTIO_PCI=y
|
|
|
4a2fec |
CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
4a2fec |
CONFIG_VIRTIO=y
|
|
|
4a2fec |
CONFIG_SCLPCONSOLE=y
|
|
|
4a2fec |
diff --git a/default-configs/sound.mak b/default-configs/sound.mak
|
|
|
4a2fec |
index 4f22c34..1bead9b 100644
|
|
|
4a2fec |
--- a/default-configs/sound.mak
|
|
|
4a2fec |
+++ b/default-configs/sound.mak
|
|
|
4a2fec |
@@ -1,4 +1,4 @@
|
|
|
4a2fec |
-CONFIG_SB16=y
|
|
|
4a2fec |
-CONFIG_ADLIB=y
|
|
|
4a2fec |
-CONFIG_GUS=y
|
|
|
4a2fec |
-CONFIG_CS4231A=y
|
|
|
4a2fec |
+#CONFIG_SB16=y
|
|
|
4a2fec |
+#CONFIG_ADLIB=y
|
|
|
4a2fec |
+#CONFIG_GUS=y
|
|
|
4a2fec |
+#CONFIG_CS4231A=y
|
|
|
4a2fec |
diff --git a/default-configs/usb.mak b/default-configs/usb.mak
|
|
|
4a2fec |
index f4b8568..a256f84 100644
|
|
|
4a2fec |
--- a/default-configs/usb.mak
|
|
|
4a2fec |
+++ b/default-configs/usb.mak
|
|
|
4a2fec |
@@ -1,10 +1,10 @@
|
|
|
4a2fec |
CONFIG_USB=y
|
|
|
4a2fec |
-CONFIG_USB_TABLET_WACOM=y
|
|
|
4a2fec |
+#CONFIG_USB_TABLET_WACOM=y
|
|
|
4a2fec |
CONFIG_USB_STORAGE_BOT=y
|
|
|
4a2fec |
-CONFIG_USB_STORAGE_UAS=y
|
|
|
4a2fec |
-CONFIG_USB_STORAGE_MTP=y
|
|
|
4a2fec |
+#CONFIG_USB_STORAGE_UAS=y
|
|
|
4a2fec |
+#CONFIG_USB_STORAGE_MTP=y
|
|
|
4a2fec |
CONFIG_USB_SMARTCARD=y
|
|
|
4a2fec |
-CONFIG_USB_AUDIO=y
|
|
|
4a2fec |
-CONFIG_USB_SERIAL=y
|
|
|
4a2fec |
-CONFIG_USB_NETWORK=y
|
|
|
4a2fec |
-CONFIG_USB_BLUETOOTH=y
|
|
|
4a2fec |
+#CONFIG_USB_AUDIO=y
|
|
|
4a2fec |
+#CONFIG_USB_SERIAL=y
|
|
|
4a2fec |
+#CONFIG_USB_NETWORK=y
|
|
|
4a2fec |
+#CONFIG_USB_BLUETOOTH=y
|
|
|
4a2fec |
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
|
|
|
4a2fec |
index 9bde2f1..d6d10aa 100644
|
|
|
4a2fec |
--- a/default-configs/x86_64-softmmu.mak
|
|
|
4a2fec |
+++ b/default-configs/x86_64-softmmu.mak
|
|
|
4a2fec |
@@ -4,19 +4,20 @@ include pci.mak
|
|
|
4a2fec |
include sound.mak
|
|
|
4a2fec |
include usb.mak
|
|
|
4a2fec |
CONFIG_QXL=$(CONFIG_SPICE)
|
|
|
4a2fec |
-CONFIG_VGA_ISA=y
|
|
|
4a2fec |
+#CONFIG_VGA_ISA=y
|
|
|
4a2fec |
+CONFIG_VGA_PCI=y
|
|
|
4a2fec |
CONFIG_VGA_CIRRUS=y
|
|
|
4a2fec |
-CONFIG_VMWARE_VGA=y
|
|
|
4a2fec |
+#CONFIG_VMWARE_VGA=y
|
|
|
4a2fec |
CONFIG_VIRTIO_VGA=y
|
|
|
4a2fec |
CONFIG_VMMOUSE=y
|
|
|
4a2fec |
CONFIG_IPMI=y
|
|
|
4a2fec |
-CONFIG_IPMI_LOCAL=y
|
|
|
4a2fec |
-CONFIG_IPMI_EXTERN=y
|
|
|
4a2fec |
-CONFIG_ISA_IPMI_KCS=y
|
|
|
4a2fec |
-CONFIG_ISA_IPMI_BT=y
|
|
|
4a2fec |
+#CONFIG_IPMI_LOCAL=y
|
|
|
4a2fec |
+#CONFIG_IPMI_EXTERN=y
|
|
|
4a2fec |
+#CONFIG_ISA_IPMI_KCS=y
|
|
|
4a2fec |
+#CONFIG_ISA_IPMI_BT=y
|
|
|
4a2fec |
CONFIG_SERIAL=y
|
|
|
4a2fec |
CONFIG_SERIAL_ISA=y
|
|
|
4a2fec |
-CONFIG_PARALLEL=y
|
|
|
4a2fec |
+#CONFIG_PARALLEL=y
|
|
|
4a2fec |
CONFIG_I8254=y
|
|
|
4a2fec |
CONFIG_PCSPK=y
|
|
|
4a2fec |
CONFIG_PCKBD=y
|
|
|
4a2fec |
@@ -28,17 +29,18 @@ CONFIG_ACPI_MEMORY_HOTPLUG=y
|
|
|
4a2fec |
CONFIG_ACPI_CPU_HOTPLUG=y
|
|
|
4a2fec |
CONFIG_APM=y
|
|
|
4a2fec |
CONFIG_I8257=y
|
|
|
4a2fec |
-CONFIG_IDE_ISA=y
|
|
|
4a2fec |
+#CONFIG_IDE_ISA=y
|
|
|
4a2fec |
CONFIG_IDE_PIIX=y
|
|
|
4a2fec |
-CONFIG_NE2000_ISA=y
|
|
|
4a2fec |
-CONFIG_HPET=y
|
|
|
4a2fec |
-CONFIG_APPLESMC=y
|
|
|
4a2fec |
+#CONFIG_NE2000_ISA=y
|
|
|
4a2fec |
+#CONFIG_HPET=y
|
|
|
4a2fec |
+#CONFIG_APPLESMC=y
|
|
|
4a2fec |
CONFIG_I8259=y
|
|
|
4a2fec |
CONFIG_PFLASH_CFI01=y
|
|
|
4a2fec |
CONFIG_TPM_TIS=$(CONFIG_TPM)
|
|
|
4a2fec |
CONFIG_MC146818RTC=y
|
|
|
4a2fec |
CONFIG_PCI_PIIX=y
|
|
|
4a2fec |
CONFIG_WDT_IB700=y
|
|
|
4a2fec |
+CONFIG_ISA_BUS=y
|
|
|
4a2fec |
CONFIG_ISA_DEBUG=y
|
|
|
4a2fec |
CONFIG_ISA_TESTDEV=y
|
|
|
4a2fec |
CONFIG_VMPORT=y
|
|
|
4a2fec |
@@ -56,6 +58,6 @@ CONFIG_XIO3130=y
|
|
|
4a2fec |
CONFIG_IOH3420=y
|
|
|
4a2fec |
CONFIG_I82801B11=y
|
|
|
4a2fec |
CONFIG_SMBIOS=y
|
|
|
4a2fec |
-CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
|
|
|
4a2fec |
+#CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
|
|
|
4a2fec |
CONFIG_PXB=y
|
|
|
4a2fec |
CONFIG_ACPI_VMGENID=y
|
|
|
4a2fec |
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
|
|
|
4a2fec |
index c5d8646..a4e87b8 100644
|
|
|
4a2fec |
--- a/hw/acpi/ich9.c
|
|
|
4a2fec |
+++ b/hw/acpi/ich9.c
|
|
|
4a2fec |
@@ -446,8 +446,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
|
|
|
4a2fec |
static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
|
|
|
4a2fec |
pm->acpi_memory_hotplug.is_enabled = true;
|
|
|
4a2fec |
pm->cpu_hotplug_legacy = true;
|
|
|
4a2fec |
- pm->disable_s3 = 0;
|
|
|
4a2fec |
- pm->disable_s4 = 0;
|
|
|
4a2fec |
+ pm->disable_s3 = 1;
|
|
|
4a2fec |
+ pm->disable_s4 = 1;
|
|
|
4a2fec |
pm->s4_val = 2;
|
|
|
4a2fec |
|
|
|
4a2fec |
object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,
|
|
|
4a2fec |
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
|
|
|
4a2fec |
index 4011290..90cd9a0 100644
|
|
|
4a2fec |
--- a/hw/block/fdc.c
|
|
|
4a2fec |
+++ b/hw/block/fdc.c
|
|
|
4a2fec |
@@ -611,6 +611,7 @@ static void floppy_drive_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
k->bus_type = TYPE_FLOPPY_BUS;
|
|
|
4a2fec |
k->props = floppy_drive_properties;
|
|
|
4a2fec |
k->desc = "virtual floppy drive";
|
|
|
4a2fec |
+ k->user_creatable = false; /* RH state preserve */
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo floppy_drive_info = {
|
|
|
4a2fec |
diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
|
|
|
4a2fec |
index 1113ab1..afe6230 100644
|
|
|
4a2fec |
--- a/hw/block/pflash_cfi01.c
|
|
|
4a2fec |
+++ b/hw/block/pflash_cfi01.c
|
|
|
4a2fec |
@@ -925,6 +925,7 @@ static void pflash_cfi01_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
dc->realize = pflash_cfi01_realize;
|
|
|
4a2fec |
dc->props = pflash_cfi01_properties;
|
|
|
4a2fec |
dc->vmsd = &vmstate_pflash;
|
|
|
4a2fec |
+ dc->user_creatable = false; /* RH state preserve */
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
|
|
|
4a2fec |
index 303104d..24ce17b 100644
|
|
|
4a2fec |
--- a/hw/char/serial-pci.c
|
|
|
4a2fec |
+++ b/hw/char/serial-pci.c
|
|
|
4a2fec |
@@ -228,6 +228,8 @@ static void multi_2x_serial_pci_class_initfn(ObjectClass *klass, void *data)
|
|
|
4a2fec |
dc->vmsd = &vmstate_pci_multi_serial;
|
|
|
4a2fec |
dc->props = multi_2x_serial_pci_properties;
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static void multi_4x_serial_pci_class_initfn(ObjectClass *klass, void *data)
|
|
|
4a2fec |
@@ -243,6 +245,8 @@ static void multi_4x_serial_pci_class_initfn(ObjectClass *klass, void *data)
|
|
|
4a2fec |
dc->vmsd = &vmstate_pci_multi_serial;
|
|
|
4a2fec |
dc->props = multi_4x_serial_pci_properties;
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo serial_pci_info = {
|
|
|
4a2fec |
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
|
|
|
4a2fec |
index f8d7a4a..060d594 100644
|
|
|
4a2fec |
--- a/hw/core/Makefile.objs
|
|
|
4a2fec |
+++ b/hw/core/Makefile.objs
|
|
|
4a2fec |
@@ -15,9 +15,10 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o
|
|
|
4a2fec |
common-obj-$(CONFIG_SOFTMMU) += loader.o
|
|
|
4a2fec |
common-obj-$(CONFIG_FITLOADER) += loader-fit.o
|
|
|
4a2fec |
common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
|
|
|
4a2fec |
-common-obj-$(CONFIG_SOFTMMU) += register.o
|
|
|
4a2fec |
-common-obj-$(CONFIG_SOFTMMU) += or-irq.o
|
|
|
4a2fec |
common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
|
|
|
4a2fec |
+# Disabled in Red Hat Enterprise Linux
|
|
|
4a2fec |
+# common-obj-$(CONFIG_SOFTMMU) += register.o
|
|
|
4a2fec |
+# obj-$(CONFIG_SOFTMMU) += generic-loader.o
|
|
|
4a2fec |
+# common-obj-$(CONFIG_SOFTMMU) += or-irq.o
|
|
|
4a2fec |
|
|
|
4a2fec |
-obj-$(CONFIG_SOFTMMU) += generic-loader.o
|
|
|
4a2fec |
obj-$(CONFIG_SOFTMMU) += null-machine.o
|
|
|
4a2fec |
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
|
|
|
4a2fec |
index 14008aa..15322b5 100644
|
|
|
4a2fec |
--- a/hw/display/cirrus_vga.c
|
|
|
4a2fec |
+++ b/hw/display/cirrus_vga.c
|
|
|
4a2fec |
@@ -3077,6 +3077,8 @@ static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
dc->realize = isa_cirrus_vga_realizefn;
|
|
|
4a2fec |
dc->props = isa_cirrus_vga_properties;
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo isa_cirrus_vga_info = {
|
|
|
4a2fec |
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
|
|
|
4a2fec |
index 9aa515b..6f3dfe0 100644
|
|
|
4a2fec |
--- a/hw/display/sm501.c
|
|
|
4a2fec |
+++ b/hw/display/sm501.c
|
|
|
4a2fec |
@@ -1758,7 +1758,7 @@ static void sm501_sysbus_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
dc->reset = sm501_reset_sysbus;
|
|
|
4a2fec |
dc->vmsd = &vmstate_sm501_sysbus;
|
|
|
4a2fec |
/* Note: pointer property "chr-state" may remain null, thus
|
|
|
4a2fec |
- * no need for dc->cannot_instantiate_with_device_add_yet = true;
|
|
|
4a2fec |
+ * no need for dc->user_creatable = false;
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c
|
|
|
4a2fec |
index bd23e89..e52a679 100644
|
|
|
4a2fec |
--- a/hw/dma/i8257.c
|
|
|
4a2fec |
+++ b/hw/dma/i8257.c
|
|
|
4a2fec |
@@ -591,6 +591,8 @@ static void i8257_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
dc->reset = i8257_reset;
|
|
|
4a2fec |
dc->vmsd = &vmstate_i8257;
|
|
|
4a2fec |
dc->props = i8257_properties;
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
|
|
|
4a2fec |
idc->get_transfer_mode = i8257_dma_get_transfer_mode;
|
|
|
4a2fec |
idc->has_autoinitialization = i8257_dma_has_autoinitialization;
|
|
|
4a2fec |
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
|
|
|
4a2fec |
index 9b5686b..1874b03 100644
|
|
|
4a2fec |
--- a/hw/i386/Makefile.objs
|
|
|
4a2fec |
+++ b/hw/i386/Makefile.objs
|
|
|
4a2fec |
@@ -4,7 +4,8 @@ obj-y += pc.o pc_piix.o pc_q35.o
|
|
|
4a2fec |
obj-y += pc_sysfw.o
|
|
|
4a2fec |
obj-y += x86-iommu.o
|
|
|
4a2fec |
obj-$(CONFIG_VTD) += intel_iommu.o
|
|
|
4a2fec |
-obj-y += amd_iommu.o
|
|
|
4a2fec |
+# Disabled in Red Hat Enterprise Linux
|
|
|
4a2fec |
+# obj-y += amd_iommu.o
|
|
|
4a2fec |
obj-$(CONFIG_XEN) += ../xenpv/ xen/
|
|
|
4a2fec |
|
|
|
4a2fec |
obj-y += kvmvapic.o
|
|
|
4a2fec |
diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
|
|
|
4a2fec |
index 363d1b5..fc7212f 100644
|
|
|
4a2fec |
--- a/hw/i386/kvm/clock.c
|
|
|
4a2fec |
+++ b/hw/i386/kvm/clock.c
|
|
|
4a2fec |
@@ -289,6 +289,7 @@ static void kvmclock_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
dc->realize = kvmclock_realize;
|
|
|
4a2fec |
dc->vmsd = &kvmclock_vmsd;
|
|
|
4a2fec |
dc->props = kvmclock_properties;
|
|
|
4a2fec |
+ dc->user_creatable = false; /* RH state preserve */
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo kvmclock_info = {
|
|
|
4a2fec |
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
|
|
|
4a2fec |
index 64929ea..c568777 100644
|
|
|
4a2fec |
--- a/hw/i386/pc.c
|
|
|
4a2fec |
+++ b/hw/i386/pc.c
|
|
|
4a2fec |
@@ -1593,8 +1593,9 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS);
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */
|
|
|
4a2fec |
parallel_hds_isa_init(isa_bus, MAX_PARALLEL_PORTS);
|
|
|
4a2fec |
-
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
|
|
|
4a2fec |
i8042 = isa_create_simple(isa_bus, "i8042");
|
|
|
4a2fec |
i8042_setup_a20_line(i8042, a20_line[0]);
|
|
|
4a2fec |
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
|
|
|
4a2fec |
index 406a1b5..2cb41fc 100644
|
|
|
4a2fec |
--- a/hw/ide/ahci.c
|
|
|
4a2fec |
+++ b/hw/ide/ahci.c
|
|
|
4a2fec |
@@ -1720,6 +1720,7 @@ static void sysbus_ahci_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
dc->vmsd = &vmstate_sysbus_ahci;
|
|
|
4a2fec |
dc->props = sysbus_ahci_properties;
|
|
|
4a2fec |
dc->reset = sysbus_ahci_reset;
|
|
|
4a2fec |
+ dc->user_creatable = false; /* RH state preserve */
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
@@ -1731,6 +1732,7 @@ static const TypeInfo sysbus_ahci_info = {
|
|
|
4a2fec |
.class_init = sysbus_ahci_class_init,
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
#define ALLWINNER_AHCI_BISTAFR ((0xa0 - ALLWINNER_AHCI_MMIO_OFF) / 4)
|
|
|
4a2fec |
#define ALLWINNER_AHCI_BISTCR ((0xa4 - ALLWINNER_AHCI_MMIO_OFF) / 4)
|
|
|
4a2fec |
#define ALLWINNER_AHCI_BISTFCTR ((0xa8 - ALLWINNER_AHCI_MMIO_OFF) / 4)
|
|
|
4a2fec |
@@ -1824,11 +1826,14 @@ static const TypeInfo allwinner_ahci_info = {
|
|
|
4a2fec |
.instance_init = allwinner_ahci_init,
|
|
|
4a2fec |
.class_init = allwinner_ahci_class_init,
|
|
|
4a2fec |
};
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
|
|
|
4a2fec |
static void sysbus_ahci_register_types(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
type_register_static(&sysbus_ahci_info);
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
type_register_static(&allwinner_ahci_info);
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
type_init(sysbus_ahci_register_types)
|
|
|
4a2fec |
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
|
|
|
4a2fec |
index 7e2d767..3184377 100644
|
|
|
4a2fec |
--- a/hw/ide/piix.c
|
|
|
4a2fec |
+++ b/hw/ide/piix.c
|
|
|
4a2fec |
@@ -254,7 +254,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1;
|
|
|
4a2fec |
k->class_id = PCI_CLASS_STORAGE_IDE;
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
4a2fec |
- dc->hotpluggable = false;
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo piix3_ide_info = {
|
|
|
4a2fec |
@@ -281,6 +282,8 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
k->class_id = PCI_CLASS_STORAGE_IDE;
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
4a2fec |
dc->hotpluggable = false;
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo piix4_ide_info = {
|
|
|
4a2fec |
diff --git a/hw/ide/via.c b/hw/ide/via.c
|
|
|
4a2fec |
index 5b32ecb..c0ab568 100644
|
|
|
4a2fec |
--- a/hw/ide/via.c
|
|
|
4a2fec |
+++ b/hw/ide/via.c
|
|
|
4a2fec |
@@ -220,6 +220,8 @@ static void via_ide_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
k->revision = 0x06;
|
|
|
4a2fec |
k->class_id = PCI_CLASS_STORAGE_IDE;
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo via_ide_info = {
|
|
|
4a2fec |
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
|
|
|
4a2fec |
index c479f82..62678f3 100644
|
|
|
4a2fec |
--- a/hw/input/pckbd.c
|
|
|
4a2fec |
+++ b/hw/input/pckbd.c
|
|
|
4a2fec |
@@ -570,6 +570,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data)
|
|
|
4a2fec |
|
|
|
4a2fec |
dc->realize = i8042_realizefn;
|
|
|
4a2fec |
dc->vmsd = &vmstate_kbd_isa;
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo i8042_info = {
|
|
|
4a2fec |
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
|
|
|
4a2fec |
index 348e0ea..467042f 100644
|
|
|
4a2fec |
--- a/hw/isa/isa-bus.c
|
|
|
4a2fec |
+++ b/hw/isa/isa-bus.c
|
|
|
4a2fec |
@@ -221,6 +221,7 @@ static void isabus_bridge_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
|
|
|
4a2fec |
dc->fw_name = "isa";
|
|
|
4a2fec |
+ dc->user_creatable = false; /* RH state preserve */
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo isabus_bridge_info = {
|
|
|
4a2fec |
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
|
|
|
4a2fec |
index 29fb922..a1007ae 100644
|
|
|
4a2fec |
--- a/hw/misc/Makefile.objs
|
|
|
4a2fec |
+++ b/hw/misc/Makefile.objs
|
|
|
4a2fec |
@@ -8,7 +8,7 @@ common-obj-$(CONFIG_ISA_TESTDEV) += pc-testdev.o
|
|
|
4a2fec |
common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o
|
|
|
4a2fec |
common-obj-$(CONFIG_EDU) += edu.o
|
|
|
4a2fec |
|
|
|
4a2fec |
-common-obj-y += unimp.o
|
|
|
4a2fec |
+#common-obj-y += unimp.o
|
|
|
4a2fec |
|
|
|
4a2fec |
obj-$(CONFIG_VMPORT) += vmport.o
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
|
|
|
4a2fec |
index 47a015f..33ef10b 100644
|
|
|
4a2fec |
--- a/hw/misc/ivshmem.c
|
|
|
4a2fec |
+++ b/hw/misc/ivshmem.c
|
|
|
4a2fec |
@@ -850,6 +850,13 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp)
|
|
|
4a2fec |
return;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+ /* Migration disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ if (s->master == ON_OFF_AUTO_ON) {
|
|
|
4a2fec |
+ error_setg(errp, "master=on is not supported");
|
|
|
4a2fec |
+ return;
|
|
|
4a2fec |
+ }
|
|
|
4a2fec |
+ s->master = ON_OFF_AUTO_OFF;
|
|
|
4a2fec |
+
|
|
|
4a2fec |
pci_conf = dev->config;
|
|
|
4a2fec |
pci_conf[PCI_COMMAND] = PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
|
|
|
4a2fec |
|
|
|
4a2fec |
@@ -1137,6 +1144,8 @@ static void ivshmem_doorbell_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
k->realize = ivshmem_doorbell_realize;
|
|
|
4a2fec |
dc->props = ivshmem_doorbell_properties;
|
|
|
4a2fec |
dc->vmsd = &ivshmem_doorbell_vmsd;
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo ivshmem_doorbell_info = {
|
|
|
4a2fec |
@@ -1306,6 +1315,8 @@ static void ivshmem_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
dc->desc = "Inter-VM shared memory (legacy)";
|
|
|
4a2fec |
dc->props = ivshmem_properties;
|
|
|
4a2fec |
dc->vmsd = &ivshmem_vmsd;
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo ivshmem_info = {
|
|
|
4a2fec |
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
|
|
|
4a2fec |
index 3d86146..d29e9ee 100644
|
|
|
4a2fec |
--- a/hw/net/e1000.c
|
|
|
4a2fec |
+++ b/hw/net/e1000.c
|
|
|
4a2fec |
@@ -1704,6 +1704,7 @@ static const E1000Info e1000_devices[] = {
|
|
|
4a2fec |
.revision = 0x03,
|
|
|
4a2fec |
.phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT,
|
|
|
4a2fec |
},
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */
|
|
|
4a2fec |
{
|
|
|
4a2fec |
.name = "e1000-82544gc",
|
|
|
4a2fec |
.device_id = E1000_DEV_ID_82544GC_COPPER,
|
|
|
4a2fec |
@@ -1716,6 +1717,7 @@ static const E1000Info e1000_devices[] = {
|
|
|
4a2fec |
.revision = 0x03,
|
|
|
4a2fec |
.phy_id2 = E1000_PHY_ID2_8254xx_DEFAULT,
|
|
|
4a2fec |
},
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo e1000_default_info = {
|
|
|
4a2fec |
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
|
|
|
4a2fec |
index 6c42b44..2c91d07 100644
|
|
|
4a2fec |
--- a/hw/net/e1000e.c
|
|
|
4a2fec |
+++ b/hw/net/e1000e.c
|
|
|
4a2fec |
@@ -671,7 +671,7 @@ static void e1000e_class_init(ObjectClass *class, void *data)
|
|
|
4a2fec |
c->vendor_id = PCI_VENDOR_ID_INTEL;
|
|
|
4a2fec |
c->device_id = E1000_DEV_ID_82574L;
|
|
|
4a2fec |
c->revision = 0;
|
|
|
4a2fec |
- c->romfile = "efi-e1000e.rom";
|
|
|
4a2fec |
+ c->romfile = "pxe-e1000e.rom";
|
|
|
4a2fec |
c->class_id = PCI_CLASS_NETWORK_ETHERNET;
|
|
|
4a2fec |
c->is_express = 1;
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
|
|
|
4a2fec |
index 072a04e..90c50b0 100644
|
|
|
4a2fec |
--- a/hw/pci-host/piix.c
|
|
|
4a2fec |
+++ b/hw/pci-host/piix.c
|
|
|
4a2fec |
@@ -750,6 +750,7 @@ static const TypeInfo i440fx_info = {
|
|
|
4a2fec |
.class_init = i440fx_class_init,
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
/* IGD Passthrough Host Bridge. */
|
|
|
4a2fec |
typedef struct {
|
|
|
4a2fec |
uint8_t offset;
|
|
|
4a2fec |
@@ -838,6 +839,7 @@ static const TypeInfo igd_passthrough_i440fx_info = {
|
|
|
4a2fec |
.instance_size = sizeof(PCII440FXState),
|
|
|
4a2fec |
.class_init = igd_passthrough_i440fx_class_init,
|
|
|
4a2fec |
};
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
|
|
|
4a2fec |
static const char *i440fx_pcihost_root_bus_path(PCIHostState *host_bridge,
|
|
|
4a2fec |
PCIBus *rootbus)
|
|
|
4a2fec |
@@ -882,7 +884,9 @@ static const TypeInfo i440fx_pcihost_info = {
|
|
|
4a2fec |
static void i440fx_register_types(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
type_register_static(&i440fx_info);
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
type_register_static(&igd_passthrough_i440fx_info);
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
type_register_static(&piix3_pci_type_info);
|
|
|
4a2fec |
type_register_static(&piix3_info);
|
|
|
4a2fec |
type_register_static(&piix3_xen_info);
|
|
|
4a2fec |
diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
|
|
|
4a2fec |
index 0e472f2..a91418c 100644
|
|
|
4a2fec |
--- a/hw/pci-host/q35.c
|
|
|
4a2fec |
+++ b/hw/pci-host/q35.c
|
|
|
4a2fec |
@@ -158,6 +158,7 @@ static void q35_host_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
dc->user_creatable = false;
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
|
|
|
4a2fec |
dc->fw_name = "pci";
|
|
|
4a2fec |
+ dc->user_creatable = false; /* RH state preserve */
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static void q35_host_initfn(Object *obj)
|
|
|
4a2fec |
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
|
|
|
4a2fec |
index 645ffdf..856cef5 100644
|
|
|
4a2fec |
--- a/hw/ppc/Makefile.objs
|
|
|
4a2fec |
+++ b/hw/ppc/Makefile.objs
|
|
|
4a2fec |
@@ -3,7 +3,7 @@ obj-y += ppc.o ppc_booke.o fdt.o
|
|
|
4a2fec |
# IBM pSeries (sPAPR)
|
|
|
4a2fec |
obj-$(CONFIG_PSERIES) += spapr.o spapr_vio.o spapr_events.o
|
|
|
4a2fec |
obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o
|
|
|
4a2fec |
-obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o spapr_rng.o
|
|
|
4a2fec |
+obj-$(CONFIG_PSERIES) += spapr_pci.o spapr_rtc.o spapr_drc.o
|
|
|
4a2fec |
obj-$(CONFIG_PSERIES) += spapr_cpu_core.o spapr_ovec.o
|
|
|
4a2fec |
# IBM PowerNV
|
|
|
4a2fec |
obj-$(CONFIG_POWERNV) += pnv.o pnv_xscom.o pnv_core.o pnv_lpc.o pnv_psi.o pnv_occ.o pnv_bmc.o
|
|
|
4a2fec |
@@ -13,7 +13,6 @@ endif
|
|
|
4a2fec |
obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o
|
|
|
4a2fec |
# PowerPC 4xx boards
|
|
|
4a2fec |
obj-y += ppc4xx_devs.o ppc405_uc.o
|
|
|
4a2fec |
-obj-y += ppc4xx_pci.o
|
|
|
4a2fec |
# PReP
|
|
|
4a2fec |
obj-$(CONFIG_PREP) += prep.o
|
|
|
4a2fec |
obj-$(CONFIG_PREP) += prep_systemio.o
|
|
|
4a2fec |
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
|
|
|
4a2fec |
index 268fd44..8d1cfcf 100644
|
|
|
4a2fec |
--- a/hw/ppc/spapr.c
|
|
|
4a2fec |
+++ b/hw/ppc/spapr.c
|
|
|
4a2fec |
@@ -1084,6 +1084,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr,
|
|
|
4a2fec |
/* /vdevice */
|
|
|
4a2fec |
spapr_dt_vdevice(spapr->vio_bus, fdt);
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
if (object_resolve_path_type("", TYPE_SPAPR_RNG, NULL)) {
|
|
|
4a2fec |
ret = spapr_rng_populate_dt(fdt);
|
|
|
4a2fec |
if (ret < 0) {
|
|
|
4a2fec |
@@ -1091,7 +1092,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr,
|
|
|
4a2fec |
exit(1);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
}
|
|
|
4a2fec |
-
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
QLIST_FOREACH(phb, &spapr->phbs, list) {
|
|
|
4a2fec |
ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt);
|
|
|
4a2fec |
if (ret < 0) {
|
|
|
4a2fec |
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
|
|
|
4a2fec |
index ea278ce..3e731e4 100644
|
|
|
4a2fec |
--- a/hw/ppc/spapr_cpu_core.c
|
|
|
4a2fec |
+++ b/hw/ppc/spapr_cpu_core.c
|
|
|
4a2fec |
@@ -264,6 +264,7 @@ err:
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const char *spapr_core_models[] = {
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
/* 970 */
|
|
|
4a2fec |
"970_v2.2",
|
|
|
4a2fec |
|
|
|
4a2fec |
@@ -276,6 +277,8 @@ static const char *spapr_core_models[] = {
|
|
|
4a2fec |
/* POWER5+ */
|
|
|
4a2fec |
"POWER5+_v2.1",
|
|
|
4a2fec |
|
|
|
4a2fec |
+ { .name = "POWER5+_v2.1", .initfn = spapr_cpu_core_POWER5plus_initfn },
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
/* POWER7 */
|
|
|
4a2fec |
"POWER7_v2.3",
|
|
|
4a2fec |
|
|
|
4a2fec |
@@ -290,7 +293,6 @@ static const char *spapr_core_models[] = {
|
|
|
4a2fec |
|
|
|
4a2fec |
/* POWER8NVL */
|
|
|
4a2fec |
"POWER8NVL_v1.0",
|
|
|
4a2fec |
-
|
|
|
4a2fec |
/* POWER9 */
|
|
|
4a2fec |
"POWER9_v1.0",
|
|
|
4a2fec |
};
|
|
|
4a2fec |
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
|
|
|
4a2fec |
index b1976fd..d85ff1d 100644
|
|
|
4a2fec |
--- a/hw/s390x/virtio-ccw.c
|
|
|
4a2fec |
+++ b/hw/s390x/virtio-ccw.c
|
|
|
4a2fec |
@@ -989,6 +989,8 @@ static void virtio_ccw_rng_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
|
|
4a2fec |
NULL);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
+
|
|
|
4a2fec |
static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
VirtIOCryptoCcw *dev = VIRTIO_CRYPTO_CCW(ccw_dev);
|
|
|
4a2fec |
@@ -1007,6 +1009,8 @@ static void virtio_ccw_crypto_realize(VirtioCcwDevice *ccw_dev, Error **errp)
|
|
|
4a2fec |
NULL);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
+
|
|
|
4a2fec |
/* DeviceState to VirtioCcwDevice. Note: used on datapath,
|
|
|
4a2fec |
* be careful and test performance if you change this.
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
@@ -1578,6 +1582,8 @@ static const TypeInfo virtio_ccw_rng = {
|
|
|
4a2fec |
.class_init = virtio_ccw_rng_class_init,
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
+
|
|
|
4a2fec |
static Property virtio_ccw_crypto_properties[] = {
|
|
|
4a2fec |
DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,
|
|
|
4a2fec |
VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),
|
|
|
4a2fec |
@@ -1616,6 +1622,8 @@ static const TypeInfo virtio_ccw_crypto = {
|
|
|
4a2fec |
.class_init = virtio_ccw_crypto_class_init,
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
+
|
|
|
4a2fec |
static void virtio_ccw_busdev_realize(DeviceState *dev, Error **errp)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
VirtioCcwDevice *_dev = (VirtioCcwDevice *)dev;
|
|
|
4a2fec |
@@ -1814,7 +1822,9 @@ static void virtio_ccw_register(void)
|
|
|
4a2fec |
#ifdef CONFIG_VHOST_VSOCK
|
|
|
4a2fec |
type_register_static(&vhost_vsock_ccw_info);
|
|
|
4a2fec |
#endif
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
type_register_static(&virtio_ccw_crypto);
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
type_init(virtio_ccw_register)
|
|
|
4a2fec |
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
|
|
|
4a2fec |
index e646eb2..8d7205c 100644
|
|
|
4a2fec |
--- a/hw/usb/ccid-card-emulated.c
|
|
|
4a2fec |
+++ b/hw/usb/ccid-card-emulated.c
|
|
|
4a2fec |
@@ -588,6 +588,8 @@ static void emulated_class_initfn(ObjectClass *klass, void *data)
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
|
|
|
4a2fec |
dc->desc = "emulated smartcard";
|
|
|
4a2fec |
dc->props = emulated_card_properties;
|
|
|
4a2fec |
+ /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
static const TypeInfo emulated_card_info = {
|
|
|
4a2fec |
diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
|
|
|
4a2fec |
index c3ab909..4029072 100644
|
|
|
4a2fec |
--- a/hw/vfio/Makefile.objs
|
|
|
4a2fec |
+++ b/hw/vfio/Makefile.objs
|
|
|
4a2fec |
@@ -2,8 +2,5 @@ ifeq ($(CONFIG_LINUX), y)
|
|
|
4a2fec |
obj-$(CONFIG_SOFTMMU) += common.o
|
|
|
4a2fec |
obj-$(CONFIG_PCI) += pci.o pci-quirks.o
|
|
|
4a2fec |
obj-$(CONFIG_VFIO_CCW) += ccw.o
|
|
|
4a2fec |
-obj-$(CONFIG_SOFTMMU) += platform.o
|
|
|
4a2fec |
-obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o
|
|
|
4a2fec |
-obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o
|
|
|
4a2fec |
obj-$(CONFIG_SOFTMMU) += spapr.o
|
|
|
4a2fec |
endif
|
|
|
4a2fec |
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
|
|
|
4a2fec |
index 349085e..58046e6 100644
|
|
|
4a2fec |
--- a/hw/vfio/pci-quirks.c
|
|
|
4a2fec |
+++ b/hw/vfio/pci-quirks.c
|
|
|
4a2fec |
@@ -1189,6 +1189,8 @@ static void vfio_pci_igd_lpc_bridge_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
|
|
|
4a2fec |
dc->desc = "VFIO dummy ISA/LPC bridge for IGD assignment";
|
|
|
4a2fec |
dc->hotpluggable = false;
|
|
|
4a2fec |
+ /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
+ dc->user_creatable = false;
|
|
|
4a2fec |
k->realize = vfio_pci_igd_lpc_bridge_realize;
|
|
|
4a2fec |
k->class_id = PCI_CLASS_BRIDGE_ISA;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
@@ -1378,6 +1380,9 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
|
|
|
4a2fec |
0, PCI_DEVFN(0x2, 0))) {
|
|
|
4a2fec |
return;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+ /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
+ return;
|
|
|
4a2fec |
|
|
|
4a2fec |
/*
|
|
|
4a2fec |
* We need to create an LPC/ISA bridge at PCI bus address 00:1f.0 that we
|
|
|
4a2fec |
diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs
|
|
|
4a2fec |
index 765d363..a5a0936 100644
|
|
|
4a2fec |
--- a/hw/virtio/Makefile.objs
|
|
|
4a2fec |
+++ b/hw/virtio/Makefile.objs
|
|
|
4a2fec |
@@ -7,8 +7,9 @@ common-obj-y += virtio-mmio.o
|
|
|
4a2fec |
obj-y += virtio.o virtio-balloon.o
|
|
|
4a2fec |
obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o
|
|
|
4a2fec |
obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o
|
|
|
4a2fec |
-obj-y += virtio-crypto.o
|
|
|
4a2fec |
-obj-$(CONFIG_VIRTIO_PCI) += virtio-crypto-pci.o
|
|
|
4a2fec |
+# Disabled in Red Hat Enterprise Linux
|
|
|
4a2fec |
+#obj-y += virtio-crypto.o
|
|
|
4a2fec |
+#obj-$(CONFIG_VIRTIO_PCI) += virtio-crypto-pci.o
|
|
|
4a2fec |
endif
|
|
|
4a2fec |
|
|
|
4a2fec |
common-obj-$(call lnot,$(CONFIG_LINUX)) += vhost-stub.o
|
|
|
4a2fec |
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
|
|
|
4a2fec |
index 5807aa8..62df6c2 100644
|
|
|
4a2fec |
--- a/hw/virtio/virtio-mmio.c
|
|
|
4a2fec |
+++ b/hw/virtio/virtio-mmio.c
|
|
|
4a2fec |
@@ -448,6 +448,7 @@ static void virtio_mmio_class_init(ObjectClass *klass, void *data)
|
|
|
4a2fec |
|
|
|
4a2fec |
dc->realize = virtio_mmio_realizefn;
|
|
|
4a2fec |
dc->reset = virtio_mmio_reset;
|
|
|
4a2fec |
+ dc->user_creatable = false; /* RH state preserve */
|
|
|
4a2fec |
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
|
4a2fec |
dc->props = virtio_mmio_properties;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
diff --git a/qemu-options.hx b/qemu-options.hx
|
|
|
4a2fec |
index 9f6e2ad..568fc7c 100644
|
|
|
4a2fec |
--- a/qemu-options.hx
|
|
|
4a2fec |
+++ b/qemu-options.hx
|
|
|
4a2fec |
@@ -1820,11 +1820,6 @@ ETEXI
|
|
|
4a2fec |
|
|
|
4a2fec |
DEF("no-hpet", 0, QEMU_OPTION_no_hpet,
|
|
|
4a2fec |
"-no-hpet disable HPET\n", QEMU_ARCH_I386)
|
|
|
4a2fec |
-STEXI
|
|
|
4a2fec |
-@item -no-hpet
|
|
|
4a2fec |
-@findex -no-hpet
|
|
|
4a2fec |
-Disable HPET support.
|
|
|
4a2fec |
-ETEXI
|
|
|
4a2fec |
|
|
|
4a2fec |
DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable,
|
|
|
4a2fec |
"-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"
|
|
|
4a2fec |
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
|
|
|
4a2fec |
index b24da3b..7e9f94d 100644
|
|
|
4a2fec |
--- a/stubs/Makefile.objs
|
|
|
4a2fec |
+++ b/stubs/Makefile.objs
|
|
|
4a2fec |
@@ -41,3 +41,4 @@ stub-obj-y += vmgenid.o
|
|
|
4a2fec |
stub-obj-y += xen-common.o
|
|
|
4a2fec |
stub-obj-y += xen-hvm.o
|
|
|
4a2fec |
stub-obj-y += shadow-bios.o
|
|
|
4a2fec |
+stub-obj-y += ide-isa.o
|
|
|
4a2fec |
diff --git a/stubs/ide-isa.c b/stubs/ide-isa.c
|
|
|
4a2fec |
new file mode 100644
|
|
|
4a2fec |
index 0000000..5dacaa5
|
|
|
4a2fec |
--- /dev/null
|
|
|
4a2fec |
+++ b/stubs/ide-isa.c
|
|
|
4a2fec |
@@ -0,0 +1,13 @@
|
|
|
4a2fec |
+#include <qemu/osdep.h>
|
|
|
4a2fec |
+#include <hw/ide.h>
|
|
|
4a2fec |
+#include <stdlib.h>
|
|
|
4a2fec |
+
|
|
|
4a2fec |
+ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq,
|
|
|
4a2fec |
+ DriveInfo *hd0, DriveInfo *hd1)
|
|
|
4a2fec |
+{
|
|
|
4a2fec |
+ /*
|
|
|
4a2fec |
+ * In theory the real isa_ide_init() function can return NULL, but no
|
|
|
4a2fec |
+ * caller actually checks for that. Make sure we go out with a clear bang.
|
|
|
4a2fec |
+ */
|
|
|
4a2fec |
+ abort();
|
|
|
4a2fec |
+}
|
|
|
4a2fec |
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
|
|
|
4a2fec |
index 05c038b..3f90b7e 100644
|
|
|
4a2fec |
--- a/target/arm/cpu.c
|
|
|
4a2fec |
+++ b/target/arm/cpu.c
|
|
|
4a2fec |
@@ -1724,7 +1724,9 @@ static void arm_cpu_register_types(void)
|
|
|
4a2fec |
type_register_static(&arm_cpu_type_info);
|
|
|
4a2fec |
|
|
|
4a2fec |
while (info->name) {
|
|
|
4a2fec |
- cpu_register(info);
|
|
|
4a2fec |
+ /* RHEL specific: Filter out unsupported cpu models */
|
|
|
4a2fec |
+ if (!strcmp(info->name, "cortex-a15"))
|
|
|
4a2fec |
+ cpu_register(info);
|
|
|
4a2fec |
info++;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
}
|
|
|
4a2fec |
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
|
|
4a2fec |
index 7f52680..670d121 100644
|
|
|
4a2fec |
--- a/target/i386/cpu.c
|
|
|
4a2fec |
+++ b/target/i386/cpu.c
|
|
|
4a2fec |
@@ -772,11 +772,8 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
4a2fec |
CPUID_CX8 | CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC |
|
|
|
4a2fec |
CPUID_PSE | CPUID_DE | CPUID_FP87,
|
|
|
4a2fec |
.features[FEAT_1_ECX] = CPUID_EXT_CX16 | CPUID_EXT_SSE3,
|
|
|
4a2fec |
- .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_FXSR |
|
|
|
4a2fec |
- CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PAT | CPUID_EXT2_CMOV |
|
|
|
4a2fec |
- CPUID_EXT2_PGE | CPUID_EXT2_SYSCALL | CPUID_EXT2_APIC |
|
|
|
4a2fec |
- CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR | CPUID_EXT2_TSC |
|
|
|
4a2fec |
- CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
4a2fec |
+ .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_NX |
|
|
|
4a2fec |
+ CPUID_EXT2_SYSCALL,
|
|
|
4a2fec |
.features[FEAT_8000_0001_ECX] =
|
|
|
4a2fec |
CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM,
|
|
|
4a2fec |
.xlevel = 0x8000000A,
|
|
|
4a2fec |
@@ -1014,11 +1011,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
|
|
4a2fec |
CPUID_CX8 | CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC |
|
|
|
4a2fec |
CPUID_PSE | CPUID_DE | CPUID_FP87,
|
|
|
4a2fec |
.features[FEAT_1_ECX] = CPUID_EXT_CX16 | CPUID_EXT_SSE3,
|
|
|
4a2fec |
- .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_FXSR |
|
|
|
4a2fec |
- CPUID_EXT2_MMX | CPUID_EXT2_NX | CPUID_EXT2_PAT | CPUID_EXT2_CMOV |
|
|
|
4a2fec |
- CPUID_EXT2_PGE | CPUID_EXT2_SYSCALL | CPUID_EXT2_APIC |
|
|
|
4a2fec |
- CPUID_EXT2_CX8 | CPUID_EXT2_MCE | CPUID_EXT2_PAE | CPUID_EXT2_MSR | CPUID_EXT2_TSC |
|
|
|
4a2fec |
- CPUID_EXT2_PSE | CPUID_EXT2_DE | CPUID_EXT2_FPU,
|
|
|
4a2fec |
+ .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
|
|
|
4a2fec |
.features[FEAT_8000_0001_ECX] = CPUID_EXT3_SSE4A | CPUID_EXT3_ABM |
|
|
|
4a2fec |
CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
|
|
|
4a2fec |
.xlevel = 0x8000000A,
|
|
|
4a2fec |
@@ -4113,11 +4106,13 @@ static Property x86_cpu_properties[] = {
|
|
|
4a2fec |
DEFINE_PROP_BOOL("hv-vapic", X86CPU, hyperv_vapic, false),
|
|
|
4a2fec |
DEFINE_PROP_BOOL("hv-time", X86CPU, hyperv_time, false),
|
|
|
4a2fec |
DEFINE_PROP_BOOL("hv-crash", X86CPU, hyperv_crash, false),
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
DEFINE_PROP_BOOL("hv-reset", X86CPU, hyperv_reset, false),
|
|
|
4a2fec |
DEFINE_PROP_BOOL("hv-vpindex", X86CPU, hyperv_vpindex, false),
|
|
|
4a2fec |
DEFINE_PROP_BOOL("hv-runtime", X86CPU, hyperv_runtime, false),
|
|
|
4a2fec |
DEFINE_PROP_BOOL("hv-synic", X86CPU, hyperv_synic, false),
|
|
|
4a2fec |
DEFINE_PROP_BOOL("hv-stimer", X86CPU, hyperv_stimer, false),
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true),
|
|
|
4a2fec |
DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false),
|
|
|
4a2fec |
DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true),
|
|
|
4a2fec |
diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
|
|
|
4a2fec |
index 4d3e635..08a1f59 100644
|
|
|
4a2fec |
--- a/target/ppc/cpu-models.c
|
|
|
4a2fec |
+++ b/target/ppc/cpu-models.c
|
|
|
4a2fec |
@@ -70,6 +70,7 @@
|
|
|
4a2fec |
#define POWERPC_DEF(_name, _pvr, _type, _desc) \
|
|
|
4a2fec |
POWERPC_DEF_SVR(_name, _desc, _pvr, POWERPC_SVR_NONE, _type)
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Embedded and 32-bit CPUs disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
/* Embedded PowerPC */
|
|
|
4a2fec |
/* PowerPC 401 family */
|
|
|
4a2fec |
POWERPC_DEF("401", CPU_POWERPC_401, 401,
|
|
|
4a2fec |
@@ -1101,8 +1102,10 @@
|
|
|
4a2fec |
"PowerPC 7447A v1.2 (G4)")
|
|
|
4a2fec |
POWERPC_DEF("7457A_v1.2", CPU_POWERPC_74x7A_v12, 7455,
|
|
|
4a2fec |
"PowerPC 7457A v1.2 (G4)")
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
/* 64 bits PowerPC */
|
|
|
4a2fec |
#if defined (TARGET_PPC64)
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
#if defined(TODO)
|
|
|
4a2fec |
POWERPC_DEF("620", CPU_POWERPC_620, 620,
|
|
|
4a2fec |
"PowerPC 620")
|
|
|
4a2fec |
@@ -1131,6 +1134,7 @@
|
|
|
4a2fec |
POWERPC_DEF("POWER6", CPU_POWERPC_POWER6, POWER6,
|
|
|
4a2fec |
"POWER6")
|
|
|
4a2fec |
#endif
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
POWERPC_DEF("POWER7_v2.3", CPU_POWERPC_POWER7_v23, POWER7,
|
|
|
4a2fec |
"POWER7 v2.3")
|
|
|
4a2fec |
POWERPC_DEF("POWER7+_v2.1", CPU_POWERPC_POWER7P_v21, POWER7,
|
|
|
4a2fec |
@@ -1141,12 +1145,15 @@
|
|
|
4a2fec |
"POWER8 v2.0")
|
|
|
4a2fec |
POWERPC_DEF("POWER8NVL_v1.0",CPU_POWERPC_POWER8NVL_v10, POWER8,
|
|
|
4a2fec |
"POWER8NVL v1.0")
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
POWERPC_DEF("970_v2.2", CPU_POWERPC_970_v22, 970,
|
|
|
4a2fec |
"PowerPC 970 v2.2")
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
|
|
|
4a2fec |
POWERPC_DEF("POWER9_v1.0", CPU_POWERPC_POWER9_BASE, POWER9,
|
|
|
4a2fec |
"POWER9 v1.0")
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
POWERPC_DEF("970fx_v1.0", CPU_POWERPC_970FX_v10, 970,
|
|
|
4a2fec |
"PowerPC 970FX v1.0 (G5)")
|
|
|
4a2fec |
POWERPC_DEF("970fx_v2.0", CPU_POWERPC_970FX_v20, 970,
|
|
|
4a2fec |
@@ -1161,6 +1168,7 @@
|
|
|
4a2fec |
"PowerPC 970MP v1.0")
|
|
|
4a2fec |
POWERPC_DEF("970mp_v1.1", CPU_POWERPC_970MP_v11, 970,
|
|
|
4a2fec |
"PowerPC 970MP v1.1")
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
#if defined(TODO)
|
|
|
4a2fec |
POWERPC_DEF("Cell", CPU_POWERPC_CELL, 970,
|
|
|
4a2fec |
"PowerPC Cell")
|
|
|
4a2fec |
@@ -1226,6 +1234,7 @@
|
|
|
4a2fec |
/* PowerPC CPU aliases */
|
|
|
4a2fec |
|
|
|
4a2fec |
PowerPCCPUAlias ppc_cpu_aliases[] = {
|
|
|
4a2fec |
+#if 0 /* Embedded and 32-bit CPUs disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
{ "403", "403GC" },
|
|
|
4a2fec |
{ "405", "405D4" },
|
|
|
4a2fec |
{ "405CR", "405CRc" },
|
|
|
4a2fec |
@@ -1381,22 +1390,27 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
|
|
|
4a2fec |
{ "7447A", "7447A_v1.2" },
|
|
|
4a2fec |
{ "7457A", "7457A_v1.2" },
|
|
|
4a2fec |
{ "Apollo7PM", "7457A_v1.0" },
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
#if defined(TARGET_PPC64)
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
{ "POWER3", "630" },
|
|
|
4a2fec |
{ "POWER3+", "631" },
|
|
|
4a2fec |
{ "POWER5+", "POWER5+_v2.1" },
|
|
|
4a2fec |
{ "POWER5gs", "POWER5+_v2.1" },
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
{ "POWER7", "POWER7_v2.3" },
|
|
|
4a2fec |
{ "POWER7+", "POWER7+_v2.1" },
|
|
|
4a2fec |
{ "POWER8E", "POWER8E_v2.1" },
|
|
|
4a2fec |
{ "POWER8", "POWER8_v2.0" },
|
|
|
4a2fec |
{ "POWER8NVL", "POWER8NVL_v1.0" },
|
|
|
4a2fec |
{ "POWER9", "POWER9_v1.0" },
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
{ "970", "970_v2.2" },
|
|
|
4a2fec |
{ "970fx", "970fx_v3.1" },
|
|
|
4a2fec |
{ "970mp", "970mp_v1.1" },
|
|
|
4a2fec |
#endif
|
|
|
4a2fec |
-
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
/* Generic PowerPCs */
|
|
|
4a2fec |
#if defined(TARGET_PPC64)
|
|
|
4a2fec |
{ "ppc64", "970fx" },
|
|
|
4a2fec |
@@ -1404,5 +1418,6 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
|
|
|
4a2fec |
{ "ppc32", "604" },
|
|
|
4a2fec |
{ "ppc", "ppc32" },
|
|
|
4a2fec |
{ "default", "ppc" },
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
{ NULL, NULL }
|
|
|
4a2fec |
};
|
|
|
4a2fec |
diff --git a/tests/Makefile.include b/tests/Makefile.include
|
|
|
4a2fec |
index 37c1bed..327ffd9 100644
|
|
|
4a2fec |
--- a/tests/Makefile.include
|
|
|
4a2fec |
+++ b/tests/Makefile.include
|
|
|
4a2fec |
@@ -166,8 +166,6 @@ check-qtest-generic-y += tests/device-introspect-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-generic-y = qdev-monitor.c qmp.c
|
|
|
4a2fec |
|
|
|
4a2fec |
gcov-files-ipack-y += hw/ipack/ipack.c
|
|
|
4a2fec |
-check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-ipack-y += hw/char/ipoctal232.c
|
|
|
4a2fec |
|
|
|
4a2fec |
check-qtest-virtioserial-y += tests/virtio-console-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-virtioserial-y += hw/char/virtio-console.c
|
|
|
4a2fec |
@@ -199,23 +197,10 @@ check-qtest-pci-y += tests/e1000e-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c
|
|
|
4a2fec |
check-qtest-pci-y += tests/rtl8139-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-pci-y += hw/net/rtl8139.c
|
|
|
4a2fec |
-check-qtest-pci-y += tests/pcnet-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-pci-y += hw/net/pcnet.c
|
|
|
4a2fec |
-gcov-files-pci-y += hw/net/pcnet-pci.c
|
|
|
4a2fec |
-check-qtest-pci-y += tests/eepro100-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-pci-y += hw/net/eepro100.c
|
|
|
4a2fec |
-check-qtest-pci-y += tests/ne2000-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-pci-y += hw/net/ne2000.c
|
|
|
4a2fec |
-check-qtest-pci-y += tests/nvme-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-pci-y += hw/block/nvme.c
|
|
|
4a2fec |
check-qtest-pci-y += tests/ac97-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-pci-y += hw/audio/ac97.c
|
|
|
4a2fec |
-check-qtest-pci-y += tests/es1370-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-pci-y += hw/audio/es1370.c
|
|
|
4a2fec |
check-qtest-pci-y += $(check-qtest-virtio-y)
|
|
|
4a2fec |
gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
|
|
|
4a2fec |
-check-qtest-pci-y += tests/tpci200-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-pci-y += hw/ipack/tpci200.c
|
|
|
4a2fec |
check-qtest-pci-y += $(check-qtest-ipack-y)
|
|
|
4a2fec |
gcov-files-pci-y += $(gcov-files-ipack-y)
|
|
|
4a2fec |
check-qtest-pci-y += tests/display-vga-test$(EXESUF)
|
|
|
4a2fec |
@@ -229,23 +214,21 @@ check-qtest-pci-y += tests/intel-hda-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-pci-y += hw/audio/intel-hda.c hw/audio/hda-codec.c
|
|
|
4a2fec |
check-qtest-pci-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-pci-y += hw/misc/ivshmem.c
|
|
|
4a2fec |
-check-qtest-pci-y += tests/megasas-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-pci-y += hw/scsi/megasas.c
|
|
|
4a2fec |
+#check-qtest-pci-y += tests/megasas-test$(EXESUF)
|
|
|
4a2fec |
+#gcov-files-pci-y += hw/scsi/megasas.c
|
|
|
4a2fec |
|
|
|
4a2fec |
check-qtest-i386-y = tests/endianness-test$(EXESUF)
|
|
|
4a2fec |
-check-qtest-i386-y += tests/fdc-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-i386-y = hw/block/fdc.c
|
|
|
4a2fec |
+#check-qtest-i386-y += tests/fdc-test$(EXESUF)
|
|
|
4a2fec |
+#gcov-files-i386-y = hw/block/fdc.c
|
|
|
4a2fec |
check-qtest-i386-y += tests/ide-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-i386-y += tests/ahci-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-i386-y += tests/hd-geo-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-i386-y += hw/block/hd-geometry.c
|
|
|
4a2fec |
check-qtest-i386-y += tests/boot-order-test$(EXESUF)
|
|
|
4a2fec |
-check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-i386-y += tests/boot-serial-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-i386-y += tests/rtc-test$(EXESUF)
|
|
|
4a2fec |
-check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF)
|
|
|
4a2fec |
-check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-i386-y += tests/drive_del-test$(EXESUF)
|
|
|
4a2fec |
@@ -254,8 +237,6 @@ check-qtest-i386-y += tests/tco-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
|
|
|
4a2fec |
check-qtest-i386-y += $(check-qtest-pci-y)
|
|
|
4a2fec |
gcov-files-i386-y += $(gcov-files-pci-y)
|
|
|
4a2fec |
-check-qtest-i386-y += tests/vmxnet3-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-i386-y += hw/net/vmxnet3.c
|
|
|
4a2fec |
gcov-files-i386-y += hw/net/net_rx_pkt.c
|
|
|
4a2fec |
gcov-files-i386-y += hw/net/net_tx_pkt.c
|
|
|
4a2fec |
check-qtest-i386-y += tests/pvpanic-test$(EXESUF)
|
|
|
4a2fec |
@@ -264,8 +245,6 @@ check-qtest-i386-y += tests/i82801b11-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-i386-y += hw/pci-bridge/i82801b11.c
|
|
|
4a2fec |
check-qtest-i386-y += tests/ioh3420-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-i386-y += hw/pci-bridge/ioh3420.c
|
|
|
4a2fec |
-check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
|
4a2fec |
-gcov-files-i386-y += hw/usb/hcd-ohci.c
|
|
|
4a2fec |
check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-i386-y += hw/usb/hcd-uhci.c
|
|
|
4a2fec |
check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
|
|
|
4a2fec |
@@ -302,7 +281,7 @@ check-qtest-mips64el-y = tests/endianness-test$(EXESUF)
|
|
|
4a2fec |
|
|
|
4a2fec |
check-qtest-ppc-y = tests/endianness-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
|
|
|
4a2fec |
-check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc-y += tests/boot-serial-test$(EXESUF)
|
|
|
4a2fec |
|
|
|
4a2fec |
@@ -310,32 +289,32 @@ check-qtest-ppc64-y = tests/spapr-phb-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-ppc64-y = ppc64-softmmu/hw/ppc/spapr_pci.c
|
|
|
4a2fec |
check-qtest-ppc64-y += tests/endianness-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc64-y += tests/boot-order-test$(EXESUF)
|
|
|
4a2fec |
-check-qtest-ppc64-y += tests/prom-env-test$(EXESUF)
|
|
|
4a2fec |
-check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-ppc64-y += tests/prom-env-test$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc64-y += tests/drive_del-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc64-y += tests/postcopy-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc64-y += tests/boot-serial-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
|
|
|
4a2fec |
-check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-ppc64-y += hw/usb/hcd-ohci.c
|
|
|
4a2fec |
-check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-ppc64-y += hw/usb/hcd-uhci.c
|
|
|
4a2fec |
check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
|
|
|
4a2fec |
gcov-files-ppc64-y += hw/usb/hcd-xhci.c
|
|
|
4a2fec |
check-qtest-ppc64-y += $(check-qtest-virtio-y)
|
|
|
4a2fec |
-check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
|
|
|
4a2fec |
-check-qtest-ppc64-y += tests/test-filter-mirror$(EXESUF)
|
|
|
4a2fec |
-check-qtest-ppc64-y += tests/test-filter-redirector$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-ppc64-y += tests/test-filter-mirror$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-ppc64-y += tests/test-filter-redirector$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
|
|
|
4a2fec |
check-qtest-ppc64-y += tests/numa-test$(EXESUF)
|
|
|
4a2fec |
-check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
|
|
|
4a2fec |
|
|
|
4a2fec |
check-qtest-sh4-y = tests/endianness-test$(EXESUF)
|
|
|
4a2fec |
|
|
|
4a2fec |
check-qtest-sh4eb-y = tests/endianness-test$(EXESUF)
|
|
|
4a2fec |
|
|
|
4a2fec |
-check-qtest-sparc-y = tests/prom-env-test$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-sparc-y = tests/prom-env-test$(EXESUF)
|
|
|
4a2fec |
#check-qtest-sparc-y += tests/m48t59-test$(EXESUF)
|
|
|
4a2fec |
#gcov-files-sparc-y = hw/timer/m48t59.c
|
|
|
4a2fec |
|
|
|
4a2fec |
@@ -353,7 +332,7 @@ gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c
|
|
|
4a2fec |
check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)
|
|
|
4a2fec |
gcov-files-arm-y += hw/timer/arm_mptimer.c
|
|
|
4a2fec |
|
|
|
4a2fec |
-check-qtest-aarch64-y = tests/numa-test$(EXESUF)
|
|
|
4a2fec |
+#check-qtest-aarch64-y = tests/numa-test$(EXESUF)
|
|
|
4a2fec |
|
|
|
4a2fec |
check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
|
|
|
4a2fec |
|
|
|
4a2fec |
@@ -716,17 +695,15 @@ tests/rtc-test$(EXESUF): tests/rtc-test.o
|
|
|
4a2fec |
tests/m48t59-test$(EXESUF): tests/m48t59-test.o
|
|
|
4a2fec |
tests/endianness-test$(EXESUF): tests/endianness-test.o
|
|
|
4a2fec |
tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y)
|
|
|
4a2fec |
-tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)
|
|
|
4a2fec |
+#tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)
|
|
|
4a2fec |
tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y)
|
|
|
4a2fec |
-tests/fdc-test$(EXESUF): tests/fdc-test.o
|
|
|
4a2fec |
+#tests/fdc-test$(EXESUF): tests/fdc-test.o
|
|
|
4a2fec |
tests/ide-test$(EXESUF): tests/ide-test.o $(libqos-pc-obj-y)
|
|
|
4a2fec |
tests/ahci-test$(EXESUF): tests/ahci-test.o $(libqos-pc-obj-y)
|
|
|
4a2fec |
-tests/ipmi-kcs-test$(EXESUF): tests/ipmi-kcs-test.o
|
|
|
4a2fec |
-tests/ipmi-bt-test$(EXESUF): tests/ipmi-bt-test.o
|
|
|
4a2fec |
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
|
|
|
4a2fec |
tests/boot-order-test$(EXESUF): tests/boot-order-test.o $(libqos-obj-y)
|
|
|
4a2fec |
tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o $(libqos-obj-y)
|
|
|
4a2fec |
-tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
|
|
|
4a2fec |
+#tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
|
|
|
4a2fec |
tests/boot-sector.o tests/acpi-utils.o $(libqos-obj-y)
|
|
|
4a2fec |
tests/pxe-test$(EXESUF): tests/pxe-test.o tests/boot-sector.o $(libqos-obj-y)
|
|
|
4a2fec |
tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
|
|
|
4a2fec |
@@ -738,11 +715,8 @@ tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
|
|
|
4a2fec |
tests/e1000-test$(EXESUF): tests/e1000-test.o
|
|
|
4a2fec |
tests/e1000e-test$(EXESUF): tests/e1000e-test.o $(libqos-pc-obj-y)
|
|
|
4a2fec |
tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)
|
|
|
4a2fec |
-tests/pcnet-test$(EXESUF): tests/pcnet-test.o
|
|
|
4a2fec |
-tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
|
|
|
4a2fec |
+#tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o
|
|
|
4a2fec |
tests/eepro100-test$(EXESUF): tests/eepro100-test.o
|
|
|
4a2fec |
-tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o
|
|
|
4a2fec |
-tests/ne2000-test$(EXESUF): tests/ne2000-test.o
|
|
|
4a2fec |
tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o
|
|
|
4a2fec |
tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y)
|
|
|
4a2fec |
tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o
|
|
|
4a2fec |
@@ -753,21 +727,17 @@ tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o $(libqos-virtio-obj-y)
|
|
|
4a2fec |
tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o $(libqos-virtio-obj-y)
|
|
|
4a2fec |
tests/virtio-serial-test$(EXESUF): tests/virtio-serial-test.o
|
|
|
4a2fec |
tests/virtio-console-test$(EXESUF): tests/virtio-console-test.o
|
|
|
4a2fec |
-tests/tpci200-test$(EXESUF): tests/tpci200-test.o
|
|
|
4a2fec |
tests/display-vga-test$(EXESUF): tests/display-vga-test.o
|
|
|
4a2fec |
tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o
|
|
|
4a2fec |
tests/qom-test$(EXESUF): tests/qom-test.o
|
|
|
4a2fec |
tests/test-hmp$(EXESUF): tests/test-hmp.o
|
|
|
4a2fec |
tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-pc-obj-y)
|
|
|
4a2fec |
tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y)
|
|
|
4a2fec |
-tests/nvme-test$(EXESUF): tests/nvme-test.o
|
|
|
4a2fec |
tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o
|
|
|
4a2fec |
tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o
|
|
|
4a2fec |
tests/ac97-test$(EXESUF): tests/ac97-test.o
|
|
|
4a2fec |
-tests/es1370-test$(EXESUF): tests/es1370-test.o
|
|
|
4a2fec |
tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o
|
|
|
4a2fec |
tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o
|
|
|
4a2fec |
-tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y)
|
|
|
4a2fec |
tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)
|
|
|
4a2fec |
tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y)
|
|
|
4a2fec |
tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)
|
|
|
4a2fec |
@@ -785,7 +755,7 @@ tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
|
|
|
4a2fec |
tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)
|
|
|
4a2fec |
tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y)
|
|
|
4a2fec |
tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
|
|
|
4a2fec |
-tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y)
|
|
|
4a2fec |
+#tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y)
|
|
|
4a2fec |
tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o contrib/libvhost-user/libvhost-user.o $(test-util-obj-y)
|
|
|
4a2fec |
tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
|
|
|
4a2fec |
tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o
|
|
|
4a2fec |
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
|
|
|
4a2fec |
index 564da45..ede777a 100644
|
|
|
4a2fec |
--- a/tests/bios-tables-test.c
|
|
|
4a2fec |
+++ b/tests/bios-tables-test.c
|
|
|
4a2fec |
@@ -743,6 +743,7 @@ static void test_acpi_q35_tcg_cphp(void)
|
|
|
4a2fec |
free_test_data(&data);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
static uint8_t ipmi_required_struct_types[] = {
|
|
|
4a2fec |
0, 1, 3, 4, 16, 17, 19, 32, 38, 127
|
|
|
4a2fec |
};
|
|
|
4a2fec |
@@ -779,6 +780,7 @@ static void test_acpi_piix4_tcg_ipmi(void)
|
|
|
4a2fec |
&data);
|
|
|
4a2fec |
free_test_data(&data);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
|
|
|
4a2fec |
static void test_acpi_q35_tcg_memhp(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
@@ -824,8 +826,10 @@ int main(int argc, char *argv[])
|
|
|
4a2fec |
qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
|
|
|
4a2fec |
qtest_add_func("acpi/q35", test_acpi_q35_tcg);
|
|
|
4a2fec |
qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
qtest_add_func("acpi/piix4/ipmi", test_acpi_piix4_tcg_ipmi);
|
|
|
4a2fec |
qtest_add_func("acpi/q35/ipmi", test_acpi_q35_tcg_ipmi);
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
qtest_add_func("acpi/piix4/cpuhp", test_acpi_piix4_tcg_cphp);
|
|
|
4a2fec |
qtest_add_func("acpi/q35/cpuhp", test_acpi_q35_tcg_cphp);
|
|
|
4a2fec |
qtest_add_func("acpi/piix4/memhp", test_acpi_piix4_tcg_memhp);
|
|
|
4a2fec |
diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
|
|
|
4a2fec |
index fc1e794..e29c528 100644
|
|
|
4a2fec |
--- a/tests/boot-order-test.c
|
|
|
4a2fec |
+++ b/tests/boot-order-test.c
|
|
|
4a2fec |
@@ -109,6 +109,7 @@ static void test_pc_boot_order(void)
|
|
|
4a2fec |
test_boot_orders(NULL, read_boot_order_pc, test_cases_pc);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
4a2fec |
static uint8_t read_m48t59(uint64_t addr, uint16_t reg)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
writeb(addr, reg & 0xff);
|
|
|
4a2fec |
@@ -139,6 +140,7 @@ static uint64_t read_boot_order_pmac(void)
|
|
|
4a2fec |
|
|
|
4a2fec |
return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+#endif /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
4a2fec |
|
|
|
4a2fec |
static const boot_order_test test_cases_fw_cfg[] = {
|
|
|
4a2fec |
{ "", 'c', 'c' },
|
|
|
4a2fec |
@@ -148,6 +150,7 @@ static const boot_order_test test_cases_fw_cfg[] = {
|
|
|
4a2fec |
{}
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
4a2fec |
static void test_pmac_oldworld_boot_order(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
test_boot_orders("g3beige", read_boot_order_pmac, test_cases_fw_cfg);
|
|
|
4a2fec |
@@ -156,7 +159,9 @@ static void test_pmac_oldworld_boot_order(void)
|
|
|
4a2fec |
static void test_pmac_newworld_boot_order(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
test_boot_orders("mac99", read_boot_order_pmac, test_cases_fw_cfg);
|
|
|
4a2fec |
+
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+#endif /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
4a2fec |
|
|
|
4a2fec |
static uint64_t read_boot_order_sun4m(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
@@ -191,11 +196,13 @@ int main(int argc, char *argv[])
|
|
|
4a2fec |
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
|
|
|
4a2fec |
qtest_add_func("boot-order/pc", test_pc_boot_order);
|
|
|
4a2fec |
} else if (strcmp(arch, "ppc") == 0 || strcmp(arch, "ppc64") == 0) {
|
|
|
4a2fec |
+#if 0 /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
4a2fec |
qtest_add_func("boot-order/prep", test_prep_boot_order);
|
|
|
4a2fec |
qtest_add_func("boot-order/pmac_oldworld",
|
|
|
4a2fec |
test_pmac_oldworld_boot_order);
|
|
|
4a2fec |
qtest_add_func("boot-order/pmac_newworld",
|
|
|
4a2fec |
test_pmac_newworld_boot_order);
|
|
|
4a2fec |
+#endif /* Disabled for RHEL, since CONFIG_MAC and CONFIG_PREP are not enabled */
|
|
|
4a2fec |
} else if (strcmp(arch, "sparc") == 0) {
|
|
|
4a2fec |
qtest_add_func("boot-order/sun4m", test_sun4m_boot_order);
|
|
|
4a2fec |
} else if (strcmp(arch, "sparc64") == 0) {
|
|
|
4a2fec |
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
|
|
|
4a2fec |
index b95c5e7..e58c518 100644
|
|
|
4a2fec |
--- a/tests/boot-serial-test.c
|
|
|
4a2fec |
+++ b/tests/boot-serial-test.c
|
|
|
4a2fec |
@@ -26,14 +26,14 @@ static testdef_t tests[] = {
|
|
|
4a2fec |
{ "alpha", "clipper", "", "PCI:" },
|
|
|
4a2fec |
{ "ppc", "ppce500", "", "U-Boot" },
|
|
|
4a2fec |
{ "ppc", "prep", "", "Open Hack'Ware BIOS" },
|
|
|
4a2fec |
- { "ppc64", "ppce500", "", "U-Boot" },
|
|
|
4a2fec |
- { "ppc64", "prep", "", "Open Hack'Ware BIOS" },
|
|
|
4a2fec |
+/* { "ppc64", "ppce500", "", "U-Boot" },
|
|
|
4a2fec |
+ { "ppc64", "prep", "", "Open Hack'Ware BIOS" }, */
|
|
|
4a2fec |
{ "ppc64", "pseries", "", "Open Firmware" },
|
|
|
4a2fec |
- { "ppc64", "powernv", "-cpu POWER8", "SkiBoot" },
|
|
|
4a2fec |
+/* { "ppc64", "powernv", "-cpu POWER8", "SkiBoot" }, */
|
|
|
4a2fec |
{ "i386", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
|
4a2fec |
{ "i386", "pc", "-device sga", "SGABIOS" },
|
|
|
4a2fec |
{ "i386", "q35", "-device sga", "SGABIOS" },
|
|
|
4a2fec |
- { "x86_64", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
|
4a2fec |
+ { "x86_64", "pc", "-cpu qemu32 -device sga", "SGABIOS" },
|
|
|
4a2fec |
{ "x86_64", "q35", "-device sga", "SGABIOS" },
|
|
|
4a2fec |
{ "s390x", "s390-ccw-virtio",
|
|
|
4a2fec |
"-nodefaults -device sclpconsole,chardev=serial0", "virtio device" },
|
|
|
4a2fec |
diff --git a/tests/e1000-test.c b/tests/e1000-test.c
|
|
|
4a2fec |
index 0c5fcdc..0504d33 100644
|
|
|
4a2fec |
--- a/tests/e1000-test.c
|
|
|
4a2fec |
+++ b/tests/e1000-test.c
|
|
|
4a2fec |
@@ -29,8 +29,10 @@ static void test_device(gconstpointer data)
|
|
|
4a2fec |
static const char *models[] = {
|
|
|
4a2fec |
"e1000",
|
|
|
4a2fec |
"e1000-82540em",
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux 7 */
|
|
|
4a2fec |
"e1000-82544gc",
|
|
|
4a2fec |
"e1000-82545em",
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
int main(int argc, char **argv)
|
|
|
4a2fec |
diff --git a/tests/endianness-test.c b/tests/endianness-test.c
|
|
|
4a2fec |
index ed0bf52..58af690 100644
|
|
|
4a2fec |
--- a/tests/endianness-test.c
|
|
|
4a2fec |
+++ b/tests/endianness-test.c
|
|
|
4a2fec |
@@ -34,6 +34,7 @@ static const TestCase test_cases[] = {
|
|
|
4a2fec |
{ "mips64", "mips", 0x14000000, .bswap = true },
|
|
|
4a2fec |
{ "mips64", "malta", 0x10000000, .bswap = true },
|
|
|
4a2fec |
{ "mips64el", "fulong2e", 0x1fd00000 },
|
|
|
4a2fec |
+#if 0 /* Disabled for RHEL, since ISA is not enabled */
|
|
|
4a2fec |
{ "ppc", "g3beige", 0xfe000000, .bswap = true, .superio = "i82378" },
|
|
|
4a2fec |
{ "ppc", "prep", 0x80000000, .bswap = true },
|
|
|
4a2fec |
{ "ppc", "bamboo", 0xe8000000, .bswap = true, .superio = "i82378" },
|
|
|
4a2fec |
@@ -41,6 +42,7 @@ static const TestCase test_cases[] = {
|
|
|
4a2fec |
{ "ppc64", "pseries", (1ULL << 45), .bswap = true, .superio = "i82378" },
|
|
|
4a2fec |
{ "ppc64", "pseries-2.7", 0x10080000000ULL,
|
|
|
4a2fec |
.bswap = true, .superio = "i82378" },
|
|
|
4a2fec |
+#endif /* Disabled for RHEL, since ISA is not enabled */
|
|
|
4a2fec |
{ "sh4", "r2d", 0xfe240000, .superio = "i82378" },
|
|
|
4a2fec |
{ "sh4eb", "r2d", 0xfe240000, .bswap = true, .superio = "i82378" },
|
|
|
4a2fec |
{ "sparc64", "sun4u", 0x1fe02000000LL, .bswap = true },
|
|
|
4a2fec |
diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c
|
|
|
4a2fec |
index 3776342..6aae100 100644
|
|
|
4a2fec |
--- a/tests/ivshmem-test.c
|
|
|
4a2fec |
+++ b/tests/ivshmem-test.c
|
|
|
4a2fec |
@@ -256,6 +256,7 @@ static void test_ivshmem_pair(void)
|
|
|
4a2fec |
g_free(data);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
typedef struct ServerThread {
|
|
|
4a2fec |
GThread *thread;
|
|
|
4a2fec |
IvshmemServer *server;
|
|
|
4a2fec |
@@ -413,9 +414,11 @@ static void test_ivshmem_server_irq(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
test_ivshmem_server(false);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
|
|
|
4a2fec |
#define PCI_SLOT_HP 0x06
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Test uses legacy ivshmem, which is disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
static void test_ivshmem_hotplug(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
const char *arch = qtest_get_arch();
|
|
|
4a2fec |
@@ -433,6 +436,7 @@ static void test_ivshmem_hotplug(void)
|
|
|
4a2fec |
qtest_end();
|
|
|
4a2fec |
g_free(opts);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
|
|
|
4a2fec |
static void test_ivshmem_memdev(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
@@ -500,7 +504,7 @@ static gchar *mktempshm(int size, int *fd)
|
|
|
4a2fec |
int main(int argc, char **argv)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
int ret, fd;
|
|
|
4a2fec |
- const char *arch = qtest_get_arch();
|
|
|
4a2fec |
+/* const char *arch = qtest_get_arch(); */
|
|
|
4a2fec |
gchar dir[] = "/tmp/ivshmem-test.XXXXXX";
|
|
|
4a2fec |
|
|
|
4a2fec |
#if !GLIB_CHECK_VERSION(2, 31, 0)
|
|
|
4a2fec |
@@ -527,14 +531,18 @@ int main(int argc, char **argv)
|
|
|
4a2fec |
tmpserver = g_strconcat(tmpdir, "/server", NULL);
|
|
|
4a2fec |
|
|
|
4a2fec |
qtest_add_func("/ivshmem/single", test_ivshmem_single);
|
|
|
4a2fec |
+#if 0 /* Test uses legacy ivshmem, which is disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
qtest_add_func("/ivshmem/hotplug", test_ivshmem_hotplug);
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
qtest_add_func("/ivshmem/memdev", test_ivshmem_memdev);
|
|
|
4a2fec |
if (g_test_slow()) {
|
|
|
4a2fec |
qtest_add_func("/ivshmem/pair", test_ivshmem_pair);
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux: */
|
|
|
4a2fec |
if (strcmp(arch, "ppc64") != 0) {
|
|
|
4a2fec |
qtest_add_func("/ivshmem/server-msi", test_ivshmem_server_msi);
|
|
|
4a2fec |
qtest_add_func("/ivshmem/server-irq", test_ivshmem_server_irq);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
ret = g_test_run();
|
|
|
4a2fec |
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
|
|
|
4a2fec |
index c8cfc76..e6275f6 100755
|
|
|
4a2fec |
--- a/tests/qemu-iotests/051
|
|
|
4a2fec |
+++ b/tests/qemu-iotests/051
|
|
|
4a2fec |
@@ -145,9 +145,9 @@ case "$QEMU_DEFAULT_MACHINE" in
|
|
|
4a2fec |
pc)
|
|
|
4a2fec |
run_qemu -drive if=floppy
|
|
|
4a2fec |
run_qemu -drive if=ide,media=cdrom
|
|
|
4a2fec |
- run_qemu -drive if=scsi,media=cdrom
|
|
|
4a2fec |
+# run_qemu -drive if=scsi,media=cdrom
|
|
|
4a2fec |
run_qemu -drive if=ide
|
|
|
4a2fec |
- run_qemu -drive if=scsi
|
|
|
4a2fec |
+# run_qemu -drive if=scsi
|
|
|
4a2fec |
;;
|
|
|
4a2fec |
*)
|
|
|
4a2fec |
;;
|
|
|
4a2fec |
@@ -158,11 +158,11 @@ run_qemu -drive if=virtio
|
|
|
4a2fec |
case "$QEMU_DEFAULT_MACHINE" in
|
|
|
4a2fec |
pc)
|
|
|
4a2fec |
run_qemu -drive if=none,id=disk -device ide-cd,drive=disk
|
|
|
4a2fec |
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
4a2fec |
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
4a2fec |
run_qemu -drive if=none,id=disk -device ide-drive,drive=disk
|
|
|
4a2fec |
run_qemu -drive if=none,id=disk -device ide-hd,drive=disk
|
|
|
4a2fec |
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
4a2fec |
- run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
4a2fec |
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
4a2fec |
+# run_qemu -drive if=none,id=disk -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
4a2fec |
;;
|
|
|
4a2fec |
*)
|
|
|
4a2fec |
;;
|
|
|
4a2fec |
@@ -176,9 +176,9 @@ case "$QEMU_DEFAULT_MACHINE" in
|
|
|
4a2fec |
pc)
|
|
|
4a2fec |
run_qemu -drive file="$TEST_IMG",if=floppy,readonly=on
|
|
|
4a2fec |
run_qemu -drive file="$TEST_IMG",if=ide,media=cdrom,readonly=on
|
|
|
4a2fec |
- run_qemu -drive file="$TEST_IMG",if=scsi,media=cdrom,readonly=on
|
|
|
4a2fec |
+# run_qemu -drive file="$TEST_IMG",if=scsi,media=cdrom,readonly=on
|
|
|
4a2fec |
run_qemu -drive file="$TEST_IMG",if=ide,readonly=on
|
|
|
4a2fec |
- run_qemu -drive file="$TEST_IMG",if=scsi,readonly=on
|
|
|
4a2fec |
+# run_qemu -drive file="$TEST_IMG",if=scsi,readonly=on
|
|
|
4a2fec |
;;
|
|
|
4a2fec |
*)
|
|
|
4a2fec |
;;
|
|
|
4a2fec |
@@ -189,11 +189,11 @@ run_qemu -drive file="$TEST_IMG",if=virtio,readonly=on
|
|
|
4a2fec |
case "$QEMU_DEFAULT_MACHINE" in
|
|
|
4a2fec |
pc)
|
|
|
4a2fec |
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-cd,drive=disk
|
|
|
4a2fec |
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
4a2fec |
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-cd,drive=disk
|
|
|
4a2fec |
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-drive,drive=disk
|
|
|
4a2fec |
run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device ide-hd,drive=disk
|
|
|
4a2fec |
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
4a2fec |
- run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
4a2fec |
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-disk,drive=disk
|
|
|
4a2fec |
+# run_qemu -drive file="$TEST_IMG",if=none,id=disk,readonly=on -device lsi53c895a -device scsi-hd,drive=disk
|
|
|
4a2fec |
;;
|
|
|
4a2fec |
*)
|
|
|
4a2fec |
;;
|
|
|
4a2fec |
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
|
|
|
4a2fec |
index 4bd5017..0c2bda3 100644
|
|
|
4a2fec |
--- a/tests/qemu-iotests/group
|
|
|
4a2fec |
+++ b/tests/qemu-iotests/group
|
|
|
4a2fec |
@@ -77,7 +77,7 @@
|
|
|
4a2fec |
068 rw auto quick
|
|
|
4a2fec |
069 rw auto quick
|
|
|
4a2fec |
070 rw auto quick
|
|
|
4a2fec |
-071 rw auto quick
|
|
|
4a2fec |
+# 071 rw auto quick -- requires whitelisted blkverify
|
|
|
4a2fec |
072 rw auto quick
|
|
|
4a2fec |
073 rw auto quick
|
|
|
4a2fec |
074 rw auto quick
|
|
|
4a2fec |
@@ -105,7 +105,7 @@
|
|
|
4a2fec |
096 rw auto quick
|
|
|
4a2fec |
097 rw auto backing
|
|
|
4a2fec |
098 rw auto backing quick
|
|
|
4a2fec |
-099 rw auto quick
|
|
|
4a2fec |
+# 099 rw auto quick -- requires whitelisted blkverify
|
|
|
4a2fec |
# 100 was removed, do not reuse
|
|
|
4a2fec |
101 rw auto quick
|
|
|
4a2fec |
102 rw auto quick
|
|
|
4a2fec |
diff --git a/tests/qom-test.c b/tests/qom-test.c
|
|
|
4a2fec |
index ab0595d..44347d2 100644
|
|
|
4a2fec |
--- a/tests/qom-test.c
|
|
|
4a2fec |
+++ b/tests/qom-test.c
|
|
|
4a2fec |
@@ -15,7 +15,9 @@
|
|
|
4a2fec |
#include "qapi/qmp/types.h"
|
|
|
4a2fec |
|
|
|
4a2fec |
static const char *blacklist_x86[] = {
|
|
|
4a2fec |
- "xenfv", "xenpv", NULL
|
|
|
4a2fec |
+ "xenfv", "xenpv",
|
|
|
4a2fec |
+ "rhel6.6.0", "rhel6.5.0", "rhel6.4.0", "rhel6.3.0",
|
|
|
4a2fec |
+ "rhel6.2.0", "rhel6.1.0", "rhel6.0.0", NULL
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
static const struct {
|
|
|
4a2fec |
diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c
|
|
|
4a2fec |
index 58a2dd9..47c21f7 100644
|
|
|
4a2fec |
--- a/tests/test-x86-cpuid-compat.c
|
|
|
4a2fec |
+++ b/tests/test-x86-cpuid-compat.c
|
|
|
4a2fec |
@@ -305,6 +305,7 @@ int main(int argc, char **argv)
|
|
|
4a2fec |
"-cpu 486,xlevel2=0xC0000002,+xstore",
|
|
|
4a2fec |
"xlevel2", 0xC0000002);
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled in Red Hat Enterprise Linux */
|
|
|
4a2fec |
/* Check compatibility of old machine-types that didn't
|
|
|
4a2fec |
* auto-increase level/xlevel/xlevel2: */
|
|
|
4a2fec |
|
|
|
4a2fec |
@@ -355,6 +356,7 @@ int main(int argc, char **argv)
|
|
|
4a2fec |
add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on",
|
|
|
4a2fec |
"-machine pc-i440fx-2.4 -cpu SandyBridge,+npt",
|
|
|
4a2fec |
"xlevel", 0x80000008);
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
|
|
|
4a2fec |
/* Test feature parsing */
|
|
|
4a2fec |
add_feature_test("x86/cpuid/features/plus",
|
|
|
4a2fec |
diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c
|
|
|
4a2fec |
index 031764d..80666d4 100644
|
|
|
4a2fec |
--- a/tests/usb-hcd-xhci-test.c
|
|
|
4a2fec |
+++ b/tests/usb-hcd-xhci-test.c
|
|
|
4a2fec |
@@ -21,6 +21,7 @@ static void test_xhci_hotplug(void)
|
|
|
4a2fec |
usb_test_hotplug("xhci", 1, NULL);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */
|
|
|
4a2fec |
static void test_usb_uas_hotplug(void)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
QDict *response;
|
|
|
4a2fec |
@@ -77,6 +78,7 @@ static void test_usb_uas_hotplug(void)
|
|
|
4a2fec |
g_assert(!strcmp(qdict_get_str(response, "event"), "DEVICE_DELETED"));
|
|
|
4a2fec |
QDECREF(response);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
|
|
|
4a2fec |
int main(int argc, char **argv)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
@@ -86,8 +88,9 @@ int main(int argc, char **argv)
|
|
|
4a2fec |
|
|
|
4a2fec |
qtest_add_func("/xhci/pci/init", test_xhci_init);
|
|
|
4a2fec |
qtest_add_func("/xhci/pci/hotplug", test_xhci_hotplug);
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */
|
|
|
4a2fec |
qtest_add_func("/xhci/pci/hotplug/usb-uas", test_usb_uas_hotplug);
|
|
|
4a2fec |
-
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
qtest_start("-device nec-usb-xhci,id=xhci"
|
|
|
4a2fec |
" -drive id=drive0,if=none,file=null-co://,format=raw");
|
|
|
4a2fec |
ret = g_test_run();
|
|
|
4a2fec |
diff --git a/vl.c b/vl.c
|
|
|
4a2fec |
index 8e247cc..a64b349 100644
|
|
|
4a2fec |
--- a/vl.c
|
|
|
4a2fec |
+++ b/vl.c
|
|
|
4a2fec |
@@ -168,7 +168,7 @@ int max_cpus = 1;
|
|
|
4a2fec |
int smp_cores = 1;
|
|
|
4a2fec |
int smp_threads = 1;
|
|
|
4a2fec |
int acpi_enabled = 1;
|
|
|
4a2fec |
-int no_hpet = 0;
|
|
|
4a2fec |
+int no_hpet = 1; /* Always disabled for Red Hat Enterprise Linux */
|
|
|
4a2fec |
int fd_bootchk = 1;
|
|
|
4a2fec |
static int no_reboot;
|
|
|
4a2fec |
int no_shutdown = 0;
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|