[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/97] vmstate: Test for VMSTATE_INT32_TEST
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 14/97] vmstate: Test for VMSTATE_INT32_TEST |
Date: |
Mon, 7 Apr 2014 05:20:32 +0200 |
Remove VMSTATE_INT32_V, we are removing versioning.
Move all users to use tests.
Signed-off-by: Juan Quintela <address@hidden>
---
hw/input/ps2.c | 2 +-
include/migration/vmstate.h | 6 +++---
target-i386/machine.c | 4 ++--
tests/test-vmstate.c | 4 ++++
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index 0a0bd80..e05ff0d 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -613,7 +613,7 @@ static const VMStateDescription vmstate_ps2_keyboard = {
VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2State),
VMSTATE_INT32(scan_enabled, PS2KbdState),
VMSTATE_INT32(translate, PS2KbdState),
- VMSTATE_INT32_V(scancode_set, PS2KbdState,3),
+ VMSTATE_INT32_TEST(scancode_set, PS2KbdState, vmstate_3_plus),
VMSTATE_END_OF_LIST()
},
.subsections = (VMStateSubsection []) {
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 645316a..85356be 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -533,8 +533,8 @@ extern const VMStateInfo vmstate_info_bitmap;
VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int8, int8_t)
#define VMSTATE_INT16_TEST(_f, _s, _t) \
VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int16, int16_t)
-#define VMSTATE_INT32_V(_f, _s, _v) \
- VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int32, int32_t)
+#define VMSTATE_INT32_TEST(_f, _s, _t) \
+ VMSTATE_SINGLE_TEST(_f, _s, _t, 0, vmstate_info_int32, int32_t)
#define VMSTATE_INT64_V(_f, _s, _v) \
VMSTATE_SINGLE(_f, _s, _v, vmstate_info_int64, int64_t)
@@ -555,7 +555,7 @@ extern const VMStateInfo vmstate_info_bitmap;
#define VMSTATE_INT16(_f, _s) \
VMSTATE_INT16_TEST(_f, _s, NULL)
#define VMSTATE_INT32(_f, _s) \
- VMSTATE_INT32_V(_f, _s, 0)
+ VMSTATE_INT32_TEST(_f, _s, NULL)
#define VMSTATE_INT64(_f, _s) \
VMSTATE_INT64_V(_f, _s, 0)
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 838a5b0..2aecf5f 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -671,10 +671,10 @@ const VMStateDescription vmstate_x86_cpu = {
VMSTATE_UINT64_V(env.mtrr_deftype, X86CPU, 8),
VMSTATE_MTRR_VARS(env.mtrr_var, X86CPU, 8, 8),
/* KVM-related states */
- VMSTATE_INT32_V(env.interrupt_injected, X86CPU, 9),
+ VMSTATE_INT32_TEST(env.interrupt_injected, X86CPU, vmstate_9_plus),
VMSTATE_UINT32_V(env.mp_state, X86CPU, 9),
VMSTATE_UINT64_V(env.tsc, X86CPU, 9),
- VMSTATE_INT32_V(env.exception_injected, X86CPU, 11),
+ 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),
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index 278df0e..75e5600 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -247,6 +247,8 @@ static const VMStateDescription vmstate_simple_test = {
VMSTATE_INT8_TEST(i8_2, TestSimple, test_false),
VMSTATE_INT16_TEST(i16_1, TestSimple, test_true),
VMSTATE_INT16_TEST(i16_2, TestSimple, test_false),
+ VMSTATE_INT32_TEST(i32_1, TestSimple, test_true),
+ VMSTATE_INT32_TEST(i32_2, TestSimple, test_false),
VMSTATE_END_OF_LIST()
}
};
@@ -255,6 +257,7 @@ uint8_t wire_simple_test[] = {
/* b_1 */ 0x01,
/* i8_1 */ 0x41,
/* i16_1 */ 0x02, 0x00,
+ /* i32_1 */ 0x00, 0x01, 0x11, 0x70,
QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
};
@@ -301,6 +304,7 @@ static void test_simple_test(void)
FIELD_ASSERT(b_1);
FIELD_ASSERT(i8_1);
FIELD_ASSERT(i16_1);
+ FIELD_ASSERT(i32_1);
qemu_fclose(loading);
}
--
1.9.0
- [Qemu-devel] [PATCH 07/97] vmstate: create test functions for versions until 15, (continued)
- [Qemu-devel] [PATCH 07/97] vmstate: create test functions for versions until 15, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 04/97] vmstate: reduce code duplication, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 06/97] vmstate: Refactor & increase tests for primitive types, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 08/97] vmstate: Remove VMSTATE_UINTL_EQUAL_V, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 09/97] vmstate: Change VMSTATE_INTTL_V to VMSTATE_INTTL_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 10/97] vmstate: Remove unused VMSTATE_UINTTL_ARRAY_V, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 11/97] vmstate: Test for VMSTATE_BOOL_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 12/97] vmstate: Test for VMSTATE_INT8_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 02/97] savevm: Remove all the unneded version_minimum_id_old (Massive), Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 13/97] vmstate: Test for VMSTATE_INT16_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 14/97] vmstate: Test for VMSTATE_INT32_TEST,
Juan Quintela <=
- [Qemu-devel] [PATCH 15/97] vmstate: test for VMSTATE_INT64_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 16/97] vmstate: Test for VMSTATE_UINT8_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 17/97] vmstate: Test for VMSTATE_UINT16_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 19/97] vmstate: Test for VMSTATE_UINT64_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 18/97] vmstate: Test for VMSTATE_UINT32_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 21/97] vmstate: Test for VMSTATE_UNUSED, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 20/97] vmstate: Test for VMSTATE_FLOAT64, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 22/97] vmstate: Test for VMSTATE_BITMAP, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 24/97] vmstate: Test for VMSTATE_UINT16_EQUAL, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 25/97] vmstate: Test for VMSTATE_UINT32_EQUAL, Juan Quintela, 2014/04/06