From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwTgj-0007zj-HP for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:59:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwTgb-0002ZB-Qx for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16382) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwTgb-0002Z1-HJ for qemu-devel@nongnu.org; Mon, 16 Jun 2014 05:58:45 -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 s5G9wiMr007402 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 16 Jun 2014 05:58:44 -0400 From: Juan Quintela Date: Mon, 16 Jun 2014 11:58:10 +0200 Message-Id: <1402912703-28195-15-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 14/27] vmstate: Test for VMSTATE_UINT8_TEST List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Remove VMSTATE_UINT8_V, we are removing versioning. Move all users to VMSTATE_UINT8_TEST. Signed-off-by: Juan Quintela --- hw/char/serial.c | 2 +- hw/ide/core.c | 2 +- hw/net/ne2000.c | 2 +- hw/timer/ds1338.c | 2 +- hw/timer/hpet.c | 2 +- include/migration/vmstate.h | 9 +++------ target-i386/machine.c | 10 +++++----- tests/test-vmstate.c | 7 ++++++- 8 files changed, 19 insertions(+), 17 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index d17da16..4ec0164 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -612,7 +612,7 @@ const VMStateDescription vmstate_serial = { VMSTATE_UINT8(lsr, SerialState), VMSTATE_UINT8(msr, SerialState), VMSTATE_UINT8(scr, SerialState), - VMSTATE_UINT8_V(fcr_vmstate, SerialState, 3), + VMSTATE_UINT8_TEST(fcr_vmstate, SerialState, vmstate_3_plus), VMSTATE_END_OF_LIST() } }; diff --git a/hw/ide/core.c b/hw/ide/core.c index 1cac5f5..2441e33 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2404,7 +2404,7 @@ const VMStateDescription vmstate_ide_drive = { VMSTATE_UINT8(lba48, IDEState), VMSTATE_UINT8(sense_key, IDEState), VMSTATE_UINT8(asc, IDEState), - VMSTATE_UINT8_V(cdrom_changed, IDEState, 3), + VMSTATE_UINT8_TEST(cdrom_changed, IDEState, vmstate_3_plus), VMSTATE_END_OF_LIST() }, .subsections = (VMStateSubsection []) { diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index d558b8c..84745d64 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -617,7 +617,7 @@ const VMStateDescription vmstate_ne2000 = { .minimum_version_id = 0, .post_load = ne2000_post_load, .fields = (VMStateField[]) { - VMSTATE_UINT8_V(rxcr, NE2000State, 2), + VMSTATE_UINT8_TEST(rxcr, NE2000State, vmstate_2_plus), VMSTATE_UINT8(cmd, NE2000State), VMSTATE_UINT32(start, NE2000State), VMSTATE_UINT32(stop, NE2000State), diff --git a/hw/timer/ds1338.c b/hw/timer/ds1338.c index ec6dbee..78b8e7b 100644 --- a/hw/timer/ds1338.c +++ b/hw/timer/ds1338.c @@ -43,7 +43,7 @@ static const VMStateDescription vmstate_ds1338 = { .fields = (VMStateField[]) { VMSTATE_I2C_SLAVE(parent_obj, DS1338State), VMSTATE_INT64(offset, DS1338State), - VMSTATE_UINT8_V(wday_offset, DS1338State, 2), + VMSTATE_UINT8_TEST(wday_offset, DS1338State, vmstate_2_plus), VMSTATE_UINT8_ARRAY(nvram, DS1338State, NVRAM_SIZE), VMSTATE_INT32(ptr, DS1338State), VMSTATE_BOOL(addr_byte, DS1338State), diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index e160e8f..f5da662 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -315,7 +315,7 @@ static const VMStateDescription vmstate_hpet = { VMSTATE_UINT64(config, HPETState), VMSTATE_UINT64(isr, HPETState), VMSTATE_UINT64(hpet_counter, HPETState), - VMSTATE_UINT8_V(num_timers, HPETState, 2), + VMSTATE_UINT8_TEST(num_timers, HPETState, vmstate_2_plus), VMSTATE_VALIDATE("num_timers in range", hpet_validate_num_timers), VMSTATE_STRUCT_VARRAY_UINT8(timer, HPETState, num_timers, 0, vmstate_hpet_timer, HPETTimer), diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f37d033..b66e540 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -547,8 +547,8 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_INT64_TEST(_f, _s, _t) \ VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int64, int64_t) -#define VMSTATE_UINT8_V(_f, _s, _v) \ - VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint8, uint8_t) +#define VMSTATE_UINT8_TEST(_f, _s, _t) \ + VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_uint8, uint8_t) #define VMSTATE_UINT16_V(_f, _s, _v) \ VMSTATE_SINGLE(_f, _s, _v, vmstate_info_uint16, uint16_t) #define VMSTATE_UINT32_V(_f, _s, _v) \ @@ -569,7 +569,7 @@ extern const VMStateInfo vmstate_info_bitmap; VMSTATE_INT64_TEST(_f, _s, NULL) #define VMSTATE_UINT8(_f, _s) \ - VMSTATE_UINT8_V(_f, _s, 0) + VMSTATE_UINT8_TEST(_f, _s, NULL) #define VMSTATE_UINT16(_f, _s) \ VMSTATE_UINT16_V(_f, _s, 0) #define VMSTATE_UINT32(_f, _s) \ @@ -604,9 +604,6 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_INT32_POSITIVE_LE(_f, _s) \ VMSTATE_SINGLE(_f, _s, 0, vmstate_info_int32_le, int32_t) -#define VMSTATE_UINT8_TEST(_f, _s, _t) \ - VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_uint8, uint8_t) - #define VMSTATE_UINT16_TEST(_f, _s, _t) \ VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_uint16, uint16_t) diff --git a/target-i386/machine.c b/target-i386/machine.c index 7e80b52..8f52c0e 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -673,7 +673,7 @@ const VMStateDescription vmstate_x86_cpu = { VMSTATE_UINT16_V(env.intercept_dr_read, X86CPU, 5), VMSTATE_UINT16_V(env.intercept_dr_write, X86CPU, 5), VMSTATE_UINT32_V(env.intercept_exceptions, X86CPU, 5), - VMSTATE_UINT8_V(env.v_tpr, X86CPU, 5), + VMSTATE_UINT8_TEST(env.v_tpr, X86CPU, vmstate_5_plus), /* MTRRs */ VMSTATE_UINT64_ARRAY_V(env.mtrr_fixed, X86CPU, 11, 8), VMSTATE_UINT64_V(env.mtrr_deftype, X86CPU, 8), @@ -683,10 +683,10 @@ const VMStateDescription vmstate_x86_cpu = { VMSTATE_UINT32_V(env.mp_state, X86CPU, 9), VMSTATE_UINT64_V(env.tsc, X86CPU, 9), VMSTATE_INT32_TEST(env.exception_injected, X86CPU, vmstate_11_plus), - VMSTATE_UINT8_V(env.soft_interrupt, X86CPU, 11), - VMSTATE_UINT8_V(env.nmi_injected, X86CPU, 11), - VMSTATE_UINT8_V(env.nmi_pending, X86CPU, 11), - VMSTATE_UINT8_V(env.has_error_code, X86CPU, 11), + VMSTATE_UINT8_TEST(env.soft_interrupt, X86CPU, vmstate_11_plus), + VMSTATE_UINT8_TEST(env.nmi_injected, X86CPU, vmstate_11_plus), + VMSTATE_UINT8_TEST(env.nmi_pending, X86CPU, vmstate_11_plus), + VMSTATE_UINT8_TEST(env.has_error_code, X86CPU, vmstate_11_plus), VMSTATE_UINT32_V(env.sipi_vector, X86CPU, 11), /* MCE */ VMSTATE_UINT64_V(env.mcg_cap, X86CPU, 10), diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index 1302aee..8678df4 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -150,7 +150,7 @@ static int load_vmstate(const VMStateDescription *desc, typedef struct TestSimple { bool b_1, b_2; - uint8_t u8_1; + uint8_t u8_1, u8_2; uint16_t u16_1; uint32_t u32_1; uint64_t u64_1; @@ -166,6 +166,7 @@ TestSimple obj_simple = { .b_1 = true, .b_2 = false, .u8_1 = 130, + .u8_2 = 222, .u16_1 = 512, .u32_1 = 70000, .u64_1 = 12121212, @@ -297,6 +298,8 @@ static const VMStateDescription vmstate_simple_test = { VMSTATE_INT32_TEST(i32_2, TestSimple, test_false), VMSTATE_INT64_TEST(i64_1, TestSimple, test_true), VMSTATE_INT64_TEST(i64_2, TestSimple, test_false), + VMSTATE_UINT8_TEST(u8_1, TestSimple, test_true), + VMSTATE_UINT8_TEST(u8_2, TestSimple, test_false), VMSTATE_END_OF_LIST() } }; @@ -307,6 +310,7 @@ uint8_t wire_simple_test[] = { /* i16_1 */ 0x02, 0x00, /* i32_1 */ 0x00, 0x01, 0x11, 0x70, /* i64_1 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xf4, 0x7c, + /* u8_1 */ 0x82, QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ }; @@ -328,6 +332,7 @@ static void test_simple_test(void) FIELD_EQUAL(i16_1); FIELD_EQUAL(i32_1); FIELD_EQUAL(i64_1); + FIELD_EQUAL(u8_1); } #undef FIELD_EQUAL -- 1.9.3