From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yoshiaki Tamura Subject: [PATCH 03/19] Introduce skip_header parameter to qemu_loadvm_state(). Date: Mon, 27 Dec 2010 17:25:21 +0900 Message-ID: <1293438337-21377-4-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1293438337-21377-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Cc: avi@redhat.com, anthony@codemonkey.ws, aliguori@us.ibm.com, mtosatti@redhat.com, dlaor@redhat.com, mst@redhat.com, kwolf@redhat.com, ananth@in.ibm.com, psuriset@linux.vnet.ibm.com, vatsa@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Return-path: Received: from sh.osrg.net ([192.16.179.4]:34223 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753394Ab0L0I3S (ORCPT ); Mon, 27 Dec 2010 03:29:18 -0500 In-Reply-To: <1293438337-21377-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Sender: kvm-owner@vger.kernel.org List-ID: Introduce skip_header parameter to qemu_loadvm_state() so that it can be called iteratively without reading the header. Signed-off-by: Yoshiaki Tamura --- migration.c | 2 +- savevm.c | 24 +++++++++++++----------- sysemu.h | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/migration.c b/migration.c index 6416ae5..a400199 100644 --- a/migration.c +++ b/migration.c @@ -60,7 +60,7 @@ int qemu_start_incoming_migration(const char *uri) void process_incoming_migration(QEMUFile *f) { - if (qemu_loadvm_state(f) < 0) { + if (qemu_loadvm_state(f, 0) < 0) { fprintf(stderr, "load of migration failed\n"); exit(0); } diff --git a/savevm.c b/savevm.c index 8c64c63..7bc3699 100644 --- a/savevm.c +++ b/savevm.c @@ -1701,7 +1701,7 @@ typedef struct LoadStateEntry { int version_id; } LoadStateEntry; -int qemu_loadvm_state(QEMUFile *f) +int qemu_loadvm_state(QEMUFile *f, int skip_header) { QLIST_HEAD(, LoadStateEntry) loadvm_handlers = QLIST_HEAD_INITIALIZER(loadvm_handlers); @@ -1710,17 +1710,19 @@ int qemu_loadvm_state(QEMUFile *f) unsigned int v; int ret; - v = qemu_get_be32(f); - if (v != QEMU_VM_FILE_MAGIC) - return -EINVAL; + if (!skip_header) { + v = qemu_get_be32(f); + if (v != QEMU_VM_FILE_MAGIC) + return -EINVAL; - v = qemu_get_be32(f); - if (v == QEMU_VM_FILE_VERSION_COMPAT) { - fprintf(stderr, "SaveVM v2 format is obsolete and don't work anymore\n"); - return -ENOTSUP; + v = qemu_get_be32(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; } - if (v != QEMU_VM_FILE_VERSION) - return -ENOTSUP; while ((section_type = qemu_get_byte(f)) != QEMU_VM_EOF) { uint32_t instance_id, version_id, section_id; @@ -2043,7 +2045,7 @@ int load_vmstate(const char *name) return -EINVAL; } - ret = qemu_loadvm_state(f); + ret = qemu_loadvm_state(f, 0); qemu_fclose(f); if (ret < 0) { diff --git a/sysemu.h b/sysemu.h index 38a20a3..735a8c8 100644 --- a/sysemu.h +++ b/sysemu.h @@ -80,7 +80,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f); int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f); void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f); -int qemu_loadvm_state(QEMUFile *f); +int qemu_loadvm_state(QEMUFile *f, int skip_header); /* SLIRP */ void do_info_slirp(Monitor *mon); -- 1.7.1.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=60999 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PX8S0-00072d-M9 for qemu-devel@nongnu.org; Mon, 27 Dec 2010 03:29:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PX8Ru-0001CP-7l for qemu-devel@nongnu.org; Mon, 27 Dec 2010 03:29:04 -0500 Received: from sh.osrg.net ([192.16.179.4]:52504) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PX8Rt-0001A0-Kg for qemu-devel@nongnu.org; Mon, 27 Dec 2010 03:28:58 -0500 From: Yoshiaki Tamura Date: Mon, 27 Dec 2010 17:25:21 +0900 Message-Id: <1293438337-21377-4-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> In-Reply-To: <1293438337-21377-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1293438337-21377-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Subject: [Qemu-devel] [PATCH 03/19] Introduce skip_header parameter to qemu_loadvm_state(). List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ananth@in.ibm.com, mst@redhat.com, dlaor@redhat.com, vatsa@linux.vnet.ibm.com, Yoshiaki Tamura , ohmura.kei@lab.ntt.co.jp, avi@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Introduce skip_header parameter to qemu_loadvm_state() so that it can be called iteratively without reading the header. Signed-off-by: Yoshiaki Tamura --- migration.c | 2 +- savevm.c | 24 +++++++++++++----------- sysemu.h | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/migration.c b/migration.c index 6416ae5..a400199 100644 --- a/migration.c +++ b/migration.c @@ -60,7 +60,7 @@ int qemu_start_incoming_migration(const char *uri) void process_incoming_migration(QEMUFile *f) { - if (qemu_loadvm_state(f) < 0) { + if (qemu_loadvm_state(f, 0) < 0) { fprintf(stderr, "load of migration failed\n"); exit(0); } diff --git a/savevm.c b/savevm.c index 8c64c63..7bc3699 100644 --- a/savevm.c +++ b/savevm.c @@ -1701,7 +1701,7 @@ typedef struct LoadStateEntry { int version_id; } LoadStateEntry; -int qemu_loadvm_state(QEMUFile *f) +int qemu_loadvm_state(QEMUFile *f, int skip_header) { QLIST_HEAD(, LoadStateEntry) loadvm_handlers = QLIST_HEAD_INITIALIZER(loadvm_handlers); @@ -1710,17 +1710,19 @@ int qemu_loadvm_state(QEMUFile *f) unsigned int v; int ret; - v = qemu_get_be32(f); - if (v != QEMU_VM_FILE_MAGIC) - return -EINVAL; + if (!skip_header) { + v = qemu_get_be32(f); + if (v != QEMU_VM_FILE_MAGIC) + return -EINVAL; - v = qemu_get_be32(f); - if (v == QEMU_VM_FILE_VERSION_COMPAT) { - fprintf(stderr, "SaveVM v2 format is obsolete and don't work anymore\n"); - return -ENOTSUP; + v = qemu_get_be32(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; } - if (v != QEMU_VM_FILE_VERSION) - return -ENOTSUP; while ((section_type = qemu_get_byte(f)) != QEMU_VM_EOF) { uint32_t instance_id, version_id, section_id; @@ -2043,7 +2045,7 @@ int load_vmstate(const char *name) return -EINVAL; } - ret = qemu_loadvm_state(f); + ret = qemu_loadvm_state(f, 0); qemu_fclose(f); if (ret < 0) { diff --git a/sysemu.h b/sysemu.h index 38a20a3..735a8c8 100644 --- a/sysemu.h +++ b/sysemu.h @@ -80,7 +80,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f); int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f); void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f); -int qemu_loadvm_state(QEMUFile *f); +int qemu_loadvm_state(QEMUFile *f, int skip_header); /* SLIRP */ void do_info_slirp(Monitor *mon); -- 1.7.1.2