From 570ba131d06fafd349b754357414fa322ac53c36 Mon Sep 17 00:00:00 2001

From: Miroslav Rezanina <mrezanin@redhat.com>

Date: Wed, 2 Sep 2020 09:11:07 +0200

Subject: Enable/disable devices for RHEL

This commit adds all changes related to changes in supported devices.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

Rebase notes (qemu 3.1.0)

- spapr_rng disabled in default_config

- new hyperv.mak in default configs

- Move changes from x86_64-softmmu.mak to i386-softmmu.mak

- Added CONFIG_VIRTIO_MMIO to aarch64-softmmu.mak

- Removed config_vga_isa.c changes as no longer needed

- Removed new devices

Rebase notes (4.0.0):

- Added CONFIG_PCI_EXPRESS_GENERIC_BRIDGE for aarch64-softmmu.mak

- Added CONFIG_ARM_VIRT for aarch64-softmmu.mak

- Switch to KConfig (upstream)

 - Using device whitelist + without-defualt-devices option

Rebase notes (4.1.0):

- Added CONFIG_USB_OHCI_PCI for ppc64

- Added CONFIG_XIVE_KVM for ppc64

- Added CONFIG_ACPI_PCI for x86_64

- Added CONFIG_SEMIHOSTING for aarch64

- Cleanup aarch64 devices

- Do not build a15mpcore.c

- Removed ide-isa.c stub file

- Use CONFIG_USB_EHCI_PCI on x86_64 (new upstream)

Rebase notes (4.2.0-rc0):

- Use conditional build for isa-superio.c (upstream change)

- Rename PCI_PIIX to PCI_I440FX (upstream change)

Rebase notes (4.2.0-rc3):

- Disabled ccid-card-emulated (patch 92566)

- Disabled vfio-pci-igd-lpc-bridge (patch 92565)

Rebase notes (5.1.0):

- added CONFIG_PCI_EXPRESS on ppc64 (due to upstream dependency)

- Added CONFIG_NVDIMM

- updated cortex-15 disabling to upstream code

- Add CONFIG_ACPI_APEI for aarch64

- removed obsolete hw/bt/Makefile.objs chunk

- removed unnecessary changes in target/i386/cpu.c

Rebase notes (5.2.0 rc0):

- Added CONFIG_USB_XHCI_PCI on aarch64 ppc64 and x86_64

- remove vl.c hack for no hpet

- Enable CONFIG_PTIMER for aarch64

- Do not package hw-display-virtio-gpu.so on s390x

Rebase notes (5.2.0 rc1):

- Added CONFIG_ARM_GIC for aarch64 (required for build)

Rebase notes (weekly-210113):

- Removed XICS_KVM, XICS_SPAPR, XIVE_KVM and XIVE_SPAPR config (removed upstream)

Rebase notes (weekly-210120):

- Add CONFIG_ARM_COMPATIBLE_SEMIHOSTING option

Rebase notes (weekly-210203):

- Rename CONFIG_PVPANIC to CONFIG_PVPANIC_ISA

Rebase notes (weekly-210317):

- Add new USB_STORAGE_CORE and USB_STORAGE_CLASSIC config for ppc64 and x86_64

- Update disabling TCG cpus for AArch64

Rebase notes (weekly-210519):

- Do not use CONFIG_SPICE and CONFIG_OPENGL in default configs

Rebase notes (weekly-210623):

- Add CONFIG_TPM for archs with used TPM functionality

Rebase notes (weekly-210714):

- default_configs moved to configs

Rebase notes (6.1.0 rc2):

- Use --with-device-ARCH configure option to use redhat config files

Merged patches (qemu 3.1.0):

- d51e082 Re-enable CONFIG_HYPERV_TESTDEV

- 4b889f3 Declare cirrus-vga as deprecated

- b579d32 Do not build bluetooth support

- 3eef52a Disable CONFIG_IPMI and CONFIG_I2C for ppc64

- 9caf292 Disable CONFIG_CAN_BUS and CONFIG_CAN_SJA1000

Merged patches (4.1.0):

