haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

machines: replace COMPAT define with a static array

Browse source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-12-12 16:30:28 +04:00
parent ea9ce8934c
commit fa386d989d
6 changed files with 567 additions and 428 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
hw/arm/virt.c
View file

@ -1872,84 +1872,91 @@ static void virt_machine_4_0_options(MachineClass *mc)
} }
DEFINE_VIRT_MACHINE_AS_LATEST(4, 0) DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)
#define VIRT_COMPAT_3_1 \ static GlobalProperty virt_compat_3_1[] = {
HW_COMPAT_3_1 HW_COMPAT_3_1
};
static void virt_machine_3_1_options(MachineClass *mc) static void virt_machine_3_1_options(MachineClass *mc)
{ {
virt_machine_4_0_options(mc); virt_machine_4_0_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_3_1); SET_MACHINE_COMPAT(mc, virt_compat_3_1);
} }
DEFINE_VIRT_MACHINE(3, 1) DEFINE_VIRT_MACHINE(3, 1)
#define VIRT_COMPAT_3_0 \ static GlobalProperty virt_compat_3_0[] = {
HW_COMPAT_3_0 HW_COMPAT_3_0
};
static void virt_machine_3_0_options(MachineClass *mc) static void virt_machine_3_0_options(MachineClass *mc)
{ {
virt_machine_3_1_options(mc); virt_machine_3_1_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_3_0); SET_MACHINE_COMPAT(mc, virt_compat_3_0);
} }
DEFINE_VIRT_MACHINE(3, 0) DEFINE_VIRT_MACHINE(3, 0)
#define VIRT_COMPAT_2_12 \ static GlobalProperty virt_compat_2_12[] = {
HW_COMPAT_2_12 HW_COMPAT_2_12
};
static void virt_machine_2_12_options(MachineClass *mc) static void virt_machine_2_12_options(MachineClass *mc)
{ {
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
virt_machine_3_0_options(mc); virt_machine_3_0_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_12); SET_MACHINE_COMPAT(mc, virt_compat_2_12);
vmc->no_highmem_ecam = true; vmc->no_highmem_ecam = true;
mc->max_cpus = 255; mc->max_cpus = 255;
} }
DEFINE_VIRT_MACHINE(2, 12) DEFINE_VIRT_MACHINE(2, 12)
#define VIRT_COMPAT_2_11 \ static GlobalProperty virt_compat_2_11[] = {
HW_COMPAT_2_11 HW_COMPAT_2_11
};
static void virt_machine_2_11_options(MachineClass *mc) static void virt_machine_2_11_options(MachineClass *mc)
{ {
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
virt_machine_2_12_options(mc); virt_machine_2_12_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_11); SET_MACHINE_COMPAT(mc, virt_compat_2_11);
vmc->smbios_old_sys_ver = true; vmc->smbios_old_sys_ver = true;
} }
DEFINE_VIRT_MACHINE(2, 11) DEFINE_VIRT_MACHINE(2, 11)
#define VIRT_COMPAT_2_10 \ static GlobalProperty virt_compat_2_10[] = {
HW_COMPAT_2_10 HW_COMPAT_2_10
};
static void virt_machine_2_10_options(MachineClass *mc) static void virt_machine_2_10_options(MachineClass *mc)
{ {
virt_machine_2_11_options(mc); virt_machine_2_11_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_10); SET_MACHINE_COMPAT(mc, virt_compat_2_10);
/* before 2.11 we never faulted accesses to bad addresses */ /* before 2.11 we never faulted accesses to bad addresses */
mc->ignore_memory_transaction_failures = true; mc->ignore_memory_transaction_failures = true;
} }
DEFINE_VIRT_MACHINE(2, 10) DEFINE_VIRT_MACHINE(2, 10)
#define VIRT_COMPAT_2_9 \ static GlobalProperty virt_compat_2_9[] = {
HW_COMPAT_2_9 HW_COMPAT_2_9
};
static void virt_machine_2_9_options(MachineClass *mc) static void virt_machine_2_9_options(MachineClass *mc)
{ {
virt_machine_2_10_options(mc); virt_machine_2_10_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_9); SET_MACHINE_COMPAT(mc, virt_compat_2_9);
} }
DEFINE_VIRT_MACHINE(2, 9) DEFINE_VIRT_MACHINE(2, 9)
#define VIRT_COMPAT_2_8 \ static GlobalProperty virt_compat_2_8[] = {
HW_COMPAT_2_8 HW_COMPAT_2_8
};
static void virt_machine_2_8_options(MachineClass *mc) static void virt_machine_2_8_options(MachineClass *mc)
{ {
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
virt_machine_2_9_options(mc); virt_machine_2_9_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_8); SET_MACHINE_COMPAT(mc, virt_compat_2_8);
/* For 2.8 and earlier we falsely claimed in the DT that /* For 2.8 and earlier we falsely claimed in the DT that
* our timers were edge-triggered, not level-triggered. * our timers were edge-triggered, not level-triggered.
*/ */
@ -1957,15 +1964,16 @@ static void virt_machine_2_8_options(MachineClass *mc)
} }
DEFINE_VIRT_MACHINE(2, 8) DEFINE_VIRT_MACHINE(2, 8)
#define VIRT_COMPAT_2_7 \ static GlobalProperty virt_compat_2_7[] = {
HW_COMPAT_2_7 HW_COMPAT_2_7
};
static void virt_machine_2_7_options(MachineClass *mc) static void virt_machine_2_7_options(MachineClass *mc)
{ {
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
virt_machine_2_8_options(mc); virt_machine_2_8_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_7); SET_MACHINE_COMPAT(mc, virt_compat_2_7);
/* ITS was introduced with 2.8 */ /* ITS was introduced with 2.8 */
vmc->no_its = true; vmc->no_its = true;
/* Stick with 1K pages for migration compatibility */ /* Stick with 1K pages for migration compatibility */
@ -1973,15 +1981,16 @@ static void virt_machine_2_7_options(MachineClass *mc)
} }
DEFINE_VIRT_MACHINE(2, 7) DEFINE_VIRT_MACHINE(2, 7)
#define VIRT_COMPAT_2_6 \ static GlobalProperty virt_compat_2_6[] = {
HW_COMPAT_2_6 HW_COMPAT_2_6
};
static void virt_machine_2_6_options(MachineClass *mc) static void virt_machine_2_6_options(MachineClass *mc)
{ {
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
virt_machine_2_7_options(mc); virt_machine_2_7_options(mc);
SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_6); SET_MACHINE_COMPAT(mc, virt_compat_2_6);
vmc->disallow_affinity_adjustment = true; vmc->disallow_affinity_adjustment = true;
/* Disable PMU for 2.6 as PMU support was first introduced in 2.7 */ /* Disable PMU for 2.6 as PMU support was first introduced in 2.7 */
vmc->no_pmu = true; vmc->no_pmu = true;

474
hw/i386/pc_piix.c
View file

@ -438,83 +438,117 @@ static void pc_i440fx_4_0_machine_options(MachineClass *m)
DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL, DEFINE_I440FX_MACHINE(v4_0, "pc-i440fx-4.0", NULL,
pc_i440fx_4_0_machine_options); pc_i440fx_4_0_machine_options);
static GlobalProperty pc_compat_3_1[] = {
PC_COMPAT_3_1
};
static void pc_i440fx_3_1_machine_options(MachineClass *m) static void pc_i440fx_3_1_machine_options(MachineClass *m)
{ {
pc_i440fx_4_0_machine_options(m); pc_i440fx_4_0_machine_options(m);
m->is_default = 0; m->is_default = 0;
m->alias = NULL; m->alias = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_3_1); SET_MACHINE_COMPAT(m, pc_compat_3_1);
} }
DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL, DEFINE_I440FX_MACHINE(v3_1, "pc-i440fx-3.1", NULL,
pc_i440fx_3_1_machine_options); pc_i440fx_3_1_machine_options);
static GlobalProperty pc_compat_3_0[] = {
PC_COMPAT_3_0
};
static void pc_i440fx_3_0_machine_options(MachineClass *m) static void pc_i440fx_3_0_machine_options(MachineClass *m)
{ {
pc_i440fx_3_1_machine_options(m); pc_i440fx_3_1_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_3_0); SET_MACHINE_COMPAT(m, pc_compat_3_0);
} }
DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL, DEFINE_I440FX_MACHINE(v3_0, "pc-i440fx-3.0", NULL,
pc_i440fx_3_0_machine_options); pc_i440fx_3_0_machine_options);
static GlobalProperty pc_compat_2_12[] = {
PC_COMPAT_2_12
};
static void pc_i440fx_2_12_machine_options(MachineClass *m) static void pc_i440fx_2_12_machine_options(MachineClass *m)
{ {
pc_i440fx_3_0_machine_options(m); pc_i440fx_3_0_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_2_12); SET_MACHINE_COMPAT(m, pc_compat_2_12);
} }
DEFINE_I440FX_MACHINE(v2_12, "pc-i440fx-2.12", NULL, DEFINE_I440FX_MACHINE(v2_12, "pc-i440fx-2.12", NULL,
pc_i440fx_2_12_machine_options); pc_i440fx_2_12_machine_options);
static GlobalProperty pc_compat_2_11[] = {
PC_COMPAT_2_11
};
static void pc_i440fx_2_11_machine_options(MachineClass *m) static void pc_i440fx_2_11_machine_options(MachineClass *m)
{ {
pc_i440fx_2_12_machine_options(m); pc_i440fx_2_12_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_2_11); SET_MACHINE_COMPAT(m, pc_compat_2_11);
} }
DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL, DEFINE_I440FX_MACHINE(v2_11, "pc-i440fx-2.11", NULL,
pc_i440fx_2_11_machine_options); pc_i440fx_2_11_machine_options);
static GlobalProperty pc_compat_2_10[] = {
PC_COMPAT_2_10
};
static void pc_i440fx_2_10_machine_options(MachineClass *m) static void pc_i440fx_2_10_machine_options(MachineClass *m)
{ {
pc_i440fx_2_11_machine_options(m); pc_i440fx_2_11_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_2_10); SET_MACHINE_COMPAT(m, pc_compat_2_10);
m->auto_enable_numa_with_memhp = false; m->auto_enable_numa_with_memhp = false;
} }
DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL, DEFINE_I440FX_MACHINE(v2_10, "pc-i440fx-2.10", NULL,
pc_i440fx_2_10_machine_options); pc_i440fx_2_10_machine_options);
static GlobalProperty pc_compat_2_9[] = {
PC_COMPAT_2_9
};
static void pc_i440fx_2_9_machine_options(MachineClass *m) static void pc_i440fx_2_9_machine_options(MachineClass *m)
{ {
pc_i440fx_2_10_machine_options(m); pc_i440fx_2_10_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_2_9); SET_MACHINE_COMPAT(m, pc_compat_2_9);
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
} }
DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL, DEFINE_I440FX_MACHINE(v2_9, "pc-i440fx-2.9", NULL,
pc_i440fx_2_9_machine_options); pc_i440fx_2_9_machine_options);
static GlobalProperty pc_compat_2_8[] = {
PC_COMPAT_2_8
};
static void pc_i440fx_2_8_machine_options(MachineClass *m) static void pc_i440fx_2_8_machine_options(MachineClass *m)
{ {
pc_i440fx_2_9_machine_options(m); pc_i440fx_2_9_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_2_8); SET_MACHINE_COMPAT(m, pc_compat_2_8);
} }
DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL, DEFINE_I440FX_MACHINE(v2_8, "pc-i440fx-2.8", NULL,
pc_i440fx_2_8_machine_options); pc_i440fx_2_8_machine_options);
static GlobalProperty pc_compat_2_7[] = {
PC_COMPAT_2_7
};
static void pc_i440fx_2_7_machine_options(MachineClass *m) static void pc_i440fx_2_7_machine_options(MachineClass *m)
{ {
pc_i440fx_2_8_machine_options(m); pc_i440fx_2_8_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_2_7); SET_MACHINE_COMPAT(m, pc_compat_2_7);
} }
DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL, DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL,
pc_i440fx_2_7_machine_options); pc_i440fx_2_7_machine_options);
static GlobalProperty pc_compat_2_6[] = {
PC_COMPAT_2_6
};
static void pc_i440fx_2_6_machine_options(MachineClass *m) static void pc_i440fx_2_6_machine_options(MachineClass *m)
{ {
@ -522,12 +556,15 @@ static void pc_i440fx_2_6_machine_options(MachineClass *m)
pc_i440fx_2_7_machine_options(m); pc_i440fx_2_7_machine_options(m);
pcmc->legacy_cpu_hotplug = true; pcmc->legacy_cpu_hotplug = true;
pcmc->linuxboot_dma_enabled = false; pcmc->linuxboot_dma_enabled = false;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_6); SET_MACHINE_COMPAT(m, pc_compat_2_6);
} }
DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL, DEFINE_I440FX_MACHINE(v2_6, "pc-i440fx-2.6", NULL,
pc_i440fx_2_6_machine_options); pc_i440fx_2_6_machine_options);
static GlobalProperty pc_compat_2_5[] = {
PC_COMPAT_2_5
};
static void pc_i440fx_2_5_machine_options(MachineClass *m) static void pc_i440fx_2_5_machine_options(MachineClass *m)
{ {
@ -535,12 +572,15 @@ static void pc_i440fx_2_5_machine_options(MachineClass *m)
pc_i440fx_2_6_machine_options(m); pc_i440fx_2_6_machine_options(m);
pcmc->save_tsc_khz = false; pcmc->save_tsc_khz = false;
m->legacy_fw_cfg_order = 1; m->legacy_fw_cfg_order = 1;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); SET_MACHINE_COMPAT(m, pc_compat_2_5);
} }
DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL, DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL,
pc_i440fx_2_5_machine_options); pc_i440fx_2_5_machine_options);
static GlobalProperty pc_compat_2_4[] = {
PC_COMPAT_2_4
};
static void pc_i440fx_2_4_machine_options(MachineClass *m) static void pc_i440fx_2_4_machine_options(MachineClass *m)
{ {
@ -548,23 +588,29 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m)
pc_i440fx_2_5_machine_options(m); pc_i440fx_2_5_machine_options(m);
m->hw_version = "2.4.0"; m->hw_version = "2.4.0";
pcmc->broken_reserved_end = true; pcmc->broken_reserved_end = true;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); SET_MACHINE_COMPAT(m, pc_compat_2_4);
} }
DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL, DEFINE_I440FX_MACHINE(v2_4, "pc-i440fx-2.4", NULL,
pc_i440fx_2_4_machine_options) pc_i440fx_2_4_machine_options)
static GlobalProperty pc_compatp_2_3[] = {
PC_COMPAT_2_3
};
static void pc_i440fx_2_3_machine_options(MachineClass *m) static void pc_i440fx_2_3_machine_options(MachineClass *m)
{ {
pc_i440fx_2_4_machine_options(m); pc_i440fx_2_4_machine_options(m);
m->hw_version = "2.3.0"; m->hw_version = "2.3.0";
SET_MACHINE_COMPAT(m, PC_COMPAT_2_3); SET_MACHINE_COMPAT(m, pc_compatp_2_3);
} }
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,
pc_i440fx_2_3_machine_options); pc_i440fx_2_3_machine_options);
static GlobalProperty pc_compatp_2_2[] = {
PC_COMPAT_2_2
};
static void pc_i440fx_2_2_machine_options(MachineClass *m) static void pc_i440fx_2_2_machine_options(MachineClass *m)
{ {
@ -572,13 +618,16 @@ static void pc_i440fx_2_2_machine_options(MachineClass *m)
pc_i440fx_2_3_machine_options(m); pc_i440fx_2_3_machine_options(m);
m->hw_version = "2.2.0"; m->hw_version = "2.2.0";
m->default_machine_opts = "firmware=bios-256k.bin,suppress-vmdesc=on"; m->default_machine_opts = "firmware=bios-256k.bin,suppress-vmdesc=on";
SET_MACHINE_COMPAT(m, PC_COMPAT_2_2); SET_MACHINE_COMPAT(m, pc_compatp_2_2);
pcmc->rsdp_in_ram = false; 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,
pc_i440fx_2_2_machine_options); pc_i440fx_2_2_machine_options);
static GlobalProperty pc_compatp_2_1[] = {
PC_COMPAT_2_1
};
static void pc_i440fx_2_1_machine_options(MachineClass *m) static void pc_i440fx_2_1_machine_options(MachineClass *m)
{ {
@ -586,7 +635,7 @@ static void pc_i440fx_2_1_machine_options(MachineClass *m)
pc_i440fx_2_2_machine_options(m); pc_i440fx_2_2_machine_options(m);
m->hw_version = "2.1.0"; m->hw_version = "2.1.0";
m->default_display = NULL; m->default_display = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_1); SET_MACHINE_COMPAT(m, pc_compatp_2_1);
pcmc->smbios_uuid_encoded = false; pcmc->smbios_uuid_encoded = false;
pcmc->enforce_aligned_dimm = false; pcmc->enforce_aligned_dimm = false;
} }
@ -594,14 +643,16 @@ static void pc_i440fx_2_1_machine_options(MachineClass *m)
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,
pc_i440fx_2_1_machine_options); pc_i440fx_2_1_machine_options);
static GlobalProperty pc_compatp_2_0[] = {
PC_COMPAT_2_0
};
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); 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"; m->hw_version = "2.0.0";
SET_MACHINE_COMPAT(m, PC_COMPAT_2_0); SET_MACHINE_COMPAT(m, pc_compatp_2_0);
pcmc->smbios_legacy_mode = true; pcmc->smbios_legacy_mode = true;
pcmc->has_reserved_memory = false; pcmc->has_reserved_memory = false;
/* This value depends on the actual DSDT and SSDT compiled into /* This value depends on the actual DSDT and SSDT compiled into
@ -627,6 +678,9 @@ static void pc_i440fx_2_0_machine_options(MachineClass *m)
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,
pc_i440fx_2_0_machine_options); pc_i440fx_2_0_machine_options);
static GlobalProperty pc_compatp_1_7[] = {
PC_COMPAT_1_7
};
static void pc_i440fx_1_7_machine_options(MachineClass *m) static void pc_i440fx_1_7_machine_options(MachineClass *m)
{ {
@ -635,7 +689,7 @@ static void pc_i440fx_1_7_machine_options(MachineClass *m)
m->hw_version = "1.7.0"; m->hw_version = "1.7.0";
m->default_machine_opts = NULL; m->default_machine_opts = NULL;
m->option_rom_has_mr = true; m->option_rom_has_mr = true;
SET_MACHINE_COMPAT(m, PC_COMPAT_1_7); SET_MACHINE_COMPAT(m, pc_compatp_1_7);
pcmc->smbios_defaults = false; pcmc->smbios_defaults = false;
pcmc->gigabyte_align = false; pcmc->gigabyte_align = false;
pcmc->legacy_acpi_table_size = 6414; pcmc->legacy_acpi_table_size = 6414;
@ -644,6 +698,9 @@ static void pc_i440fx_1_7_machine_options(MachineClass *m)
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,
pc_i440fx_1_7_machine_options); pc_i440fx_1_7_machine_options);
static GlobalProperty pc_compatp_1_6[] = {
PC_COMPAT_1_6
};
static void pc_i440fx_1_6_machine_options(MachineClass *m) static void pc_i440fx_1_6_machine_options(MachineClass *m)
{ {
@ -651,302 +708,311 @@ static void pc_i440fx_1_6_machine_options(MachineClass *m)
pc_i440fx_1_7_machine_options(m); pc_i440fx_1_7_machine_options(m);
m->hw_version = "1.6.0"; m->hw_version = "1.6.0";
m->rom_file_has_mr = false; m->rom_file_has_mr = false;
SET_MACHINE_COMPAT(m, PC_COMPAT_1_6); SET_MACHINE_COMPAT(m, pc_compatp_1_6);
pcmc->has_acpi_build = false; 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,
pc_i440fx_1_6_machine_options); pc_i440fx_1_6_machine_options);
static GlobalProperty pc_compatp_1_5[] = {
PC_COMPAT_1_5
};
static void pc_i440fx_1_5_machine_options(MachineClass *m) static void pc_i440fx_1_5_machine_options(MachineClass *m)
{ {
pc_i440fx_1_6_machine_options(m); pc_i440fx_1_6_machine_options(m);
m->hw_version = "1.5.0"; m->hw_version = "1.5.0";
SET_MACHINE_COMPAT(m, PC_COMPAT_1_5); SET_MACHINE_COMPAT(m, pc_compatp_1_5);
} }
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,
pc_i440fx_1_5_machine_options); pc_i440fx_1_5_machine_options);
static GlobalProperty pc_compatp_1_4[] = {
PC_COMPAT_1_4
};
static void pc_i440fx_1_4_machine_options(MachineClass *m) static void pc_i440fx_1_4_machine_options(MachineClass *m)
{ {
pc_i440fx_1_5_machine_options(m); pc_i440fx_1_5_machine_options(m);
m->hw_version = "1.4.0"; m->hw_version = "1.4.0";
m->hot_add_cpu = NULL; m->hot_add_cpu = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_1_4); SET_MACHINE_COMPAT(m, pc_compatp_1_4);
} }
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,
pc_i440fx_1_4_machine_options); pc_i440fx_1_4_machine_options);
static GlobalProperty pc_compatp_1_3[] = {
#define PC_COMPAT_1_3 \ PC_CPU_MODEL_IDS("1.3.0")
PC_CPU_MODEL_IDS("1.3.0") \ {
{\ .driver = "usb-tablet",
.driver = "usb-tablet",\ .property = "usb_version",
.property = "usb_version",\ .value = stringify(1),
.value = stringify(1),\ },{
},{\ .driver = "virtio-net-pci",
.driver = "virtio-net-pci",\ .property = "ctrl_mac_addr",
.property = "ctrl_mac_addr",\ .value = "off",
.value = "off", \ },{
},{ \ .driver = "virtio-net-pci",
.driver = "virtio-net-pci", \ .property = "mq",
.property = "mq", \ .value = "off",
.value = "off", \ }, {
}, {\ .driver = "e1000",
.driver = "e1000",\ .property = "autonegotiation",
.property = "autonegotiation",\ .value = "off",
.value = "off",\ },
}, };
static void pc_i440fx_1_3_machine_options(MachineClass *m) static void pc_i440fx_1_3_machine_options(MachineClass *m)
{ {
pc_i440fx_1_4_machine_options(m); pc_i440fx_1_4_machine_options(m);
m->hw_version = "1.3.0"; m->hw_version = "1.3.0";
SET_MACHINE_COMPAT(m, PC_COMPAT_1_3); SET_MACHINE_COMPAT(m, pc_compatp_1_3);
} }
DEFINE_I440FX_MACHINE(v1_3, "pc-1.3", pc_compat_1_3, DEFINE_I440FX_MACHINE(v1_3, "pc-1.3", pc_compat_1_3,
pc_i440fx_1_3_machine_options); pc_i440fx_1_3_machine_options);
#define PC_COMPAT_1_2 \ static GlobalProperty pc_compatp_1_2[] = {
PC_CPU_MODEL_IDS("1.2.0") \ PC_CPU_MODEL_IDS("1.2.0")
{\ {
.driver = "nec-usb-xhci",\ .driver = "nec-usb-xhci",
.property = "msi",\ .property = "msi",
.value = "off",\ .value = "off",
},{\ },{
.driver = "nec-usb-xhci",\ .driver = "nec-usb-xhci",
.property = "msix",\ .property = "msix",
.value = "off",\ .value = "off",
},{\ },{
.driver = "ivshmem",\ .driver = "ivshmem",
.property = "use64",\ .property = "use64",
.value = "0",\ .value = "0",
},{\ },{
.driver = "qxl",\ .driver = "qxl",
.property = "revision",\ .property = "revision",
.value = stringify(3),\ .value = stringify(3),
},{\ },{
.driver = "qxl-vga",\ .driver = "qxl-vga",
.property = "revision",\ .property = "revision",
.value = stringify(3),\ .value = stringify(3),
},{\ },{
.driver = "VGA",\ .driver = "VGA",
.property = "mmio",\ .property = "mmio",
.value = "off",\ .value = "off",
}, },
};
static void pc_i440fx_1_2_machine_options(MachineClass *m) static void pc_i440fx_1_2_machine_options(MachineClass *m)
{ {
pc_i440fx_1_3_machine_options(m); pc_i440fx_1_3_machine_options(m);
m->hw_version = "1.2.0"; m->hw_version = "1.2.0";
SET_MACHINE_COMPAT(m, PC_COMPAT_1_2); SET_MACHINE_COMPAT(m, pc_compatp_1_2);
} }
DEFINE_I440FX_MACHINE(v1_2, "pc-1.2", pc_compat_1_2, DEFINE_I440FX_MACHINE(v1_2, "pc-1.2", pc_compat_1_2,
pc_i440fx_1_2_machine_options); pc_i440fx_1_2_machine_options);
#define PC_COMPAT_1_1 \ static GlobalProperty pc_compatp_1_1[] = {
PC_CPU_MODEL_IDS("1.1.0") \ PC_CPU_MODEL_IDS("1.1.0")
{\ {
.driver = "virtio-scsi-pci",\ .driver = "virtio-scsi-pci",
.property = "hotplug",\ .property = "hotplug",
.value = "off",\ .value = "off",
},{\ },{
.driver = "virtio-scsi-pci",\ .driver = "virtio-scsi-pci",
.property = "param_change",\ .property = "param_change",
.value = "off",\ .value = "off",
},{\ },{
.driver = "VGA",\ .driver = "VGA",
.property = "vgamem_mb",\ .property = "vgamem_mb",
.value = stringify(8),\ .value = stringify(8),
},{\ },{
.driver = "vmware-svga",\ .driver = "vmware-svga",
.property = "vgamem_mb",\ .property = "vgamem_mb",
.value = stringify(8),\ .value = stringify(8),
},{\ },{
.driver = "qxl-vga",\ .driver = "qxl-vga",
.property = "vgamem_mb",\ .property = "vgamem_mb",
.value = stringify(8),\ .value = stringify(8),
},{\ },{
.driver = "qxl",\ .driver = "qxl",
.property = "vgamem_mb",\ .property = "vgamem_mb",
.value = stringify(8),\ .value = stringify(8),
},{\ },{
.driver = "virtio-blk-pci",\ .driver = "virtio-blk-pci",
.property = "config-wce",\ .property = "config-wce",
.value = "off",\ .value = "off",
}, },
};
static void pc_i440fx_1_1_machine_options(MachineClass *m) static void pc_i440fx_1_1_machine_options(MachineClass *m)
{ {
pc_i440fx_1_2_machine_options(m); pc_i440fx_1_2_machine_options(m);
m->hw_version = "1.1.0"; m->hw_version = "1.1.0";
SET_MACHINE_COMPAT(m, PC_COMPAT_1_1); SET_MACHINE_COMPAT(m, pc_compatp_1_1);
} }
DEFINE_I440FX_MACHINE(v1_1, "pc-1.1", pc_compat_1_2, DEFINE_I440FX_MACHINE(v1_1, "pc-1.1", pc_compat_1_2,
pc_i440fx_1_1_machine_options); pc_i440fx_1_1_machine_options);
static GlobalProperty pc_compatp_1_0[] = {
#define PC_COMPAT_1_0 \ PC_CPU_MODEL_IDS("1.0")
PC_CPU_MODEL_IDS("1.0") \ {
{\ .driver = TYPE_ISA_FDC,
.driver = TYPE_ISA_FDC,\ .property = "check_media_rate",
.property = "check_media_rate",\ .value = "off",
.value = "off",\ },{
}, {\ .driver = "virtio-balloon-pci",
.driver = "virtio-balloon-pci",\ .property = "class",
.property = "class",\ .value = stringify(PCI_CLASS_MEMORY_RAM),
.value = stringify(PCI_CLASS_MEMORY_RAM),\ },{
},{\ .driver = "apic-common",
.driver = "apic-common",\ .property = "vapic",
.property = "vapic",\ .value = "off",
.value = "off",\ },{
},{\ .driver = TYPE_USB_DEVICE,
.driver = TYPE_USB_DEVICE,\ .property = "full-path",
.property = "full-path",\ .value = "no",
.value = "no",\ },
}, };
static void pc_i440fx_1_0_machine_options(MachineClass *m) static void pc_i440fx_1_0_machine_options(MachineClass *m)
{ {
pc_i440fx_1_1_machine_options(m); pc_i440fx_1_1_machine_options(m);
m->hw_version = "1.0"; m->hw_version = "1.0";
SET_MACHINE_COMPAT(m, PC_COMPAT_1_0); SET_MACHINE_COMPAT(m, pc_compatp_1_0);
} }
DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2, DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2,
pc_i440fx_1_0_machine_options); pc_i440fx_1_0_machine_options);
#define PC_COMPAT_0_15 \ static GlobalProperty pc_compatp_0_15[] = {
PC_CPU_MODEL_IDS("0.15") 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)
{ {
pc_i440fx_1_0_machine_options(m); pc_i440fx_1_0_machine_options(m);
m->hw_version = "0.15"; m->hw_version = "0.15";
m->deprecation_reason = "use a newer machine type instead"; m->deprecation_reason = "use a newer machine type instead";
SET_MACHINE_COMPAT(m, PC_COMPAT_0_15); SET_MACHINE_COMPAT(m, pc_compatp_0_15);
} }
DEFINE_I440FX_MACHINE(v0_15, "pc-0.15", pc_compat_1_2, DEFINE_I440FX_MACHINE(v0_15, "pc-0.15", pc_compat_1_2,
pc_i440fx_0_15_machine_options); pc_i440fx_0_15_machine_options);
#define PC_COMPAT_0_14 \ static GlobalProperty pc_compatp_0_14[] = {
PC_CPU_MODEL_IDS("0.14") \ PC_CPU_MODEL_IDS("0.14")
{\ {
.driver = "virtio-blk-pci",\ .driver = "virtio-blk-pci",
.property = "event_idx",\ .property = "event_idx",
.value = "off",\ .value = "off",
},{\ },{
.driver = "virtio-serial-pci",\ .driver = "virtio-serial-pci",
.property = "event_idx",\ .property = "event_idx",
.value = "off",\ .value = "off",
},{\ },{
.driver = "virtio-net-pci",\ .driver = "virtio-net-pci",
.property = "event_idx",\ .property = "event_idx",
.value = "off",\ .value = "off",
},{\ },{
.driver = "virtio-balloon-pci",\ .driver = "virtio-balloon-pci",
.property = "event_idx",\ .property = "event_idx",
.value = "off",\ .value = "off",
},{\ },{
.driver = "qxl",\ .driver = "qxl",
.property = "revision",\ .property = "revision",
.value = stringify(2),\ .value = stringify(2),
},{\ },{
.driver = "qxl-vga",\ .driver = "qxl-vga",
.property = "revision",\ .property = "revision",
.value = stringify(2),\ .value = stringify(2),
}, },
};
static void pc_i440fx_0_14_machine_options(MachineClass *m) static void pc_i440fx_0_14_machine_options(MachineClass *m)
{ {
pc_i440fx_0_15_machine_options(m); pc_i440fx_0_15_machine_options(m);
m->hw_version = "0.14"; m->hw_version = "0.14";
SET_MACHINE_COMPAT(m, PC_COMPAT_0_14); SET_MACHINE_COMPAT(m, pc_compatp_0_14);
} }
DEFINE_I440FX_MACHINE(v0_14, "pc-0.14", pc_compat_1_2, DEFINE_I440FX_MACHINE(v0_14, "pc-0.14", pc_compat_1_2,
pc_i440fx_0_14_machine_options); pc_i440fx_0_14_machine_options);
static GlobalProperty pc_compatp_0_13[] = {
#define PC_COMPAT_0_13 \ PC_CPU_MODEL_IDS("0.13")
PC_CPU_MODEL_IDS("0.13") \ {
{\ .driver = TYPE_PCI_DEVICE,
.driver = TYPE_PCI_DEVICE,\ .property = "command_serr_enable",
.property = "command_serr_enable",\ .value = "off",
.value = "off",\ },{
},{\ .driver = "AC97",
.driver = "AC97",\ .property = "use_broken_id",
.property = "use_broken_id",\ .value = stringify(1),
.value = stringify(1),\ },{
},{\ .driver = "virtio-9p-pci",
.driver = "virtio-9p-pci",\ .property = "vectors",
.property = "vectors",\ .value = stringify(0),
.value = stringify(0),\ },{
},{\ .driver = "VGA",
.driver = "VGA",\ .property = "rombar",
.property = "rombar",\ .value = stringify(0),
.value = stringify(0),\ },{
},{\ .driver = "vmware-svga",
.driver = "vmware-svga",\ .property = "rombar",
.property = "rombar",\ .value = stringify(0),
.value = stringify(0),\ },
}, };
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); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_i440fx_0_14_machine_options(m); pc_i440fx_0_14_machine_options(m);
m->hw_version = "0.13"; m->hw_version = "0.13";
SET_MACHINE_COMPAT(m, PC_COMPAT_0_13); SET_MACHINE_COMPAT(m, pc_compatp_0_13);
pcmc->kvmclock_enabled = false; 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,
pc_i440fx_0_13_machine_options); pc_i440fx_0_13_machine_options);
static GlobalProperty pc_compat_0_12[] = {
#define PC_COMPAT_0_12 \ PC_CPU_MODEL_IDS("0.12")
PC_CPU_MODEL_IDS("0.12") \ {
{\ .driver = "virtio-serial-pci",
.driver = "virtio-serial-pci",\ .property = "max_ports",
.property = "max_ports",\ .value = stringify(1),
.value = stringify(1),\ },{
},{\ .driver = "virtio-serial-pci",
.driver = "virtio-serial-pci",\ .property = "vectors",
.property = "vectors",\ .value = stringify(0),
.value = stringify(0),\ },{
},{\ .driver = "usb-mouse",
.driver = "usb-mouse",\ .property = "serial",
.property = "serial",\ .value = "1",
.value = "1",\ },{
},{\ .driver = "usb-tablet",
.driver = "usb-tablet",\ .property = "serial",
.property = "serial",\ .value = "1",
.value = "1",\ },{
},{\ .driver = "usb-kbd",
.driver = "usb-kbd",\ .property = "serial",
.property = "serial",\ .value = "1",
.value = "1",\ },
}, };
static void pc_i440fx_0_12_machine_options(MachineClass *m) static void pc_i440fx_0_12_machine_options(MachineClass *m)
{ {
pc_i440fx_0_13_machine_options(m); pc_i440fx_0_13_machine_options(m);
m->hw_version = "0.12"; m->hw_version = "0.12";
SET_MACHINE_COMPAT(m, PC_COMPAT_0_12); SET_MACHINE_COMPAT(m, pc_compat_0_12);
} }
DEFINE_I440FX_MACHINE(v0_12, "pc-0.12", pc_compat_0_13, DEFINE_I440FX_MACHINE(v0_12, "pc-0.12", pc_compat_0_13,

66
hw/i386/pc_q35.c
View file

@ -321,51 +321,71 @@ static void pc_q35_4_0_machine_options(MachineClass *m)
DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL, DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
pc_q35_4_0_machine_options); pc_q35_4_0_machine_options);
static GlobalProperty pc_compat_3_1[] = {
PC_COMPAT_3_1
};
static void pc_q35_3_1_machine_options(MachineClass *m) static void pc_q35_3_1_machine_options(MachineClass *m)
{ {
pc_q35_4_0_machine_options(m); pc_q35_4_0_machine_options(m);
m->default_kernel_irqchip_split = false; m->default_kernel_irqchip_split = false;
m->alias = NULL; m->alias = NULL;
SET_MACHINE_COMPAT(m, PC_COMPAT_3_1); SET_MACHINE_COMPAT(m, pc_compat_3_1);
} }
DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL, DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL,
pc_q35_3_1_machine_options); pc_q35_3_1_machine_options);
static GlobalProperty pc_compat_3_0[] = {
PC_COMPAT_3_0
};
static void pc_q35_3_0_machine_options(MachineClass *m) static void pc_q35_3_0_machine_options(MachineClass *m)
{ {
pc_q35_3_1_machine_options(m); pc_q35_3_1_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_3_0); SET_MACHINE_COMPAT(m, pc_compat_3_0);
} }
DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL, DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,
pc_q35_3_0_machine_options); pc_q35_3_0_machine_options);
static GlobalProperty pc_compat_2_12[] = {
PC_COMPAT_2_12
};
static void pc_q35_2_12_machine_options(MachineClass *m) static void pc_q35_2_12_machine_options(MachineClass *m)
{ {
pc_q35_3_0_machine_options(m); pc_q35_3_0_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_2_12); SET_MACHINE_COMPAT(m, pc_compat_2_12);
} }
DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL, DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL,
pc_q35_2_12_machine_options); pc_q35_2_12_machine_options);
static GlobalProperty pc_compat_2_11[] = {
PC_COMPAT_2_11
};
static void pc_q35_2_11_machine_options(MachineClass *m) static void pc_q35_2_11_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_2_12_machine_options(m); pc_q35_2_12_machine_options(m);
pcmc->default_nic_model = "e1000"; pcmc->default_nic_model = "e1000";
SET_MACHINE_COMPAT(m, PC_COMPAT_2_11); SET_MACHINE_COMPAT(m, pc_compat_2_11);
} }
DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL, DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL,
pc_q35_2_11_machine_options); pc_q35_2_11_machine_options);
static GlobalProperty pc_compat_2_10[] = {
PC_COMPAT_2_10
};
static void pc_q35_2_10_machine_options(MachineClass *m) static void pc_q35_2_10_machine_options(MachineClass *m)
{ {
pc_q35_2_11_machine_options(m); pc_q35_2_11_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_2_10); SET_MACHINE_COMPAT(m, pc_compat_2_10);
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram; m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
m->auto_enable_numa_with_memhp = false; m->auto_enable_numa_with_memhp = false;
} }
@ -373,65 +393,89 @@ static void pc_q35_2_10_machine_options(MachineClass *m)
DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL, DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL,
pc_q35_2_10_machine_options); pc_q35_2_10_machine_options);
static GlobalProperty pc_compat_2_9[] = {
PC_COMPAT_2_9
};
static void pc_q35_2_9_machine_options(MachineClass *m) static void pc_q35_2_9_machine_options(MachineClass *m)
{ {
pc_q35_2_10_machine_options(m); pc_q35_2_10_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_2_9); SET_MACHINE_COMPAT(m, pc_compat_2_9);
} }
DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL, DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
pc_q35_2_9_machine_options); pc_q35_2_9_machine_options);
static GlobalProperty pc_compat_2_8[] = {
PC_COMPAT_2_8
};
static void pc_q35_2_8_machine_options(MachineClass *m) static void pc_q35_2_8_machine_options(MachineClass *m)
{ {
pc_q35_2_9_machine_options(m); pc_q35_2_9_machine_options(m);
SET_MACHINE_COMPAT(m, PC_COMPAT_2_8); SET_MACHINE_COMPAT(m, pc_compat_2_8);
} }
DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL, DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,
pc_q35_2_8_machine_options); pc_q35_2_8_machine_options);
static GlobalProperty pc_compat_2_7[] = {
PC_COMPAT_2_7
};
static void pc_q35_2_7_machine_options(MachineClass *m) static void pc_q35_2_7_machine_options(MachineClass *m)
{ {
pc_q35_2_8_machine_options(m); pc_q35_2_8_machine_options(m);
m->max_cpus = 255; m->max_cpus = 255;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_7); SET_MACHINE_COMPAT(m, pc_compat_2_7);
} }
DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL, DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL,
pc_q35_2_7_machine_options); pc_q35_2_7_machine_options);
static GlobalProperty pc_compat_2_6[] = {
PC_COMPAT_2_6
};
static void pc_q35_2_6_machine_options(MachineClass *m) static void pc_q35_2_6_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_2_7_machine_options(m); pc_q35_2_7_machine_options(m);
pcmc->legacy_cpu_hotplug = true; pcmc->legacy_cpu_hotplug = true;
pcmc->linuxboot_dma_enabled = false; pcmc->linuxboot_dma_enabled = false;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_6); SET_MACHINE_COMPAT(m, pc_compat_2_6);
} }
DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL, DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,
pc_q35_2_6_machine_options); pc_q35_2_6_machine_options);
static GlobalProperty pc_compat_2_5[] = {
PC_COMPAT_2_5
};
static void pc_q35_2_5_machine_options(MachineClass *m) static void pc_q35_2_5_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_2_6_machine_options(m); pc_q35_2_6_machine_options(m);
pcmc->save_tsc_khz = false; pcmc->save_tsc_khz = false;
m->legacy_fw_cfg_order = 1; m->legacy_fw_cfg_order = 1;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); SET_MACHINE_COMPAT(m, pc_compat_2_5);
} }
DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
pc_q35_2_5_machine_options); pc_q35_2_5_machine_options);
static GlobalProperty pc_compat_2_4[] = {
PC_COMPAT_2_4
};
static void pc_q35_2_4_machine_options(MachineClass *m) static void pc_q35_2_4_machine_options(MachineClass *m)
{ {
PCMachineClass *pcmc = PC_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
pc_q35_2_5_machine_options(m); pc_q35_2_5_machine_options(m);
m->hw_version = "2.4.0"; m->hw_version = "2.4.0";
pcmc->broken_reserved_end = true; pcmc->broken_reserved_end = true;
SET_MACHINE_COMPAT(m, PC_COMPAT_2_4); SET_MACHINE_COMPAT(m, pc_compat_2_4);
} }
DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL, DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,

201
hw/ppc/spapr.c
View file

@ -4021,13 +4021,14 @@ DEFINE_SPAPR_MACHINE(4_0, "4.0", true);
/* /*
* pseries-3.1 * pseries-3.1
*/ */
#define SPAPR_COMPAT_3_1 \ static GlobalProperty spapr_compat_3_1[] = {
HW_COMPAT_3_1 HW_COMPAT_3_1
};
static void spapr_machine_3_1_class_options(MachineClass *mc) static void spapr_machine_3_1_class_options(MachineClass *mc)
{ {
spapr_machine_4_0_class_options(mc); spapr_machine_4_0_class_options(mc);
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_3_1); SET_MACHINE_COMPAT(mc, spapr_compat_3_1);
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power8_v2.0"); mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power8_v2.0");
} }
@ -4036,15 +4037,16 @@ DEFINE_SPAPR_MACHINE(3_1, "3.1", false);
/* /*
* pseries-3.0 * pseries-3.0
*/ */
#define SPAPR_COMPAT_3_0 \ static GlobalProperty spapr_compat_3_0[] = {
HW_COMPAT_3_0 HW_COMPAT_3_0
};
static void spapr_machine_3_0_class_options(MachineClass *mc) static void spapr_machine_3_0_class_options(MachineClass *mc)
{ {
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
spapr_machine_3_1_class_options(mc); spapr_machine_3_1_class_options(mc);
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_3_0); SET_MACHINE_COMPAT(mc, spapr_compat_3_0);
smc->legacy_irq_allocation = true; smc->legacy_irq_allocation = true;
smc->irq = &spapr_irq_xics_legacy; smc->irq = &spapr_irq_xics_legacy;
@ -4055,25 +4057,26 @@ DEFINE_SPAPR_MACHINE(3_0, "3.0", false);
/* /*
* pseries-2.12 * pseries-2.12
*/ */
#define SPAPR_COMPAT_2_12 \ static GlobalProperty spapr_compat_2_12[] = {
HW_COMPAT_2_12 \ HW_COMPAT_2_12
{ \ {
.driver = TYPE_POWERPC_CPU, \ .driver = TYPE_POWERPC_CPU,
.property = "pre-3.0-migration", \ .property = "pre-3.0-migration",
.value = "on", \ .value = "on",
}, \
{ \
.driver = TYPE_SPAPR_CPU_CORE, \
.property = "pre-3.0-migration", \
.value = "on", \
}, },
{
.driver = TYPE_SPAPR_CPU_CORE,
.property = "pre-3.0-migration",
.value = "on",
},
};
static void spapr_machine_2_12_class_options(MachineClass *mc) static void spapr_machine_2_12_class_options(MachineClass *mc)
{ {
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
spapr_machine_3_0_class_options(mc); spapr_machine_3_0_class_options(mc);
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_12); SET_MACHINE_COMPAT(mc, spapr_compat_2_12);
/* We depend on kvm_enabled() to choose a default value for the /* We depend on kvm_enabled() to choose a default value for the
* hpt-max-page-size capability. Of course we can't do it here * hpt-max-page-size capability. Of course we can't do it here
@ -4100,8 +4103,9 @@ DEFINE_SPAPR_MACHINE(2_12_sxxm, "2.12-sxxm", false);
/* /*
* pseries-2.11 * pseries-2.11
*/ */
#define SPAPR_COMPAT_2_11 \ static GlobalProperty spapr_compat_2_11[] = {
HW_COMPAT_2_11 HW_COMPAT_2_11
};
static void spapr_machine_2_11_class_options(MachineClass *mc) static void spapr_machine_2_11_class_options(MachineClass *mc)
{ {
@ -4109,7 +4113,7 @@ static void spapr_machine_2_11_class_options(MachineClass *mc)
spapr_machine_2_12_class_options(mc); spapr_machine_2_12_class_options(mc);
smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_ON; smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_ON;
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_11); SET_MACHINE_COMPAT(mc, spapr_compat_2_11);
} }
DEFINE_SPAPR_MACHINE(2_11, "2.11", false); DEFINE_SPAPR_MACHINE(2_11, "2.11", false);
@ -4117,13 +4121,14 @@ DEFINE_SPAPR_MACHINE(2_11, "2.11", false);
/* /*
* pseries-2.10 * pseries-2.10
*/ */
#define SPAPR_COMPAT_2_10 \ static GlobalProperty spapr_compat_2_10[] = {
HW_COMPAT_2_10 HW_COMPAT_2_10
};
static void spapr_machine_2_10_class_options(MachineClass *mc) static void spapr_machine_2_10_class_options(MachineClass *mc)
{ {
spapr_machine_2_11_class_options(mc); spapr_machine_2_11_class_options(mc);
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_10); SET_MACHINE_COMPAT(mc, spapr_compat_2_10);
} }
DEFINE_SPAPR_MACHINE(2_10, "2.10", false); DEFINE_SPAPR_MACHINE(2_10, "2.10", false);
@ -4131,20 +4136,21 @@ DEFINE_SPAPR_MACHINE(2_10, "2.10", false);
/* /*
* pseries-2.9 * pseries-2.9
*/ */
#define SPAPR_COMPAT_2_9 \ static GlobalProperty spapr_compat_2_9[] = {
HW_COMPAT_2_9 \ HW_COMPAT_2_9
{ \ {
.driver = TYPE_POWERPC_CPU, \ .driver = TYPE_POWERPC_CPU,
.property = "pre-2.10-migration", \ .property = "pre-2.10-migration",
.value = "on", \ .value = "on",
}, \ },
};
static void spapr_machine_2_9_class_options(MachineClass *mc) static void spapr_machine_2_9_class_options(MachineClass *mc)
{ {
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc); sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
spapr_machine_2_10_class_options(mc); spapr_machine_2_10_class_options(mc);
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_9); SET_MACHINE_COMPAT(mc, spapr_compat_2_9);
mc->numa_auto_assign_ram = numa_legacy_auto_assign_ram; mc->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
smc->pre_2_10_has_unused_icps = true; smc->pre_2_10_has_unused_icps = true;
smc->resize_hpt_default = SPAPR_RESIZE_HPT_DISABLED; smc->resize_hpt_default = SPAPR_RESIZE_HPT_DISABLED;
@ -4155,18 +4161,19 @@ DEFINE_SPAPR_MACHINE(2_9, "2.9", false);
/* /*
* pseries-2.8 * pseries-2.8
*/ */
#define SPAPR_COMPAT_2_8 \ static GlobalProperty spapr_compat_2_8[] = {
HW_COMPAT_2_8 \ HW_COMPAT_2_8
{ \ {
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE, \ .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "pcie-extended-configuration-space", \ .property = "pcie-extended-configuration-space",
.value = "off", \ .value = "off",
}, },
};
static void spapr_machine_2_8_class_options(MachineClass *mc) static void spapr_machine_2_8_class_options(MachineClass *mc)
{ {
spapr_machine_2_9_class_options(mc); spapr_machine_2_9_class_options(mc);
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_8); SET_MACHINE_COMPAT(mc, spapr_compat_2_8);
mc->numa_mem_align_shift = 23; mc->numa_mem_align_shift = 23;
} }
@ -4175,28 +4182,29 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
/* /*
* pseries-2.7 * pseries-2.7
*/ */
#define SPAPR_COMPAT_2_7 \ static GlobalProperty spapr_compat_2_7[] = {
HW_COMPAT_2_7 \ HW_COMPAT_2_7
{ \ {
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE, \ .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "mem_win_size", \ .property = "mem_win_size",
.value = stringify(SPAPR_PCI_2_7_MMIO_WIN_SIZE),\ .value = stringify(SPAPR_PCI_2_7_MMIO_WIN_SIZE),
}, \
{ \
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE, \
.property = "mem64_win_size", \
.value = "0", \
}, \
{ \
.driver = TYPE_POWERPC_CPU, \
.property = "pre-2.8-migration", \
.value = "on", \
}, \
{ \
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE, \
.property = "pre-2.8-migration", \
.value = "on", \
}, },
{
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "mem64_win_size",
.value = "0",
},
{
.driver = TYPE_POWERPC_CPU,
.property = "pre-2.8-migration",
.value = "on",
},
{
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "pre-2.8-migration",
.value = "on",
},
};
static void phb_placement_2_7(sPAPRMachineState *spapr, uint32_t index, static void phb_placement_2_7(sPAPRMachineState *spapr, uint32_t index,
uint64_t *buid, hwaddr *pio, uint64_t *buid, hwaddr *pio,
@ -4254,7 +4262,7 @@ static void spapr_machine_2_7_class_options(MachineClass *mc)
spapr_machine_2_8_class_options(mc); spapr_machine_2_8_class_options(mc);
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power7_v2.3"); mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power7_v2.3");
mc->default_machine_opts = "modern-hotplug-events=off"; mc->default_machine_opts = "modern-hotplug-events=off";
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_7); SET_MACHINE_COMPAT(mc, spapr_compat_2_7);
smc->phb_placement = phb_placement_2_7; smc->phb_placement = phb_placement_2_7;
} }
@ -4263,19 +4271,20 @@ DEFINE_SPAPR_MACHINE(2_7, "2.7", false);
/* /*
* pseries-2.6 * pseries-2.6
*/ */
#define SPAPR_COMPAT_2_6 \ static GlobalProperty spapr_compat_2_6[] = {
HW_COMPAT_2_6 \ HW_COMPAT_2_6
{ \ {
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\ .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "ddw",\ .property = "ddw",
.value = stringify(off),\ .value = stringify(off),
}, },
};
static void spapr_machine_2_6_class_options(MachineClass *mc) static void spapr_machine_2_6_class_options(MachineClass *mc)
{ {
spapr_machine_2_7_class_options(mc); spapr_machine_2_7_class_options(mc);
mc->has_hotpluggable_cpus = false; mc->has_hotpluggable_cpus = false;
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_6); SET_MACHINE_COMPAT(mc, spapr_compat_2_6);
} }
DEFINE_SPAPR_MACHINE(2_6, "2.6", false); DEFINE_SPAPR_MACHINE(2_6, "2.6", false);
@ -4283,13 +4292,14 @@ DEFINE_SPAPR_MACHINE(2_6, "2.6", false);
/* /*
* pseries-2.5 * pseries-2.5
*/ */
#define SPAPR_COMPAT_2_5 \ static GlobalProperty spapr_compat_2_5[] = {
HW_COMPAT_2_5 \ HW_COMPAT_2_5
{ \ {
.driver = "spapr-vlan", \ .driver = "spapr-vlan",
.property = "use-rx-buffer-pools", \ .property = "use-rx-buffer-pools",
.value = "off", \ .value = "off",
}, },
};
static void spapr_machine_2_5_class_options(MachineClass *mc) static void spapr_machine_2_5_class_options(MachineClass *mc)
{ {
@ -4297,7 +4307,7 @@ static void spapr_machine_2_5_class_options(MachineClass *mc)
spapr_machine_2_6_class_options(mc); spapr_machine_2_6_class_options(mc);
smc->use_ohci_by_default = true; smc->use_ohci_by_default = true;
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_5); SET_MACHINE_COMPAT(mc, spapr_compat_2_5);
} }
DEFINE_SPAPR_MACHINE(2_5, "2.5", false); DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
@ -4305,8 +4315,9 @@ DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
/* /*
* pseries-2.4 * pseries-2.4
*/ */
#define SPAPR_COMPAT_2_4 \ static GlobalProperty spapr_compat_2_4[] = {
HW_COMPAT_2_4 HW_COMPAT_2_4
};
static void spapr_machine_2_4_class_options(MachineClass *mc) static void spapr_machine_2_4_class_options(MachineClass *mc)
{ {
@ -4314,7 +4325,7 @@ static void spapr_machine_2_4_class_options(MachineClass *mc)
spapr_machine_2_5_class_options(mc); spapr_machine_2_5_class_options(mc);
smc->dr_lmb_enabled = false; smc->dr_lmb_enabled = false;
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_4); SET_MACHINE_COMPAT(mc, spapr_compat_2_4);
} }
DEFINE_SPAPR_MACHINE(2_4, "2.4", false); DEFINE_SPAPR_MACHINE(2_4, "2.4", false);
@ -4322,37 +4333,38 @@ DEFINE_SPAPR_MACHINE(2_4, "2.4", false);
/* /*
* pseries-2.3 * pseries-2.3
*/ */
#define SPAPR_COMPAT_2_3 \ static GlobalProperty spapr_compat_2_3[] = {
HW_COMPAT_2_3 \ HW_COMPAT_2_3
{\ {
.driver = "spapr-pci-host-bridge",\ .driver = "spapr-pci-host-bridge",
.property = "dynamic-reconfiguration",\ .property = "dynamic-reconfiguration",
.value = "off",\ .value = "off",
}, },
};
static void spapr_machine_2_3_class_options(MachineClass *mc) static void spapr_machine_2_3_class_options(MachineClass *mc)
{ {
spapr_machine_2_4_class_options(mc); spapr_machine_2_4_class_options(mc);
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_3); SET_MACHINE_COMPAT(mc, spapr_compat_2_3);
} }
DEFINE_SPAPR_MACHINE(2_3, "2.3", false); DEFINE_SPAPR_MACHINE(2_3, "2.3", false);
/* /*
* pseries-2.2 * pseries-2.2
*/ */
static GlobalProperty spapr_compat_2_2[] = {
#define SPAPR_COMPAT_2_2 \ HW_COMPAT_2_2
HW_COMPAT_2_2 \ {
{\ .driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,\ .property = "mem_win_size",
.property = "mem_win_size",\ .value = "0x20000000",
.value = "0x20000000",\ },
}, };
static void spapr_machine_2_2_class_options(MachineClass *mc) static void spapr_machine_2_2_class_options(MachineClass *mc)
{ {
spapr_machine_2_3_class_options(mc); spapr_machine_2_3_class_options(mc);
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_2); SET_MACHINE_COMPAT(mc, spapr_compat_2_2);
mc->default_machine_opts = "modern-hotplug-events=off,suppress-vmdesc=on"; mc->default_machine_opts = "modern-hotplug-events=off,suppress-vmdesc=on";
} }
DEFINE_SPAPR_MACHINE(2_2, "2.2", false); DEFINE_SPAPR_MACHINE(2_2, "2.2", false);
@ -4360,13 +4372,14 @@ DEFINE_SPAPR_MACHINE(2_2, "2.2", false);
/* /*
* pseries-2.1 * pseries-2.1
*/ */
#define SPAPR_COMPAT_2_1 \ static GlobalProperty spapr_compat_2_1[] = {
HW_COMPAT_2_1 HW_COMPAT_2_1
};
static void spapr_machine_2_1_class_options(MachineClass *mc) static void spapr_machine_2_1_class_options(MachineClass *mc)
{ {
spapr_machine_2_2_class_options(mc); spapr_machine_2_2_class_options(mc);
SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_1); SET_MACHINE_COMPAT(mc, spapr_compat_2_1);
} }
DEFINE_SPAPR_MACHINE(2_1, "2.1", false); DEFINE_SPAPR_MACHINE(2_1, "2.1", false);

