From 84733200df4772cf20a4e9f7e5669b87ef5ab4c0 Mon Sep 17 00:00:00 2001

From: Miroslav Rezanina <mrezanin@redhat.com>

Date: Sun, 14 Dec 2014 18:32:18 +0100

Subject: Add RHEL 7 machine types

This commit adds all changes related to machine types applied in

qemu-kvm-rhev-2.1.2-16.el7.

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

Conflicts (on 2.3 rebase):

	default-configs/ppc64-softmmu.mak

	hw/arm/Makefile.objs

	hw/i386/pc_piix.c

	hw/i386/pc_q35.c

	hw/ppc/spapr.c

	savevm.c - has to change shadow_bios tail to rcu list handling

	target-i386/machine.c - use xmm instead of ymmh register

--

Rebase notes (2.12.0):

- replace has_dynamic_sysbus with list of dynamic devices (upstream)

- Changed force_rev1_fadt handling

- Added default nic to machine options for pc_piix and pc_q35

- Disabled m48t59-test for ppc64

- Disabled unsupported machine types in boot-serial-test

- Disabled pseries-rhel7.2.0 machine type for cpu-plug-test

Rebase notes (2.11.0):

- Return type for VMStateDescription.pre_save changed (upstream)

- Use default_cpu_type instead of tcg_default_cpu for sPAPRMachineClass

- Use virt_get_default_cpu_node_id in arm rhel machine type

- Set default_cpu_type to cortex-a57

- Disable options for arm boards instead of object file remove

- Changed order with device disable commit - removed unnecessary changes

Rebase notes (2.10.0):

- Commented out new unused functions in hw/arm/virt.c

- savevm_skip_section_footers changed to COMPAT variable (upstream)

- global_state_set_optional changed to COMPAT variable (upstream)

- savevm_skip_configuration changed to COMPAT variable (upstream)

- move shadow_bios() to separate module with stub version available

- set possible_cpu_arch_ids and cpu_index_to_instance_props fields for arm machine type

- Re-enable older machine types for ppc64

- Commented 7.2 rebase error for compat qemu-extended-regs

Rebase notes (2.9.0):

- new header file for arm (upstream)

- query_hotpluggable_cpus renamed to has_hotpluggable_cpus (upstream)

- replace MAX_CPUMASK_BITS with max_cpus

- Adding rhel6-e1000.rom moved to Initial redhat commit

- Fixed conflict on cirrus_vga.c

Rebase notes (2.8.0):

- new "m->max_cpus = 288" in pc_q35_machine_options hw/i386/pc_q35.c

Rebase notes (2.7.0):

- Additional fsl-imx6.o sabrelito.o files in arm hw dir

Rebase notes (2.6.0):

- Changes in handling of some compat properties

- Fixes in x86_64 copmat models

- Added required devices for aarch64

- Fixes for ppc machine types

Rebase notes (2.5.0):

- changed cpu defaults structure

- chnaged cpu compat properties handling

- added fix for arm machine type

Rebase notes (2.4.0)

- Moved needed attribute (due to 5cd8cadae8db905afcbf877cae568c27d1d55a8a)

- Fixes to machine types changes

Merged patches (2.12.0):

- 402de2c redhat: Define the pseries-rhel7.5-sxxm machine type

- a232ba5 redhat: Define the pseries-rhel7.4-sxxm machine type

- 54f90c2 redhat: Define the pseries-rhel7.3-sxxm machine type

- 3fe3c44 Disable GeForce quirks in vfio-pci for RHEL machines

- 4780659 target-i386: cpu: add new CPU models for indirect branch predictor restrictions

- d486f00 hw/ppc/spapr_caps: Rework spapr_caps to use uint8 internal representation

- cc06449 spapr: Handle Decimal Floating Point (DFP) as an optional capability

- 64ef8ed spapr: Handle VMX/VSX presence as an spapr capability flag

- acad5a1 spapr: Treat Hardware Transactional Memory (HTM) as an optional capability

Merged patches (2.11.0):

- 58702e8dbb redhat: fix HW_COMPAT_RHEL7_3

- ea157600da redhat: define HW_COMPAT_RHEL7_4

- 86ef5cd189 redhat: define pseries-rhel7.5.0 machine type

- d8bf28e9ec qemu-kvm-ma: define only pseries-rhel7.5.0 machine type for -ma

