From patchwork Thu Feb 10 09:30:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 82583 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 D936BB70B3 for ; Thu, 10 Feb 2011 20:46:05 +1100 (EST) Received: from localhost ([127.0.0.1]:38102 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PnT62-0002Wq-Dd for incoming@patchwork.ozlabs.org; Thu, 10 Feb 2011 04:45:54 -0500 Received: from [140.186.70.92] (port=40667 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PnSss-0002Uj-5l for qemu-devel@nongnu.org; Thu, 10 Feb 2011 04:32:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PnSsg-00016s-G3 for qemu-devel@nongnu.org; Thu, 10 Feb 2011 04:32:13 -0500 Received: from sh.osrg.net ([192.16.179.4]:35776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PnSsf-00015X-Ru for qemu-devel@nongnu.org; Thu, 10 Feb 2011 04:32:06 -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 p1A9VoaI022321; Thu, 10 Feb 2011 18:31:52 +0900 Received: from localhost (hype-nh0.osrg.net [10.72.1.48]) by fs.osrg.net (Postfix) with ESMTP id AEE223E0420; Thu, 10 Feb 2011 18:31:46 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Thu, 10 Feb 2011 18:30:55 +0900 Message-Id: <1297330258-20494-16-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.1.2 In-Reply-To: <1297330258-20494-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1297330258-20494-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 247 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Thu, 10 Feb 2011 18:31:53 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.5 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 192.16.179.4 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 , blauwirbel@gmail.com, ohmura.kei@lab.ntt.co.jp, avi@redhat.com, pbonzini@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 15/18] 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_trans_{begin,commit} to send the memory and device info together, while avoiding cancelling memory state tracking. This patch also abstracts common code between qemu_savevm_state_{begin,iterate,commit}. Signed-off-by: Yoshiaki Tamura --- savevm.c | 157 +++++++++++++++++++++++++++++++++++++++----------------------- sysemu.h | 2 + 2 files changed, 101 insertions(+), 58 deletions(-) diff --git a/savevm.c b/savevm.c index e44eccd..1c2a7fb 100644 --- a/savevm.c +++ b/savevm.c @@ -1601,29 +1601,68 @@ bool qemu_savevm_state_blocked(Monitor *mon) return false; } -int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, - int shared) +/* + * section: header to write + * inc: if true, forces to pass SECTION_PART instead of SECTION_START + * pause: if true, breaks the loop when live handler returned 0 + */ +static int qemu_savevm_state_live(Monitor *mon, QEMUFile *f, int section, + bool inc, bool pause) { SaveStateEntry *se; + int skip = 0, ret; QTAILQ_FOREACH(se, &savevm_handlers, entry) { - if(se->set_params == NULL) { + int len, stage; + + if (se->save_live_state == NULL) { continue; - } - se->set_params(blk_enable, shared, se->opaque); + } + + /* Section type */ + qemu_put_byte(f, section); + qemu_put_be32(f, se->section_id); + + if (section == QEMU_VM_SECTION_START) { + /* 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 = inc ? QEMU_VM_SECTION_PART : QEMU_VM_SECTION_START; + } else { + assert(inc); + stage = section; + } + + ret = se->save_live_state(mon, f, stage, se->opaque); + if (!ret) { + skip++; + if (pause) { + break; + } + } } - - qemu_put_be32(f, QEMU_VM_FILE_MAGIC); - qemu_put_be32(f, QEMU_VM_FILE_VERSION); + + return skip; +} + +static void qemu_savevm_state_full(QEMUFile *f) +{ + SaveStateEntry *se; QTAILQ_FOREACH(se, &savevm_handlers, entry) { int len; - if (se->save_live_state == NULL) + if (se->save_state == NULL && se->vmsd == NULL) { continue; + } /* Section type */ - qemu_put_byte(f, QEMU_VM_SECTION_START); + qemu_put_byte(f, QEMU_VM_SECTION_FULL); qemu_put_be32(f, se->section_id); /* ID string */ @@ -1634,9 +1673,29 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, qemu_put_be32(f, se->instance_id); qemu_put_be32(f, se->version_id); - se->save_live_state(mon, f, QEMU_VM_SECTION_START, se->opaque); + vmstate_save(f, se); + } + + qemu_put_byte(f, QEMU_VM_EOF); +} + +int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, + int shared) +{ + SaveStateEntry *se; + + QTAILQ_FOREACH(se, &savevm_handlers, entry) { + if (se->set_params == NULL) { + continue; + } + se->set_params(blk_enable, shared, se->opaque); } + qemu_put_be32(f, QEMU_VM_FILE_MAGIC); + qemu_put_be32(f, QEMU_VM_FILE_VERSION); + + qemu_savevm_state_live(mon, f, QEMU_VM_SECTION_START, 0, 0); + if (qemu_file_has_error(f)) { qemu_savevm_state_cancel(mon, f); return -EIO; @@ -1647,29 +1706,16 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f) { - SaveStateEntry *se; int ret = 1; - QTAILQ_FOREACH(se, &savevm_handlers, entry) { - 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 before this one reported - completion of the current stage. This serializes the migration - and reduces the probability that a faster changing state is - synchronized over and over again. */ - break; - } - } - - if (ret) + /* Do not proceed to the next vmstate before this one reported + completion of the current stage. This serializes the migration + and reduces the probability that a faster changing state is + synchronized over and over again. */ + ret = qemu_savevm_state_live(mon, f, QEMU_VM_SECTION_PART, 1, 1); + if (!ret) { return 1; + } if (qemu_file_has_error(f)) { qemu_savevm_state_cancel(mon, f); @@ -1681,46 +1727,41 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f) int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) { - SaveStateEntry *se; - cpu_synchronize_all_states(); - QTAILQ_FOREACH(se, &savevm_handlers, entry) { - if (se->save_live_state == NULL) - continue; - - /* Section type */ - qemu_put_byte(f, QEMU_VM_SECTION_END); - qemu_put_be32(f, se->section_id); + qemu_savevm_state_live(mon, f, QEMU_VM_SECTION_END, 1, 0); + qemu_savevm_state_full(f); - se->save_live_state(mon, f, QEMU_VM_SECTION_END, se->opaque); + if (qemu_file_has_error(f)) { + return -EIO; } - QTAILQ_FOREACH(se, &savevm_handlers, entry) { - int len; + return 0; +} - if (se->save_state == NULL && se->vmsd == NULL) - continue; +int qemu_savevm_trans_begin(Monitor *mon, QEMUFile *f, int init) +{ + int ret; - /* Section type */ - qemu_put_byte(f, QEMU_VM_SECTION_FULL); - qemu_put_be32(f, se->section_id); + ret = qemu_savevm_state_live(mon, f, QEMU_VM_SECTION_START, !init, 0); - /* ID string */ - len = strlen(se->idstr); - qemu_put_byte(f, len); - qemu_put_buffer(f, (uint8_t *)se->idstr, len); + if (qemu_file_has_error(f)) { + return -EIO; + } - qemu_put_be32(f, se->instance_id); - qemu_put_be32(f, se->version_id); + return ret; +} - vmstate_save(f, se); - } +int qemu_savevm_trans_complete(Monitor *mon, QEMUFile *f) +{ + cpu_synchronize_all_states(); - qemu_put_byte(f, QEMU_VM_EOF); + qemu_savevm_state_live(mon, f, QEMU_VM_SECTION_PART, 1, 0); + qemu_savevm_state_full(f); - if (qemu_file_has_error(f)) + if (qemu_file_has_error(f)) { return -EIO; + } return 0; } diff --git a/sysemu.h b/sysemu.h index c86b4e8..6579714 100644 --- a/sysemu.h +++ b/sysemu.h @@ -81,6 +81,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 */