199
hw/s390x/s390-virtio-ccw.c
View file

@ -651,99 +651,110 @@ bool css_migration_enabled(void)
} \ } \
type_init(ccw_machine_register_##suffix) type_init(ccw_machine_register_##suffix)
#define CCW_COMPAT_3_1 \ static GlobalProperty ccw_compat_3_1[] = {
HW_COMPAT_3_1 HW_COMPAT_3_1
};
#define CCW_COMPAT_3_0 \ static GlobalProperty ccw_compat_3_0[] = {
HW_COMPAT_3_0 HW_COMPAT_3_0
};
#define CCW_COMPAT_2_12 \ static GlobalProperty ccw_compat_2_12[] = {
HW_COMPAT_2_12 HW_COMPAT_2_12
};
#define CCW_COMPAT_2_11 \ static GlobalProperty ccw_compat_2_11[] = {
HW_COMPAT_2_11 \ HW_COMPAT_2_11
{\ {
.driver = TYPE_SCLP_EVENT_FACILITY,\ .driver = TYPE_SCLP_EVENT_FACILITY,
.property = "allow_all_mask_sizes",\ .property = "allow_all_mask_sizes",
.value = "off",\ .value = "off",
}, },
};
#define CCW_COMPAT_2_10 \ static GlobalProperty ccw_compat_2_10[] = {
HW_COMPAT_2_10 HW_COMPAT_2_10
};
#define CCW_COMPAT_2_9 \ static GlobalProperty ccw_compat_2_9[] = {
HW_COMPAT_2_9 \ HW_COMPAT_2_9
{\ {
.driver = TYPE_S390_STATTRIB,\ .driver = TYPE_S390_STATTRIB,
.property = "migration-enabled",\ .property = "migration-enabled",
.value = "off",\ .value = "off",
}, },
};
#define CCW_COMPAT_2_8 \ static GlobalProperty ccw_compat_2_8[] = {
HW_COMPAT_2_8 \ HW_COMPAT_2_8
{\ {
.driver = TYPE_S390_FLIC_COMMON,\ .driver = TYPE_S390_FLIC_COMMON,
.property = "adapter_routes_max_batch",\ .property = "adapter_routes_max_batch",
.value = "64",\ .value = "64",
}, },
};
#define CCW_COMPAT_2_7 \ static GlobalProperty ccw_compat_2_7[] = {
HW_COMPAT_2_7 HW_COMPAT_2_7
};
#define CCW_COMPAT_2_6 \ static GlobalProperty ccw_compat_2_6[] = {
HW_COMPAT_2_6 \ HW_COMPAT_2_6
{\ {
.driver = TYPE_S390_IPL,\ .driver = TYPE_S390_IPL,
.property = "iplbext_migration",\ .property = "iplbext_migration",
.value = "off",\ .value = "off",
}, {\ }, {
.driver = TYPE_VIRTUAL_CSS_BRIDGE,\ .driver = TYPE_VIRTUAL_CSS_BRIDGE,
.property = "css_dev_path",\ .property = "css_dev_path",
.value = "off",\ .value = "off",
}, },
};
#define CCW_COMPAT_2_5 \ static GlobalProperty ccw_compat_2_5[] = {
HW_COMPAT_2_5 HW_COMPAT_2_5
};
#define CCW_COMPAT_2_4 \ static GlobalProperty ccw_compat_2_4[] = {
HW_COMPAT_2_4 \ HW_COMPAT_2_4
{\ {
.driver = TYPE_S390_SKEYS,\ .driver = TYPE_S390_SKEYS,
.property = "migration-enabled",\ .property = "migration-enabled",
.value = "off",\ .value = "off",
},{\ },{
.driver = "virtio-blk-ccw",\ .driver = "virtio-blk-ccw",
.property = "max_revision",\ .property = "max_revision",
.value = "0",\ .value = "0",
},{\ },{
.driver = "virtio-balloon-ccw",\ .driver = "virtio-balloon-ccw",
.property = "max_revision",\ .property = "max_revision",
.value = "0",\ .value = "0",
},{\ },{
.driver = "virtio-serial-ccw",\ .driver = "virtio-serial-ccw",
.property = "max_revision",\ .property = "max_revision",
.value = "0",\ .value = "0",
},{\ },{
.driver = "virtio-9p-ccw",\ .driver = "virtio-9p-ccw",
.property = "max_revision",\ .property = "max_revision",
.value = "0",\ .value = "0",
},{\ },{
.driver = "virtio-rng-ccw",\ .driver = "virtio-rng-ccw",
.property = "max_revision",\ .property = "max_revision",
.value = "0",\ .value = "0",
},{\ },{
.driver = "virtio-net-ccw",\ .driver = "virtio-net-ccw",
.property = "max_revision",\ .property = "max_revision",
.value = "0",\ .value = "0",
},{\ },{
.driver = "virtio-scsi-ccw",\ .driver = "virtio-scsi-ccw",
.property = "max_revision",\ .property = "max_revision",
.value = "0",\ .value = "0",
},{\ },{
.driver = "vhost-scsi-ccw",\ .driver = "vhost-scsi-ccw",
.property = "max_revision",\ .property = "max_revision",
.value = "0",\ .value = "0",
}, },
};
static void ccw_machine_4_0_instance_options(MachineState *machine) static void ccw_machine_4_0_instance_options(MachineState *machine)
{ {
@ -762,7 +773,7 @@ static void ccw_machine_3_1_instance_options(MachineState *machine)
static void ccw_machine_3_1_class_options(MachineClass *mc) static void ccw_machine_3_1_class_options(MachineClass *mc)
{ {
ccw_machine_4_0_class_options(mc); ccw_machine_4_0_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_3_1); SET_MACHINE_COMPAT(mc, ccw_compat_3_1);
} }
DEFINE_CCW_MACHINE(3_1, "3.1", false); DEFINE_CCW_MACHINE(3_1, "3.1", false);
@ -777,7 +788,7 @@ static void ccw_machine_3_0_class_options(MachineClass *mc)
s390mc->hpage_1m_allowed = false; s390mc->hpage_1m_allowed = false;
ccw_machine_3_1_class_options(mc); ccw_machine_3_1_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_3_0); SET_MACHINE_COMPAT(mc, ccw_compat_3_0);
} }
DEFINE_CCW_MACHINE(3_0, "3.0", false); DEFINE_CCW_MACHINE(3_0, "3.0", false);
@ -791,7 +802,7 @@ static void ccw_machine_2_12_instance_options(MachineState *machine)
static void ccw_machine_2_12_class_options(MachineClass *mc) static void ccw_machine_2_12_class_options(MachineClass *mc)
{ {
ccw_machine_3_0_class_options(mc); ccw_machine_3_0_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_12); SET_MACHINE_COMPAT(mc, ccw_compat_2_12);
} }
DEFINE_CCW_MACHINE(2_12, "2.12", false); DEFINE_CCW_MACHINE(2_12, "2.12", false);
@ -807,7 +818,7 @@ static void ccw_machine_2_11_instance_options(MachineState *machine)
static void ccw_machine_2_11_class_options(MachineClass *mc) static void ccw_machine_2_11_class_options(MachineClass *mc)
{ {
ccw_machine_2_12_class_options(mc); ccw_machine_2_12_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_11); SET_MACHINE_COMPAT(mc, ccw_compat_2_11);
} }
DEFINE_CCW_MACHINE(2_11, "2.11", false); DEFINE_CCW_MACHINE(2_11, "2.11", false);
@ -819,7 +830,7 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)
static void ccw_machine_2_10_class_options(MachineClass *mc) static void ccw_machine_2_10_class_options(MachineClass *mc)
{ {
ccw_machine_2_11_class_options(mc); ccw_machine_2_11_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_10); SET_MACHINE_COMPAT(mc, ccw_compat_2_10);
} }
DEFINE_CCW_MACHINE(2_10, "2.10", false); DEFINE_CCW_MACHINE(2_10, "2.10", false);
@ -838,7 +849,7 @@ static void ccw_machine_2_9_class_options(MachineClass *mc)
S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc); S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
ccw_machine_2_10_class_options(mc); ccw_machine_2_10_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_9); SET_MACHINE_COMPAT(mc, ccw_compat_2_9);
s390mc->css_migration_enabled = false; s390mc->css_migration_enabled = false;
} }
DEFINE_CCW_MACHINE(2_9, "2.9", false); DEFINE_CCW_MACHINE(2_9, "2.9", false);
@ -851,7 +862,7 @@ static void ccw_machine_2_8_instance_options(MachineState *machine)
static void ccw_machine_2_8_class_options(MachineClass *mc) static void ccw_machine_2_8_class_options(MachineClass *mc)
{ {
ccw_machine_2_9_class_options(mc); ccw_machine_2_9_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_8); SET_MACHINE_COMPAT(mc, ccw_compat_2_8);
} }
DEFINE_CCW_MACHINE(2_8, "2.8", false); DEFINE_CCW_MACHINE(2_8, "2.8", false);
@ -866,7 +877,7 @@ static void ccw_machine_2_7_class_options(MachineClass *mc)
s390mc->cpu_model_allowed = false; s390mc->cpu_model_allowed = false;
ccw_machine_2_8_class_options(mc); ccw_machine_2_8_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_7); SET_MACHINE_COMPAT(mc, ccw_compat_2_7);
} }
DEFINE_CCW_MACHINE(2_7, "2.7", false); DEFINE_CCW_MACHINE(2_7, "2.7", false);
@ -881,7 +892,7 @@ static void ccw_machine_2_6_class_options(MachineClass *mc)
s390mc->ri_allowed = false; s390mc->ri_allowed = false;
ccw_machine_2_7_class_options(mc); ccw_machine_2_7_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_6); SET_MACHINE_COMPAT(mc, ccw_compat_2_6);
} }
DEFINE_CCW_MACHINE(2_6, "2.6", false); DEFINE_CCW_MACHINE(2_6, "2.6", false);
@ -893,7 +904,7 @@ static void ccw_machine_2_5_instance_options(MachineState *machine)
static void ccw_machine_2_5_class_options(MachineClass *mc) static void ccw_machine_2_5_class_options(MachineClass *mc)
{ {
ccw_machine_2_6_class_options(mc); ccw_machine_2_6_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_5); SET_MACHINE_COMPAT(mc, ccw_compat_2_5);
} }
DEFINE_CCW_MACHINE(2_5, "2.5", false); DEFINE_CCW_MACHINE(2_5, "2.5", false);
@ -905,7 +916,7 @@ static void ccw_machine_2_4_instance_options(MachineState *machine)
static void ccw_machine_2_4_class_options(MachineClass *mc) static void ccw_machine_2_4_class_options(MachineClass *mc)
{ {
ccw_machine_2_5_class_options(mc); ccw_machine_2_5_class_options(mc);
SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_4); SET_MACHINE_COMPAT(mc, ccw_compat_2_4);
} }
DEFINE_CCW_MACHINE(2_4, "2.4", false); DEFINE_CCW_MACHINE(2_4, "2.4", false);

10
include/hw/boards.h
View file

@ -289,18 +289,14 @@ struct MachineState {
} \ } \
type_init(machine_initfn##_register_types) type_init(machine_initfn##_register_types)
#define SET_MACHINE_COMPAT(m, COMPAT) \ #define SET_MACHINE_COMPAT(m, compat) \
do { \ do { \
int i; \ int i; \
static GlobalProperty props[] = { \
COMPAT \
{ /* end of list */ } \
}; \
if (!m->compat_props) { \ if (!m->compat_props) { \
m->compat_props = g_array_new(false, false, sizeof(void *)); \ m->compat_props = g_array_new(false, false, sizeof(void *)); \
} \ } \
for (i = 0; props[i].driver != NULL; i++) { \ for (i = 0; i < G_N_ELEMENTS(compat); i++) { \
GlobalProperty *prop = &props[i]; \ GlobalProperty *prop = &compat[i]; \
g_array_append_val(m->compat_props, prop); \ g_array_append_val(m->compat_props, prop); \
} \ } \
} while (0) } while (0)