#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "sysemu/arch_init.h"
-#include "hw/i2c/smbus.h"
+#include "hw/i2c/smbus_eeprom.h"
#include "hw/xen/xen.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
PC_MACHINE_ACPI_DEVICE_PROP, &error_abort);
}
- if (pcms->acpi_nvdimm_state.is_enabled) {
- nvdimm_init_acpi_state(&pcms->acpi_nvdimm_state, system_io,
+ if (machine->nvdimms_state->is_enabled) {
+ nvdimm_init_acpi_state(machine->nvdimms_state, system_io,
pcms->fw_cfg, OBJECT(pcms));
}
}
* HW_COMPAT_*, PC_COMPAT_*, or * pc_*_machine_options().
*/
-static void pc_compat_2_3(MachineState *machine)
+static void pc_compat_2_3_fn(MachineState *machine)
{
PCMachineState *pcms = PC_MACHINE(machine);
if (kvm_enabled()) {
}
}
-static void pc_compat_2_2(MachineState *machine)
+static void pc_compat_2_2_fn(MachineState *machine)
{
- pc_compat_2_3(machine);
+ pc_compat_2_3_fn(machine);
}
-static void pc_compat_2_1(MachineState *machine)
+static void pc_compat_2_1_fn(MachineState *machine)
{
- pc_compat_2_2(machine);
+ pc_compat_2_2_fn(machine);
x86_cpu_change_kvm_default("svm", NULL);
}
-static void pc_compat_2_0(MachineState *machine)
+static void pc_compat_2_0_fn(MachineState *machine)
{
- pc_compat_2_1(machine);
+ pc_compat_2_1_fn(machine);
}
-static void pc_compat_1_7(MachineState *machine)
+static void pc_compat_1_7_fn(MachineState *machine)
{
- pc_compat_2_0(machine);
+ pc_compat_2_0_fn(machine);
x86_cpu_change_kvm_default("x2apic", NULL);
}
-static void pc_compat_1_6(MachineState *machine)
+static void pc_compat_1_6_fn(MachineState *machine)
{
- pc_compat_1_7(machine);
+ pc_compat_1_7_fn(machine);
}
-static void pc_compat_1_5(MachineState *machine)
+static void pc_compat_1_5_fn(MachineState *machine)
{
- pc_compat_1_6(machine);
+ pc_compat_1_6_fn(machine);
}
-static void pc_compat_1_4(MachineState *machine)
+static void pc_compat_1_4_fn(MachineState *machine)
{
- pc_compat_1_5(machine);
+ pc_compat_1_5_fn(machine);
}
static void pc_compat_1_3(MachineState *machine)
{
- pc_compat_1_4(machine);
+ pc_compat_1_4_fn(machine);
enable_compat_apic_id_mode();
}
static void pc_i440fx_3_1_machine_options(MachineClass *m)
{
+ PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
+
pc_i440fx_4_0_machine_options(m);
m->is_default = 0;
+ m->smbus_no_migration_support = true;
m->alias = NULL;
+ pcmc->pvh_enabled = false;
compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len);
compat_props_add(m->compat_props, pc_compat_3_1, pc_compat_3_1_len);
}
static void pc_i440fx_2_9_machine_options(MachineClass *m)
{
- static GlobalProperty compat[] = {
- PC_COMPAT_2_9
- };
-
pc_i440fx_2_10_machine_options(m);
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, hw_compat_2_9, hw_compat_2_9_len);
+ compat_props_add(m->compat_props, pc_compat_2_9, pc_compat_2_9_len);
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
}
static void pc_i440fx_2_8_machine_options(MachineClass *m)
{
- static GlobalProperty compat[] = {
- PC_COMPAT_2_8
- };
-
pc_i440fx_2_9_machine_options(m);
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, hw_compat_2_8, hw_compat_2_8_len);
+ compat_props_add(m->compat_props, pc_compat_2_8, pc_compat_2_8_len);
}
DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,
static void pc_i440fx_2_7_machine_options(MachineClass *m)
{
- static GlobalProperty compat[] = {
- PC_COMPAT_2_7
- };
-
pc_i440fx_2_8_machine_options(m);
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len);
+ compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len);
}
DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL,
static void pc_i440fx_2_6_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
- static GlobalProperty compat[] = {
- PC_COMPAT_2_6
- };
pc_i440fx_2_7_machine_options(m);
pcmc->legacy_cpu_hotplug = true;
pcmc->linuxboot_dma_enabled = false;
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len);
+ compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len);
}
DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL,
static void pc_i440fx_2_5_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
- static GlobalProperty compat[] = {
- PC_COMPAT_2_5
- };
pc_i440fx_2_6_machine_options(m);
pcmc->save_tsc_khz = false;
m->legacy_fw_cfg_order = 1;
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, hw_compat_2_5, hw_compat_2_5_len);
+ compat_props_add(m->compat_props, pc_compat_2_5, pc_compat_2_5_len);
}
DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,
static void pc_i440fx_2_4_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
- static GlobalProperty compat[] = {
- PC_COMPAT_2_4
- };
pc_i440fx_2_5_machine_options(m);
m->hw_version = "2.4.0";
pcmc->broken_reserved_end = true;
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, hw_compat_2_4, hw_compat_2_4_len);
+ compat_props_add(m->compat_props, pc_compat_2_4, pc_compat_2_4_len);
}
DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL,
static void pc_i440fx_2_3_machine_options(MachineClass *m)
{
- static GlobalProperty compat[] = {
- PC_COMPAT_2_3
- };
-
pc_i440fx_2_4_machine_options(m);
m->hw_version = "2.3.0";
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, hw_compat_2_3, hw_compat_2_3_len);
+ compat_props_add(m->compat_props, pc_compat_2_3, pc_compat_2_3_len);
}
-DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3,
+DEFINE_I440FX_MACHINE(v2_3, "pc-i440fx-2.3", pc_compat_2_3_fn,
pc_i440fx_2_3_machine_options);
static void pc_i440fx_2_2_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
- static GlobalProperty compat[] = {
- PC_COMPAT_2_2
- };
pc_i440fx_2_3_machine_options(m);
m->hw_version = "2.2.0";
m->default_machine_opts = "firmware=bios-256k.bin,suppress-vmdesc=on";
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, hw_compat_2_2, hw_compat_2_2_len);
+ compat_props_add(m->compat_props, pc_compat_2_2, pc_compat_2_2_len);
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_fn,
pc_i440fx_2_2_machine_options);
static void pc_i440fx_2_1_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
- static GlobalProperty compat[] = {
- PC_COMPAT_2_1
- };
pc_i440fx_2_2_machine_options(m);
m->hw_version = "2.1.0";
m->default_display = NULL;
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, hw_compat_2_1, hw_compat_2_1_len);
+ compat_props_add(m->compat_props, pc_compat_2_1, pc_compat_2_1_len);
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_fn,
pc_i440fx_2_1_machine_options);
static void pc_i440fx_2_0_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
- static GlobalProperty compat[] = {
- PC_COMPAT_2_0
- };
pc_i440fx_2_1_machine_options(m);
m->hw_version = "2.0.0";
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, pc_compat_2_0, pc_compat_2_0_len);
pcmc->smbios_legacy_mode = true;
pcmc->has_reserved_memory = false;
/* This value depends on the actual DSDT and SSDT compiled into
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_fn,
pc_i440fx_2_0_machine_options);
static void pc_i440fx_1_7_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
- static GlobalProperty compat[] = {
- PC_COMPAT_1_7
- };
pc_i440fx_2_0_machine_options(m);
m->hw_version = "1.7.0";
m->default_machine_opts = NULL;
m->option_rom_has_mr = true;
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, pc_compat_1_7, pc_compat_1_7_len);
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_fn,
pc_i440fx_1_7_machine_options);
static void pc_i440fx_1_6_machine_options(MachineClass *m)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
- static GlobalProperty compat[] = {
- PC_COMPAT_1_6
- };
pc_i440fx_1_7_machine_options(m);
m->hw_version = "1.6.0";
m->rom_file_has_mr = false;
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, pc_compat_1_6, pc_compat_1_6_len);
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_fn,
pc_i440fx_1_6_machine_options);
static void pc_i440fx_1_5_machine_options(MachineClass *m)
{
- static GlobalProperty compat[] = {
- PC_COMPAT_1_5
- };
-
pc_i440fx_1_6_machine_options(m);
m->hw_version = "1.5.0";
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, pc_compat_1_5, pc_compat_1_5_len);
}
-DEFINE_I440FX_MACHINE(v1_5, "pc-i440fx-1.5", pc_compat_1_5,
+DEFINE_I440FX_MACHINE(v1_5, "pc-i440fx-1.5", pc_compat_1_5_fn,
pc_i440fx_1_5_machine_options);
static void pc_i440fx_1_4_machine_options(MachineClass *m)
{
- static GlobalProperty compat[] = {
- PC_COMPAT_1_4
- };
-
pc_i440fx_1_5_machine_options(m);
m->hw_version = "1.4.0";
m->hot_add_cpu = NULL;
- compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
+ compat_props_add(m->compat_props, pc_compat_1_4, pc_compat_1_4_len);
}
-DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_1_4,
+DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_1_4_fn,
pc_i440fx_1_4_machine_options);
static void pc_i440fx_1_3_machine_options(MachineClass *m)
{
static GlobalProperty compat[] = {
PC_CPU_MODEL_IDS("1.3.0")
- {
- .driver = "usb-tablet",
- .property = "usb_version",
- .value = stringify(1),
- },{
- .driver = "virtio-net-pci",
- .property = "ctrl_mac_addr",
- .value = "off",
- },{
- .driver = "virtio-net-pci",
- .property = "mq",
- .value = "off",
- }, {
- .driver = "e1000",
- .property = "autonegotiation",
- .value = "off",
- },
+ { "usb-tablet", "usb_version", "1" },
+ { "virtio-net-pci", "ctrl_mac_addr", "off" },
+ { "virtio-net-pci", "mq", "off" },
+ { "e1000", "autonegotiation", "off" },
};
pc_i440fx_1_4_machine_options(m);
{
static GlobalProperty compat[] = {
PC_CPU_MODEL_IDS("1.2.0")
- {
- .driver = "nec-usb-xhci",
- .property = "msi",
- .value = "off",
- },{
- .driver = "nec-usb-xhci",
- .property = "msix",
- .value = "off",
- },{
- .driver = "ivshmem",
- .property = "use64",
- .value = "0",
- },{
- .driver = "qxl",
- .property = "revision",
- .value = stringify(3),
- },{
- .driver = "qxl-vga",
- .property = "revision",
- .value = stringify(3),
- },{
- .driver = "VGA",
- .property = "mmio",
- .value = "off",
- },
+ { "nec-usb-xhci", "msi", "off" },
+ { "nec-usb-xhci", "msix", "off" },
+ { "qxl", "revision", "3" },
+ { "qxl-vga", "revision", "3" },
+ { "VGA", "mmio", "off" },
};
pc_i440fx_1_3_machine_options(m);
{
static GlobalProperty compat[] = {
PC_CPU_MODEL_IDS("1.1.0")
- {
- .driver = "virtio-scsi-pci",
- .property = "hotplug",
- .value = "off",
- },{
- .driver = "virtio-scsi-pci",
- .property = "param_change",
- .value = "off",
- },{
- .driver = "VGA",
- .property = "vgamem_mb",
- .value = stringify(8),
- },{
- .driver = "vmware-svga",
- .property = "vgamem_mb",
- .value = stringify(8),
- },{
- .driver = "qxl-vga",
- .property = "vgamem_mb",
- .value = stringify(8),
- },{
- .driver = "qxl",
- .property = "vgamem_mb",
- .value = stringify(8),
- },{
- .driver = "virtio-blk-pci",
- .property = "config-wce",
- .value = "off",
- },
+ { "virtio-scsi-pci", "hotplug", "off" },
+ { "virtio-scsi-pci", "param_change", "off" },
+ { "VGA", "vgamem_mb", "8" },
+ { "vmware-svga", "vgamem_mb", "8" },
+ { "qxl-vga", "vgamem_mb", "8" },
+ { "qxl", "vgamem_mb", "8" },
+ { "virtio-blk-pci", "config-wce", "off" },
};
pc_i440fx_1_2_machine_options(m);
{
static GlobalProperty compat[] = {
PC_CPU_MODEL_IDS("1.0")
- {
- .driver = TYPE_ISA_FDC,
- .property = "check_media_rate",
- .value = "off",
- },{
- .driver = "virtio-balloon-pci",
- .property = "class",
- .value = stringify(PCI_CLASS_MEMORY_RAM),
- },{
- .driver = "apic-common",
- .property = "vapic",
- .value = "off",
- },{
- .driver = TYPE_USB_DEVICE,
- .property = "full-path",
- .value = "no",
- },
+ { TYPE_ISA_FDC, "check_media_rate", "off" },
+ { "virtio-balloon-pci", "class", stringify(PCI_CLASS_MEMORY_RAM) },
+ { "apic-common", "vapic", "off" },
+ { TYPE_USB_DEVICE, "full-path", "no" },
};
pc_i440fx_1_1_machine_options(m);
{
static GlobalProperty compat[] = {
PC_CPU_MODEL_IDS("0.14")
- {
- .driver = "virtio-blk-pci",
- .property = "event_idx",
- .value = "off",
- },{
- .driver = "virtio-serial-pci",
- .property = "event_idx",
- .value = "off",
- },{
- .driver = "virtio-net-pci",
- .property = "event_idx",
- .value = "off",
- },{
- .driver = "virtio-balloon-pci",
- .property = "event_idx",
- .value = "off",
- },{
- .driver = "qxl",
- .property = "revision",
- .value = stringify(2),
- },{
- .driver = "qxl-vga",
- .property = "revision",
- .value = stringify(2),
- },
+ { "virtio-blk-pci", "event_idx", "off" },
+ { "virtio-serial-pci", "event_idx", "off" },
+ { "virtio-net-pci", "event_idx", "off" },
+ { "virtio-balloon-pci", "event_idx", "off" },
+ { "qxl", "revision", "2" },
+ { "qxl-vga", "revision", "2" },
};
pc_i440fx_0_15_machine_options(m);
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
static GlobalProperty compat[] = {
PC_CPU_MODEL_IDS("0.13")
- {
- .driver = TYPE_PCI_DEVICE,
- .property = "command_serr_enable",
- .value = "off",
- },{
- .driver = "AC97",
- .property = "use_broken_id",
- .value = stringify(1),
- },{
- .driver = "virtio-9p-pci",
- .property = "vectors",
- .value = stringify(0),
- },{
- .driver = "VGA",
- .property = "rombar",
- .value = stringify(0),
- },{
- .driver = "vmware-svga",
- .property = "rombar",
- .value = stringify(0),
- },
+ { TYPE_PCI_DEVICE, "command_serr_enable", "off" },
+ { "AC97", "use_broken_id", "1" },
+ { "virtio-9p-pci", "vectors", "0" },
+ { "VGA", "rombar", "0" },
+ { "vmware-svga", "rombar", "0" },
};
pc_i440fx_0_14_machine_options(m);
{
static GlobalProperty compat[] = {
PC_CPU_MODEL_IDS("0.12")
- {
- .driver = "virtio-serial-pci",
- .property = "max_ports",
- .value = stringify(1),
- },{
- .driver = "virtio-serial-pci",
- .property = "vectors",
- .value = stringify(0),
- },{
- .driver = "usb-mouse",
- .property = "serial",
- .value = "1",
- },{
- .driver = "usb-tablet",
- .property = "serial",
- .value = "1",
- },{
- .driver = "usb-kbd",
- .property = "serial",
- .value = "1",
- },
+ { "virtio-serial-pci", "max_ports", "1" },
+ { "virtio-serial-pci", "vectors", "0" },
+ { "usb-mouse", "serial", "1" },
+ { "usb-tablet", "serial", "1" },
+ { "usb-kbd", "serial", "1" },
};
pc_i440fx_0_13_machine_options(m);
projects / mirror_qemu.git / blobdiff