[Qemu-commits] [qemu/qemu] 027a24: net: add missing "netmap" to host_net_devices[]

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 027a247bbf703e94258d07e38948946d7b85e91c
      
https://github.com/qemu/qemu/commit/027a247bbf703e94258d07e38948946d7b85e91c
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: add missing "netmap" to host_net_devices[]

Although hmp-commands.hx lists "netmap" as a valid host_net_add type,
the command rejects it because it's missing from the list.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden


  Commit: 1322629b4f25730aed973d51983e7a3b021fe9c9
      
https://github.com/qemu/qemu/commit/1322629b4f25730aed973d51983e7a3b021fe9c9
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: replace net_client_init1() netdev whitelist with blacklist

It's cumbersome to keep the whitelist up-to-date.  New netdev backends
should most likely be allowed so a blacklist makes more sense than a
whitelist.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-id: address@hidden


  Commit: d139e9a6cf01b8c31f5904b4ba40521d7224f7de
      
https://github.com/qemu/qemu/commit/d139e9a6cf01b8c31f5904b4ba40521d7224f7de
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: raise an error if -net type is invalid

When a -net type is used that was not compiled into the binary there
should be an error message.

Note the special case for -net none, which is a no-op.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-id: address@hidden


  Commit: 4ef0defbad9bc8b195f3392d1b7dcb42cd7ebe11
      
https://github.com/qemu/qemu/commit/4ef0defbad9bc8b195f3392d1b7dcb42cd7ebe11
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: drop if expression that is always true

Both is_netdev and !is_netdev paths already check that
net_client_init_func[opts->kind] is non-NULL so there is no need for the
if statement.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-id: address@hidden


  Commit: 1e81aba5ac0b908ab859bf8ddf43ece33732d49c
      
https://github.com/qemu/qemu/commit/1e81aba5ac0b908ab859bf8ddf43ece33732d49c
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2015-06-24 (Wed, 24 Jun 2015)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: simplify net_client_init1()

Drop the union and move the hubport creation into the !is_netdev case.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-id: address@hidden


  Commit: 0a4a0312bf8b029cbd32a97db2cad669cf65ac49
      
https://github.com/qemu/qemu/commit/0a4a0312bf8b029cbd32a97db2cad669cf65ac49
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-25 (Thu, 25 Jun 2015)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Stefan Hajnoczi <address@hidden>"

* 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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/58e8b33518fd...0a4a0312bf8b