summary refs log tree commit diff stats
path: root/io/task.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-03-05 14:27:24 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-03-05 14:27:24 +0000
commit41dfc0dc55f0b338ab3c1d29a1721441b76ebd03 (patch)
treead63b36baa4dc7bdecef827063cdba2091d1fed7 /io/task.c
parent4a22592e32868db846898831c27fbee8e73e24e3 (diff)
parent46d4d36d0bf2b24b205f2f604f0905db80264eef (diff)
downloadfocaccia-qemu-41dfc0dc55f0b338ab3c1d29a1721441b76ebd03.tar.gz
focaccia-qemu-41dfc0dc55f0b338ab3c1d29a1721441b76ebd03.zip
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 05 Mar 2018 03:06:59 GMT
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  tap: setting error appropriately when calling net_init_tap_one()
  hw/net: Remove unnecessary header includes
  net: Add a new convenience option "--nic" to configure default/on-board NICs
  net: Remove the deprecated 'host_net_add' and 'host_net_remove' HMP commands
  net: Remove the deprecated way of dumping network packets
  net: Make net_client_init() static
  net: Only show vhost-user in the help text if CONFIG_POSIX is defined
  net: List available netdevs with "-netdev help"
  net: Move error reporting from net_init_client/netdev to the calling site

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'io/task.c')
0 files changed, 0 insertions, 0 deletions