From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwTgY-0007hO-5g for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwTgR-0002E2-TJ for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwTgR-0002DT-Jr for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:35 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5G9wYhL007364 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 16 Jun 2014 05:58:35 -0400 From: Juan Quintela Date: Mon, 16 Jun 2014 11:58:03 +0200 Message-Id: <1402912703-28195-8-git-send-email-quintela@redhat.com> In-Reply-To: <1402912703-28195-1-git-send-email-quintela@redhat.com> References: <1402912703-28195-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 07/27] vmstate: Change VMSTATE_INTTL_V to VMSTATE_INTTL_TEST List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org And fix all users. VMSTATE_UINT64_TEST don't exist. Create it. Signed-off-by: Juan Quintela --- include/hw/hw.h | 10 +++++----- include/migration/vmstate.h | 3 +++ target-i386/machine.c | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/hw/hw.h b/include/hw/hw.h index 2b68ac3..211eb8b 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -49,22 +49,22 @@ int qemu_boot_set(const char *boot_order); #ifdef NEED_CPU_H #if TARGET_LONG_BITS == 64 -#define VMSTATE_UINTTL_V(_f, _s, _v) \ - VMSTATE_UINT64_V(_f, _s, _v) +#define VMSTATE_UINTTL_TEST(_f, _s, _t) \ + VMSTATE_UINT64_TEST(_f, _s, _t) #define VMSTATE_UINTTL_EQUAL(_f, _s) \ VMSTATE_UINT64_EQUAL(_f, _s) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) #else -#define VMSTATE_UINTTL_V(_f, _s, _v) \ - VMSTATE_UINT32_V(_f, _s, _v) +#define VMSTATE_UINTTL_TEST(_f, _s, _t) \ + VMSTATE_UINT32_TEST(_f, _s, _t) #define VMSTATE_UINTTL_EQUAL(_f, _s) \ VMSTATE_UINT32_EQUAL(_f, _s) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) #endif #define VMSTATE_UINTTL(_f, _s) \ - VMSTATE_UINTTL_V(_f, _s, 0) + VMSTATE_UINTTL_TEST(_f, _s, NULL) #define VMSTATE_UINTTL_ARRAY(_f, _s, _n) \ VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index ea00bae..4d9c974 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -613,6 +613,9 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_UINT32_TEST(_f, _s, _t) \ VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_uint32, uint32_t) +#define VMSTATE_UINT64_TEST(_f, _s, _t) \ + VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_uint64, uint64_t) + #define VMSTATE_FLOAT64_V(_f, _s, _v) \ VMSTATE_SINGLE(_f, _s, _v, vmstate_info_float64, float64) diff --git a/target-i386/machine.c b/target-i386/machine.c index b8dcd2f..a684d75 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -632,8 +632,8 @@ const VMStateDescription vmstate_x86_cpu = { /* Hack: In v7 size changed from 32 to 64 bits on x86_64 */ VMSTATE_HACK_UINT32(env.sysenter_esp, X86CPU, less_than_7), VMSTATE_HACK_UINT32(env.sysenter_eip, X86CPU, less_than_7), - VMSTATE_UINTTL_V(env.sysenter_esp, X86CPU, 7), - VMSTATE_UINTTL_V(env.sysenter_eip, X86CPU, 7), + VMSTATE_UINTTL_TEST(env.sysenter_esp, X86CPU, vmstate_7_plus), + VMSTATE_UINTTL_TEST(env.sysenter_eip, X86CPU, vmstate_7_plus), #else VMSTATE_UINTTL(env.sysenter_esp, X86CPU), VMSTATE_UINTTL(env.sysenter_eip, X86CPU), -- 1.9.3