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 /qemu-io.c | |
| parent | 61861eff69279e20428c10be269ce1c1bba2c7b1 (diff) | |
| parent | 51b9b478cc238ad23a78ffd713f9c18bbc3907e6 (diff) | |
| download | focaccia-qemu-736f85d5db701cc9d464a03b583d4a04606a0dd5.tar.gz focaccia-qemu-736f85d5db701cc9d464a03b583d4a04606a0dd5.zip | |
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 'qemu-io.c')
| -rw-r--r-- | qemu-io.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qemu-io.c b/qemu-io.c index 288bba84b9..0598251e7c 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -534,8 +534,7 @@ int main(int argc, char **argv) if (qemu_opts_foreach(&qemu_object_opts, user_creatable_add_opts_foreach, - NULL, &local_error)) { - error_report_err(local_error); + NULL, NULL)) { exit(1); } |