Series comparison

-[Qemu-devel] [PULL 0/6] Net patches
+[PULL 0/6] Net patches
-The following changes since commit e607bbee553cfe73072870cef458cfa4e78133e2:
+The following changes since commit d0d3dd401b70168a353450e031727affee828527:
-  Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2018-01-26.for-upstream' into staging (2018-01-26 14:24:25 +0000)
+  Update version for v6.0.0-rc2 release (2021-04-06 18:34:34 +0100)
 are available in the git repository at:
   https://github.com/jasowang/qemu.git tags/net-pull-request
-for you to fetch changes up to bf4835a4d5338bb7424827715df22570a8adc67c:
+for you to fetch changes up to 21df394d9e2ffce9fa308f496d1ae228cf6cdb57:
-  MAINTAINERS: update Dmitry Fleytman email (2018-01-29 16:05:38 +0800)
+  tap-win32: correctly recycle buffers (2021-04-08 17:33:59 +0800)
 ----------------------------------------------------------------
-----------------------------------------------------------------
+Fixes for rc3:
 Mao Zhongyi (2):
       colo: modified the payload compare function
       colo: compare the packet based on the tcp sequence number
-Philippe Mathieu-Daudé (1):
+- query-netdev is reverted (that's why the changeset is huge)
-      MAINTAINERS: update Dmitry Fleytman email
+- fix a regression caused by padding for in TAP for win32
 Thomas Huth (3):
       net: Allow hubports to connect to other netdevs
       net: Allow netdevs to be used with 'hostfwd_add' and 'hostfwd_remove'
       qemu-doc: Get rid of "vlan=X" example in the documentation
  MAINTAINERS        |   8 +-
  hmp-commands.hx    |   4 +-
  net/colo-compare.c | 411 +++++++++++++++++++++++++++++++++--------------------
  net/colo.c         |   9 ++
  net/colo.h         |  15 ++
  net/hub.c          |  27 +++-
  net/hub.h          |   3 +-
  net/net.c          |   2 +-
  net/slirp.c        |  33 +++--
  net/trace-events   |   2 +-
  qapi/net.json      |   4 +-
  qemu-options.hx    |  12 +-
 files changed, 347 insertions(+), 183 deletions(-)
+----------------------------------------------------------------
+Jason Wang (6):
+      Revert "net: Do not fill legacy info_str for backends"
+      Revert "hmp: Use QAPI NetdevInfo in hmp_info_network"
+      Revert "net: Move NetClientState.info_str to dynamic allocations"
+      Revert "tests: Add tests for query-netdev command"
+      Revert "qapi: net: Add query-netdev command"
+      tap-win32: correctly recycle buffers
+ hw/net/xen_nic.c                  |   5 +-
+ include/net/net.h                 |   5 +-
+ include/qapi/hmp-output-visitor.h |  30 ------
+ net/l2tpv3.c                      |   8 +-
+ net/net.c                         |  73 ++------------
+ net/netmap.c                      |   7 --
+ net/slirp.c                       | 124 +-----------------------
+ net/socket.c                      |  92 +++++-------------
+ net/tap-win32.c                   |  16 ++--
+ net/tap.c                         | 107 +++------------------
+ net/vde.c                         |  25 +----
+ net/vhost-user.c                  |  20 +---
+ net/vhost-vdpa.c                  |  15 +--
+ qapi/hmp-output-visitor.c         | 193 --------------------------------------
+ qapi/meson.build                  |   1 -
+ qapi/net.json                     |  80 ----------------
+ tests/qtest/meson.build           |   3 -
+ tests/qtest/test-query-netdev.c   | 120 ------------------------
+files changed, 66 insertions(+), 858 deletions(-)
+ delete mode 100644 include/qapi/hmp-output-visitor.h
+ delete mode 100644 qapi/hmp-output-visitor.c
+ delete mode 100644 tests/qtest/test-query-netdev.c

-[Qemu-devel] [PULL 6/6] MAINTAINERS: update Dmitry Fleytman email
+[PULL 1/6] Revert "net: Do not fill legacy info_str for backends"
-From: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Several issues has been reported for query-netdev info
+series. Consider it's late in the rc, this reverts commit
-gently asked by his automatic reply :)
+f2e8319d456724c3d8514d943dc4607e2f08e88a.
 Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- MAINTAINERS | 8 ++++----
+ net/l2tpv3.c     |  2 ++
-file changed, 4 insertions(+), 4 deletions(-)
+ net/slirp.c      |  3 +++
+ net/socket.c     | 28 ++++++++++++++++++++++++++++
-diff --git a/MAINTAINERS b/MAINTAINERS
+ net/tap-win32.c  |  2 ++
-index XXXXXXX..XXXXXXX 100644
+ net/tap.c        |  9 +++++++++
---- a/MAINTAINERS
+ net/vde.c        |  2 ++
-+++ b/MAINTAINERS
+ net/vhost-user.c |  1 +
-@@ -XXX,XX +XXX,XX @@ F: hw/scsi/mfi.h
+ net/vhost-vdpa.c |  1 +
- F: tests/megasas-test.c
+files changed, 48 insertions(+)
- Network packet abstractions
+diff --git a/net/l2tpv3.c b/net/l2tpv3.c
--M: Dmitry Fleytman <dmitry@daynix.com>
+index XXXXXXX..XXXXXXX 100644
-+M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
+--- a/net/l2tpv3.c
- S: Maintained
++++ b/net/l2tpv3.c
- F: include/net/eth.h
+@@ -XXX,XX +XXX,XX @@ int net_init_l2tpv3(const Netdev *netdev,
- F: net/eth.c
-@@ -XXX,XX +XXX,XX @@ F: hw/net/net_rx_pkt*
+     QAPI_CLONE_MEMBERS(NetdevL2TPv3Options,
- F: hw/net/net_tx_pkt*
+                        &nc->stored_config->u.l2tpv3, l2tpv3);
++
- Vmware
++    s->nc.info_str = g_strdup_printf("l2tpv3: connected");
--M: Dmitry Fleytman <dmitry@daynix.com>
+     return 0;
-+M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
+ outerr:
- S: Maintained
+     qemu_del_net_client(nc);
- F: hw/net/vmxnet*
+diff --git a/net/slirp.c b/net/slirp.c
- F: hw/scsi/vmw_pvscsi*
+index XXXXXXX..XXXXXXX 100644
-@@ -XXX,XX +XXX,XX @@ F: hw/mem/nvdimm.c
+--- a/net/slirp.c
- F: include/hw/mem/nvdimm.h
++++ b/net/slirp.c
+@@ -XXX,XX +XXX,XX @@ static int net_slirp_init(NetClientState *peer, const char *model,
- e1000x
+         stored->tftp_server_name = g_strdup(tftp_server_name);
--M: Dmitry Fleytman <dmitry@daynix.com>
+     }
-+M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
- S: Maintained
++    nc->info_str = g_strdup_printf("net=%s,restrict=%s", inet_ntoa(net),
- F: hw/net/e1000x*
++                                   restricted ? "on" : "off");
++
- e1000e
+     s = DO_UPCAST(SlirpState, nc, nc);
--M: Dmitry Fleytman <dmitry@daynix.com>
-+M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
+     s->slirp = slirp_init(restricted, ipv4, net, mask, host,
- S: Maintained
+diff --git a/net/socket.c b/net/socket.c
- F: hw/net/e1000e*
+index XXXXXXX..XXXXXXX 100644
+--- a/net/socket.c
 +++ b/net/socket.c
@@ -XXX,XX +XXX,XX @@ static void net_socket_send(void *opaque)
          s->fd = -1;
          net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
          s->nc.link_down = true;
 +        g_free(s->nc.info_str);
 +        s->nc.info_str = g_new0(char, 1);
          return;
      }
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
          stored->mcast = g_strdup(mcast);
          s->dgram_dst = saddr;
 +        nc->info_str = g_strdup_printf("socket: fd=%d (cloned mcast=%s:%d)",
 +                                       fd, inet_ntoa(saddr.sin_addr),
 +                                       ntohs(saddr.sin_port));
      } else {
          if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
              s->dgram_dst.sin_family = AF_UNIX;
          }
 +
 +        nc->info_str = g_strdup_printf("socket: fd=%d %s",
 +                                       fd, SocketAddressType_str(sa_type));
      }
      return s;
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
      nc = qemu_new_net_client(&net_socket_info, peer, model, name);
 +    nc->info_str = g_strdup_printf("socket: fd=%d", fd);
 +
      s = DO_UPCAST(NetSocketState, nc, nc);
      s->fd = fd;
@@ -XXX,XX +XXX,XX @@ static void net_socket_accept(void *opaque)
      stored->has_fd = true;
      stored->fd = g_strdup_printf("%d", fd);
 +
 +    g_free(s->nc.info_str);
 +    s->nc.info_str = g_strdup_printf("socket: connection from %s:%d",
 +                                     inet_ntoa(saddr.sin_addr),
 +                                     ntohs(saddr.sin_port));
  }
  static int net_socket_listen_init(NetClientState *peer,
@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
      stored->has_connect = true;
      stored->connect = g_strdup(host_str);
 +    g_free(s->nc.info_str);
 +    s->nc.info_str = g_strdup_printf("socket: connect to %s:%d",
 +                                     inet_ntoa(saddr.sin_addr),
 +                                     ntohs(saddr.sin_port));
      return 0;
  }
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
          stored->localaddr = g_strdup(localaddr_str);
      }
 +    g_free(s->nc.info_str);
 +    s->nc.info_str = g_strdup_printf("socket: mcast=%s:%d",
 +                                     inet_ntoa(saddr.sin_addr),
 +                                     ntohs(saddr.sin_port));
      return 0;
 +
  }
  static int net_socket_udp_init(NetClientState *peer,
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
      stored->has_udp = true;
      stored->udp = g_strdup(rhost);
 +    g_free(s->nc.info_str);
 +    s->nc.info_str = g_strdup_printf("socket: udp=%s:%d",
 +                                     inet_ntoa(raddr.sin_addr),
 +                                     ntohs(raddr.sin_port));
      return 0;
  }
 diff --git a/net/tap-win32.c b/net/tap-win32.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/tap-win32.c
 +++ b/net/tap-win32.c
