[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 81/97] vmstate: version_id is gone from fields
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 81/97] vmstate: version_id is gone from fields |
Date: |
Mon, 7 Apr 2014 05:21:39 +0200 |
And after all this work, fields don't have version_id anymore.
Signed-off-by: Juan Quintela <address@hidden>
---
include/migration/vmstate.h | 1 -
vmstate.c | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 12020d9..84533eb 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -112,7 +112,6 @@ typedef struct {
const VMStateInfo *info;
enum VMStateFlags flags;
const VMStateDescription *vmsd;
- int version_id;
bool (*field_exists)(void *opaque, int version_id);
} VMStateField;
diff --git a/vmstate.c b/vmstate.c
index ce197d2..ca6691b 100644
--- a/vmstate.c
+++ b/vmstate.c
@@ -74,10 +74,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription
*vmsd,
}
}
while (field->name) {
- if ((field->field_exists &&
- field->field_exists(opaque, version_id)) ||
- (!field->field_exists &&
- field->version_id <= version_id)) {
+ if (!field->field_exists || field->field_exists(opaque, version_id)) {
void *base_addr = vmstate_base_addr(opaque, field);
int i, n_elems = vmstate_n_elems(opaque, field);
int size = vmstate_size(opaque, field);
--
1.9.0
- [Qemu-devel] [PATCH 73/97] vmstate: Remove version parameter from VMSTATE_VARRAY_UINT32, (continued)
- [Qemu-devel] [PATCH 73/97] vmstate: Remove version parameter from VMSTATE_VARRAY_UINT32, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 74/97] vmstate: Remove version parameter from VMSTATE_STRUCT_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 75/97] vmstate: Move all users of versioning to VMSTATE_STRUCT_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 76/97] vmstate: Remove version from all VMSTATE_STRUCT calls, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 77/97] vmstate: Create VMSTATE_VARRAY macro, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 78/97] vmstate: Create VMSTATE_POINTER_UNSAFE, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 79/97] vmstate: Create VMSTATE_OPENCODED_UNSAFE, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 80/97] vmstate: Create VMSTATE_SYNTHETIC, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 81/97] vmstate: version_id is gone from fields,
Juan Quintela <=
- [Qemu-devel] [PATCH 83/97] vmstate: Test for VMSTATE_UINT8_SUB_ARRAY, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 82/97] vmstate: Test for VMSTATE_SYNTHETIC, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 84/97] vmstate: Test for VMSTATE_UINT32_SUB_ARRAY, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 90/97] vmstate: Test for VMSTATE_BUFFER_UNSAFE, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 91/97] vmstate: Remove unused VMSTATE_SUB_VBUFFER, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 92/97] vmstate: Remove unused VMSTATE_PARTIAL_VBUFFER_UINT32, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 93/97] vmstate: Test for VMSTATE_PARTIAL_VBUFFER, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 89/97] vmstate: Use VMSTATE_UINT8_2DARRAY instead of VMSTATE_BUFFER_TEST, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 94/97] vmstate: ename VMSTATE_PARTIAL_VBUFFER to VMSTATE_VBUFFER_INT32, Juan Quintela, 2014/04/06
- [Qemu-devel] [PATCH 95/97] vmstate: Create VMS_VBUFFER_UINT32, Juan Quintela, 2014/04/06