summary refs log tree commit diff stats
path: root/hw/usb/dev-network.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-19 15:19:13 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-19 15:19:13 +0000
commit1b3337bb1d1c3125a2140c47629f36540ac57605 (patch)
tree5195a25c658d88e7fdbc1602ea4033cf52869dff /hw/usb/dev-network.c
parent5cfffc30de4a34a47d2719d2cd87ababb6c6379b (diff)
parent7580f231cf3f1710951416ec85df7b3f79dbaf86 (diff)
downloadfocaccia-qemu-1b3337bb1d1c3125a2140c47629f36540ac57605.tar.gz
focaccia-qemu-1b3337bb1d1c3125a2140c47629f36540ac57605.zip
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>
Diffstat (limited to 'hw/usb/dev-network.c')
0 files changed, 0 insertions, 0 deletions