From: Peter Maydell Date: Thu, 28 Apr 2016 10:05:37 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-04-28' into staging X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~30^2~6^2~8^2~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=736f85d5db701cc9d464a03b583d4a04606a0dd5;p=sdk%2Femulator%2Fqemu.git 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 " # gpg: aka "Markus Armbruster " * 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 --- 736f85d5db701cc9d464a03b583d4a04606a0dd5