- 20a51f6 fdc: Revert downstream disablement of device "floppy"

- f869cc0 fdc: Restrict floppy controllers to RHEL-7 machine types

- 5909721 aarch64: Compile out IOH3420

- 27b7c44 rh: set CONFIG_BOCHS_DISPLAY=y for x86 (partial)

- 495a27d x86_64-rh-devices: add missing TPM passthrough

- e1fe9fe x86_64-rh-devices: enable TPM emulation (partial)

Merged patches (4.2.0):

- f7587dd RHEL: disable hostmem-memfd

Merged patches (5.1.0):

- 4543a3c i386: Remove cpu64-rhel6 CPU model

- 96533 aarch64: Remove tcg cpu types (pjw commit)

- 559d589 Revert "RHEL: disable hostmem-memfd"

- 441128e enable ramfb

Merged patches (5.2.0 rc0):

- f70eb50 RHEL-only: Enable vTPM for POWER in downstream configs

- 69d8ae7 redhat: fix 5.0 rebase missing ISA TPM TIS

- 8310f89 RHEL-only: Enable vTPM for ARM in downstream configs

- 4a8ccfd Disable TPM passthrough backend on ARM

Merged patches (6.0.0):

- ff817df9e3 config: enable VFIO_CCW

- 70d3924521 redhat: Add some devices for exporting upstream machine types

 - without machine type chunks

- efac91b2b4 default-configs: Enable vhost-user-blk

Merged patches (weekly-210630):

- 59a178acff disable CONFIG_USB_STORAGE_BOT

Merged patches (6.1.0 rc2):

- 86f0025f16 aarch64: Add USB storage devices

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 .../aarch64-softmmu/aarch64-rh-devices.mak    |  31 ++++++

 .../ppc64-softmmu/ppc64-rh-devices.mak        |  36 ++++++

 configs/devices/rh-virtio.mak                 |  10 ++

 .../s390x-softmmu/s390x-rh-devices.mak        |  16 +++

 .../x86_64-softmmu/x86_64-rh-devices.mak      | 104 ++++++++++++++++++

 .../x86_64-upstream-devices.mak               |   4 +

 hw/acpi/ich9.c                                |   4 +-

 hw/arm/meson.build                            |   2 +-

 hw/block/fdc.c                                |  10 ++

 hw/char/parallel.c                            |   9 ++

 hw/cpu/meson.build                            |   5 +-

 hw/display/cirrus_vga.c                       |   3 +

 hw/ide/piix.c                                 |   5 +-

 hw/input/pckbd.c                              |   2 +

 hw/net/e1000.c                                |   2 +

 hw/ppc/spapr_cpu_core.c                       |   2 +

 hw/timer/hpet.c                               |   8 ++

 hw/usb/meson.build                            |   2 +-

 qemu-options.hx                               |   4 -

 redhat/qemu-kvm.spec.template                 |  13 ++-

 target/arm/cpu_tcg.c                          |  10 ++

 target/ppc/cpu-models.c                       |  10 ++

 target/s390x/cpu_models_sysemu.c              |   3 +

 target/s390x/kvm/kvm.c                        |   8 ++

 24 files changed, 289 insertions(+), 14 deletions(-)

 create mode 100644 configs/devices/aarch64-softmmu/aarch64-rh-devices.mak

 create mode 100644 configs/devices/ppc64-softmmu/ppc64-rh-devices.mak

 create mode 100644 configs/devices/rh-virtio.mak

 create mode 100644 configs/devices/s390x-softmmu/s390x-rh-devices.mak

 create mode 100644 configs/devices/x86_64-softmmu/x86_64-rh-devices.mak

 create mode 100644 configs/devices/x86_64-softmmu/x86_64-upstream-devices.mak

diff --git a/configs/devices/aarch64-softmmu/aarch64-rh-devices.mak b/configs/devices/aarch64-softmmu/aarch64-rh-devices.mak

new file mode 100644

index 0000000000..0d4f9e6e4b

--- /dev/null

+++ b/configs/devices/aarch64-softmmu/aarch64-rh-devices.mak

