This will allow us to define class-specific KVM defaults, instead of
defaults that apply to all CPU models.
If this table is starting to look like the global properties tables,
that's not a coincidence: in the future, we might convert this to
accelerator-specific code that simply register global properties when
the machine is initialized.
Signed-off-by: Eduardo Habkost <ehabk...@redhat.com>
---
hw/i386/pc_piix.c | 8 ++++----
hw/i386/pc_q35.c | 4 ++--
target-i386/cpu.c | 29 +++++++++++++++++------------
target-i386/cpu.h | 3 ++-
4 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 393dcc4..fd4bbc9 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -325,7 +325,7 @@ static void pc_compat_2_1(MachineState *machine)
pc_compat_2_2(machine);
smbios_uuid_encoded = false;
- x86_cpu_change_kvm_default("svm", NULL);
+ x86_cpu_change_kvm_default(NULL, "svm", NULL);
pcms->enforce_aligned_dimm = false;
}
@@ -361,7 +361,7 @@ static void pc_compat_1_7(MachineState *machine)
gigabyte_align = false;
option_rom_has_mr = true;
legacy_acpi_table_size = 6414;
- x86_cpu_change_kvm_default("x2apic", NULL);
+ x86_cpu_change_kvm_default(NULL, "x2apic", NULL);
}
static void pc_compat_1_6(MachineState *machine)
@@ -391,7 +391,7 @@ static void pc_compat_1_3(MachineState *machine)
static void pc_compat_1_2(MachineState *machine)
{
pc_compat_1_3(machine);
- x86_cpu_change_kvm_default("kvm-pv-eoi", NULL);
+ x86_cpu_change_kvm_default(NULL, "kvm-pv-eoi", NULL);
}
/* PC compat function for pc-0.10 to pc-0.13 */
@@ -414,7 +414,7 @@ static void pc_init_isa(MachineState *machine)
if (!machine->cpu_model) {
machine->cpu_model = "486";
}
- x86_cpu_change_kvm_default("kvm-pv-eoi", NULL);
+ x86_cpu_change_kvm_default(NULL, "kvm-pv-eoi", NULL);
enable_compat_apic_id_mode();
pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE);
}
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 2f8f396..833b1c1 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -309,7 +309,7 @@ static void pc_compat_2_1(MachineState *machine)
pc_compat_2_2(machine);
pcms->enforce_aligned_dimm = false;
smbios_uuid_encoded = false;
- x86_cpu_change_kvm_default("svm", NULL);
+ x86_cpu_change_kvm_default(NULL, "svm", NULL);
}
static void pc_compat_2_0(MachineState *machine)
@@ -326,7 +326,7 @@ static void pc_compat_1_7(MachineState *machine)
smbios_defaults = false;
gigabyte_align = false;
option_rom_has_mr = true;
- x86_cpu_change_kvm_default("x2apic", NULL);
+ x86_cpu_change_kvm_default(NULL, "x2apic", NULL);
}
static void pc_compat_1_6(MachineState *machine)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 9280bfc..b699a2c 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1359,6 +1359,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
};
typedef struct PropValue {
+ const char *type;
const char *prop, *value;
} PropValue;
@@ -1366,24 +1367,25 @@ typedef struct PropValue {
* from all CPU models when KVM is enabled.
*/
static PropValue kvm_default_props[] = {
- { "kvmclock", "on" },
- { "kvm-nopiodelay", "on" },
- { "kvm-asyncpf", "on" },
- { "kvm-steal-time", "on" },
- { "kvm-pv-eoi", "on" },
- { "kvmclock-stable-bit", "on" },
- { "x2apic", "on" },
- { "acpi", "off" },
- { "monitor", "off" },
- { "svm", "off" },
+ { NULL, "kvmclock", "on" },
+ { NULL, "kvm-nopiodelay", "on" },
+ { NULL, "kvm-asyncpf", "on" },
+ { NULL, "kvm-steal-time", "on" },
+ { NULL, "kvm-pv-eoi", "on" },
+ { NULL, "kvmclock-stable-bit", "on" },
+ { NULL, "x2apic", "on" },
+ { NULL, "acpi", "off" },
+ { NULL, "monitor", "off" },
+ { NULL, "svm", "off" },
{ NULL, NULL },
};
-void x86_cpu_change_kvm_default(const char *prop, const char *value)
+void x86_cpu_change_kvm_default(const char *type, const char *prop,
+ const char *value)
{
PropValue *pv;
for (pv = kvm_default_props; pv->prop; pv++) {
- if (!strcmp(pv->prop, prop)) {
+ if (!g_strcmp0(pv->type, type) && !strcmp(pv->prop, prop)) {
pv->value = value;
break;
}
@@ -2073,6 +2075,9 @@ static void x86_cpu_apply_props(X86CPU *cpu, PropValue
*props)
if (!pv->value) {
continue;
}
+ if (pv->type && !object_dynamic_cast(OBJECT(cpu), pv->type)) {
+ continue;
+ }
object_property_parse(OBJECT(cpu), pv->value, pv->prop,
&error_abort);
}
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 62f7879..ef57247 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1324,7 +1324,8 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAccess
access);
* It is valid to call this funciton only for properties that
* are already present in the kvm_default_props table.
*/
-void x86_cpu_change_kvm_default(const char *prop, const char *value);
+void x86_cpu_change_kvm_default(const char *type, const char *prop,
+ const char *value);
/* Return name of 32-bit register, from a R_* constant */
--
2.1.0
