[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/26] Remove SaveVM v2 support
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 03/26] Remove SaveVM v2 support |
Date: |
Thu, 10 Sep 2009 03:04:24 +0200 |
In previosu series I remove v2 support for RAM (that was the version that was
supported when SaveVM v3 appeared). Now we can't load RAM for any image saved
in SaveVM v2, we can as well remove SaveVM v2 entirely.
Note: That SaveVM RAM was at v2 when General SaveVM support went from v2 to v3
makes talking about versions confusing at least
Signed-off-by: Juan Quintela <address@hidden>
---
savevm.c | 47 ++++-------------------------------------------
1 files changed, 4 insertions(+), 43 deletions(-)
diff --git a/savevm.c b/savevm.c
index 34145f9..0dcab79 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1266,47 +1266,6 @@ typedef struct LoadStateEntry {
int version_id;
} LoadStateEntry;
-static int qemu_loadvm_state_v2(QEMUFile *f)
-{
- SaveStateEntry *se;
- int len, ret, instance_id, record_len, version_id;
- int64_t total_len, end_pos, cur_pos;
- char idstr[256];
-
- total_len = qemu_get_be64(f);
- end_pos = total_len + qemu_ftell(f);
- for(;;) {
- if (qemu_ftell(f) >= end_pos)
- break;
- len = qemu_get_byte(f);
- qemu_get_buffer(f, (uint8_t *)idstr, len);
- idstr[len] = '\0';
- instance_id = qemu_get_be32(f);
- version_id = qemu_get_be32(f);
- record_len = qemu_get_be32(f);
- cur_pos = qemu_ftell(f);
- se = find_se(idstr, instance_id);
- if (!se) {
- fprintf(stderr, "qemu: warning: instance 0x%x of device '%s' not
present in current VM\n",
- instance_id, idstr);
- } else {
- ret = vmstate_load(f, se, version_id);
- if (ret < 0) {
- fprintf(stderr, "qemu: warning: error while loading state for
instance 0x%x of device '%s'\n",
- instance_id, idstr);
- return ret;
- }
- }
- /* always seek to exact end of record */
- qemu_fseek(f, cur_pos + record_len, SEEK_SET);
- }
-
- if (qemu_file_has_error(f))
- return -EIO;
-
- return 0;
-}
-
int qemu_loadvm_state(QEMUFile *f)
{
LIST_HEAD(, LoadStateEntry) loadvm_handlers =
@@ -1321,8 +1280,10 @@ int qemu_loadvm_state(QEMUFile *f)
return -EINVAL;
v = qemu_get_be32(f);
- if (v == QEMU_VM_FILE_VERSION_COMPAT)
- return qemu_loadvm_state_v2(f);
+ if (v == QEMU_VM_FILE_VERSION_COMPAT) {
+ fprintf(stderr, "SaveVM v2 format is obsolete and don't work
anymore\n");
+ return -ENOTSUP;
+ }
if (v != QEMU_VM_FILE_VERSION)
return -ENOTSUP;
--
1.6.2.5
- [Qemu-devel] [PATCH 00/26] VMState: port several pc devices to vmstate, Juan Quintela, 2009/09/09
- [Qemu-devel] [PATCH 01/26] ram: remove support for loading v1, Juan Quintela, 2009/09/09
- [Qemu-devel] [PATCH 02/26] ram: Remove SaveVM Version 2 support, Juan Quintela, 2009/09/09
- [Qemu-devel] [PATCH 04/26] timers: remove useless check, Juan Quintela, 2009/09/09
- [Qemu-devel] [PATCH 03/26] Remove SaveVM v2 support,
Juan Quintela <=
- Re: [Qemu-devel] [PATCH 03/26] Remove SaveVM v2 support, Stefano Stabellini, 2009/09/10
- [Qemu-devel] Re: [PATCH 03/26] Remove SaveVM v2 support, Juan Quintela, 2009/09/10
- [Qemu-devel] Re: [PATCH 03/26] Remove SaveVM v2 support, Stefano Stabellini, 2009/09/10
- Re: [Qemu-devel] Re: [PATCH 03/26] Remove SaveVM v2 support, Anthony Liguori, 2009/09/10
- Re: [Qemu-devel] Re: [PATCH 03/26] Remove SaveVM v2 support, Stefano Stabellini, 2009/09/11
- [Qemu-devel] Re: [PATCH 03/26] Remove SaveVM v2 support, Juan Quintela, 2009/09/11
- [Qemu-devel] Re: [PATCH 03/26] Remove SaveVM v2 support, Stefano Stabellini, 2009/09/11
- [Qemu-devel] Re: [PATCH 03/26] Remove SaveVM v2 support, Anthony Liguori, 2009/09/11
- [Qemu-devel] Re: [PATCH 03/26] Remove SaveVM v2 support, Juan Quintela, 2009/09/11
- [Qemu-devel] Re: [PATCH 03/26] Remove SaveVM v2 support, Stefano Stabellini, 2009/09/11