From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwTgV-0007ei-MO for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwTgP-0002D4-Iv for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41862) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwTgP-0002Cw-28 for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:33 -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 s5G9wWa1025012 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 16 Jun 2014 05:58:32 -0400 From: Juan Quintela Date: Mon, 16 Jun 2014 11:58:01 +0200 Message-Id: <1402912703-28195-6-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 05/27] vmstate: Create test functions for versions until 15 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Using macros, just to avoid repeating code. Signed-off-by: Juan Quintela --- include/migration/vmstate.h | 16 ++++++++++++++++ vmstate.c | 22 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 7e45048..ea00bae 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -778,4 +778,20 @@ void vmstate_register_ram(struct MemoryRegion *memory, DeviceState *dev); void vmstate_unregister_ram(struct MemoryRegion *memory, DeviceState *dev); void vmstate_register_ram_global(struct MemoryRegion *memory); +/* Return true if version_id > X */ +bool vmstate_2_plus(void *opaque, int version_id); +bool vmstate_3_plus(void *opaque, int version_id); +bool vmstate_4_plus(void *opaque, int version_id); +bool vmstate_5_plus(void *opaque, int version_id); +bool vmstate_6_plus(void *opaque, int version_id); +bool vmstate_7_plus(void *opaque, int version_id); +bool vmstate_8_plus(void *opaque, int version_id); +bool vmstate_9_plus(void *opaque, int version_id); +bool vmstate_10_plus(void *opaque, int version_id); +bool vmstate_11_plus(void *opaque, int version_id); +bool vmstate_12_plus(void *opaque, int version_id); +bool vmstate_13_plus(void *opaque, int version_id); +bool vmstate_14_plus(void *opaque, int version_id); +bool vmstate_15_plus(void *opaque, int version_id); + #endif diff --git a/vmstate.c b/vmstate.c index c996520..bca15a8 100644 --- a/vmstate.c +++ b/vmstate.c @@ -671,3 +671,25 @@ const VMStateInfo vmstate_info_bitmap = { .get = get_bitmap, .put = put_bitmap, }; + +/* version is X or bigger */ +#define VMSTATE_X_PLUS(X)\ +bool vmstate_##X##_plus(void *opaque, int version_id)\ +{\ + return version_id >= X;\ +} + +VMSTATE_X_PLUS(2) +VMSTATE_X_PLUS(3) +VMSTATE_X_PLUS(4) +VMSTATE_X_PLUS(5) +VMSTATE_X_PLUS(6) +VMSTATE_X_PLUS(7) +VMSTATE_X_PLUS(8) +VMSTATE_X_PLUS(9) +VMSTATE_X_PLUS(10) +VMSTATE_X_PLUS(11) +VMSTATE_X_PLUS(12) +VMSTATE_X_PLUS(13) +VMSTATE_X_PLUS(14) +VMSTATE_X_PLUS(15) -- 1.9.3