| Message ID | 1541051971-28584-1-git-send-email-liq3ea@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | vl: Improve error message when we can't load fw_cfg from file | expand |
Ping.... Li Qiang <liq3ea@gmail.com> 于2018年11月1日周四 下午1:59写道： > 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. > > 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 1fcacc5..f0bd899 100644 > --- a/vl.c > +++ b/vl.c > @@ -2244,8 +2244,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 > >
On 01/11/18 06:59, Li Qiang wrote: > 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. > > 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 1fcacc5..f0bd899 100644 > --- a/vl.c > +++ b/vl.c > @@ -2244,8 +2244,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; > } > } > Queued, thanks. Paolo
diff --git a/vl.c b/vl.c index 1fcacc5..f0bd899 100644 --- a/vl.c +++ b/vl.c @@ -2244,8 +2244,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; } }
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. Signed-off-by: Li Qiang <liq3ea@gmail.com> --- vl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)