The following changes since commit 136c67e07869227b21b3f627316e03679ce7b738:

Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-2018-03-02' into staging (2018-03-02 16:56:20 +0000)

for you to fetch changes up to 46d4d36d0bf2b24b205f2f604f0905db80264eef:

tap: setting error appropriately when calling net_init_tap_one() (2018-03-05 10:30:16 +0800)

Jay Zhou (1):

tap: setting error appropriately when calling net_init_tap_one()

Thomas Huth (8):

net: Move error reporting from net_init_client/netdev to the calling site

net: List available netdevs with "-netdev help"

net: Only show vhost-user in the help text if CONFIG_POSIX is defined

net: Make net_client_init() static

net: Remove the deprecated way of dumping network packets

net: Remove the deprecated 'host_net_add' and 'host_net_remove' HMP commands

net: Add a new convenience option "--nic" to configure default/on-board NICs

hw/net: Remove unnecessary header includes

hmp-commands.hx | 30 ------

hmp.h | 3 -

hw/net/e1000.c | 1 -

hw/net/lance.c | 3 -

hw/net/ne2000.c | 2 -

hw/net/pcnet-pci.c | 1 -

hw/net/pcnet.c | 1 -

hw/net/rtl8139.c | 2 -

hw/net/xgmac.c | 1 -

include/net/net.h | 4 +-

include/net/vhost_net.h | 3 +

include/sysemu/sysemu.h | 1 +

monitor.c | 61 ------------

net/dump.c | 102 +--------------------

net/net.c | 239 +++++++++++++++++++++++-------------------------

net/tap.c | 22 ++++-

qapi/net.json | 29 ++----

qemu-doc.texi | 16 ----

qemu-options.hx | 48 +++++++---

tests/test-hmp.c | 2 -

vl.c | 10 +-

21 files changed, 190 insertions(+), 391 deletions(-)

From: Thomas Huth <thuth@redhat.com>

Headers like "hw/loader.h" and "qemu/sockets.h" are not needed in

the hw/net/*.c files. And Some other headers are included via other

headers already, so we can drop them, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>

hw/net/e1000.c | 1 -

hw/net/lance.c | 3 ---

hw/net/ne2000.c | 2 --

hw/net/pcnet-pci.c | 1 -

hw/net/pcnet.c | 1 -

hw/net/rtl8139.c | 2 --

hw/net/xgmac.c | 1 -

7 files changed, 11 deletions(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c

--- a/hw/net/e1000.c

+++ b/hw/net/e1000.c

@@ -XXX,XX +XXX,XX @@

#include "hw/pci/pci.h"

#include "net/net.h"

#include "net/checksum.h"

-#include "hw/loader.h"

#include "sysemu/sysemu.h"

#include "sysemu/dma.h"

#include "qemu/iov.h"

diff --git a/hw/net/lance.c b/hw/net/lance.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/lance.c

+++ b/hw/net/lance.c

@@ -XXX,XX +XXX,XX @@

*/

#include "qemu/osdep.h"

-#include "hw/sysbus.h"

-#include "net/net.h"

#include "qemu/timer.h"

-#include "qemu/sockets.h"

#include "hw/sparc/sparc32_dma.h"

#include "hw/net/lance.h"

#include "trace.h"

diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/ne2000.c

+++ b/hw/net/ne2000.c

@@ -XXX,XX +XXX,XX @@

*/

#include "qemu/osdep.h"

#include "hw/pci/pci.h"

-#include "net/net.h"

#include "net/eth.h"

#include "ne2000.h"

-#include "hw/loader.h"

#include "sysemu/sysemu.h"

/* debug NE2000 card */

diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/pcnet-pci.c

+++ b/hw/net/pcnet-pci.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/osdep.h"

#include "hw/pci/pci.h"

#include "net/net.h"

-#include "hw/loader.h"

#include "qemu/timer.h"

#include "sysemu/dma.h"

#include "sysemu/sysemu.h"

diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/pcnet.c

+++ b/hw/net/pcnet.c

@@ -XXX,XX +XXX,XX @@

#include "net/net.h"

#include "net/eth.h"

#include "qemu/timer.h"

-#include "qemu/sockets.h"

#include "sysemu/sysemu.h"

#include "trace.h"

diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/rtl8139.c

+++ b/hw/net/rtl8139.c

@@ -XXX,XX +XXX,XX @@

#include "qemu/timer.h"

#include "net/net.h"

#include "net/eth.h"

-#include "hw/loader.h"

#include "sysemu/sysemu.h"

-#include "qemu/iov.h"

/* debug RTL8139 card */

//#define DEBUG_RTL8139 1

diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/net/xgmac.c

+++ b/hw/net/xgmac.c

@@ -XXX,XX +XXX,XX @@

#include "hw/sysbus.h"

#include "qemu/log.h"

#include "net/net.h"

-#include "net/checksum.h"

#ifdef DEBUG_XGMAC

#define DEBUGF_BRK(message, args...) do { \

From: Thomas Huth <thuth@redhat.com>

It looks strange that net_init_client() and net_init_netdev() both

take an "Error **errp" parameter, but then do the error reporting

with "error_report_err(local_err)" on their own. Let's move the

error reporting to the calling site instead to simplify this code

a little bit.

Reviewed-by: Eric Blake <eblake@redhat.com>

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Thomas Huth <thuth@redhat.com>

include/net/net.h | 2 +-

net/net.c | 29 +++++------------------------

vl.c | 3 ++-

3 files changed, 8 insertions(+), 26 deletions(-)

@@ -XXX,XX +XXX,XX @@ extern const char *legacy_bootp_filename;

int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp);

-int net_init_clients(void);

+int net_init_clients(Error **errp);

void hmp_host_net_add(Monitor *mon, const QDict *qdict);

@@ -XXX,XX +XXX,XX @@ void net_check_clients(void)

static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)

- Error *local_err = NULL;

- net_client_init(opts, false, &local_err);

- if (local_err) {

- error_report_err(local_err);

- return -1;

- }

- return 0;

+ return net_client_init(opts, false, errp);

}

- Error *local_err = NULL;

- int ret;

-

- ret = net_client_init(opts, true, &local_err);

- if (local_err) {

- error_report_err(local_err);

- return -1;

- }

-

- return ret;

+ return net_client_init(opts, true, errp);

From: Thomas Huth <thuth@redhat.com>

Other options like "-chardev" or "-device" feature a nice help text

with the available devices when being called with "help" or "?".

Since it is quite useful, especially if you want to see which network

backends have been compiled into the QEMU binary, let's provide such

a help text for "-netdev", too.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Thomas Huth <thuth@redhat.com>

net/net.c | 37 ++++++++++++++++++++++++++++++++++++-

1 file changed, 36 insertions(+), 1 deletion(-)

@@ -XXX,XX +XXX,XX @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp)

return 0;

}

+static void show_netdevs(void)

+{

+ int idx;

+ const char *available_netdevs[] = {

+ "socket",

+ "hubport",

+ "tap",

+#ifdef CONFIG_SLIRP

+ "user",

+#endif

+#ifdef CONFIG_L2TPV3

+ "l2tpv3",

+#endif

+#ifdef CONFIG_VDE

+ "vde",

+#endif

+#ifdef CONFIG_NET_BRIDGE

+ "bridge",

+#endif

+#ifdef CONFIG_NETMAP

+ "netmap",

+#endif

+#ifdef CONFIG_POSIX

+ "vhost-user",

+#endif

+ };

+

+ printf("Available netdev backend types:\n");

+ for (idx = 0; idx < ARRAY_SIZE(available_netdevs); idx++) {

+ puts(available_netdevs[idx]);

+ }

+}

int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)

{

@@ -XXX,XX +XXX,XX @@ int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp)

int ret = -1;

Visitor *v = opts_visitor_new(opts);

- {

+ if (is_netdev && is_help_option(qemu_opt_get(opts, "type"))) {

+ show_netdevs();

+ exit(0);

+ } else {

/* Parse convenience option format ip6-net=fec0::0[/64] */

const char *ip6_net = qemu_opt_get(opts, "ipv6-net");

From: Thomas Huth <thuth@redhat.com>

According to net/Makefile.objs we only link in the vhost-user code

if CONFIG_POSIX has been set. So the help screen should also only

show this information if CONFIG_POSIX has been defined.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Thomas Huth <thuth@redhat.com>

qemu-options.hx | 2 ++

diff --git a/qemu-options.hx b/qemu-options.hx

--- a/qemu-options.hx

+++ b/qemu-options.hx

@@ -XXX,XX +XXX,XX @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,

" VALE port (created on the fly) called 'name' ('nmname' is name of the \n"

" netmap device, defaults to '/dev/netmap')\n"

#endif

+#ifdef CONFIG_POSIX

"-netdev vhost-user,id=str,chardev=dev[,vhostforce=on|off]\n"

" configure a vhost-user network, backed by a chardev 'dev'\n"

+#endif

"-netdev hubport,id=str,hubid=n[,netdev=nd]\n"

" configure a hub port on QEMU VLAN 'n'\n", QEMU_ARCH_ALL)

DEF("net", HAS_ARG, QEMU_OPTION_net,