From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF2gw-0000sl-Uh for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:50:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TF2gp-0003g9-Ua for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:50:46 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:64054) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TF2gp-0003g0-NL for qemu-devel@nongnu.org; Fri, 21 Sep 2012 08:50:39 -0400 Received: by padfb10 with SMTP id fb10so432384pad.4 for ; Fri, 21 Sep 2012 05:50:38 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <505C6299.2070303@redhat.com> Date: Fri, 21 Sep 2012 14:50:33 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1348217255-22441-1-git-send-email-quintela@redhat.com> <1348217255-22441-37-git-send-email-quintela@redhat.com> In-Reply-To: <1348217255-22441-37-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 36/41] block-migration: make flush_blks() 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: > This means we don't need to pass through qemu_file to get the errors. > Adjust all callers. > > Signed-off-by: Juan Quintela > --- > block-migration.c | 22 ++++++++-------------- > 1 file changed, 8 insertions(+), 14 deletions(-) > > diff --git a/block-migration.c b/block-migration.c > index 7def8ab..a822bb2 100644 > --- a/block-migration.c > +++ b/block-migration.c > @@ -444,9 +444,10 @@ static int blk_mig_save_dirty_block(QEMUFile *f, int is_async) > return ret; > } > > -static void flush_blks(QEMUFile* f) > +static int flush_blks(QEMUFile *f) > { > BlkMigBlock *blk; > + int ret = 0; > > DPRINTF("%s Enter submitted %d read_done %d transferred %d\n", > __FUNCTION__, block_mig_state.submitted, block_mig_state.read_done, > @@ -457,7 +458,7 @@ static void flush_blks(QEMUFile* f) > break; > } > if (blk->ret < 0) { > - qemu_file_set_error(f, blk->ret); > + ret = blk->ret; > break; > } > blk_send(f, blk); > @@ -474,6 +475,7 @@ static void flush_blks(QEMUFile* f) > DPRINTF("%s Exit submitted %d read_done %d transferred %d\n", __FUNCTION__, > block_mig_state.submitted, block_mig_state.read_done, > block_mig_state.transferred); > + return ret; > } > > static int64_t get_remaining_dirty(void) > @@ -553,9 +555,7 @@ static int block_save_setup(QEMUFile *f, void *opaque) > /* start track dirty blocks */ > set_dirty_tracking(1); > > - flush_blks(f); > - > - ret = qemu_file_get_error(f); > + ret = flush_blks(f); > if (ret) { > blk_mig_cleanup(); > return ret; > @@ -575,9 +575,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque) > DPRINTF("Enter save live iterate submitted %d transferred %d\n", > block_mig_state.submitted, block_mig_state.transferred); > > - flush_blks(f); > - > - ret = qemu_file_get_error(f); > + ret = flush_blks(f); > if (ret) { > blk_mig_cleanup(); > return ret; > @@ -603,9 +601,7 @@ static int block_save_iterate(QEMUFile *f, void *opaque) > } > } > > - flush_blks(f); > - > - ret = qemu_file_get_error(f); > + ret = flush_blks(f); > if (ret) { > blk_mig_cleanup(); > return ret; > @@ -623,9 +619,7 @@ static int block_save_complete(QEMUFile *f, void *opaque) > DPRINTF("Enter save live complete submitted %d transferred %d\n", > block_mig_state.submitted, block_mig_state.transferred); > > - flush_blks(f); > - > - ret = qemu_file_get_error(f); > + ret = flush_blks(f); > if (ret) { > blk_mig_cleanup(); > return ret; > Reviewed-by: Paolo Bonzini