qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"John Snow" <jsnow@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 01/14] qga: treat get-guest-fsinfo as "best effort"
Date: Tue, 19 Jul 2022 09:03:59 +0200	[thread overview]
Message-ID: <20220719070412.16757-2-thuth@redhat.com> (raw)
In-Reply-To: <20220719070412.16757-1-thuth@redhat.com>

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



  reply	other threads:[~2022-07-19  7:06 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-19  7:03 [PULL 00/14] Testing and misc patches Thomas Huth
2022-07-19  7:03 ` Thomas Huth [this message]
2022-07-19  7:04 ` [PULL 02/14] tests/vm: use 'cp' instead of 'ln' for temporary vm images Thomas Huth
2022-07-19  7:04 ` [PULL 03/14] tests/vm: switch CentOS 8 to CentOS 8 Stream Thomas Huth
2022-07-19  7:04 ` [PULL 04/14] tests/vm: switch centos.aarch64 " Thomas Huth
2022-07-19  7:04 ` [PULL 05/14] tests/vm: upgrade Ubuntu 18.04 VM to 20.04 Thomas Huth
2022-07-19  7:04 ` [PULL 06/14] tests/vm: remove ubuntu.i386 VM test Thomas Huth
2022-07-19  7:04 ` [PULL 07/14] tests/vm: remove duplicate 'centos' " Thomas Huth
2022-07-19  7:04 ` [PULL 08/14] tests/vm: add 1GB extra memory per core Thomas Huth
2022-07-19  7:04 ` [PULL 09/14] tests/vm: Remove docker cross-compile test from CentOS VM Thomas Huth
2022-07-19  7:04 ` [PULL 10/14] qtest/machine-none: Add LoongArch support Thomas Huth
2022-07-19  7:04 ` [PULL 11/14] tests/unit: Replace g_memdup() by g_memdup2() Thomas Huth
2022-07-19  7:04 ` [PULL 12/14] Replace 'whitelist' with 'allow' Thomas Huth
2022-07-19  7:04 ` [PULL 13/14] util: Fix broken build on Haiku Thomas Huth
2022-07-19  7:04 ` [PULL 14/14] python/qemu/qmp/legacy: Replace 'returns-whitelist' with the correct type Thomas Huth
2022-07-19 16:14 ` [PULL 00/14] Testing and misc patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220719070412.16757-2-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).