[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/14] qga: treat get-guest-fsinfo as "best effort"
From: |
Thomas Huth |
Subject: |
[PULL 01/14] qga: treat get-guest-fsinfo as "best effort" |
Date: |
Tue, 19 Jul 2022 09:03:59 +0200 |
From: John Snow <jsnow@redhat.com>
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>
---
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 f18530d85f..954efed01b 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.31.1
- [PULL 08/14] tests: wait for migration completion before looking for STOP event, (continued)
- [PULL 08/14] tests: wait for migration completion before looking for STOP event, Thomas Huth, 2022/07/05
- [PULL 10/14] tests: use consistent bandwidth/downtime limits in migration tests, Thomas Huth, 2022/07/05
- [PULL 06/14] gitlab-ci: Extend timeout for ubuntu-20.04-s390x-all to 75m, Thomas Huth, 2022/07/05
- [PULL 09/14] tests: increase migration test converge downtime to 30 seconds, Thomas Huth, 2022/07/05
- [PULL 12/14] po: add ukrainian translation, Thomas Huth, 2022/07/05
- [PULL 14/14] include/qemu/host-utils: Remove unused code in the *_overflow wrappers, Thomas Huth, 2022/07/05
- [PULL 13/14] meson.build: Require a recent version of libpng, Thomas Huth, 2022/07/05
- [PULL 11/14] disas: Remove libvixl disassembler, Thomas Huth, 2022/07/05
- Re: [PULL 00/14] Testing and misc patches, Richard Henderson, 2022/07/05
- [PULL 00/14] Testing and misc patches, Thomas Huth, 2022/07/19
- [PULL 01/14] qga: treat get-guest-fsinfo as "best effort",
Thomas Huth <=
- [PULL 05/14] tests/vm: upgrade Ubuntu 18.04 VM to 20.04, Thomas Huth, 2022/07/19
- [PULL 08/14] tests/vm: add 1GB extra memory per core, Thomas Huth, 2022/07/19
- [PULL 02/14] tests/vm: use 'cp' instead of 'ln' for temporary vm images, Thomas Huth, 2022/07/19
- [PULL 07/14] tests/vm: remove duplicate 'centos' VM test, Thomas Huth, 2022/07/19
- [PULL 09/14] tests/vm: Remove docker cross-compile test from CentOS VM, Thomas Huth, 2022/07/19
- [PULL 11/14] tests/unit: Replace g_memdup() by g_memdup2(), Thomas Huth, 2022/07/19
- [PULL 04/14] tests/vm: switch centos.aarch64 to CentOS 8 Stream, Thomas Huth, 2022/07/19
- [PULL 10/14] qtest/machine-none: Add LoongArch support, Thomas Huth, 2022/07/19
- [PULL 13/14] util: Fix broken build on Haiku, Thomas Huth, 2022/07/19
- [PULL 12/14] Replace 'whitelist' with 'allow', Thomas Huth, 2022/07/19