From: Li Qiang <liq3ea@gmail.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
philmd@redhat.com, Laszlo Ersek <lersek@redhat.com>
Cc: Qemu Developers <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH] hw: fw_cfg: Improve error message when can't load splash file
Date: Tue, 27 Nov 2018 11:02:40 +0800 [thread overview]
Message-ID: <CAKXe6SJ6cF2jTBzRpPRULJFeE0Y6M7O=cET91BZ5kw4uu5UT-w@mail.gmail.com> (raw)
In-Reply-To: <1541052148-28752-1-git-send-email-liq3ea@gmail.com>
Hello Paolo, Philippe
Seems this patch has been lost...
I think Philippe can merge it for 4.0, right?
Also pls notice the following fw_cfg patchset.
-->https://lists.gnu.org/archive/html/qemu-devel/2018-11/msg04097.html
Thanks,
Li Qiang
Li Qiang <liq3ea@gmail.com> 于2018年11月1日周四 下午2:02写道:
> read_splashfile() reports "failed to read splash file" without
> further details. Get the details from g_file_get_contents(), and
> include them in the error message. Also remove unnecessary 'res'
> variable.
>
> Signed-off-by: Li Qiang <liq3ea@gmail.com>
> ---
> hw/nvram/fw_cfg.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index 946f765..3fcfa35 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -68,15 +68,14 @@ static char *read_splashfile(char *filename, gsize
> *file_sizep,
> int *file_typep)
> {
> GError *err = NULL;
> - gboolean res;
> gchar *content;
> int file_type;
> unsigned int filehead;
> int bmp_bpp;
>
> - res = g_file_get_contents(filename, &content, file_sizep, &err);
> - if (res == FALSE) {
> - error_report("failed to read splash file '%s'", filename);
> + if (!g_file_get_contents(filename, &content, file_sizep, &err)) {
> + error_report("failed to read splash file '%s': %s",
> + filename, err->message);
> g_error_free(err);
> return NULL;
> }
> --
> 1.8.3.1
>
>
next prev parent reply other threads:[~2018-11-27 3:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-01 6:02 [Qemu-devel] [PATCH] hw: fw_cfg: Improve error message when can't load splash file Li Qiang
2018-11-27 3:02 ` Li Qiang [this message]
2018-11-27 6:44 ` Markus Armbruster
2018-12-11 15:45 ` Philippe Mathieu-Daudé
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='CAKXe6SJ6cF2jTBzRpPRULJFeE0Y6M7O=cET91BZ5kw4uu5UT-w@mail.gmail.com' \
--to=liq3ea@gmail.com \
--cc=armbru@redhat.com \
--cc=lersek@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.