@@ -0,0 +1,31 @@

+include ../rh-virtio.mak

+

+CONFIG_ARM_GIC_KVM=y

+CONFIG_ARM_GIC=y

+CONFIG_ARM_SMMUV3=y

+CONFIG_ARM_V7M=y

+CONFIG_ARM_VIRT=y

+CONFIG_EDID=y

+CONFIG_PCIE_PORT=y

+CONFIG_PCI_DEVICES=y

+CONFIG_PCI_TESTDEV=y

+CONFIG_PFLASH_CFI01=y

+CONFIG_SCSI=y

+CONFIG_SEMIHOSTING=y

+CONFIG_USB=y

+CONFIG_USB_XHCI=y

+CONFIG_USB_XHCI_PCI=y

+CONFIG_USB_STORAGE_CORE=y

+CONFIG_USB_STORAGE_CLASSIC=y

+CONFIG_VFIO=y

+CONFIG_VFIO_PCI=y

+CONFIG_VIRTIO_MMIO=y

+CONFIG_VIRTIO_PCI=y

+CONFIG_XIO3130=y

+CONFIG_NVDIMM=y

+CONFIG_ACPI_APEI=y

+CONFIG_TPM=y

+CONFIG_TPM_EMULATOR=y

+CONFIG_TPM_TIS_SYSBUS=y

+CONFIG_PTIMER=y

+CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y

diff --git a/configs/devices/ppc64-softmmu/ppc64-rh-devices.mak b/configs/devices/ppc64-softmmu/ppc64-rh-devices.mak

new file mode 100644

index 0000000000..73e3ee0293

--- /dev/null

+++ b/configs/devices/ppc64-softmmu/ppc64-rh-devices.mak

@@ -0,0 +1,36 @@

+include ../rh-virtio.mak

+

+CONFIG_DIMM=y

+CONFIG_MEM_DEVICE=y

+CONFIG_NVDIMM=y

+CONFIG_PCI=y

+CONFIG_PCI_DEVICES=y

+CONFIG_PCI_TESTDEV=y

+CONFIG_PCI_EXPRESS=y

+CONFIG_PSERIES=y

+CONFIG_SCSI=y

+CONFIG_SPAPR_VSCSI=y

+CONFIG_TEST_DEVICES=y

+CONFIG_USB=y

+CONFIG_USB_OHCI=y

+CONFIG_USB_OHCI_PCI=y

+CONFIG_USB_SMARTCARD=y

+CONFIG_USB_STORAGE_CORE=y

+CONFIG_USB_STORAGE_CLASSIC=y

+CONFIG_USB_XHCI=y

+CONFIG_USB_XHCI_NEC=y

+CONFIG_USB_XHCI_PCI=y

+CONFIG_VFIO=y

+CONFIG_VFIO_PCI=y

+CONFIG_VGA=y

+CONFIG_VGA_PCI=y

+CONFIG_VHOST_USER=y

+CONFIG_VIRTIO_PCI=y

+CONFIG_VIRTIO_VGA=y

+CONFIG_WDT_IB6300ESB=y

+CONFIG_XICS=y

+CONFIG_XIVE=y

+CONFIG_TPM=y

+CONFIG_TPM_SPAPR=y

+CONFIG_TPM_EMULATOR=y

+CONFIG_TPM_PASSTHROUGH=y

diff --git a/configs/devices/rh-virtio.mak b/configs/devices/rh-virtio.mak

new file mode 100644

index 0000000000..94ede1b5f6

--- /dev/null

+++ b/configs/devices/rh-virtio.mak

@@ -0,0 +1,10 @@

+CONFIG_VIRTIO=y

+CONFIG_VIRTIO_BALLOON=y

+CONFIG_VIRTIO_BLK=y

+CONFIG_VIRTIO_GPU=y

+CONFIG_VIRTIO_INPUT=y

+CONFIG_VIRTIO_INPUT_HOST=y

+CONFIG_VIRTIO_NET=y

+CONFIG_VIRTIO_RNG=y

+CONFIG_VIRTIO_SCSI=y

