From patchwork Tue Jan 8 23:00:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 210564 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E49E92C00A9 for ; Wed, 9 Jan 2013 10:27:36 +1100 (EST) Received: from localhost ([::1]:54683 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsiF6-0008Ed-VZ for incoming@patchwork.ozlabs.org; Tue, 08 Jan 2013 18:06:00 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=1sSNAj3VQASgbdscaF8hfcGAL08R63T6pDjplEdQCTQ=; b=Nu+4lY0w2Cr9wsRCOPO40EM3RF+F8uXIDpmKkg3da6JadUFcDsT7Nvnzzx+PTJhAz1 a955O/SaE4G3hoV5YY0ABDqwzQAZ7BBxs23B2AQFjdJ0blTjc2z5TyYsao9MqmvGMIq1 FLymC1Bxq2d1+L6ye6lkVTeiiJWKwcy2CBRkYeZ8m7mui2rOewy03zINgdT8ci8QgAQZ bam4XIWjEWM3wd7FN4ds1LNh4ULeaGKXH09hBYhc3WJUtAaUhULPgB2cVmd7uirG++R0 iv7o59QEazRB221nE0gTTV755kdFCF+To9CBffCtLzHWcVQEZmN/JdR+6Lg7tEovZpS4 8RXw== X-Received: by 10.43.7.7 with SMTP id om7mr42127311icb.25.1357686320431; Tue, 08 Jan 2013 15:05:20 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id v12sm776592igv.3.2013.01.08.15.05.19 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Jan 2013 15:05:19 -0800 (PST) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 8 Jan 2013 17:00:04 -0600 Message-Id: <1357686009-13139-8-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.180 Cc: aliguori@us.ibm.com, tomoki.sekiyama.qu@hitachi.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 07/12] qemu-ga: qmp_guest_fstrim(): get rid of sprintf() + error_set() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }