tree 5195a25c658d88e7fdbc1602ea4033cf52869dff
parent 5cfffc30de4a34a47d2719d2cd87ababb6c6379b
parent 7580f231cf3f1710951416ec85df7b3f79dbaf86
author Peter Maydell <peter.maydell@linaro.org> 1455895153 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1455895153 +0000
mergetag object 7580f231cf3f1710951416ec85df7b3f79dbaf86
 type commit
 tag pull-error-2016-02-19
 tagger Markus Armbruster <armbru@redhat.com> 1455886070 +0100
 
 Error reporting patches for 2016-02-19
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWxw72AAoJEDhwtADrkYZT4Y8P/jyMnI6Cp8HK/rRz1mK7SzxL
 66R4ut+ShuvLUGXq/OwSvm4zPewehY0QV2s6XjNd/RgscmC9EW5FMeKLN2WzvJm1
 CzBx4jK7LEGiSFjdUbP984Sx2Rqz9BK10Y7R/3t/f1JATL3OBPfn6nGwlW/8UYaO
 RzM9stpGsfJXi/vuDOkSk28k233co0b79N5FsIVXrDyhxxXQxK9gFpQgAbo2ZAC8
 g2/wAZTi6L056X66+aNDvOvCMjOtpeSFoZjtjcfB8Os9h2P1KpyW+0xsR1vbTdVH
 bPc+vSjN2KTdksKOBEhsbtmkbaDvrnEsX6fscMmUUyFbGpichtNvpd+E+9mQ9m/v
 /MlDdjQ2E7Fu62HHOAZRr4+lTFyNtISFZTS6OOQzZG63Vd/rxvou8VEYsygBCInP
 BW7pG70KX8mmRpUnZFPJ/OSSJwXAmi1Cx8GEsegB3DbY0MSZu3u+sJYI4JFBglwo
 Gaf42ouDsw/Z5XFlHEuqYAF4p0J2ytwUhGaHPPzlXlTsNOJUIi7UEGCndh812j+4
 Nq1+fIPeERR7pDnedR6K3cE9mZopUqlvS/2Kh2pfuXeIEVz7WLlpSYpYP+CGRc4r
 PiaS6fyBVRCMYVATrQRJ0/mRjSmJTRQYD9W+nSVvkWlD8nN5lGhbWMBaT+1QC0z5
 0RLkLvHQrsR8235kLwVu
 =15cD
 -----END PGP SIGNATURE-----

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>