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>

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(-)

diff --git a/include/net/net.h b/include/net/net.h

--- a/include/net/net.h

+++ b/include/net/net.h

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

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

int net_client_parse(QemuOptsList *opts_list, const char *str);

-int net_init_clients(void);

+int net_init_clients(Error **errp);

void net_check_clients(void);

void net_cleanup(void);

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

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

index XXXXXXX..XXXXXXX 100644

--- a/net/net.c

+++ b/net/net.c

@@ -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);

}

static int net_init_netdev(void *dummy, QemuOpts *opts, Error **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);

}

-int net_init_clients(void)

+int net_init_clients(Error **errp)

{

- QemuOptsList *net = qemu_find_opts("net");

-

net_change_state_entry =

qemu_add_vm_change_state_handler(net_vm_change_state_handler, NULL);

QTAILQ_INIT(&net_clients);

if (qemu_opts_foreach(qemu_find_opts("netdev"),

- net_init_netdev, NULL, NULL)) {

+ net_init_netdev, NULL, errp)) {

return -1;

}

- if (qemu_opts_foreach(net, net_init_client, NULL, NULL)) {

+ if (qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL, errp)) {

return -1;

}

diff --git a/vl.c b/vl.c

index XXXXXXX..XXXXXXX 100644

--- a/vl.c

+++ b/vl.c

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)

colo_info_init();

- if (net_init_clients() < 0) {

+ if (net_init_clients(&err) < 0) {

+ error_report_err(err);

exit(1);

}

From: Thomas Huth <thuth@redhat.com>

The function is only used within net.c, so there's no need that

this is a global function.

While we're at it, also remove the unused prototype compute_mcast_idx()

(the function has been removed in commit d9caeb09b107e91122d10ba4a08a).

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

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

include/net/net.h | 2 --

net/net.c | 2 +-

2 files changed, 1 insertion(+), 3 deletions(-)

@@ -XXX,XX +XXX,XX @@ extern const char *host_net_devices[];

extern const char *legacy_tftp_prefix;

extern const char *legacy_bootp_filename;

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

int net_client_parse(QemuOptsList *opts_list, const char *str);

int net_init_clients(Error **errp);

void net_check_clients(void);

@@ -XXX,XX +XXX,XX @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);

#define POLYNOMIAL_LE 0xedb88320

uint32_t net_crc32(const uint8_t *p, int len);

uint32_t net_crc32_le(const uint8_t *p, int len);

-unsigned compute_mcast_idx(const uint8_t *ep);

#define vmstate_offset_macaddr(_state, _field) \

vmstate_offset_array(_state, _field.a, uint8_t, \

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

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ static void show_netdevs(void)

}

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

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

void *object = NULL;

Error *err = NULL;

From: Thomas Huth <thuth@redhat.com>

The legacy "-net" option can be quite confusing for the users since most

people do not expect to get a "vlan" hub between their emulated guest

hardware and the host backend. But so far, we are also not able to get

rid of "-net" completely, since it is the only way to configure on-board

NICs that can not be instantiated via "-device" yet. It's also a little

bit shorter to type "-net nic -net tap" instead of "-device xyz,netdev=n1

-netdev tap,id=n1".

So what we need is a new convenience option that is shorter to type than

the full -device + -netdev stuff, and which can be used to configure the

on-board NICs that can not be handled via -device yet. Thus this patch now

provides such a new option "--nic": It adds an entry in the nd_table to

configure a on-board / default NIC, creates a host backend and connects

the two directly, without a confusing "vlan" hub inbetween.

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

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

include/sysemu/sysemu.h | 1 +

net/net.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++

qemu-options.hx | 40 +++++++++++++++++++++----

vl.c | 7 +++++

4 files changed, 120 insertions(+), 6 deletions(-)

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h

index XXXXXXX..XXXXXXX 100644

--- a/include/sysemu/sysemu.h

+++ b/include/sysemu/sysemu.h

@@ -XXX,XX +XXX,XX @@ extern QemuOptsList bdrv_runtime_opts;

extern QemuOptsList qemu_chardev_opts;

