From patchwork Tue Feb 1 18:21:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 81347 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 BF17EB70EA for ; Wed, 2 Feb 2011 05:24:11 +1100 (EST) Received: from localhost ([127.0.0.1]:41471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PkKtA-0003li-Nb for incoming@patchwork.ozlabs.org; Tue, 01 Feb 2011 13:23:40 -0500 Received: from [140.186.70.92] (port=38017 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PkKrs-00034P-W1 for qemu-devel@nongnu.org; Tue, 01 Feb 2011 13:22:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PkKrp-00062i-Hl for qemu-devel@nongnu.org; Tue, 01 Feb 2011 13:22:18 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:44658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PkKrp-00062C-6A for qemu-devel@nongnu.org; Tue, 01 Feb 2011 13:22:17 -0500 Received: by wwi18 with SMTP id 18so6800532wwi.10 for ; Tue, 01 Feb 2011 10:22:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=S74+pjSqr28/7JljfCWYr89cvYWOUh/Dii3CcmNDPz4=; b=pk/s3u2yTUTs6JyQ+7BMEZ4TdI5a+YU9eoZmv+fGBeHfRdoHyOy9fHjg0lsPVSyTI1 ThMedTNv490emDPFirLb0F20f4fD5ABgerTgrFhkHNJH3e1G8ucIUqCdbxK2vmXmCuIP MsLqRQNbVt+LHpXxt89OTjXlWRsIVyVZK5j/c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; b=cQUuvUDNyBnSakC+3KRnBpcf9MpRJc38umSlOHm4RNBd11la3ulH53+QCbzFFCL5De bdFBs2zaaG2i+x6P8Me3ftVAPaWOAIoZcdr19c8lwwXmE1UFCjWDm73Khru2LoaOuOFi rtUdS3e2gDWcFMkTZojtZ+HQsmuuRwmcpTGDI= MIME-Version: 1.0 Received: by 10.227.127.75 with SMTP id f11mr1597958wbs.87.1296584509615; Tue, 01 Feb 2011 10:21:49 -0800 (PST) Received: by 10.216.59.141 with HTTP; Tue, 1 Feb 2011 10:21:49 -0800 (PST) In-Reply-To: References: <1296199312-26334-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> <1296199312-26334-16-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> <4D42C41D.7090705@redhat.com> Date: Wed, 2 Feb 2011 03:21:49 +0900 X-Google-Sender-Auth: xA4lsEcIgq03TH_mNcDlnn2nay0 Message-ID: From: Yoshiaki Tamura To: Paolo Bonzini X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] Re: [PATCH 15/19] 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 Paolo, I refactored the savevm functions. Could you give me your comments? Thanks, Yoshi /* SLIRP */ diff --git a/savevm.c b/savevm.c index 5418280..90aae55 100644 --- a/savevm.c +++ b/savevm.c @@ -1602,29 +1602,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 */ @@ -1635,8 +1674,28 @@ 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); @@ -1648,29 +1707,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); @@ -1682,46 +1728,40 @@ 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 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);