]> git.proxmox.com Git - mirror_qemu.git/commit
qom: -object error messages lost location, restore it
authorMarkus Armbruster <armbru@redhat.com>
Wed, 27 Apr 2016 14:29:09 +0000 (16:29 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 28 Apr 2016 06:19:36 +0000 (08:19 +0200)
commit51b9b478cc238ad23a78ffd713f9c18bbc3907e6
treedac1b1a7ec5c83135cd8524014e4aa528291373a
parentd9d3aaea0b3fbb5028e20316bdb93359487cd01f
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]
include/qom/object_interfaces.h
qemu-img.c
qemu-io.c
qemu-nbd.c
qom/object_interfaces.c
vl.c