From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF2kC-0004Ym-LC for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:54:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF2k6-0004e1-NF for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:54:08 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:34861) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF2k6-0004YR-HR for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:54:02 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so7619915pbb.4 for ; Fri, 21 Sep 2012 05:54:02 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <505C6364.8020707@redhat.com> Date: Fri, 21 Sep 2012 14:53:56 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1348217255-22441-1-git-send-email-quintela@redhat.com> <1348217255-22441-41-git-send-email-quintela@redhat.com> In-Reply-To: <1348217255-22441-41-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 40/41] savevm: make qemu_file_put_notify() return errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org Il 21/09/2012 10:47, Juan Quintela ha scritto: > Signed-off-by: Juan Quintela > --- > migration.c | 5 +++-- > qemu-file.h | 2 +- > savevm.c | 4 ++-- > 3 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/migration.c b/migration.c > index 6a505c1..2c29d04 100644 > --- a/migration.c > +++ b/migration.c > @@ -285,10 +285,11 @@ static void migrate_fd_completed(MigrationState *s) > static void migrate_fd_put_notify(void *opaque) > { > MigrationState *s = opaque; > + int ret; > > qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); > - qemu_file_put_notify(s->file); > - if (s->file && qemu_file_get_error(s->file)) { > + ret = qemu_file_put_notify(s->file); > + if (ret) { > migrate_fd_error(s); > } > } > diff --git a/qemu-file.h b/qemu-file.h > index 8dd9207..9c8985b 100644 > --- a/qemu-file.h > +++ b/qemu-file.h > @@ -107,7 +107,7 @@ int qemu_file_get_error(QEMUFile *f); > /* Try to send any outstanding data. This function is useful when output is > * halted due to rate limiting or EAGAIN errors occur as it can be used to > * resume output. */ > -void qemu_file_put_notify(QEMUFile *f); > +int qemu_file_put_notify(QEMUFile *f); > > static inline void qemu_put_be64s(QEMUFile *f, const uint64_t *pv) > { > diff --git a/savevm.c b/savevm.c > index 68c0464..2ea1fa6 100644 > --- a/savevm.c > +++ b/savevm.c > @@ -523,9 +523,9 @@ int qemu_fclose(QEMUFile *f) > return ret; > } > > -void qemu_file_put_notify(QEMUFile *f) > +int qemu_file_put_notify(QEMUFile *f) > { > - f->put_buffer(f->opaque, NULL, 0, 0); > + return f->put_buffer(f->opaque, NULL, 0, 0); > } > > void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size) > Reviewed-by: Paolo Bonzini