- 9b07271835 Create x86 7.5.0 machine types

- e63d707db9 acpi: Force rev1 FADT on old q35 machine types

- c091cd7a1b pc: make pc_rom RO only on new machine types

- 082bd3ba3d arm/virt: Add RHEL 7.5 machine typei

- 8663586f2b qemu-kvm-rhev: only allows pseries-rhel7.5.0 machine type with POWER9 guest

- 229441f111 machine compat: pci_bridge/shpc always enable

- 917c9e7df7 pcie_root_port: Fix x-migrate-msix compat

- b0c0614041 q35: Fix mismerge

- 888e98c6d6 hw/pci-host: Fix x86 Host Bridges 64bit PCI hole (partial)

- b2f9f4fcaa i386/cpu/hyperv: support over 64 vcpus for windows guests (partial)

- cc306393d7 migcompat/e1000e: Work around 7.3 msi/intr_state field

- c4753f76a3 migcompat/rtl8139: Work around version bump

- 1ece5bfd00 RHEL: Add RHEL7 machine type for qemu on s390x

Merged patches (2.10.0)

- 5090ba1 Fix qemu-kvm does not quit when booting guest w/ 241 vcpus and "-no-kvm"

- 3c52050 x86: bump maximum vcpu count of pc-q35-rhel7.4.0 to 288

- 0ed92ca x86: Work around SMI breakages

- f7b5a7f spapr: update SPAPR_COMPAT_RHEL7_3

- 04faf4d migration: update HW_COMPAT_RHEL7_3

- 9982768 x86: bump maximum vcpu count of pc-q35-rhel7.4.0 to 384

- f5095ba re-enable DMA for 7.3 machine type

- d6ec65d x86 machine compat: 2.9 stragglers

- eda659a disable linuxboot_dma.bin option rom for 7.3 machine types

- 8c122a5 Revert "hw/pci: disable pci-bridge's shpc by default" (partial)

- 627adfa virtio_net: Bypass backends for MTU feature negotiation (partial)

- b430787 pc: Use "min[x]level" on compat_props on RHEL machine-types

- 8c3f45a AArch64: remove mach-virt-7.3 machine type

- d5df1ef Downstream: Update pseries machine types for RHEL-ALT-7.4

Merged patches (2.9.0)

- 8475d69 hw/arm/virt: Disable virtio-net-pci option ROM file loading

- 73fe1f6 Workaround rhel6 ctrl_guest_offloads machine type mismatch

- 21d32ca pc_piix: fix compat props typo for RHEL6 machine types

- 55a5002 compat: define HW_COMPAT_RHEL7_3

- 1b8e927 spapr: define pseries-rhel7.4.0 machine type

- cdb76ec hw/arm/virt: remove aarch64 rhel machine type

- 7dfa88b hw/arm/virt: create virt-rhel7.3.0 machine type

- 6894f91 hw/arm/virt: create virt-rhel7.4.0 machine type

- a9d2d39 x86: Split out options for the head rhel7 machine types

- fdafbdc x86: Create PC_RHEL7_3_COMPAT definition

- 3427c72 x86: Define pc-i440fx-rhel7.4.0

- aea20ab x86: Define pc-q35-rhel7.4.0

- 0185c0f x86: Remove downstream opteron rdtscp override

- 6b51073 fix abort in acpi_setup() since 2.8 with rhel6 machine types

- 954fc0d intel-hda: fix rhel6 compat property

- 1b57274 kvmclock: reduce kvmclock difference on migration (rhel only part)

Merged patches (2.8.0)

- a1da2f0 virtio-pci: reduce modern_mem_bar size (rhel only part)

Merged patches (2.7.0):

- fe9d1cf pc: Use right HW_COMPAT_* macros at PC_RHEL7* compat macros

- 3938189 compat: Add missing "any_layout" in HW_COMPAT_RHEL7_1

- 6dffc9d spapr: update RHEL-7.2 machine type

- c5d5910 migration: fix HW_COMPAT_RHEL7_2

- 2da9bb8 pc: New (default) pc-i440fx-rhel7.3.0 machine-type

- 0520d7e 7.3 mismerge fix: Fix ich9-intel-hda compatibility

- 89528b3 PC migration compat: Section footers/global state