@@ -XXX,XX +XXX,XX @@ static int tap_win32_init(NetClientState *peer, const char *model,
      stored->has_ifname = true;
      stored->ifname = g_strdup(ifname);
 +    s->nc.info_str = g_strdup_printf("tap: ifname=%s", ifname);
 +
      s->handle = handle;
      qemu_add_wait_object(s->handle->tap_semaphore, tap_win32_send, s);
 diff --git a/net/tap.c b/net/tap.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/tap.c
 +++ b/net/tap.c
@@ -XXX,XX +XXX,XX @@ int net_init_bridge(const Netdev *netdev, const char *name,
          stored->helper = g_strdup(helper);
      }
 +    s->nc.info_str = g_strdup_printf("helper=%s,br=%s", helper, br);
 +
      return 0;
  }
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
              stored->fds = g_strdup_printf("%s:%d", stored->fds, fd);
              g_free(tmp_s);
          }
 +
 +        s->nc.info_str = g_strdup_printf("fd=%d", fd);
      } else if (tap->has_helper) {
          if (!stored->has_helper) {
              stored->has_helper = true;
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
              stored->br = tap->has_br ? g_strdup(tap->br) :
                                         g_strdup(DEFAULT_BRIDGE_INTERFACE);
          }
 +
 +        s->nc.info_str = g_strdup_printf("helper=%s", tap->helper);
      } else {
          if (ifname && !stored->has_ifname) {
              stored->has_ifname = true;
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
              stored->downscript = g_strdup(downscript);
          }
 +        s->nc.info_str = g_strdup_printf("ifname=%s,script=%s,downscript=%s",
 +                                         ifname, script, downscript);
 +
          if (strcmp(downscript, "no") != 0) {
              snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
              snprintf(s->down_script_arg, sizeof(s->down_script_arg),
 diff --git a/net/vde.c b/net/vde.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/vde.c
 +++ b/net/vde.c
@@ -XXX,XX +XXX,XX @@ static int net_vde_init(NetClientState *peer, const char *model,
      nc = qemu_new_net_client(&net_vde_info, peer, model, name);
 +    nc->info_str = g_strdup_printf("sock=%s,fd=%d", sock, vde_datafd(vde));
 +
      s = DO_UPCAST(VDEState, nc, nc);
      s->vde = vde;
 diff --git a/net/vhost-user.c b/net/vhost-user.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/vhost-user.c
 +++ b/net/vhost-user.c
@@ -XXX,XX +XXX,XX @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
      user = g_new0(struct VhostUserState, 1);
      for (i = 0; i < queues; i++) {
          nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name);
 +        nc->info_str = g_strdup_printf("vhost-user%d to %s", i, chr->label);
          nc->queue_index = i;
          if (!nc0) {
              nc0 = nc;
 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/vhost-vdpa.c
 +++ b/net/vhost-vdpa.c
@@ -XXX,XX +XXX,XX @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
      stored->has_queues = true;
      stored->queues = 1; /* TODO: change when support multiqueue */
 +    nc->info_str = g_strdup_printf(TYPE_VHOST_VDPA);
      nc->queue_index = 0;
      s = DO_UPCAST(VhostVDPAState, nc, nc);
      vdpa_device_fd = qemu_open_old(vhostdev, O_RDWR);
 --
 .7.4

-[Qemu-devel] [PULL 5/6] qemu-doc: Get rid of "vlan=X" example in the documentation
+[PULL 2/6] Revert "hmp: Use QAPI NetdevInfo in hmp_info_network"
-From: Thomas Huth <thuth@redhat.com>
+Several issues has been reported for query-netdev info
 series. Consider it's late in the rc, this reverts commit
 a0724776c5a98a08fc946bb5a4ad16410ca64c0e.
-The vlan concept is marked as deprecated, so we should not use
-this for examples in the documentation anymore.
-Signed-off-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- qemu-options.hx | 4 ++--
+ include/qapi/hmp-output-visitor.h |  30 ------
-file changed, 2 insertions(+), 2 deletions(-)
+ net/net.c                         |  31 +-----
  qapi/hmp-output-visitor.c         | 193 --------------------------------------
  qapi/meson.build                  |   1 -
 files changed, 1 insertion(+), 254 deletions(-)
  delete mode 100644 include/qapi/hmp-output-visitor.h
  delete mode 100644 qapi/hmp-output-visitor.c
-diff --git a/qemu-options.hx b/qemu-options.hx
+diff --git a/include/qapi/hmp-output-visitor.h b/include/qapi/hmp-output-visitor.h
 deleted file mode 100644
 index XXXXXXX..XXXXXXX
 --- a/include/qapi/hmp-output-visitor.h
 +++ /dev/null
@@ -XXX,XX +XXX,XX @@
 -/*
 - * HMP string output Visitor
 - *
 - * Copyright Yandex N.V., 2021
 - *
 - * This work is licensed under the terms of the GNU GPL, version 2 or later.
 - * See the COPYING file in the top-level directory.
 - *
 - */
 -
 -#ifndef HMP_OUTPUT_VISITOR_H
 -#define HMP_OUTPUT_VISITOR_H
 -
 -#include "qapi/visitor.h"
 -
 -typedef struct HMPOutputVisitor HMPOutputVisitor;
 -
 -/**
 - * Create a HMP string output visitor for @obj
 - *
 - * Flattens dicts/structures, only shows arrays borders.
 - *
 - * Errors are not expected to happen.
 - *
 - * The caller is responsible for freeing the visitor with
 - * visit_free().
 - */
 -Visitor *hmp_output_visitor_new(char **result);
 -
 -#endif
 diff --git a/net/net.c b/net/net.c
 index XXXXXXX..XXXXXXX 100644
---- a/qemu-options.hx
+--- a/net/net.c
-+++ b/qemu-options.hx
++++ b/net/net.c
-@@ -XXX,XX +XXX,XX @@ qemu-system-i386 linux.img -net nic -net tap
+@@ -XXX,XX +XXX,XX @@
- #launch a QEMU instance with two NICs, each one connected
+ #include "sysemu/sysemu.h"
- #to a TAP device
+ #include "net/filter.h"
- qemu-system-i386 linux.img \
+ #include "qapi/string-output-visitor.h"
--                 -net nic,vlan=0 -net tap,vlan=0,ifname=tap0 \
+-#include "qapi/hmp-output-visitor.h"
--                 -net nic,vlan=1 -net tap,vlan=1,ifname=tap1
-+        -netdev tap,id=nd0,ifname=tap0 -device e1000,netdev=nd0 \
+ /* Net bridge is currently not supported for W32. */
-+        -netdev tap,id=nd1,ifname=tap1 -device rtl8139,netdev=nd1
+ #if !defined(_WIN32)
- @end example
+@@ -XXX,XX +XXX,XX @@ static void netfilter_print_info(Monitor *mon, NetFilterState *nf)
+     monitor_printf(mon, "\n");
- @example
+ }
 -static char *generate_info_str(NetClientState *nc)
 -{
 -    NetdevInfo *ni = nc->stored_config;
 -    char *ret_out = NULL;
 -    Visitor *v;
 -
 -    /* Use legacy field info_str for NIC and hubports */
 -    if ((nc->info->type == NET_CLIENT_DRIVER_NIC) ||
 -        (nc->info->type == NET_CLIENT_DRIVER_HUBPORT)) {
 -        return g_strdup(nc->info_str ? nc->info_str : "");
 -    }
 -
 -    if (!ni) {
 -        return g_malloc0(1);
 -    }
 -
 -    v = hmp_output_visitor_new(&ret_out);
 -    if (visit_type_NetdevInfo(v, "", &ni, NULL)) {
 -        visit_complete(v, &ret_out);
 -    }
 -    visit_free(v);
 -
 -    return ret_out;
 -}
 -
  void print_net_client(Monitor *mon, NetClientState *nc)
  {
      NetFilterState *nf;
 -    char *info_str = generate_info_str(nc);
      monitor_printf(mon, "%s: index=%d,type=%s,%s\n", nc->name,
                     nc->queue_index,
                     NetClientDriver_str(nc->info->type),
 -                   info_str);
 -    g_free(info_str);
 -
 +                   nc->info_str ? nc->info_str : "");
      if (!QTAILQ_EMPTY(&nc->filters)) {
          monitor_printf(mon, "filters:\n");
      }
 diff --git a/qapi/hmp-output-visitor.c b/qapi/hmp-output-visitor.c
 deleted file mode 100644
 index XXXXXXX..XXXXXXX
 --- a/qapi/hmp-output-visitor.c
 +++ /dev/null
@@ -XXX,XX +XXX,XX @@
 -/*
 - * HMP string output Visitor
 - *
 - * Copyright Yandex N.V., 2021
 - *
 - * This work is licensed under the terms of the GNU GPL, version 2 or later.
 - * See the COPYING file in the top-level directory.
 - *
 - */
 -
 -#include "qemu/osdep.h"
 -#include "qemu/cutils.h"
 -#include "qapi/hmp-output-visitor.h"
 -#include "qapi/visitor-impl.h"
 -
 -struct HMPOutputVisitor {
 -    Visitor visitor;
 -    char **result;
 -    GString *buffer;
 -    bool is_continue;
 -};
 -
 -static HMPOutputVisitor *to_hov(Visitor *v)
 -{
 -    return container_of(v, HMPOutputVisitor, visitor);
 -}
 -
 -static void hmp_output_append_formatted(Visitor *v, const char *fmt, ...)
 -{
 -    HMPOutputVisitor *ov = to_hov(v);
 -    va_list args;
 -
 -    if (ov->is_continue) {
 -        g_string_append(ov->buffer, ",");
 -    } else {
 -        ov->is_continue = true;
 -    }
 -
 -    va_start(args, fmt);
 -    g_string_append_vprintf(ov->buffer, fmt, args);
 -    va_end(args);
 -}
 -
 -static void hmp_output_skip_comma(Visitor *v)
 -{
 -    HMPOutputVisitor *ov = to_hov(v);
 -
 -    ov->is_continue = false;
 -}
 -
 -static bool hmp_output_start_struct(Visitor *v, const char *name,
 -                                    void **obj, size_t unused, Error **errp)
 -{
 -    return true;
 -}
 -
 -static void hmp_output_end_struct(Visitor *v, void **obj) {}
 -
 -static bool hmp_output_start_list(Visitor *v, const char *name,
 -                                  GenericList **listp, size_t size,
 -                                  Error **errp)
 -{
 -    hmp_output_append_formatted(v, "%s=[", name);
 -    /* First element in array without comma before it */
 -    hmp_output_skip_comma(v);
 -
 -    return true;
 -}
 -
 -static GenericList *hmp_output_next_list(Visitor *v, GenericList *tail,
 -                                         size_t size)
 -{
 -    return tail->next;
 -}
 -
 -static void hmp_output_end_list(Visitor *v, void **obj)
 -{
 -    /* Don't need comma after last array element */
 -    hmp_output_skip_comma(v);
 -    hmp_output_append_formatted(v, "]");
 -}
 -
 -static bool hmp_output_type_int64(Visitor *v, const char *name,
 -                                  int64_t *obj, Error **errp)
 -{
 -    hmp_output_append_formatted(v, "%s=%" PRId64, name, *obj);
 -
 -    return true;
 -}
 -
 -static bool hmp_output_type_uint64(Visitor *v, const char *name,
 -                                   uint64_t *obj, Error **errp)
 -{
 -    hmp_output_append_formatted(v, "%s=%" PRIu64, name, *obj);
 -
 -    return true;
 -}
 -
 -static bool hmp_output_type_bool(Visitor *v, const char *name, bool *obj,
 -                                 Error **errp)
 -{
 -    hmp_output_append_formatted(v, "%s=%s", name, *obj ? "true" : "false");
 -
 -    return true;
 -}
 -
 -static bool hmp_output_type_str(Visitor *v, const char *name, char **obj,
 -                                Error **errp)
 -{
 -    /* Skip already printed or unused fields */
 -    if (!*obj || g_str_equal(name, "id") || g_str_equal(name, "type")) {
 -        return true;
 -    }
 -
 -    /* Do not print stub name for StringList elements */
 -    if (g_str_equal(name, "str")) {
 -        hmp_output_append_formatted(v, "%s", *obj);
 -    } else {
 -        hmp_output_append_formatted(v, "%s=%s", name, *obj);
 -    }
 -
 -    return true;
 -}
 -
 -static bool hmp_output_type_number(Visitor *v, const char *name,
 -                                   double *obj, Error **errp)
 -{
 -    hmp_output_append_formatted(v, "%s=%.17g", name, *obj);
 -
 -    return true;
 -}
 -
 -/* TODO: remove this function? */
 -static bool hmp_output_type_any(Visitor *v, const char *name,
 -                                QObject **obj, Error **errp)
 -{
 -    return true;
 -}
 -
 -static bool hmp_output_type_null(Visitor *v, const char *name,
 -                                 QNull **obj, Error **errp)
 -{
 -    hmp_output_append_formatted(v, "%s=NULL", name);
 -
 -    return true;
 -}
 -
 -static void hmp_output_complete(Visitor *v, void *opaque)
 -{
 -    HMPOutputVisitor *ov = to_hov(v);
 -
 -    *ov->result = g_string_free(ov->buffer, false);
 -    ov->buffer = NULL;
 -}
 -
 -static void hmp_output_free(Visitor *v)
 -{
 -    HMPOutputVisitor *ov = to_hov(v);
 -
 -    if (ov->buffer) {
 -        g_string_free(ov->buffer, true);
 -    }
 -    g_free(v);
 -}
 -
 -Visitor *hmp_output_visitor_new(char **result)
 -{
 -    HMPOutputVisitor *v;
 -
 -    v = g_malloc0(sizeof(*v));
 -
 -    v->visitor.type = VISITOR_OUTPUT;
 -    v->visitor.start_struct = hmp_output_start_struct;
 -    v->visitor.end_struct = hmp_output_end_struct;
 -    v->visitor.start_list = hmp_output_start_list;
 -    v->visitor.next_list = hmp_output_next_list;
 -    v->visitor.end_list = hmp_output_end_list;
 -    v->visitor.type_int64 = hmp_output_type_int64;
 -    v->visitor.type_uint64 = hmp_output_type_uint64;
 -    v->visitor.type_bool = hmp_output_type_bool;
 -    v->visitor.type_str = hmp_output_type_str;
 -    v->visitor.type_number = hmp_output_type_number;
 -    v->visitor.type_any = hmp_output_type_any;
 -    v->visitor.type_null = hmp_output_type_null;
 -    v->visitor.complete = hmp_output_complete;
 -    v->visitor.free = hmp_output_free;
 -
 -    v->result = result;
 -    v->buffer = g_string_new("");
 -    v->is_continue = false;
 -
 -    return &v->visitor;
 -}
 diff --git a/qapi/meson.build b/qapi/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/qapi/meson.build
 +++ b/qapi/meson.build
@@ -XXX,XX +XXX,XX @@ util_ss.add(files(
    'qobject-output-visitor.c',
    'string-input-visitor.c',
    'string-output-visitor.c',
 -  'hmp-output-visitor.c',
  ))
  if have_system or have_tools
    util_ss.add(files(
 --
 .7.4

-[Qemu-devel] [PULL 4/6] net: Allow netdevs to be used with 'hostfwd_add' and 'hostfwd_remove'
+[PULL 3/6] Revert "net: Move NetClientState.info_str to dynamic allocations"
-From: Thomas Huth <thuth@redhat.com>
+Several issues has been reported for query-netdev info
 series. Consider it's late in the rc, this reverts commit
 commit 59b5437eb732d6b103a9bc279c3482c834d1eff9.
-It does not make much sense to limit these commands to the legacy 'vlan'
-concept only, they should work with the modern netdevs, too. So now
-it is possible to use this command with one, two or three parameters.
-With one parameter, the command installs a hostfwd rule on the default
-"user" network:
-    hostfwd_add tcp:...
-With two parameters, the command installs a hostfwd rule on a netdev
-(that's the new way of using this command):
-    hostfwd_add netdev_id tcp:...
-With three parameters, the command installs a rule on a 'vlan' (aka hub):
-    hostfwd_add hub_id name tcp:...
-Same applies to the hostfwd_remove command now.
-Signed-off-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- hmp-commands.hx |  4 ++--
+ hw/net/xen_nic.c  |  5 +++--
- net/slirp.c     | 33 +++++++++++++++++++++++----------
+ include/net/net.h |  2 +-
-files changed, 25 insertions(+), 12 deletions(-)
+ net/l2tpv3.c      |  3 ++-
  net/net.c         | 14 ++++++--------
  net/slirp.c       |  5 +++--
  net/socket.c      | 43 +++++++++++++++++++------------------------
  net/tap-win32.c   |  3 ++-
  net/tap.c         | 13 ++++++++-----
  net/vde.c         |  3 ++-
  net/vhost-user.c  |  3 ++-
  net/vhost-vdpa.c  |  2 +-
 files changed, 49 insertions(+), 47 deletions(-)
-diff --git a/hmp-commands.hx b/hmp-commands.hx
+diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
 index XXXXXXX..XXXXXXX 100644
---- a/hmp-commands.hx
+--- a/hw/net/xen_nic.c
-+++ b/hmp-commands.hx
++++ b/hw/net/xen_nic.c
-@@ -XXX,XX +XXX,XX @@ ETEXI
+@@ -XXX,XX +XXX,XX @@ static int net_init(struct XenLegacyDevice *xendev)
-     {
+     netdev->nic = qemu_new_nic(&net_xen_info, &netdev->conf,
-         .name       = "hostfwd_add",
+                                "xen", NULL, netdev);
-         .args_type  = "arg1:s,arg2:s?,arg3:s?",
--        .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
+-    qemu_get_queue(netdev->nic)->info_str = g_strdup_printf(
-+        .params     = "[hub_id name]|[netdev_id] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
+-        "nic: xenbus vif macaddr=%s", netdev->mac);
-         .help       = "redirect TCP or UDP connections from host to guest (requires -net user)",
++    snprintf(qemu_get_queue(netdev->nic)->info_str,
-         .cmd        = hmp_hostfwd_add,
++             sizeof(qemu_get_queue(netdev->nic)->info_str),
-     },
++             "nic: xenbus vif macaddr=%s", netdev->mac);
-@@ -XXX,XX +XXX,XX @@ ETEXI
-     {
+     /* fill info */
-         .name       = "hostfwd_remove",
+     xenstore_write_be_int(&netdev->xendev, "feature-rx-copy", 1);
-         .args_type  = "arg1:s,arg2:s?,arg3:s?",
+diff --git a/include/net/net.h b/include/net/net.h
--        .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",
+index XXXXXXX..XXXXXXX 100644
-+        .params     = "[hub_id name]|[netdev_id] [tcp|udp]:[hostaddr]:hostport",
+--- a/include/net/net.h
-         .help       = "remove host-to-guest TCP or UDP redirection",
++++ b/include/net/net.h
-         .cmd        = hmp_hostfwd_remove,
+@@ -XXX,XX +XXX,XX @@ struct NetClientState {
-     },
+     NetQueue *incoming_queue;
      char *model;
      char *name;
 -    char *info_str;
 +    char info_str[256];
      NetdevInfo *stored_config;
      unsigned receive_disabled : 1;
      NetClientDestructor *destructor;
 diff --git a/net/l2tpv3.c b/net/l2tpv3.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/l2tpv3.c
 +++ b/net/l2tpv3.c
@@ -XXX,XX +XXX,XX @@ int net_init_l2tpv3(const Netdev *netdev,
      QAPI_CLONE_MEMBERS(NetdevL2TPv3Options,
                         &nc->stored_config->u.l2tpv3, l2tpv3);
 -    s->nc.info_str = g_strdup_printf("l2tpv3: connected");
 +    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
 +             "l2tpv3: connected");
      return 0;
  outerr:
      qemu_del_net_client(nc);
 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 @@ char *qemu_mac_strdup_printf(const uint8_t *macaddr)
  void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6])
  {
 -    g_free(nc->info_str);
 -    nc->info_str = g_strdup_printf(
 -        "model=%s,macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
 -        nc->model,
 -        macaddr[0], macaddr[1], macaddr[2],
 -        macaddr[3], macaddr[4], macaddr[5]);
 +    snprintf(nc->info_str, sizeof(nc->info_str),
 +             "model=%s,macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
 +             nc->model,
 +             macaddr[0], macaddr[1], macaddr[2],
 +             macaddr[3], macaddr[4], macaddr[5]);
  }
  static int mac_table[256] = {0};
@@ -XXX,XX +XXX,XX @@ static void qemu_free_net_client(NetClientState *nc)
      }
      g_free(nc->name);
      g_free(nc->model);
 -    g_free(nc->info_str);
      qapi_free_NetdevInfo(nc->stored_config);
      if (nc->destructor) {
          nc->destructor(nc);
@@ -XXX,XX +XXX,XX @@ void print_net_client(Monitor *mon, NetClientState *nc)
      monitor_printf(mon, "%s: index=%d,type=%s,%s\n", nc->name,
                     nc->queue_index,
                     NetClientDriver_str(nc->info->type),
 -                   nc->info_str ? nc->info_str : "");
 +                   nc->info_str);
      if (!QTAILQ_EMPTY(&nc->filters)) {
          monitor_printf(mon, "filters:\n");
      }
 diff --git a/net/slirp.c b/net/slirp.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/slirp.c
 +++ b/net/slirp.c
-@@ -XXX,XX +XXX,XX @@ error:
+@@ -XXX,XX +XXX,XX @@ static int net_slirp_init(NetClientState *peer, const char *model,
-     return -1;
+         stored->tftp_server_name = g_strdup(tftp_server_name);
- }
+     }
--static SlirpState *slirp_lookup(Monitor *mon, const char *vlan,
+-    nc->info_str = g_strdup_printf("net=%s,restrict=%s", inet_ntoa(net),
--                                const char *stack)
+-                                   restricted ? "on" : "off");
-+static SlirpState *slirp_lookup(Monitor *mon, const char *hub_id,
++    snprintf(nc->info_str, sizeof(nc->info_str),
-+                                const char *name)
++             "net=%s,restrict=%s", inet_ntoa(net),
- {
++             restricted ? "on" : "off");
--
--    if (vlan) {
+     s = DO_UPCAST(SlirpState, nc, nc);
-+    if (name) {
-         NetClientState *nc;
+diff --git a/net/socket.c b/net/socket.c
--        nc = net_hub_find_client_by_name(strtol(vlan, NULL, 0), stack);
+index XXXXXXX..XXXXXXX 100644
--        if (!nc) {
+--- a/net/socket.c
--            monitor_printf(mon, "unrecognized (vlan-id, stackname) pair\n");
++++ b/net/socket.c
--            return NULL;
+@@ -XXX,XX +XXX,XX @@ static void net_socket_send(void *opaque)
-+        if (hub_id) {
+         s->fd = -1;
-+            nc = net_hub_find_client_by_name(strtol(hub_id, NULL, 0), name);
+         net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
-+            if (!nc) {
+         s->nc.link_down = true;
-+                monitor_printf(mon, "unrecognized (vlan-id, stackname) pair\n");
+-        g_free(s->nc.info_str);
-+                return NULL;
+-        s->nc.info_str = g_new0(char, 1);
-+            }
++        memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
-+        } else {
-+            nc = qemu_find_netdev(name);
+         return;
-+            if (!nc) {
+     }
-+                monitor_printf(mon, "unrecognized netdev id '%s'\n", name);
+@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
-+                return NULL;
+         stored->mcast = g_strdup(mcast);
-+            }
          s->dgram_dst = saddr;
 -        nc->info_str = g_strdup_printf("socket: fd=%d (cloned mcast=%s:%d)",
 -                                       fd, inet_ntoa(saddr.sin_addr),
 -                                       ntohs(saddr.sin_port));
 +        snprintf(nc->info_str, sizeof(nc->info_str),
 +                 "socket: fd=%d (cloned mcast=%s:%d)",
 +                 fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
      } else {
          if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
              s->dgram_dst.sin_family = AF_UNIX;
          }
-         if (strcmp(nc->model, "user")) {
-             monitor_printf(mon, "invalid device specified\n");
+-        nc->info_str = g_strdup_printf("socket: fd=%d %s",
-@@ -XXX,XX +XXX,XX @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict)
+-                                       fd, SocketAddressType_str(sa_type));
-     const char *arg2 = qdict_get_try_str(qdict, "arg2");
++        snprintf(nc->info_str, sizeof(nc->info_str),
-     const char *arg3 = qdict_get_try_str(qdict, "arg3");
++                 "socket: fd=%d %s", fd, SocketAddressType_str(sa_type));
+     }
--    if (arg2) {
-+    if (arg3) {
+     return s;
-         s = slirp_lookup(mon, arg1, arg2);
+@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
-         src_str = arg3;
-+    } else if (arg2) {
+     nc = qemu_new_net_client(&net_socket_info, peer, model, name);
-+        s = slirp_lookup(mon, NULL, arg1);
-+        src_str = arg2;
+-    nc->info_str = g_strdup_printf("socket: fd=%d", fd);
 +    snprintf(nc->info_str, sizeof(nc->info_str), "socket: fd=%d", fd);
      s = DO_UPCAST(NetSocketState, nc, nc);
@@ -XXX,XX +XXX,XX @@ static void net_socket_accept(void *opaque)
      stored->has_fd = true;
      stored->fd = g_strdup_printf("%d", fd);
 -    g_free(s->nc.info_str);
 -    s->nc.info_str = g_strdup_printf("socket: connection from %s:%d",
 -                                     inet_ntoa(saddr.sin_addr),
 -                                     ntohs(saddr.sin_port));
 +    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
 +             "socket: connection from %s:%d",
 +             inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
  }
  static int net_socket_listen_init(NetClientState *peer,
@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
      stored->has_connect = true;
      stored->connect = g_strdup(host_str);
 -    g_free(s->nc.info_str);
 -    s->nc.info_str = g_strdup_printf("socket: connect to %s:%d",
 -                                     inet_ntoa(saddr.sin_addr),
 -                                     ntohs(saddr.sin_port));
 +    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
 +             "socket: connect to %s:%d",
 +             inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
      return 0;
  }
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
          stored->localaddr = g_strdup(localaddr_str);
      }
 -    g_free(s->nc.info_str);
 -    s->nc.info_str = g_strdup_printf("socket: mcast=%s:%d",
 -                                     inet_ntoa(saddr.sin_addr),
 -                                     ntohs(saddr.sin_port));
 +    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
 +             "socket: mcast=%s:%d",
 +             inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
      return 0;
  }
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
      stored->has_udp = true;
      stored->udp = g_strdup(rhost);
 -    g_free(s->nc.info_str);
 -    s->nc.info_str = g_strdup_printf("socket: udp=%s:%d",
 -                                     inet_ntoa(raddr.sin_addr),
 -                                     ntohs(raddr.sin_port));
 +    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
 +             "socket: udp=%s:%d",
 +             inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port));
      return 0;
  }
 diff --git a/net/tap-win32.c b/net/tap-win32.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/tap-win32.c
 +++ b/net/tap-win32.c
@@ -XXX,XX +XXX,XX @@ static int tap_win32_init(NetClientState *peer, const char *model,
      stored->has_ifname = true;
      stored->ifname = g_strdup(ifname);
 -    s->nc.info_str = g_strdup_printf("tap: ifname=%s", ifname);
 +    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
 +             "tap: ifname=%s", ifname);
      s->handle = handle;
 diff --git a/net/tap.c b/net/tap.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/tap.c
 +++ b/net/tap.c
@@ -XXX,XX +XXX,XX @@ int net_init_bridge(const Netdev *netdev, const char *name,
          stored->helper = g_strdup(helper);
      }
 -    s->nc.info_str = g_strdup_printf("helper=%s,br=%s", helper, br);
 +    snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s", helper,
 +             br);
      return 0;
  }
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
              g_free(tmp_s);
          }
 -        s->nc.info_str = g_strdup_printf("fd=%d", fd);
 +        snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
      } else if (tap->has_helper) {
          if (!stored->has_helper) {
              stored->has_helper = true;
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
                                         g_strdup(DEFAULT_BRIDGE_INTERFACE);
          }
 -        s->nc.info_str = g_strdup_printf("helper=%s", tap->helper);
 +        snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s",
 +                 tap->helper);
      } else {
-         s = slirp_lookup(mon, NULL, NULL);
+         if (ifname && !stored->has_ifname) {
-         src_str = arg1;
+             stored->has_ifname = true;
-@@ -XXX,XX +XXX,XX @@ void hmp_hostfwd_add(Monitor *mon, const QDict *qdict)
+@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
-     const char *arg2 = qdict_get_try_str(qdict, "arg2");
+             stored->downscript = g_strdup(downscript);
-     const char *arg3 = qdict_get_try_str(qdict, "arg3");
+         }
--    if (arg2) {
+-        s->nc.info_str = g_strdup_printf("ifname=%s,script=%s,downscript=%s",
-+    if (arg3) {
+-                                         ifname, script, downscript);
-         s = slirp_lookup(mon, arg1, arg2);
++        snprintf(s->nc.info_str, sizeof(s->nc.info_str),
-         redir_str = arg3;
++                 "ifname=%s,script=%s,downscript=%s", ifname, script,
-+    } else if (arg2) {
++                 downscript);
-+        s = slirp_lookup(mon, NULL, arg1);
-+        redir_str = arg2;
+         if (strcmp(downscript, "no") != 0) {
-     } else {
+             snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
-         s = slirp_lookup(mon, NULL, NULL);
+diff --git a/net/vde.c b/net/vde.c
-         redir_str = arg1;
+index XXXXXXX..XXXXXXX 100644
 --- a/net/vde.c
 +++ b/net/vde.c
@@ -XXX,XX +XXX,XX @@ static int net_vde_init(NetClientState *peer, const char *model,
      nc = qemu_new_net_client(&net_vde_info, peer, model, name);
 -    nc->info_str = g_strdup_printf("sock=%s,fd=%d", sock, vde_datafd(vde));
 +    snprintf(nc->info_str, sizeof(nc->info_str), "sock=%s,fd=%d",
 +             sock, vde_datafd(vde));
      s = DO_UPCAST(VDEState, nc, nc);
 diff --git a/net/vhost-user.c b/net/vhost-user.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/vhost-user.c
 +++ b/net/vhost-user.c
@@ -XXX,XX +XXX,XX @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
      user = g_new0(struct VhostUserState, 1);
      for (i = 0; i < queues; i++) {
          nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name);
 -        nc->info_str = g_strdup_printf("vhost-user%d to %s", i, chr->label);
 +        snprintf(nc->info_str, sizeof(nc->info_str), "vhost-user%d to %s",
 +                 i, chr->label);
          nc->queue_index = i;
          if (!nc0) {
              nc0 = nc;
 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/vhost-vdpa.c
 +++ b/net/vhost-vdpa.c
@@ -XXX,XX +XXX,XX @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
      stored->has_queues = true;
      stored->queues = 1; /* TODO: change when support multiqueue */
 -    nc->info_str = g_strdup_printf(TYPE_VHOST_VDPA);
 +    snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA);
      nc->queue_index = 0;
      s = DO_UPCAST(VhostVDPAState, nc, nc);
      vdpa_device_fd = qemu_open_old(vhostdev, O_RDWR);
 --
 .7.4

-[Qemu-devel] [PULL 1/6] colo: modified the payload compare function
+[PULL 4/6] Revert "tests: Add tests for query-netdev command"
-From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
+Several issues has been reported for query-netdev series. Consider
 it's late in the rc, this reverts commit
 c3b656885473ef0d699290ba966177f17839aa5.
-Modified the function colo_packet_compare_common to prepare for the
-tcp packet comparison in the next patch.
-Cc: Zhang Chen <zhangckid@gmail.com>
-Cc: Li Zhijian <lizhijian@cn.fujitsu.com>
-Cc: Jason Wang <jasowang@redhat.com>
-Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
-Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
-Signed-off-by: Zhang Chen <zhangckid@gmail.com>
-Reviewed-by: Zhang Chen <zhangckid@gmail.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c | 88 +++++++++++++++++++++++++++---------------------------
+ tests/qtest/meson.build         |   3 -
-file changed, 44 insertions(+), 44 deletions(-)
+ tests/qtest/test-query-netdev.c | 120 ----------------------------------------
 files changed, 123 deletions(-)
  delete mode 100644 tests/qtest/test-query-netdev.c
-diff --git a/net/colo-compare.c b/net/colo-compare.c
+diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
 index XXXXXXX..XXXXXXX 100644
---- a/net/colo-compare.c
+--- a/tests/qtest/meson.build
-+++ b/net/colo-compare.c
++++ b/tests/qtest/meson.build
-@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
+@@ -XXX,XX +XXX,XX @@ qtests_generic = \
-  * return:    0  means packet same
+ if config_host.has_key('CONFIG_MODULES')
-  *            > 0 || < 0 means packet different
+   qtests_generic += [ 'modules-test' ]
-  */
+ endif
--static int colo_packet_compare_common(Packet *ppkt,
+-if slirp.found()
--                                      Packet *spkt,
+-  qtests_generic += [ 'test-query-netdev' ]
--                                      int poffset,
+-endif
--                                      int soffset)
-+static int colo_compare_packet_payload(Packet *ppkt,
+ qtests_pci = \
-+                                       Packet *spkt,
+   (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) +                  \
-+                                       uint16_t poffset,
+diff --git a/tests/qtest/test-query-netdev.c b/tests/qtest/test-query-netdev.c
-+                                       uint16_t soffset,
+deleted file mode 100644
-+                                       uint16_t len)
+index XXXXXXX..XXXXXXX
-+
+--- a/tests/qtest/test-query-netdev.c
- {
++++ /dev/null
-     if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
+@@ -XXX,XX +XXX,XX @@
-         char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
+-/*
-@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_common(Packet *ppkt,
+- * QTest testcase for the query-netdev
-                                    sec_ip_src, sec_ip_dst);
+- *
-     }
+- * Copyright Yandex N.V., 2019
+- *
--    poffset = ppkt->vnet_hdr_len + poffset;
+- * This work is licensed under the terms of the GNU GPL, version 2 or later.
--    soffset = ppkt->vnet_hdr_len + soffset;
+- * See the COPYING file in the top-level directory.
 - *
 - */
 -
--    if (ppkt->size - poffset == spkt->size - soffset) {
+-#include "qemu/osdep.h"
--        return memcmp(ppkt->data + poffset,
+-
--                      spkt->data + soffset,
+-#include "libqos/libqtest.h"
--                      spkt->size - soffset);
+-#include "qapi/qmp/qdict.h"
 -#include "qapi/qmp/qlist.h"
 -
 -/*
 - * Events can get in the way of responses we are actually waiting for.
 - */
 -GCC_FMT_ATTR(2, 3)
 -static QObject *wait_command(QTestState *who, const char *command, ...)
 -{
 -    va_list ap;
 -    QDict *response;
 -    QObject *result;
 -
 -    va_start(ap, command);
 -    qtest_qmp_vsend(who, command, ap);
 -    va_end(ap);
 -
 -    response = qtest_qmp_receive(who);
 -
 -    result = qdict_get(response, "return");
 -    g_assert(result);
 -    qobject_ref(result);
 -    qobject_unref(response);
 -
 -    return result;
 -}
 -
 -static void qmp_query_netdev_no_error(QTestState *qts, size_t netdevs_count)
 -{
 -    QObject *resp;
 -    QList *netdevs;
 -
 -    resp = wait_command(qts, "{'execute': 'query-netdev'}");
 -
 -    netdevs = qobject_to(QList, resp);
 -    g_assert(netdevs);
 -    g_assert(qlist_size(netdevs) == netdevs_count);
 -
 -    qobject_unref(resp);
 -}
 -
 -static void test_query_netdev(void)
 -{
 -    const char *arch = qtest_get_arch();
 -    QObject *resp;
 -    QTestState *state;
 -
 -    /* Choosing machine for platforms without default one */
 -    if (g_str_equal(arch, "arm") ||
 -        g_str_equal(arch, "aarch64")) {
 -        state = qtest_init(
 -            "-nodefaults "
 -            "-M virt "
 -            "-netdev user,id=slirp0");
 -    } else if (g_str_equal(arch, "tricore")) {
 -        state = qtest_init(
 -            "-nodefaults "
 -            "-M tricore_testboard "
 -            "-netdev user,id=slirp0");
 -    } else if (g_str_equal(arch, "avr")) {
 -        state = qtest_init(
 -            "-nodefaults "
 -            "-M mega2560 "
 -            "-netdev user,id=slirp0");
 -    } else if (g_str_equal(arch, "rx")) {
 -        state = qtest_init(
 -            "-nodefaults "
 -            "-M gdbsim-r5f562n8 "
 -            "-netdev user,id=slirp0");
 -    } else {
--        trace_colo_compare_main("Net packet size are not the same");
+-        state = qtest_init(
--        return -1;
+-            "-nodefaults "
 -            "-netdev user,id=slirp0");
 -    }
-+    return memcmp(ppkt->data + poffset, spkt->data + soffset, len);
+-    g_assert(state);
  }
  /*
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
       * the secondary guest's timestamp. COLO just focus on payload,
       * so we just need skip this field.
       */
 -    if (ptcp->th_off > 5) {
 -        ptrdiff_t ptcp_offset, stcp_offset;
 -        ptcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
 -                      + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;
 -        stcp_offset = spkt->transport_header - (uint8_t *)spkt->data
 -                      + (stcp->th_off * 4) - spkt->vnet_hdr_len;
 +    ptrdiff_t ptcp_offset, stcp_offset;
 -        /*
 -         * When network is busy, some tcp options(like sack) will unpredictable
 -         * occur in primary side or secondary side. it will make packet size
 -         * not same, but the two packet's payload is identical. colo just
 -         * care about packet payload, so we skip the option field.
 -         */
 -        res = colo_packet_compare_common(ppkt, spkt, ptcp_offset, stcp_offset);
 -    } else if (ptcp->th_sum == stcp->th_sum) {
 -        res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN, ETH_HLEN);
 +    ptcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
 +                  + (ptcp->th_off << 2) - ppkt->vnet_hdr_len;
 +    stcp_offset = spkt->transport_header - (uint8_t *)spkt->data
 +                  + (stcp->th_off << 2) - spkt->vnet_hdr_len;
 +    if (ppkt->size - ptcp_offset == spkt->size - stcp_offset) {
 +        res = colo_compare_packet_payload(ppkt, spkt,
 +                                          ptcp_offset, stcp_offset,
 +                                          ppkt->size - ptcp_offset);
      } else {
 +        trace_colo_compare_main("TCP: payload size of packets are different");
          res = -1;
      }
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
   */
  static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
  {
 -    int ret;
 -    int network_header_length = ppkt->ip->ip_hl * 4;
 +    uint16_t network_header_length = ppkt->ip->ip_hl << 2;
 +    uint16_t offset = network_header_length + ETH_HLEN + ppkt->vnet_hdr_len;
      trace_colo_compare_main("compare udp");
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
       * other field like TOS,TTL,IP Checksum. we only need to compare
       * the ip payload here.
       */
 -    ret = colo_packet_compare_common(ppkt, spkt,
 -                                     network_header_length + ETH_HLEN,
 -                                     network_header_length + ETH_HLEN);
 -
--    if (ret) {
+-    qmp_query_netdev_no_error(state, 1);
-+    if (ppkt->size != spkt->size) {
+-
-+        trace_colo_compare_main("UDP: payload size of packets are different");
+-    resp = wait_command(state,
-+        return -1;
+-        "{'execute': 'netdev_add', 'arguments': {"
-+    }
+-        " 'id': 'slirp1',"
-+    if (colo_compare_packet_payload(ppkt, spkt, offset, offset,
+-        " 'type': 'user'}}");
-+                                    ppkt->size - offset)) {
+-    qobject_unref(resp);
-         trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size);
+-
-         trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size);
+-    qmp_query_netdev_no_error(state, 2);
-         if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
+-
-@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
+-    resp = wait_command(state,
-             qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt",
+-        "{'execute': 'netdev_del', 'arguments': {"
-                          spkt->size);
+-        " 'id': 'slirp1'}}");
-         }
+-    qobject_unref(resp);
-+        return -1;
+-
-+    } else {
+-    qmp_query_netdev_no_error(state, 1);
-+        return 0;
+-
-     }
+-    qtest_quit(state);
 -}
 -
 -int main(int argc, char **argv)
 -{
 -    int ret = 0;
 -    g_test_init(&argc, &argv, NULL);
 -
 -    qtest_add_func("/net/qapi/query_netdev", test_query_netdev);
 -
 -    ret = g_test_run();
 -
 -    return ret;
- }
+-}
  /*
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
   */
  static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)
  {
 -    int network_header_length = ppkt->ip->ip_hl * 4;
 +    uint16_t network_header_length = ppkt->ip->ip_hl << 2;
 +    uint16_t offset = network_header_length + ETH_HLEN + ppkt->vnet_hdr_len;
      trace_colo_compare_main("compare icmp");
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)
       * other field like TOS,TTL,IP Checksum. we only need to compare
       * the ip payload here.
       */
 -    if (colo_packet_compare_common(ppkt, spkt,
 -                                   network_header_length + ETH_HLEN,
 -                                   network_header_length + ETH_HLEN)) {
 +    if (ppkt->size != spkt->size) {
 +        trace_colo_compare_main("ICMP: payload size of packets are different");
 +        return -1;
 +    }
 +    if (colo_compare_packet_payload(ppkt, spkt, offset, offset,
 +                                    ppkt->size - offset)) {
          trace_colo_compare_icmp_miscompare("primary pkt size",
                                             ppkt->size);
          trace_colo_compare_icmp_miscompare("Secondary pkt size",
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)
   */
  static int colo_packet_compare_other(Packet *spkt, Packet *ppkt)
  {
 +    uint16_t offset = ppkt->vnet_hdr_len;
 +
      trace_colo_compare_main("compare other");
      if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
          char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_other(Packet *spkt, Packet *ppkt)
                                     sec_ip_src, sec_ip_dst);
      }
 -    return colo_packet_compare_common(ppkt, spkt, 0, 0);
 +    if (ppkt->size != spkt->size) {
 +        trace_colo_compare_main("Other: payload size of packets are different");
 +        return -1;
 +    }
 +    return colo_compare_packet_payload(ppkt, spkt, offset, offset,
 +                                       ppkt->size - offset);
  }
  static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time)
 --
 .7.4

-[Qemu-devel] [PULL 3/6] net: Allow hubports to connect to other netdevs
+[PULL 5/6] Revert "qapi: net: Add query-netdev command"
-From: Thomas Huth <thuth@redhat.com>
+Several issues has been reported for query-netdev series. Consider
 it's late in the rc, this reverts commit
 d32ad10a14d46dfe9304e3ed5858a11dcd5c71a0.
-QEMU can emulate hubs to connect NICs and netdevs. This is currently
-primarily used for the mis-named 'vlan' feature of the networking
-subsystem. Now the 'vlan' feature has been marked as deprecated, since
-its name is rather confusing and the users often rather mis-configure
-their network when trying to use it. But while the 'vlan' parameter
-should be removed at one point in time, the basic idea of emulating
-a hub in QEMU is still good: It's useful for bundling up the output of
-multiple NICs into one single l2tp netdev for example.
-Now to be able to use the hubport feature without 'vlan's, there is one
-missing piece: The possibility to connect a hubport to a netdev, too.
-This patch adds this possibility by introducing a new "netdev=..."
-parameter to the hubports.
-To bundle up the output of multiple NICs into one socket netdev, you can
-now run QEMU with these parameters for example:
-qemu-system-ppc64 ... -netdev socket,id=s1,connect=:11122 \
-    -netdev hubport,hubid=1,id=h1,netdev=s1 \
-    -netdev hubport,hubid=1,id=h2 -device e1000,netdev=h2 \
-    -netdev hubport,hubid=1,id=h3 -device virtio-net-pci,netdev=h3
-For using the socket netdev, you have got to start another QEMU as the
-receiving side first, for example with network dumping enabled:
-qemu-system-x86_64 -M isapc -netdev socket,id=s0,listen=:11122 \
-    -device ne2k_isa,netdev=s0 \
-    -object filter-dump,id=f1,netdev=s0,file=/tmp/dump.dat
-After the ppc64 guest tried to boot from both NICs, you can see in the
-dump file (using Wireshark, for example), that the output of both NICs
-(the e1000 and the virtio-net-pci) has been successfully transfered
-via the socket netdev in this case.
-Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/hub.c       | 27 +++++++++++++++++++++------
+ include/net/net.h |   3 --
- net/hub.h       |  3 ++-
+ net/l2tpv3.c      |   7 ----
- net/net.c       |  2 +-
+ net/net.c         |  30 +-------------
- qapi/net.json   |  4 +++-
+ net/netmap.c      |   7 ----
- qemu-options.hx |  8 +++++---
+ net/slirp.c       | 122 ------------------------------------------------------
-files changed, 32 insertions(+), 12 deletions(-)
+ net/socket.c      |  71 -------------------------------
  net/tap-win32.c   |   9 ----
  net/tap.c         | 103 +++------------------------------------------
  net/vde.c         |  22 ----------
  net/vhost-user.c  |  18 ++------
  net/vhost-vdpa.c  |  14 -------
  qapi/net.json     |  80 -----------------------------------
 files changed, 9 insertions(+), 477 deletions(-)
-diff --git a/net/hub.c b/net/hub.c
+diff --git a/include/net/net.h b/include/net/net.h
 index XXXXXXX..XXXXXXX 100644
---- a/net/hub.c
+--- a/include/net/net.h
-+++ b/net/hub.c
++++ b/include/net/net.h
 @@ -XXX,XX +XXX,XX @@
-  */
+ #include "qapi/qapi-types-net.h"
+ #include "net/queue.h"
- #include "qemu/osdep.h"
+ #include "hw/qdev-properties-system.h"
-+#include "qapi/error.h"
+-#include "qapi/clone-visitor.h"
 -#include "qapi/qapi-visit-net.h"
  #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X"
  #define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \
@@ -XXX,XX +XXX,XX @@ struct NetClientState {
      char *model;
      char *name;
      char info_str[256];
 -    NetdevInfo *stored_config;
      unsigned receive_disabled : 1;
      NetClientDestructor *destructor;
      unsigned int queue_index;
 diff --git a/net/l2tpv3.c b/net/l2tpv3.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/l2tpv3.c
 +++ b/net/l2tpv3.c
@@ -XXX,XX +XXX,XX @@ int net_init_l2tpv3(const Netdev *netdev,
      l2tpv3_read_poll(s, true);
 -    /* Store startup parameters */
 -    nc->stored_config = g_new0(NetdevInfo, 1);
 -    nc->stored_config->type = NET_BACKEND_L2TPV3;
 -
 -    QAPI_CLONE_MEMBERS(NetdevL2TPv3Options,
 -                       &nc->stored_config->u.l2tpv3, l2tpv3);
 -
      snprintf(s->nc.info_str, sizeof(s->nc.info_str),
               "l2tpv3: connected");
      return 0;
 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 @@
  #include "monitor/monitor.h"
- #include "net/net.h"
+ #include "qemu/help_option.h"
- #include "clients.h"
+ #include "qapi/qapi-commands-net.h"
-@@ -XXX,XX +XXX,XX @@ static NetClientInfo net_hub_port_info = {
++#include "qapi/qapi-visit-net.h"
-     .cleanup = net_hub_port_cleanup,
+ #include "qapi/qmp/qdict.h"
- };
+ #include "qapi/qmp/qerror.h"
+ #include "qemu/error-report.h"
--static NetHubPort *net_hub_port_new(NetHub *hub, const char *name)
+@@ -XXX,XX +XXX,XX @@ static void qemu_free_net_client(NetClientState *nc)
-+static NetHubPort *net_hub_port_new(NetHub *hub, const char *name,
+     }
-+                                    NetClientState *hubpeer)
+     g_free(nc->name);
      g_free(nc->model);
 -    qapi_free_NetdevInfo(nc->stored_config);
      if (nc->destructor) {
          nc->destructor(nc);
      }
@@ -XXX,XX +XXX,XX @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,
      return filter_list;
  }
 -NetdevInfoList *qmp_query_netdev(Error **errp)
 -{
 -    NetdevInfoList *list = NULL;
 -    NetClientState *nc;
 -
 -    QTAILQ_FOREACH(nc, &net_clients, next) {
 -        /*
 -         * Only look at netdevs (backend network devices), not for each queue
 -         * or NIC / hubport
 -         */
 -        if (nc->stored_config) {
 -            NetdevInfo *element = QAPI_CLONE(NetdevInfo, nc->stored_config);
 -
 -            g_free(element->id); /* Need to dealloc empty id after clone */
 -            element->id = g_strdup(nc->name);
 -
 -            element->has_peer_id = nc->peer != NULL;
 -            if (element->has_peer_id) {
 -                element->peer_id = g_strdup(nc->peer->name);
 -            }
 -
 -            QAPI_LIST_PREPEND(list, element);
 -        }
 -    }
 -
 -    return list;
 -}
 -
  void hmp_info_network(Monitor *mon, const QDict *qdict)
  {
      NetClientState *nc, *peer;
 diff --git a/net/netmap.c b/net/netmap.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/netmap.c
 +++ b/net/netmap.c
@@ -XXX,XX +XXX,XX @@ int net_init_netmap(const Netdev *netdev,
      pstrcpy(s->ifname, sizeof(s->ifname), netmap_opts->ifname);
      netmap_read_poll(s, true); /* Initially only poll for reads. */
 -    /* Store startup parameters */
 -    nc->stored_config = g_new0(NetdevInfo, 1);
 -    nc->stored_config->type = NET_BACKEND_NETMAP;
 -
 -    QAPI_CLONE_MEMBERS(NetdevNetmapOptions,
 -                       &nc->stored_config->u.netmap, netmap_opts);
 -
      return 0;
  }
 diff --git a/net/slirp.c b/net/slirp.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/slirp.c
 +++ b/net/slirp.c
@@ -XXX,XX +XXX,XX @@ static int net_slirp_init(NetClientState *peer, const char *model,
      int shift;
      char *end;
      struct slirp_config_str *config;
 -    NetdevUserOptions *stored;
 -    StringList **stored_hostfwd;
 -    StringList **stored_guestfwd;
      if (!ipv4 && (vnetwork || vhost || vnameserver)) {
          error_setg(errp, "IPv4 disabled but netmask/host/dns provided");
@@ -XXX,XX +XXX,XX @@ static int net_slirp_init(NetClientState *peer, const char *model,
      nc = qemu_new_net_client(&net_slirp_info, peer, model, name);
 -    /* Store startup parameters */
 -    nc->stored_config = g_new0(NetdevInfo, 1);
 -    nc->stored_config->type = NET_BACKEND_USER;
 -    stored = &nc->stored_config->u.user;
 -
 -    if (vhostname) {
 -        stored->has_hostname = true;
 -        stored->hostname = g_strdup(vhostname);
 -    }
 -
 -    stored->has_q_restrict = true;
 -    stored->q_restrict = restricted;
 -
 -    stored->has_ipv4 = true;
 -    stored->ipv4 = ipv4;
 -
 -    stored->has_ipv6 = true;
 -    stored->ipv6 = ipv6;
 -
 -    if (ipv4) {
 -        uint8_t *net_bytes = (uint8_t *)&net;
 -        uint8_t *mask_bytes = (uint8_t *)&mask;
 -
 -        stored->has_net = true;
 -        stored->net = g_strdup_printf("%d.%d.%d.%d/%d.%d.%d.%d",
 -                                      net_bytes[0], net_bytes[1],
 -                                      net_bytes[2], net_bytes[3],
 -                                      mask_bytes[0], mask_bytes[1],
 -                                      mask_bytes[2], mask_bytes[3]);
 -
 -        stored->has_host = true;
 -        stored->host = g_strdup(inet_ntoa(host));
 -    }
 -
 -    if (tftp_export) {
 -        stored->has_tftp = true;
 -        stored->tftp = g_strdup(tftp_export);
 -    }
 -
 -    if (bootfile) {
 -        stored->has_bootfile = true;
 -        stored->bootfile = g_strdup(bootfile);
 -    }
 -
 -    if (vdhcp_start) {
 -        stored->has_dhcpstart = true;
 -        stored->dhcpstart = g_strdup(vdhcp_start);
 -    }
 -
 -    if (ipv4) {
 -        stored->has_dns = true;
 -        stored->dns = g_strdup(inet_ntoa(dns));
 -    }
 -
 -    if (dnssearch) {
 -        stored->has_dnssearch = true;
 -        StringList **stored_list = &stored->dnssearch;
 -
 -        for (int i = 0; dnssearch[i]; i++) {
 -            String *element = g_new0(String, 1);
 -
 -            element->str = g_strdup(dnssearch[i]);
 -            QAPI_LIST_APPEND(stored_list, element);
 -        }
 -    }
 -
 -    if (vdomainname) {
 -        stored->has_domainname = true;
 -        stored->domainname = g_strdup(vdomainname);
 -    }
 -
 -    if (ipv6) {
 -        char addrstr[INET6_ADDRSTRLEN];
 -        const char *res;
 -
 -        stored->has_ipv6_prefix = true;
 -        stored->ipv6_prefix = g_strdup(vprefix6);
 -
 -        stored->has_ipv6_prefixlen = true;
 -        stored->ipv6_prefixlen = vprefix6_len;
 -
 -        res = inet_ntop(AF_INET6, &ip6_host,
 -                        addrstr, sizeof(addrstr));
 -
 -        stored->has_ipv6_host = true;
 -        stored->ipv6_host = g_strdup(res);
 -
 -        res = inet_ntop(AF_INET6, &ip6_dns,
 -                        addrstr, sizeof(addrstr));
 -
 -        stored->has_ipv6_dns = true;
 -        stored->ipv6_dns = g_strdup(res);
 -    }
 -
 -    if (smb_export) {
 -        stored->has_smb = true;
 -        stored->smb = g_strdup(smb_export);
 -    }
 -
 -    if (vsmbserver) {
 -        stored->has_smbserver = true;
 -        stored->smbserver = g_strdup(vsmbserver);
 -    }
 -
 -    if (tftp_server_name) {
 -        stored->has_tftp_server_name = true;
 -        stored->tftp_server_name = g_strdup(tftp_server_name);
 -    }
 -
      snprintf(nc->info_str, sizeof(nc->info_str),
               "net=%s,restrict=%s", inet_ntoa(net),
               restricted ? "on" : "off");
@@ -XXX,XX +XXX,XX @@ static int net_slirp_init(NetClientState *peer, const char *model,
      s->poll_notifier.notify = net_slirp_poll_notify;
      main_loop_poll_add_notifier(&s->poll_notifier);
 -    stored_hostfwd = &stored->hostfwd;
 -    stored_guestfwd = &stored->guestfwd;
 -
      for (config = slirp_configs; config; config = config->next) {
 -        String *element = g_new0(String, 1);
 -
 -        element->str = g_strdup(config->str);
          if (config->flags & SLIRP_CFG_HOSTFWD) {
              if (slirp_hostfwd(s, config->str, errp) < 0) {
                  goto error;
              }
 -            stored->has_hostfwd = true;
 -            QAPI_LIST_APPEND(stored_hostfwd, element);
          } else {
              if (slirp_guestfwd(s, config->str, errp) < 0) {
                  goto error;
              }
 -            stored->has_guestfwd = true;
 -            QAPI_LIST_APPEND(stored_guestfwd, element);
          }
      }
  #ifndef _WIN32
 diff --git a/net/socket.c b/net/socket.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/socket.c
 +++ b/net/socket.c
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
      NetSocketState *s;
      SocketAddress *sa;
      SocketAddressType sa_type;
 -    NetdevSocketOptions *stored;
      sa = socket_local_address(fd, errp);
      if (!sa) {
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
      net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
      net_socket_read_poll(s, true);
 -    /* Store startup parameters */
 -    nc->stored_config = g_new0(NetdevInfo, 1);
 -    nc->stored_config->type = NET_BACKEND_SOCKET;
 -    stored = &nc->stored_config->u.socket;
 -
 -    stored->has_fd = true;
 -    stored->fd = g_strdup_printf("%d", fd);
 -
      /* mcast: save bound address as dst */
      if (is_connected && mcast != NULL) {
 -        stored->has_mcast = true;
 -        stored->mcast = g_strdup(mcast);
 -
          s->dgram_dst = saddr;
          snprintf(nc->info_str, sizeof(nc->info_str),
                   "socket: fd=%d (cloned mcast=%s:%d)",
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
  {
      NetClientState *nc;
-     NetHubPort *port;
+     NetSocketState *s;
-@@ -XXX,XX +XXX,XX @@ static NetHubPort *net_hub_port_new(NetHub *hub, const char *name)
+-    NetdevSocketOptions *stored;
-         name = default_name;
      nc = qemu_new_net_client(&net_socket_info, peer, model, name);
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
      } else {
          qemu_set_fd_handler(s->fd, NULL, net_socket_connect, s);
      }
+-
--    nc = qemu_new_net_client(&net_hub_port_info, NULL, "hub", name);
+-    /* Store startup parameters */
-+    nc = qemu_new_net_client(&net_hub_port_info, hubpeer, "hub", name);
+-    nc->stored_config = g_new0(NetdevInfo, 1);
-     port = DO_UPCAST(NetHubPort, nc, nc);
+-    nc->stored_config->type = NET_BACKEND_SOCKET;
-     port->id = id;
+-    stored = &nc->stored_config->u.socket;
-     port->hub = hub;
+-
-@@ -XXX,XX +XXX,XX @@ static NetHubPort *net_hub_port_new(NetHub *hub, const char *name)
+-    stored->has_fd = true;
+-    stored->fd = g_strdup_printf("%d", fd);
- /**
+-
-  * Create a port on a given hub
+     return s;
 + * @hub_id: Number of the hub
   * @name: Net client name or NULL for default name.
 + * @hubpeer: Peer to use (if "netdev=id" has been specified)
   *
   * If there is no existing hub with the given id then a new hub is created.
   */
 -NetClientState *net_hub_add_port(int hub_id, const char *name)
 +NetClientState *net_hub_add_port(int hub_id, const char *name,
 +                                 NetClientState *hubpeer)
  {
      NetHub *hub;
      NetHubPort *port;
@@ -XXX,XX +XXX,XX @@ NetClientState *net_hub_add_port(int hub_id, const char *name)
          hub = net_hub_new(hub_id);
      }
 -    port = net_hub_port_new(hub, name);
 +    port = net_hub_port_new(hub, name, hubpeer);
      return &port->nc;
  }
-@@ -XXX,XX +XXX,XX @@ NetClientState *net_hub_port_find(int hub_id)
+@@ -XXX,XX +XXX,XX @@ static void net_socket_accept(void *opaque)
-         }
+     struct sockaddr_in saddr;
-     }
+     socklen_t len;
+     int fd;
--    nc = net_hub_add_port(hub_id, NULL);
+-    NetdevSocketOptions *stored;
-+    nc = net_hub_add_port(hub_id, NULL, NULL);
-     return nc;
+     for(;;) {
- }
+         len = sizeof(saddr);
+@@ -XXX,XX +XXX,XX @@ static void net_socket_accept(void *opaque)
-@@ -XXX,XX +XXX,XX @@ int net_init_hubport(const Netdev *netdev, const char *name,
+     s->fd = fd;
-                      NetClientState *peer, Error **errp)
+     s->nc.link_down = false;
- {
+     net_socket_connect(s);
-     const NetdevHubPortOptions *hubport;
+-
-+    NetClientState *hubpeer = NULL;
+-    /* Store additional startup parameters (extend net_socket_listen_init) */
+-    stored = &s->nc.stored_config->u.socket;
-     assert(netdev->type == NET_CLIENT_DRIVER_HUBPORT);
+-
-     assert(!peer);
+-    stored->has_fd = true;
-     hubport = &netdev->u.hubport;
+-    stored->fd = g_strdup_printf("%d", fd);
+-
--    net_hub_add_port(hubport->hubid, name);
+     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
-+    if (hubport->has_netdev) {
+              "socket: connection from %s:%d",
-+        hubpeer = qemu_find_netdev(hubport->netdev);
+              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
-+        if (!hubpeer) {
+@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,
-+            error_setg(errp, "netdev '%s' not found", hubport->netdev);
+     NetSocketState *s;
-+            return -1;
+     struct sockaddr_in saddr;
-+        }
+     int fd, ret;
-+    }
+-    NetdevSocketOptions *stored;
-+
-+    net_hub_add_port(hubport->hubid, name, hubpeer);
+     if (parse_host_port(&saddr, host_str, errp) < 0) {
-+
+         return -1;
@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,
      net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
      qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s);
 -
 -    /* Store startup parameters */
 -    nc->stored_config = g_new0(NetdevInfo, 1);
 -    nc->stored_config->type = NET_BACKEND_SOCKET;
 -    stored = &nc->stored_config->u.socket;
 -
 -    stored->has_listen = true;
 -    stored->listen = g_strdup(host_str);
 -
      return 0;
  }
-diff --git a/net/hub.h b/net/hub.h
+@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
-index XXXXXXX..XXXXXXX 100644
+     NetSocketState *s;
---- a/net/hub.h
+     int fd, connected, ret;
-+++ b/net/hub.h
+     struct sockaddr_in saddr;
-@@ -XXX,XX +XXX,XX @@
+-    NetdevSocketOptions *stored;
- #include "qemu-common.h"
+     if (parse_host_port(&saddr, host_str, errp) < 0) {
+         return -1;
--NetClientState *net_hub_add_port(int hub_id, const char *name);
+@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
-+NetClientState *net_hub_add_port(int hub_id, const char *name,
+         return -1;
-+                                 NetClientState *hubpeer);
+     }
- NetClientState *net_hub_find_client_by_name(int hub_id, const char *name);
- void net_hub_info(Monitor *mon);
+-    /* Store additional startup parameters (extend net_socket_fd_init) */
- void net_hub_check_clients(void);
+-    stored = &s->nc.stored_config->u.socket;
-diff --git a/net/net.c b/net/net.c
+-
-index XXXXXXX..XXXXXXX 100644
+-    stored->has_connect = true;
---- a/net/net.c
+-    stored->connect = g_strdup(host_str);
-+++ b/net/net.c
+-
-@@ -XXX,XX +XXX,XX @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp)
+     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
-         /* Do not add to a vlan if it's a nic with a netdev= parameter. */
+              "socket: connect to %s:%d",
-         if (netdev->type != NET_CLIENT_DRIVER_NIC ||
+              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
-             !opts->u.nic.has_netdev) {
+@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
--            peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL);
+     int fd;
-+            peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL, NULL);
+     struct sockaddr_in saddr;
      struct in_addr localaddr, *param_localaddr;
 -    NetdevSocketOptions *stored;
      if (parse_host_port(&saddr, host_str, errp) < 0) {
          return -1;
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
      s->dgram_dst = saddr;
 -    /* Store additional startup parameters (extend net_socket_fd_init) */
 -    stored = &s->nc.stored_config->u.socket;
 -
 -    if (!stored->has_mcast) {
 -        stored->has_mcast = true;
 -        stored->mcast = g_strdup(host_str);
 -    }
 -
 -    if (localaddr_str) {
 -        stored->has_localaddr = true;
 -        stored->localaddr = g_strdup(localaddr_str);
 -    }
 -
      snprintf(s->nc.info_str, sizeof(s->nc.info_str),
               "socket: mcast=%s:%d",
               inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
      NetSocketState *s;
      int fd, ret;
      struct sockaddr_in laddr, raddr;
 -    NetdevSocketOptions *stored;
      if (parse_host_port(&laddr, lhost, errp) < 0) {
          return -1;
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
      s->dgram_dst = raddr;
 -    /* Store additional startup parameters (extend net_socket_fd_init) */
 -    stored = &s->nc.stored_config->u.socket;
 -
 -    stored->has_localaddr = true;
 -    stored->localaddr = g_strdup(lhost);
 -
 -    stored->has_udp = true;
 -    stored->udp = g_strdup(rhost);
 -
      snprintf(s->nc.info_str, sizeof(s->nc.info_str),
               "socket: udp=%s:%d",
               inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port));
 diff --git a/net/tap-win32.c b/net/tap-win32.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/tap-win32.c
 +++ b/net/tap-win32.c
@@ -XXX,XX +XXX,XX @@ static int tap_win32_init(NetClientState *peer, const char *model,
      NetClientState *nc;
      TAPState *s;
      tap_win32_overlapped_t *handle;
 -    NetdevTapOptions *stored;
      if (tap_win32_open(&handle, ifname) < 0) {
          printf("tap: Could not open '%s'\n", ifname);
@@ -XXX,XX +XXX,XX @@ static int tap_win32_init(NetClientState *peer, const char *model,
      s = DO_UPCAST(TAPState, nc, nc);
 -    /* Store startup parameters */
 -    nc->stored_config = g_new0(NetdevInfo, 1);
 -    nc->stored_config->type = NET_BACKEND_TAP;
 -    stored = &nc->stored_config->u.tap;
 -
 -    stored->has_ifname = true;
 -    stored->ifname = g_strdup(ifname);
 -
      snprintf(s->nc.info_str, sizeof(s->nc.info_str),
               "tap: ifname=%s", ifname);
 diff --git a/net/tap.c b/net/tap.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/tap.c
 +++ b/net/tap.c
@@ -XXX,XX +XXX,XX @@ int net_init_bridge(const Netdev *netdev, const char *name,
      const char *helper, *br;
      TAPState *s;
      int fd, vnet_hdr;
 -    NetdevBridgeOptions *stored;
      assert(netdev->type == NET_CLIENT_DRIVER_BRIDGE);
      bridge = &netdev->u.bridge;
@@ -XXX,XX +XXX,XX @@ int net_init_bridge(const Netdev *netdev, const char *name,
      }
      s = net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr);
 -    /* Store startup parameters */
 -    s->nc.stored_config = g_new0(NetdevInfo, 1);
 -    s->nc.stored_config->type = NET_BACKEND_BRIDGE;
 -    stored = &s->nc.stored_config->u.bridge;
 -
 -    if (br) {
 -        stored->has_br = true;
 -        stored->br = g_strdup(br);
 -    }
 -
 -    if (helper) {
 -        stored->has_helper = true;
 -        stored->helper = g_strdup(helper);
 -    }
 -
      snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s", helper,
               br);
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
                               const char *model, const char *name,
                               const char *ifname, const char *script,
                               const char *downscript, const char *vhostfdname,
 -                             int vnet_hdr, int fd, NetdevInfo **common_stored,
 -                             Error **errp)
 +                             int vnet_hdr, int fd, Error **errp)
  {
      Error *err = NULL;
      TAPState *s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
      int vhostfd;
 -    NetdevTapOptions *stored;
      tap_set_sndbuf(s->fd, tap, &err);
      if (err) {
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
          return;
      }
 -    /* Store startup parameters */
 -    if (!*common_stored) {
 -        *common_stored = g_new0(NetdevInfo, 1);
 -        (*common_stored)->type = NET_BACKEND_TAP;
 -        s->nc.stored_config = *common_stored;
 -    }
 -    stored = &(*common_stored)->u.tap;
 -
 -    if (tap->has_sndbuf && !stored->has_sndbuf) {
 -        stored->has_sndbuf = true;
 -        stored->sndbuf = tap->sndbuf;
 -    }
 -
 -    if (vnet_hdr && !stored->has_vnet_hdr) {
 -        stored->has_vnet_hdr = true;
 -        stored->vnet_hdr = true;
 -    }
 -
      if (tap->has_fd || tap->has_fds) {
 -        if (!stored->has_fds) {
 -            stored->has_fds = true;
 -            stored->fds = g_strdup_printf("%d", fd);
 -        } else {
 -            char *tmp_s = stored->fds;
 -            stored->fds = g_strdup_printf("%s:%d", stored->fds, fd);
 -            g_free(tmp_s);
 -        }
 -
          snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
      } else if (tap->has_helper) {
 -        if (!stored->has_helper) {
 -            stored->has_helper = true;
 -            stored->helper = g_strdup(tap->helper);
 -        }
 -
 -        if (!stored->has_br) {
 -            stored->has_br = true;
 -            stored->br = tap->has_br ? g_strdup(tap->br) :
 -                                       g_strdup(DEFAULT_BRIDGE_INTERFACE);
 -        }
 -
          snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s",
                   tap->helper);
      } else {
 -        if (ifname && !stored->has_ifname) {
 -            stored->has_ifname = true;
 -            stored->ifname = g_strdup(ifname);
 -        }
 -
 -        if (script && !stored->has_script) {
 -            stored->has_script = true;
 -            stored->script = g_strdup(script);
 -        }
 -
 -        if (downscript && !stored->has_downscript) {
 -            stored->has_downscript = true;
 -            stored->downscript = g_strdup(downscript);
 -        }
 -
          snprintf(s->nc.info_str, sizeof(s->nc.info_str),
                   "ifname=%s,script=%s,downscript=%s", ifname, script,
                   downscript);
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
          vhostfdname || (tap->has_vhostforce && tap->vhostforce)) {
          VhostNetOptions options;
 -        stored->has_vhost = true;
 -        stored->vhost = true;
 -
 -        if (tap->has_vhostforce && tap->vhostforce) {
 -            stored->has_vhostforce = true;
 -            stored->vhostforce = true;
 -        }
 -
          options.backend_type = VHOST_BACKEND_TYPE_KERNEL;
          options.net_backend = &s->nc;
          if (tap->has_poll_us) {
 -            stored->has_poll_us = true;
 -            stored->poll_us = tap->poll_us;
 -
              options.busyloop_timeout = tap->poll_us;
          } else {
              options.busyloop_timeout = 0;
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
          }
+         options.opaque = (void *)(uintptr_t)vhostfd;
-         if (net->has_vlan && !vlan_warned) {
 -        if (!stored->has_vhostfds) {
 -            stored->has_vhostfds = true;
 -            stored->vhostfds = g_strdup_printf("%d", vhostfd);
 -        } else {
 -            char *tmp_s = stored->vhostfds;
 -            stored->vhostfds = g_strdup_printf("%s:%d", stored->fds, vhostfd);
 -            g_free(tmp_s);
 -        }
 -
          s->vhost_net = vhost_net_init(&options);
          if (!s->vhost_net) {
              if (tap->has_vhostforce && tap->vhostforce) {
@@ -XXX,XX +XXX,XX @@ int net_init_tap(const Netdev *netdev, const char *name,
      const char *vhostfdname;
      char ifname[128];
      int ret = 0;
 -    NetdevInfo *common_stored = NULL; /* will store configuration */
      assert(netdev->type == NET_CLIENT_DRIVER_TAP);
      tap = &netdev->u.tap;
@@ -XXX,XX +XXX,XX @@ int net_init_tap(const Netdev *netdev, const char *name,
          net_init_tap_one(tap, peer, "tap", name, NULL,
                           script, downscript,
 -                         vhostfdname, vnet_hdr, fd, &common_stored, &err);
 +                         vhostfdname, vnet_hdr, fd, &err);
          if (err) {
              error_propagate(errp, err);
              close(fd);
@@ -XXX,XX +XXX,XX @@ int net_init_tap(const Netdev *netdev, const char *name,
              net_init_tap_one(tap, peer, "tap", name, ifname,
                               script, downscript,
                               tap->has_vhostfds ? vhost_fds[i] : NULL,
 -                             vnet_hdr, fd, &common_stored, &err);
 +                             vnet_hdr, fd, &err);
              if (err) {
                  error_propagate(errp, err);
                  ret = -1;
@@ -XXX,XX +XXX,XX @@ free_fail:
          net_init_tap_one(tap, peer, "bridge", name, ifname,
                           script, downscript, vhostfdname,
 -                         vnet_hdr, fd, &common_stored, &err);
 +                         vnet_hdr, fd, &err);
          if (err) {
              error_propagate(errp, err);
              close(fd);
@@ -XXX,XX +XXX,XX @@ free_fail:
              net_init_tap_one(tap, peer, "tap", name, ifname,
                               i >= 1 ? "no" : script,
                               i >= 1 ? "no" : downscript,
 -                             vhostfdname, vnet_hdr, fd,
 -                             &common_stored, &err);
 +                             vhostfdname, vnet_hdr, fd, &err);
              if (err) {
                  error_propagate(errp, err);
                  close(fd);
 diff --git a/net/vde.c b/net/vde.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/vde.c
 +++ b/net/vde.c
@@ -XXX,XX +XXX,XX @@ static int net_vde_init(NetClientState *peer, const char *model,
      VDECONN *vde;
      char *init_group = (char *)group;
      char *init_sock = (char *)sock;
 -    NetdevVdeOptions *stored;
      struct vde_open_args args = {
          .port = port,
@@ -XXX,XX +XXX,XX @@ static int net_vde_init(NetClientState *peer, const char *model,
      qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s);
 -    /* Store startup parameters */
 -    nc->stored_config = g_new0(NetdevInfo, 1);
 -    nc->stored_config->type = NET_BACKEND_VDE;
 -    stored = &nc->stored_config->u.vde;
 -
 -    if (sock) {
 -        stored->has_sock = true;
 -        stored->sock = g_strdup(sock);
 -    }
 -
 -    stored->has_port = true;
 -    stored->port = port;
 -
 -    if (group) {
 -        stored->has_group = true;
 -        stored->group = g_strdup(group);
 -    }
 -
 -    stored->has_mode = true;
 -    stored->mode = mode;
 -
      return 0;
  }
 diff --git a/net/vhost-user.c b/net/vhost-user.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/vhost-user.c
 +++ b/net/vhost-user.c
@@ -XXX,XX +XXX,XX @@ static void net_vhost_user_event(void *opaque, QEMUChrEvent event)
  }
  static int net_vhost_user_init(NetClientState *peer, const char *device,
 -                               const char *name, const char *chardev,
 -                               Chardev *chr, int queues)
 +                               const char *name, Chardev *chr,
 +                               int queues)
  {
      Error *err = NULL;
      NetClientState *nc, *nc0 = NULL;
      NetVhostUserState *s = NULL;
      VhostUserState *user;
      int i;
 -    NetdevVhostUserOptions *stored;
      assert(name);
      assert(queues > 0);
@@ -XXX,XX +XXX,XX @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
      assert(s->vhost_net);
 -    /* Store startup parameters */
 -    nc0->stored_config = g_new0(NetdevInfo, 1);
 -    nc0->stored_config->type = NET_BACKEND_VHOST_USER;
 -    stored = &nc0->stored_config->u.vhost_user;
 -
 -    stored->chardev = g_strdup(chardev);
 -
 -    stored->has_queues = true;
 -    stored->queues = queues;
 -
      return 0;
  err:
@@ -XXX,XX +XXX,XX @@ int net_init_vhost_user(const Netdev *netdev, const char *name,
          return -1;
      }
 -    return net_vhost_user_init(peer, "vhost_user", name,
 -                               vhost_user_opts->chardev, chr, queues);
 +    return net_vhost_user_init(peer, "vhost_user", name, chr, queues);
  }
 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
 index XXXXXXX..XXXXXXX 100644
 --- a/net/vhost-vdpa.c
 +++ b/net/vhost-vdpa.c
@@ -XXX,XX +XXX,XX @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
      VhostVDPAState *s;
      int vdpa_device_fd = -1;
      int ret = 0;
 -    NetdevVhostVDPAOptions *stored;
 -
      assert(name);
      nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name);
 -
 -    /* Store startup parameters */
 -    nc->stored_config = g_new0(NetdevInfo, 1);
 -    nc->stored_config->type = NET_BACKEND_VHOST_VDPA;
 -    stored = &nc->stored_config->u.vhost_vdpa;
 -
 -    stored->has_vhostdev = true;
 -    stored->vhostdev = g_strdup(vhostdev);
 -
 -    stored->has_queues = true;
 -    stored->queues = 1; /* TODO: change when support multiqueue */
 -
      snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA);
      nc->queue_index = 0;
      s = DO_UPCAST(VhostVDPAState, nc, nc);
 diff --git a/qapi/net.json b/qapi/net.json
 index XXXXXXX..XXXXXXX 100644
 --- a/qapi/net.json
 +++ b/qapi/net.json
 @@ -XXX,XX +XXX,XX @@
- # Connect two or more net clients through a software hub.
- #
- # @hubid: hub identifier number
-+# @netdev: used to connect hub to a netdev instead of a device (since 2.12)
- #
- # Since: 1.2
  ##
- { 'struct': 'NetdevHubPortOptions',
+ { 'event': 'FAILOVER_NEGOTIATED',
-   'data': {
+   'data': {'device-id': 'str'} }
--    'hubid':     'int32' } }
+-
-+    'hubid':     'int32',
+-##
-+    '*netdev':    'str' } }
+-# @NetBackend:
+-#
- ##
+-# Available netdev backend drivers.
- # @NetdevNetmapOptions:
+-#
-diff --git a/qemu-options.hx b/qemu-options.hx
+-# Since: 6.0
-index XXXXXXX..XXXXXXX 100644
+-##
---- a/qemu-options.hx
+-{ 'enum': 'NetBackend',
-+++ b/qemu-options.hx
+-  'data': [ 'bridge', 'l2tpv3', 'netmap', 'socket', 'tap', 'user', 'vde',
-@@ -XXX,XX +XXX,XX @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev,
+-            'vhost-user', 'vhost-vdpa' ] }
- #endif
+-
-     "-netdev vhost-user,id=str,chardev=dev[,vhostforce=on|off]\n"
+-##
-     "                configure a vhost-user network, backed by a chardev 'dev'\n"
+-# @NetdevInfo:
--    "-netdev hubport,id=str,hubid=n\n"
+-#
-+    "-netdev hubport,id=str,hubid=n[,netdev=nd]\n"
+-# Configuration of a network backend device (netdev).
-     "                configure a hub port on QEMU VLAN 'n'\n", QEMU_ARCH_ALL)
+-#
- DEF("net", HAS_ARG, QEMU_OPTION_net,
+-# @id: Device identifier.
-     "-net nic[,vlan=n][,netdev=nd][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"
+-#
-@@ -XXX,XX +XXX,XX @@ vde_switch -F -sock /tmp/myswitch
+-# @type: Specify the driver used for interpreting remaining arguments.
- qemu-system-i386 linux.img -net nic -net vde,sock=/tmp/myswitch
+-#
- @end example
+-# @peer-id: The connected frontend network device name (absent if no frontend
+-#           is connected).
--@item -netdev hubport,id=@var{id},hubid=@var{hubid}
+-#
-+@item -netdev hubport,id=@var{id},hubid=@var{hubid}[,netdev=@var{nd}]
+-# Since: 6.0
+-##
- Create a hub port on QEMU "vlan" @var{hubid}.
+-{ 'union': 'NetdevInfo',
+-  'base': { 'id': 'str',
- The hubport netdev lets you connect a NIC to a QEMU "vlan" instead of a single
+-            'type': 'NetBackend',
- netdev.  @code{-net} and @code{-device} with parameter @option{vlan} create the
+-            '*peer-id': 'str' },
--required hub automatically.
+-  'discriminator': 'type',
-+required hub automatically. Alternatively, you can also connect the hubport
+-  'data': {
-+to another netdev with ID @var{nd} by using the @option{netdev=@var{nd}}
+-      'bridge':     'NetdevBridgeOptions',
-+option.
+-      'l2tpv3':     'NetdevL2TPv3Options',
+-      'netmap':     'NetdevNetmapOptions',
- @item -netdev vhost-user,chardev=@var{id}[,vhostforce=on|off][,queues=n]
+-      'socket':     'NetdevSocketOptions',
+-      'tap':        'NetdevTapOptions',
 -      'user':       'NetdevUserOptions',
 -      'vde':        'NetdevVdeOptions',
 -      'vhost-user': 'NetdevVhostUserOptions',
 -      'vhost-vdpa': 'NetdevVhostVDPAOptions' } }
 -
 -##
 -# @query-netdev:
 -#
 -# Get a list of @NetdevInfo for all virtual network backend devices (netdevs).
 -#
 -# Returns: a list of @NetdevInfo describing each netdev.
 -#
 -# Since: 6.0
 -#
 -# Example:
 -#
 -# -> { "execute": "query-netdev" }
 -# <- { "return": [
 -#          {
 -#              "ipv6": true,
 -#              "ipv4": true,
 -#              "host": "10.0.2.2",
 -#              "ipv6-dns": "fec0::3",
 -#              "ipv6-prefix": "fec0::",
 -#              "net": "10.0.2.0/255.255.255.0",
 -#              "ipv6-host": "fec0::2",
 -#              "type": "user",
 -#              "peer-id": "net0",
 -#              "dns": "10.0.2.3",
 -#              "hostfwd": [
 -#                  {
 -#                      "str": "tcp::20004-:22"
 -#                  }
 -#              ],
 -#              "ipv6-prefixlen": 64,
 -#              "id": "netdev0",
 -#              "restrict": false
 -#          }
 -#      ]
 -#    }
 -#
 -##
 -{ 'command': 'query-netdev', 'returns': ['NetdevInfo'] }
 --
 .7.4

-[Qemu-devel] [PULL 2/6] colo: compare the packet based on the tcp sequence number
+[PULL 6/6] tap-win32: correctly recycle buffers
-From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
+Commit 969e50b61a28 ("net: Pad short frames to minimum size before
 sending from SLiRP/TAP") tries to pad frames but try to recyle the
 local array that is used for padding to tap thread. This patch fixes
 this by recyling the original buffer.
-Packet size some time different or when network is busy.
+Fixes: 969e50b61a28 ("net: Pad short frames to minimum size before sending from SLiRP/TAP")
-Based on same payload size, but TCP protocol can not
+Tested-by: Howard Spoelstra <hsp.cat7@gmail.com>
-guarantee send the same one packet in the same way,
+Tested-by: Bin Meng <bmeng.cn@gmail.com>
+Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
 like that:
 We send this payload:
 ------------------------------
 | header |1|2|3|4|5|6|7|8|9|0|
 ------------------------------
 primary:
 ppkt1:
 ----------------
 | header |1|2|3|
 ----------------
 ppkt2:
 ------------------------
 | header |4|5|6|7|8|9|0|
 ------------------------
 secondary:
 spkt1:
 ------------------------------
 | header |1|2|3|4|5|6|7|8|9|0|
 ------------------------------
 In the original method, ppkt1 and ppkt2 are different in size and
 spkt1, so they can't compare and trigger the checkpoint.
 I have tested FTP get 200M and 1G file many times, I found that
 the performance was less than 1% of the native.
 Now I reconstructed the comparison of TCP packets based on the
 TCP sequence number. first of all, ppkt1 and spkt1 have the same
 starting sequence number, so they can compare, even though their
 length is different. And then ppkt1 with a smaller payload length
 is used as the comparison length, if the payload is same, send
 out the ppkt1 and record the offset(the length of ppkt1 payload)
 in spkt1. The next comparison, ppkt2 and spkt1 can be compared
 from the recorded position of spkt1.
 like that:
 ----------------
 | header |1|2|3| ppkt1
 ---------|-----|
          |     |
 ---------v-----v--------------
 | header |1|2|3|4|5|6|7|8|9|0| spkt1
 ---------------|\------------|
                | \offset     |
       ---------v-------------v
       | header |4|5|6|7|8|9|0| ppkt2
       ------------------------
 In this way, the performance can reach native 20% in my multiple
 tests.
 Cc: Zhang Chen <zhangckid@gmail.com>
 Cc: Li Zhijian <lizhijian@cn.fujitsu.com>
 Cc: Jason Wang <jasowang@redhat.com>
 Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
 Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
 Signed-off-by: Zhang Chen <zhangckid@gmail.com>
 Reviewed-by: Zhang Chen <zhangckid@gmail.com>
 Tested-by: Zhang Chen <zhangckid@gmail.com>
 Signed-off-by: Jason Wang <jasowang@redhat.com>
 ---
- net/colo-compare.c | 343 +++++++++++++++++++++++++++++++++++------------------
+ net/tap-win32.c | 6 ++++--
- net/colo.c         |   9 ++
+file changed, 4 insertions(+), 2 deletions(-)
  net/colo.h         |  15 +++
  net/trace-events   |   2 +-
 files changed, 250 insertions(+), 119 deletions(-)
-diff --git a/net/colo-compare.c b/net/colo-compare.c
+diff --git a/net/tap-win32.c b/net/tap-win32.c
 index XXXXXXX..XXXXXXX 100644
---- a/net/colo-compare.c
+--- a/net/tap-win32.c
-+++ b/net/colo-compare.c
++++ b/net/tap-win32.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static ssize_t tap_receive(NetClientState *nc, const uint8_t *buf, size_t size)
- #define COMPARE_READ_LEN_MAX NET_BUFSIZE
+ static void tap_win32_send(void *opaque)
- #define MAX_QUEUE_SIZE 1024
+ {
+     TAPState *s = opaque;
-+#define COLO_COMPARE_FREE_PRIMARY     0x01
+-    uint8_t *buf;
-+#define COLO_COMPARE_FREE_SECONDARY   0x02
++    uint8_t *buf, *orig_buf;
      int max_size = 4096;
      int size;
      uint8_t min_pkt[ETH_ZLEN];
@@ -XXX,XX +XXX,XX @@ static void tap_win32_send(void *opaque)
      size = tap_win32_read(s->handle, &buf, max_size);
      if (size > 0) {
 +        orig_buf = buf;
 +
- /* TODO: Should be configurable */
+         if (!s->nc.peer->do_not_pad) {
- #define REGULAR_PACKET_CHECK_MS 3000
+             if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) {
+                 buf = min_pkt;
-@@ -XXX,XX +XXX,XX @@ static gint seq_sorter(Packet *a, Packet *b, gpointer data)
+@@ -XXX,XX +XXX,XX @@ static void tap_win32_send(void *opaque)
      return ntohl(atcp->th_seq) - ntohl(btcp->th_seq);
  }
 +static void fill_pkt_tcp_info(void *data, uint32_t *max_ack)
 +{
 +    Packet *pkt = data;
 +    struct tcphdr *tcphd;
 +
 +    tcphd = (struct tcphdr *)pkt->transport_header;
 +
 +    pkt->tcp_seq = ntohl(tcphd->th_seq);
 +    pkt->tcp_ack = ntohl(tcphd->th_ack);
 +    *max_ack = *max_ack > pkt->tcp_ack ? *max_ack : pkt->tcp_ack;
 +    pkt->header_size = pkt->transport_header - (uint8_t *)pkt->data
 +                       + (tcphd->th_off << 2) - pkt->vnet_hdr_len;
 +    pkt->payload_size = pkt->size - pkt->header_size;
 +    pkt->seq_end = pkt->tcp_seq + pkt->payload_size;
 +    pkt->flags = tcphd->th_flags;
 +}
 +
  /*
   * Return 1 on success, if return 0 means the
   * packet will be dropped
   */
 -static int colo_insert_packet(GQueue *queue, Packet *pkt)
 +static int colo_insert_packet(GQueue *queue, Packet *pkt, uint32_t *max_ack)
  {
      if (g_queue_get_length(queue) <= MAX_QUEUE_SIZE) {
          if (pkt->ip->ip_p == IPPROTO_TCP) {
 +            fill_pkt_tcp_info(pkt, max_ack);
              g_queue_insert_sorted(queue,
                                    pkt,
                                    (GCompareDataFunc)seq_sorter,
@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
      }
      if (mode == PRIMARY_IN) {
 -        if (!colo_insert_packet(&conn->primary_list, pkt)) {
 +        if (!colo_insert_packet(&conn->primary_list, pkt, &conn->pack)) {
              error_report("colo compare primary queue size too big,"
                           "drop packet");
          }
-     } else {
--        if (!colo_insert_packet(&conn->secondary_list, pkt)) {
+         qemu_send_packet(&s->nc, buf, size);
-+        if (!colo_insert_packet(&conn->secondary_list, pkt, &conn->sack)) {
+-        tap_win32_free_buffer(s->handle, buf);
-             error_report("colo compare secondary queue size too big,"
++        tap_win32_free_buffer(s->handle, orig_buf);
                           "drop packet");
          }
@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
      return 0;
  }
 +static inline bool after(uint32_t seq1, uint32_t seq2)
 +{
 +        return (int32_t)(seq1 - seq2) > 0;
 +}
 +
 +static void colo_release_primary_pkt(CompareState *s, Packet *pkt)
 +{
 +    int ret;
 +    ret = compare_chr_send(s,
 +                           pkt->data,
 +                           pkt->size,
 +                           pkt->vnet_hdr_len);
 +    if (ret < 0) {
 +        error_report("colo send primary packet failed");
 +    }
 +    trace_colo_compare_main("packet same and release packet");
 +    packet_destroy(pkt, NULL);
 +}
 +
  /*
   * The IP packets sent by primary and secondary
   * will be compared in here
@@ -XXX,XX +XXX,XX @@ static int colo_compare_packet_payload(Packet *ppkt,
  }
  /*
 - * Called from the compare thread on the primary
 - * for compare tcp packet
 - * compare_tcp copied from Dr. David Alan Gilbert's branch
 - */
 -static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
 + * return true means that the payload is consist and
 + * need to make the next comparison, false means do
 + * the checkpoint
 +*/
 +static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
 +                              int8_t *mark, uint32_t max_ack)
  {
 -    struct tcphdr *ptcp, *stcp;
 -    int res;
 +    *mark = 0;
 +
 +    if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) {
 +        if (colo_compare_packet_payload(ppkt, spkt,
 +                                        ppkt->header_size, spkt->header_size,
 +                                        ppkt->payload_size)) {
 +            *mark = COLO_COMPARE_FREE_SECONDARY | COLO_COMPARE_FREE_PRIMARY;
 +            return true;
 +        }
 +    }
 +    if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) {
 +        if (colo_compare_packet_payload(ppkt, spkt,
 +                                        ppkt->header_size, spkt->header_size,
 +                                        ppkt->payload_size)) {
 +            *mark = COLO_COMPARE_FREE_SECONDARY | COLO_COMPARE_FREE_PRIMARY;
 +            return true;
 +        }
 +    }
 +
 +    /* one part of secondary packet payload still need to be compared */
 +    if (!after(ppkt->seq_end, spkt->seq_end)) {
 +        if (colo_compare_packet_payload(ppkt, spkt,
 +                                        ppkt->header_size + ppkt->offset,
 +                                        spkt->header_size + spkt->offset,
 +                                        ppkt->payload_size - ppkt->offset)) {
 +            if (!after(ppkt->tcp_ack, max_ack)) {
 +                *mark = COLO_COMPARE_FREE_PRIMARY;
 +                spkt->offset += ppkt->payload_size - ppkt->offset;
 +                return true;
 +            } else {
 +                /* secondary guest hasn't ack the data, don't send
 +                 * out this packet
 +                 */
 +                return false;
 +            }
 +        }
 +    } else {
 +        /* primary packet is longer than secondary packet, compare
 +         * the same part and mark the primary packet offset
 +         */
 +        if (colo_compare_packet_payload(ppkt, spkt,
 +                                        ppkt->header_size + ppkt->offset,
 +                                        spkt->header_size + spkt->offset,
 +                                        spkt->payload_size - spkt->offset)) {
 +            *mark = COLO_COMPARE_FREE_SECONDARY;
 +            ppkt->offset += spkt->payload_size - spkt->offset;
 +            return true;
 +        }
 +    }
 -    trace_colo_compare_main("compare tcp");
 +    return false;
 +}
 -    ptcp = (struct tcphdr *)ppkt->transport_header;
 -    stcp = (struct tcphdr *)spkt->transport_header;
 +static void colo_compare_tcp(CompareState *s, Connection *conn)
 +{
 +    Packet *ppkt = NULL, *spkt = NULL;
 +    int8_t mark;
      /*
 -     * The 'identification' field in the IP header is *very* random
 -     * it almost never matches.  Fudge this by ignoring differences in
 -     * unfragmented packets; they'll normally sort themselves out if different
 -     * anyway, and it should recover at the TCP level.
 -     * An alternative would be to get both the primary and secondary to rewrite
 -     * somehow; but that would need some sync traffic to sync the state
 -     */
 -    if (ntohs(ppkt->ip->ip_off) & IP_DF) {
 -        spkt->ip->ip_id = ppkt->ip->ip_id;
 -        /* and the sum will be different if the IDs were different */
 -        spkt->ip->ip_sum = ppkt->ip->ip_sum;
 +     * If ppkt and spkt have the same payload, but ppkt's ACK
 +     * is greater than spkt's ACK, in this case we can not
 +     * send the ppkt because it will cause the secondary guest
 +     * to miss sending some data in the next. Therefore, we
 +     * record the maximum ACK in the current queue at both
 +     * primary side and secondary side. Only when the ack is
 +     * less than the smaller of the two maximum ack, then we
 +     * can ensure that the packet's payload is acknowledged by
 +     * primary and secondary.
 +    */
 +    uint32_t min_ack = conn->pack > conn->sack ? conn->sack : conn->pack;
 +
 +pri:
 +    if (g_queue_is_empty(&conn->primary_list)) {
 +        return;
      }
 +    ppkt = g_queue_pop_head(&conn->primary_list);
 +sec:
 +    if (g_queue_is_empty(&conn->secondary_list)) {
 +        g_queue_push_head(&conn->primary_list, ppkt);
 +        return;
 +    }
 +    spkt = g_queue_pop_head(&conn->secondary_list);
 -    /*
 -     * Check tcp header length for tcp option field.
 -     * th_off > 5 means this tcp packet have options field.
 -     * The tcp options maybe always different.
 -     * for example:
 -     * From RFC 7323.
 -     * TCP Timestamps option (TSopt):
 -     * Kind: 8
 -     *
 -     * Length: 10 bytes
 -     *
 -     *    +-------+-------+---------------------+---------------------+
 -     *    |Kind=8 |  10   |   TS Value (TSval)  |TS Echo Reply (TSecr)|
 -     *    +-------+-------+---------------------+---------------------+
 -     *       1       1              4                     4
 -     *
 -     * In this case the primary guest's timestamp always different with
 -     * the secondary guest's timestamp. COLO just focus on payload,
 -     * so we just need skip this field.
 -     */
 +    if (ppkt->tcp_seq == ppkt->seq_end) {
 +        colo_release_primary_pkt(s, ppkt);
 +        ppkt = NULL;
 +    }
 -    ptrdiff_t ptcp_offset, stcp_offset;
 +    if (ppkt && conn->compare_seq && !after(ppkt->seq_end, conn->compare_seq)) {
 +        trace_colo_compare_main("pri: this packet has compared");
 +        colo_release_primary_pkt(s, ppkt);
 +        ppkt = NULL;
 +    }
 -    ptcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
 -                  + (ptcp->th_off << 2) - ppkt->vnet_hdr_len;
 -    stcp_offset = spkt->transport_header - (uint8_t *)spkt->data
 -                  + (stcp->th_off << 2) - spkt->vnet_hdr_len;
 -    if (ppkt->size - ptcp_offset == spkt->size - stcp_offset) {
 -        res = colo_compare_packet_payload(ppkt, spkt,
 -                                          ptcp_offset, stcp_offset,
 -                                          ppkt->size - ptcp_offset);
 +    if (spkt->tcp_seq == spkt->seq_end) {
 +        packet_destroy(spkt, NULL);
 +        if (!ppkt) {
 +            goto pri;
 +        } else {
 +            goto sec;
 +        }
      } else {
 -        trace_colo_compare_main("TCP: payload size of packets are different");
 -        res = -1;
 +        if (conn->compare_seq && !after(spkt->seq_end, conn->compare_seq)) {
 +            trace_colo_compare_main("sec: this packet has compared");
 +            packet_destroy(spkt, NULL);
 +            if (!ppkt) {
 +                goto pri;
 +            } else {
 +                goto sec;
 +            }
 +        }
 +        if (!ppkt) {
 +            g_queue_push_head(&conn->secondary_list, spkt);
 +            goto pri;
 +        }
      }
 -    if (res != 0 &&
 -        trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
 -        char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
 -
 -        strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src));
 -        strcpy(pri_ip_dst, inet_ntoa(ppkt->ip->ip_dst));
 -        strcpy(sec_ip_src, inet_ntoa(spkt->ip->ip_src));
 -        strcpy(sec_ip_dst, inet_ntoa(spkt->ip->ip_dst));
 -
 -        trace_colo_compare_ip_info(ppkt->size, pri_ip_src,
 -                                   pri_ip_dst, spkt->size,
 -                                   sec_ip_src, sec_ip_dst);
 -
 -        trace_colo_compare_tcp_info("pri tcp packet",
 -                                    ntohl(ptcp->th_seq),
 -                                    ntohl(ptcp->th_ack),
 -                                    res, ptcp->th_flags,
 -                                    ppkt->size);
 -
 -        trace_colo_compare_tcp_info("sec tcp packet",
 -                                    ntohl(stcp->th_seq),
 -                                    ntohl(stcp->th_ack),
 -                                    res, stcp->th_flags,
 -                                    spkt->size);
 +    if (colo_mark_tcp_pkt(ppkt, spkt, &mark, min_ack)) {
 +        trace_colo_compare_tcp_info("pri",
 +                                    ppkt->tcp_seq, ppkt->tcp_ack,
 +                                    ppkt->header_size, ppkt->payload_size,
 +                                    ppkt->offset, ppkt->flags);
 +
 +        trace_colo_compare_tcp_info("sec",
 +                                    spkt->tcp_seq, spkt->tcp_ack,
 +                                    spkt->header_size, spkt->payload_size,
 +                                    spkt->offset, spkt->flags);
 +
 +        if (mark == COLO_COMPARE_FREE_PRIMARY) {
 +            conn->compare_seq = ppkt->seq_end;
 +            colo_release_primary_pkt(s, ppkt);
 +            g_queue_push_head(&conn->secondary_list, spkt);
 +            goto pri;
 +        }
 +        if (mark == COLO_COMPARE_FREE_SECONDARY) {
 +            conn->compare_seq = spkt->seq_end;
 +            packet_destroy(spkt, NULL);
 +            goto sec;
 +        }
 +        if (mark == (COLO_COMPARE_FREE_PRIMARY | COLO_COMPARE_FREE_SECONDARY)) {
 +            conn->compare_seq = ppkt->seq_end;
 +            colo_release_primary_pkt(s, ppkt);
 +            packet_destroy(spkt, NULL);
 +            goto pri;
 +        }
 +    } else {
 +        g_queue_push_head(&conn->primary_list, ppkt);
 +        g_queue_push_head(&conn->secondary_list, spkt);
          qemu_hexdump((char *)ppkt->data, stderr,
                       "colo-compare ppkt", ppkt->size);
          qemu_hexdump((char *)spkt->data, stderr,
                       "colo-compare spkt", spkt->size);
 -    }
 -    return res;
 +        /*
 +         * colo_compare_inconsistent_notify();
 +         * TODO: notice to checkpoint();
 +         */
 +    }
  }
 +
  /*
   * Called from the compare thread on the primary
   * for compare udp packet
@@ -XXX,XX +XXX,XX @@ static void colo_old_packet_check(void *opaque)
                          (GCompareFunc)colo_old_packet_check_one_conn);
  }
 -/*
 - * Called from the compare thread on the primary
 - * for compare packet with secondary list of the
 - * specified connection when a new packet was
 - * queued to it.
 - */
 -static void colo_compare_connection(void *opaque, void *user_data)
 +static void colo_compare_packet(CompareState *s, Connection *conn,
 +                                int (*HandlePacket)(Packet *spkt,
 +                                Packet *ppkt))
  {
 -    CompareState *s = user_data;
 -    Connection *conn = opaque;
      Packet *pkt = NULL;
      GList *result = NULL;
 -    int ret;
      while (!g_queue_is_empty(&conn->primary_list) &&
             !g_queue_is_empty(&conn->secondary_list)) {
          pkt = g_queue_pop_head(&conn->primary_list);
 -        switch (conn->ip_proto) {
 -        case IPPROTO_TCP:
 -            result = g_queue_find_custom(&conn->secondary_list,
 -                     pkt, (GCompareFunc)colo_packet_compare_tcp);
 -            break;
 -        case IPPROTO_UDP:
 -            result = g_queue_find_custom(&conn->secondary_list,
 -                     pkt, (GCompareFunc)colo_packet_compare_udp);
 -            break;
 -        case IPPROTO_ICMP:
 -            result = g_queue_find_custom(&conn->secondary_list,
 -                     pkt, (GCompareFunc)colo_packet_compare_icmp);
 -            break;
 -        default:
 -            result = g_queue_find_custom(&conn->secondary_list,
 -                     pkt, (GCompareFunc)colo_packet_compare_other);
 -            break;
 -        }
 +        result = g_queue_find_custom(&conn->secondary_list,
 +                 pkt, (GCompareFunc)HandlePacket);
          if (result) {
 -            ret = compare_chr_send(s,
 -                                   pkt->data,
 -                                   pkt->size,
 -                                   pkt->vnet_hdr_len);
 -            if (ret < 0) {
 -                error_report("colo_send_primary_packet failed");
 -            }
 -            trace_colo_compare_main("packet same and release packet");
 +            colo_release_primary_pkt(s, pkt);
              g_queue_remove(&conn->secondary_list, result->data);
 -            packet_destroy(pkt, NULL);
          } else {
              /*
               * If one packet arrive late, the secondary_list or
@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
      }
  }
-+/*
-+ * Called from the compare thread on the primary
-+ * for compare packet with secondary list of the
-+ * specified connection when a new packet was
-+ * queued to it.
-+ */
-+static void colo_compare_connection(void *opaque, void *user_data)
-+{
-+    CompareState *s = user_data;
-+    Connection *conn = opaque;
-+
-+    switch (conn->ip_proto) {
-+    case IPPROTO_TCP:
-+        colo_compare_tcp(s, conn);
-+        break;
-+    case IPPROTO_UDP:
-+        colo_compare_packet(s, conn, colo_packet_compare_udp);
-+        break;
-+    case IPPROTO_ICMP:
-+        colo_compare_packet(s, conn, colo_packet_compare_icmp);
-+        break;
-+    default:
-+        colo_compare_packet(s, conn, colo_packet_compare_other);
-+        break;
-+    }
-+}
-+
- static int compare_chr_send(CompareState *s,
-                             const uint8_t *buf,
-                             uint32_t size,
-diff --git a/net/colo.c b/net/colo.c
-index XXXXXXX..XXXXXXX 100644
---- a/net/colo.c
-+++ b/net/colo.c
-@@ -XXX,XX +XXX,XX @@ Connection *connection_new(ConnectionKey *key)
-     conn->processing = false;
-     conn->offset = 0;
-     conn->syn_flag = 0;
-+    conn->pack = 0;
-+    conn->sack = 0;
-     g_queue_init(&conn->primary_list);
-     g_queue_init(&conn->secondary_list);
-@@ -XXX,XX +XXX,XX @@ Packet *packet_new(const void *data, int size, int vnet_hdr_len)
-     pkt->size = size;
-     pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);
-     pkt->vnet_hdr_len = vnet_hdr_len;
-+    pkt->tcp_seq = 0;
-+    pkt->tcp_ack = 0;
-+    pkt->seq_end = 0;
-+    pkt->header_size = 0;
-+    pkt->payload_size = 0;
-+    pkt->offset = 0;
-+    pkt->flags = 0;
-     return pkt;
- }
-diff --git a/net/colo.h b/net/colo.h
-index XXXXXXX..XXXXXXX 100644
---- a/net/colo.h
-+++ b/net/colo.h
-@@ -XXX,XX +XXX,XX @@ typedef struct Packet {
-     int64_t creation_ms;
-     /* Get vnet_hdr_len from filter */
-     uint32_t vnet_hdr_len;
-+    uint32_t tcp_seq; /* sequence number */
-+    uint32_t tcp_ack; /* acknowledgement number */
-+    /* the sequence number of the last byte of the packet */
-+    uint32_t seq_end;
-+    uint8_t header_size;  /* the header length */
-+    uint16_t payload_size; /* the payload length */
-+    /* record the payload offset(the length that has been compared) */
-+    uint16_t offset;
-+    uint8_t flags; /* Flags(aka Control bits) */
- } Packet;
- typedef struct ConnectionKey {
-@@ -XXX,XX +XXX,XX @@ typedef struct Connection {
-     /* flag to enqueue unprocessed_connections */
-     bool processing;
-     uint8_t ip_proto;
-+    /* record the sequence number that has been compared */
-+    uint32_t compare_seq;
-+    /* the maximum of acknowledgement number in primary_list queue */
-+    uint32_t pack;
-+    /* the maximum of acknowledgement number in secondary_list queue */
-+    uint32_t sack;
-     /* offset = secondary_seq - primary_seq */
-     tcp_seq  offset;
-     /*
-diff --git a/net/trace-events b/net/trace-events
-index XXXXXXX..XXXXXXX 100644
---- a/net/trace-events
-+++ b/net/trace-events
-@@ -XXX,XX +XXX,XX @@ colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"
- colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"
- colo_old_packet_check_found(int64_t old_time) "%" PRId64
- colo_compare_miscompare(void) ""
--colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int res, uint32_t flag, int size) "side: %s seq/ack= %u/%u res= %d flags= 0x%x pkt_size: %d\n"
-+colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int hdlen, int pdlen, int offset, int flags) "%s: seq/ack= %u/%u hdlen= %d pdlen= %d offset= %d flags=%d\n"
- # net/filter-rewriter.c
- colo_filter_rewriter_debug(void) ""
 --
 .7.4

The following changes since commit e607bbee553cfe73072870cef458cfa4e78133e2:

Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2018-01-26.for-upstream' into staging (2018-01-26 14:24:25 +0000)

are available in the git repository at:

https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to bf4835a4d5338bb7424827715df22570a8adc67c:

MAINTAINERS: update Dmitry Fleytman email (2018-01-29 16:05:38 +0800)

----------------------------------------------------------------

----------------------------------------------------------------
Mao Zhongyi (2):
      colo: modified the payload compare function
      colo: compare the packet based on the tcp sequence number

Philippe Mathieu-Daudé (1):
      MAINTAINERS: update Dmitry Fleytman email

Thomas Huth (3):
      net: Allow hubports to connect to other netdevs
      net: Allow netdevs to be used with 'hostfwd_add' and 'hostfwd_remove'
      qemu-doc: Get rid of "vlan=X" example in the documentation

From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Modified the function colo_packet_compare_common to prepare for the
tcp packet comparison in the next patch.

Cc: Zhang Chen <zhangckid@gmail.com>
Cc: Li Zhijian <lizhijian@cn.fujitsu.com>
Cc: Jason Wang <jasowang@redhat.com>

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Zhang Chen <zhangckid@gmail.com>
Reviewed-by: Zhang Chen <zhangckid@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 88 +++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index XXXXXXX..XXXXXXX 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
  * return:    0  means packet same
  *            > 0 || < 0 means packet different
  */
-static int colo_packet_compare_common(Packet *ppkt,
-                                      Packet *spkt,
-                                      int poffset,
-                                      int soffset)
+static int colo_compare_packet_payload(Packet *ppkt,
+                                       Packet *spkt,
+                                       uint16_t poffset,
+                                       uint16_t soffset,
+                                       uint16_t len)
+
 {
     if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
         char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_common(Packet *ppkt,
                                    sec_ip_src, sec_ip_dst);
     }
 
-    poffset = ppkt->vnet_hdr_len + poffset;
-    soffset = ppkt->vnet_hdr_len + soffset;
-
-    if (ppkt->size - poffset == spkt->size - soffset) {
-        return memcmp(ppkt->data + poffset,
-                      spkt->data + soffset,
-                      spkt->size - soffset);
-    } else {
-        trace_colo_compare_main("Net packet size are not the same");
-        return -1;
-    }
+    return memcmp(ppkt->data + poffset, spkt->data + soffset, len);
 }
 
 /*
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
      * the secondary guest's timestamp. COLO just focus on payload,
      * so we just need skip this field.
      */
-    if (ptcp->th_off > 5) {
-        ptrdiff_t ptcp_offset, stcp_offset;
 
-        ptcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
-                      + (ptcp->th_off * 4) - ppkt->vnet_hdr_len;
-        stcp_offset = spkt->transport_header - (uint8_t *)spkt->data
-                      + (stcp->th_off * 4) - spkt->vnet_hdr_len;
+    ptrdiff_t ptcp_offset, stcp_offset;
 
-        /*
-         * When network is busy, some tcp options(like sack) will unpredictable
-         * occur in primary side or secondary side. it will make packet size
-         * not same, but the two packet's payload is identical. colo just
-         * care about packet payload, so we skip the option field.
-         */
-        res = colo_packet_compare_common(ppkt, spkt, ptcp_offset, stcp_offset);
-    } else if (ptcp->th_sum == stcp->th_sum) {
-        res = colo_packet_compare_common(ppkt, spkt, ETH_HLEN, ETH_HLEN);
+    ptcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
+                  + (ptcp->th_off << 2) - ppkt->vnet_hdr_len;
+    stcp_offset = spkt->transport_header - (uint8_t *)spkt->data
+                  + (stcp->th_off << 2) - spkt->vnet_hdr_len;
+    if (ppkt->size - ptcp_offset == spkt->size - stcp_offset) {
+        res = colo_compare_packet_payload(ppkt, spkt,
+                                          ptcp_offset, stcp_offset,
+                                          ppkt->size - ptcp_offset);
     } else {
+        trace_colo_compare_main("TCP: payload size of packets are different");
         res = -1;
     }
 
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
  */
 static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
 {
-    int ret;
-    int network_header_length = ppkt->ip->ip_hl * 4;
+    uint16_t network_header_length = ppkt->ip->ip_hl << 2;
+    uint16_t offset = network_header_length + ETH_HLEN + ppkt->vnet_hdr_len;
 
     trace_colo_compare_main("compare udp");
 
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
      * other field like TOS,TTL,IP Checksum. we only need to compare
      * the ip payload here.
      */
-    ret = colo_packet_compare_common(ppkt, spkt,
-                                     network_header_length + ETH_HLEN,
-                                     network_header_length + ETH_HLEN);
-
-    if (ret) {
+    if (ppkt->size != spkt->size) {
+        trace_colo_compare_main("UDP: payload size of packets are different");
+        return -1;
+    }
+    if (colo_compare_packet_payload(ppkt, spkt, offset, offset,
+                                    ppkt->size - offset)) {
         trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size);
         trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size);
         if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
             qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt",
                          spkt->size);
         }
+        return -1;
+    } else {
+        return 0;
     }
-
-    return ret;
 }
 
 /*
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_udp(Packet *spkt, Packet *ppkt)
  */
 static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)
 {
-    int network_header_length = ppkt->ip->ip_hl * 4;
+    uint16_t network_header_length = ppkt->ip->ip_hl << 2;
+    uint16_t offset = network_header_length + ETH_HLEN + ppkt->vnet_hdr_len;
 
     trace_colo_compare_main("compare icmp");
 
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)
      * other field like TOS,TTL,IP Checksum. we only need to compare
      * the ip payload here.
      */
-    if (colo_packet_compare_common(ppkt, spkt,
-                                   network_header_length + ETH_HLEN,
-                                   network_header_length + ETH_HLEN)) {
+    if (ppkt->size != spkt->size) {
+        trace_colo_compare_main("ICMP: payload size of packets are different");
+        return -1;
+    }
+    if (colo_compare_packet_payload(ppkt, spkt, offset, offset,
+                                    ppkt->size - offset)) {
         trace_colo_compare_icmp_miscompare("primary pkt size",
                                            ppkt->size);
         trace_colo_compare_icmp_miscompare("Secondary pkt size",
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt)
  */
 static int colo_packet_compare_other(Packet *spkt, Packet *ppkt)
 {
+    uint16_t offset = ppkt->vnet_hdr_len;
+
     trace_colo_compare_main("compare other");
     if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
         char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
@@ -XXX,XX +XXX,XX @@ static int colo_packet_compare_other(Packet *spkt, Packet *ppkt)
                                    sec_ip_src, sec_ip_dst);
     }
 
-    return colo_packet_compare_common(ppkt, spkt, 0, 0);
+    if (ppkt->size != spkt->size) {
+        trace_colo_compare_main("Other: payload size of packets are different");
+        return -1;
+    }
+    return colo_compare_packet_payload(ppkt, spkt, offset, offset,
+                                       ppkt->size - offset);
 }
 
 static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time)
-- 
2.7.4

From: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>

Packet size some time different or when network is busy.
Based on same payload size, but TCP protocol can not
guarantee send the same one packet in the same way,

like that:
We send this payload:
------------------------------
| header |1|2|3|4|5|6|7|8|9|0|
------------------------------

primary:
ppkt1:
----------------
| header |1|2|3|
----------------
ppkt2:
------------------------
| header |4|5|6|7|8|9|0|
------------------------

secondary:
spkt1:
------------------------------
| header |1|2|3|4|5|6|7|8|9|0|
------------------------------

In the original method, ppkt1 and ppkt2 are different in size and
spkt1, so they can't compare and trigger the checkpoint.

I have tested FTP get 200M and 1G file many times, I found that
the performance was less than 1% of the native.

Now I reconstructed the comparison of TCP packets based on the
TCP sequence number. first of all, ppkt1 and spkt1 have the same
starting sequence number, so they can compare, even though their
length is different. And then ppkt1 with a smaller payload length
is used as the comparison length, if the payload is same, send
out the ppkt1 and record the offset(the length of ppkt1 payload)
in spkt1. The next comparison, ppkt2 and spkt1 can be compared
from the recorded position of spkt1.

like that:
----------------
| header |1|2|3| ppkt1
---------|-----|
         |     |
---------v-----v--------------
| header |1|2|3|4|5|6|7|8|9|0| spkt1
---------------|\------------|
               | \offset     |
      ---------v-------------v
      | header |4|5|6|7|8|9|0| ppkt2
      ------------------------

In this way, the performance can reach native 20% in my multiple
tests.

Cc: Zhang Chen <zhangckid@gmail.com>
Cc: Li Zhijian <lizhijian@cn.fujitsu.com>
Cc: Jason Wang <jasowang@redhat.com>

Signed-off-by: Mao Zhongyi <maozy.fnst@cn.fujitsu.com>
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Zhang Chen <zhangckid@gmail.com>
Reviewed-by: Zhang Chen <zhangckid@gmail.com>
Tested-by: Zhang Chen <zhangckid@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c | 343 +++++++++++++++++++++++++++++++++++------------------
 net/colo.c         |   9 ++
 net/colo.h         |  15 +++
 net/trace-events   |   2 +-
 4 files changed, 250 insertions(+), 119 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index XXXXXXX..XXXXXXX 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -XXX,XX +XXX,XX @@
 #define COMPARE_READ_LEN_MAX NET_BUFSIZE
 #define MAX_QUEUE_SIZE 1024
 
+#define COLO_COMPARE_FREE_PRIMARY     0x01
+#define COLO_COMPARE_FREE_SECONDARY   0x02
+
 /* TODO: Should be configurable */
 #define REGULAR_PACKET_CHECK_MS 3000
 
@@ -XXX,XX +XXX,XX @@ static gint seq_sorter(Packet *a, Packet *b, gpointer data)
     return ntohl(atcp->th_seq) - ntohl(btcp->th_seq);
 }
 
+static void fill_pkt_tcp_info(void *data, uint32_t *max_ack)
+{
+    Packet *pkt = data;
+    struct tcphdr *tcphd;
+
+    tcphd = (struct tcphdr *)pkt->transport_header;
+
+    pkt->tcp_seq = ntohl(tcphd->th_seq);
+    pkt->tcp_ack = ntohl(tcphd->th_ack);
+    *max_ack = *max_ack > pkt->tcp_ack ? *max_ack : pkt->tcp_ack;
+    pkt->header_size = pkt->transport_header - (uint8_t *)pkt->data
+                       + (tcphd->th_off << 2) - pkt->vnet_hdr_len;
+    pkt->payload_size = pkt->size - pkt->header_size;
+    pkt->seq_end = pkt->tcp_seq + pkt->payload_size;
+    pkt->flags = tcphd->th_flags;
+}
+
 /*
  * Return 1 on success, if return 0 means the
  * packet will be dropped
  */
-static int colo_insert_packet(GQueue *queue, Packet *pkt)
+static int colo_insert_packet(GQueue *queue, Packet *pkt, uint32_t *max_ack)
 {
     if (g_queue_get_length(queue) <= MAX_QUEUE_SIZE) {
         if (pkt->ip->ip_p == IPPROTO_TCP) {
+            fill_pkt_tcp_info(pkt, max_ack);
             g_queue_insert_sorted(queue,
                                   pkt,
                                   (GCompareDataFunc)seq_sorter,
@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
     }
 
     if (mode == PRIMARY_IN) {
-        if (!colo_insert_packet(&conn->primary_list, pkt)) {
+        if (!colo_insert_packet(&conn->primary_list, pkt, &conn->pack)) {
             error_report("colo compare primary queue size too big,"
                          "drop packet");
         }
     } else {
-        if (!colo_insert_packet(&conn->secondary_list, pkt)) {
+        if (!colo_insert_packet(&conn->secondary_list, pkt, &conn->sack)) {
             error_report("colo compare secondary queue size too big,"
                          "drop packet");
         }
@@ -XXX,XX +XXX,XX @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
     return 0;
 }
 
+static inline bool after(uint32_t seq1, uint32_t seq2)
+{
+        return (int32_t)(seq1 - seq2) > 0;
+}
+
+static void colo_release_primary_pkt(CompareState *s, Packet *pkt)
+{
+    int ret;
+    ret = compare_chr_send(s,
+                           pkt->data,
+                           pkt->size,
+                           pkt->vnet_hdr_len);
+    if (ret < 0) {
+        error_report("colo send primary packet failed");
+    }
+    trace_colo_compare_main("packet same and release packet");
+    packet_destroy(pkt, NULL);
+}
+
 /*
  * The IP packets sent by primary and secondary
  * will be compared in here
@@ -XXX,XX +XXX,XX @@ static int colo_compare_packet_payload(Packet *ppkt,
 }
 
 /*
- * Called from the compare thread on the primary
- * for compare tcp packet
- * compare_tcp copied from Dr. David Alan Gilbert's branch
- */
-static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
+ * return true means that the payload is consist and
+ * need to make the next comparison, false means do
+ * the checkpoint
+*/
+static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
+                              int8_t *mark, uint32_t max_ack)
 {
-    struct tcphdr *ptcp, *stcp;
-    int res;
+    *mark = 0;
+
+    if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) {
+        if (colo_compare_packet_payload(ppkt, spkt,
+                                        ppkt->header_size, spkt->header_size,
+                                        ppkt->payload_size)) {
+            *mark = COLO_COMPARE_FREE_SECONDARY | COLO_COMPARE_FREE_PRIMARY;
+            return true;
+        }
+    }
+    if (ppkt->tcp_seq == spkt->tcp_seq && ppkt->seq_end == spkt->seq_end) {
+        if (colo_compare_packet_payload(ppkt, spkt,
+                                        ppkt->header_size, spkt->header_size,
+                                        ppkt->payload_size)) {
+            *mark = COLO_COMPARE_FREE_SECONDARY | COLO_COMPARE_FREE_PRIMARY;
+            return true;
+        }
+    }
+
+    /* one part of secondary packet payload still need to be compared */
+    if (!after(ppkt->seq_end, spkt->seq_end)) {
+        if (colo_compare_packet_payload(ppkt, spkt,
+                                        ppkt->header_size + ppkt->offset,
+                                        spkt->header_size + spkt->offset,
+                                        ppkt->payload_size - ppkt->offset)) {
+            if (!after(ppkt->tcp_ack, max_ack)) {
+                *mark = COLO_COMPARE_FREE_PRIMARY;
+                spkt->offset += ppkt->payload_size - ppkt->offset;
+                return true;
+            } else {
+                /* secondary guest hasn't ack the data, don't send
+                 * out this packet
+                 */
+                return false;
+            }
+        }
+    } else {
+        /* primary packet is longer than secondary packet, compare
+         * the same part and mark the primary packet offset
+         */
+        if (colo_compare_packet_payload(ppkt, spkt,
+                                        ppkt->header_size + ppkt->offset,
+                                        spkt->header_size + spkt->offset,
+                                        spkt->payload_size - spkt->offset)) {
+            *mark = COLO_COMPARE_FREE_SECONDARY;
+            ppkt->offset += spkt->payload_size - spkt->offset;
+            return true;
+        }
+    }
 
-    trace_colo_compare_main("compare tcp");
+    return false;
+}
 
-    ptcp = (struct tcphdr *)ppkt->transport_header;
-    stcp = (struct tcphdr *)spkt->transport_header;
+static void colo_compare_tcp(CompareState *s, Connection *conn)
+{
+    Packet *ppkt = NULL, *spkt = NULL;
+    int8_t mark;
 
     /*
-     * The 'identification' field in the IP header is *very* random
-     * it almost never matches.  Fudge this by ignoring differences in
-     * unfragmented packets; they'll normally sort themselves out if different
-     * anyway, and it should recover at the TCP level.
-     * An alternative would be to get both the primary and secondary to rewrite
-     * somehow; but that would need some sync traffic to sync the state
-     */
-    if (ntohs(ppkt->ip->ip_off) & IP_DF) {
-        spkt->ip->ip_id = ppkt->ip->ip_id;
-        /* and the sum will be different if the IDs were different */
-        spkt->ip->ip_sum = ppkt->ip->ip_sum;
+     * If ppkt and spkt have the same payload, but ppkt's ACK
+     * is greater than spkt's ACK, in this case we can not
+     * send the ppkt because it will cause the secondary guest
+     * to miss sending some data in the next. Therefore, we
+     * record the maximum ACK in the current queue at both
+     * primary side and secondary side. Only when the ack is
+     * less than the smaller of the two maximum ack, then we
+     * can ensure that the packet's payload is acknowledged by
+     * primary and secondary.
+    */
+    uint32_t min_ack = conn->pack > conn->sack ? conn->sack : conn->pack;
+
+pri:
+    if (g_queue_is_empty(&conn->primary_list)) {
+        return;
     }
+    ppkt = g_queue_pop_head(&conn->primary_list);
+sec:
+    if (g_queue_is_empty(&conn->secondary_list)) {
+        g_queue_push_head(&conn->primary_list, ppkt);
+        return;
+    }
+    spkt = g_queue_pop_head(&conn->secondary_list);
 
-    /*
-     * Check tcp header length for tcp option field.
-     * th_off > 5 means this tcp packet have options field.
-     * The tcp options maybe always different.
-     * for example:
-     * From RFC 7323.
-     * TCP Timestamps option (TSopt):
-     * Kind: 8
-     *
-     * Length: 10 bytes
-     *
-     *    +-------+-------+---------------------+---------------------+
-     *    |Kind=8 |  10   |   TS Value (TSval)  |TS Echo Reply (TSecr)|
-     *    +-------+-------+---------------------+---------------------+
-     *       1       1              4                     4
-     *
-     * In this case the primary guest's timestamp always different with
-     * the secondary guest's timestamp. COLO just focus on payload,
-     * so we just need skip this field.
-     */
+    if (ppkt->tcp_seq == ppkt->seq_end) {
+        colo_release_primary_pkt(s, ppkt);
+        ppkt = NULL;
+    }
 
-    ptrdiff_t ptcp_offset, stcp_offset;
+    if (ppkt && conn->compare_seq && !after(ppkt->seq_end, conn->compare_seq)) {
+        trace_colo_compare_main("pri: this packet has compared");
+        colo_release_primary_pkt(s, ppkt);
+        ppkt = NULL;
+    }
 
-    ptcp_offset = ppkt->transport_header - (uint8_t *)ppkt->data
-                  + (ptcp->th_off << 2) - ppkt->vnet_hdr_len;
-    stcp_offset = spkt->transport_header - (uint8_t *)spkt->data
-                  + (stcp->th_off << 2) - spkt->vnet_hdr_len;
-    if (ppkt->size - ptcp_offset == spkt->size - stcp_offset) {
-        res = colo_compare_packet_payload(ppkt, spkt,
-                                          ptcp_offset, stcp_offset,
-                                          ppkt->size - ptcp_offset);
+    if (spkt->tcp_seq == spkt->seq_end) {
+        packet_destroy(spkt, NULL);
+        if (!ppkt) {
+            goto pri;
+        } else {
+            goto sec;
+        }
     } else {
-        trace_colo_compare_main("TCP: payload size of packets are different");
-        res = -1;
+        if (conn->compare_seq && !after(spkt->seq_end, conn->compare_seq)) {
+            trace_colo_compare_main("sec: this packet has compared");
+            packet_destroy(spkt, NULL);
+            if (!ppkt) {
+                goto pri;
+            } else {
+                goto sec;
+            }
+        }
+        if (!ppkt) {
+            g_queue_push_head(&conn->secondary_list, spkt);
+            goto pri;
+        }
     }
 
-    if (res != 0 &&
-        trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
-        char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20];
-
-        strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src));
-        strcpy(pri_ip_dst, inet_ntoa(ppkt->ip->ip_dst));
-        strcpy(sec_ip_src, inet_ntoa(spkt->ip->ip_src));
-        strcpy(sec_ip_dst, inet_ntoa(spkt->ip->ip_dst));
-
-        trace_colo_compare_ip_info(ppkt->size, pri_ip_src,
-                                   pri_ip_dst, spkt->size,
-                                   sec_ip_src, sec_ip_dst);
-
-        trace_colo_compare_tcp_info("pri tcp packet",
-                                    ntohl(ptcp->th_seq),
-                                    ntohl(ptcp->th_ack),
-                                    res, ptcp->th_flags,
-                                    ppkt->size);
-
-        trace_colo_compare_tcp_info("sec tcp packet",
-                                    ntohl(stcp->th_seq),
-                                    ntohl(stcp->th_ack),
-                                    res, stcp->th_flags,
-                                    spkt->size);
+    if (colo_mark_tcp_pkt(ppkt, spkt, &mark, min_ack)) {
+        trace_colo_compare_tcp_info("pri",
+                                    ppkt->tcp_seq, ppkt->tcp_ack,
+                                    ppkt->header_size, ppkt->payload_size,
+                                    ppkt->offset, ppkt->flags);
+
+        trace_colo_compare_tcp_info("sec",
+                                    spkt->tcp_seq, spkt->tcp_ack,
+                                    spkt->header_size, spkt->payload_size,
+                                    spkt->offset, spkt->flags);
+
+        if (mark == COLO_COMPARE_FREE_PRIMARY) {
+            conn->compare_seq = ppkt->seq_end;
+            colo_release_primary_pkt(s, ppkt);
+            g_queue_push_head(&conn->secondary_list, spkt);
+            goto pri;
+        }
+        if (mark == COLO_COMPARE_FREE_SECONDARY) {
+            conn->compare_seq = spkt->seq_end;
+            packet_destroy(spkt, NULL);
+            goto sec;
+        }
+        if (mark == (COLO_COMPARE_FREE_PRIMARY | COLO_COMPARE_FREE_SECONDARY)) {
+            conn->compare_seq = ppkt->seq_end;
+            colo_release_primary_pkt(s, ppkt);
+            packet_destroy(spkt, NULL);
+            goto pri;
+        }
+    } else {
+        g_queue_push_head(&conn->primary_list, ppkt);
+        g_queue_push_head(&conn->secondary_list, spkt);
 
         qemu_hexdump((char *)ppkt->data, stderr,
                      "colo-compare ppkt", ppkt->size);
         qemu_hexdump((char *)spkt->data, stderr,
                      "colo-compare spkt", spkt->size);
-    }
 
-    return res;
+        /*
+         * colo_compare_inconsistent_notify();
+         * TODO: notice to checkpoint();
+         */
+    }
 }
 
+
 /*
  * Called from the compare thread on the primary
  * for compare udp packet
@@ -XXX,XX +XXX,XX @@ static void colo_old_packet_check(void *opaque)
                         (GCompareFunc)colo_old_packet_check_one_conn);
 }
 
-/*
- * Called from the compare thread on the primary
- * for compare packet with secondary list of the
- * specified connection when a new packet was
- * queued to it.
- */
-static void colo_compare_connection(void *opaque, void *user_data)
+static void colo_compare_packet(CompareState *s, Connection *conn,
+                                int (*HandlePacket)(Packet *spkt,
+                                Packet *ppkt))
 {
-    CompareState *s = user_data;
-    Connection *conn = opaque;
     Packet *pkt = NULL;
     GList *result = NULL;
-    int ret;
 
     while (!g_queue_is_empty(&conn->primary_list) &&
            !g_queue_is_empty(&conn->secondary_list)) {
         pkt = g_queue_pop_head(&conn->primary_list);
-        switch (conn->ip_proto) {
-        case IPPROTO_TCP:
-            result = g_queue_find_custom(&conn->secondary_list,
-                     pkt, (GCompareFunc)colo_packet_compare_tcp);
-            break;
-        case IPPROTO_UDP:
-            result = g_queue_find_custom(&conn->secondary_list,
-                     pkt, (GCompareFunc)colo_packet_compare_udp);
-            break;
-        case IPPROTO_ICMP:
-            result = g_queue_find_custom(&conn->secondary_list,
-                     pkt, (GCompareFunc)colo_packet_compare_icmp);
-            break;
-        default:
-            result = g_queue_find_custom(&conn->secondary_list,
-                     pkt, (GCompareFunc)colo_packet_compare_other);
-            break;
-        }
+        result = g_queue_find_custom(&conn->secondary_list,
+                 pkt, (GCompareFunc)HandlePacket);
 
         if (result) {
-            ret = compare_chr_send(s,
-                                   pkt->data,
-                                   pkt->size,
-                                   pkt->vnet_hdr_len);
-            if (ret < 0) {
-                error_report("colo_send_primary_packet failed");
-            }
-            trace_colo_compare_main("packet same and release packet");
+            colo_release_primary_pkt(s, pkt);
             g_queue_remove(&conn->secondary_list, result->data);
-            packet_destroy(pkt, NULL);
         } else {
             /*
              * If one packet arrive late, the secondary_list or
@@ -XXX,XX +XXX,XX @@ static void colo_compare_connection(void *opaque, void *user_data)
     }
 }
 
+/*
+ * Called from the compare thread on the primary
+ * for compare packet with secondary list of the
+ * specified connection when a new packet was
+ * queued to it.
+ */
+static void colo_compare_connection(void *opaque, void *user_data)
+{
+    CompareState *s = user_data;
+    Connection *conn = opaque;
+
+    switch (conn->ip_proto) {
+    case IPPROTO_TCP:
+        colo_compare_tcp(s, conn);
+        break;
+    case IPPROTO_UDP:
+        colo_compare_packet(s, conn, colo_packet_compare_udp);
+        break;
+    case IPPROTO_ICMP:
+        colo_compare_packet(s, conn, colo_packet_compare_icmp);
+        break;
+    default:
+        colo_compare_packet(s, conn, colo_packet_compare_other);
+        break;
+    }
+}
+
 static int compare_chr_send(CompareState *s,
                             const uint8_t *buf,
                             uint32_t size,
diff --git a/net/colo.c b/net/colo.c
index XXXXXXX..XXXXXXX 100644
--- a/net/colo.c
+++ b/net/colo.c
@@ -XXX,XX +XXX,XX @@ Connection *connection_new(ConnectionKey *key)
     conn->processing = false;
     conn->offset = 0;
     conn->syn_flag = 0;
+    conn->pack = 0;
+    conn->sack = 0;
     g_queue_init(&conn->primary_list);
     g_queue_init(&conn->secondary_list);
 
@@ -XXX,XX +XXX,XX @@ Packet *packet_new(const void *data, int size, int vnet_hdr_len)
     pkt->size = size;
     pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST);
     pkt->vnet_hdr_len = vnet_hdr_len;
+    pkt->tcp_seq = 0;
+    pkt->tcp_ack = 0;
+    pkt->seq_end = 0;
+    pkt->header_size = 0;
+    pkt->payload_size = 0;
+    pkt->offset = 0;
+    pkt->flags = 0;
 
     return pkt;
 }
diff --git a/net/colo.h b/net/colo.h
index XXXXXXX..XXXXXXX 100644
--- a/net/colo.h
+++ b/net/colo.h
@@ -XXX,XX +XXX,XX @@ typedef struct Packet {
     int64_t creation_ms;
     /* Get vnet_hdr_len from filter */
     uint32_t vnet_hdr_len;
+    uint32_t tcp_seq; /* sequence number */
+    uint32_t tcp_ack; /* acknowledgement number */
+    /* the sequence number of the last byte of the packet */
+    uint32_t seq_end;
+    uint8_t header_size;  /* the header length */
+    uint16_t payload_size; /* the payload length */
+    /* record the payload offset(the length that has been compared) */
+    uint16_t offset;
+    uint8_t flags; /* Flags(aka Control bits) */
 } Packet;
 
 typedef struct ConnectionKey {
@@ -XXX,XX +XXX,XX @@ typedef struct Connection {
     /* flag to enqueue unprocessed_connections */
     bool processing;
     uint8_t ip_proto;
+    /* record the sequence number that has been compared */
+    uint32_t compare_seq;
+    /* the maximum of acknowledgement number in primary_list queue */
+    uint32_t pack;
+    /* the maximum of acknowledgement number in secondary_list queue */
+    uint32_t sack;
     /* offset = secondary_seq - primary_seq */
     tcp_seq  offset;
     /*
diff --git a/net/trace-events b/net/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/net/trace-events
+++ b/net/trace-events
@@ -XXX,XX +XXX,XX @@ colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"
 colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"
 colo_old_packet_check_found(int64_t old_time) "%" PRId64
 colo_compare_miscompare(void) ""
-colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int res, uint32_t flag, int size) "side: %s seq/ack= %u/%u res= %d flags= 0x%x pkt_size: %d\n"
+colo_compare_tcp_info(const char *pkt, uint32_t seq, uint32_t ack, int hdlen, int pdlen, int offset, int flags) "%s: seq/ack= %u/%u hdlen= %d pdlen= %d offset= %d flags=%d\n"
 
 # net/filter-rewriter.c
 colo_filter_rewriter_debug(void) ""
-- 
2.7.4

From: Thomas Huth <thuth@redhat.com>

QEMU can emulate hubs to connect NICs and netdevs. This is currently
primarily used for the mis-named 'vlan' feature of the networking
subsystem. Now the 'vlan' feature has been marked as deprecated, since
its name is rather confusing and the users often rather mis-configure
their network when trying to use it. But while the 'vlan' parameter
should be removed at one point in time, the basic idea of emulating
a hub in QEMU is still good: It's useful for bundling up the output of
multiple NICs into one single l2tp netdev for example.

Now to be able to use the hubport feature without 'vlan's, there is one
missing piece: The possibility to connect a hubport to a netdev, too.
This patch adds this possibility by introducing a new "netdev=..."
parameter to the hubports.

To bundle up the output of multiple NICs into one socket netdev, you can
now run QEMU with these parameters for example:

qemu-system-ppc64 ... -netdev socket,id=s1,connect=:11122 \
    -netdev hubport,hubid=1,id=h1,netdev=s1 \
    -netdev hubport,hubid=1,id=h2 -device e1000,netdev=h2 \
    -netdev hubport,hubid=1,id=h3 -device virtio-net-pci,netdev=h3

For using the socket netdev, you have got to start another QEMU as the
receiving side first, for example with network dumping enabled:

qemu-system-x86_64 -M isapc -netdev socket,id=s0,listen=:11122 \
    -device ne2k_isa,netdev=s0 \
    -object filter-dump,id=f1,netdev=s0,file=/tmp/dump.dat

After the ppc64 guest tried to boot from both NICs, you can see in the
dump file (using Wireshark, for example), that the output of both NICs
(the e1000 and the virtio-net-pci) has been successfully transfered
via the socket netdev in this case.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/hub.c       | 27 +++++++++++++++++++++------
 net/hub.h       |  3 ++-
 net/net.c       |  2 +-
 qapi/net.json   |  4 +++-
 qemu-options.hx |  8 +++++---
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/net/hub.c b/net/hub.c
index XXXXXXX..XXXXXXX 100644
--- a/net/hub.c
+++ b/net/hub.c
@@ -XXX,XX +XXX,XX @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "monitor/monitor.h"
 #include "net/net.h"
 #include "clients.h"
@@ -XXX,XX +XXX,XX @@ static NetClientInfo net_hub_port_info = {
     .cleanup = net_hub_port_cleanup,
 };
 
-static NetHubPort *net_hub_port_new(NetHub *hub, const char *name)
+static NetHubPort *net_hub_port_new(NetHub *hub, const char *name,
+                                    NetClientState *hubpeer)
 {
     NetClientState *nc;
     NetHubPort *port;
@@ -XXX,XX +XXX,XX @@ static NetHubPort *net_hub_port_new(NetHub *hub, const char *name)
         name = default_name;
     }
 
-    nc = qemu_new_net_client(&net_hub_port_info, NULL, "hub", name);
+    nc = qemu_new_net_client(&net_hub_port_info, hubpeer, "hub", name);
     port = DO_UPCAST(NetHubPort, nc, nc);
     port->id = id;
     port->hub = hub;
@@ -XXX,XX +XXX,XX @@ static NetHubPort *net_hub_port_new(NetHub *hub, const char *name)
 
 /**
  * Create a port on a given hub
+ * @hub_id: Number of the hub
  * @name: Net client name or NULL for default name.
+ * @hubpeer: Peer to use (if "netdev=id" has been specified)
  *
  * If there is no existing hub with the given id then a new hub is created.
  */
-NetClientState *net_hub_add_port(int hub_id, const char *name)
+NetClientState *net_hub_add_port(int hub_id, const char *name,
+                                 NetClientState *hubpeer)
 {
     NetHub *hub;
     NetHubPort *port;
@@ -XXX,XX +XXX,XX @@ NetClientState *net_hub_add_port(int hub_id, const char *name)
         hub = net_hub_new(hub_id);
     }
 
-    port = net_hub_port_new(hub, name);
+    port = net_hub_port_new(hub, name, hubpeer);
     return &port->nc;
 }
 
@@ -XXX,XX +XXX,XX @@ NetClientState *net_hub_port_find(int hub_id)
         }
     }
 
-    nc = net_hub_add_port(hub_id, NULL);
+    nc = net_hub_add_port(hub_id, NULL, NULL);
     return nc;
 }
 
@@ -XXX,XX +XXX,XX @@ int net_init_hubport(const Netdev *netdev, const char *name,
                      NetClientState *peer, Error **errp)
 {
     const NetdevHubPortOptions *hubport;
+    NetClientState *hubpeer = NULL;
 
     assert(netdev->type == NET_CLIENT_DRIVER_HUBPORT);
     assert(!peer);
     hubport = &netdev->u.hubport;
 
-    net_hub_add_port(hubport->hubid, name);
+    if (hubport->has_netdev) {
+        hubpeer = qemu_find_netdev(hubport->netdev);
+        if (!hubpeer) {
+            error_setg(errp, "netdev '%s' not found", hubport->netdev);
+            return -1;
+        }
+    }
+
+    net_hub_add_port(hubport->hubid, name, hubpeer);
+
     return 0;
 }
 
diff --git a/net/hub.h b/net/hub.h
index XXXXXXX..XXXXXXX 100644
--- a/net/hub.h
+++ b/net/hub.h
@@ -XXX,XX +XXX,XX @@
 
 #include "qemu-common.h"
 
-NetClientState *net_hub_add_port(int hub_id, const char *name);
+NetClientState *net_hub_add_port(int hub_id, const char *name,
+                                 NetClientState *hubpeer);
 NetClientState *net_hub_find_client_by_name(int hub_id, const char *name);
 void net_hub_info(Monitor *mon);
 void net_hub_check_clients(void);
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_client_init1(const void *object, bool is_netdev, Error **errp)
         /* Do not add to a vlan if it's a nic with a netdev= parameter. */
         if (netdev->type != NET_CLIENT_DRIVER_NIC ||
             !opts->u.nic.has_netdev) {
-            peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL);
+            peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL, NULL);
         }
 
         if (net->has_vlan && !vlan_warned) {
diff --git a/qapi/net.json b/qapi/net.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -XXX,XX +XXX,XX @@
 # Connect two or more net clients through a software hub.
 #
 # @hubid: hub identifier number
+# @netdev: used to connect hub to a netdev instead of a device (since 2.12)
 #
 # Since: 1.2
 ##
 { 'struct': 'NetdevHubPortOptions',
   'data': {
-    'hubid':     'int32' } }
+    'hubid':     'int32',
+    '*netdev':    'str' } }
 
 ##
 # @NetdevNetmapOptions:
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 vhost-user,id=str,chardev=dev[,vhostforce=on|off]\n"
     "                configure a vhost-user network, backed by a chardev 'dev'\n"
-    "-netdev hubport,id=str,hubid=n\n"
+    "-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,
     "-net nic[,vlan=n][,netdev=nd][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v]\n"
@@ -XXX,XX +XXX,XX @@ vde_switch -F -sock /tmp/myswitch
 qemu-system-i386 linux.img -net nic -net vde,sock=/tmp/myswitch
 @end example
 
-@item -netdev hubport,id=@var{id},hubid=@var{hubid}
+@item -netdev hubport,id=@var{id},hubid=@var{hubid}[,netdev=@var{nd}]
 
 Create a hub port on QEMU "vlan" @var{hubid}.
 
 The hubport netdev lets you connect a NIC to a QEMU "vlan" instead of a single
 netdev.  @code{-net} and @code{-device} with parameter @option{vlan} create the
-required hub automatically.
+required hub automatically. Alternatively, you can also connect the hubport
+to another netdev with ID @var{nd} by using the @option{netdev=@var{nd}}
+option.
 
 @item -netdev vhost-user,chardev=@var{id}[,vhostforce=on|off][,queues=n]
 
-- 
2.7.4

From: Thomas Huth <thuth@redhat.com>

It does not make much sense to limit these commands to the legacy 'vlan'
concept only, they should work with the modern netdevs, too. So now
it is possible to use this command with one, two or three parameters.

With one parameter, the command installs a hostfwd rule on the default
"user" network:
    hostfwd_add tcp:...

With two parameters, the command installs a hostfwd rule on a netdev
(that's the new way of using this command):
    hostfwd_add netdev_id tcp:...

With three parameters, the command installs a rule on a 'vlan' (aka hub):
    hostfwd_add hub_id name tcp:...

Same applies to the hostfwd_remove command now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hmp-commands.hx |  4 ++--
 net/slirp.c     | 33 +++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/hmp-commands.hx b/hmp-commands.hx
index XXXXXXX..XXXXXXX 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -XXX,XX +XXX,XX @@ ETEXI
     {
         .name       = "hostfwd_add",
         .args_type  = "arg1:s,arg2:s?,arg3:s?",
-        .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
+        .params     = "[hub_id name]|[netdev_id] [tcp|udp]:[hostaddr]:hostport-[guestaddr]:guestport",
         .help       = "redirect TCP or UDP connections from host to guest (requires -net user)",
         .cmd        = hmp_hostfwd_add,
     },
@@ -XXX,XX +XXX,XX @@ ETEXI
     {
         .name       = "hostfwd_remove",
         .args_type  = "arg1:s,arg2:s?,arg3:s?",
-        .params     = "[vlan_id name] [tcp|udp]:[hostaddr]:hostport",
+        .params     = "[hub_id name]|[netdev_id] [tcp|udp]:[hostaddr]:hostport",
         .help       = "remove host-to-guest TCP or UDP redirection",
         .cmd        = hmp_hostfwd_remove,
     },
diff --git a/net/slirp.c b/net/slirp.c
index XXXXXXX..XXXXXXX 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -XXX,XX +XXX,XX @@ error:
     return -1;
 }
 
-static SlirpState *slirp_lookup(Monitor *mon, const char *vlan,
-                                const char *stack)
+static SlirpState *slirp_lookup(Monitor *mon, const char *hub_id,
+                                const char *name)
 {
-
-    if (vlan) {
+    if (name) {
         NetClientState *nc;
-        nc = net_hub_find_client_by_name(strtol(vlan, NULL, 0), stack);
-        if (!nc) {
-            monitor_printf(mon, "unrecognized (vlan-id, stackname) pair\n");
-            return NULL;
+        if (hub_id) {
+            nc = net_hub_find_client_by_name(strtol(hub_id, NULL, 0), name);
+            if (!nc) {
+                monitor_printf(mon, "unrecognized (vlan-id, stackname) pair\n");
+                return NULL;
+            }
+        } else {
+            nc = qemu_find_netdev(name);
+            if (!nc) {
+                monitor_printf(mon, "unrecognized netdev id '%s'\n", name);
+                return NULL;
+            }
         }
         if (strcmp(nc->model, "user")) {
             monitor_printf(mon, "invalid device specified\n");
@@ -XXX,XX +XXX,XX @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict)
     const char *arg2 = qdict_get_try_str(qdict, "arg2");
     const char *arg3 = qdict_get_try_str(qdict, "arg3");
 
-    if (arg2) {
+    if (arg3) {
         s = slirp_lookup(mon, arg1, arg2);
         src_str = arg3;
+    } else if (arg2) {
+        s = slirp_lookup(mon, NULL, arg1);
+        src_str = arg2;
     } else {
         s = slirp_lookup(mon, NULL, NULL);
         src_str = arg1;
@@ -XXX,XX +XXX,XX @@ void hmp_hostfwd_add(Monitor *mon, const QDict *qdict)
     const char *arg2 = qdict_get_try_str(qdict, "arg2");
     const char *arg3 = qdict_get_try_str(qdict, "arg3");
 
-    if (arg2) {
+    if (arg3) {
         s = slirp_lookup(mon, arg1, arg2);
         redir_str = arg3;
+    } else if (arg2) {
+        s = slirp_lookup(mon, NULL, arg1);
+        redir_str = arg2;
     } else {
         s = slirp_lookup(mon, NULL, NULL);
         redir_str = arg1;
-- 
2.7.4

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

gently asked by his automatic reply :)

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 MAINTAINERS | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: hw/scsi/mfi.h
 F: tests/megasas-test.c
 
 Network packet abstractions
-M: Dmitry Fleytman <dmitry@daynix.com>
+M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
 S: Maintained
 F: include/net/eth.h
 F: net/eth.c
@@ -XXX,XX +XXX,XX @@ F: hw/net/net_rx_pkt*
 F: hw/net/net_tx_pkt*
 
 Vmware
-M: Dmitry Fleytman <dmitry@daynix.com>
+M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
 S: Maintained
 F: hw/net/vmxnet*
 F: hw/scsi/vmw_pvscsi*
@@ -XXX,XX +XXX,XX @@ F: hw/mem/nvdimm.c
 F: include/hw/mem/nvdimm.h
 
 e1000x
-M: Dmitry Fleytman <dmitry@daynix.com>
+M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
 S: Maintained
 F: hw/net/e1000x*
 
 e1000e
-M: Dmitry Fleytman <dmitry@daynix.com>
+M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
 S: Maintained
 F: hw/net/e1000e*
 
-- 
2.7.4

The following changes since commit d0d3dd401b70168a353450e031727affee828527:

Update version for v6.0.0-rc2 release (2021-04-06 18:34:34 +0100)

are available in the git repository at:

https://github.com/jasowang/qemu.git tags/net-pull-request

for you to fetch changes up to 21df394d9e2ffce9fa308f496d1ae228cf6cdb57:

tap-win32: correctly recycle buffers (2021-04-08 17:33:59 +0800)

----------------------------------------------------------------

Fixes for rc3:

- query-netdev is reverted (that's why the changeset is huge)
- fix a regression caused by padding for in TAP for win32

----------------------------------------------------------------
Jason Wang (6):
      Revert "net: Do not fill legacy info_str for backends"
      Revert "hmp: Use QAPI NetdevInfo in hmp_info_network"
      Revert "net: Move NetClientState.info_str to dynamic allocations"
      Revert "tests: Add tests for query-netdev command"
      Revert "qapi: net: Add query-netdev command"
      tap-win32: correctly recycle buffers

Several issues has been reported for query-netdev info
series. Consider it's late in the rc, this reverts commit
f2e8319d456724c3d8514d943dc4607e2f08e88a.

diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index XXXXXXX..XXXXXXX 100644
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -XXX,XX +XXX,XX @@ int net_init_l2tpv3(const Netdev *netdev,
 
     QAPI_CLONE_MEMBERS(NetdevL2TPv3Options,
                        &nc->stored_config->u.l2tpv3, l2tpv3);
+
+    s->nc.info_str = g_strdup_printf("l2tpv3: connected");
     return 0;
 outerr:
     qemu_del_net_client(nc);
diff --git a/net/slirp.c b/net/slirp.c
index XXXXXXX..XXXXXXX 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -XXX,XX +XXX,XX @@ static int net_slirp_init(NetClientState *peer, const char *model,
         stored->tftp_server_name = g_strdup(tftp_server_name);
     }
 
+    nc->info_str = g_strdup_printf("net=%s,restrict=%s", inet_ntoa(net),
+                                   restricted ? "on" : "off");
+
     s = DO_UPCAST(SlirpState, nc, nc);
 
     s->slirp = slirp_init(restricted, ipv4, net, mask, host,
diff --git a/net/socket.c b/net/socket.c
index XXXXXXX..XXXXXXX 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -XXX,XX +XXX,XX @@ static void net_socket_send(void *opaque)
         s->fd = -1;
         net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
         s->nc.link_down = true;
+        g_free(s->nc.info_str);
+        s->nc.info_str = g_new0(char, 1);
 
         return;
     }
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
         stored->mcast = g_strdup(mcast);
 
         s->dgram_dst = saddr;
+        nc->info_str = g_strdup_printf("socket: fd=%d (cloned mcast=%s:%d)",
+                                       fd, inet_ntoa(saddr.sin_addr),
+                                       ntohs(saddr.sin_port));
     } else {
         if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
             s->dgram_dst.sin_family = AF_UNIX;
         }
+
+        nc->info_str = g_strdup_printf("socket: fd=%d %s",
+                                       fd, SocketAddressType_str(sa_type));
     }
 
     return s;
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
 
     nc = qemu_new_net_client(&net_socket_info, peer, model, name);
 
+    nc->info_str = g_strdup_printf("socket: fd=%d", fd);
+
     s = DO_UPCAST(NetSocketState, nc, nc);
 
     s->fd = fd;
@@ -XXX,XX +XXX,XX @@ static void net_socket_accept(void *opaque)
 
     stored->has_fd = true;
     stored->fd = g_strdup_printf("%d", fd);
+
+    g_free(s->nc.info_str);
+    s->nc.info_str = g_strdup_printf("socket: connection from %s:%d",
+                                     inet_ntoa(saddr.sin_addr),
+                                     ntohs(saddr.sin_port));
 }
 
 static int net_socket_listen_init(NetClientState *peer,
@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
     stored->has_connect = true;
     stored->connect = g_strdup(host_str);
 
+    g_free(s->nc.info_str);
+    s->nc.info_str = g_strdup_printf("socket: connect to %s:%d",
+                                     inet_ntoa(saddr.sin_addr),
+                                     ntohs(saddr.sin_port));
     return 0;
 }
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
         stored->localaddr = g_strdup(localaddr_str);
     }
 
+    g_free(s->nc.info_str);
+    s->nc.info_str = g_strdup_printf("socket: mcast=%s:%d",
+                                     inet_ntoa(saddr.sin_addr),
+                                     ntohs(saddr.sin_port));
     return 0;
+
 }
 
 static int net_socket_udp_init(NetClientState *peer,
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
     stored->has_udp = true;
     stored->udp = g_strdup(rhost);
 
+    g_free(s->nc.info_str);
+    s->nc.info_str = g_strdup_printf("socket: udp=%s:%d",
+                                     inet_ntoa(raddr.sin_addr),
+                                     ntohs(raddr.sin_port));
     return 0;
 }
 
diff --git a/net/tap-win32.c b/net/tap-win32.c
index XXXXXXX..XXXXXXX 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -XXX,XX +XXX,XX @@ static int tap_win32_init(NetClientState *peer, const char *model,
     stored->has_ifname = true;
     stored->ifname = g_strdup(ifname);
 
+    s->nc.info_str = g_strdup_printf("tap: ifname=%s", ifname);
+
     s->handle = handle;
 
     qemu_add_wait_object(s->handle->tap_semaphore, tap_win32_send, s);
diff --git a/net/tap.c b/net/tap.c
index XXXXXXX..XXXXXXX 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -XXX,XX +XXX,XX @@ int net_init_bridge(const Netdev *netdev, const char *name,
         stored->helper = g_strdup(helper);
     }
 
+    s->nc.info_str = g_strdup_printf("helper=%s,br=%s", helper, br);
+
     return 0;
 }
 
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
             stored->fds = g_strdup_printf("%s:%d", stored->fds, fd);
             g_free(tmp_s);
         }
+
+        s->nc.info_str = g_strdup_printf("fd=%d", fd);
     } else if (tap->has_helper) {
         if (!stored->has_helper) {
             stored->has_helper = true;
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
             stored->br = tap->has_br ? g_strdup(tap->br) :
                                        g_strdup(DEFAULT_BRIDGE_INTERFACE);
         }
+
+        s->nc.info_str = g_strdup_printf("helper=%s", tap->helper);
     } else {
         if (ifname && !stored->has_ifname) {
             stored->has_ifname = true;
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
             stored->downscript = g_strdup(downscript);
         }
 
+        s->nc.info_str = g_strdup_printf("ifname=%s,script=%s,downscript=%s",
+                                         ifname, script, downscript);
+
         if (strcmp(downscript, "no") != 0) {
             snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
             snprintf(s->down_script_arg, sizeof(s->down_script_arg),
diff --git a/net/vde.c b/net/vde.c
index XXXXXXX..XXXXXXX 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -XXX,XX +XXX,XX @@ static int net_vde_init(NetClientState *peer, const char *model,
 
     nc = qemu_new_net_client(&net_vde_info, peer, model, name);
 
+    nc->info_str = g_strdup_printf("sock=%s,fd=%d", sock, vde_datafd(vde));
+
     s = DO_UPCAST(VDEState, nc, nc);
 
     s->vde = vde;
diff --git a/net/vhost-user.c b/net/vhost-user.c
index XXXXXXX..XXXXXXX 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -XXX,XX +XXX,XX @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
     user = g_new0(struct VhostUserState, 1);
     for (i = 0; i < queues; i++) {
         nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name);
+        nc->info_str = g_strdup_printf("vhost-user%d to %s", i, chr->label);
         nc->queue_index = i;
         if (!nc0) {
             nc0 = nc;
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index XXXXXXX..XXXXXXX 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -XXX,XX +XXX,XX @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
     stored->has_queues = true;
     stored->queues = 1; /* TODO: change when support multiqueue */
 
+    nc->info_str = g_strdup_printf(TYPE_VHOST_VDPA);
     nc->queue_index = 0;
     s = DO_UPCAST(VhostVDPAState, nc, nc);
     vdpa_device_fd = qemu_open_old(vhostdev, O_RDWR);
-- 
2.7.4

Several issues has been reported for query-netdev info
series. Consider it's late in the rc, this reverts commit
a0724776c5a98a08fc946bb5a4ad16410ca64c0e.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 include/qapi/hmp-output-visitor.h |  30 ------
 net/net.c                         |  31 +-----
 qapi/hmp-output-visitor.c         | 193 --------------------------------------
 qapi/meson.build                  |   1 -
 4 files changed, 1 insertion(+), 254 deletions(-)
 delete mode 100644 include/qapi/hmp-output-visitor.h
 delete mode 100644 qapi/hmp-output-visitor.c

diff --git a/include/qapi/hmp-output-visitor.h b/include/qapi/hmp-output-visitor.h
deleted file mode 100644
index XXXXXXX..XXXXXXX
--- a/include/qapi/hmp-output-visitor.h
+++ /dev/null
@@ -XXX,XX +XXX,XX @@
-/*
- * HMP string output Visitor
- *
- * Copyright Yandex N.V., 2021
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#ifndef HMP_OUTPUT_VISITOR_H
-#define HMP_OUTPUT_VISITOR_H
-
-#include "qapi/visitor.h"
-
-typedef struct HMPOutputVisitor HMPOutputVisitor;
-
-/**
- * Create a HMP string output visitor for @obj
- *
- * Flattens dicts/structures, only shows arrays borders.
- *
- * Errors are not expected to happen.
- *
- * The caller is responsible for freeing the visitor with
- * visit_free().
- */
-Visitor *hmp_output_visitor_new(char **result);
-
-#endif
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 @@
 #include "sysemu/sysemu.h"
 #include "net/filter.h"
 #include "qapi/string-output-visitor.h"
-#include "qapi/hmp-output-visitor.h"
 
 /* Net bridge is currently not supported for W32. */
 #if !defined(_WIN32)
@@ -XXX,XX +XXX,XX @@ static void netfilter_print_info(Monitor *mon, NetFilterState *nf)
     monitor_printf(mon, "\n");
 }
 
-static char *generate_info_str(NetClientState *nc)
-{
-    NetdevInfo *ni = nc->stored_config;
-    char *ret_out = NULL;
-    Visitor *v;
-
-    /* Use legacy field info_str for NIC and hubports */
-    if ((nc->info->type == NET_CLIENT_DRIVER_NIC) ||
-        (nc->info->type == NET_CLIENT_DRIVER_HUBPORT)) {
-        return g_strdup(nc->info_str ? nc->info_str : "");
-    }
-
-    if (!ni) {
-        return g_malloc0(1);
-    }
-
-    v = hmp_output_visitor_new(&ret_out);
-    if (visit_type_NetdevInfo(v, "", &ni, NULL)) {
-        visit_complete(v, &ret_out);
-    }
-    visit_free(v);
-
-    return ret_out;
-}
-
 void print_net_client(Monitor *mon, NetClientState *nc)
 {
     NetFilterState *nf;
-    char *info_str = generate_info_str(nc);
 
     monitor_printf(mon, "%s: index=%d,type=%s,%s\n", nc->name,
                    nc->queue_index,
                    NetClientDriver_str(nc->info->type),
-                   info_str);
-    g_free(info_str);
-
+                   nc->info_str ? nc->info_str : "");
     if (!QTAILQ_EMPTY(&nc->filters)) {
         monitor_printf(mon, "filters:\n");
     }
diff --git a/qapi/hmp-output-visitor.c b/qapi/hmp-output-visitor.c
deleted file mode 100644
index XXXXXXX..XXXXXXX
--- a/qapi/hmp-output-visitor.c
+++ /dev/null
@@ -XXX,XX +XXX,XX @@
-/*
- * HMP string output Visitor
- *
- * Copyright Yandex N.V., 2021
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qemu/cutils.h"
-#include "qapi/hmp-output-visitor.h"
-#include "qapi/visitor-impl.h"
-
-struct HMPOutputVisitor {
-    Visitor visitor;
-    char **result;
-    GString *buffer;
-    bool is_continue;
-};
-
-static HMPOutputVisitor *to_hov(Visitor *v)
-{
-    return container_of(v, HMPOutputVisitor, visitor);
-}
-
-static void hmp_output_append_formatted(Visitor *v, const char *fmt, ...)
-{
-    HMPOutputVisitor *ov = to_hov(v);
-    va_list args;
-
-    if (ov->is_continue) {
-        g_string_append(ov->buffer, ",");
-    } else {
-        ov->is_continue = true;
-    }
-
-    va_start(args, fmt);
-    g_string_append_vprintf(ov->buffer, fmt, args);
-    va_end(args);
-}
-
-static void hmp_output_skip_comma(Visitor *v)
-{
-    HMPOutputVisitor *ov = to_hov(v);
-
-    ov->is_continue = false;
-}
-
-static bool hmp_output_start_struct(Visitor *v, const char *name,
-                                    void **obj, size_t unused, Error **errp)
-{
-    return true;
-}
-
-static void hmp_output_end_struct(Visitor *v, void **obj) {}
-
-static bool hmp_output_start_list(Visitor *v, const char *name,
-                                  GenericList **listp, size_t size,
-                                  Error **errp)
-{
-    hmp_output_append_formatted(v, "%s=[", name);
-    /* First element in array without comma before it */
-    hmp_output_skip_comma(v);
-
-    return true;
-}
-
-static GenericList *hmp_output_next_list(Visitor *v, GenericList *tail,
-                                         size_t size)
-{
-    return tail->next;
-}
-
-static void hmp_output_end_list(Visitor *v, void **obj)
-{
-    /* Don't need comma after last array element */
-    hmp_output_skip_comma(v);
-    hmp_output_append_formatted(v, "]");
-}
-
-static bool hmp_output_type_int64(Visitor *v, const char *name,
-                                  int64_t *obj, Error **errp)
-{
-    hmp_output_append_formatted(v, "%s=%" PRId64, name, *obj);
-
-    return true;
-}
-
-static bool hmp_output_type_uint64(Visitor *v, const char *name,
-                                   uint64_t *obj, Error **errp)
-{
-    hmp_output_append_formatted(v, "%s=%" PRIu64, name, *obj);
-
-    return true;
-}
-
-static bool hmp_output_type_bool(Visitor *v, const char *name, bool *obj,
-                                 Error **errp)
-{
-    hmp_output_append_formatted(v, "%s=%s", name, *obj ? "true" : "false");
-
-    return true;
-}
-
-static bool hmp_output_type_str(Visitor *v, const char *name, char **obj,
-                                Error **errp)
-{
-    /* Skip already printed or unused fields */
-    if (!*obj || g_str_equal(name, "id") || g_str_equal(name, "type")) {
-        return true;
-    }
-
-    /* Do not print stub name for StringList elements */
-    if (g_str_equal(name, "str")) {
-        hmp_output_append_formatted(v, "%s", *obj);
-    } else {
-        hmp_output_append_formatted(v, "%s=%s", name, *obj);
-    }
-
-    return true;
-}
-
-static bool hmp_output_type_number(Visitor *v, const char *name,
-                                   double *obj, Error **errp)
-{
-    hmp_output_append_formatted(v, "%s=%.17g", name, *obj);
-
-    return true;
-}
-
-/* TODO: remove this function? */
-static bool hmp_output_type_any(Visitor *v, const char *name,
-                                QObject **obj, Error **errp)
-{
-    return true;
-}
-
-static bool hmp_output_type_null(Visitor *v, const char *name,
-                                 QNull **obj, Error **errp)
-{
-    hmp_output_append_formatted(v, "%s=NULL", name);
-
-    return true;
-}
-
-static void hmp_output_complete(Visitor *v, void *opaque)
-{
-    HMPOutputVisitor *ov = to_hov(v);
-
-    *ov->result = g_string_free(ov->buffer, false);
-    ov->buffer = NULL;
-}
-
-static void hmp_output_free(Visitor *v)
-{
-    HMPOutputVisitor *ov = to_hov(v);
-
-    if (ov->buffer) {
-        g_string_free(ov->buffer, true);
-    }
-    g_free(v);
-}
-
-Visitor *hmp_output_visitor_new(char **result)
-{
-    HMPOutputVisitor *v;
-
-    v = g_malloc0(sizeof(*v));
-
-    v->visitor.type = VISITOR_OUTPUT;
-    v->visitor.start_struct = hmp_output_start_struct;
-    v->visitor.end_struct = hmp_output_end_struct;
-    v->visitor.start_list = hmp_output_start_list;
-    v->visitor.next_list = hmp_output_next_list;
-    v->visitor.end_list = hmp_output_end_list;
-    v->visitor.type_int64 = hmp_output_type_int64;
-    v->visitor.type_uint64 = hmp_output_type_uint64;
-    v->visitor.type_bool = hmp_output_type_bool;
-    v->visitor.type_str = hmp_output_type_str;
-    v->visitor.type_number = hmp_output_type_number;
-    v->visitor.type_any = hmp_output_type_any;
-    v->visitor.type_null = hmp_output_type_null;
-    v->visitor.complete = hmp_output_complete;
-    v->visitor.free = hmp_output_free;
-
-    v->result = result;
-    v->buffer = g_string_new("");
-    v->is_continue = false;
-
-    return &v->visitor;
-}
diff --git a/qapi/meson.build b/qapi/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -XXX,XX +XXX,XX @@ util_ss.add(files(
   'qobject-output-visitor.c',
   'string-input-visitor.c',
   'string-output-visitor.c',
-  'hmp-output-visitor.c',
 ))
 if have_system or have_tools
   util_ss.add(files(
-- 
2.7.4

Several issues has been reported for query-netdev info
series. Consider it's late in the rc, this reverts commit
commit 59b5437eb732d6b103a9bc279c3482c834d1eff9.

diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@@ -XXX,XX +XXX,XX @@ static int net_init(struct XenLegacyDevice *xendev)
     netdev->nic = qemu_new_nic(&net_xen_info, &netdev->conf,
                                "xen", NULL, netdev);
 
-    qemu_get_queue(netdev->nic)->info_str = g_strdup_printf(
-        "nic: xenbus vif macaddr=%s", netdev->mac);
+    snprintf(qemu_get_queue(netdev->nic)->info_str,
+             sizeof(qemu_get_queue(netdev->nic)->info_str),
+             "nic: xenbus vif macaddr=%s", netdev->mac);
 
     /* fill info */
     xenstore_write_be_int(&netdev->xendev, "feature-rx-copy", 1);
diff --git a/include/net/net.h b/include/net/net.h
index XXXXXXX..XXXXXXX 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -XXX,XX +XXX,XX @@ struct NetClientState {
     NetQueue *incoming_queue;
     char *model;
     char *name;
-    char *info_str;
+    char info_str[256];
     NetdevInfo *stored_config;
     unsigned receive_disabled : 1;
     NetClientDestructor *destructor;
diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index XXXXXXX..XXXXXXX 100644
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -XXX,XX +XXX,XX @@ int net_init_l2tpv3(const Netdev *netdev,
     QAPI_CLONE_MEMBERS(NetdevL2TPv3Options,
                        &nc->stored_config->u.l2tpv3, l2tpv3);
 
-    s->nc.info_str = g_strdup_printf("l2tpv3: connected");
+    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+             "l2tpv3: connected");
     return 0;
 outerr:
     qemu_del_net_client(nc);
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 @@ char *qemu_mac_strdup_printf(const uint8_t *macaddr)
 
 void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6])
 {
-    g_free(nc->info_str);
-    nc->info_str = g_strdup_printf(
-        "model=%s,macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
-        nc->model,
-        macaddr[0], macaddr[1], macaddr[2],
-        macaddr[3], macaddr[4], macaddr[5]);
+    snprintf(nc->info_str, sizeof(nc->info_str),
+             "model=%s,macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
+             nc->model,
+             macaddr[0], macaddr[1], macaddr[2],
+             macaddr[3], macaddr[4], macaddr[5]);
 }
 
 static int mac_table[256] = {0};
@@ -XXX,XX +XXX,XX @@ static void qemu_free_net_client(NetClientState *nc)
     }
     g_free(nc->name);
     g_free(nc->model);
-    g_free(nc->info_str);
     qapi_free_NetdevInfo(nc->stored_config);
     if (nc->destructor) {
         nc->destructor(nc);
@@ -XXX,XX +XXX,XX @@ void print_net_client(Monitor *mon, NetClientState *nc)
     monitor_printf(mon, "%s: index=%d,type=%s,%s\n", nc->name,
                    nc->queue_index,
                    NetClientDriver_str(nc->info->type),
-                   nc->info_str ? nc->info_str : "");
+                   nc->info_str);
     if (!QTAILQ_EMPTY(&nc->filters)) {
         monitor_printf(mon, "filters:\n");
     }
diff --git a/net/slirp.c b/net/slirp.c
index XXXXXXX..XXXXXXX 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -XXX,XX +XXX,XX @@ static int net_slirp_init(NetClientState *peer, const char *model,
         stored->tftp_server_name = g_strdup(tftp_server_name);
     }
 
-    nc->info_str = g_strdup_printf("net=%s,restrict=%s", inet_ntoa(net),
-                                   restricted ? "on" : "off");
+    snprintf(nc->info_str, sizeof(nc->info_str),
+             "net=%s,restrict=%s", inet_ntoa(net),
+             restricted ? "on" : "off");
 
     s = DO_UPCAST(SlirpState, nc, nc);
 
diff --git a/net/socket.c b/net/socket.c
index XXXXXXX..XXXXXXX 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -XXX,XX +XXX,XX @@ static void net_socket_send(void *opaque)
         s->fd = -1;
         net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
         s->nc.link_down = true;
-        g_free(s->nc.info_str);
-        s->nc.info_str = g_new0(char, 1);
+        memset(s->nc.info_str, 0, sizeof(s->nc.info_str));
 
         return;
     }
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
         stored->mcast = g_strdup(mcast);
 
         s->dgram_dst = saddr;
-        nc->info_str = g_strdup_printf("socket: fd=%d (cloned mcast=%s:%d)",
-                                       fd, inet_ntoa(saddr.sin_addr),
-                                       ntohs(saddr.sin_port));
+        snprintf(nc->info_str, sizeof(nc->info_str),
+                 "socket: fd=%d (cloned mcast=%s:%d)",
+                 fd, inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
     } else {
         if (sa_type == SOCKET_ADDRESS_TYPE_UNIX) {
             s->dgram_dst.sin_family = AF_UNIX;
         }
 
-        nc->info_str = g_strdup_printf("socket: fd=%d %s",
-                                       fd, SocketAddressType_str(sa_type));
+        snprintf(nc->info_str, sizeof(nc->info_str),
+                 "socket: fd=%d %s", fd, SocketAddressType_str(sa_type));
     }
 
     return s;
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
 
     nc = qemu_new_net_client(&net_socket_info, peer, model, name);
 
-    nc->info_str = g_strdup_printf("socket: fd=%d", fd);
+    snprintf(nc->info_str, sizeof(nc->info_str), "socket: fd=%d", fd);
 
     s = DO_UPCAST(NetSocketState, nc, nc);
 
@@ -XXX,XX +XXX,XX @@ static void net_socket_accept(void *opaque)
     stored->has_fd = true;
     stored->fd = g_strdup_printf("%d", fd);
 
-    g_free(s->nc.info_str);
-    s->nc.info_str = g_strdup_printf("socket: connection from %s:%d",
-                                     inet_ntoa(saddr.sin_addr),
-                                     ntohs(saddr.sin_port));
+    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+             "socket: connection from %s:%d",
+             inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
 }
 
 static int net_socket_listen_init(NetClientState *peer,
@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
     stored->has_connect = true;
     stored->connect = g_strdup(host_str);
 
-    g_free(s->nc.info_str);
-    s->nc.info_str = g_strdup_printf("socket: connect to %s:%d",
-                                     inet_ntoa(saddr.sin_addr),
-                                     ntohs(saddr.sin_port));
+    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+             "socket: connect to %s:%d",
+             inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
     return 0;
 }
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
         stored->localaddr = g_strdup(localaddr_str);
     }
 
-    g_free(s->nc.info_str);
-    s->nc.info_str = g_strdup_printf("socket: mcast=%s:%d",
-                                     inet_ntoa(saddr.sin_addr),
-                                     ntohs(saddr.sin_port));
+    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+             "socket: mcast=%s:%d",
+             inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
     return 0;
 
 }
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
     stored->has_udp = true;
     stored->udp = g_strdup(rhost);
 
-    g_free(s->nc.info_str);
-    s->nc.info_str = g_strdup_printf("socket: udp=%s:%d",
-                                     inet_ntoa(raddr.sin_addr),
-                                     ntohs(raddr.sin_port));
+    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+             "socket: udp=%s:%d",
+             inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port));
     return 0;
 }
 
diff --git a/net/tap-win32.c b/net/tap-win32.c
index XXXXXXX..XXXXXXX 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -XXX,XX +XXX,XX @@ static int tap_win32_init(NetClientState *peer, const char *model,
     stored->has_ifname = true;
     stored->ifname = g_strdup(ifname);
 
-    s->nc.info_str = g_strdup_printf("tap: ifname=%s", ifname);
+    snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+             "tap: ifname=%s", ifname);
 
     s->handle = handle;
 
diff --git a/net/tap.c b/net/tap.c
index XXXXXXX..XXXXXXX 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -XXX,XX +XXX,XX @@ int net_init_bridge(const Netdev *netdev, const char *name,
         stored->helper = g_strdup(helper);
     }
 
-    s->nc.info_str = g_strdup_printf("helper=%s,br=%s", helper, br);
+    snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s", helper,
+             br);
 
     return 0;
 }
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
             g_free(tmp_s);
         }
 
-        s->nc.info_str = g_strdup_printf("fd=%d", fd);
+        snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
     } else if (tap->has_helper) {
         if (!stored->has_helper) {
             stored->has_helper = true;
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
                                        g_strdup(DEFAULT_BRIDGE_INTERFACE);
         }
 
-        s->nc.info_str = g_strdup_printf("helper=%s", tap->helper);
+        snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s",
+                 tap->helper);
     } else {
         if (ifname && !stored->has_ifname) {
             stored->has_ifname = true;
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
             stored->downscript = g_strdup(downscript);
         }
 
-        s->nc.info_str = g_strdup_printf("ifname=%s,script=%s,downscript=%s",
-                                         ifname, script, downscript);
+        snprintf(s->nc.info_str, sizeof(s->nc.info_str),
+                 "ifname=%s,script=%s,downscript=%s", ifname, script,
+                 downscript);
 
         if (strcmp(downscript, "no") != 0) {
             snprintf(s->down_script, sizeof(s->down_script), "%s", downscript);
diff --git a/net/vde.c b/net/vde.c
index XXXXXXX..XXXXXXX 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -XXX,XX +XXX,XX @@ static int net_vde_init(NetClientState *peer, const char *model,
 
     nc = qemu_new_net_client(&net_vde_info, peer, model, name);
 
-    nc->info_str = g_strdup_printf("sock=%s,fd=%d", sock, vde_datafd(vde));
+    snprintf(nc->info_str, sizeof(nc->info_str), "sock=%s,fd=%d",
+             sock, vde_datafd(vde));
 
     s = DO_UPCAST(VDEState, nc, nc);
 
diff --git a/net/vhost-user.c b/net/vhost-user.c
index XXXXXXX..XXXXXXX 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -XXX,XX +XXX,XX @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
     user = g_new0(struct VhostUserState, 1);
     for (i = 0; i < queues; i++) {
         nc = qemu_new_net_client(&net_vhost_user_info, peer, device, name);
-        nc->info_str = g_strdup_printf("vhost-user%d to %s", i, chr->label);
+        snprintf(nc->info_str, sizeof(nc->info_str), "vhost-user%d to %s",
+                 i, chr->label);
         nc->queue_index = i;
         if (!nc0) {
             nc0 = nc;
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index XXXXXXX..XXXXXXX 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -XXX,XX +XXX,XX @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
     stored->has_queues = true;
     stored->queues = 1; /* TODO: change when support multiqueue */
 
-    nc->info_str = g_strdup_printf(TYPE_VHOST_VDPA);
+    snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA);
     nc->queue_index = 0;
     s = DO_UPCAST(VhostVDPAState, nc, nc);
     vdpa_device_fd = qemu_open_old(vhostdev, O_RDWR);
-- 
2.7.4

Several issues has been reported for query-netdev series. Consider
it's late in the rc, this reverts commit
3c3b656885473ef0d699290ba966177f17839aa5.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 tests/qtest/meson.build         |   3 -
 tests/qtest/test-query-netdev.c | 120 ----------------------------------------
 2 files changed, 123 deletions(-)
 delete mode 100644 tests/qtest/test-query-netdev.c

diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -XXX,XX +XXX,XX @@ qtests_generic = \
 if config_host.has_key('CONFIG_MODULES')
   qtests_generic += [ 'modules-test' ]
 endif
-if slirp.found()
-  qtests_generic += [ 'test-query-netdev' ]
-endif
 
 qtests_pci = \
   (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) +                  \
diff --git a/tests/qtest/test-query-netdev.c b/tests/qtest/test-query-netdev.c
deleted file mode 100644
index XXXXXXX..XXXXXXX
--- a/tests/qtest/test-query-netdev.c
+++ /dev/null
@@ -XXX,XX +XXX,XX @@
-/*
- * QTest testcase for the query-netdev
- *
- * Copyright Yandex N.V., 2019
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-
-#include "libqos/libqtest.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-
-/*
- * Events can get in the way of responses we are actually waiting for.
- */
-GCC_FMT_ATTR(2, 3)
-static QObject *wait_command(QTestState *who, const char *command, ...)
-{
-    va_list ap;
-    QDict *response;
-    QObject *result;
-
-    va_start(ap, command);
-    qtest_qmp_vsend(who, command, ap);
-    va_end(ap);
-
-    response = qtest_qmp_receive(who);
-
-    result = qdict_get(response, "return");
-    g_assert(result);
-    qobject_ref(result);
-    qobject_unref(response);
-
-    return result;
-}
-
-static void qmp_query_netdev_no_error(QTestState *qts, size_t netdevs_count)
-{
-    QObject *resp;
-    QList *netdevs;
-
-    resp = wait_command(qts, "{'execute': 'query-netdev'}");
-
-    netdevs = qobject_to(QList, resp);
-    g_assert(netdevs);
-    g_assert(qlist_size(netdevs) == netdevs_count);
-
-    qobject_unref(resp);
-}
-
-static void test_query_netdev(void)
-{
-    const char *arch = qtest_get_arch();
-    QObject *resp;
-    QTestState *state;
-
-    /* Choosing machine for platforms without default one */
-    if (g_str_equal(arch, "arm") ||
-        g_str_equal(arch, "aarch64")) {
-        state = qtest_init(
-            "-nodefaults "
-            "-M virt "
-            "-netdev user,id=slirp0");
-    } else if (g_str_equal(arch, "tricore")) {
-        state = qtest_init(
-            "-nodefaults "
-            "-M tricore_testboard "
-            "-netdev user,id=slirp0");
-    } else if (g_str_equal(arch, "avr")) {
-        state = qtest_init(
-            "-nodefaults "
-            "-M mega2560 "
-            "-netdev user,id=slirp0");
-    } else if (g_str_equal(arch, "rx")) {
-        state = qtest_init(
-            "-nodefaults "
-            "-M gdbsim-r5f562n8 "
-            "-netdev user,id=slirp0");
-    } else {
-        state = qtest_init(
-            "-nodefaults "
-            "-netdev user,id=slirp0");
-    }
-    g_assert(state);
-
-    qmp_query_netdev_no_error(state, 1);
-
-    resp = wait_command(state,
-        "{'execute': 'netdev_add', 'arguments': {"
-        " 'id': 'slirp1',"
-        " 'type': 'user'}}");
-    qobject_unref(resp);
-
-    qmp_query_netdev_no_error(state, 2);
-
-    resp = wait_command(state,
-        "{'execute': 'netdev_del', 'arguments': {"
-        " 'id': 'slirp1'}}");
-    qobject_unref(resp);
-
-    qmp_query_netdev_no_error(state, 1);
-
-    qtest_quit(state);
-}
-
-int main(int argc, char **argv)
-{
-    int ret = 0;
-    g_test_init(&argc, &argv, NULL);
-
-    qtest_add_func("/net/qapi/query_netdev", test_query_netdev);
-
-    ret = g_test_run();
-
-    return ret;
-}
-- 
2.7.4

Several issues has been reported for query-netdev series. Consider
it's late in the rc, this reverts commit
d32ad10a14d46dfe9304e3ed5858a11dcd5c71a0.

diff --git a/include/net/net.h b/include/net/net.h
index XXXXXXX..XXXXXXX 100644
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -XXX,XX +XXX,XX @@
 #include "qapi/qapi-types-net.h"
 #include "net/queue.h"
 #include "hw/qdev-properties-system.h"
-#include "qapi/clone-visitor.h"
-#include "qapi/qapi-visit-net.h"
 
 #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X"
 #define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \
@@ -XXX,XX +XXX,XX @@ struct NetClientState {
     char *model;
     char *name;
     char info_str[256];
-    NetdevInfo *stored_config;
     unsigned receive_disabled : 1;
     NetClientDestructor *destructor;
     unsigned int queue_index;
diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index XXXXXXX..XXXXXXX 100644
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -XXX,XX +XXX,XX @@ int net_init_l2tpv3(const Netdev *netdev,
 
     l2tpv3_read_poll(s, true);
 
-    /* Store startup parameters */
-    nc->stored_config = g_new0(NetdevInfo, 1);
-    nc->stored_config->type = NET_BACKEND_L2TPV3;
-
-    QAPI_CLONE_MEMBERS(NetdevL2TPv3Options,
-                       &nc->stored_config->u.l2tpv3, l2tpv3);
-
     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
              "l2tpv3: connected");
     return 0;
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 @@
 #include "monitor/monitor.h"
 #include "qemu/help_option.h"
 #include "qapi/qapi-commands-net.h"
+#include "qapi/qapi-visit-net.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
@@ -XXX,XX +XXX,XX @@ static void qemu_free_net_client(NetClientState *nc)
     }
     g_free(nc->name);
     g_free(nc->model);
-    qapi_free_NetdevInfo(nc->stored_config);
     if (nc->destructor) {
         nc->destructor(nc);
     }
@@ -XXX,XX +XXX,XX @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name, const char *name,
     return filter_list;
 }
 
-NetdevInfoList *qmp_query_netdev(Error **errp)
-{
-    NetdevInfoList *list = NULL;
-    NetClientState *nc;
-
-    QTAILQ_FOREACH(nc, &net_clients, next) {
-        /*
-         * Only look at netdevs (backend network devices), not for each queue
-         * or NIC / hubport
-         */
-        if (nc->stored_config) {
-            NetdevInfo *element = QAPI_CLONE(NetdevInfo, nc->stored_config);
-
-            g_free(element->id); /* Need to dealloc empty id after clone */
-            element->id = g_strdup(nc->name);
-
-            element->has_peer_id = nc->peer != NULL;
-            if (element->has_peer_id) {
-                element->peer_id = g_strdup(nc->peer->name);
-            }
-
-            QAPI_LIST_PREPEND(list, element);
-        }
-    }
-
-    return list;
-}
-
 void hmp_info_network(Monitor *mon, const QDict *qdict)
 {
     NetClientState *nc, *peer;
diff --git a/net/netmap.c b/net/netmap.c
index XXXXXXX..XXXXXXX 100644
--- a/net/netmap.c
+++ b/net/netmap.c
@@ -XXX,XX +XXX,XX @@ int net_init_netmap(const Netdev *netdev,
     pstrcpy(s->ifname, sizeof(s->ifname), netmap_opts->ifname);
     netmap_read_poll(s, true); /* Initially only poll for reads. */
 
-    /* Store startup parameters */
-    nc->stored_config = g_new0(NetdevInfo, 1);
-    nc->stored_config->type = NET_BACKEND_NETMAP;
-
-    QAPI_CLONE_MEMBERS(NetdevNetmapOptions,
-                       &nc->stored_config->u.netmap, netmap_opts);
-
     return 0;
 }
 
diff --git a/net/slirp.c b/net/slirp.c
index XXXXXXX..XXXXXXX 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -XXX,XX +XXX,XX @@ static int net_slirp_init(NetClientState *peer, const char *model,
     int shift;
     char *end;
     struct slirp_config_str *config;
-    NetdevUserOptions *stored;
-    StringList **stored_hostfwd;
-    StringList **stored_guestfwd;
 
     if (!ipv4 && (vnetwork || vhost || vnameserver)) {
         error_setg(errp, "IPv4 disabled but netmask/host/dns provided");
@@ -XXX,XX +XXX,XX @@ static int net_slirp_init(NetClientState *peer, const char *model,
 
     nc = qemu_new_net_client(&net_slirp_info, peer, model, name);
 
-    /* Store startup parameters */
-    nc->stored_config = g_new0(NetdevInfo, 1);
-    nc->stored_config->type = NET_BACKEND_USER;
-    stored = &nc->stored_config->u.user;
-
-    if (vhostname) {
-        stored->has_hostname = true;
-        stored->hostname = g_strdup(vhostname);
-    }
-
-    stored->has_q_restrict = true;
-    stored->q_restrict = restricted;
-
-    stored->has_ipv4 = true;
-    stored->ipv4 = ipv4;
-
-    stored->has_ipv6 = true;
-    stored->ipv6 = ipv6;
-
-    if (ipv4) {
-        uint8_t *net_bytes = (uint8_t *)&net;
-        uint8_t *mask_bytes = (uint8_t *)&mask;
-
-        stored->has_net = true;
-        stored->net = g_strdup_printf("%d.%d.%d.%d/%d.%d.%d.%d",
-                                      net_bytes[0], net_bytes[1],
-                                      net_bytes[2], net_bytes[3],
-                                      mask_bytes[0], mask_bytes[1],
-                                      mask_bytes[2], mask_bytes[3]);
-
-        stored->has_host = true;
-        stored->host = g_strdup(inet_ntoa(host));
-    }
-
-    if (tftp_export) {
-        stored->has_tftp = true;
-        stored->tftp = g_strdup(tftp_export);
-    }
-
-    if (bootfile) {
-        stored->has_bootfile = true;
-        stored->bootfile = g_strdup(bootfile);
-    }
-
-    if (vdhcp_start) {
-        stored->has_dhcpstart = true;
-        stored->dhcpstart = g_strdup(vdhcp_start);
-    }
-
-    if (ipv4) {
-        stored->has_dns = true;
-        stored->dns = g_strdup(inet_ntoa(dns));
-    }
-
-    if (dnssearch) {
-        stored->has_dnssearch = true;
-        StringList **stored_list = &stored->dnssearch;
-
-        for (int i = 0; dnssearch[i]; i++) {
-            String *element = g_new0(String, 1);
-
-            element->str = g_strdup(dnssearch[i]);
-            QAPI_LIST_APPEND(stored_list, element);
-        }
-    }
-
-    if (vdomainname) {
-        stored->has_domainname = true;
-        stored->domainname = g_strdup(vdomainname);
-    }
-
-    if (ipv6) {
-        char addrstr[INET6_ADDRSTRLEN];
-        const char *res;
-
-        stored->has_ipv6_prefix = true;
-        stored->ipv6_prefix = g_strdup(vprefix6);
-
-        stored->has_ipv6_prefixlen = true;
-        stored->ipv6_prefixlen = vprefix6_len;
-
-        res = inet_ntop(AF_INET6, &ip6_host,
-                        addrstr, sizeof(addrstr));
-
-        stored->has_ipv6_host = true;
-        stored->ipv6_host = g_strdup(res);
-
-        res = inet_ntop(AF_INET6, &ip6_dns,
-                        addrstr, sizeof(addrstr));
-
-        stored->has_ipv6_dns = true;
-        stored->ipv6_dns = g_strdup(res);
-    }
-
-    if (smb_export) {
-        stored->has_smb = true;
-        stored->smb = g_strdup(smb_export);
-    }
-
-    if (vsmbserver) {
-        stored->has_smbserver = true;
-        stored->smbserver = g_strdup(vsmbserver);
-    }
-
-    if (tftp_server_name) {
-        stored->has_tftp_server_name = true;
-        stored->tftp_server_name = g_strdup(tftp_server_name);
-    }
-
     snprintf(nc->info_str, sizeof(nc->info_str),
              "net=%s,restrict=%s", inet_ntoa(net),
              restricted ? "on" : "off");
@@ -XXX,XX +XXX,XX @@ static int net_slirp_init(NetClientState *peer, const char *model,
     s->poll_notifier.notify = net_slirp_poll_notify;
     main_loop_poll_add_notifier(&s->poll_notifier);
 
-    stored_hostfwd = &stored->hostfwd;
-    stored_guestfwd = &stored->guestfwd;
-
     for (config = slirp_configs; config; config = config->next) {
-        String *element = g_new0(String, 1);
-
-        element->str = g_strdup(config->str);
         if (config->flags & SLIRP_CFG_HOSTFWD) {
             if (slirp_hostfwd(s, config->str, errp) < 0) {
                 goto error;
             }
-            stored->has_hostfwd = true;
-            QAPI_LIST_APPEND(stored_hostfwd, element);
         } else {
             if (slirp_guestfwd(s, config->str, errp) < 0) {
                 goto error;
             }
-            stored->has_guestfwd = true;
-            QAPI_LIST_APPEND(stored_guestfwd, element);
         }
     }
 #ifndef _WIN32
diff --git a/net/socket.c b/net/socket.c
index XXXXXXX..XXXXXXX 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
     NetSocketState *s;
     SocketAddress *sa;
     SocketAddressType sa_type;
-    NetdevSocketOptions *stored;
 
     sa = socket_local_address(fd, errp);
     if (!sa) {
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_dgram(NetClientState *peer,
     net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
     net_socket_read_poll(s, true);
 
-    /* Store startup parameters */
-    nc->stored_config = g_new0(NetdevInfo, 1);
-    nc->stored_config->type = NET_BACKEND_SOCKET;
-    stored = &nc->stored_config->u.socket;
-
-    stored->has_fd = true;
-    stored->fd = g_strdup_printf("%d", fd);
-
     /* mcast: save bound address as dst */
     if (is_connected && mcast != NULL) {
-        stored->has_mcast = true;
-        stored->mcast = g_strdup(mcast);
-
         s->dgram_dst = saddr;
         snprintf(nc->info_str, sizeof(nc->info_str),
                  "socket: fd=%d (cloned mcast=%s:%d)",
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
 {
     NetClientState *nc;
     NetSocketState *s;
-    NetdevSocketOptions *stored;
 
     nc = qemu_new_net_client(&net_socket_info, peer, model, name);
 
@@ -XXX,XX +XXX,XX @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
     } else {
         qemu_set_fd_handler(s->fd, NULL, net_socket_connect, s);
     }
-
-    /* Store startup parameters */
-    nc->stored_config = g_new0(NetdevInfo, 1);
-    nc->stored_config->type = NET_BACKEND_SOCKET;
-    stored = &nc->stored_config->u.socket;
-
-    stored->has_fd = true;
-    stored->fd = g_strdup_printf("%d", fd);
-
     return s;
 }
 
@@ -XXX,XX +XXX,XX @@ static void net_socket_accept(void *opaque)
     struct sockaddr_in saddr;
     socklen_t len;
     int fd;
-    NetdevSocketOptions *stored;
 
     for(;;) {
         len = sizeof(saddr);
@@ -XXX,XX +XXX,XX @@ static void net_socket_accept(void *opaque)
     s->fd = fd;
     s->nc.link_down = false;
     net_socket_connect(s);
-
-    /* Store additional startup parameters (extend net_socket_listen_init) */
-    stored = &s->nc.stored_config->u.socket;
-
-    stored->has_fd = true;
-    stored->fd = g_strdup_printf("%d", fd);
-
     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
              "socket: connection from %s:%d",
              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,
     NetSocketState *s;
     struct sockaddr_in saddr;
     int fd, ret;
-    NetdevSocketOptions *stored;
 
     if (parse_host_port(&saddr, host_str, errp) < 0) {
         return -1;
@@ -XXX,XX +XXX,XX @@ static int net_socket_listen_init(NetClientState *peer,
     net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
 
     qemu_set_fd_handler(s->listen_fd, net_socket_accept, NULL, s);
-
-    /* Store startup parameters */
-    nc->stored_config = g_new0(NetdevInfo, 1);
-    nc->stored_config->type = NET_BACKEND_SOCKET;
-    stored = &nc->stored_config->u.socket;
-
-    stored->has_listen = true;
-    stored->listen = g_strdup(host_str);
-
     return 0;
 }
 
@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
     NetSocketState *s;
     int fd, connected, ret;
     struct sockaddr_in saddr;
-    NetdevSocketOptions *stored;
 
     if (parse_host_port(&saddr, host_str, errp) < 0) {
         return -1;
@@ -XXX,XX +XXX,XX @@ static int net_socket_connect_init(NetClientState *peer,
         return -1;
     }
 
-    /* Store additional startup parameters (extend net_socket_fd_init) */
-    stored = &s->nc.stored_config->u.socket;
-
-    stored->has_connect = true;
-    stored->connect = g_strdup(host_str);
-
     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
              "socket: connect to %s:%d",
              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
     int fd;
     struct sockaddr_in saddr;
     struct in_addr localaddr, *param_localaddr;
-    NetdevSocketOptions *stored;
 
     if (parse_host_port(&saddr, host_str, errp) < 0) {
         return -1;
@@ -XXX,XX +XXX,XX @@ static int net_socket_mcast_init(NetClientState *peer,
 
     s->dgram_dst = saddr;
 
-    /* Store additional startup parameters (extend net_socket_fd_init) */
-    stored = &s->nc.stored_config->u.socket;
-
-    if (!stored->has_mcast) {
-        stored->has_mcast = true;
-        stored->mcast = g_strdup(host_str);
-    }
-
-    if (localaddr_str) {
-        stored->has_localaddr = true;
-        stored->localaddr = g_strdup(localaddr_str);
-    }
-
     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
              "socket: mcast=%s:%d",
              inet_ntoa(saddr.sin_addr), ntohs(saddr.sin_port));
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
     NetSocketState *s;
     int fd, ret;
     struct sockaddr_in laddr, raddr;
-    NetdevSocketOptions *stored;
 
     if (parse_host_port(&laddr, lhost, errp) < 0) {
         return -1;
@@ -XXX,XX +XXX,XX @@ static int net_socket_udp_init(NetClientState *peer,
 
     s->dgram_dst = raddr;
 
-    /* Store additional startup parameters (extend net_socket_fd_init) */
-    stored = &s->nc.stored_config->u.socket;
-
-    stored->has_localaddr = true;
-    stored->localaddr = g_strdup(lhost);
-
-    stored->has_udp = true;
-    stored->udp = g_strdup(rhost);
-
     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
              "socket: udp=%s:%d",
              inet_ntoa(raddr.sin_addr), ntohs(raddr.sin_port));
diff --git a/net/tap-win32.c b/net/tap-win32.c
index XXXXXXX..XXXXXXX 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -XXX,XX +XXX,XX @@ static int tap_win32_init(NetClientState *peer, const char *model,
     NetClientState *nc;
     TAPState *s;
     tap_win32_overlapped_t *handle;
-    NetdevTapOptions *stored;
 
     if (tap_win32_open(&handle, ifname) < 0) {
         printf("tap: Could not open '%s'\n", ifname);
@@ -XXX,XX +XXX,XX @@ static int tap_win32_init(NetClientState *peer, const char *model,
 
     s = DO_UPCAST(TAPState, nc, nc);
 
-    /* Store startup parameters */
-    nc->stored_config = g_new0(NetdevInfo, 1);
-    nc->stored_config->type = NET_BACKEND_TAP;
-    stored = &nc->stored_config->u.tap;
-
-    stored->has_ifname = true;
-    stored->ifname = g_strdup(ifname);
-
     snprintf(s->nc.info_str, sizeof(s->nc.info_str),
              "tap: ifname=%s", ifname);
 
diff --git a/net/tap.c b/net/tap.c
index XXXXXXX..XXXXXXX 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -XXX,XX +XXX,XX @@ int net_init_bridge(const Netdev *netdev, const char *name,
     const char *helper, *br;
     TAPState *s;
     int fd, vnet_hdr;
-    NetdevBridgeOptions *stored;
 
     assert(netdev->type == NET_CLIENT_DRIVER_BRIDGE);
     bridge = &netdev->u.bridge;
@@ -XXX,XX +XXX,XX @@ int net_init_bridge(const Netdev *netdev, const char *name,
     }
     s = net_tap_fd_init(peer, "bridge", name, fd, vnet_hdr);
 
-    /* Store startup parameters */
-    s->nc.stored_config = g_new0(NetdevInfo, 1);
-    s->nc.stored_config->type = NET_BACKEND_BRIDGE;
-    stored = &s->nc.stored_config->u.bridge;
-
-    if (br) {
-        stored->has_br = true;
-        stored->br = g_strdup(br);
-    }
-
-    if (helper) {
-        stored->has_helper = true;
-        stored->helper = g_strdup(helper);
-    }
-
     snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s,br=%s", helper,
              br);
 
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
                              const char *model, const char *name,
                              const char *ifname, const char *script,
                              const char *downscript, const char *vhostfdname,
-                             int vnet_hdr, int fd, NetdevInfo **common_stored,
-                             Error **errp)
+                             int vnet_hdr, int fd, Error **errp)
 {
     Error *err = NULL;
     TAPState *s = net_tap_fd_init(peer, model, name, fd, vnet_hdr);
     int vhostfd;
-    NetdevTapOptions *stored;
 
     tap_set_sndbuf(s->fd, tap, &err);
     if (err) {
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
         return;
     }
 
-    /* Store startup parameters */
-    if (!*common_stored) {
-        *common_stored = g_new0(NetdevInfo, 1);
-        (*common_stored)->type = NET_BACKEND_TAP;
-        s->nc.stored_config = *common_stored;
-    }
-    stored = &(*common_stored)->u.tap;
-
-    if (tap->has_sndbuf && !stored->has_sndbuf) {
-        stored->has_sndbuf = true;
-        stored->sndbuf = tap->sndbuf;
-    }
-
-    if (vnet_hdr && !stored->has_vnet_hdr) {
-        stored->has_vnet_hdr = true;
-        stored->vnet_hdr = true;
-    }
-
     if (tap->has_fd || tap->has_fds) {
-        if (!stored->has_fds) {
-            stored->has_fds = true;
-            stored->fds = g_strdup_printf("%d", fd);
-        } else {
-            char *tmp_s = stored->fds;
-            stored->fds = g_strdup_printf("%s:%d", stored->fds, fd);
-            g_free(tmp_s);
-        }
-
         snprintf(s->nc.info_str, sizeof(s->nc.info_str), "fd=%d", fd);
     } else if (tap->has_helper) {
-        if (!stored->has_helper) {
-            stored->has_helper = true;
-            stored->helper = g_strdup(tap->helper);
-        }
-
-        if (!stored->has_br) {
-            stored->has_br = true;
-            stored->br = tap->has_br ? g_strdup(tap->br) :
-                                       g_strdup(DEFAULT_BRIDGE_INTERFACE);
-        }
-
         snprintf(s->nc.info_str, sizeof(s->nc.info_str), "helper=%s",
                  tap->helper);
     } else {
-        if (ifname && !stored->has_ifname) {
-            stored->has_ifname = true;
-            stored->ifname = g_strdup(ifname);
-        }
-
-        if (script && !stored->has_script) {
-            stored->has_script = true;
-            stored->script = g_strdup(script);
-        }
-
-        if (downscript && !stored->has_downscript) {
-            stored->has_downscript = true;
-            stored->downscript = g_strdup(downscript);
-        }
-
         snprintf(s->nc.info_str, sizeof(s->nc.info_str),
                  "ifname=%s,script=%s,downscript=%s", ifname, script,
                  downscript);
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
         vhostfdname || (tap->has_vhostforce && tap->vhostforce)) {
         VhostNetOptions options;
 
-        stored->has_vhost = true;
-        stored->vhost = true;
-
-        if (tap->has_vhostforce && tap->vhostforce) {
-            stored->has_vhostforce = true;
-            stored->vhostforce = true;
-        }
-
         options.backend_type = VHOST_BACKEND_TYPE_KERNEL;
         options.net_backend = &s->nc;
         if (tap->has_poll_us) {
-            stored->has_poll_us = true;
-            stored->poll_us = tap->poll_us;
-
             options.busyloop_timeout = tap->poll_us;
         } else {
             options.busyloop_timeout = 0;
@@ -XXX,XX +XXX,XX @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
         }
         options.opaque = (void *)(uintptr_t)vhostfd;
 
-        if (!stored->has_vhostfds) {
-            stored->has_vhostfds = true;
-            stored->vhostfds = g_strdup_printf("%d", vhostfd);
-        } else {
-            char *tmp_s = stored->vhostfds;
-            stored->vhostfds = g_strdup_printf("%s:%d", stored->fds, vhostfd);
-            g_free(tmp_s);
-        }
-
         s->vhost_net = vhost_net_init(&options);
         if (!s->vhost_net) {
             if (tap->has_vhostforce && tap->vhostforce) {
@@ -XXX,XX +XXX,XX @@ int net_init_tap(const Netdev *netdev, const char *name,
     const char *vhostfdname;
     char ifname[128];
     int ret = 0;
-    NetdevInfo *common_stored = NULL; /* will store configuration */
 
     assert(netdev->type == NET_CLIENT_DRIVER_TAP);
     tap = &netdev->u.tap;
@@ -XXX,XX +XXX,XX @@ int net_init_tap(const Netdev *netdev, const char *name,
 
         net_init_tap_one(tap, peer, "tap", name, NULL,
                          script, downscript,
-                         vhostfdname, vnet_hdr, fd, &common_stored, &err);
+                         vhostfdname, vnet_hdr, fd, &err);
         if (err) {
             error_propagate(errp, err);
             close(fd);
@@ -XXX,XX +XXX,XX @@ int net_init_tap(const Netdev *netdev, const char *name,
             net_init_tap_one(tap, peer, "tap", name, ifname,
                              script, downscript,
                              tap->has_vhostfds ? vhost_fds[i] : NULL,
-                             vnet_hdr, fd, &common_stored, &err);
+                             vnet_hdr, fd, &err);
             if (err) {
                 error_propagate(errp, err);
                 ret = -1;
@@ -XXX,XX +XXX,XX @@ free_fail:
 
         net_init_tap_one(tap, peer, "bridge", name, ifname,
                          script, downscript, vhostfdname,
-                         vnet_hdr, fd, &common_stored, &err);
+                         vnet_hdr, fd, &err);
         if (err) {
             error_propagate(errp, err);
             close(fd);
@@ -XXX,XX +XXX,XX @@ free_fail:
             net_init_tap_one(tap, peer, "tap", name, ifname,
                              i >= 1 ? "no" : script,
                              i >= 1 ? "no" : downscript,
-                             vhostfdname, vnet_hdr, fd,
-                             &common_stored, &err);
+                             vhostfdname, vnet_hdr, fd, &err);
             if (err) {
                 error_propagate(errp, err);
                 close(fd);
diff --git a/net/vde.c b/net/vde.c
index XXXXXXX..XXXXXXX 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -XXX,XX +XXX,XX @@ static int net_vde_init(NetClientState *peer, const char *model,
     VDECONN *vde;
     char *init_group = (char *)group;
     char *init_sock = (char *)sock;
-    NetdevVdeOptions *stored;
 
     struct vde_open_args args = {
         .port = port,
@@ -XXX,XX +XXX,XX @@ static int net_vde_init(NetClientState *peer, const char *model,
 
     qemu_set_fd_handler(vde_datafd(s->vde), vde_to_qemu, NULL, s);
 
-    /* Store startup parameters */
-    nc->stored_config = g_new0(NetdevInfo, 1);
-    nc->stored_config->type = NET_BACKEND_VDE;
-    stored = &nc->stored_config->u.vde;
-
-    if (sock) {
-        stored->has_sock = true;
-        stored->sock = g_strdup(sock);
-    }
-
-    stored->has_port = true;
-    stored->port = port;
-
-    if (group) {
-        stored->has_group = true;
-        stored->group = g_strdup(group);
-    }
-
-    stored->has_mode = true;
-    stored->mode = mode;
-
     return 0;
 }
 
diff --git a/net/vhost-user.c b/net/vhost-user.c
index XXXXXXX..XXXXXXX 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -XXX,XX +XXX,XX @@ static void net_vhost_user_event(void *opaque, QEMUChrEvent event)
 }
 
 static int net_vhost_user_init(NetClientState *peer, const char *device,
-                               const char *name, const char *chardev,
-                               Chardev *chr, int queues)
+                               const char *name, Chardev *chr,
+                               int queues)
 {
     Error *err = NULL;
     NetClientState *nc, *nc0 = NULL;
     NetVhostUserState *s = NULL;
     VhostUserState *user;
     int i;
-    NetdevVhostUserOptions *stored;
 
     assert(name);
     assert(queues > 0);
@@ -XXX,XX +XXX,XX @@ static int net_vhost_user_init(NetClientState *peer, const char *device,
 
     assert(s->vhost_net);
 
-    /* Store startup parameters */
-    nc0->stored_config = g_new0(NetdevInfo, 1);
-    nc0->stored_config->type = NET_BACKEND_VHOST_USER;
-    stored = &nc0->stored_config->u.vhost_user;
-
-    stored->chardev = g_strdup(chardev);
-
-    stored->has_queues = true;
-    stored->queues = queues;
-
     return 0;
 
 err:
@@ -XXX,XX +XXX,XX @@ int net_init_vhost_user(const Netdev *netdev, const char *name,
         return -1;
     }
 
-    return net_vhost_user_init(peer, "vhost_user", name,
-                               vhost_user_opts->chardev, chr, queues);
+    return net_vhost_user_init(peer, "vhost_user", name, chr, queues);
 }
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index XXXXXXX..XXXXXXX 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -XXX,XX +XXX,XX @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
     VhostVDPAState *s;
     int vdpa_device_fd = -1;
     int ret = 0;
-    NetdevVhostVDPAOptions *stored;
-
     assert(name);
     nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device, name);
-
-    /* Store startup parameters */
-    nc->stored_config = g_new0(NetdevInfo, 1);
-    nc->stored_config->type = NET_BACKEND_VHOST_VDPA;
-    stored = &nc->stored_config->u.vhost_vdpa;
-
-    stored->has_vhostdev = true;
-    stored->vhostdev = g_strdup(vhostdev);
-
-    stored->has_queues = true;
-    stored->queues = 1; /* TODO: change when support multiqueue */
-
     snprintf(nc->info_str, sizeof(nc->info_str), TYPE_VHOST_VDPA);
     nc->queue_index = 0;
     s = DO_UPCAST(VhostVDPAState, nc, nc);
diff --git a/qapi/net.json b/qapi/net.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -XXX,XX +XXX,XX @@
 ##
 { 'event': 'FAILOVER_NEGOTIATED',
   'data': {'device-id': 'str'} }
-
-##
-# @NetBackend:
-#
-# Available netdev backend drivers.
-#
-# Since: 6.0
-##
-{ 'enum': 'NetBackend',
-  'data': [ 'bridge', 'l2tpv3', 'netmap', 'socket', 'tap', 'user', 'vde',
-            'vhost-user', 'vhost-vdpa' ] }
-
-##
-# @NetdevInfo:
-#
-# Configuration of a network backend device (netdev).
-#
-# @id: Device identifier.
-#
-# @type: Specify the driver used for interpreting remaining arguments.
-#
-# @peer-id: The connected frontend network device name (absent if no frontend
-#           is connected).
-#
-# Since: 6.0
-##
-{ 'union': 'NetdevInfo',
-  'base': { 'id': 'str',
-            'type': 'NetBackend',
-            '*peer-id': 'str' },
-  'discriminator': 'type',
-  'data': {
-      'bridge':     'NetdevBridgeOptions',
-      'l2tpv3':     'NetdevL2TPv3Options',
-      'netmap':     'NetdevNetmapOptions',
-      'socket':     'NetdevSocketOptions',
-      'tap':        'NetdevTapOptions',
-      'user':       'NetdevUserOptions',
-      'vde':        'NetdevVdeOptions',
-      'vhost-user': 'NetdevVhostUserOptions',
-      'vhost-vdpa': 'NetdevVhostVDPAOptions' } }
-
-##
-# @query-netdev:
-#
-# Get a list of @NetdevInfo for all virtual network backend devices (netdevs).
-#
-# Returns: a list of @NetdevInfo describing each netdev.
-#
-# Since: 6.0
-#
-# Example:
-#
-# -> { "execute": "query-netdev" }
-# <- { "return": [
-#          {
-#              "ipv6": true,
-#              "ipv4": true,
-#              "host": "10.0.2.2",
-#              "ipv6-dns": "fec0::3",
-#              "ipv6-prefix": "fec0::",
-#              "net": "10.0.2.0/255.255.255.0",
-#              "ipv6-host": "fec0::2",
-#              "type": "user",
-#              "peer-id": "net0",
-#              "dns": "10.0.2.3",
-#              "hostfwd": [
-#                  {
-#                      "str": "tcp::20004-:22"
-#                  }
-#              ],
-#              "ipv6-prefixlen": 64,
-#              "id": "netdev0",
-#              "restrict": false
-#          }
-#      ]
-#    }
-#
-##
-{ 'command': 'query-netdev', 'returns': ['NetdevInfo'] }
-- 
2.7.4

Commit 969e50b61a28 ("net: Pad short frames to minimum size before
sending from SLiRP/TAP") tries to pad frames but try to recyle the
local array that is used for padding to tap thread. This patch fixes
this by recyling the original buffer.

Fixes: 969e50b61a28 ("net: Pad short frames to minimum size before sending from SLiRP/TAP")
Tested-by: Howard Spoelstra <hsp.cat7@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/tap-win32.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/tap-win32.c b/net/tap-win32.c
index XXXXXXX..XXXXXXX 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -XXX,XX +XXX,XX @@ static ssize_t tap_receive(NetClientState *nc, const uint8_t *buf, size_t size)
 static void tap_win32_send(void *opaque)
 {
     TAPState *s = opaque;
-    uint8_t *buf;
+    uint8_t *buf, *orig_buf;
     int max_size = 4096;
     int size;
     uint8_t min_pkt[ETH_ZLEN];
@@ -XXX,XX +XXX,XX @@ static void tap_win32_send(void *opaque)
 
     size = tap_win32_read(s->handle, &buf, max_size);
     if (size > 0) {
+        orig_buf = buf;
+
         if (!s->nc.peer->do_not_pad) {
             if (eth_pad_short_frame(min_pkt, &min_pktsz, buf, size)) {
                 buf = min_pkt;
@@ -XXX,XX +XXX,XX @@ static void tap_win32_send(void *opaque)
         }
 
         qemu_send_packet(&s->nc, buf, size);
-        tap_win32_free_buffer(s->handle, buf);
+        tap_win32_free_buffer(s->handle, orig_buf);
     }
 }
 
-- 
2.7.4