| Message ID | 20181007043335.23631-1-liq3ea@163.com |
|---|---|
| State | New |
| Headers | show |
| Series | vl.c: print error message if load fw_cfg file failed | expand |
On 10/7/18 6:33 AM, Li Qiang wrote: > It makes sense to print the error message while reading > file failed. > > Signed-off-by: Li Qiang <liq3ea@163.com> > --- > vl.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/vl.c b/vl.c > index cc55fe04a2..3db410e771 100644 > --- a/vl.c > +++ b/vl.c > @@ -2207,8 +2207,9 @@ 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_report("can't load %s", file); > + GError *error = NULL; > + if (!g_file_get_contents(file, &buf, &size, &error)) { > + error_report("can't load %s, %s", file, error->message); Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > return -1; > } > } >
Hi Li, On Sun, Oct 7, 2018 at 7:48 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > On 10/7/18 6:33 AM, Li Qiang wrote: > > It makes sense to print the error message while reading > > file failed. > > > > Signed-off-by: Li Qiang <liq3ea@163.com> > > --- > > vl.c | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/vl.c b/vl.c > > index cc55fe04a2..3db410e771 100644 > > --- a/vl.c > > +++ b/vl.c > > @@ -2207,8 +2207,9 @@ 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_report("can't load %s", file); > > + GError *error = NULL; > > + if (!g_file_get_contents(file, &buf, &size, &error)) { > > + error_report("can't load %s, %s", file, error->message); You forgot: g_error_free(error); With the free: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > > return -1; > > } > > } > >
diff --git a/vl.c b/vl.c index cc55fe04a2..3db410e771 100644 --- a/vl.c +++ b/vl.c @@ -2207,8 +2207,9 @@ 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_report("can't load %s", file); + GError *error = NULL; + if (!g_file_get_contents(file, &buf, &size, &error)) { + error_report("can't load %s, %s", file, error->message); return -1; } }
It makes sense to print the error message while reading file failed. Signed-off-by: Li Qiang <liq3ea@163.com> --- vl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)