pc: Set CPU model-id on compat_props for pc <= 2.4

[qemu.git] / hw / i386 / pc_piix.c

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index a91cc3dada6d504ac5781233a10b3f3609150b8d..24e7042680355c9afd0f0f3ddb4bbe53554e9c02 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 
  * THE SOFTWARE.
  */
 

+#include "qemu/osdep.h"

 #include <glib.h>
 
 #include "hw/hw.h"
 #include <glib.h>
 
 #include "hw/hw.h"


@@ -53,6 +54,7 @@
 #include "hw/xen/xen_pt.h"
 #endif
 #include "migration/migration.h"
 #include "hw/xen/xen_pt.h"
 #endif
 #include "migration/migration.h"

+#include "kvm_i386.h"

 
 #define MAX_IDE_BUS 2
 
 
 #define MAX_IDE_BUS 2
 


@@ -60,26 +62,12 @@ static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
 static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
 static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
 
 static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
 static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
 

-static bool pci_enabled = true;
-static bool has_acpi_build = true;
-static bool rsdp_in_ram = true;
-static int legacy_acpi_table_size;
-static bool smbios_defaults = true;
-static bool smbios_legacy_mode;
-static bool smbios_uuid_encoded = true;
-/* Make sure that guest addresses aligned at 1Gbyte boundaries get mapped to
- * host addresses aligned at 1Gbyte boundaries.  This way we can use 1GByte
- * pages in the host.
- */
-static bool gigabyte_align = true;
-static bool has_reserved_memory = true;
-static bool kvmclock_enabled = true;
-

 /* PC hardware initialisation */
 static void pc_init1(MachineState *machine,
                      const char *host_type, const char *pci_type)
 {
     PCMachineState *pcms = PC_MACHINE(machine);
 /* PC hardware initialisation */
 static void pc_init1(MachineState *machine,
                      const char *host_type, const char *pci_type)
 {
     PCMachineState *pcms = PC_MACHINE(machine);

+    PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);

     MemoryRegion *system_memory = get_system_memory();
     MemoryRegion *system_io = get_system_io();
     int i;
     MemoryRegion *system_memory = get_system_memory();
     MemoryRegion *system_io = get_system_io();
     int i;


@@ -97,7 +85,6 @@ static void pc_init1(MachineState *machine,
     MemoryRegion *ram_memory;
     MemoryRegion *pci_memory;
     MemoryRegion *rom_memory;
     MemoryRegion *ram_memory;
     MemoryRegion *pci_memory;
     MemoryRegion *rom_memory;

-    PcGuestInfo *guest_info;

     ram_addr_t lowmem;
 
     /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory).
     ram_addr_t lowmem;
 
     /* Check whether RAM fits below 4G (leaving 1/2 GByte for IO memory).


@@ -108,7 +95,7 @@ static void pc_init1(MachineState *machine,
      * breaking migration.
      */
     if (machine->ram_size >= 0xe0000000) {
      * breaking migration.
      */
     if (machine->ram_size >= 0xe0000000) {

-        lowmem = gigabyte_align ? 0xc0000000 : 0xe0000000;
+        lowmem = pcmc->gigabyte_align ? 0xc0000000 : 0xe0000000;

     } else {
         lowmem = 0xe0000000;
     }
     } else {
         lowmem = 0xe0000000;
     }


@@ -134,18 +121,17 @@ static void pc_init1(MachineState *machine,
         pcms->below_4g_mem_size = machine->ram_size;
     }
 
         pcms->below_4g_mem_size = machine->ram_size;
     }
 

-    if (xen_enabled() && xen_hvm_init(pcms, &ram_memory) != 0) {
-        fprintf(stderr, "xen hardware virtual machine initialisation failed\n");
-        exit(1);
+    if (xen_enabled()) {
+        xen_hvm_init(pcms, &ram_memory);

     }
 
     }
 

-    pc_cpus_init(machine->cpu_model);
+    pc_cpus_init(pcms);

 
 

-    if (kvm_enabled() && kvmclock_enabled) {
+    if (kvm_enabled() && pcmc->kvmclock_enabled) {

         kvmclock_create();
     }
 
         kvmclock_create();
     }
 