+CONFIG_VIRTIO_SERIAL=y

diff --git a/configs/devices/s390x-softmmu/s390x-rh-devices.mak b/configs/devices/s390x-softmmu/s390x-rh-devices.mak

new file mode 100644

index 0000000000..165c082e87

--- /dev/null

+++ b/configs/devices/s390x-softmmu/s390x-rh-devices.mak

@@ -0,0 +1,16 @@

+include ../rh-virtio.mak

+

+CONFIG_PCI=y

+CONFIG_S390_CCW_VIRTIO=y

+CONFIG_S390_FLIC=y

+CONFIG_S390_FLIC_KVM=y

+CONFIG_SCLPCONSOLE=y

+CONFIG_SCSI=y

+CONFIG_TERMINAL3270=y

+CONFIG_VFIO=y

+CONFIG_VFIO_AP=y

+CONFIG_VFIO_CCW=y

+CONFIG_VFIO_PCI=y

+CONFIG_VHOST_USER=y

+CONFIG_VIRTIO_CCW=y

+CONFIG_WDT_DIAG288=y

diff --git a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak

new file mode 100644

index 0000000000..ddf036f042

--- /dev/null

+++ b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak

@@ -0,0 +1,104 @@

+include ../rh-virtio.mak

+include x86_64-upstream-devices.mak

+

+CONFIG_AC97=y

+CONFIG_ACPI=y

+CONFIG_ACPI_PCI=y

+CONFIG_ACPI_CPU_HOTPLUG=y

+CONFIG_ACPI_MEMORY_HOTPLUG=y

+CONFIG_ACPI_NVDIMM=y

+CONFIG_ACPI_SMBUS=y

+CONFIG_ACPI_VMGENID=y

+CONFIG_ACPI_X86=y

+CONFIG_ACPI_X86_ICH=y

+CONFIG_AHCI=y

+CONFIG_APIC=y

+CONFIG_APM=y

+CONFIG_BOCHS_DISPLAY=y

+CONFIG_DIMM=y

+CONFIG_E1000E_PCI_EXPRESS=y

+CONFIG_E1000_PCI=y

+CONFIG_EDU=y

+CONFIG_FDC=y

+CONFIG_FDC_SYSBUS=y

+CONFIG_FW_CFG_DMA=y

+CONFIG_HDA=y

+CONFIG_HYPERV=y

+CONFIG_HYPERV_TESTDEV=y

+CONFIG_I2C=y

+CONFIG_I440FX=y

+CONFIG_I8254=y

+CONFIG_I8257=y

+CONFIG_I8259=y

+CONFIG_I82801B11=y

+CONFIG_IDE_CORE=y

+CONFIG_IDE_PCI=y

+CONFIG_IDE_PIIX=y

+CONFIG_IDE_QDEV=y

+CONFIG_IOAPIC=y

+CONFIG_IOH3420=y

+CONFIG_ISA_BUS=y

+CONFIG_ISA_DEBUG=y

+CONFIG_ISA_TESTDEV=y

+CONFIG_LPC_ICH9=y

+CONFIG_MC146818RTC=y

+CONFIG_MEM_DEVICE=y

+CONFIG_NVDIMM=y

+CONFIG_PAM=y

+CONFIG_PC=y

+CONFIG_PCI=y

+CONFIG_PCIE_PORT=y

+CONFIG_PCI_DEVICES=y

+CONFIG_PCI_EXPRESS=y

+CONFIG_PCI_EXPRESS_Q35=y

+CONFIG_PCI_I440FX=y

+CONFIG_PCI_TESTDEV=y

+CONFIG_PCKBD=y

+CONFIG_PCSPK=y

+CONFIG_PC_ACPI=y

+CONFIG_PC_PCI=y

+CONFIG_PFLASH_CFI01=y

+CONFIG_PVPANIC_ISA=y

+CONFIG_PXB=y

+CONFIG_Q35=y

+CONFIG_QXL=y

+CONFIG_RTL8139_PCI=y

+CONFIG_SCSI=y

+CONFIG_SERIAL=y

+CONFIG_SERIAL_ISA=y

