[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 086/124] vmstate: version_id is gone from fields
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 086/124] vmstate: version_id is gone from fields |
Date: |
Mon, 21 Apr 2014 16:41:06 +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 05d9ecb..b363eca 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 dd74730..bd52c79 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 075/124] vmstate: Remove unused version parameter from VMSTATE_STRUCT_VARRAY_INT32, (continued)
- [Qemu-devel] [PATCH 075/124] vmstate: Remove unused version parameter from VMSTATE_STRUCT_VARRAY_INT32, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 077/124] vmstate: Introduce VMSTATE_VARRAY_UINT32_TEST, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 078/124] vmstate: Remove version parameter from VMSTATE_VARRAY_UINT32, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 079/124] vmstate: Remove version parameter from VMSTATE_STRUCT_TEST, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 080/124] vmstate: Move all users of versioning to VMSTATE_STRUCT_TEST, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 081/124] vmstate: Remove version from all VMSTATE_STRUCT calls, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 082/124] vmstate: Create VMSTATE_VARRAY macro, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 083/124] vmstate: Create VMSTATE_POINTER_UNSAFE, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 084/124] vmstate: Create VMSTATE_OPENCODED_UNSAFE, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 085/124] vmstate: Create VMSTATE_SYNTHETIC, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 086/124] vmstate: version_id is gone from fields,
Juan Quintela <=
- [Qemu-devel] [PATCH 087/124] vmstate: Test for VMSTATE_SYNTHETIC, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 089/124] vmstate: Test for VMSTATE_UINT32_SUB_ARRAY, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 090/124] vmstate: Test for VMSTATE_BUFFER, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 088/124] vmstate: Test for VMSTATE_UINT8_SUB_ARRAY, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 091/124] vmstate: Test for VMSTATE_PARTIAL_BUFFER, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 093/124] vmstate: Test for VMSTATE_BUFFER_TEST, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 094/124] vmstate: Use VMSTATE_UINT8_2DARRAY instead of VMSTATE_BUFFER_TEST, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 092/124] vmstate: Test for VMSTATE_BUFFER_START_MIDDLE, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 095/124] vmstate: Test for VMSTATE_BUFFER_UNSAFE, Juan Quintela, 2014/04/21
- [Qemu-devel] [PATCH 096/124] vmstate: Remove unused VMSTATE_SUB_VBUFFER, Juan Quintela, 2014/04/21