From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9lX4-0002km-GZ for qemu-devel@nongnu.org; Mon, 19 Mar 2012 18:58:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S9lWm-0000rR-Ua for qemu-devel@nongnu.org; Mon, 19 Mar 2012 18:58:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9lWm-0000rA-MY for qemu-devel@nongnu.org; Mon, 19 Mar 2012 18:58:12 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2JMwBuP024695 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 19 Mar 2012 18:58:11 -0400 From: Juan Quintela Date: Mon, 19 Mar 2012 23:57:32 +0100 Message-Id: <548618fc83713e6e26043704ce82f7fc8708e754.1332197811.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 04/36] vmstate: use new cpu style for x86 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- target-i386/cpu.h | 2 -- target-i386/machine.c | 12 +----------- 2 files changed, 1 insertions(+), 13 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index a1ed3e7..b2eeb9b 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -964,8 +964,6 @@ uint64_t cpu_get_tsc(CPUX86State *env); #define cpu_list_id x86_cpu_list #define cpudef_setup x86_cpudef_setup -#define CPU_SAVE_VERSION 12 - /* MMU modes definitions */ #define MMU_MODE0_SUFFIX _kernel #define MMU_MODE1_SUFFIX _user diff --git a/target-i386/machine.c b/target-i386/machine.c index fc37738..127c44f 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -348,7 +348,7 @@ static const VMStateDescription vmstate_msr_ia32_misc_enable = { const VMStateDescription vmstate_cpu = { .name = "cpu", - .version_id = CPU_SAVE_VERSION, + .version_id = 12, .minimum_version_id = 3, .minimum_version_id_old = 3, .pre_save = cpu_pre_save, @@ -467,13 +467,3 @@ const VMStateDescription vmstate_cpu = { } } }; - -void cpu_save(QEMUFile *f, void *opaque) -{ - vmstate_save_state(f, &vmstate_cpu, opaque); -} - -int cpu_load(QEMUFile *f, void *opaque, int version_id) -{ - return vmstate_load_state(f, &vmstate_cpu, opaque, version_id); -} -- 1.7.7.6