- 2231e35 fw_cfg for 7.2 compatibility

- b8a3ade pc: Create new pc-q35-rhel7.3.0 machine-type

- 340929b q35: Remove 7.0, 7.1, 7.2 machine types

- bb7fc95 machine types: fix pc_machine_*_options chain

- d9fa9aa Fix rhel6 rom file

- dc39363 fix vga type for older machines

- 255a2d1 7.2 machine type compatibility

- 16c3d25 target-i386: Remove SSE4a from qemu64 CPU model (rhel only part)

- 76a1796 target-i386: Remove ABM from qemu64 CPU model (rhel only part)

- a9f8773 pc: Recover PC_RHEL7_1_COMPAT from RHEL-7.2 code

- 7a6ed67 pc: Include missing PC_COMPAT_2_3 entries in PC_RHEL7_2_COMPAT

- 07428f6 Revert "static checker: e1000-82540em got aliased to e1000"

- 446cf1f Revert "e1000: use alias for default model"

- 615096e 7.x compat: e1000-82540em

- 0855905 hw/arm/virt: kill 7.2 machine type

- 18bbea2 usbredir: turn off streams for rhel7.2 & older

- 910cf4a target-i386: Fill high bits of mtrr mask (rhel only part)

- 0e8ab1b target-i386: Enable host-phys-bits on RHEL

- 8c5f8a5 pc: Fix rhel6.3.0 compat_props setting

- 8f869f1 pc: use new CPU hotplug interface since 2.7 machine type (rhel only part)

- d9d646f machine: add properties to compat_props incrementaly (rhel only part)

- acb18fd apic: Use apic_id as apic's migration instance_id (rhel only part)

- c7e37d4 apic: fix broken migration for kvm-apic (rhel only part)

- eca64aee hw/virtio-pci: fix virtio behaviour

- c56b8F6e pc-rhel-7.2: pcie: fix link active status bit migration

- 5522aa3 q35-rhel: allow dynamic sysbus

Merged patches (2.6.0):

- f915d7f arm: virt: Add an abstract RHEL ARM virt machine type

- deffcc0 arm: virt: Add RHEL 7.3.0 virt machine type

- 04ca07d arm: virt: Consolidate the naming of RHEL virt machine types

- 2856ce2 Define HW_COMPAT_RHEL7_2

- 1869242 spapr: move pseries-2.5 machine to RHEL disabled machine zone

- cc59ce7 spapr: add RHEL-7.3 machine type

- 98549c5 pc: Fix property names on CPU compat code

- caa47bb Fix ich9-intel-hda compatibility

Merged patches (2.3.0):

- bb4e53c2 pc: add rhel6.6.0 machine type

- 129a2b3 Downstream-only: Restore "pseries" machine alias

Merged patches (2.4.0):

- 8e8107c numa: Don't allow memdev= on RHEL-6 machine-types

- 8b220c0 pc_sysfw: prevent pflash and/or mis-sized firmware for rhel6.x.0 machtypes

- 9dba3a5 Add pc-i440fx-rhel7.2.0 machine type

- 1c88ffa Add pc-q35-rhel7.2.0 machine type

- 6f74d0c Downstream-only: Add rhel7.2.0 machine type

- a7d6105 Add flag for pre-2.2 migration compatibility

- 17f9a18 Serial: Migration compatibility pre 2.2/7.2

- 3799a57 Migration compat for mc146818rtc/irq_reinject_on_ack_count subsection

- 5668cc1 Fix reported machine type

- 2417534 386: drop FDC in pc-q35-rhel7.2.0 if neither it nor fl. drives are anted

- f42eee5 global_state: Make section optional

- 8640f84 migration: Add configuration section

- 48c857b pc: memhotplug: fix incorrectly set reserved-memory-end

- f33f0b6 pc: memhotplug: keep reserved-memory-end broken on rhel71 and earlier machines

(cherry picked from commit 44f7e7595c416686a00015e317e74183037a8136)

Conflicts:

	redhat/qemu-kvm.spec.template

Conflicts:

	hw/arm/Makefile.objs

	hw/i386/acpi-build.c

	hw/ppc/spapr.c

	hw/timer/mc146818rtc.c

	migration/migration.h

	target/i386/machine.c

Conflicts:

	tests/boot-serial-test.c

