From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdnWN-0001fs-J2 for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:42:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TdnWJ-0001df-Hf for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:42:11 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:62049) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdnWJ-0001da-Cj for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:42:07 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so10132268iej.4 for ; Wed, 28 Nov 2012 11:42:06 -0800 (PST) Sender: fluxion Date: Wed, 28 Nov 2012 13:41:32 -0600 From: mdroth Message-ID: <20121128194132.GI8690@vm> References: <1354021324-31561-1-git-send-email-lcapitulino@redhat.com> <1354021324-31561-8-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-8-git-send-email-lcapitulino@redhat.com> Subject: Re: [Qemu-devel] [PATCH 07/10] qemu-ga: qmp_guest_fstrim(): get rid of sprintf() + error_set() 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:02:01AM -0200, Luiz Capitulino wrote: > Convert them to error_setg_errno(). > > Signed-off-by: Luiz Capitulino Reviewed-by: Michael Roth > --- > qga/commands-posix.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 9325433..72ef8ba 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -565,7 +565,6 @@ void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err) > struct FsMount *mount; > int fd; > Error *local_err = NULL; > - char err_msg[512]; > struct fstrim_range r = { > .start = 0, > .len = -1, > @@ -584,9 +583,7 @@ void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err) > QTAILQ_FOREACH(mount, &mounts, next) { > fd = qemu_open(mount->dirname, O_RDONLY); > if (fd == -1) { > - sprintf(err_msg, "failed to open %s, %s", mount->dirname, > - strerror(errno)); > - error_set(err, QERR_QGA_COMMAND_FAILED, err_msg); > + error_setg_errno(err, errno, "failed to open %s", mount->dirname); > goto error; > } > > @@ -599,9 +596,8 @@ void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err) > ret = ioctl(fd, FITRIM, &r); > if (ret == -1) { > if (errno != ENOTTY && errno != EOPNOTSUPP) { > - sprintf(err_msg, "failed to trim %s, %s", > - mount->dirname, strerror(errno)); > - error_set(err, QERR_QGA_COMMAND_FAILED, err_msg); > + error_setg_errno(err, errno, "failed to trim %s", > + mount->dirname); > close(fd); > goto error; > } > -- > 1.8.0 >