mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-ga: build_fs_mount_list(): take an Error argument

Browse Source 
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Luiz Capitulino 2012-11-29 15:29:11 -02:00 committed by Michael Roth
parent d220a6dfea
commit 261551d1cc
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
qga/commands-posix.c
View File

@ -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;
}