[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/15] qga: make build_fs_mount_list() return a bool
From: |
marcandre . lureau |
Subject: |
[PULL 09/15] qga: make build_fs_mount_list() return a bool |
Date: |
Fri, 27 May 2022 15:54:53 +0200 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Change build_fs_mount_list() to return bool, in accordance
with the guidance under = Rules = in include/qapi/error.h
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Suggested-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220525144140.591926-10-marcandre.lureau@redhat.com>
---
qga/commands-posix.c | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 0047245273..0469dc409d 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 **errp)
+static bool build_fs_mount_list_from_mtab(FsMountList *mounts, Error **errp)
{
struct mntent *ment;
FsMount *mount;
@@ -684,7 +684,7 @@ static void build_fs_mount_list_from_mtab(FsMountList
*mounts, Error **errp)
fp = setmntent(mtab, "r");
if (!fp) {
error_setg(errp, "failed to open mtab file: '%s'", mtab);
- return;
+ return false;
}
while ((ment = getmntent(fp))) {
@@ -714,6 +714,7 @@ static void build_fs_mount_list_from_mtab(FsMountList
*mounts, Error **errp)
}
endmntent(fp);
+ return true;
}
static void decode_mntname(char *name, int len)
@@ -738,7 +739,7 @@ static void decode_mntname(char *name, int len)
}
}
-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 = "/proc/self/mountinfo";
@@ -751,8 +752,7 @@ static void build_fs_mount_list(FsMountList *mounts, Error
**errp)
fp = fopen(mountinfo, "r");
if (!fp) {
- build_fs_mount_list_from_mtab(mounts, errp);
- return;
+ return build_fs_mount_list_from_mtab(mounts, errp);
}
while (getline(&line, &n, fp) != -1) {
@@ -794,6 +794,7 @@ static void build_fs_mount_list(FsMountList *mounts, Error
**errp)
free(line);
fclose(fp);
+ return true;
}
#endif
@@ -1592,8 +1593,7 @@ GuestFilesystemInfoList *qmp_guest_get_fsinfo(Error
**errp)
Error *local_err = NULL;
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;
}
@@ -1716,8 +1716,7 @@ int64_t qmp_guest_fsfreeze_freeze_list(bool
has_mountpoints,
}
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;
}
@@ -1798,8 +1797,7 @@ int64_t qmp_guest_fsfreeze_thaw(Error **errp)
Error *local_err = NULL;
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;
}
@@ -1872,15 +1870,12 @@ qmp_guest_fstrim(bool has_minimum, int64_t minimum,
Error **errp)
FsMountList mounts;
struct FsMount *mount;
int fd;
- Error *local_err = NULL;
struct fstrim_range r;
slog("guest-fstrim called");
QTAILQ_INIT(&mounts);
- build_fs_mount_list(&mounts, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
+ if (!build_fs_mount_list(&mounts, errp)) {
return NULL;
}
--
2.36.1
- [PULL 03/15] tests: make libqmp buildable for win32, (continued)
- [PULL 03/15] tests: make libqmp buildable for win32, marcandre . lureau, 2022/05/27
- [PULL 12/15] qga/wixl: require Mingw_bin, marcandre . lureau, 2022/05/27
- [PULL 13/15] qga/wixl: simplify some pre-processing, marcandre . lureau, 2022/05/27
- [PULL 14/15] qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir, marcandre . lureau, 2022/05/27
- [PULL 08/15] qga: replace qemu_open_old() with qga_open_cloexec(), marcandre . lureau, 2022/05/27
- [PULL 11/15] qga/wixl: prefer variables over environment, marcandre . lureau, 2022/05/27
- [PULL 15/15] test/qga: use g_auto wherever sensible, marcandre . lureau, 2022/05/27
- [PULL 04/15] qga: flatten safe_open_or_create(), marcandre . lureau, 2022/05/27
- [PULL 05/15] qga: add qga_open_cloexec() helper, marcandre . lureau, 2022/05/27
- [PULL 06/15] qga: use qga_open_cloexec() for safe_open_or_create(), marcandre . lureau, 2022/05/27
- [PULL 09/15] qga: make build_fs_mount_list() return a bool,
marcandre . lureau <=