From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsiEX-0006zX-Mo for qemu-devel@nongnu.org; Tue, 08 Jan 2013 18:05:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsiEW-0006pS-BT for qemu-devel@nongnu.org; Tue, 08 Jan 2013 18:05:25 -0500 Received: from mail-ia0-f180.google.com ([209.85.210.180]:43572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsiES-0006ni-Rj for qemu-devel@nongnu.org; Tue, 08 Jan 2013 18:05:24 -0500 Received: by mail-ia0-f180.google.com with SMTP id t4so912601iag.11 for ; Tue, 08 Jan 2013 15:05:20 -0800 (PST) Sender: fluxion From: Michael Roth Date: Tue, 8 Jan 2013 17:00:04 -0600 Message-Id: <1357686009-13139-8-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1357686009-13139-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1357686009-13139-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 07/12] qemu-ga: qmp_guest_fstrim(): get rid of sprintf() + error_set() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, tomoki.sekiyama.qu@hitachi.com, lcapitulino@redhat.com From: Luiz Capitulino Convert them to error_setg_errno(). Signed-off-by: Luiz Capitulino Reviewed-by: Michael Roth Signed-off-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 9ad2891..fa786e5 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.7.9.5