From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yoshiaki Tamura Subject: [PATCH 15/19] savevm: introduce qemu_savevm_trans_{begin,commit}. Date: Wed, 26 Jan 2011 18:42:07 +0900 Message-ID: <1296034931-10843-16-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1296034931-10843-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, blauwirbel@gmail.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]:49684 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751557Ab1AZJny (ORCPT ); Wed, 26 Jan 2011 04:43:54 -0500 In-Reply-To: <1296034931-10843-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Sender: kvm-owner@vger.kernel.org List-ID: 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 | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sysemu.h | 2 + 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/savevm.c b/savevm.c index 5418280..73465ed 100644 --- a/savevm.c +++ b/savevm.c @@ -1726,6 +1726,99 @@ 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 329415f..ee2c382 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 */ -- 1.7.1.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51237 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi1vJ-0004Ki-Fk for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:44:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pi1ue-00069g-FO for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:43:44 -0500 Received: from sh.osrg.net ([192.16.179.4]:45563) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pi1ud-00068B-Tp for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:43:40 -0500 From: Yoshiaki Tamura Date: Wed, 26 Jan 2011 18:42:07 +0900 Message-Id: <1296034931-10843-16-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> In-Reply-To: <1296034931-10843-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1296034931-10843-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> Subject: [Qemu-devel] [PATCH 15/19] savevm: introduce qemu_savevm_trans_{begin, commit}. 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 , blauwirbel@gmail.com, ohmura.kei@lab.ntt.co.jp, avi@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com 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 | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sysemu.h | 2 + 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/savevm.c b/savevm.c index 5418280..73465ed 100644 --- a/savevm.c +++ b/savevm.c @@ -1726,6 +1726,99 @@ 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 329415f..ee2c382 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 */ -- 1.7.1.2