From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 25 Jun 2015 13:03:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
X-Git-Tag: v2.4.0-rc0~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a4a0312bf8b029cbd32a97db2cad669cf65ac49;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging

# gpg: Signature made Wed Jun 24 16:37:23 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/net-pull-request:
  net: simplify net_client_init1()
  net: drop if expression that is always true
  net: raise an error if -net type is invalid
  net: replace net_client_init1() netdev whitelist with blacklist
  net: add missing "netmap" to host_net_devices[]

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

0a4a0312bf8b029cbd32a97db2cad669cf65ac49