[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 01/12] qga: treat get-guest-fsinfo as "best effort"
From: |
John Snow |
Subject: |
[PATCH v4 01/12] qga: treat get-guest-fsinfo as "best effort" |
Date: |
Fri, 8 Jul 2022 11:34:52 -0400 |
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>
---
qga/commands-posix.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 0469dc409d4..355de050a1c 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -1207,7 +1207,15 @@ static void build_guest_fsinfo_for_device(char const
*devpath,
syspath = realpath(devpath, NULL);
if (!syspath) {
- error_setg_errno(errp, errno, "realpath(\"%s\")", devpath);
+ if (errno != ENOENT) {
+ error_setg_errno(errp, errno, "realpath(\"%s\")", devpath);
+ return;
+ }
+
+ /* ENOENT: This devpath may not exist because of container config */
+ if (!fs->name) {
+ fs->name = g_path_get_basename(devpath);
+ }
return;
}
--
2.34.3
- [PATCH v4 00/12] Improve reliability of VM tests, John Snow, 2022/07/08
- [PATCH v4 05/12] tests/vm: upgrade Ubuntu 18.04 VM to 20.04, John Snow, 2022/07/08
- [PATCH v4 09/12] tests/vm: Remove docker cross-compile test from CentOS VM, John Snow, 2022/07/08
- [PATCH v4 10/12] tests/qemu-iotests: hotfix for 307, 223 output, John Snow, 2022/07/08
- [PATCH v4 03/12] tests/vm: switch CentOS 8 to CentOS 8 Stream, John Snow, 2022/07/08
- [PATCH v4 07/12] tests/vm: remove duplicate 'centos' VM test, John Snow, 2022/07/08
- [PATCH v4 01/12] qga: treat get-guest-fsinfo as "best effort",
John Snow <=
- [PATCH v4 04/12] tests/vm: switch centos.aarch64 to CentOS 8 Stream, John Snow, 2022/07/08
- [PATCH v4 08/12] tests/vm: add 1GB extra memory per core, John Snow, 2022/07/08
- [PATCH v4 02/12] tests/vm: use 'cp' instead of 'ln' for temporary vm images, John Snow, 2022/07/08
- [PATCH v4 06/12] tests/vm: remove ubuntu.i386 VM test, John Snow, 2022/07/08
- [PATCH v4 11/12] tests/qemu-iotests: skip 108 when FUSE is not loaded, John Snow, 2022/07/08