extern QemuOptsList qemu_device_opts;

extern QemuOptsList qemu_netdev_opts;

+extern QemuOptsList qemu_nic_opts;

extern QemuOptsList qemu_net_opts;

extern QemuOptsList qemu_global_opts;

extern QemuOptsList qemu_mon_opts;

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

index XXXXXXX..XXXXXXX 100644

--- a/net/net.c

+++ b/net/net.c

@@ -XXX,XX +XXX,XX @@ static int net_init_netdev(void *dummy, QemuOpts *opts, Error **errp)

return net_client_init(opts, true, errp);

}

+/* For the convenience "--nic" parameter */

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

+ char *mac, *nd_id;

+ int idx, ret;

+ NICInfo *ni;

+ const char *type;

+

+ type = qemu_opt_get(opts, "type");

+ if (type && g_str_equal(type, "none")) {

+ return 0; /* Nothing to do, default_net is cleared in vl.c */

+ }

+

+ idx = nic_get_free_idx();

+ if (idx == -1 || nb_nics >= MAX_NICS) {

+ error_setg(errp, "no more on-board/default NIC slots available");

+ if (!type) {

+ qemu_opt_set(opts, "type", "user", &error_abort);

+ }

+

+ ni = &nd_table[idx];

+ memset(ni, 0, sizeof(*ni));

+ ni->model = qemu_opt_get_del(opts, "model");

+

+ /* Create an ID if the user did not specify one */

+ nd_id = g_strdup(qemu_opts_id(opts));

+ if (!nd_id) {

+ nd_id = g_strdup_printf("__org.qemu.nic%i\n", idx);

+ qemu_opts_set_id(opts, nd_id);

+ }

+

+ /* Handle MAC address */

+ mac = qemu_opt_get_del(opts, "mac");

+ if (mac) {

+ ret = net_parse_macaddr(ni->macaddr.a, mac);

+ g_free(mac);

+ if (ret) {

+ error_setg(errp, "invalid syntax for ethernet address");

+ return -1;

+ }

+ if (is_multicast_ether_addr(ni->macaddr.a)) {

+ error_setg(errp, "NIC cannot have multicast MAC address");

+ return -1;

+ }

+ }

+ qemu_macaddr_default_if_unset(&ni->macaddr);

+

+ ret = net_client_init(opts, true, errp);

+ if (ret == 0) {

+ ni->netdev = qemu_find_netdev(nd_id);

+ ni->used = true;

+ nb_nics++;

+ }

+

+ g_free(nd_id);

+ return ret;

+}

+

int net_init_clients(Error **errp)

{

net_change_state_entry =

@@ -XXX,XX +XXX,XX @@ int net_init_clients(Error **errp)

return -1;

}

+ if (qemu_opts_foreach(qemu_find_opts("nic"), net_param_nic, NULL, errp)) {

+ return -1;

+ }

+

if (qemu_opts_foreach(qemu_find_opts("net"), net_init_client, NULL, errp)) {

return -1;

}

@@ -XXX,XX +XXX,XX @@ QemuOptsList qemu_netdev_opts = {

},

};

+QemuOptsList qemu_nic_opts = {

+ .name = "nic",

+ .implied_opt_name = "type",

+ .head = QTAILQ_HEAD_INITIALIZER(qemu_nic_opts.head),

+ .desc = {

+ /*

+ * no elements => accept any params

+ * validation will happen later

+ */

+ { /* end of list */ }

+ },

+};

+

