Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-04-28' into staging
commit736f85d5db701cc9d464a03b583d4a04606a0dd5
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 28 Apr 2016 10:05:37 +0000 (28 11:05 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 28 Apr 2016 10:05:37 +0000 (28 11:05 +0100)
treeb08061229b40f7b5d36f023f28b3c0e8c98ce604
parent61861eff69279e20428c10be269ce1c1bba2c7b1
parent51b9b478cc238ad23a78ffd713f9c18bbc3907e6
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>