+CONFIG_SERIAL_PCI=y

+CONFIG_SEV=y

+CONFIG_SGA=y

+CONFIG_SMBIOS=y

+CONFIG_SMBUS_EEPROM=y

+CONFIG_TEST_DEVICES=y

+CONFIG_USB=y

+CONFIG_USB_EHCI=y

+CONFIG_USB_EHCI_PCI=y

+CONFIG_USB_SMARTCARD=y

+CONFIG_USB_STORAGE_CORE=y

+CONFIG_USB_STORAGE_CLASSIC=y

+CONFIG_USB_UHCI=y

+CONFIG_USB_XHCI=y

+CONFIG_USB_XHCI_NEC=y

+CONFIG_USB_XHCI_PCI=y

+CONFIG_VFIO=y

+CONFIG_VFIO_PCI=y

+CONFIG_VGA=y

+CONFIG_VGA_CIRRUS=y

+CONFIG_VGA_PCI=y

+CONFIG_VHOST_USER=y

+CONFIG_VHOST_USER_BLK=y

+CONFIG_VIRTIO_PCI=y

+CONFIG_VIRTIO_VGA=y

+CONFIG_VMMOUSE=y

+CONFIG_VMPORT=y

+CONFIG_VTD=y

+CONFIG_WDT_IB6300ESB=y

+CONFIG_WDT_IB700=y

+CONFIG_XIO3130=y

+CONFIG_TPM=y

+CONFIG_TPM_CRB=y

+CONFIG_TPM_TIS_ISA=y

+CONFIG_TPM_EMULATOR=y

+CONFIG_TPM_PASSTHROUGH=y

diff --git a/configs/devices/x86_64-softmmu/x86_64-upstream-devices.mak b/configs/devices/x86_64-softmmu/x86_64-upstream-devices.mak

new file mode 100644

index 0000000000..2cd20f54d2

--- /dev/null

+++ b/configs/devices/x86_64-softmmu/x86_64-upstream-devices.mak

@@ -0,0 +1,4 @@

+# We need "isa-parallel"

+CONFIG_PARALLEL=y

+# We need "hpet"

+CONFIG_HPET=y

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c

index 778e27b659..802501881f 100644

--- a/hw/acpi/ich9.c

+++ b/hw/acpi/ich9.c

@@ -424,8 +424,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)

     static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;

     pm->acpi_memory_hotplug.is_enabled = true;

     pm->cpu_hotplug_legacy = true;

-    pm->disable_s3 = 0;

-    pm->disable_s4 = 0;

+    pm->disable_s3 = 1;

+    pm->disable_s4 = 1;

     pm->s4_val = 2;

     pm->use_acpi_hotplug_bridge = true;

diff --git a/hw/arm/meson.build b/hw/arm/meson.build

index 721a8eb8be..87ed4dd914 100644

--- a/hw/arm/meson.build

+++ b/hw/arm/meson.build

@@ -31,7 +31,7 @@ arm_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c'))

 arm_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c'))

 arm_ss.add(when: 'CONFIG_SABRELITE', if_true: files('sabrelite.c'))

-arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c'))

+#arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c'))

 arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210.c'))

 arm_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c', 'pxa2xx_gpio.c', 'pxa2xx_pic.c'))

 arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic.c'))

diff --git a/hw/block/fdc.c b/hw/block/fdc.c

index 9014cd30b3..46cee8c544 100644

--- a/hw/block/fdc.c

+++ b/hw/block/fdc.c

@@ -48,6 +48,8 @@

 #include "qom/object.h"

 #include "fdc-internal.h"

+#include "hw/boards.h"

+

 /********************************************************/

 /* debug Floppy devices */

@@ -2320,6 +2322,14 @@ void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, Error **errp)

     FDrive *drive;

     static int command_tables_inited = 0;

+    /* Restricted for Red Hat Enterprise Linux: */

+    MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());

+    if (!strstr(mc->name, "-rhel7.")) {

+        error_setg(errp, "Device %s is not supported with machine type %s",

+                   object_get_typename(OBJECT(dev)), mc->name);

+        return;

+    }

