From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB9PU-0007LK-0U for qemu-devel@nongnu.org; Tue, 04 Oct 2011 14:08:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RB9PS-00056W-Kx for qemu-devel@nongnu.org; Tue, 04 Oct 2011 14:08:07 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:61762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RB9PS-00056Q-Hp for qemu-devel@nongnu.org; Tue, 04 Oct 2011 14:08:06 -0400 Received: by iagf6 with SMTP id f6so1040783iag.4 for ; Tue, 04 Oct 2011 11:08:05 -0700 (PDT) Message-ID: <4E8B4B82.4080107@codemonkey.ws> Date: Tue, 04 Oct 2011 13:08:02 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <5529f9bd516a73e64eb7f9761e85cd2240030dfd.1316781876.git.quintela@redhat.com> In-Reply-To: <5529f9bd516a73e64eb7f9761e85cd2240030dfd.1316781876.git.quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 04/11] migration: return real error code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org On 09/23/2011 07:50 AM, Juan Quintela wrote: > make functions propaget errno, instead of just using -EIO. > > Signed-off-by: Juan Quintela qemu_file_has_error() implies a boolean response. Wouldn't qemu_file_get_error() make more sense if you're going to rely on the return value? Regards, Anthony Liguori > --- > migration.c | 6 +++++- > savevm.c | 33 +++++++++++++++------------------ > 2 files changed, 20 insertions(+), 19 deletions(-) > > diff --git a/migration.c b/migration.c > index ea7bcc8..9498e20 100644 > --- a/migration.c > +++ b/migration.c > @@ -363,6 +363,7 @@ void migrate_fd_connect(FdMigrationState *s) > void migrate_fd_put_ready(void *opaque) > { > FdMigrationState *s = opaque; > + int ret; > > if (s->state != MIG_STATE_ACTIVE) { > DPRINTF("put_ready returning because of non-active state\n"); > @@ -370,7 +371,10 @@ void migrate_fd_put_ready(void *opaque) > } > > DPRINTF("iterate\n"); > - if (qemu_savevm_state_iterate(s->mon, s->file) == 1) { > + ret = qemu_savevm_state_iterate(s->mon, s->file); > + if (ret< 0) { > + migrate_fd_error(s); > + } else if (ret == 1) { > int old_vm_running = runstate_is_running(); > > DPRINTF("done iterating\n"); > diff --git a/savevm.c b/savevm.c > index 46f2447..c382076 100644 > --- a/savevm.c > +++ b/savevm.c > @@ -1466,6 +1466,7 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, > int shared) > { > SaveStateEntry *se; > + int ret; > > QTAILQ_FOREACH(se,&savevm_handlers, entry) { > if(se->set_params == NULL) { > @@ -1497,13 +1498,13 @@ int qemu_savevm_state_begin(Monitor *mon, QEMUFile *f, int blk_enable, > > se->save_live_state(mon, f, QEMU_VM_SECTION_START, se->opaque); > } > - > - if (qemu_file_has_error(f)) { > + ret = qemu_file_has_error(f); > + if (ret != 0) { > qemu_savevm_state_cancel(mon, f); > - return -EIO; > } > > - return 0; > + return ret; > + > } > > int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f) > @@ -1528,16 +1529,14 @@ int qemu_savevm_state_iterate(Monitor *mon, QEMUFile *f) > break; > } > } > - > - if (ret) > - return 1; > - > - if (qemu_file_has_error(f)) { > + if (ret != 0) { > + return ret; > + } > + ret = qemu_file_has_error(f); > + if (ret != 0) { > qemu_savevm_state_cancel(mon, f); > - return -EIO; > } > - > - return 0; > + return ret; > } > > int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) > @@ -1580,10 +1579,7 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f) > > qemu_put_byte(f, QEMU_VM_EOF); > > - if (qemu_file_has_error(f)) > - return -EIO; > - > - return 0; > + return qemu_file_has_error(f); > } > > void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f) > @@ -1623,8 +1619,9 @@ static int qemu_savevm_state(Monitor *mon, QEMUFile *f) > ret = qemu_savevm_state_complete(mon, f); > > out: > - if (qemu_file_has_error(f)) > - ret = -EIO; > + if (ret == 0) { > + ret = qemu_file_has_error(f); > + } > > if (!ret&& saved_vm_running) > vm_start();