From patchwork Tue Jan 8 23:00:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 210568 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 0B1902C00A9 for ; Wed, 9 Jan 2013 10:40:17 +1100 (EST) Received: from localhost ([::1]:54334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsiEy-00081U-4p for incoming@patchwork.ozlabs.org; Tue, 08 Jan 2013 18:05:52 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsiEP-0006a3-Ll for qemu-devel@nongnu.org; Tue, 08 Jan 2013 18:05:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsiEO-0006kT-8G for qemu-devel@nongnu.org; Tue, 08 Jan 2013 18:05:17 -0500 Received: from mail-ia0-f180.google.com ([209.85.210.180]:37014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsiEO-0006jt-3i for qemu-devel@nongnu.org; Tue, 08 Jan 2013 18:05:16 -0500 Received: by mail-ia0-f180.google.com with SMTP id t4so881552iag.25 for ; Tue, 08 Jan 2013 15:05:15 -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=xOPewvTjynNszZ2ToZBkaiGxLhGVsR27R4RJfgG9sZc=; b=SvdK4mgcpKWjh3U9/EJzCJ+rJ4bY/+sKSttT/mPCC+2i+5w/J0GqVFWfkxVOdaVkE1 IozW1Z07g729g4OQqn0IraiBxDN9uvjYvCYOIkEKJ/UkuZZSYYhjEfsP2qo89saoFG+N jiRipVJ1Zp+PIwB0/epgXCCHGQQeEqyQmtnUvV31vejXyhyfjP/LZYWo5fzPj+Xox0vB 7/nNLxQjz1HGTnGJEITr+VsWAbO7tSZiGR1QNenrP7Qqs5W3yVK48nxw0H7AACNODGMe cDpePoJoCQ2NA0gsnxVXQJlOwMWDs2cyCXyLTDHFilnRsf69YAOX8VLewhx2y6rKwna+ 3cuA== X-Received: by 10.43.124.130 with SMTP id go2mr49695127icc.8.1357686315761; Tue, 08 Jan 2013 15:05:15 -0800 (PST) Received: from localhost ([32.97.110.59]) by mx.google.com with ESMTPS id uj6sm774505igb.4.2013.01.08.15.05.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Jan 2013 15:05:15 -0800 (PST) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 8 Jan 2013 17:00:02 -0600 Message-Id: <1357686009-13139-6-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 05/12] qemu-ga: build_fs_mount_list(): take an Error argument 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 Signed-off-by: Luiz Capitulino Signed-off-by: Michael Roth --- qga/commands-posix.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 247e8dc..f7b85b2 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -371,7 +371,7 @@ static void free_fs_mount_list(FsMountList *mounts) /* * Walk the mount table and build a list of local file systems */ -static int build_fs_mount_list(FsMountList *mounts) +static void build_fs_mount_list(FsMountList *mounts, Error **err) { struct mntent *ment; FsMount *mount; @@ -380,8 +380,8 @@ static int build_fs_mount_list(FsMountList *mounts) fp = setmntent(mtab, "r"); if (!fp) { - g_warning("fsfreeze: unable to read mtab"); - return -1; + error_setg(err, "failed to open mtab file: '%s'", mtab); + return; } while ((ment = getmntent(fp))) { @@ -405,8 +405,6 @@ static int build_fs_mount_list(FsMountList *mounts) } endmntent(fp); - - return 0; } #endif @@ -433,15 +431,17 @@ int64_t qmp_guest_fsfreeze_freeze(Error **err) int ret = 0, i = 0; FsMountList mounts; struct FsMount *mount; + Error *local_err = NULL; int fd; char err_msg[512]; slog("guest-fsfreeze called"); QTAILQ_INIT(&mounts); - ret = build_fs_mount_list(&mounts); - if (ret < 0) { - return ret; + build_fs_mount_list(&mounts, &local_err); + if (error_is_set(&local_err)) { + error_propagate(err, local_err); + return -1; } /* cannot risk guest agent blocking itself on a write in this state */ @@ -498,12 +498,12 @@ int64_t qmp_guest_fsfreeze_thaw(Error **err) FsMountList mounts; FsMount *mount; int fd, i = 0, logged; + Error *local_err = NULL; QTAILQ_INIT(&mounts); - ret = build_fs_mount_list(&mounts); - if (ret) { - error_set(err, QERR_QGA_COMMAND_FAILED, - "failed to enumerate filesystems"); + build_fs_mount_list(&mounts, &local_err); + if (error_is_set(&local_err)) { + error_propagate(err, local_err); return 0; } @@ -568,6 +568,7 @@ void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err) FsMountList mounts; struct FsMount *mount; int fd; + Error *local_err = NULL; char err_msg[512]; struct fstrim_range r = { .start = 0, @@ -578,8 +579,9 @@ void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err) slog("guest-fstrim called"); QTAILQ_INIT(&mounts); - ret = build_fs_mount_list(&mounts); - if (ret < 0) { + build_fs_mount_list(&mounts, &local_err); + if (error_is_set(&local_err)) { + error_propagate(err, local_err); return; }