From nobody Tue Feb 10 07:23:48 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653390533; cv=none; d=zohomail.com; s=zohoarc; b=GD1Wwc/T5K9p5uIPu03z28yOrjVTZVnJe4E7htujOD/17Qe8DHppiUS9TRoyEaWF8l0tPCALjlc7NTF6c/cnXyQq9cFU/xhRfe60lkNG0Bw4/0/51ARbA7MihNDSe+6htEogvlFkf4VN3yWSR0S22SSuDM25GaYMNuzb1bCI6g0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653390533; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LzYI8ZC2ERXD7GLd1aEpB1Cn7FeyVs38oMYiGAHhcK0=; b=TqGqcmh6OIPb5rxxrtL7zbLDjmL3gVf82sl/Q15SesIQ0PEvO6PnE3i0rMqId0NphbUGhZd0KrjD0HYPBoZxFd54Es75y1hm2FaoyFIKgcA+EEcyFrC0V+fQ4zzOtzjt/d+w/3BC6JDD1UNdqXoSD8HbSeQy6z99Tn8b2vk+4w8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653390533649452.86565822128864; Tue, 24 May 2022 04:08:53 -0700 (PDT) Received: from localhost ([::1]:36478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntSPD-0008LK-OZ for importer@patchew.org; Tue, 24 May 2022 07:08:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntRtP-0007o0-7x for qemu-devel@nongnu.org; Tue, 24 May 2022 06:36:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:32640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntRtL-0007Ya-It for qemu-devel@nongnu.org; Tue, 24 May 2022 06:35:58 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-475-cTLGrAAtNA2ioPEPrCzMqw-1; Tue, 24 May 2022 06:35:05 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3517E299E763; Tue, 24 May 2022 10:35:05 +0000 (UTC) Received: from localhost (unknown [10.39.192.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE9B72166B25; Tue, 24 May 2022 10:35:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653388506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LzYI8ZC2ERXD7GLd1aEpB1Cn7FeyVs38oMYiGAHhcK0=; b=ShNmGFexHgq5Lc9R+axpkUoaH5BDWy4uLK+eYjcgmQwmIXx2Qm5lEHH4ZTvq7pwhLTi17w 1HVyoj+Oj0BENV1+SXVz8EkgmGiCv0dIBDI8ztdQ1bgbkeDbJZjzhA4bN28Bf9hX76x3Az VxISSBDoRgr765NLnpWHAxrfbJQ97z0= X-MC-Unique: cTLGrAAtNA2ioPEPrCzMqw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Konstantin Kostiuk , Michael Roth , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v4 09/15] qga: make build_fs_mount_list() return a bool Date: Tue, 24 May 2022 12:34:47 +0200 Message-Id: <20220524103453.162665-10-marcandre.lureau@redhat.com> In-Reply-To: <20220524103453.162665-1-marcandre.lureau@redhat.com> References: <20220524103453.162665-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653390534455100001 From: Marc-Andr=C3=A9 Lureau Change build_fs_mount_list() to return bool, in accordance with the guidance under =3D Rules =3D in include/qapi/error.h Signed-off-by: Marc-Andr=C3=A9 Lureau Suggested-by: Markus Armbruster --- qga/commands-posix.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index e3b893cd47..ae16e84e41 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -673,7 +673,7 @@ static int dev_major_minor(const char *devpath, /* * Walk the mount table and build a list of local file systems */ -static void build_fs_mount_list_from_mtab(FsMountList *mounts, Error **err= p) +static bool build_fs_mount_list_from_mtab(FsMountList *mounts, Error **err= p) { struct mntent *ment; FsMount *mount; @@ -684,7 +684,7 @@ static void build_fs_mount_list_from_mtab(FsMountList *= mounts, Error **errp) fp =3D setmntent(mtab, "r"); if (!fp) { error_setg(errp, "failed to open mtab file: '%s'", mtab); - return; + return false; } =20 while ((ment =3D getmntent(fp))) { @@ -714,6 +714,7 @@ static void build_fs_mount_list_from_mtab(FsMountList *= mounts, Error **errp) } =20 endmntent(fp); + return true; } =20 static void decode_mntname(char *name, int len) @@ -738,7 +739,7 @@ static void decode_mntname(char *name, int len) } } =20 -static void build_fs_mount_list(FsMountList *mounts, Error **errp) +static bool build_fs_mount_list(FsMountList *mounts, Error **errp) { FsMount *mount; char const *mountinfo =3D "/proc/self/mountinfo"; @@ -751,8 +752,7 @@ static void build_fs_mount_list(FsMountList *mounts, Er= ror **errp) =20 fp =3D fopen(mountinfo, "r"); if (!fp) { - build_fs_mount_list_from_mtab(mounts, errp); - return; + return build_fs_mount_list_from_mtab(mounts, errp); } =20 while (getline(&line, &n, fp) !=3D -1) { @@ -794,6 +794,7 @@ static void build_fs_mount_list(FsMountList *mounts, Er= ror **errp) free(line); =20 fclose(fp); + return true; } #endif =20 @@ -1594,8 +1595,7 @@ GuestFilesystemInfoList *qmp_guest_get_fsinfo(Error *= *errp) Error *local_err =3D NULL; =20 QTAILQ_INIT(&mounts); - build_fs_mount_list(&mounts, &local_err); - if (local_err) { + if (!build_fs_mount_list(&mounts, &local_err)) { error_propagate(errp, local_err); return NULL; } @@ -1718,8 +1718,7 @@ int64_t qmp_guest_fsfreeze_freeze_list(bool has_mount= points, } =20 QTAILQ_INIT(&mounts); - build_fs_mount_list(&mounts, &local_err); - if (local_err) { + if (!build_fs_mount_list(&mounts, &local_err)) { error_propagate(errp, local_err); return -1; } @@ -1799,8 +1798,7 @@ int64_t qmp_guest_fsfreeze_thaw(Error **errp) Error *local_err =3D NULL; =20 QTAILQ_INIT(&mounts); - build_fs_mount_list(&mounts, &local_err); - if (local_err) { + if (!build_fs_mount_list(&mounts, &local_err)) { error_propagate(errp, local_err); return 0; } @@ -1879,8 +1877,7 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum, E= rror **errp) slog("guest-fstrim called"); =20 QTAILQ_INIT(&mounts); - build_fs_mount_list(&mounts, errp); - if (*errp) { + if (!build_fs_mount_list(&mounts, errp)) { return NULL; } =20 --=20 2.36.1