From patchwork Wed Apr 21 05:57:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 93809 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3L62Lme005310 for ; Wed, 21 Apr 2010 06:02:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752248Ab0DUGCI (ORCPT ); Wed, 21 Apr 2010 02:02:08 -0400 Received: from sh.osrg.net ([192.16.179.4]:58780 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751979Ab0DUGCB (ORCPT ); Wed, 21 Apr 2010 02:02:01 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o3L61QrK004087; Wed, 21 Apr 2010 15:01:26 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 326E43E02F7; Wed, 21 Apr 2010 15:01:25 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: avi@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ohmura.kei@lab.ntt.co.jp, yoshikawa.takuya@oss.ntt.co.jp, Yoshiaki Tamura Subject: [RFC PATCH 10/20] Introduce skip_header parameter to qemu_loadvm_state() so that it can be called iteratively without reading the header. Date: Wed, 21 Apr 2010 14:57:15 +0900 Message-Id: <1271829445-5328-11-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1271829445-5328-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 130 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 21 Apr 2010 06:02:28 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 21 Apr 2010 15:01:26 +0900 (JST) X-Virus-Scanned: clamav-milter 0.95.3 at sh X-Virus-Status: Clean Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/migration-exec.c b/migration-exec.c index 3edc026..5839a6d 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -113,7 +113,7 @@ static void exec_accept_incoming_migration(void *opaque) QEMUFile *f = opaque; int ret; - ret = qemu_loadvm_state(f); + ret = qemu_loadvm_state(f, 0); if (ret < 0) { fprintf(stderr, "load of migration failed\n"); goto err; diff --git a/migration-fd.c b/migration-fd.c index 0cc74ad..0e97ed0 100644 --- a/migration-fd.c +++ b/migration-fd.c @@ -106,7 +106,7 @@ static void fd_accept_incoming_migration(void *opaque) QEMUFile *f = opaque; int ret; - ret = qemu_loadvm_state(f); + ret = qemu_loadvm_state(f, 0); if (ret < 0) { fprintf(stderr, "load of migration failed\n"); goto err; diff --git a/migration-tcp.c b/migration-tcp.c index 56e1a3b..94a1a03 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -182,7 +182,7 @@ static void tcp_accept_incoming_migration(void *opaque) goto out; } - ret = qemu_loadvm_state(f); + ret = qemu_loadvm_state(f, 0); if (ret < 0) { fprintf(stderr, "load of migration failed\n"); goto out_fopen; diff --git a/migration-unix.c b/migration-unix.c index b7aab38..dd99a73 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -168,7 +168,7 @@ static void unix_accept_incoming_migration(void *opaque) goto out; } - ret = qemu_loadvm_state(f); + ret = qemu_loadvm_state(f, 0); if (ret < 0) { fprintf(stderr, "load of migration failed\n"); goto out_fopen; diff --git a/savevm.c b/savevm.c index 22d928c..a401b27 100644 --- a/savevm.c +++ b/savevm.c @@ -1554,7 +1554,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); @@ -1563,17 +1563,20 @@ 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 v3 format is obsolete and don't work anymore\n"); + return -ENOTSUP; + } + if (v != QEMU_VM_FILE_VERSION) + 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; while ((section_type = qemu_get_byte(f)) != QEMU_VM_EOF) { uint32_t instance_id, version_id, section_id; @@ -1898,7 +1901,7 @@ int load_vmstate(Monitor *mon, const char *name) monitor_printf(mon, "Could not open VM state file\n"); return -EINVAL; } - ret = qemu_loadvm_state(f); + ret = qemu_loadvm_state(f, 0); qemu_fclose(f); if (ret < 0) { monitor_printf(mon, "Error %d while loading VM state\n", ret); diff --git a/sysemu.h b/sysemu.h index 647a468..6c1441f 100644 --- a/sysemu.h +++ b/sysemu.h @@ -68,7 +68,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); void qemu_errors_to_file(FILE *fp); void qemu_errors_to_mon(Monitor *mon);