diff options
author | Markus Armbruster <armbru@redhat.com> | 2016-04-27 16:29:09 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2016-04-28 08:19:36 +0200 |
commit | 51b9b478cc238ad23a78ffd713f9c18bbc3907e6 (patch) | |
tree | dac1b1a7ec5c83135cd8524014e4aa528291373a /qom | |
parent | d9d3aaea0b3fbb5028e20316bdb93359487cd01f (diff) | |
download | qemu-51b9b478cc238ad23a78ffd713f9c18bbc3907e6.zip qemu-51b9b478cc238ad23a78ffd713f9c18bbc3907e6.tar.gz qemu-51b9b478cc238ad23a78ffd713f9c18bbc3907e6.tar.bz2 |
qom: -object error messages lost location, restore it
qemu_opts_foreach() runs its callback with the error location set to
the option's location. Any errors the callback reports use the
option's location automatically.
Commit 90998d5 moved the actual error reporting from "inside"
qemu_opts_foreach() to after it. Here's a typical hunk:
if (qemu_opts_foreach(qemu_find_opts("object"),
- object_create,
- object_create_initial, NULL)) {
+ user_creatable_add_opts_foreach,
+ object_create_initial, &err)) {
+ error_report_err(err);
exit(1);
}
Before, object_create() reports from within qemu_opts_foreach(), using
the option's location. Afterwards, we do it after
qemu_opts_foreach(), using whatever location happens to be current
there. Commonly a "none" location.
This is because Error objects don't have location information.
Problematic.
Reproducer:
$ qemu-system-x86_64 -nodefaults -display none -object secret,id=foo,foo=bar
qemu-system-x86_64: Property '.foo' not found
Note no location. This commit restores it:
qemu-system-x86_64: -object secret,id=foo,foo=bar: Property '.foo' not found
Note that the qemu_opts_foreach() bug just fixed could mask the bug
here: if the location it leaves dangling hasn't been clobbered, yet,
it's the correct one.
Reported-by: Eric Blake <eblake@redhat.com>
Cc: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1461767349-15329-4-git-send-email-armbru@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[Paragraph on Error added to commit message]
Diffstat (limited to 'qom')
-rw-r--r-- | qom/object_interfaces.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index ab5da35..3931890 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -170,6 +170,7 @@ int user_creatable_add_opts_foreach(void *opaque, QemuOpts *opts, Error **errp) { bool (*type_predicate)(const char *) = opaque; Object *obj = NULL; + Error *err = NULL; const char *type; type = qemu_opt_get(opts, "qom-type"); @@ -178,8 +179,9 @@ int user_creatable_add_opts_foreach(void *opaque, QemuOpts *opts, Error **errp) return 0; } - obj = user_creatable_add_opts(opts, errp); + obj = user_creatable_add_opts(opts, &err); if (!obj) { + error_report_err(err); return -1; } object_unref(obj); |