From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5DGE-0005FZ-5Q for qemu-devel@nongnu.org; Wed, 17 Jun 2015 09:20:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5DG5-0000JQ-Ok for qemu-devel@nongnu.org; Wed, 17 Jun 2015 09:20:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33539) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5DG5-0000JK-Kc for qemu-devel@nongnu.org; Wed, 17 Jun 2015 09:20:01 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 3751FC4622 for ; Wed, 17 Jun 2015 13:20:01 +0000 (UTC) From: Laszlo Ersek Date: Wed, 17 Jun 2015 14:44:59 +0200 Message-Id: <1434545105-5811-2-git-send-email-lersek@redhat.com> In-Reply-To: <1434545105-5811-1-git-send-email-lersek@redhat.com> References: <1434545105-5811-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH v6 1/7] migration: introduce VMSTATE_BUFFER_UNSAFE_INFO_TEST() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, lersek@redhat.com Cc: Amit Shah , Marcel Apfelbaum , "Michael S. Tsirkin" , Juan Quintela There is no _TEST() variant of VMSTATE_BUFFER_UNSAFE_INFO() yet, but we'll soon need it. Introduce it and rebase the original VMSTATE_BUFFER_UNSAFE_INFO() on top. The parameter order of the new function-like macro follows that of VMSTATE_SINGLE_TEST(): "_test" is introduced between "_state" and "_version". Cc: Juan Quintela Cc: Amit Shah Cc: Marcel Apfelbaum Cc: Michael S. Tsirkin Signed-off-by: Laszlo Ersek --- Notes: v6: - new in v6 include/migration/vmstate.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 7153b1e..0695d7c 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -500,9 +500,10 @@ extern const VMStateInfo vmstate_info_bitmap; .start = (_start), \ } -#define VMSTATE_BUFFER_UNSAFE_INFO(_field, _state, _version, _info, _size) { \ +#define VMSTATE_BUFFER_UNSAFE_INFO_TEST(_field, _state, _test, _version, _info, _size) { \ .name = (stringify(_field)), \ .version_id = (_version), \ + .field_exists = (_test), \ .size = (_size), \ .info = &(_info), \ .flags = VMS_BUFFER, \ @@ -562,6 +563,10 @@ extern const VMStateInfo vmstate_info_bitmap; VMSTATE_STRUCT_ARRAY_TEST(_field, _state, _num, NULL, _version, \ _vmsd, _type) +#define VMSTATE_BUFFER_UNSAFE_INFO(_field, _state, _version, _info, _size) \ + VMSTATE_BUFFER_UNSAFE_INFO_TEST(_field, _state, NULL, _version, _info, \ + _size) + #define VMSTATE_BOOL_V(_f, _s, _v) \ VMSTATE_SINGLE(_f, _s, _v, vmstate_info_bool, bool) -- 1.8.3.1