Skip to content

Q
qemu

openeuler / qemu

通知 10
Star 0
Fork 0
Q
qemu

体验新版 GitCode，发现更多精彩内容 >>

提交 88cbe073 编写于 作者: M Marc-André Lureau
浏览文件
操作

machine: move compat properties out of globals 

Move the compat arrays inside functions that use them.
Signed-off-by: NMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: NIgor Mammedov <imammedo@redhat.com>
Reviewed-by: NCornelia Huck <cohuck@redhat.com>
Acked-by: NEduardo Habkost <ehabkost@redhat.com>
上级 b66bbee3
展开全部 隐藏空白更改
内联 并排
Showing with 637 addition and 716 deletion
hw/arm/virt.c
浏览文件 @ 88cbe073
......@@ -1872,98 +1872,88 @@ static void virt_machine_4_0_options(MachineClass *mc)
}
DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)
static GlobalProperty virt_compat_3_1[] = {
HW_COMPAT_3_1
};
static void virt_machine_3_1_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_3_1
};
virt_machine_4_0_options(mc);
compat_props_add(mc->compat_props,
virt_compat_3_1, G_N_ELEMENTS(virt_compat_3_1));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_VIRT_MACHINE(3, 1)
static GlobalProperty virt_compat_3_0[] = {
HW_COMPAT_3_0
};
static void virt_machine_3_0_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_3_0
};
virt_machine_3_1_options(mc);
compat_props_add(mc->compat_props,
virt_compat_3_0, G_N_ELEMENTS(virt_compat_3_0));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_VIRT_MACHINE(3, 0)
static GlobalProperty virt_compat_2_12[] = {
HW_COMPAT_2_12
};
static void virt_machine_2_12_options(MachineClass *mc)
{
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
static GlobalProperty compat[] = {
HW_COMPAT_2_12
};
virt_machine_3_0_options(mc);
compat_props_add(mc->compat_props,
virt_compat_2_12, G_N_ELEMENTS(virt_compat_2_12));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
vmc->no_highmem_ecam = true;
mc->max_cpus = 255;
}
DEFINE_VIRT_MACHINE(2, 12)
static GlobalProperty virt_compat_2_11[] = {
HW_COMPAT_2_11
};
static void virt_machine_2_11_options(MachineClass *mc)
{
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
static GlobalProperty compat[] = {
HW_COMPAT_2_11
};
virt_machine_2_12_options(mc);
compat_props_add(mc->compat_props,
virt_compat_2_11, G_N_ELEMENTS(virt_compat_2_11));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
vmc->smbios_old_sys_ver = true;
}
DEFINE_VIRT_MACHINE(2, 11)
static GlobalProperty virt_compat_2_10[] = {
HW_COMPAT_2_10
};
static void virt_machine_2_10_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_10
};
virt_machine_2_11_options(mc);
compat_props_add(mc->compat_props,
virt_compat_2_10, G_N_ELEMENTS(virt_compat_2_10));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
/* before 2.11 we never faulted accesses to bad addresses */
mc->ignore_memory_transaction_failures = true;
}
DEFINE_VIRT_MACHINE(2, 10)
static GlobalProperty virt_compat_2_9[] = {
HW_COMPAT_2_9
};
static void virt_machine_2_9_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_9
};
virt_machine_2_10_options(mc);
compat_props_add(mc->compat_props,
virt_compat_2_9, G_N_ELEMENTS(virt_compat_2_9));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_VIRT_MACHINE(2, 9)
static GlobalProperty virt_compat_2_8[] = {
HW_COMPAT_2_8
};
static void virt_machine_2_8_options(MachineClass *mc)
{
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
static GlobalProperty compat[] = {
HW_COMPAT_2_8
};
virt_machine_2_9_options(mc);
compat_props_add(mc->compat_props,
virt_compat_2_8, G_N_ELEMENTS(virt_compat_2_8));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
/* For 2.8 and earlier we falsely claimed in the DT that
* our timers were edge-triggered, not level-triggered.
*/
......@@ -1971,17 +1961,15 @@ static void virt_machine_2_8_options(MachineClass *mc)
}
DEFINE_VIRT_MACHINE(2, 8)
static GlobalProperty virt_compat_2_7[] = {
HW_COMPAT_2_7
};
static void virt_machine_2_7_options(MachineClass *mc)
{
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
static GlobalProperty compat[] = {
HW_COMPAT_2_7
};
virt_machine_2_8_options(mc);
compat_props_add(mc->compat_props,
virt_compat_2_7, G_N_ELEMENTS(virt_compat_2_7));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
/* ITS was introduced with 2.8 */
vmc->no_its = true;
/* Stick with 1K pages for migration compatibility */
......@@ -1989,17 +1977,15 @@ static void virt_machine_2_7_options(MachineClass *mc)
}
DEFINE_VIRT_MACHINE(2, 7)
static GlobalProperty virt_compat_2_6[] = {
HW_COMPAT_2_6
};
static void virt_machine_2_6_options(MachineClass *mc)
{
VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
static GlobalProperty compat[] = {
HW_COMPAT_2_6
};
virt_machine_2_7_options(mc);
compat_props_add(mc->compat_props,
virt_compat_2_6, G_N_ELEMENTS(virt_compat_2_6));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
vmc->disallow_affinity_adjustment = true;
/* Disable PMU for 2.6 as PMU support was first introduced in 2.7 */
vmc->no_pmu = true;
......
hw/i386/pc_piix.c
浏览文件 @ 88cbe073
此差异已折叠。
hw/i386/pc_q35.c
浏览文件 @ 88cbe073
......@@ -321,76 +321,71 @@ static void pc_q35_4_0_machine_options(MachineClass *m)
DEFINE_Q35_MACHINE(v4_0, "pc-q35-4.0", NULL,
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 GlobalProperty compat[] = {
PC_COMPAT_3_1
};
pc_q35_4_0_machine_options(m);
m->default_kernel_irqchip_split = false;
m->alias = NULL;
compat_props_add(m->compat_props,
pc_compat_3_1, G_N_ELEMENTS(pc_compat_3_1));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_Q35_MACHINE(v3_1, "pc-q35-3.1", NULL,
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 GlobalProperty compat[] = {
PC_COMPAT_3_0
};
pc_q35_3_1_machine_options(m);
compat_props_add(m->compat_props,
pc_compat_3_0, G_N_ELEMENTS(pc_compat_3_0));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_Q35_MACHINE(v3_0, "pc-q35-3.0", NULL,
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 GlobalProperty compat[] = {
PC_COMPAT_2_12
};
pc_q35_3_0_machine_options(m);
compat_props_add(m->compat_props,
pc_compat_2_12, G_N_ELEMENTS(pc_compat_2_12));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_Q35_MACHINE(v2_12, "pc-q35-2.12", NULL,
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)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
static GlobalProperty compat[] = {
PC_COMPAT_2_11
};
pc_q35_2_12_machine_options(m);
pcmc->default_nic_model = "e1000";
compat_props_add(m->compat_props,
pc_compat_2_11, G_N_ELEMENTS(pc_compat_2_11));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_Q35_MACHINE(v2_11, "pc-q35-2.11", NULL,
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 GlobalProperty compat[] = {
PC_COMPAT_2_10
};
pc_q35_2_11_machine_options(m);
compat_props_add(m->compat_props,
pc_compat_2_10, G_N_ELEMENTS(pc_compat_2_10));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
m->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
m->auto_enable_numa_with_memhp = false;
}
......@@ -398,95 +393,89 @@ static void pc_q35_2_10_machine_options(MachineClass *m)
DEFINE_Q35_MACHINE(v2_10, "pc-q35-2.10", NULL,
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 GlobalProperty compat[] = {
PC_COMPAT_2_9
};
pc_q35_2_10_machine_options(m);
compat_props_add(m->compat_props,
pc_compat_2_9, G_N_ELEMENTS(pc_compat_2_9));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_Q35_MACHINE(v2_9, "pc-q35-2.9", NULL,
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 GlobalProperty compat[] = {
PC_COMPAT_2_8
};
pc_q35_2_9_machine_options(m);
compat_props_add(m->compat_props,
pc_compat_2_8, G_N_ELEMENTS(pc_compat_2_8));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_Q35_MACHINE(v2_8, "pc-q35-2.8", NULL,
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 GlobalProperty compat[] = {
PC_COMPAT_2_7
};
pc_q35_2_8_machine_options(m);
m->max_cpus = 255;
compat_props_add(m->compat_props,
pc_compat_2_7, G_N_ELEMENTS(pc_compat_2_7));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL,
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)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
static GlobalProperty compat[] = {
PC_COMPAT_2_6
};
pc_q35_2_7_machine_options(m);
pcmc->legacy_cpu_hotplug = true;
pcmc->linuxboot_dma_enabled = false;
compat_props_add(m->compat_props,
pc_compat_2_6, G_N_ELEMENTS(pc_compat_2_6));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_Q35_MACHINE(v2_6, "pc-q35-2.6", NULL,
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)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
static GlobalProperty compat[] = {
PC_COMPAT_2_5
};
pc_q35_2_6_machine_options(m);
pcmc->save_tsc_khz = false;
m->legacy_fw_cfg_order = 1;
compat_props_add(m->compat_props,
pc_compat_2_5, G_N_ELEMENTS(pc_compat_2_5));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL,
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)
{
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
static GlobalProperty compat[] = {
PC_COMPAT_2_4
};
pc_q35_2_5_machine_options(m);
m->hw_version = "2.4.0";
pcmc->broken_reserved_end = true;
compat_props_add(m->compat_props,
pc_compat_2_4, G_N_ELEMENTS(pc_compat_2_4));
compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,
......
hw/ppc/spapr.c
浏览文件 @ 88cbe073
......@@ -4021,15 +4021,14 @@ DEFINE_SPAPR_MACHINE(4_0, "4.0", true);
/*
* pseries-3.1
*/
static GlobalProperty spapr_compat_3_1[] = {
HW_COMPAT_3_1
};
static void spapr_machine_3_1_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_3_1
};
spapr_machine_4_0_class_options(mc);
compat_props_add(mc->compat_props,
spapr_compat_3_1, G_N_ELEMENTS(spapr_compat_3_1));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power8_v2.0");
}
......@@ -4038,17 +4037,16 @@ DEFINE_SPAPR_MACHINE(3_1, "3.1", false);
/*
* pseries-3.0
*/
static GlobalProperty spapr_compat_3_0[] = {
HW_COMPAT_3_0
};
static void spapr_machine_3_0_class_options(MachineClass *mc)
{
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_3_0
};
spapr_machine_3_1_class_options(mc);
compat_props_add(mc->compat_props,
spapr_compat_3_0, G_N_ELEMENTS(spapr_compat_3_0));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
smc->legacy_irq_allocation = true;
smc->irq = &spapr_irq_xics_legacy;
......@@ -4059,27 +4057,25 @@ DEFINE_SPAPR_MACHINE(3_0, "3.0", false);
/*
* pseries-2.12
*/
static GlobalProperty spapr_compat_2_12[] = {
HW_COMPAT_2_12
{
.driver = TYPE_POWERPC_CPU,
.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)
{
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_12
{
.driver = TYPE_POWERPC_CPU,
.property = "pre-3.0-migration",
.value = "on",
},
{
.driver = TYPE_SPAPR_CPU_CORE,
.property = "pre-3.0-migration",
.value = "on",
},
};
spapr_machine_3_0_class_options(mc);
compat_props_add(mc->compat_props,
spapr_compat_2_12, G_N_ELEMENTS(spapr_compat_2_12));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
/* 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
......@@ -4106,18 +4102,17 @@ DEFINE_SPAPR_MACHINE(2_12_sxxm, "2.12-sxxm", false);
/*
* pseries-2.11
*/
static GlobalProperty spapr_compat_2_11[] = {
HW_COMPAT_2_11
};
static void spapr_machine_2_11_class_options(MachineClass *mc)
{
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_11
};
spapr_machine_2_12_class_options(mc);
smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_ON;
compat_props_add(mc->compat_props,
spapr_compat_2_11, G_N_ELEMENTS(spapr_compat_2_11));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_SPAPR_MACHINE(2_11, "2.11", false);
......@@ -4125,15 +4120,15 @@ DEFINE_SPAPR_MACHINE(2_11, "2.11", false);
/*
* pseries-2.10
*/
static GlobalProperty spapr_compat_2_10[] = {
HW_COMPAT_2_10
};
static void spapr_machine_2_10_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_10
};
spapr_machine_2_11_class_options(mc);
compat_props_add(mc->compat_props,
spapr_compat_2_10, G_N_ELEMENTS(spapr_compat_2_10));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_SPAPR_MACHINE(2_10, "2.10", false);
......@@ -4141,22 +4136,21 @@ DEFINE_SPAPR_MACHINE(2_10, "2.10", false);
/*
* pseries-2.9
*/
static GlobalProperty spapr_compat_2_9[] = {
HW_COMPAT_2_9
{
.driver = TYPE_POWERPC_CPU,
.property = "pre-2.10-migration",
.value = "on",
},
};
static void spapr_machine_2_9_class_options(MachineClass *mc)
{
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_9
{
.driver = TYPE_POWERPC_CPU,
.property = "pre-2.10-migration",
.value = "on",
},
};
spapr_machine_2_10_class_options(mc);
compat_props_add(mc->compat_props,
spapr_compat_2_9, G_N_ELEMENTS(spapr_compat_2_9));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
mc->numa_auto_assign_ram = numa_legacy_auto_assign_ram;
smc->pre_2_10_has_unused_icps = true;
smc->resize_hpt_default = SPAPR_RESIZE_HPT_DISABLED;
......@@ -4167,20 +4161,20 @@ DEFINE_SPAPR_MACHINE(2_9, "2.9", false);
/*
* pseries-2.8
*/
static GlobalProperty spapr_compat_2_8[] = {
HW_COMPAT_2_8
{
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "pcie-extended-configuration-space",
.value = "off",
},
};
static void spapr_machine_2_8_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_8
{
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "pcie-extended-configuration-space",
.value = "off",
},
};
spapr_machine_2_9_class_options(mc);
compat_props_add(mc->compat_props,
spapr_compat_2_8, G_N_ELEMENTS(spapr_compat_2_8));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
mc->numa_mem_align_shift = 23;
}
......@@ -4189,29 +4183,6 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
/*
* pseries-2.7
*/
static GlobalProperty spapr_compat_2_7[] = {
HW_COMPAT_2_7
{
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "mem_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",
},
};
static void phb_placement_2_7(sPAPRMachineState *spapr, uint32_t index,
uint64_t *buid, hwaddr *pio,
......@@ -4265,12 +4236,34 @@ static void phb_placement_2_7(sPAPRMachineState *spapr, uint32_t index,
static void spapr_machine_2_7_class_options(MachineClass *mc)
{
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_7
{
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "mem_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",
},
};
spapr_machine_2_8_class_options(mc);
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power7_v2.3");
mc->default_machine_opts = "modern-hotplug-events=off";
compat_props_add(mc->compat_props,
spapr_compat_2_7, G_N_ELEMENTS(spapr_compat_2_7));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
smc->phb_placement = phb_placement_2_7;
}
......@@ -4279,21 +4272,21 @@ DEFINE_SPAPR_MACHINE(2_7, "2.7", false);
/*
* pseries-2.6
*/
static GlobalProperty spapr_compat_2_6[] = {
HW_COMPAT_2_6
{
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "ddw",
.value = stringify(off),
},
};
static void spapr_machine_2_6_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_6
{
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "ddw",
.value = stringify(off),
},
};
spapr_machine_2_7_class_options(mc);
mc->has_hotpluggable_cpus = false;
compat_props_add(mc->compat_props,
spapr_compat_2_6, G_N_ELEMENTS(spapr_compat_2_6));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_SPAPR_MACHINE(2_6, "2.6", false);
......@@ -4301,23 +4294,22 @@ DEFINE_SPAPR_MACHINE(2_6, "2.6", false);
/*
* pseries-2.5
*/
static GlobalProperty spapr_compat_2_5[] = {
HW_COMPAT_2_5
{
.driver = "spapr-vlan",
.property = "use-rx-buffer-pools",
.value = "off",
},
};
static void spapr_machine_2_5_class_options(MachineClass *mc)
{
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_5
{
.driver = "spapr-vlan",
.property = "use-rx-buffer-pools",
.value = "off",
},
};
spapr_machine_2_6_class_options(mc);
smc->use_ohci_by_default = true;
compat_props_add(mc->compat_props,
spapr_compat_2_5, G_N_ELEMENTS(spapr_compat_2_5));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
......@@ -4325,18 +4317,17 @@ DEFINE_SPAPR_MACHINE(2_5, "2.5", false);
/*
* pseries-2.4
*/
static GlobalProperty spapr_compat_2_4[] = {
HW_COMPAT_2_4
};
static void spapr_machine_2_4_class_options(MachineClass *mc)
{
sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_4
};
spapr_machine_2_5_class_options(mc);
smc->dr_lmb_enabled = false;
compat_props_add(mc->compat_props,
spapr_compat_2_4, G_N_ELEMENTS(spapr_compat_2_4));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_SPAPR_MACHINE(2_4, "2.4", false);
......@@ -4344,40 +4335,39 @@ DEFINE_SPAPR_MACHINE(2_4, "2.4", false);
/*
* pseries-2.3
*/
static GlobalProperty spapr_compat_2_3[] = {
HW_COMPAT_2_3
{
.driver = "spapr-pci-host-bridge",
.property = "dynamic-reconfiguration",
.value = "off",
},
};
static void spapr_machine_2_3_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_3
{
.driver = "spapr-pci-host-bridge",
.property = "dynamic-reconfiguration",
.value = "off",
},
};
spapr_machine_2_4_class_options(mc);
compat_props_add(mc->compat_props,
spapr_compat_2_3, G_N_ELEMENTS(spapr_compat_2_3));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_SPAPR_MACHINE(2_3, "2.3", false);
/*
* pseries-2.2
*/
static GlobalProperty spapr_compat_2_2[] = {
HW_COMPAT_2_2
{
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "mem_win_size",
.value = "0x20000000",
},
};
static void spapr_machine_2_2_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_2
{
.driver = TYPE_SPAPR_PCI_HOST_BRIDGE,
.property = "mem_win_size",
.value = "0x20000000",
},
};
spapr_machine_2_3_class_options(mc);
compat_props_add(mc->compat_props,
spapr_compat_2_2, G_N_ELEMENTS(spapr_compat_2_2));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
mc->default_machine_opts = "modern-hotplug-events=off,suppress-vmdesc=on";
}
DEFINE_SPAPR_MACHINE(2_2, "2.2", false);
......@@ -4385,15 +4375,15 @@ DEFINE_SPAPR_MACHINE(2_2, "2.2", false);
/*
* pseries-2.1
*/
static GlobalProperty spapr_compat_2_1[] = {
HW_COMPAT_2_1
};
static void spapr_machine_2_1_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_1
};
spapr_machine_2_2_class_options(mc);
compat_props_add(mc->compat_props,
spapr_compat_2_1, G_N_ELEMENTS(spapr_compat_2_1));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_SPAPR_MACHINE(2_1, "2.1", false);
......
hw/s390x/s390-virtio-ccw.c
浏览文件 @ 88cbe073
......@@ -651,111 +651,6 @@ bool css_migration_enabled(void)
} \
type_init(ccw_machine_register_##suffix)
static GlobalProperty ccw_compat_3_1[] = {
HW_COMPAT_3_1
};
static GlobalProperty ccw_compat_3_0[] = {
HW_COMPAT_3_0
};
static GlobalProperty ccw_compat_2_12[] = {
HW_COMPAT_2_12
};
static GlobalProperty ccw_compat_2_11[] = {
HW_COMPAT_2_11
{
.driver = TYPE_SCLP_EVENT_FACILITY,
.property = "allow_all_mask_sizes",
.value = "off",
},
};
static GlobalProperty ccw_compat_2_10[] = {
HW_COMPAT_2_10
};
static GlobalProperty ccw_compat_2_9[] = {
HW_COMPAT_2_9
{
.driver = TYPE_S390_STATTRIB,
.property = "migration-enabled",
.value = "off",
},
};
static GlobalProperty ccw_compat_2_8[] = {
HW_COMPAT_2_8
{
.driver = TYPE_S390_FLIC_COMMON,
.property = "adapter_routes_max_batch",
.value = "64",
},
};
static GlobalProperty ccw_compat_2_7[] = {
HW_COMPAT_2_7
};
static GlobalProperty ccw_compat_2_6[] = {
HW_COMPAT_2_6
{
.driver = TYPE_S390_IPL,
.property = "iplbext_migration",
.value = "off",
}, {
.driver = TYPE_VIRTUAL_CSS_BRIDGE,
.property = "css_dev_path",
.value = "off",
},
};
static GlobalProperty ccw_compat_2_5[] = {
HW_COMPAT_2_5
};
static GlobalProperty ccw_compat_2_4[] = {
HW_COMPAT_2_4
{
.driver = TYPE_S390_SKEYS,
.property = "migration-enabled",
.value = "off",
},{
.driver = "virtio-blk-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-balloon-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-serial-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-9p-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-rng-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-net-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-scsi-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "vhost-scsi-ccw",
.property = "max_revision",
.value = "0",
},
};
static void ccw_machine_4_0_instance_options(MachineState *machine)
{
}
......@@ -772,9 +667,12 @@ static void ccw_machine_3_1_instance_options(MachineState *machine)
static void ccw_machine_3_1_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_3_1
};
ccw_machine_4_0_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_3_1, G_N_ELEMENTS(ccw_compat_3_1));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_CCW_MACHINE(3_1, "3.1", false);
......@@ -786,11 +684,13 @@ static void ccw_machine_3_0_instance_options(MachineState *machine)
static void ccw_machine_3_0_class_options(MachineClass *mc)
{
S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_3_0
};
s390mc->hpage_1m_allowed = false;
ccw_machine_3_1_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_3_0, G_N_ELEMENTS(ccw_compat_3_0));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_CCW_MACHINE(3_0, "3.0", false);
......@@ -803,9 +703,12 @@ static void ccw_machine_2_12_instance_options(MachineState *machine)
static void ccw_machine_2_12_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_12
};
ccw_machine_3_0_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_2_12, G_N_ELEMENTS(ccw_compat_2_12));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_CCW_MACHINE(2_12, "2.12", false);
......@@ -820,9 +723,17 @@ static void ccw_machine_2_11_instance_options(MachineState *machine)
static void ccw_machine_2_11_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_11
{
.driver = TYPE_SCLP_EVENT_FACILITY,
.property = "allow_all_mask_sizes",
.value = "off",
},
};
ccw_machine_2_12_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_2_11, G_N_ELEMENTS(ccw_compat_2_11));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_CCW_MACHINE(2_11, "2.11", false);
......@@ -833,9 +744,12 @@ static void ccw_machine_2_10_instance_options(MachineState *machine)
static void ccw_machine_2_10_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_10
};
ccw_machine_2_11_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_2_10, G_N_ELEMENTS(ccw_compat_2_10));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_CCW_MACHINE(2_10, "2.10", false);
......@@ -852,10 +766,17 @@ static void ccw_machine_2_9_instance_options(MachineState *machine)
static void ccw_machine_2_9_class_options(MachineClass *mc)
{
S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_9
{
.driver = TYPE_S390_STATTRIB,
.property = "migration-enabled",
.value = "off",
},
};
ccw_machine_2_10_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_2_9, G_N_ELEMENTS(ccw_compat_2_9));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
s390mc->css_migration_enabled = false;
}
DEFINE_CCW_MACHINE(2_9, "2.9", false);
......@@ -867,9 +788,17 @@ static void ccw_machine_2_8_instance_options(MachineState *machine)
static void ccw_machine_2_8_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_8
{
.driver = TYPE_S390_FLIC_COMMON,
.property = "adapter_routes_max_batch",
.value = "64",
},
};
ccw_machine_2_9_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_2_8, G_N_ELEMENTS(ccw_compat_2_8));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_CCW_MACHINE(2_8, "2.8", false);
......@@ -881,11 +810,13 @@ static void ccw_machine_2_7_instance_options(MachineState *machine)
static void ccw_machine_2_7_class_options(MachineClass *mc)
{
S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_7
};
s390mc->cpu_model_allowed = false;
ccw_machine_2_8_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_2_7, G_N_ELEMENTS(ccw_compat_2_7));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_CCW_MACHINE(2_7, "2.7", false);
......@@ -897,11 +828,22 @@ static void ccw_machine_2_6_instance_options(MachineState *machine)
static void ccw_machine_2_6_class_options(MachineClass *mc)
{
S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
static GlobalProperty compat[] = {
HW_COMPAT_2_6
{
.driver = TYPE_S390_IPL,
.property = "iplbext_migration",
.value = "off",
}, {
.driver = TYPE_VIRTUAL_CSS_BRIDGE,
.property = "css_dev_path",
.value = "off",
},
};
s390mc->ri_allowed = false;
ccw_machine_2_7_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_2_6, G_N_ELEMENTS(ccw_compat_2_6));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_CCW_MACHINE(2_6, "2.6", false);
......@@ -912,9 +854,12 @@ static void ccw_machine_2_5_instance_options(MachineState *machine)
static void ccw_machine_2_5_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_5
};
ccw_machine_2_6_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_2_5, G_N_ELEMENTS(ccw_compat_2_5));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_CCW_MACHINE(2_5, "2.5", false);
......@@ -925,9 +870,49 @@ static void ccw_machine_2_4_instance_options(MachineState *machine)
static void ccw_machine_2_4_class_options(MachineClass *mc)
{
static GlobalProperty compat[] = {
HW_COMPAT_2_4
{
.driver = TYPE_S390_SKEYS,
.property = "migration-enabled",
.value = "off",
},{
.driver = "virtio-blk-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-balloon-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-serial-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-9p-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-rng-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-net-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "virtio-scsi-ccw",
.property = "max_revision",
.value = "0",
},{
.driver = "vhost-scsi-ccw",
.property = "max_revision",
.value = "0",
},
};
ccw_machine_2_5_class_options(mc);
compat_props_add(mc->compat_props,
ccw_compat_2_4, G_N_ELEMENTS(ccw_compat_2_4));
compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
}
DEFINE_CCW_MACHINE(2_4, "2.4", false);
......
hw/xen/xen-common.c
浏览文件 @ 88cbe073
......@@ -159,27 +159,26 @@ static int xen_init(MachineState *ms)
return 0;
}
static GlobalProperty xen_compat_props[] = {
{
.driver = "migration",
.property = "store-global-state",
.value = "off",
},
{
.driver = "migration",
.property = "send-configuration",
.value = "off",
},
{
.driver = "migration",
.property = "send-section-footer",
.value = "off",
}
};
static void xen_accel_class_init(ObjectClass *oc, void *data)
{
AccelClass *ac = ACCEL_CLASS(oc);
static GlobalProperty compat[] = {
{
.driver = "migration",
.property = "store-global-state",
.value = "off",
},
{
.driver = "migration",
.property = "send-configuration",
.value = "off",
},
{
.driver = "migration",
.property = "send-section-footer",
.value = "off",
}
};
ac->name = "Xen";
ac->init_machine = xen_init;
......@@ -187,8 +186,7 @@ static void xen_accel_class_init(ObjectClass *oc, void *data)
ac->allowed = &xen_allowed;
ac->compat_props = g_ptr_array_new();
compat_props_add(ac->compat_props,
xen_compat_props, G_N_ELEMENTS(xen_compat_props));
compat_props_add(ac->compat_props, compat, G_N_ELEMENTS(compat));
}
#define TYPE_XEN_ACCEL ACCEL_CLASS_NAME("xen")
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或