From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52215)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <huaitong.han@intel.com>) id 1ZysMP-0008Sh-Pl
	for qemu-devel@nongnu.org; Tue, 17 Nov 2015 21:20:38 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <huaitong.han@intel.com>) id 1ZysMN-0002Ng-KK
	for qemu-devel@nongnu.org; Tue, 17 Nov 2015 21:20:37 -0500
Received: from mga02.intel.com ([134.134.136.20]:5101)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <huaitong.han@intel.com>) id 1ZysMN-0002Mp-EA
	for qemu-devel@nongnu.org; Tue, 17 Nov 2015 21:20:35 -0500
From: Huaitong Han <huaitong.han@intel.com>
Date: Wed, 18 Nov 2015 10:20:17 +0800
Message-Id: <1447813217-10532-4-git-send-email-huaitong.han@intel.com>
In-Reply-To: <1447813217-10532-1-git-send-email-huaitong.han@intel.com>
References: <1447813217-10532-1-git-send-email-huaitong.han@intel.com>
Subject: [Qemu-devel] [PATCH v3 3/3] target-i386: add pkeys support for vm
	migration
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: pbonzini@redhat.com, rth@twiddle.net, afaerber@suse.de, ehabkost@redhat.com
Cc: Huaitong Han <huaitong.han@intel.com>, qemu-devel@nongnu.org, kvm@vger.kernel.org

This patch adds pkeys support for vm migration.

Signed-off-by: Huaitong Han <huaitong.han@intel.com>

diff --git a/target-i386/machine.c b/target-i386/machine.c
index a0df64b..1b190c7 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -725,6 +725,26 @@ static const VMStateDescription vmstate_xss = {
         VMSTATE_END_OF_LIST()
     }
 };
+#ifdef TARGET_X86_64
+static bool pkru_needed(void *opaque)
+{
+    X86CPU *cpu = opaque;
+    CPUX86State *env = &cpu->env;
+
+    return env->pkru != 0;
+}
+
+static const VMStateDescription vmstate_pkru = {
+    .name = "cpu/pkru",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .needed = pkru_needed,
+    .fields = (VMStateField[]){
+        VMSTATE_UINT32(env.pkru, X86CPU),
+        VMSTATE_END_OF_LIST()
+    }
+};
+#endif
 
 VMStateDescription vmstate_x86_cpu = {
     .name = "cpu",
@@ -844,6 +864,9 @@ VMStateDescription vmstate_x86_cpu = {
         &vmstate_msr_hyperv_time,
         &vmstate_avx512,
         &vmstate_xss,
+#ifdef TARGET_X86_64
+        &vmstate_pkru,
+#endif
         NULL
     }
 };
-- 
2.4.3