(cherry picked from commit f3d24bf7acf06b294404ec0c9849df6211b7b4a7)

---

 hw/acpi/ich9.c                    |  16 +

 hw/acpi/piix4.c                   |   6 +-

 hw/arm/virt.c                     | 121 +++++-

 hw/char/serial.c                  |  28 ++

 hw/display/cirrus_vga.c           |   4 +-

 hw/display/vga-isa.c              |   2 +-

 hw/i386/Makefile.objs             |   1 +

 hw/i386/acpi-build.c              |   3 +

 hw/i386/pc.c                      |   7 +-

 hw/i386/pc_piix.c                 | 894 +++++++++++++++++++++++++++++++++++++-

 hw/i386/pc_q35.c                  |  74 +++-

 hw/i386/pc_sysfw.c                |  16 +

 hw/i386/shadow-bios.c             |  64 +++

 hw/net/e1000.c                    |  20 +-

 hw/net/e1000e.c                   |  21 +

 hw/net/ne2000.c                   |   2 +-

 hw/net/pcnet-pci.c                |   2 +-

 hw/net/rtl8139.c                  |   6 +-

 hw/ppc/spapr.c                    | 213 +++++++++

 hw/ppc/spapr_cpu_core.c           |  13 +

 hw/s390x/s390-virtio-ccw.c        |  17 +-

 hw/smbios/smbios.c                |   1 +

 hw/timer/i8254_common.c           |   2 +-

 hw/timer/mc146818rtc.c            |   6 +

 hw/usb/hcd-uhci.c                 |  15 +-

 hw/usb/hcd-xhci.c                 |  20 +

 hw/usb/hcd-xhci.h                 |   2 +

 hw/virtio/virtio-pci.c            |   2 +-

 hw/virtio/virtio.c                |  22 +-

 include/hw/acpi/ich9.h            |   3 +

 include/hw/arm/virt.h             |  22 +

 include/hw/compat.h               | 195 +++++++++

 include/hw/i386/pc.h              | 554 +++++++++++++++++++++++

 include/hw/ppc/spapr.h            |   1 +

 include/hw/usb.h                  |   7 +

 include/hw/virtio/virtio.h        |   1 +

 include/sysemu/sysemu.h           |   2 +

 migration/migration.c             |   2 +

 migration/migration.h             |   5 +

 migration/savevm.c                |   9 +

 numa.c                            |  13 +

 qdev-monitor.c                    |   1 -

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

 scripts/vmstate-static-checker.py |   1 -

 stubs/Makefile.objs               |   1 +

 stubs/shadow-bios.c               |   7 +

 target/i386/cpu.c                 |   9 +-

 target/i386/machine.c             |  21 +

 target/ppc/compat.c               |  11 +

 target/ppc/cpu.h                  |   1 +

 tests/Makefile.include            |   8 +-

 tests/cpu-plug-test.c             |   3 +-

 52 files changed, 2450 insertions(+), 42 deletions(-)

 create mode 100644 hw/i386/shadow-bios.c

 create mode 100644 stubs/shadow-bios.c

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

index a4e87b8..23a7baa 100644

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

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

@@ -441,6 +441,18 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp)

     s->pm.enable_tco = value;

 }

+static bool ich9_pm_get_force_rev1_fadt(Object *obj, Error **errp)

+{

+    ICH9LPCState *s = ICH9_LPC_DEVICE(obj);

+    return s->pm.force_rev1_fadt;

+}

+

+static void ich9_pm_set_force_rev1_fadt(Object *obj, bool value, Error **errp)

+{

+    ICH9LPCState *s = ICH9_LPC_DEVICE(obj);

+    s->pm.force_rev1_fadt = value;

+}

+

 void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)

 {

     static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;

@@ -465,6 +477,10 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)

                              ich9_pm_get_cpu_hotplug_legacy,

                              ich9_pm_set_cpu_hotplug_legacy,

                              NULL);