+

     if (fdctrl->fallback == FLOPPY_DRIVE_TYPE_AUTO) {

         error_setg(errp, "Cannot choose a fallback FDrive type of 'auto'");

         return;

diff --git a/hw/char/parallel.c b/hw/char/parallel.c

index b45e67bfbb..e5f108211b 100644

--- a/hw/char/parallel.c

+++ b/hw/char/parallel.c

@@ -29,6 +29,7 @@

 #include "chardev/char-parallel.h"

 #include "chardev/char-fe.h"

 #include "hw/acpi/aml-build.h"

+#include "hw/boards.h"

 #include "hw/irq.h"

 #include "hw/isa/isa.h"

 #include "hw/qdev-properties.h"

@@ -534,6 +535,14 @@ static void parallel_isa_realizefn(DeviceState *dev, Error **errp)

     int base;

     uint8_t dummy;

+    /* Restricted for Red Hat Enterprise Linux */

+    MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());

+    if (strstr(mc->name, "rhel")) {

+        error_setg(errp, "Device %s is not supported with machine type %s",

+                   object_get_typename(OBJECT(dev)), mc->name);

+        return;

+    }

+

     if (!qemu_chr_fe_backend_connected(&s->chr)) {

         error_setg(errp, "Can't create parallel device, empty char device");

         return;

diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build

index 9e52fee9e7..bb71c9f3e7 100644

--- a/hw/cpu/meson.build

+++ b/hw/cpu/meson.build

@@ -1,6 +1,7 @@

-softmmu_ss.add(files('core.c', 'cluster.c'))

+#softmmu_ss.add(files('core.c', 'cluster.c'))

+softmmu_ss.add(files('core.c'))

 specific_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'))

 specific_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c'))

 specific_ss.add(when: 'CONFIG_A9MPCORE', if_true: files('a9mpcore.c'))

-specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c'))

+#specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c'))

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c

index fdca6ca659..fa1a7eee51 100644

--- a/hw/display/cirrus_vga.c

+++ b/hw/display/cirrus_vga.c

@@ -2945,6 +2945,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp)

      PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);

      int16_t device_id = pc->device_id;

+     warn_report("'cirrus-vga' is deprecated, "

+                 "please use a different VGA card instead");

+

      /* follow real hardware, cirrus card emulated has 4 MB video memory.

        Also accept 8 MB/16 MB for backward compatibility. */

      if (s->vga.vram_size_mb != 4 && s->vga.vram_size_mb != 8 &&

diff --git a/hw/ide/piix.c b/hw/ide/piix.c

index d3e738320b..7c77312463 100644

--- a/hw/ide/piix.c

+++ b/hw/ide/piix.c

@@ -232,7 +232,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data)

     k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1;

     k->class_id = PCI_CLASS_STORAGE_IDE;

     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

-    dc->hotpluggable = false;

+    /* Disabled for Red Hat Enterprise Linux: */

+    dc->user_creatable = false;

 }

 static const TypeInfo piix3_ide_info = {

@@ -261,6 +262,8 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data)

     k->class_id = PCI_CLASS_STORAGE_IDE;

     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

     dc->hotpluggable = false;

+    /* Disabled for Red Hat Enterprise Linux: */

+    dc->user_creatable = false;

 }

 static const TypeInfo piix4_ide_info = {

diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c

index baba62f357..bc360347ea 100644

--- a/hw/input/pckbd.c

+++ b/hw/input/pckbd.c

@@ -796,6 +796,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data)

     dc->vmsd = &vmstate_kbd_isa;

     isa->build_aml = i8042_build_aml;

     set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

+    /* Disabled for Red Hat Enterprise Linux: */