-    if (pci_enabled) {
+    if (pcmc->pci_enabled) {

         pci_memory = g_new(MemoryRegion, 1);
         memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
         rom_memory = pci_memory;
         pci_memory = g_new(MemoryRegion, 1);
         memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
         rom_memory = pci_memory;


@@ -154,42 +140,36 @@ static void pc_init1(MachineState *machine,
         rom_memory = system_memory;
     }
 
         rom_memory = system_memory;
     }
 

-    guest_info = pc_guest_info_init(pcms);
-
-    guest_info->has_acpi_build = has_acpi_build;
-    guest_info->legacy_acpi_table_size = legacy_acpi_table_size;
+    pc_guest_info_init(pcms);

 
 

-    guest_info->isapc_ram_fw = !pci_enabled;
-    guest_info->has_reserved_memory = has_reserved_memory;
-    guest_info->rsdp_in_ram = rsdp_in_ram;
-
-    if (smbios_defaults) {
+    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)",
         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, smbios_legacy_mode, smbios_uuid_encoded,
+                            mc->name, pcmc->smbios_legacy_mode,
+                            pcmc->smbios_uuid_encoded,

                             SMBIOS_ENTRY_POINT_21);
     }
 
     /* allocate ram and load rom/bios */
     if (!xen_enabled()) {
         pc_memory_init(pcms, system_memory,
                             SMBIOS_ENTRY_POINT_21);
     }
 
     /* allocate ram and load rom/bios */
     if (!xen_enabled()) {
         pc_memory_init(pcms, system_memory,

-                       rom_memory, &ram_memory, guest_info);
+                       rom_memory, &ram_memory);

     } else if (machine->kernel_filename != NULL) {
         /* For xen HVM direct kernel boot, load linux here */
     } else if (machine->kernel_filename != NULL) {
         /* For xen HVM direct kernel boot, load linux here */

-        xen_load_linux(pcms, guest_info);
+        xen_load_linux(pcms);

     }
 
     gsi_state = g_malloc0(sizeof(*gsi_state));
     }
 
     gsi_state = g_malloc0(sizeof(*gsi_state));

-    if (kvm_irqchip_in_kernel()) {
-        kvm_pc_setup_irq_routing(pci_enabled);
+    if (kvm_ioapic_in_kernel()) {
+        kvm_pc_setup_irq_routing(pcmc->pci_enabled);

         gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
                                  GSI_NUM_PINS);
     } else {
         gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
     }
 
         gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
                                  GSI_NUM_PINS);
     } else {
         gsi = qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS);
     }
 