+    object_property_add_bool(obj, "__com.redhat_force-rev1-fadt",

+                             ich9_pm_get_force_rev1_fadt,

+                             ich9_pm_set_force_rev1_fadt,

+                             NULL);

     object_property_add(obj, ACPI_PM_PROP_S3_DISABLED, "uint8",

                         ich9_pm_get_disable_s3,

                         ich9_pm_set_disable_s3,

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

index 8b70345..d706360 100644

--- a/hw/acpi/piix4.c

+++ b/hw/acpi/piix4.c

@@ -311,7 +311,7 @@ static const VMStateDescription vmstate_cpuhp_state = {

 static const VMStateDescription vmstate_acpi = {

     .name = "piix4_pm",

     .version_id = 3,

-    .minimum_version_id = 3,

+    .minimum_version_id = 2,

     .minimum_version_id_old = 1,

     .load_state_old = acpi_load_old,

     .post_load = vmstate_acpi_post_load,

@@ -671,8 +671,8 @@ static void piix4_send_gpe(AcpiDeviceIf *adev, AcpiEventStatusBits ev)

 static Property piix4_pm_properties[] = {

     DEFINE_PROP_UINT32("smb_io_base", PIIX4PMState, smb_io_base, 0),

-    DEFINE_PROP_UINT8(ACPI_PM_PROP_S3_DISABLED, PIIX4PMState, disable_s3, 0),

-    DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, 0),

+    DEFINE_PROP_UINT8(ACPI_PM_PROP_S3_DISABLED, PIIX4PMState, disable_s3, 1),

+    DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, 1),

     DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2),

     DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState,

                      use_acpi_pci_hotplug, true),

diff --git a/hw/arm/virt.c b/hw/arm/virt.c

index 94dcb12..806eb1e 100644

--- a/hw/arm/virt.c

+++ b/hw/arm/virt.c

@@ -59,6 +59,7 @@

 #include "qapi/visitor.h"

 #include "standard-headers/linux/input.h"

+#if 0 /* disabled Red Hat Enterprise Linux */

 #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \

     static void virt_##major##_##minor##_class_init(ObjectClass *oc, \

                                                     void *data) \

@@ -86,7 +87,36 @@

     DEFINE_VIRT_MACHINE_LATEST(major, minor, true)

 #define DEFINE_VIRT_MACHINE(major, minor) \

     DEFINE_VIRT_MACHINE_LATEST(major, minor, false)

-

+#endif /* disabled for RHEL */

+

+#define DEFINE_RHEL_MACHINE_LATEST(m, n, s, latest)                     \

+    static void rhel##m##n##s##_virt_class_init(ObjectClass *oc,        \

+                                                void *data)             \

+    {                                                                   \

+        MachineClass *mc = MACHINE_CLASS(oc);                           \

+        rhel##m##n##s##_virt_options(mc);                               \

+        mc->desc = "RHEL " # m "." # n "." # s " ARM Virtual Machine";  \

+        if (latest) {                                                   \

+            mc->alias = "virt";                                         \

+            mc->is_default = 1;                                         \

+        }                                                               \

+    }                                                                   \

+    static const TypeInfo rhel##m##n##s##_machvirt_info = {             \

+        .name = MACHINE_TYPE_NAME("virt-rhel" # m "." # n "." # s),     \

+        .parent = TYPE_RHEL_MACHINE,                                    \

+        .instance_init = rhel##m##n##s##_virt_instance_init,            \

+        .class_init = rhel##m##n##s##_virt_class_init,                  \

+    };                                                                  \

+    static void rhel##m##n##s##_machvirt_init(void)                     \

+    {                                                                   \

+        type_register_static(&rhel##m##n##s##_machvirt_info);           \

+    }                                                                   \

+    type_init(rhel##m##n##s##_machvirt_init);

+

+#define DEFINE_RHEL_MACHINE_AS_LATEST(major, minor, subminor)   \

+    DEFINE_RHEL_MACHINE_LATEST(major, minor, subminor, true)

+#define DEFINE_RHEL_MACHINE(major, minor, subminor)             \

+    DEFINE_RHEL_MACHINE_LATEST(major, minor, subminor, false)

 /* Number of external interrupt lines to configure the GIC with */

 #define NUM_IRQS 256

@@ -1416,6 +1446,7 @@ static void machvirt_init(MachineState *machine)

     create_platform_bus(vms, pic);

 }

+#if 0 /* disabled for RHEL */

 static bool virt_get_secure(Object *obj, Error **errp)

 {

     VirtMachineState *vms = VIRT_MACHINE(obj);

@@ -1444,6 +1475,7 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)

     vms->virt = value;

 }

