From: Eduardo Habkost Date: Mon, 16 Jan 2017 18:12:12 +0000 (-0200) Subject: i386: Return migration-safe field on query-cpu-definitions X-Git-Tag: v2.9.0-rc0~135^2~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd72159db41d3d3c5f9afb1671d0320a77167569;p=thirdparty%2Fqemu.git i386: Return migration-safe field on query-cpu-definitions Return the migration-safe field on query-cpu-definitions. All CPU models in x86 are migration-safe except "host". Signed-off-by: Eduardo Habkost Message-Id: <20170116181212.31565-1-ehabkost@redhat.com> Acked-by: David Hildenbrand Signed-off-by: Eduardo Habkost --- diff --git a/target/i386/cpu-qom.h b/target/i386/cpu-qom.h index 7c9a07ae653..8cd607e9a21 100644 --- a/target/i386/cpu-qom.h +++ b/target/i386/cpu-qom.h @@ -48,6 +48,7 @@ typedef struct X86CPUDefinition X86CPUDefinition; * X86CPUClass: * @cpu_def: CPU model definition * @kvm_required: Whether CPU model requires KVM to be enabled. + * @migration_safe: See CpuDefinitionInfo::migration_safe * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. * @@ -62,6 +63,7 @@ typedef struct X86CPUClass { X86CPUDefinition *cpu_def; bool kvm_required; + bool migration_safe; /* Optional description of CPU model. * If unavailable, cpu_def->model_id is used */ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 0e5ecb3a0fe..cff23e129dc 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2209,6 +2209,8 @@ static void x86_cpu_definition_entry(gpointer data, gpointer user_data) x86_cpu_class_check_missing_features(cc, &info->unavailable_features); info->has_unavailable_features = true; info->q_typename = g_strdup(object_class_get_name(oc)); + info->migration_safe = cc->migration_safe; + info->has_migration_safe = true; entry = g_malloc0(sizeof(*entry)); entry->value = info; @@ -2356,6 +2358,7 @@ static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data) X86CPUClass *xcc = X86_CPU_CLASS(oc); xcc->cpu_def = cpudef; + xcc->migration_safe = true; } static void x86_register_cpudef_type(X86CPUDefinition *def)