| Message ID | 1539052760-11730-1-git-send-email-liq3ea@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] vl.c: print error message if load fw_cfg file failed | expand |
Hi Li, On 09/10/2018 04:39, Li Qiang wrote: > It makes sense to print the error message while reading > file failed. OK > > Change since v1: > free error Changes are useful for reviewer, but not in the git history. You can have them automatically stripped if you place them below the next '---' separator. Hopefully the maintainer taking this patch can clean this up. > > Signed-off-by: Li Qiang <liq3ea@gmail.com> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- Here goes comment not worth to stay forever in git history: Since v1: ... > vl.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/vl.c b/vl.c > index 4e25c78..69fc77c 100644 > --- a/vl.c > +++ b/vl.c > @@ -2207,8 +2207,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_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); If you ever respin, you can help Markus [1] effort using: error_setg(errp, "can't load %s, %s", file, error->message); Else your patch will clash with [2]. > + g_error_free(error); > return -1; > } > } > Regards, Phil. [1] https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg01394.html [2] https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg01406.html
Hello Philippe, Philippe Mathieu-Daudé <philmd@redhat.com> 于2018年10月9日周二 下午1:52写道： > Hi Li, > > On 09/10/2018 04:39, Li Qiang wrote: > > It makes sense to print the error message while reading > > file failed. > > OK > > > > > Change since v1: > > free error > > Changes are useful for reviewer, but not in the git history. > You can have them automatically stripped if you place them below the > next '---' separator. > > Thanks for your advice. > Hopefully the maintainer taking this patch can clean this up. > > > > > Signed-off-by: Li Qiang <liq3ea@gmail.com> > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > --- > > Here goes comment not worth to stay forever in git history: > > Since v1: ... > > > vl.c | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/vl.c b/vl.c > > index 4e25c78..69fc77c 100644 > > --- a/vl.c > > +++ b/vl.c > > @@ -2207,8 +2207,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_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); > > If you ever respin, you can help Markus [1] effort using: > > error_setg(errp, "can't load %s, %s", file, error->message); > > Else your patch will clash with [2]. > OK, I will send out this patch based Markus' tree or later when his patch goes to upstream. Thanks, Li Qiang > > > + g_error_free(error); > > return -1; > > } > > } > > > > Regards, > > Phil. > > [1] https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg01394.html > [2] https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg01406.html >
Li Qiang <liq3ea@gmail.com> writes: > Hello Philippe, > > Philippe Mathieu-Daudé <philmd@redhat.com> 于2018年10月9日周二 下午1:52写道： > >> Hi Li, >> >> On 09/10/2018 04:39, Li Qiang wrote: >> > It makes sense to print the error message while reading >> > file failed. [...] >> > diff --git a/vl.c b/vl.c >> > index 4e25c78..69fc77c 100644 >> > --- a/vl.c >> > +++ b/vl.c >> > @@ -2207,8 +2207,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_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); >> >> If you ever respin, you can help Markus [1] effort using: >> >> error_setg(errp, "can't load %s, %s", file, error->message); >> >> Else your patch will clash with [2]. >> > > OK, I will send out this patch based Markus' tree or later when his patch > goes to upstream. Appreciated!
diff --git a/vl.c b/vl.c index 4e25c78..69fc77c 100644 --- a/vl.c +++ b/vl.c @@ -2207,8 +2207,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_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); + g_error_free(error); return -1; } }