+#endif /* disabled for RHEL */

 static bool virt_get_highmem(Object *obj, Error **errp)

 {

     VirtMachineState *vms = VIRT_MACHINE(obj);

@@ -1536,6 +1568,7 @@ static const CPUArchIdList *virt_possible_cpu_arch_ids(MachineState *ms)

     return ms->possible_cpus;

 }

+#if 0 /* disabled for RHEL */

 static void virt_machine_class_init(ObjectClass *oc, void *data)

 {

     MachineClass *mc = MACHINE_CLASS(oc);

@@ -1748,3 +1781,89 @@ static void virt_machine_2_6_options(MachineClass *mc)

     vmc->no_pmu = true;

 }

 DEFINE_VIRT_MACHINE(2, 6)

+#endif /* disabled for RHEL */

+

+static void rhel_machine_class_init(ObjectClass *oc, void *data)

+{

+    MachineClass *mc = MACHINE_CLASS(oc);

+

+    mc->family = "virt-rhel-Z";

+    mc->init = machvirt_init;

+    /* Start max_cpus at the maximum QEMU supports. We'll further restrict

+     * it later in machvirt_init, where we have more information about the

+     * configuration of the particular instance.

+     */

+    mc->max_cpus = 255;

+    mc->block_default_type = IF_VIRTIO;

+    mc->no_cdrom = 1;

+    mc->pci_allow_0_address = true;

+    /* We know we will never create a pre-ARMv7 CPU which needs 1K pages */

+    mc->minimum_page_bits = 12;

+    mc->possible_cpu_arch_ids = virt_possible_cpu_arch_ids;

+    mc->cpu_index_to_instance_props = virt_cpu_index_to_props;

+    mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a57");

+    mc->get_default_cpu_node_id = virt_get_default_cpu_node_id;

+}

+

+static const TypeInfo rhel_machine_info = {

+    .name          = TYPE_RHEL_MACHINE,

+    .parent        = TYPE_MACHINE,

+    .abstract      = true,

+    .instance_size = sizeof(VirtMachineState),

+    .class_size    = sizeof(VirtMachineClass),

+    .class_init    = rhel_machine_class_init,

+};

+

+static void rhel_machine_init(void)

+{

+    type_register_static(&rhel_machine_info);

+}

+type_init(rhel_machine_init);

+

+static void rhel750_virt_instance_init(Object *obj)

+{

+    VirtMachineState *vms = VIRT_MACHINE(obj);

+    VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);

+

+    /* EL3 is disabled by default and non-configurable for RHEL */

+    vms->secure = false;

+    /* EL2 is disabled by default and non-configurable for RHEL */

+    vms->virt = false;

+    /* High memory is enabled by default for RHEL */

+    vms->highmem = true;

+    object_property_add_bool(obj, "highmem", virt_get_highmem,

+                             virt_set_highmem, NULL);

+    object_property_set_description(obj, "highmem",

+                                    "Set on/off to enable/disable using "

+                                    "physical address space above 32 bits",

+                                    NULL);

+    /* Default GIC type is still v2, but became configurable for RHEL */

+    vms->gic_version = 2;

+    object_property_add_str(obj, "gic-version", virt_get_gic_version,

+                        virt_set_gic_version, NULL);

+    object_property_set_description(obj, "gic-version",

+                                    "Set GIC version. "

+                                    "Valid values are 2, 3 and host", NULL);

+

+    if (vmc->no_its) {

+        vms->its = false;

+    } else {

+        /* Default allows ITS instantiation */

+        vms->its = true;

+        object_property_add_bool(obj, "its", virt_get_its,

+                                 virt_set_its, NULL);

+        object_property_set_description(obj, "its",

+                                        "Set on/off to enable/disable "

+                                        "ITS instantiation",

+                                        NULL);

+    }

+

+    vms->memmap=a15memmap;

+    vms->irqmap=a15irqmap;

+}

+

+static void rhel750_virt_options(MachineClass *mc)

+{

+    SET_MACHINE_COMPAT(mc, ARM_RHEL_COMPAT);

+}

+DEFINE_RHEL_MACHINE_AS_LATEST(7, 5, 0)

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

index eb72191..7647fac 100644

--- a/hw/char/serial.c

+++ b/hw/char/serial.c

@@ -30,6 +30,7 @@

 #include "qemu/timer.h"

 #include "exec/address-spaces.h"

 #include "qemu/error-report.h"