-    if (pci_enabled) {
+    if (pcmc->pci_enabled) {

         pci_bus = i440fx_init(host_type,
                               pci_type,
                               &i440fx_state, &piix3_devfn, &isa_bus, gsi,
         pci_bus = i440fx_init(host_type,
                               pci_type,
                               &i440fx_state, &piix3_devfn, &isa_bus, gsi,


@@ -197,15 +177,17 @@ static void pc_init1(MachineState *machine,
                               pcms->below_4g_mem_size,
                               pcms->above_4g_mem_size,
                               pci_memory, ram_memory);
                               pcms->below_4g_mem_size,
                               pcms->above_4g_mem_size,
                               pci_memory, ram_memory);

+        pcms->bus = pci_bus;

     } else {
         pci_bus = NULL;
         i440fx_state = NULL;
     } else {
         pci_bus = NULL;
         i440fx_state = NULL;

-        isa_bus = isa_bus_new(NULL, get_system_memory(), system_io);
+        isa_bus = isa_bus_new(NULL, get_system_memory(), system_io,
+                              &error_abort);

         no_hpet = 1;
     }
     isa_bus_irqs(isa_bus, gsi);
 
         no_hpet = 1;
     }
     isa_bus_irqs(isa_bus, gsi);
 

-    if (kvm_irqchip_in_kernel()) {
+    if (kvm_pic_in_kernel()) {

         i8259 = kvm_i8259_init(isa_bus);
     } else if (xen_enabled()) {
         i8259 = xen_interrupt_controller_init();
         i8259 = kvm_i8259_init(isa_bus);
     } else if (xen_enabled()) {
         i8259 = xen_interrupt_controller_init();


@@ -217,15 +199,15 @@ static void pc_init1(MachineState *machine,
         gsi_state->i8259_irq[i] = i8259[i];
     }
     g_free(i8259);
         gsi_state->i8259_irq[i] = i8259[i];
     }
     g_free(i8259);

-    if (pci_enabled) {
+    if (pcmc->pci_enabled) {

         ioapic_init_gsi(gsi_state, "i440fx");
     }
 
     pc_register_ferr_irq(gsi[13]);
 
         ioapic_init_gsi(gsi_state, "i440fx");
     }
 
     pc_register_ferr_irq(gsi[13]);
 

-    pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
+    pc_vga_init(isa_bus, pcmc->pci_enabled ? pci_bus : NULL);

 
 

-    assert(pcms->vmport != ON_OFF_AUTO_MAX);
+    assert(pcms->vmport != ON_OFF_AUTO__MAX);

     if (pcms->vmport == ON_OFF_AUTO_AUTO) {
         pcms->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
     }
     if (pcms->vmport == ON_OFF_AUTO_AUTO) {
         pcms->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;
     }


@@ -237,7 +219,7 @@ static void pc_init1(MachineState *machine,
     pc_nic_init(isa_bus, pci_bus);
 
     ide_drive_get(hd, ARRAY_SIZE(hd));
     pc_nic_init(isa_bus, pci_bus);
 
     ide_drive_get(hd, ARRAY_SIZE(hd));

-    if (pci_enabled) {
+    if (pcmc->pci_enabled) {

         PCIDevice *dev;
         if (xen_enabled()) {
             dev = pci_piix3_xen_ide_init(pci_bus, hd, piix3_devfn + 1);
         PCIDevice *dev;
         if (xen_enabled()) {
             dev = pci_piix3_xen_ide_init(pci_bus, hd, piix3_devfn + 1);


@@ -264,11 +246,11 @@ static void pc_init1(MachineState *machine,
 
     pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
 
 
     pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
 

-    if (pci_enabled && usb_enabled()) {
+    if (pcmc->pci_enabled && usb_enabled()) {

         pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
     }
 
         pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
     }
 

-    if (pci_enabled && acpi_enabled) {
+    if (pcmc->pci_enabled && acpi_enabled) {

         DeviceState *piix4_pm;
         I2CBus *smbus;
 
         DeviceState *piix4_pm;
         I2CBus *smbus;
 


@@ -289,9 +271,14 @@ static void pc_init1(MachineState *machine,
                                  PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
     }
 
                                  PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
     }
 

-    if (pci_enabled) {
+    if (pcmc->pci_enabled) {

         pc_pci_device_init(pci_bus);
     }
         pc_pci_device_init(pci_bus);
     }

+
+    if (pcms->acpi_nvdimm_state.is_enabled) {
+        nvdimm_init_acpi_state(&pcms->acpi_nvdimm_state, system_io,
+                               pcms->fw_cfg, OBJECT(pcms));
+    }

 }
 
 /* Looking for a pc_compat_2_4() function? It doesn't exist.
 }
 
 /* Looking for a pc_compat_2_4() function? It doesn't exist.


@@ -315,60 +302,29 @@ static void pc_compat_2_3(MachineState *machine)
 static void pc_compat_2_2(MachineState *machine)
 {
     pc_compat_2_3(machine);
 static void pc_compat_2_2(MachineState *machine)
 {
     pc_compat_2_3(machine);

-    rsdp_in_ram = false;

     machine->suppress_vmdesc = true;
 }
 
 static void pc_compat_2_1(MachineState *machine)
 {
     machine->suppress_vmdesc = true;
 }
 
 static void pc_compat_2_1(MachineState *machine)
 {

-    PCMachineState *pcms = PC_MACHINE(machine);
-

     pc_compat_2_2(machine);
     pc_compat_2_2(machine);

-    smbios_uuid_encoded = false;

     x86_cpu_change_kvm_default("svm", NULL);
     x86_cpu_change_kvm_default("svm", NULL);

-    pcms->enforce_aligned_dimm = false;

 }
 
 static void pc_compat_2_0(MachineState *machine)
 {
     pc_compat_2_1(machine);
 }
 
 static void pc_compat_2_0(MachineState *machine)
 {
     pc_compat_2_1(machine);

-    /* This value depends on the actual DSDT and SSDT compiled into
-     * the source QEMU; unfortunately it depends on the binary and
-     * not on the machine type, so we cannot make pc-i440fx-1.7 work on
-     * both QEMU 1.7 and QEMU 2.0.
-     *
-     * Large variations cause migration to fail for more than one
-     * consecutive value of the "-smp" maxcpus option.
-     *
-     * For small variations of the kind caused by different iasl versions,
-     * the 4k rounding usually leaves slack.  However, there could be still
-     * one or two values that break.  For QEMU 1.7 and QEMU 2.0 the
-     * slack is only ~10 bytes before one "-smp maxcpus" value breaks!
-     *
-     * 6652 is valid for QEMU 2.0, the right value for pc-i440fx-1.7 on
-     * QEMU 1.7 it is 6414.  For RHEL/CentOS 7.0 it is 6418.
-     */
-    legacy_acpi_table_size = 6652;
-    smbios_legacy_mode = true;
-    has_reserved_memory = false;
-    pc_set_legacy_acpi_data_size();

 }
 
 static void pc_compat_1_7(MachineState *machine)
 {
     pc_compat_2_0(machine);
 }
 
 static void pc_compat_1_7(MachineState *machine)
 {
     pc_compat_2_0(machine);

-    smbios_defaults = false;
-    gigabyte_align = false;
-    option_rom_has_mr = true;
-    legacy_acpi_table_size = 6414;

     x86_cpu_change_kvm_default("x2apic", NULL);
 }
 
 static void pc_compat_1_6(MachineState *machine)
 {
     pc_compat_1_7(machine);
     x86_cpu_change_kvm_default("x2apic", NULL);
 }
 
 static void pc_compat_1_6(MachineState *machine)
 {
     pc_compat_1_7(machine);

-    rom_file_has_mr = false;
-    has_acpi_build = false;

 }
 
 static void pc_compat_1_5(MachineState *machine)
 }
 
 static void pc_compat_1_5(MachineState *machine)


@@ -398,19 +354,10 @@ static void pc_compat_1_2(MachineState *machine)
 static void pc_compat_0_13(MachineState *machine)
 {
     pc_compat_1_2(machine);
 static void pc_compat_0_13(MachineState *machine)
 {
     pc_compat_1_2(machine);

-    kvmclock_enabled = false;

 }
 
 static void pc_init_isa(MachineState *machine)
 {
 }
 
 static void pc_init_isa(MachineState *machine)
 {

-    pci_enabled = false;
-    has_acpi_build = false;
-    smbios_defaults = false;
-    gigabyte_align = false;
-    smbios_legacy_mode = true;
-    has_reserved_memory = false;
-    option_rom_has_mr = true;
-    rom_file_has_mr = false;

     if (!machine->cpu_model) {
         machine->cpu_model = "486";
     }
     if (!machine->cpu_model) {
         machine->cpu_model = "486";
     }


@@ -469,13 +416,28 @@ static void pc_i440fx_machine_options(MachineClass *m)
     m->default_display = "std";
 }
 
     m->default_display = "std";
 }
 

-static void pc_i440fx_2_5_machine_options(MachineClass *m)
+static void pc_i440fx_2_6_machine_options(MachineClass *m)

 {
     pc_i440fx_machine_options(m);
     m->alias = "pc";
     m->is_default = 1;
 }
 
 {
     pc_i440fx_machine_options(m);
     m->alias = "pc";
     m->is_default = 1;
 }
 

+DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL,
+                      pc_i440fx_2_6_machine_options);
+
+
+static void pc_i440fx_2_5_machine_options(MachineClass *m)
+{
+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
+    pc_i440fx_2_6_machine_options(m);
+    m->alias = NULL;
+    m->is_default = 0;
+    pcmc->save_tsc_khz = false;
+    m->legacy_fw_cfg_order = 1;
+    SET_MACHINE_COMPAT(m, PC_COMPAT_2_5);
+}
+

 DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,
                       pc_i440fx_2_5_machine_options);
 
 DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,
                       pc_i440fx_2_5_machine_options);
 


@@ -484,10 +446,8 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m)
 {
     PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_i440fx_2_5_machine_options(m);
 {
     PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_i440fx_2_5_machine_options(m);

-    m->alias = NULL;
-    m->is_default = 0;
+    m->hw_version = "2.4.0";

     pcmc->broken_reserved_end = true;
     pcmc->broken_reserved_end = true;

-    pcmc->inter_dimm_gap = false;

     SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
 }
 
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_4);
 }
 


@@ -498,8 +458,7 @@ DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL,
 static void pc_i440fx_2_3_machine_options(MachineClass *m)
 {
     pc_i440fx_2_4_machine_options(m);
 static void pc_i440fx_2_3_machine_options(MachineClass *m)
 {
     pc_i440fx_2_4_machine_options(m);

-    m->alias = NULL;
-    m->is_default = 0;
+    m->hw_version = "2.3.0";

     SET_MACHINE_COMPAT(m, PC_COMPAT_2_3);
 }
 
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_3);
 }
 


