From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tdl1X-0008Bo-9n for qemu-devel@nongnu.org; Wed, 28 Nov 2012 12:02:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tdl1V-0003vl-Iu for qemu-devel@nongnu.org; Wed, 28 Nov 2012 12:02:11 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:49015) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tdl1V-0003vP-DV for qemu-devel@nongnu.org; Wed, 28 Nov 2012 12:02:09 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so9825004iej.4 for ; Wed, 28 Nov 2012 09:02:08 -0800 (PST) Sender: fluxion Date: Wed, 28 Nov 2012 11:01:08 -0600 From: mdroth Message-ID: <20121128170108.GC8690@vm> References: <1354021324-31561-1-git-send-email-lcapitulino@redhat.com> <1354021324-31561-2-git-send-email-lcapitulino@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1354021324-31561-2-git-send-email-lcapitulino@redhat.com> Subject: Re: [Qemu-devel] [PATCH 01/10] qemu-ga: guest_file_handle_find(): take an Error argument List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-devel@nongnu.org On Tue, Nov 27, 2012 at 11:01:55AM -0200, Luiz Capitulino wrote: > Signed-off-by: Luiz Capitulino Reviewed-by: Michael Roth > --- > qga/commands-posix.c | 18 +++++++----------- > 1 file changed, 7 insertions(+), 11 deletions(-) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 726930a..a2216f2 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -111,7 +111,7 @@ static void guest_file_handle_add(FILE *fh) > QTAILQ_INSERT_TAIL(&guest_file_state.filehandles, gfh, next); > } > > -static GuestFileHandle *guest_file_handle_find(int64_t id) > +static GuestFileHandle *guest_file_handle_find(int64_t id, Error **err) > { > GuestFileHandle *gfh; > > @@ -122,6 +122,7 @@ static GuestFileHandle *guest_file_handle_find(int64_t id) > } > } > > + error_setg(err, "handle '%" PRId64 "'has not been found", id); > return NULL; > } > > @@ -160,12 +161,11 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, E > > void qmp_guest_file_close(int64_t handle, Error **err) > { > - GuestFileHandle *gfh = guest_file_handle_find(handle); > + GuestFileHandle *gfh = guest_file_handle_find(handle, err); > int ret; > > slog("guest-file-close called, handle: %ld", handle); > if (!gfh) { > - error_set(err, QERR_FD_NOT_FOUND, "handle"); > return; > } > > @@ -182,14 +182,13 @@ void qmp_guest_file_close(int64_t handle, Error **err) > struct GuestFileRead *qmp_guest_file_read(int64_t handle, bool has_count, > int64_t count, Error **err) > { > - GuestFileHandle *gfh = guest_file_handle_find(handle); > + GuestFileHandle *gfh = guest_file_handle_find(handle, err); > GuestFileRead *read_data = NULL; > guchar *buf; > FILE *fh; > size_t read_count; > > if (!gfh) { > - error_set(err, QERR_FD_NOT_FOUND, "handle"); > return NULL; > } > > @@ -228,11 +227,10 @@ GuestFileWrite *qmp_guest_file_write(int64_t handle, const char *buf_b64, > guchar *buf; > gsize buf_len; > int write_count; > - GuestFileHandle *gfh = guest_file_handle_find(handle); > + GuestFileHandle *gfh = guest_file_handle_find(handle, err); > FILE *fh; > > if (!gfh) { > - error_set(err, QERR_FD_NOT_FOUND, "handle"); > return NULL; > } > > @@ -265,13 +263,12 @@ GuestFileWrite *qmp_guest_file_write(int64_t handle, const char *buf_b64, > struct GuestFileSeek *qmp_guest_file_seek(int64_t handle, int64_t offset, > int64_t whence, Error **err) > { > - GuestFileHandle *gfh = guest_file_handle_find(handle); > + GuestFileHandle *gfh = guest_file_handle_find(handle, err); > GuestFileSeek *seek_data = NULL; > FILE *fh; > int ret; > > if (!gfh) { > - error_set(err, QERR_FD_NOT_FOUND, "handle"); > return NULL; > } > > @@ -291,12 +288,11 @@ struct GuestFileSeek *qmp_guest_file_seek(int64_t handle, int64_t offset, > > void qmp_guest_file_flush(int64_t handle, Error **err) > { > - GuestFileHandle *gfh = guest_file_handle_find(handle); > + GuestFileHandle *gfh = guest_file_handle_find(handle, err); > FILE *fh; > int ret; > > if (!gfh) { > - error_set(err, QERR_FD_NOT_FOUND, "handle"); > return; > } > > -- > 1.8.0 >