+#include "migration/migration.h"

 //#define DEBUG_SERIAL

@@ -691,6 +692,9 @@ static int serial_post_load(void *opaque, int version_id)

 static bool serial_thr_ipending_needed(void *opaque)

 {

     SerialState *s = opaque;

+    if (migrate_pre_2_2) {

+        return false;

+    }

     if (s->ier & UART_IER_THRI) {

         bool expected_value = ((s->iir & UART_IIR_ID) == UART_IIR_THRI);

@@ -718,6 +722,10 @@ static const VMStateDescription vmstate_serial_thr_ipending = {

 static bool serial_tsr_needed(void *opaque)

 {

     SerialState *s = (SerialState *)opaque;

+    if (migrate_pre_2_2) {

+        return false;

+    }

+

     return s->tsr_retry != 0;

 }

@@ -737,6 +745,10 @@ static const VMStateDescription vmstate_serial_tsr = {

 static bool serial_recv_fifo_needed(void *opaque)

 {

     SerialState *s = (SerialState *)opaque;

+    if (migrate_pre_2_2) {

+        return false;

+    }

+

     return !fifo8_is_empty(&s->recv_fifo);

 }

@@ -755,6 +767,10 @@ static const VMStateDescription vmstate_serial_recv_fifo = {

 static bool serial_xmit_fifo_needed(void *opaque)

 {

     SerialState *s = (SerialState *)opaque;

+    if (migrate_pre_2_2) {

+        return false;

+    }

+

     return !fifo8_is_empty(&s->xmit_fifo);

 }

@@ -772,6 +788,10 @@ static const VMStateDescription vmstate_serial_xmit_fifo = {

 static bool serial_fifo_timeout_timer_needed(void *opaque)

 {

     SerialState *s = (SerialState *)opaque;

+    if (migrate_pre_2_2) {

+        return false;

+    }

+

     return timer_pending(s->fifo_timeout_timer);

 }

@@ -789,6 +809,10 @@ static const VMStateDescription vmstate_serial_fifo_timeout_timer = {

 static bool serial_timeout_ipending_needed(void *opaque)

 {

     SerialState *s = (SerialState *)opaque;

+    if (migrate_pre_2_2) {

+        return false;

+    }

+

     return s->timeout_ipending != 0;

 }

@@ -806,6 +830,10 @@ static const VMStateDescription vmstate_serial_timeout_ipending = {

 static bool serial_poll_needed(void *opaque)

 {

     SerialState *s = (SerialState *)opaque;

+    if (migrate_pre_2_2) {

+        return false;

+    }

+

     return s->poll_msl >= 0;

 }

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

index d116651..feacb45 100644

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

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

@@ -3060,7 +3060,7 @@ static void isa_cirrus_vga_realizefn(DeviceState *dev, Error **errp)

 static Property isa_cirrus_vga_properties[] = {

     DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState,

-                       cirrus_vga.vga.vram_size_mb, 4),

+                       cirrus_vga.vga.vram_size_mb, 16),

     DEFINE_PROP_BOOL("blitter", struct ISACirrusVGAState,

                        cirrus_vga.enable_blitter, true),

     DEFINE_PROP_END_OF_LIST(),

@@ -3133,7 +3133,7 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp)

 static Property pci_vga_cirrus_properties[] = {

     DEFINE_PROP_UINT32("vgamem_mb", struct PCICirrusVGAState,

-                       cirrus_vga.vga.vram_size_mb, 4),

+                       cirrus_vga.vga.vram_size_mb, 16),

     DEFINE_PROP_BOOL("blitter", struct PCICirrusVGAState,

                      cirrus_vga.enable_blitter, true),

     DEFINE_PROP_END_OF_LIST(),

diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c

index 469834a..eb44d21 100644

--- a/hw/display/vga-isa.c

+++ b/hw/display/vga-isa.c

@@ -79,7 +79,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)

 }

 static Property vga_isa_properties[] = {

-    DEFINE_PROP_UINT32("vgamem_mb", ISAVGAState, state.vram_size_mb, 8),

+    DEFINE_PROP_UINT32("vgamem_mb", ISAVGAState, state.vram_size_mb, 16),

     DEFINE_PROP_END_OF_LIST(),

 };

diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs

index fa87a14..8c25538 100644

--- a/hw/i386/Makefile.objs

+++ b/hw/i386/Makefile.objs

@@ -10,3 +10,4 @@ obj-$(CONFIG_VMMOUSE) += vmmouse.o

 obj-y += kvmvapic.o

 obj-y += acpi-build.o

+obj-y += shadow-bios.o

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c

index 3cf2a16..976d151 100644

--- a/hw/i386/acpi-build.c

+++ b/hw/i386/acpi-build.c

@@ -183,6 +183,9 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)

         pm->fadt.reset_reg = r;

         pm->fadt.reset_val = 0xf;

         pm->fadt.flags |= 1 << ACPI_FADT_F_RESET_REG_SUP;

+        if (object_property_get_bool(lpc,

+                                     "__com.redhat_force-rev1-fadt", NULL))

+            pm->fadt.rev = 1;

         pm->cpu_hp_io_base = ICH9_CPU_HOTPLUG_IO_BASE;

     }

     assert(obj);

diff --git a/hw/i386/pc.c b/hw/i386/pc.c

index ab4323d..d38a328 100644

--- a/hw/i386/pc.c

+++ b/hw/i386/pc.c

@@ -1417,7 +1417,8 @@ void pc_memory_init(PCMachineState *pcms,

     option_rom_mr = g_malloc(sizeof(*option_rom_mr));

     memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,

                            &error_fatal);

-    if (pcmc->pci_enabled) {

+    /* RH difference: See bz 1489800, explicitly make ROM ro */

+    if (pcmc->pc_rom_ro) {

         memory_region_set_readonly(option_rom_mr, true);

     }

     memory_region_add_subregion_overlap(rom_memory,

@@ -2360,6 +2361,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)

     pcmc->acpi_data_size = 0x20000 + 0x8000;

     pcmc->save_tsc_khz = true;

     pcmc->linuxboot_dma_enabled = true;

+    pcmc->pc_rom_ro = true;

     mc->get_hotplug_handler = pc_get_hotpug_handler;

     mc->cpu_index_to_instance_props = pc_cpu_index_to_props;

     mc->get_default_cpu_node_id = pc_get_default_cpu_node_id;

@@ -2369,7 +2371,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)

     mc->default_boot_order = "cad";

     mc->hot_add_cpu = pc_hot_add_cpu;

     mc->block_default_type = IF_IDE;

-    mc->max_cpus = 255;

+    /* 240: max CPU count for RHEL */

+    mc->max_cpus = 240;

     mc->reset = pc_machine_reset;

     hc->pre_plug = pc_machine_device_pre_plug_cb;

     hc->plug = pc_machine_device_plug_cb;

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c

index 729a050..6794bb7 100644

--- a/hw/i386/pc_piix.c

+++ b/hw/i386/pc_piix.c

@@ -48,6 +48,7 @@

 #include "cpu.h"

 #include "qapi/error.h"

 #include "qemu/error-report.h"

+#include "migration/migration.h"

 #ifdef CONFIG_XEN

 #include <xen/hvm/hvm_info_table.h>

 #include "hw/xen/xen_pt.h"

@@ -168,8 +169,8 @@ static void pc_init1(MachineState *machine,

     if (pcmc->smbios_defaults) {

         MachineClass *mc = MACHINE_GET_CLASS(machine);

         /* These values are guest ABI, do not change */

-        smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)",

-                            mc->name, pcmc->smbios_legacy_mode,

+        smbios_set_defaults("Red Hat", "KVM",

+                            mc->desc, pcmc->smbios_legacy_mode,

                             pcmc->smbios_uuid_encoded,

                             SMBIOS_ENTRY_POINT_21);

     }

@@ -307,6 +308,7 @@ static void pc_init1(MachineState *machine,

  * HW_COMPAT_*, PC_COMPAT_*, or * pc_*_machine_options().

  */

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

 static void pc_compat_2_3(MachineState *machine)

 {

     PCMachineState *pcms = PC_MACHINE(machine);

@@ -1135,3 +1137,891 @@ static void xenfv_machine_options(MachineClass *m)

 DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init,

                   xenfv_machine_options);

 #endif

+machine_init(pc_machine_init);

+

+#endif  /* Disabled for Red Hat Enterprise Linux */

+