+    dc->user_creatable = false;

 }

 static const TypeInfo i8042_info = {

diff --git a/hw/net/e1000.c b/hw/net/e1000.c

index a30546c5d5..c2877978d9 100644

--- a/hw/net/e1000.c

+++ b/hw/net/e1000.c

@@ -1814,6 +1814,7 @@ static const E1000Info e1000_devices[] = {

         .revision  = 0x03,

         .phy_id2   = E1000_PHY_ID2_8254xx_DEFAULT,

     },

+#if 0 /* Disabled for Red Hat Enterprise Linux 7 */

     {

         .name      = "e1000-82544gc",

         .device_id = E1000_DEV_ID_82544GC_COPPER,

@@ -1826,6 +1827,7 @@ static const E1000Info e1000_devices[] = {

         .revision  = 0x03,

         .phy_id2   = E1000_PHY_ID2_8254xx_DEFAULT,

     },

+#endif

 };

 static void e1000_register_types(void)

diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c

index 4f316a6f9d..64178f0f9a 100644

--- a/hw/ppc/spapr_cpu_core.c

+++ b/hw/ppc/spapr_cpu_core.c

@@ -370,10 +370,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {

         .instance_size = sizeof(SpaprCpuCore),

         .class_size = sizeof(SpaprCpuCoreClass),

     },

+#if 0  /* Disabled for Red Hat Enterprise Linux */

     DEFINE_SPAPR_CPU_CORE_TYPE("970_v2.2"),

     DEFINE_SPAPR_CPU_CORE_TYPE("970mp_v1.0"),

     DEFINE_SPAPR_CPU_CORE_TYPE("970mp_v1.1"),

     DEFINE_SPAPR_CPU_CORE_TYPE("power5+_v2.1"),

+#endif

     DEFINE_SPAPR_CPU_CORE_TYPE("power7_v2.3"),

     DEFINE_SPAPR_CPU_CORE_TYPE("power7+_v2.1"),

     DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"),

diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c

index 9520471be2..202e032524 100644

--- a/hw/timer/hpet.c

+++ b/hw/timer/hpet.c

@@ -733,6 +733,14 @@ static void hpet_realize(DeviceState *dev, Error **errp)

     int i;

     HPETTimer *timer;

+    /* Restricted for Red Hat Enterprise Linux */

+    MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());

+    if (strstr(mc->name, "rhel")) {

+        error_setg(errp, "Device %s is not supported with machine type %s",

+                   object_get_typename(OBJECT(dev)), mc->name);

+        return;

+    }

+

     if (!s->intcap) {

         warn_report("Hpet's intcap not initialized");

     }

diff --git a/hw/usb/meson.build b/hw/usb/meson.build

index de853d780d..0776ae6a20 100644

--- a/hw/usb/meson.build

+++ b/hw/usb/meson.build

@@ -52,7 +52,7 @@ softmmu_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reade

 if cacard.found()

   usbsmartcard_ss = ss.source_set()

   usbsmartcard_ss.add(when: 'CONFIG_USB_SMARTCARD',

-                      if_true: [cacard, files('ccid-card-emulated.c', 'ccid-card-passthru.c')])

+                      if_true: [cacard, files('ccid-card-passthru.c')])

   hw_usb_modules += {'smartcard': usbsmartcard_ss}

 endif

diff --git a/qemu-options.hx b/qemu-options.hx

index 83aa59a920..ac596e01a1 100644

--- a/qemu-options.hx

+++ b/qemu-options.hx

@@ -2412,10 +2412,6 @@ ERST

 DEF("no-hpet", 0, QEMU_OPTION_no_hpet,

     "-no-hpet        disable HPET\n", QEMU_ARCH_I386)

-SRST

-``-no-hpet``

-    Disable HPET support.

-ERST

 DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable,

     "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n"

diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c

index ed444bf436..fafd019539 100644

--- a/target/arm/cpu_tcg.c

+++ b/target/arm/cpu_tcg.c

@@ -22,6 +22,7 @@

 /* CPU models. These are not needed for the AArch64 linux-user build. */

 #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64)

+#if 0 /* Disabled for Red Hat Enterprise Linux */

 #ifdef CONFIG_TCG

 static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request)

 {

@@ -375,6 +376,7 @@ static void cortex_a9_initfn(Object *obj)

     cpu->ccsidr[1] = 0x200fe019; /* 16k L1 icache. */

     define_arm_cp_regs(cpu, cortexa9_cp_reginfo);

 }

