diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-28 11:05:37 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-28 11:05:37 +0100 |
| commit | 736f85d5db701cc9d464a03b583d4a04606a0dd5 (patch) | |
| tree | b08061229b40f7b5d36f023f28b3c0e8c98ce604 /include/qom/object_interfaces.h | |
| parent | 61861eff69279e20428c10be269ce1c1bba2c7b1 (diff) | |
| parent | 51b9b478cc238ad23a78ffd713f9c18bbc3907e6 (diff) | |
| download | qemu-736f85d5db701cc9d464a03b583d4a04606a0dd5.tar.gz | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-04-28' into staging
Fix dangling pointers and error message regressions
# gpg: Signature made Thu 28 Apr 2016 07:25:51 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-error-2016-04-28:
qom: -object error messages lost location, restore it
replay: Fix dangling location bug in replay_configure()
QemuOpts: Fix qemu_opts_foreach() dangling location regression
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qom/object_interfaces.h')
| -rw-r--r-- | include/qom/object_interfaces.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h index d579746db6..8b17f4def7 100644 --- a/include/qom/object_interfaces.h +++ b/include/qom/object_interfaces.h @@ -140,7 +140,7 @@ typedef bool (*user_creatable_add_opts_predicate)(const char *type); * user_creatable_add_opts_foreach: * @opaque: a user_creatable_add_opts_predicate callback or NULL * @opts: options to create - * @errp: if an error occurs, a pointer to an area to store the error + * @errp: unused * * An iterator callback to be used in conjunction with * the qemu_opts_foreach() method for creating a list of @@ -148,8 +148,9 @@ typedef bool (*user_creatable_add_opts_predicate)(const char *type); * * The @opaque parameter can be passed a user_creatable_add_opts_predicate * callback to filter which types of object are created during iteration. + * When it fails, report the error. * - * Returns: 0 on success, -1 on error + * Returns: 0 on success, -1 when an error was reported. */ int user_creatable_add_opts_foreach(void *opaque, QemuOpts *opts, Error **errp); |