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

qga: treat get-guest-fsinfo as "best effort"

Browse Source 
In some container environments, there may be references to block devices
witnessable from a container through /proc/self/mountinfo that reference
devices we simply don't have access to in the container, and cannot
provide information about.

Instead of failing the entire fsinfo command, return stub information
for these failed lookups.

This allows test-qga to pass under docker tests, which are in turn used
by the CentOS VM tests.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220708153503.18864-2-jsnow@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
John Snow 2022-07-08 11:34:52 -04:00 committed by Thomas Huth
parent 7823789731
commit bbb0151cf2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qga/commands-posix.c
View File

@ -1207,10 +1207,18 @@ static void build_guest_fsinfo_for_device(char const *devpath,
syspath = realpath(devpath, NULL); syspath = realpath(devpath, NULL);
if (!syspath) { if (!syspath) {
if (errno != ENOENT) {
error_setg_errno(errp, errno, "realpath(\"%s\")", devpath); error_setg_errno(errp, errno, "realpath(\"%s\")", devpath);
return; return;
} }
/* ENOENT: This devpath may not exist because of container config */
if (!fs->name) {
fs->name = g_path_get_basename(devpath);
}
return;
}
if (!fs->name) { if (!fs->name) {
fs->name = g_path_get_basename(syspath); fs->name = g_path_get_basename(syspath);
} }