From patchwork Mon Jan 23 23:27:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 718823 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v6nb605xpz9t17 for ; Tue, 24 Jan 2017 10:29:38 +1100 (AEDT) Received: from localhost ([::1]:45152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVo3L-0004MH-Iz for incoming@patchwork.ozlabs.org; Mon, 23 Jan 2017 18:29:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVo1q-0003ET-Fz for qemu-devel@nongnu.org; Mon, 23 Jan 2017 18:28:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVo1p-0005xn-HV for qemu-devel@nongnu.org; Mon, 23 Jan 2017 18:28:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55082) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cVo1p-0005xX-Bu for qemu-devel@nongnu.org; Mon, 23 Jan 2017 18:28:01 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 88C1DC04B30E; Mon, 23 Jan 2017 23:28:01 +0000 (UTC) Received: from localhost (ovpn-116-36.gru2.redhat.com [10.97.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id F25C915827; Mon, 23 Jan 2017 23:28:00 +0000 (UTC) From: Eduardo Habkost To: Peter Maydell Date: Mon, 23 Jan 2017 21:27:28 -0200 Message-Id: <20170123232738.20796-4-ehabkost@redhat.com> In-Reply-To: <20170123232738.20796-1-ehabkost@redhat.com> References: <20170123232738.20796-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 23 Jan 2017 23:28:01 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 03/13] i386: Return migration-safe field on query-cpu-definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcel Apfelbaum , Paolo Bonzini , Igor Mammedov , qemu-devel@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- target/i386/cpu-qom.h | 2 ++ target/i386/cpu.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/target/i386/cpu-qom.h b/target/i386/cpu-qom.h index 7c9a07ae65..8cd607e9a2 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 0e5ecb3a0f..cff23e129d 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)