qemu /
qemu /
1b3337bb1d1c3125a2140c47629f36540ac57605 Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-02-19' into staging
Error reporting patches for 2016-02-19
# gpg: Signature made Fri 19 Feb 2016 12:47:50 GMT 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-02-19:
vl: Clean up machine selection in main().
vl: Set error location when parsing memory options
replay: Set error location properly when parsing options
vl: Reset location after handling command-line arguments
vl.c: Fix regression in machine error message
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>