From 44f7e7595c416686a00015e317e74183037a8136 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.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.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 d682dec685d0a342b990068b20dbef5aebc30a23)

---

 default-configs/aarch64-softmmu.mak |   2 +

 default-configs/arm-softmmu.mak     |   1 -

 hw/acpi/piix4.c                     |   6 +-

 hw/arm/Makefile.objs                |  19 +-

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

 hw/char/serial.c                    |  28 ++

 hw/display/cirrus_vga.c             |   4 +-

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

 hw/i386/Makefile.objs               |   1 +

 hw/i386/pc.c                        |   3 +-

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

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

 hw/i386/pc_sysfw.c                  |  16 +

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

 hw/net/e1000.c                      |  20 +-

 hw/net/ne2000.c                     |   2 +-

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

 hw/net/rtl8139.c                    |   2 +-

 hw/ppc/Makefile.objs                |   2 +-

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

 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                   |  18 +

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

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

 hw/virtio/virtio.c                  |  22 +-

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

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

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

 include/hw/usb.h                    |   7 +

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

 include/sysemu/sysemu.h             |   2 +

 migration/migration.c               |   2 +

 migration/migration.h               |   6 +

 migration/savevm.c                  |   9 +

 numa.c                              |  13 +

 qdev-monitor.c                      |   1 -

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

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

 stubs/Makefile.objs                 |   1 +

 stubs/shadow-bios.c                 |   7 +

 target/i386/cpu.c                   |  51 ++-

 target/i386/machine.c               |  21 +

 45 files changed, 2030 insertions(+), 60 deletions(-)

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

 create mode 100644 stubs/shadow-bios.c

diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak

index 2449483..abd18c2 100644

--- a/default-configs/aarch64-softmmu.mak

+++ b/default-configs/aarch64-softmmu.mak

@@ -7,3 +7,5 @@ CONFIG_AUX=y

 CONFIG_DDC=y

 CONFIG_DPCD=y

 CONFIG_XLNX_ZYNQMP=y

+CONFIG_PL061=y

+CONFIG_GPIO_KEY=y

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak

index bbdd3c1..05aaf8f 100644

--- a/default-configs/arm-softmmu.mak

+++ b/default-configs/arm-softmmu.mak

@@ -76,7 +76,6 @@ CONFIG_ARM11SCU=y

 CONFIG_A9SCU=y

 CONFIG_DIGIC=y

 CONFIG_MARVELL_88W8618=y

-CONFIG_OMAP=y

 CONFIG_TSC210X=y

 CONFIG_BLIZZARD=y

 CONFIG_ONENAND=y

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

index f276967..efd80d1 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,

@@ -675,8 +675,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/Makefile.objs b/hw/arm/Makefile.objs

index a2e56ec..906367c 100644

--- a/hw/arm/Makefile.objs

+++ b/hw/arm/Makefile.objs

@@ -1,21 +1,4 @@

-obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o

-obj-$(CONFIG_DIGIC) += digic_boards.o

-obj-y += integratorcp.o mainstone.o musicpal.o nseries.o

-obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o

-obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o

 obj-$(CONFIG_ACPI) += virt-acpi-build.o

-obj-y += netduino2.o

 obj-y += sysbus-fdt.o

-obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o

-obj-$(CONFIG_DIGIC) += digic.o

-obj-y += omap1.o omap2.o strongarm.o

-obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o

-obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o

-obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o

-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o

-obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o

-obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o

-obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o

-obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o

-obj-$(CONFIG_MPS2) += mps2.o

+obj-y += boot.o virt.o

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

index 6b7a0fe..b14e16d 100644

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

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

@@ -57,6 +57,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) \

@@ -84,7 +85,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

@@ -1484,6 +1514,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);

@@ -1512,6 +1543,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);

@@ -1604,6 +1636,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);

@@ -1780,3 +1813,88 @@ 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->has_dynamic_sysbus = false;

+    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;

+}

+

+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 rhel740_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 rhel740_virt_options(MachineClass *mc)

+{

+    SET_MACHINE_COMPAT(mc, ARM_RHEL_COMPAT);

+}

+DEFINE_RHEL_MACHINE_AS_LATEST(7, 4, 0)

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

index 9aec6c6..fe4f41d 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

@@ -689,6 +690,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);

@@ -716,6 +720,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;

 }

@@ -735,6 +743,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);

 }

