From patchwork Wed Jan 19 05:44:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 488361 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0J5l1lU018362 for ; Wed, 19 Jan 2011 05:47:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753414Ab1ASFqt (ORCPT ); Wed, 19 Jan 2011 00:46:49 -0500 Received: from sh.osrg.net ([192.16.179.4]:56346 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753420Ab1ASFqX (ORCPT ); Wed, 19 Jan 2011 00:46:23 -0500 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 p0J5jjBX019300; Wed, 19 Jan 2011 14:45:45 +0900 Received: from localhost (hype-nh0.osrg.net [10.72.1.48]) by fs.osrg.net (Postfix) with ESMTP id F11013E0411; Wed, 19 Jan 2011 14:45:44 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org 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, blauwirbel@gmail.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura Subject: [PATCH 03/19] Introduce skip_header parameter to qemu_loadvm_state(). Date: Wed, 19 Jan 2011 14:44:48 +0900 Message-Id: <1295415904-11918-4-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1.2 In-Reply-To: <1295415904-11918-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1295415904-11918-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 90 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 19 Jan 2011 05:47:01 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 19 Jan 2011 14:45:48 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.5 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.c b/migration.c index 4a749bb..9639659 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 d8fceec..81bcf00 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);