From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjYO6-0002Fr-A6 for qemu-devel@nongnu.org; Fri, 14 Dec 2012 11:45:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TjYO5-0002TR-5f for qemu-devel@nongnu.org; Fri, 14 Dec 2012 11:45:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TjYO4-0002TN-TB for qemu-devel@nongnu.org; Fri, 14 Dec 2012 11:45:25 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBEGjJT4025327 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 14 Dec 2012 11:45:24 -0500 Date: Fri, 14 Dec 2012 14:45:16 -0200 From: Luiz Capitulino Message-ID: <20121214144516.782501b1@doriath.home> In-Reply-To: <70bb440d178e3ebcaefa27f5817ea4f096e8e259.1355404685.git.phrdina@redhat.com> References: <70bb440d178e3ebcaefa27f5817ea4f096e8e259.1355404685.git.phrdina@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 08/17] savevm: add error parameter to qemu_savevm_state_begin() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Hrdina Cc: qemu-devel@nongnu.org On Thu, 13 Dec 2012 16:40:42 +0100 Pavel Hrdina wrote: > Signed-off-by: Pavel Hrdina > --- > migration.c | 2 +- > savevm.c | 7 +++++-- > sysemu.h | 3 ++- > 3 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/migration.c b/migration.c > index 73ce170..bf51a07 100644 > --- a/migration.c > +++ b/migration.c > @@ -451,7 +451,7 @@ void migrate_fd_connect(MigrationState *s) > s->file = qemu_fopen_ops_buffered(s); > > DPRINTF("beginning savevm\n"); > - ret = qemu_savevm_state_begin(s->file, &s->params); > + ret = qemu_savevm_state_begin(s->file, &s->params, NULL); > if (ret < 0) { > DPRINTF("failed, %d\n", ret); > migrate_fd_error(s); > diff --git a/savevm.c b/savevm.c > index 3ee7da5..633a697 100644 > --- a/savevm.c > +++ b/savevm.c > @@ -1601,7 +1601,8 @@ bool qemu_savevm_state_blocked(Error **errp) > } > > int qemu_savevm_state_begin(QEMUFile *f, > - const MigrationParams *params) > + const MigrationParams *params, > + Error **errp) > { > SaveStateEntry *se; > int ret; > @@ -1641,12 +1642,14 @@ int qemu_savevm_state_begin(QEMUFile *f, > > ret = se->ops->save_live_setup(f, se->opaque); > if (ret < 0) { > + error_setg(errp, "Failed to begin vmstate save."); If possible, it would be nice to say why. > qemu_savevm_state_cancel(f); > return ret; > } > } > ret = qemu_file_get_error(f); > if (ret != 0) { > + error_setg(errp, "%s", strerror(errno)); We have error_setg_errno(). > qemu_savevm_state_cancel(f); > } > > @@ -1783,7 +1786,7 @@ static int qemu_savevm_state(QEMUFile *f) > goto out; > } > > - ret = qemu_savevm_state_begin(f, ¶ms); > + ret = qemu_savevm_state_begin(f, ¶ms, NULL); > if (ret < 0) > goto out; > > diff --git a/sysemu.h b/sysemu.h > index 1b6add2..07c5322 100644 > --- a/sysemu.h > +++ b/sysemu.h > @@ -74,7 +74,8 @@ void qemu_announce_self(void); > > bool qemu_savevm_state_blocked(Error **errp); > int qemu_savevm_state_begin(QEMUFile *f, > - const MigrationParams *params); > + const MigrationParams *params, > + Error **errp); > int qemu_savevm_state_iterate(QEMUFile *f); > int qemu_savevm_state_complete(QEMUFile *f); > void qemu_savevm_state_cancel(QEMUFile *f);