From 65eea220dcce6177b306eae08935f5354847bb08 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina 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 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) 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 --- default-configs/devices/aarch64-rh-devices.mak | 27 +++++++ default-configs/devices/aarch64-softmmu.mak | 10 ++- default-configs/devices/ppc64-rh-devices.mak | 38 ++++++++++ default-configs/devices/ppc64-softmmu.mak | 10 ++- default-configs/devices/rh-virtio.mak | 10 +++ default-configs/devices/s390x-rh-devices.mak | 15 ++++ default-configs/devices/s390x-softmmu.mak | 4 +- default-configs/devices/x86_64-rh-devices.mak | 101 +++++++++++++++++++++++++ default-configs/devices/x86_64-softmmu.mak | 4 +- hw/acpi/ich9.c | 4 +- hw/arm/meson.build | 2 +- hw/block/fdc.c | 10 +++ 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/usb/meson.build | 2 +- qemu-options.hx | 4 - redhat/Makefile.common | 1 + redhat/qemu-kvm.spec.template | 9 ++- target/arm/cpu.c | 4 +- target/arm/cpu_tcg.c | 3 + target/ppc/cpu-models.c | 10 +++ target/s390x/cpu_models.c | 3 + target/s390x/kvm.c | 8 ++ 27 files changed, 273 insertions(+), 25 deletions(-) create mode 100644 default-configs/devices/aarch64-rh-devices.mak create mode 100644 default-configs/devices/ppc64-rh-devices.mak create mode 100644 default-configs/devices/rh-virtio.mak create mode 100644 default-configs/devices/s390x-rh-devices.mak create mode 100644 default-configs/devices/x86_64-rh-devices.mak diff --git a/default-configs/devices/aarch64-rh-devices.mak b/default-configs/devices/aarch64-rh-devices.mak new file mode 100644 index 0000000..9831940 --- /dev/null +++ b/default-configs/devices/aarch64-rh-devices.mak @@ -0,0 +1,27 @@ +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_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_EMULATOR=y +CONFIG_TPM_TIS_SYSBUS=y +CONFIG_PTIMER=y diff --git a/default-configs/devices/aarch64-softmmu.mak b/default-configs/devices/aarch64-softmmu.mak index 958b1e0..8f6867d 100644 --- a/default-configs/devices/aarch64-softmmu.mak +++ b/default-configs/devices/aarch64-softmmu.mak @@ -1,8 +1,10 @@ # Default configuration for aarch64-softmmu # We support all the 32 bit boards so need all their config -include arm-softmmu.mak +#include arm-softmmu.mak -CONFIG_XLNX_ZYNQMP_ARM=y -CONFIG_XLNX_VERSAL=y -CONFIG_SBSA_REF=y +#CONFIG_XLNX_ZYNQMP_ARM=y +#CONFIG_XLNX_VERSAL=y +#CONFIG_SBSA_REF=y + +include aarch64-rh-devices.mak diff --git a/default-configs/devices/ppc64-rh-devices.mak b/default-configs/devices/ppc64-rh-devices.mak new file mode 100644 index 0000000..467a16b --- /dev/null +++ b/default-configs/devices/ppc64-rh-devices.mak @@ -0,0 +1,38 @@ +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_BOT=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_XICS_KVM=y +CONFIG_XICS_SPAPR=y +CONFIG_XIVE=y +CONFIG_XIVE_SPAPR=y +CONFIG_XIVE_KVM=y +CONFIG_TPM_SPAPR=y +CONFIG_TPM_EMULATOR=y +CONFIG_TPM_PASSTHROUGH=y diff --git a/default-configs/devices/ppc64-softmmu.mak b/default-configs/devices/ppc64-softmmu.mak index ae0841f..040e557 100644 --- a/default-configs/devices/ppc64-softmmu.mak +++ b/default-configs/devices/ppc64-softmmu.mak @@ -1,11 +1,13 @@ # Default configuration for ppc64-softmmu # Include all 32-bit boards -include ppc-softmmu.mak +#include ppc-softmmu.mak # For PowerNV -CONFIG_POWERNV=y +#CONFIG_POWERNV=y # For pSeries -CONFIG_PSERIES=y -CONFIG_NVDIMM=y +#CONFIG_PSERIES=y +#CONFIG_NVDIMM=y + +include ppc64-rh-devices.mak diff --git a/default-configs/devices/rh-virtio.mak b/default-configs/devices/rh-virtio.mak new file mode 100644 index 0000000..94ede1b --- /dev/null +++ b/default-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/default-configs/devices/s390x-rh-devices.mak b/default-configs/devices/s390x-rh-devices.mak new file mode 100644 index 0000000..c3c73fe --- /dev/null +++ b/default-configs/devices/s390x-rh-devices.mak @@ -0,0 +1,15 @@ +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_PCI=y +CONFIG_VHOST_USER=y +CONFIG_VIRTIO_CCW=y +CONFIG_WDT_DIAG288=y diff --git a/default-configs/devices/s390x-softmmu.mak b/default-configs/devices/s390x-softmmu.mak index f2287a1..3e2e388 100644 --- a/default-configs/devices/s390x-softmmu.mak +++ b/default-configs/devices/s390x-softmmu.mak @@ -10,4 +10,6 @@ # Boards: # -CONFIG_S390_CCW_VIRTIO=y +#CONFIG_S390_CCW_VIRTIO=y + +include s390x-rh-devices.mak diff --git a/default-configs/devices/x86_64-rh-devices.mak b/default-configs/devices/x86_64-rh-devices.mak new file mode 100644 index 0000000..e80877d --- /dev/null +++ b/default-configs/devices/x86_64-rh-devices.mak @@ -0,0 +1,101 @@ +include rh-virtio.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_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_OPENGL=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=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_SPICE=y +CONFIG_TEST_DEVICES=y +CONFIG_USB=y +CONFIG_USB_EHCI=y +CONFIG_USB_EHCI_PCI=y +CONFIG_USB_SMARTCARD=y +CONFIG_USB_STORAGE_BOT=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_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_CRB=y +CONFIG_TPM_TIS_ISA=y +CONFIG_TPM_EMULATOR=y +CONFIG_TPM_PASSTHROUGH=y diff --git a/default-configs/devices/x86_64-softmmu.mak b/default-configs/devices/x86_64-softmmu.mak index 64b2ee2..b5de7e5 100644 --- a/default-configs/devices/x86_64-softmmu.mak +++ b/default-configs/devices/x86_64-softmmu.mak @@ -1,3 +1,5 @@ # Default configuration for x86_64-softmmu -include i386-softmmu.mak +#include i386-softmmu.mak + +include x86_64-rh-devices.mak diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 95cb0f9..f9690a0 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -374,8 +374,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; object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, diff --git a/hw/arm/meson.build b/hw/arm/meson.build index be39117..6fcc5ed 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -30,7 +30,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 4c2c35e..e9eb7b8 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -48,6 +48,8 @@ #include "trace.h" #include "qom/object.h" +#include "hw/boards.h" + /********************************************************/ /* debug Floppy devices */ @@ -2621,6 +2623,14 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl, int i, j; 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/cpu/meson.build b/hw/cpu/meson.build index 9e52fee..bb71c9f 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 722b9e7..25de8b2 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2963,6 +2963,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 b9860e3..beb1ea6 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -220,7 +220,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 = { @@ -249,6 +250,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 dde85ba..62cf60c 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -597,6 +597,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 83347cb..8fb83a1 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1796,6 +1796,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, @@ -1808,6 +1809,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 2f7dc3c..55d36e0 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -376,10 +376,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/usb/meson.build b/hw/usb/meson.build index 934e4fa..e3abba5 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -48,7 +48,7 @@ softmmu_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reade if config_host.has_key('CONFIG_SMARTCARD') 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 2c83390..53472fd 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2251,10 +2251,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.c b/target/arm/cpu.c index 07492e9..a048714 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2358,7 +2358,9 @@ static void arm_cpu_register_types(void) type_register_static(&idau_interface_type_info); for (i = 0; i < cpu_count; ++i) { - arm_cpu_register(&arm_cpus[i]); + /* RHEL specific: Filter out unsupported cpu models */ + if (!strcmp(arm_cpus[i].name, "cortex-a15")) + arm_cpu_register(&arm_cpus[i]); } } } diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index 0013e25..6540046 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -679,6 +679,9 @@ static void arm_tcg_cpu_register_types(void) { size_t i; + /* Disable TCG cpu types for Red Hat Enterprise Linux */ + return; + for (i = 0; i < ARRAY_SIZE(arm_tcg_cpus); ++i) { arm_cpu_register(&arm_tcg_cpus[i]); } diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c index 4ad1686..16b2185 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)") POWERPC_DEF("7457a_v1.2", CPU_POWERPC_74x7A_v12, 7455, "PowerPC 7457A v1.2 (G4)") +#endif /* 64 bits PowerPC */ #if defined(TARGET_PPC64) +#if 0 /* Disabled for Red Hat Enterprise Linux */ POWERPC_DEF("970_v2.2", CPU_POWERPC_970_v22, 970, "PowerPC 970 v2.2") POWERPC_DEF("970fx_v1.0", CPU_POWERPC_970FX_v10, 970, @@ -760,6 +763,7 @@ "PowerPC 970MP v1.1") POWERPC_DEF("power5+_v2.1", CPU_POWERPC_POWER5P_v21, POWER5P, "POWER5+ v2.1") +#endif POWERPC_DEF("power7_v2.3", CPU_POWERPC_POWER7_v23, POWER7, "POWER7 v2.3") POWERPC_DEF("power7+_v2.1", CPU_POWERPC_POWER7P_v21, POWER7, @@ -782,6 +786,7 @@ /* PowerPC CPU aliases */ PowerPCCPUAlias ppc_cpu_aliases[] = { +#if 0 /* Embedded and 32-bit CPUs disabled for Red Hat Enterprise Linux */ { "403", "403gc" }, { "405", "405d4" }, { "405cr", "405crc" }, @@ -940,12 +945,15 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { { "7447a", "7447a_v1.2" }, { "7457a", "7457a_v1.2" }, { "apollo7pm", "7457a_v1.0" }, +#endif #if defined(TARGET_PPC64) +#if 0 /* Disabled for Red Hat Enterprise Linux */ { "970", "970_v2.2" }, { "970fx", "970fx_v3.1" }, { "970mp", "970mp_v1.1" }, { "power5+", "power5+_v2.1" }, { "power5gs", "power5+_v2.1" }, +#endif { "power7", "power7_v2.3" }, { "power7+", "power7+_v2.1" }, { "power8e", "power8e_v2.1" }, @@ -955,6 +963,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { { "power10", "power10_v1.0" }, #endif +#if 0 /* Disabled for Red Hat Enterprise Linux */ /* Generic PowerPCs */ #if defined(TARGET_PPC64) { "ppc64", "970fx_v3.1" }, @@ -962,5 +971,6 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { { "ppc32", "604" }, { "ppc", "604" }, { "default", "604" }, +#endif { NULL, NULL } }; diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index b5abff8..abe09d7 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -408,6 +408,9 @@ static void check_unavailable_features(const S390CPUModel *max_model, (max_model->def->gen == model->def->gen && max_model->def->ec_ga < model->def->ec_ga)) { list_add_feat("type", unavailable); + } else if (model->def->gen < 11 && kvm_enabled()) { + /* Older CPU models are not supported on Red Hat Enterprise Linux */ + list_add_feat("type", unavailable); } /* detect missing features if any to properly report them */ diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index baa070f..10ce36a 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -2540,6 +2540,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp) error_setg(errp, "KVM doesn't support CPU models"); return; } + + /* Older CPU models are not supported on Red Hat Enterprise Linux */ + if (model->def->gen < 11) { + error_setg(errp, "KVM: Unsupported CPU type specified: %s", + MACHINE(qdev_get_machine())->cpu_type); + return; + } + prop.cpuid = s390_cpuid_from_cpu_model(model); prop.ibc = s390_ibc_from_cpu_model(model); /* configure cpu features indicated via STFL(e) */ -- 1.8.3.1