+#endif /* disabled for RHEL */

 #ifndef CONFIG_USER_ONLY

 static uint64_t a15_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri)

@@ -400,6 +402,7 @@ static const ARMCPRegInfo cortexa15_cp_reginfo[] = {

     REGINFO_SENTINEL

 };

+#if 0 /* Disabled for Red Hat Enterprise Linux */

 static void cortex_a7_initfn(Object *obj)

 {

     ARMCPU *cpu = ARM_CPU(obj);

@@ -445,6 +448,7 @@ static void cortex_a7_initfn(Object *obj)

     cpu->ccsidr[2] = 0x711fe07a; /* 4096K L2 unified cache */

     define_arm_cp_regs(cpu, cortexa15_cp_reginfo); /* Same as A15 */

 }

+#endif /* disabled for RHEL */

 static void cortex_a15_initfn(Object *obj)

 {

@@ -488,6 +492,7 @@ static void cortex_a15_initfn(Object *obj)

     define_arm_cp_regs(cpu, cortexa15_cp_reginfo);

 }

+#if 0 /* Disabled for Red Hat Enterprise Linux */

 static void cortex_m0_initfn(Object *obj)

 {

     ARMCPU *cpu = ARM_CPU(obj);

@@ -928,6 +933,7 @@ static void arm_v7m_class_init(ObjectClass *oc, void *data)

     cc->gdb_core_xml_file = "arm-m-profile.xml";

 }

+#endif /* disabled for RHEL */

 #ifndef TARGET_AARCH64

 /*

@@ -1007,6 +1013,7 @@ static void arm_max_initfn(Object *obj)

 #endif /* !TARGET_AARCH64 */

 static const ARMCPUInfo arm_tcg_cpus[] = {

+#if 0 /* Disabled for Red Hat Enterprise Linux */

     { .name = "arm926",      .initfn = arm926_initfn },

     { .name = "arm946",      .initfn = arm946_initfn },

     { .name = "arm1026",     .initfn = arm1026_initfn },

@@ -1022,7 +1029,9 @@ static const ARMCPUInfo arm_tcg_cpus[] = {

     { .name = "cortex-a7",   .initfn = cortex_a7_initfn },

     { .name = "cortex-a8",   .initfn = cortex_a8_initfn },

     { .name = "cortex-a9",   .initfn = cortex_a9_initfn },

+#endif /* disabled for RHEL */

     { .name = "cortex-a15",  .initfn = cortex_a15_initfn },

+#if 0 /* Disabled for Red Hat Enterprise Linux */

     { .name = "cortex-m0",   .initfn = cortex_m0_initfn,

                              .class_init = arm_v7m_class_init },

     { .name = "cortex-m3",   .initfn = cortex_m3_initfn,

@@ -1053,6 +1062,7 @@ static const ARMCPUInfo arm_tcg_cpus[] = {

     { .name = "pxa270-b1",   .initfn = pxa270b1_initfn },

     { .name = "pxa270-c0",   .initfn = pxa270c0_initfn },

     { .name = "pxa270-c5",   .initfn = pxa270c5_initfn },

+#endif /* disabled for RHEL */

 #ifndef TARGET_AARCH64

     { .name = "max",         .initfn = arm_max_initfn },

 #endif

diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c

index 87e4228614..6eaa65efff 100644

--- a/target/ppc/cpu-models.c

+++ b/target/ppc/cpu-models.c

@@ -66,6 +66,7 @@

 #define POWERPC_DEF(_name, _pvr, _type, _desc)                              \

     POWERPC_DEF_SVR(_name, _desc, _pvr, POWERPC_SVR_NONE, _type)

+#if 0  /* Embedded and 32-bit CPUs disabled for Red Hat Enterprise Linux */

     /* Embedded PowerPC                                                      */

     /* PowerPC 401 family                                                    */

     POWERPC_DEF("401",           CPU_POWERPC_401,                    401,

@@ -740,8 +741,10 @@

                 "PowerPC 7447A v1.2 (G4)")