[Qemu-devel] [PATCH] vl.c: print error message if loading fw_cfg file failed

Li Qiang posted 1 patch 7 years ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1540352349-12737-1-git-send-email-liq3ea@gmail.com
Test docker-clang@ubuntu passed
Test checkpatch passed
Test asan passed
Test docker-mingw@fedora failed
Test docker-quick@centos7 passed
vl.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
[Qemu-devel] [PATCH] vl.c: print error message if loading fw_cfg file failed
Posted by Li Qiang 7 years ago
It makes sense to print the error message while reading
file failed.

Signed-off-by: Li Qiang <liq3ea@gmail.com>
---
 vl.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vl.c b/vl.c
index b2a405f..ee6f982 100644
--- a/vl.c
+++ b/vl.c
@@ -2234,8 +2234,10 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
         size = strlen(str); /* NUL terminator NOT included in fw_cfg blob */
         buf = g_memdup(str, size);
     } else {
-        if (!g_file_get_contents(file, &buf, &size, NULL)) {
-            error_setg(errp, "can't load %s", file);
+        GError *err = NULL;
+        if (!g_file_get_contents(file, &buf, &size, &err)) {
+            error_setg(errp, "can't load %s, %s", file, err->message);
+            g_error_free(err);
             return -1;
         }
     }
-- 
1.8.3.1


Re: [Qemu-devel] [PATCH] vl.c: print error message if loading fw_cfg file failed
Posted by Markus Armbruster 7 years ago
Li Qiang <liq3ea@gmail.com> writes:

> It makes sense to print the error message while reading
> file failed.
>
> Signed-off-by: Li Qiang <liq3ea@gmail.com>

Your commit message suggests the patch adds an error message where none
was before.

> ---
>  vl.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index b2a405f..ee6f982 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2234,8 +2234,10 @@ static int parse_fw_cfg(void *opaque, QemuOpts *opts, Error **errp)
>          size = strlen(str); /* NUL terminator NOT included in fw_cfg blob */
>          buf = g_memdup(str, size);
>      } else {
> -        if (!g_file_get_contents(file, &buf, &size, NULL)) {
> -            error_setg(errp, "can't load %s", file);
> +        GError *err = NULL;
> +        if (!g_file_get_contents(file, &buf, &size, &err)) {
> +            error_setg(errp, "can't load %s, %s", file, err->message);
> +            g_error_free(err);
>              return -1;
>          }
>      }

What the patch actually does is improving an existing error message.

Suggest to rephrase the commit message like this:

    vl: Improve error message when we can't load fw_cfg from file

    parse_fw_cfg() reports "can't load" without further details.  Get
    the details from g_file_get_contents(), and include them in the
    error message.