@@ -509,8 +468,11 @@ DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3,
 
 static void pc_i440fx_2_2_machine_options(MachineClass *m)
 {
 
 static void pc_i440fx_2_2_machine_options(MachineClass *m)
 {

+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

     pc_i440fx_2_3_machine_options(m);
     pc_i440fx_2_3_machine_options(m);

+    m->hw_version = "2.2.0";

     SET_MACHINE_COMPAT(m, PC_COMPAT_2_2);
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_2);

+    pcmc->rsdp_in_ram = false;

 }
 
 DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2,
 }
 
 DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2,


@@ -519,9 +481,13 @@ DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2,
 
 static void pc_i440fx_2_1_machine_options(MachineClass *m)
 {
 
 static void pc_i440fx_2_1_machine_options(MachineClass *m)
 {

+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

     pc_i440fx_2_2_machine_options(m);
     pc_i440fx_2_2_machine_options(m);

+    m->hw_version = "2.1.0";

     m->default_display = NULL;
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_1);
     m->default_display = NULL;
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_1);

+    pcmc->smbios_uuid_encoded = false;
+    pcmc->enforce_aligned_dimm = false;

 }
 
 DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1,
 }
 
 DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1,


@@ -531,8 +497,30 @@ DEFINE_I440FX_MACHINE(v2_1, "pc-i440fx-2.1", pc_compat_2_1,
 
 static void pc_i440fx_2_0_machine_options(MachineClass *m)
 {
 
 static void pc_i440fx_2_0_machine_options(MachineClass *m)
 {

+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

     pc_i440fx_2_1_machine_options(m);
     pc_i440fx_2_1_machine_options(m);

+    m->hw_version = "2.0.0";

     SET_MACHINE_COMPAT(m, PC_COMPAT_2_0);
     SET_MACHINE_COMPAT(m, PC_COMPAT_2_0);

+    pcmc->smbios_legacy_mode = true;
+    pcmc->has_reserved_memory = false;
+    /* This value depends on the actual DSDT and SSDT compiled into
+     * the source QEMU; unfortunately it depends on the binary and
+     * not on the machine type, so we cannot make pc-i440fx-1.7 work on
+     * both QEMU 1.7 and QEMU 2.0.
+     *
+     * Large variations cause migration to fail for more than one
+     * consecutive value of the "-smp" maxcpus option.
+     *
+     * For small variations of the kind caused by different iasl versions,
+     * the 4k rounding usually leaves slack.  However, there could be still
+     * one or two values that break.  For QEMU 1.7 and QEMU 2.0 the
+     * slack is only ~10 bytes before one "-smp maxcpus" value breaks!
+     *
+     * 6652 is valid for QEMU 2.0, the right value for pc-i440fx-1.7 on
+     * QEMU 1.7 it is 6414.  For RHEL/CentOS 7.0 it is 6418.
+     */
+    pcmc->legacy_acpi_table_size = 6652;
+    pcmc->acpi_data_size = 0x10000;

 }
 
 DEFINE_I440FX_MACHINE(v2_0, "pc-i440fx-2.0", pc_compat_2_0,
 }
 
 DEFINE_I440FX_MACHINE(v2_0, "pc-i440fx-2.0", pc_compat_2_0,


@@ -541,9 +529,15 @@ DEFINE_I440FX_MACHINE(v2_0, "pc-i440fx-2.0", pc_compat_2_0,
 
 static void pc_i440fx_1_7_machine_options(MachineClass *m)
 {
 
 static void pc_i440fx_1_7_machine_options(MachineClass *m)
 {

+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

     pc_i440fx_2_0_machine_options(m);
     pc_i440fx_2_0_machine_options(m);

+    m->hw_version = "1.7.0";

     m->default_machine_opts = NULL;
     m->default_machine_opts = NULL;

+    m->option_rom_has_mr = true;

     SET_MACHINE_COMPAT(m, PC_COMPAT_1_7);
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_7);

+    pcmc->smbios_defaults = false;
+    pcmc->gigabyte_align = false;
+    pcmc->legacy_acpi_table_size = 6414;

 }
 
 DEFINE_I440FX_MACHINE(v1_7, "pc-i440fx-1.7", pc_compat_1_7,
 }
 
 DEFINE_I440FX_MACHINE(v1_7, "pc-i440fx-1.7", pc_compat_1_7,


@@ -552,8 +546,12 @@ DEFINE_I440FX_MACHINE(v1_7, "pc-i440fx-1.7", pc_compat_1_7,
 
 static void pc_i440fx_1_6_machine_options(MachineClass *m)
 {
 
 static void pc_i440fx_1_6_machine_options(MachineClass *m)
 {

+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

     pc_i440fx_1_7_machine_options(m);
     pc_i440fx_1_7_machine_options(m);

+    m->hw_version = "1.6.0";
+    m->rom_file_has_mr = false;

     SET_MACHINE_COMPAT(m, PC_COMPAT_1_6);
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_6);

+    pcmc->has_acpi_build = false;

 }
 
 DEFINE_I440FX_MACHINE(v1_6, "pc-i440fx-1.6", pc_compat_1_6,
 }
 
 DEFINE_I440FX_MACHINE(v1_6, "pc-i440fx-1.6", pc_compat_1_6,


@@ -563,6 +561,7 @@ DEFINE_I440FX_MACHINE(v1_6, "pc-i440fx-1.6", pc_compat_1_6,
 static void pc_i440fx_1_5_machine_options(MachineClass *m)
 {
     pc_i440fx_1_6_machine_options(m);
 static void pc_i440fx_1_5_machine_options(MachineClass *m)
 {
     pc_i440fx_1_6_machine_options(m);

+    m->hw_version = "1.5.0";

     SET_MACHINE_COMPAT(m, PC_COMPAT_1_5);
 }
 
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_5);
 }
 


@@ -573,6 +572,7 @@ DEFINE_I440FX_MACHINE(v1_5, "pc-i440fx-1.5", pc_compat_1_5,
 static void pc_i440fx_1_4_machine_options(MachineClass *m)
 {
     pc_i440fx_1_5_machine_options(m);
 static void pc_i440fx_1_4_machine_options(MachineClass *m)
 {
     pc_i440fx_1_5_machine_options(m);

+    m->hw_version = "1.4.0";

     m->hot_add_cpu = NULL;
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_4);
 }
     m->hot_add_cpu = NULL;
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_4);
 }


@@ -582,7 +582,7 @@ DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_1_4,
 
 
 #define PC_COMPAT_1_3 \
 
 
 #define PC_COMPAT_1_3 \

-        PC_COMPAT_1_4 \
+        PC_CPU_MODEL_IDS("1.3.0") \

         {\
             .driver   = "usb-tablet",\
             .property = "usb_version",\
         {\
             .driver   = "usb-tablet",\
             .property = "usb_version",\


@@ -605,6 +605,7 @@ DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_1_4,
 static void pc_i440fx_1_3_machine_options(MachineClass *m)
 {
     pc_i440fx_1_4_machine_options(m);
 static void pc_i440fx_1_3_machine_options(MachineClass *m)
 {
     pc_i440fx_1_4_machine_options(m);

+    m->hw_version = "1.3.0";

     SET_MACHINE_COMPAT(m, PC_COMPAT_1_3);
 }
 
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_3);
 }
 


@@ -613,7 +614,7 @@ DEFINE_I440FX_MACHINE(v1_3, "pc-1.3", pc_compat_1_3,
 
 
 #define PC_COMPAT_1_2 \
 
 
 #define PC_COMPAT_1_2 \

-        PC_COMPAT_1_3 \
+        PC_CPU_MODEL_IDS("1.2.0") \

         {\
             .driver   = "nec-usb-xhci",\
             .property = "msi",\
         {\
             .driver   = "nec-usb-xhci",\
             .property = "msi",\


@@ -643,6 +644,7 @@ DEFINE_I440FX_MACHINE(v1_3, "pc-1.3", pc_compat_1_3,
 static void pc_i440fx_1_2_machine_options(MachineClass *m)
 {
     pc_i440fx_1_3_machine_options(m);
 static void pc_i440fx_1_2_machine_options(MachineClass *m)
 {
     pc_i440fx_1_3_machine_options(m);

+    m->hw_version = "1.2.0";

     SET_MACHINE_COMPAT(m, PC_COMPAT_1_2);
 }
 
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_2);
 }
 


@@ -651,7 +653,7 @@ DEFINE_I440FX_MACHINE(v1_2, "pc-1.2", pc_compat_1_2,
 
 
 #define PC_COMPAT_1_1 \
 
 
 #define PC_COMPAT_1_1 \

-        PC_COMPAT_1_2 \
+        PC_CPU_MODEL_IDS("1.1.0") \

         {\
             .driver   = "virtio-scsi-pci",\
             .property = "hotplug",\
         {\
             .driver   = "virtio-scsi-pci",\
             .property = "hotplug",\


@@ -685,6 +687,7 @@ DEFINE_I440FX_MACHINE(v1_2, "pc-1.2", pc_compat_1_2,
 static void pc_i440fx_1_1_machine_options(MachineClass *m)
 {
     pc_i440fx_1_2_machine_options(m);
 static void pc_i440fx_1_1_machine_options(MachineClass *m)
 {
     pc_i440fx_1_2_machine_options(m);

+    m->hw_version = "1.1.0";

     SET_MACHINE_COMPAT(m, PC_COMPAT_1_1);
 }
 
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_1);
 }
 


@@ -693,7 +696,7 @@ DEFINE_I440FX_MACHINE(v1_1, "pc-1.1", pc_compat_1_2,
 
 
 #define PC_COMPAT_1_0 \
 
 
 #define PC_COMPAT_1_0 \

-        PC_COMPAT_1_1 \
+        PC_CPU_MODEL_IDS("1.0") \

         {\
             .driver   = TYPE_ISA_FDC,\
             .property = "check_media_rate",\
         {\
             .driver   = TYPE_ISA_FDC,\
             .property = "check_media_rate",\


@@ -724,7 +727,7 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2,
 
 
 #define PC_COMPAT_0_15 \
 
 
 #define PC_COMPAT_0_15 \

-        PC_COMPAT_1_0
+        PC_CPU_MODEL_IDS("0.15")

 
 static void pc_i440fx_0_15_machine_options(MachineClass *m)
 {
 
 static void pc_i440fx_0_15_machine_options(MachineClass *m)
 {


@@ -738,7 +741,7 @@ DEFINE_I440FX_MACHINE(v0_15, "pc-0.15", pc_compat_1_2,
 
 
 #define PC_COMPAT_0_14 \
 
 
 #define PC_COMPAT_0_14 \

-        PC_COMPAT_0_15 \
+        PC_CPU_MODEL_IDS("0.14") \

         {\
             .driver   = "virtio-blk-pci",\
             .property = "event_idx",\
         {\
             .driver   = "virtio-blk-pci",\
             .property = "event_idx",\


@@ -777,7 +780,7 @@ DEFINE_I440FX_MACHINE(v0_14, "pc-0.14", pc_compat_1_2,
 
 
 #define PC_COMPAT_0_13 \
 
 
 #define PC_COMPAT_0_13 \

-        PC_COMPAT_0_14 \
+        PC_CPU_MODEL_IDS("0.13") \

         {\
             .driver   = TYPE_PCI_DEVICE,\
             .property = "command_serr_enable",\
         {\
             .driver   = TYPE_PCI_DEVICE,\
             .property = "command_serr_enable",\


@@ -802,9 +805,11 @@ DEFINE_I440FX_MACHINE(v0_14, "pc-0.14", pc_compat_1_2,
 
 static void pc_i440fx_0_13_machine_options(MachineClass *m)
 {
 
 static void pc_i440fx_0_13_machine_options(MachineClass *m)
 {

+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

     pc_i440fx_0_14_machine_options(m);
     m->hw_version = "0.13";
     SET_MACHINE_COMPAT(m, PC_COMPAT_0_13);
     pc_i440fx_0_14_machine_options(m);
     m->hw_version = "0.13";
     SET_MACHINE_COMPAT(m, PC_COMPAT_0_13);

+    pcmc->kvmclock_enabled = false;

 }
 
 DEFINE_I440FX_MACHINE(v0_13, "pc-0.13", pc_compat_0_13,
 }
 
 DEFINE_I440FX_MACHINE(v0_13, "pc-0.13", pc_compat_0_13,


@@ -812,7 +817,7 @@ DEFINE_I440FX_MACHINE(v0_13, "pc-0.13", pc_compat_0_13,
 
 
 #define PC_COMPAT_0_12 \
 
 
 #define PC_COMPAT_0_12 \

-        PC_COMPAT_0_13 \
+        PC_CPU_MODEL_IDS("0.12") \

         {\
             .driver   = "virtio-serial-pci",\
             .property = "max_ports",\
         {\
             .driver   = "virtio-serial-pci",\
             .property = "max_ports",\


@@ -847,7 +852,7 @@ DEFINE_I440FX_MACHINE(v0_12, "pc-0.12", pc_compat_0_13,
 
 
 #define PC_COMPAT_0_11 \
 
 
 #define PC_COMPAT_0_11 \

-        PC_COMPAT_0_12 \
+        PC_CPU_MODEL_IDS("0.11") \

         {\
             .driver   = "virtio-blk-pci",\
             .property = "vectors",\
         {\
             .driver   = "virtio-blk-pci",\
             .property = "vectors",\


@@ -878,7 +883,7 @@ DEFINE_I440FX_MACHINE(v0_11, "pc-0.11", pc_compat_0_13,
 
 
 #define PC_COMPAT_0_10 \
 
 
 #define PC_COMPAT_0_10 \

-    PC_COMPAT_0_11 \
+    PC_CPU_MODEL_IDS("0.10") \

     {\
         .driver   = "virtio-blk-pci",\
         .property = "class",\
     {\
         .driver   = "virtio-blk-pci",\
         .property = "class",\


@@ -1026,8 +1031,17 @@ void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id)
 
 static void isapc_machine_options(MachineClass *m)
 {
 
 static void isapc_machine_options(MachineClass *m)
 {

+    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);

     m->desc = "ISA-only PC";
     m->max_cpus = 1;
     m->desc = "ISA-only PC";
     m->max_cpus = 1;

+    m->option_rom_has_mr = true;
+    m->rom_file_has_mr = false;
+    pcmc->pci_enabled = false;
+    pcmc->has_acpi_build = false;
+    pcmc->smbios_defaults = false;
+    pcmc->gigabyte_align = false;
+    pcmc->smbios_legacy_mode = true;
+    pcmc->has_reserved_memory = false;

 }
 
 DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa,
 }
 
 DEFINE_PC_MACHINE(isapc, "isapc", pc_init_isa,