From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08p-0005mI-Eq for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX08j-0008E9-7P for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16385) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08i-0008Dy-Uj for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:29 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s373MSjh031195 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:22:28 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:20:39 +0200 Message-Id: <1396840915-10384-22-git-send-email-quintela@redhat.com> In-Reply-To: <1396840915-10384-1-git-send-email-quintela@redhat.com> References: <1396840915-10384-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 21/97] vmstate: Test for VMSTATE_UNUSED List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Remove VMSTATE_UNUSED_V and fix only user. Signed-off-by: Juan Quintela --- hw/intc/ioapic_common.c | 3 ++- include/migration/vmstate.h | 11 ++--------- tests/test-vmstate.c | 5 +++++ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c index d4c0c8e..ae81d3f 100644 --- a/hw/intc/ioapic_common.c +++ b/hw/intc/ioapic_common.c @@ -91,7 +91,8 @@ static const VMStateDescription vmstate_ioapic_common = { .fields = (VMStateField[]) { VMSTATE_UINT8(id, IOAPICCommonState), VMSTATE_UINT8(ioregsel, IOAPICCommonState), - VMSTATE_UNUSED_V(2, 8), /* to account for qemu-kvm's v2 format */ + /* to account for qemu-kvm's v2 format */ + VMSTATE_UNUSED_TEST(vmstate_2_plus, 8), VMSTATE_UINT32_TEST(irr, IOAPICCommonState, vmstate_2_plus), VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICCommonState, IOAPIC_NUM_PINS), VMSTATE_END_OF_LIST() diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index eec4b13..b350eac 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -482,10 +482,9 @@ extern const VMStateInfo vmstate_info_bitmap; .offset = offsetof(_state, _field), \ } -#define VMSTATE_UNUSED_BUFFER(_test, _version, _size) { \ +#define VMSTATE_UNUSED_TEST(_test, _size) { \ .name = "unused", \ .field_exists = (_test), \ - .version_id = (_version), \ .size = (_size), \ .info = &vmstate_info_unused_buffer, \ .flags = VMS_BUFFER, \ @@ -719,14 +718,8 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_BUFFER_UNSAFE(_field, _state, _version, _size) \ VMSTATE_BUFFER_UNSAFE_INFO(_field, _state, _version, vmstate_info_buffer, _size) -#define VMSTATE_UNUSED_V(_v, _size) \ - VMSTATE_UNUSED_BUFFER(NULL, _v, _size) - #define VMSTATE_UNUSED(_size) \ - VMSTATE_UNUSED_V(0, _size) - -#define VMSTATE_UNUSED_TEST(_test, _size) \ - VMSTATE_UNUSED_BUFFER(_test, 0, _size) + VMSTATE_UNUSED_TEST(NULL, _size) #define VMSTATE_END_OF_LIST() \ {} diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index 21f02ad..e4096f7 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -116,6 +116,7 @@ static const VMStateDescription vmstate_simple_primitive = { VMSTATE_INT64(i64_1, TestSimple), VMSTATE_INT64(i64_2, TestSimple), VMSTATE_FLOAT64(f64, TestSimple), + VMSTATE_UNUSED(5), VMSTATE_END_OF_LIST() } }; @@ -148,6 +149,7 @@ uint8_t wire_simple_primitive[] = { /* i64_1 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xf4, 0x7c, /* i64_2 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0x47, 0x0b, 0x84, /* f64 */ 0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18, + /* unused */0x00, 0x00, 0x00, 0x00, 0x00, QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ }; @@ -264,6 +266,8 @@ static const VMStateDescription vmstate_simple_test = { VMSTATE_UINT32_TEST(u32_2, TestSimple, test_false), VMSTATE_UINT64_TEST(u64_1, TestSimple, test_true), VMSTATE_UINT64_TEST(u64_2, TestSimple, test_false), + VMSTATE_UNUSED_TEST(test_true, 5), + VMSTATE_UNUSED_TEST(test_false, 5), VMSTATE_END_OF_LIST() } }; @@ -278,6 +282,7 @@ uint8_t wire_simple_test[] = { /* u16_1 */ 0x02, 0x00, /* u32_1 */ 0x00, 0x01, 0x11, 0x70, /* u64_1 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xf4, 0x7c, + /* unused */0x00, 0x00, 0x00, 0x00, 0x00, QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ }; -- 1.9.0