@@ -753,6 +765,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);

 }

@@ -770,6 +786,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);

 }

@@ -787,6 +807,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;

 }

@@ -804,6 +828,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 afc290a..14008aa 100644

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

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

@@ -3063,7 +3063,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(),

@@ -3134,7 +3134,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 1af9556..91a675d 100644

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

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

@@ -80,7 +80,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 c14559b..9b5686b 100644

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

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

@@ -10,3 +10,4 @@ obj-$(CONFIG_XEN) += ../xenpv/ xen/

 obj-y += kvmvapic.o

 obj-y += acpi-build.o

 obj-y += pci-assign-load-rom.o

+obj-y += shadow-bios.o

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

index 2108104..64929ea 100644

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

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

@@ -2353,7 +2353,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 46dfd2c..7f12ce3 100644

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

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

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

 #include "hw/acpi/acpi.h"

 #include "cpu.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);

     }

@@ -311,6 +312,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);

@@ -1122,3 +1124,769 @@ 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 */

+

+/* Red Hat Enterprise Linux machine types */

+

+/* Options for the latest rhel7 machine type */

+static void pc_machine_rhel7_options(MachineClass *m)

+{

+    m->family = "pc_piix_Y";

+    m->default_machine_opts = "firmware=bios-256k.bin";

+    m->default_display = "std";

+    SET_MACHINE_COMPAT(m, PC_RHEL_COMPAT);

+    m->alias = "pc";

+    m->is_default = 1;

+}

+

+static void pc_init_rhel740(MachineState *machine)

+{

+    pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \

+             TYPE_I440FX_PCI_DEVICE);

+}

+

+static void pc_machine_rhel740_options(MachineClass *m)

+{

+    pc_machine_rhel7_options(m);

+    m->desc = "RHEL 7.4.0 PC (i440FX + PIIX, 1996)";

+}

+

+DEFINE_PC_MACHINE(rhel740, "pc-i440fx-rhel7.4.0", pc_init_rhel740,

+                  pc_machine_rhel740_options);

+

+static void pc_init_rhel730(MachineState *machine)

+{

+    pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \

+             TYPE_I440FX_PCI_DEVICE);

+}

+

+static void pc_machine_rhel730_options(MachineClass *m)

+{

+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

+    pc_machine_rhel740_options(m);

+    m->alias = NULL;

+    m->is_default = 0;

+    m->desc = "RHEL 7.3.0 PC (i440FX + PIIX, 1996)";

+    pcmc->linuxboot_dma_enabled = false;

+    SET_MACHINE_COMPAT(m, PC_RHEL7_3_COMPAT);

+}

+

+DEFINE_PC_MACHINE(rhel730, "pc-i440fx-rhel7.3.0", pc_init_rhel730,

+                  pc_machine_rhel730_options);

+

+

+static void pc_init_rhel720(MachineState *machine)

+{

+    pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \

+             TYPE_I440FX_PCI_DEVICE);

+}

+

+static void pc_machine_rhel720_options(MachineClass *m)

+{

+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

+    pc_machine_rhel730_options(m);

+    m->desc = "RHEL 7.2.0 PC (i440FX + PIIX, 1996)";

+    /* From pc_i440fx_2_5_machine_options */

+    pcmc->save_tsc_khz = false;

+    m->legacy_fw_cfg_order = 1;

+    /* Note: broken_reserved_end was already in 7.2 */

+    /* From pc_i440fx_2_6_machine_options */

+    pcmc->legacy_cpu_hotplug = true;

+    SET_MACHINE_COMPAT(m, PC_RHEL7_2_COMPAT);

+}

+

+DEFINE_PC_MACHINE(rhel720, "pc-i440fx-rhel7.2.0", pc_init_rhel720,

+                  pc_machine_rhel720_options);

+

+static void pc_compat_rhel710(MachineState *machine)

+{

+    PCMachineState *pcms = PC_MACHINE(machine);

+    PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);

+

+    /* From pc_compat_2_2 */

+    pcmc->rsdp_in_ram = false;

+    machine->suppress_vmdesc = true;

+

+    /* From pc_compat_2_1 */

+    pcmc->smbios_uuid_encoded = false;

+    x86_cpu_change_kvm_default("svm", NULL);

+    pcmc->enforce_aligned_dimm = false;

+

+    /* Disable all the extra subsections that were added in 2.2 */

+    migrate_pre_2_2 = true;