From patchwork Thu Nov 25 06:06:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 72986 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 113EAB70AA for ; Thu, 25 Nov 2010 18:00:55 +1100 (EST) Received: from localhost ([127.0.0.1]:37335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLVp6-0001yI-02 for incoming@patchwork.ozlabs.org; Thu, 25 Nov 2010 02:00:52 -0500 Received: from [140.186.70.92] (port=60959 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLVh3-0007Zy-Hz for qemu-devel@nongnu.org; Thu, 25 Nov 2010 01:52:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PLVh0-0007t8-1M for qemu-devel@nongnu.org; Thu, 25 Nov 2010 01:52:33 -0500 Received: from sh.osrg.net ([192.16.179.4]:32979) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PLVgz-0007rt-A0 for qemu-devel@nongnu.org; Thu, 25 Nov 2010 01:52:29 -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 oAP6q02L003056; Thu, 25 Nov 2010 15:52:02 +0900 Received: from localhost (hype-nh0.osrg.net [10.72.1.48]) by fs.osrg.net (Postfix) with ESMTP id 8B28D3E0434; Thu, 25 Nov 2010 15:51:57 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Thu, 25 Nov 2010 15:06:56 +0900 Message-Id: <1290665220-26478-18-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1.2 In-Reply-To: <1290665220-26478-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1290665220-26478-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 124 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Thu, 25 Nov 2010 15:52:03 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.4 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aliguori@us.ibm.com, mtosatti@redhat.com, ananth@in.ibm.com, ohmura.kei@lab.ntt.co.jp, dlaor@redhat.com, vatsa@linux.vnet.ibm.com, Yoshiaki Tamura , avi@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 17/21] savevm: introduce qemu_savevm_trans_{begin, commit}. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Introduce qemu_savevm_state_{begin,commit} to send the memory and device info together, while avoiding cancelling memory state tracking. Signed-off-by: Yoshiaki Tamura --- savevm.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sysemu.h | 2 + 2 files changed, 90 insertions(+), 0 deletions(-) diff --git a/savevm.c b/savevm.c index afd4046..4e4be7c 100644 --- a/savevm.c +++ b/savevm.c @@ -1740,6 +1740,94 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) return 0; } +int qemu_savevm_trans_begin(Monitor *mon, QEMUFile *f, int init) +{ + SaveStateEntry *se; + int skipped = 0; + + QTAILQ_FOREACH(se, &savevm_handlers, entry) { + int len, stage, ret; + + if (se->save_live_state == NULL) + continue; + + /* Section type */ + qemu_put_byte(f, QEMU_VM_SECTION_START); + qemu_put_be32(f, se->section_id); + + /* ID string */ + len = strlen(se->idstr); + qemu_put_byte(f, len); + qemu_put_buffer(f, (uint8_t *)se->idstr, len); + + qemu_put_be32(f, se->instance_id); + qemu_put_be32(f, se->version_id); + + stage = init ? QEMU_VM_SECTION_START : QEMU_VM_SECTION_PART; + ret = se->save_live_state(mon, f, stage, se->opaque); + if (!ret) { + skipped++; + } + } + + if (qemu_file_has_error(f)) + return -EIO; + + return skipped; +} + +int qemu_savevm_trans_complete(Monitor *mon, QEMUFile *f) +{ + SaveStateEntry *se; + + cpu_synchronize_all_states(); + + QTAILQ_FOREACH(se, &savevm_handlers, entry) { + int ret; + + if (se->save_live_state == NULL) + continue; + + /* Section type */ + qemu_put_byte(f, QEMU_VM_SECTION_PART); + qemu_put_be32(f, se->section_id); + + ret = se->save_live_state(mon, f, QEMU_VM_SECTION_PART, se->opaque); + if (!ret) { + /* do not proceed to the next vmstate. */ + return 1; + } + } + + QTAILQ_FOREACH(se, &savevm_handlers, entry) { + int len; + + if (se->save_state == NULL && se->vmsd == NULL) + continue; + + /* Section type */ + qemu_put_byte(f, QEMU_VM_SECTION_FULL); + qemu_put_be32(f, se->section_id); + + /* ID string */ + len = strlen(se->idstr); + qemu_put_byte(f, len); + qemu_put_buffer(f, (uint8_t *)se->idstr, len); + + qemu_put_be32(f, se->instance_id); + qemu_put_be32(f, se->version_id); + + vmstate_save(f, se); + } + + qemu_put_byte(f, QEMU_VM_EOF); + + if (qemu_file_has_error(f)) + return -EIO; + + return 0; +} + void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f) { SaveStateEntry *se; diff --git a/sysemu.h b/sysemu.h index 588548a..5516493 100644 --- a/sysemu.h +++ b/sysemu.h @@ -78,6 +78,8 @@ 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_savevm_trans_begin(Monitor *mon, QEMUFile *f, int init); +int qemu_savevm_trans_complete(Monitor *mon, QEMUFile *f); int qemu_loadvm_state(QEMUFile *f, int skip_header); /* SLIRP */