From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08i-0005Zp-TQ for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX08c-0008Ca-Ay for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34285) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX08c-0008CP-3v for qemu-devel@nongnu.org; Sun, 06 Apr 2014 23:22:22 -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 s373MLHG002307 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 6 Apr 2014 23:22:21 -0400 From: Juan Quintela Date: Mon, 7 Apr 2014 05:20:34 +0200 Message-Id: <1396840915-10384-17-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 16/97] 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 | 4 ++++ 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 16646d0..6243555 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -610,7 +610,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 ade1b89..b79cc9e 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 fa590e3..2148568 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -303,7 +303,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_STRUCT_VARRAY_UINT8(timer, HPETState, num_timers, 0, vmstate_hpet_timer, HPETTimer), VMSTATE_END_OF_LIST() diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index ba8b44d..5d2b68d 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -538,8 +538,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) \ @@ -560,7 +560,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) \ @@ -595,9 +595,6 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_INT32_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 2aecf5f..e4fd27c 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -665,7 +665,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), @@ -675,10 +675,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 b8d1309..9af83a6 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -251,6 +251,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() } }; @@ -261,6 +263,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 */ }; @@ -309,6 +312,7 @@ static void test_simple_test(void) FIELD_ASSERT(i16_1); FIELD_ASSERT(i32_1); FIELD_ASSERT(i64_1); + FIELD_ASSERT(u8_1); qemu_fclose(loading); } -- 1.9.0