QemuOptsList qemu_net_opts = {

.name = "net",

.implied_opt_name = "type",

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

index XXXXXXX..XXXXXXX 100644

--- a/qemu-options.hx

+++ b/qemu-options.hx

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

#endif

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

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

+DEF("nic", HAS_ARG, QEMU_OPTION_nic,

+ "--nic [tap|bridge|"

+#ifdef CONFIG_SLIRP

+ "user|"

+#endif

+#ifdef __linux__

+ "l2tpv3|"

+#endif

+#ifdef CONFIG_VDE

+ "vde|"

+#endif

+#ifdef CONFIG_NETMAP

+ "netmap|"

+#endif

+#ifdef CONFIG_POSIX

+ "vhost-user|"

+#endif

+ "socket][,option][,...][mac=macaddr]\n"

+ " initialize an on-board / default host NIC (using MAC address\n"

+ " macaddr) and connect it to the given host network backend\n"

+ "--nic none use it alone to have zero network devices (the default is to\n"

+ " provided a 'user' network connection)\n",

+ QEMU_ARCH_ALL)

DEF("net", HAS_ARG, QEMU_OPTION_net,

"-net nic[,vlan=n][,netdev=nd][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"

" configure or create an on-board (or machine default) NIC and\n"

" connect it either to VLAN 'n' or the netdev 'nd' (for pluggable\n"

" NICs please use '-device devtype,netdev=nd' instead)\n"

- "-net none use it alone to have zero network devices. If no -net option\n"

- " is provided, the default is '-net nic -net user'\n"

"-net ["

#ifdef CONFIG_SLIRP

"user|"

@@ -XXX,XX +XXX,XX @@ qemu -m 512 -object memory-backend-file,id=mem,size=512M,mem-path=/hugetlbfs,sha

-device virtio-net-pci,netdev=net0

@end example

-@item -net none

-Indicate that no network devices should be configured. It is used to

-override the default configuration (@option{-net nic -net user}) which

-is activated if no @option{-net} options are provided.

+@item --nic [tap|bridge|user|l2tpv3|vde|netmap|vhost-user|socket][,...][,mac=macaddr]

+

+This option is a shortcut for setting both, the on-board (default) guest NIC

+hardware and the host network backend in one go. The host backend options are

+the same as with the corresponding @option{--netdev} option. The guest NIC

+hardware MAC address can be set with @option{mac=@var{macaddr}}.

+

+@item --nic none

+Indicate that no network devices should be configured. It is used to override

+the default configuration (default NIC with @option{--net user} backend) which

+is activated if no other networking options are provided.

ETEXI

STEXI

diff --git a/vl.c b/vl.c

index XXXXXXX..XXXXXXX 100644

--- a/vl.c

+++ b/vl.c

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)

qemu_add_opts(&qemu_chardev_opts);

qemu_add_opts(&qemu_device_opts);

qemu_add_opts(&qemu_netdev_opts);

+ qemu_add_opts(&qemu_nic_opts);

qemu_add_opts(&qemu_net_opts);

qemu_add_opts(&qemu_rtc_opts);

qemu_add_opts(&qemu_global_opts);

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)

exit(1);

}

break;

+ case QEMU_OPTION_nic:

+ default_net = 0;

+ if (net_client_parse(qemu_find_opts("nic"), optarg) == -1) {

+ exit(1);

+ }

+ break;

case QEMU_OPTION_net:

default_net = 0;

if (net_client_parse(qemu_find_opts("net"), optarg) == -1) {

From: Jay Zhou <jianjay.zhou@huawei.com>

If netdev_add tap,id=net0,...,vhost=on failed in net_init_tap_one(),

the followed up device_add virtio-net-pci,netdev=net0 will fail

too, prints:

TUNSETOFFLOAD ioctl() failed: Bad file descriptor TUNSETOFFLOAD

ioctl() failed: Bad file descriptor

The reason is that the fd of tap is closed when error occured after

calling net_init_tap_one().

The fd should be closed when calling net_init_tap_one failed:

- if tap_set_sndbuf() failed

- if tap_set_sndbuf() succeeded but vhost failed to open or

initialize with vhostforce flag on

- with wrong vhost command line parameter

The fd should not be closed just because vhost failed to open or

initialize but without vhostforce flag. So the followed up

device_add can fall back to userspace virtio successfully.

Suggested-by: Michael S. Tsirkin <mst@redhat.com>

Suggested-by: Igor Mammedov <imammedo@redhat.com>

Suggested-by: Jason Wang <jasowang@redhat.com>

Signed-off-by: Jay Zhou <jianjay.zhou@huawei.com>

include/net/vhost_net.h | 3 +++

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

2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h