On Fri, Jul 8, 2022 at 8:16 PM John Snow <js...@redhat.com> wrote:
> 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 <js...@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@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
>
>
>
--
Marc-André Lureau
