[Qemu-devel] [PULL 0/5] Net patches

[Qemu-devel] [PULL 0/5] Net patches

[Stefan Hajnoczi]

The following changes since commit 959e41473f2179850578482052fb73b913bc4e42:

  slirp/arp: do not special-case bogus IP addresses (2014-06-09 01:49:28 +0200)

are available in the git repository at:

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

for you to fetch changes up to 7efea763772c815ad6220d5ea7a46447329f6015:

  e1000: remove broken support for 82573L (2014-06-09 15:38:58 +0200)

----------------------------------------------------------------
Net patches

----------------------------------------------------------------
Gabriel L. Somlo (3):
      e1000: allow command-line selection of card model
      tests: e1000: test additional device IDs
      e1000: remove broken support for 82573L

Jiri Pirko (1):
      vmxnet3: fix msix vectors unuse

Peter Crosthwaite (1):
      net: xilinx_ethlite: Fix Rx-pong interrupt

 hw/net/e1000.c          | 110 ++++++++++++++++++++++++++++++++++++------------
 hw/net/e1000_regs.h     |   6 +++
 hw/net/vmxnet3.c        |   2 +-
 hw/net/xilinx_ethlite.c |   3 +-
 tests/e1000-test.c      |  33 ++++++++++++---
 5 files changed, 117 insertions(+), 37 deletions(-)

-- 
1.9.3

Re: [Qemu-devel] [PULL 0/5] Net patches

[Peter Maydell]

On 9 June 2014 14:43, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 959e41473f2179850578482052fb73b913bc4e42:
>
>   slirp/arp: do not special-case bogus IP addresses (2014-06-09 01:49:28 +0200)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 7efea763772c815ad6220d5ea7a46447329f6015:
>
>   e1000: remove broken support for 82573L (2014-06-09 15:38:58 +0200)
>
> ----------------------------------------------------------------
> Net patches
>
Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/5] Net patches

[Stefan Hajnoczi]

The following changes since commit 86b182ac0e0b44726d85598cbefb468ed22517fc:

  Merge remote-tracking branch 'remotes/xtensa/tags/20141217-xtensa' into staging (2014-12-17 17:31:26 +0000)

are available in the git repository at:

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

for you to fetch changes up to 20302e71a5b654d7b4d0d61c7384e9dd8d112971:

  e1000: defer packets until BM enabled (2014-12-19 13:17:06 +0000)

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

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

Jason Wang (1):
  net: don't use set/get_pointer() in set/get_netdev()

Markus Armbruster (2):
  net: Fuse g_malloc(); memset() into g_new0()
  net: Use g_new() & friends where that makes obvious sense

Michael S. Tsirkin (1):
  e1000: defer packets until BM enabled

Wangkai (Kevin,C) (1):
  tap: fix vcpu long time io blocking on tap

 hw/core/qdev-properties-system.c | 82 +++++++++++++++++++++-------------------
 hw/net/e1000.c                   | 21 +++++++++-
 net/l2tpv3.c                     |  9 ++---
 net/queue.c                      |  2 +-
 net/slirp.c                      |  2 +-
 net/tap.c                        | 12 ++++++
 6 files changed, 82 insertions(+), 46 deletions(-)

-- 
2.1.0

[Qemu-devel] [PULL 1/5] tap: fix vcpu long time io blocking on tap

[Stefan Hajnoczi]

From: "Wangkai (Kevin,C)" <wangkai86@huawei.com>

[Adjusted doc comment for grammar.
--Stefan]

Signed-off-by: Wangkai <wangkai86@huawei.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/tap.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/net/tap.c b/net/tap.c
index bde6b58..1fe0edf 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -189,6 +189,7 @@ static void tap_send(void *opaque)
 {
     TAPState *s = opaque;
     int size;
+    int packets = 0;
 
     while (qemu_can_send_packet(&s->nc)) {
         uint8_t *buf = s->buf;
@@ -210,6 +211,17 @@ static void tap_send(void *opaque)
         } else if (size < 0) {
             break;
         }
+
+        /*
+         * When the host keeps receiving more packets while tap_send() is
+         * running we can hog the QEMU global mutex.  Limit the number of
+         * packets that are processed per tap_send() callback to prevent
+         * stalling the guest.
+         */
+        packets++;
+        if (packets >= 50) {
+            break;
+        }
     }
 }
 
-- 
2.1.0

[Qemu-devel] [PULL 2/5] net: don't use set/get_pointer() in set/get_netdev()

[Stefan Hajnoczi]

From: Jason Wang <jasowang@redhat.com>

Commit 1ceef9f27359cbe92ef124bf74de6f792e71f6fb (net: multiqueue
support) tries to use set_pointer() and get_pointer() to set and get
NICPeers which is not a pointer defined in DEFINE_PROP_NETDEV. This
trick works but result a unclean and fragile implementation (e.g
print_netdev and parse_netdev).

This patch solves this issue by not using set/get_pinter() and set and
get netdev directly in set_netdev() and get_netdev(). After this the
parse_netdev() and print_netdev() were no longer used and dropped from
the source.

[Renamed 'err' label to 'out' as suggested by Markus Armbruster.
--Stefan]

Cc: Markus Armbruster <armbru@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/core/qdev-properties-system.c | 82 +++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 65901ef..a2e44bd 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -177,42 +177,69 @@ PropertyInfo qdev_prop_chr = {
 };
 
 /* --- netdev device --- */
+static void get_netdev(Object *obj, Visitor *v, void *opaque,
+                       const char *name, Error **errp)
+{
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
+    char *p = g_strdup(peers_ptr->ncs[0] ? peers_ptr->ncs[0]->name : "");
 
-static int parse_netdev(DeviceState *dev, const char *str, void **ptr)
+    visit_type_str(v, &p, name, errp);
+    g_free(p);
+}
+
+static void set_netdev(Object *obj, Visitor *v, void *opaque,
+                       const char *name, Error **errp)
 {
-    NICPeers *peers_ptr = (NICPeers *)ptr;
+    DeviceState *dev = DEVICE(obj);
+    Property *prop = opaque;
+    NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);
     NetClientState **ncs = peers_ptr->ncs;
     NetClientState *peers[MAX_QUEUE_NUM];
-    int queues, i = 0;
-    int ret;
+    Error *local_err = NULL;
+    int queues, err = 0, i = 0;
+    char *str;
+
+    if (dev->realized) {
+        qdev_prop_set_after_realize(dev, name, errp);
+        return;
+    }
+
+    visit_type_str(v, &str, name, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
+        return;
+    }
 
     queues = qemu_find_net_clients_except(str, peers,
                                           NET_CLIENT_OPTIONS_KIND_NIC,
                                           MAX_QUEUE_NUM);
     if (queues == 0) {
-        ret = -ENOENT;
-        goto err;
+        err = -ENOENT;
+        goto out;
     }
 
     if (queues > MAX_QUEUE_NUM) {
-        ret = -E2BIG;
-        goto err;
+        error_setg(errp, "queues of backend '%s'(%d) exceeds QEMU limitation(%d)",
+                   str, queues, MAX_QUEUE_NUM);
+        goto out;
     }
 
     for (i = 0; i < queues; i++) {
         if (peers[i] == NULL) {
-            ret = -ENOENT;
-            goto err;
+            err = -ENOENT;
+            goto out;
         }
 
         if (peers[i]->peer) {
-            ret = -EEXIST;
-            goto err;
+            err = -EEXIST;
+            goto out;
         }
 
         if (ncs[i]) {
-            ret = -EINVAL;
-            goto err;
+            err = -EINVAL;
+            goto out;
         }
 
         ncs[i] = peers[i];
@@ -221,30 +248,9 @@ static int parse_netdev(DeviceState *dev, const char *str, void **ptr)
 
     peers_ptr->queues = queues;
 
-    return 0;
-
-err:
-    return ret;
-}
-
-static char *print_netdev(void *ptr)
-{
-    NetClientState *netdev = ptr;
-    const char *val = netdev->name ? netdev->name : "";
-
-    return g_strdup(val);
-}
-
-static void get_netdev(Object *obj, Visitor *v, void *opaque,
-                       const char *name, Error **errp)
-{
-    get_pointer(obj, v, opaque, print_netdev, name, errp);
-}
-
-static void set_netdev(Object *obj, Visitor *v, void *opaque,
-                       const char *name, Error **errp)
-{
-    set_pointer(obj, v, opaque, parse_netdev, name, errp);
+out:
+    error_set_from_qdev_prop_error(errp, err, dev, prop, str);
+    g_free(str);
 }
 
 PropertyInfo qdev_prop_netdev = {
-- 
2.1.0

[Qemu-devel] [PULL 3/5] net: Fuse g_malloc(); memset() into g_new0()

[Stefan Hajnoczi]

From: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/l2tpv3.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index 3b805a7..6014c43 100644
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -695,8 +695,7 @@ int net_init_l2tpv3(const NetClientOptions *opts,
         goto outerr;
     }
 
-    s->dgram_dst = g_malloc(sizeof(struct sockaddr_storage));
-    memset(s->dgram_dst, '\0' , sizeof(struct sockaddr_storage));
+    s->dgram_dst = g_new0(struct sockaddr_storage, 1);
     memcpy(s->dgram_dst, result->ai_addr, result->ai_addrlen);
     s->dst_size = result->ai_addrlen;
 
-- 
2.1.0

[Qemu-devel] [PULL 4/5] net: Use g_new() & friends where that makes obvious sense

[Stefan Hajnoczi]

From: Markus Armbruster <armbru@redhat.com>

g_new(T, n) is neater than g_malloc(sizeof(T) * n).  It's also safer,
for two reasons.  One, it catches multiplication overflowing size_t.
Two, it returns T * rather than void *, which lets the compiler catch
more type errors.

This commit only touches allocations with size arguments of the form
sizeof(T).

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/l2tpv3.c | 6 +++---
 net/queue.c  | 2 +-
 net/slirp.c  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/l2tpv3.c b/net/l2tpv3.c
index 6014c43..8c598b0 100644
--- a/net/l2tpv3.c
+++ b/net/l2tpv3.c
@@ -489,12 +489,12 @@ static struct mmsghdr *build_l2tpv3_vector(NetL2TPV3State *s, int count)
     struct iovec *iov;
     struct mmsghdr *msgvec, *result;
 
-    msgvec = g_malloc(sizeof(struct mmsghdr) * count);
+    msgvec = g_new(struct mmsghdr, count);
     result = msgvec;
     for (i = 0; i < count ; i++) {
         msgvec->msg_hdr.msg_name = NULL;
         msgvec->msg_hdr.msg_namelen = 0;
-        iov =  g_malloc(sizeof(struct iovec) * IOVSIZE);
+        iov =  g_new(struct iovec, IOVSIZE);
         msgvec->msg_hdr.msg_iov = iov;
         iov->iov_base = g_malloc(s->header_size);
         iov->iov_len = s->header_size;
@@ -729,7 +729,7 @@ int net_init_l2tpv3(const NetClientOptions *opts,
     }
 
     s->msgvec = build_l2tpv3_vector(s, MAX_L2TPV3_MSGCNT);
-    s->vec = g_malloc(sizeof(struct iovec) * MAX_L2TPV3_IOVCNT);
+    s->vec = g_new(struct iovec, MAX_L2TPV3_IOVCNT);
     s->header_buf = g_malloc(s->header_size);
 
     qemu_set_nonblock(fd);
diff --git a/net/queue.c b/net/queue.c
index f948318..ebbe2bb 100644
--- a/net/queue.c
+++ b/net/queue.c
@@ -62,7 +62,7 @@ NetQueue *qemu_new_net_queue(void *opaque)
 {
     NetQueue *queue;
 
-    queue = g_malloc0(sizeof(NetQueue));
+    queue = g_new0(NetQueue, 1);
 
     queue->opaque = opaque;
     queue->nq_maxlen = 10000;
diff --git a/net/slirp.c b/net/slirp.c
index 377d7ef..0cbca3c 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -652,7 +652,7 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str,
             return -1;
         }
     } else {
-        fwd = g_malloc(sizeof(struct GuestFwd));
+        fwd = g_new(struct GuestFwd, 1);
         fwd->hd = qemu_chr_new(buf, p, NULL);
         if (!fwd->hd) {
             error_report("could not open guest forwarding device '%s'", buf);
-- 
2.1.0

[Qemu-devel] [PULL 5/5] e1000: defer packets until BM enabled

[Stefan Hajnoczi]

From: "Michael S. Tsirkin" <mst@redhat.com>

Some guests seem to set BM for e1000 after
enabling RX.
If packets arrive in the window, device is wedged.
Probably works by luck on real hardware, work around
this by making can_receive depend on BM.

Tested-by: Gabriel Somlo <somlo@cmu.edu>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/e1000.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index e33a4da..89c5788 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -33,6 +33,7 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/dma.h"
 #include "qemu/iov.h"
+#include "qemu/range.h"
 
 #include "e1000_regs.h"
 
@@ -923,7 +924,9 @@ e1000_can_receive(NetClientState *nc)
     E1000State *s = qemu_get_nic_opaque(nc);
 
     return (s->mac_reg[STATUS] & E1000_STATUS_LU) &&
-        (s->mac_reg[RCTL] & E1000_RCTL_EN) && e1000_has_rxbufs(s, 1);
+        (s->mac_reg[RCTL] & E1000_RCTL_EN) &&
+        (s->parent_obj.config[PCI_COMMAND] & PCI_COMMAND_MASTER) &&
+        e1000_has_rxbufs(s, 1);
 }
 
 static uint64_t rx_desc_base(E1000State *s)
@@ -1529,6 +1532,20 @@ static NetClientInfo net_e1000_info = {
     .link_status_changed = e1000_set_link_status,
 };
 
+static void e1000_write_config(PCIDevice *pci_dev, uint32_t address,
+                                uint32_t val, int len)
+{
+    E1000State *s = E1000(pci_dev);
+
+    pci_default_write_config(pci_dev, address, val, len);
+
+    if (range_covers_byte(address, len, PCI_COMMAND) &&
+        (pci_dev->config[PCI_COMMAND] & PCI_COMMAND_MASTER)) {
+        qemu_flush_queued_packets(qemu_get_queue(s->nic));
+    }
+}
+
+
 static int pci_e1000_init(PCIDevice *pci_dev)
 {
     DeviceState *dev = DEVICE(pci_dev);
@@ -1539,6 +1556,8 @@ static int pci_e1000_init(PCIDevice *pci_dev)
     int i;
     uint8_t *macaddr;
 
+    pci_dev->config_write = e1000_write_config;
+
     pci_conf = pci_dev->config;
 
     /* TODO: RST# value should be 0, PCI spec 6.2.4 */
-- 
2.1.0

Re: [Qemu-devel] [PULL 5/5] e1000: defer packets until BM enabled

[Michael S. Tsirkin]

On Fri, Dec 19, 2014 at 01:18:24PM +0000, Stefan Hajnoczi wrote:
> From: "Michael S. Tsirkin" <mst@redhat.com>
> 
> Some guests seem to set BM for e1000 after
> enabling RX.
> If packets arrive in the window, device is wedged.
> Probably works by luck on real hardware, work around
> this by making can_receive depend on BM.
> 
> Tested-by: Gabriel Somlo <somlo@cmu.edu>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Reviewed-by: Jason Wang <jasowang@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Pls defer this.
This does not help windows as I thought it does,
no point in making changes until we have figured
it out.


> ---
>  hw/net/e1000.c | 21 ++++++++++++++++++++-
>  1 file changed, 20 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/net/e1000.c b/hw/net/e1000.c
> index e33a4da..89c5788 100644
> --- a/hw/net/e1000.c
> +++ b/hw/net/e1000.c
> @@ -33,6 +33,7 @@
>  #include "sysemu/sysemu.h"
>  #include "sysemu/dma.h"
>  #include "qemu/iov.h"
> +#include "qemu/range.h"
>  
>  #include "e1000_regs.h"
>  
> @@ -923,7 +924,9 @@ e1000_can_receive(NetClientState *nc)
>      E1000State *s = qemu_get_nic_opaque(nc);
>  
>      return (s->mac_reg[STATUS] & E1000_STATUS_LU) &&
> -        (s->mac_reg[RCTL] & E1000_RCTL_EN) && e1000_has_rxbufs(s, 1);
> +        (s->mac_reg[RCTL] & E1000_RCTL_EN) &&
> +        (s->parent_obj.config[PCI_COMMAND] & PCI_COMMAND_MASTER) &&
> +        e1000_has_rxbufs(s, 1);
>  }
>  
>  static uint64_t rx_desc_base(E1000State *s)
> @@ -1529,6 +1532,20 @@ static NetClientInfo net_e1000_info = {
>      .link_status_changed = e1000_set_link_status,
>  };
>  
> +static void e1000_write_config(PCIDevice *pci_dev, uint32_t address,
> +                                uint32_t val, int len)
> +{
> +    E1000State *s = E1000(pci_dev);
> +
> +    pci_default_write_config(pci_dev, address, val, len);
> +
> +    if (range_covers_byte(address, len, PCI_COMMAND) &&
> +        (pci_dev->config[PCI_COMMAND] & PCI_COMMAND_MASTER)) {
> +        qemu_flush_queued_packets(qemu_get_queue(s->nic));
> +    }
> +}
> +
> +
>  static int pci_e1000_init(PCIDevice *pci_dev)
>  {
>      DeviceState *dev = DEVICE(pci_dev);
> @@ -1539,6 +1556,8 @@ static int pci_e1000_init(PCIDevice *pci_dev)
>      int i;
>      uint8_t *macaddr;
>  
> +    pci_dev->config_write = e1000_write_config;
> +
>      pci_conf = pci_dev->config;
>  
>      /* TODO: RST# value should be 0, PCI spec 6.2.4 */
> -- 
> 2.1.0

Re: [Qemu-devel] [PULL 0/5] Net patches

[Peter Maydell]

On 19 December 2014 at 13:18, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 86b182ac0e0b44726d85598cbefb468ed22517fc:
>
>   Merge remote-tracking branch 'remotes/xtensa/tags/20141217-xtensa' into staging (2014-12-17 17:31:26 +0000)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 20302e71a5b654d7b4d0d61c7384e9dd8d112971:
>
>   e1000: defer packets until BM enabled (2014-12-19 13:17:06 +0000)
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/5] Net patches

[Stefan Hajnoczi]

The following changes since commit a3206972a9eab65ec8e8f9ae320ad628ba4b58f1:

  Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-06-22' into staging (2015-06-23 10:38:00 +0100)

are available in the git repository at:

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

for you to fetch changes up to 1e81aba5ac0b908ab859bf8ddf43ece33732d49c:

  net: simplify net_client_init1() (2015-06-24 16:33:42 +0100)

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

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

Stefan Hajnoczi (5):
  net: add missing "netmap" to host_net_devices[]
  net: replace net_client_init1() netdev whitelist with blacklist
  net: raise an error if -net type is invalid
  net: drop if expression that is always true
  net: simplify net_client_init1()

 net/net.c | 91 ++++++++++++++++++++++++++-------------------------------------
 1 file changed, 37 insertions(+), 54 deletions(-)

-- 
2.4.3

Re: [Qemu-devel] [PULL 0/5] Net patches

[Peter Maydell]

On 24 June 2015 at 16:37, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit a3206972a9eab65ec8e8f9ae320ad628ba4b58f1:
>
>   Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-06-22' into staging (2015-06-23 10:38:00 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 1e81aba5ac0b908ab859bf8ddf43ece33732d49c:
>
>   net: simplify net_client_init1() (2015-06-24 16:33:42 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> Stefan Hajnoczi (5):
>   net: add missing "netmap" to host_net_devices[]
>   net: replace net_client_init1() netdev whitelist with blacklist
>   net: raise an error if -net type is invalid
>   net: drop if expression that is always true
>   net: simplify net_client_init1()

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/5] Net patches

[Jason Wang]

The following changes since commit 7acbff99c6c285b3070bf0e768d56f511e2bf346:

  Update version for v2.6.0-rc1 release (2016-04-05 21:53:18 +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 e0a039e50d481dce6b4ee45a29002538a258cd89:

  filter-buffer: fix segfault when starting qemu with status=off property (2016-04-06 09:52:07 +0800)

----------------------------------------------------------------
- fix segfault when start filter with status=off
- fix large array to heap for nc_sendv_compat()
- fix OptsVisitor memory leak during net client init

----------------------------------------------------------------
Isaac Lozano (1):
      util: Improved qemu_hexmap() to include an ascii dump of the buffer

Jason Wang (1):
      rtl8139: using CP_TX_OWN for ownership transferring during tx

Paolo Bonzini (1):
      net: fix OptsVisitor memory leak

Pooja Dhannawat (1):
      net: Allocating Large sized arrays to heap

zhanghailiang (1):
      filter-buffer: fix segfault when starting qemu with status=off property

 hw/net/rtl8139.c |  2 +-
 net/filter.c     |  2 +-
 net/net.c        | 44 +++++++++++---------------------------------
 util/hexdump.c   | 33 ++++++++++++++++++++++-----------
 4 files changed, 35 insertions(+), 46 deletions(-)

Re: [Qemu-devel] [PULL 0/5] Net patches

[Peter Maydell]

On 6 April 2016 at 03:37, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit 7acbff99c6c285b3070bf0e768d56f511e2bf346:
>
>   Update version for v2.6.0-rc1 release (2016-04-05 21:53:18 +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 e0a039e50d481dce6b4ee45a29002538a258cd89:
>
>   filter-buffer: fix segfault when starting qemu with status=off property (2016-04-06 09:52:07 +0800)
>
> ----------------------------------------------------------------
> - fix segfault when start filter with status=off
> - fix large array to heap for nc_sendv_compat()
> - fix OptsVisitor memory leak during net client init
>

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/5] Net patches

[Jason Wang]

The following changes since commit 14e60aaece20a1cfc059a69f6491b0899f9257a8:

  hw/net/e1000: Don't use *_to_cpup() (2016-06-27 16:39:56 +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 c508277335e3b6b20cf18e6ea3a35c1fa835c64a:

  vmxnet3: Fix reading/writing guest memory specially when behind an IOMMU (2016-06-28 10:13:57 +0800)

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

----------------------------------------------------------------
Ashijeet Acharya (1):
      Change net/socket.c to use socket_*() functions

David Vrabel (1):
      rtl8139: save/load RxMulOk counter (again)

KarimAllah Ahmed (1):
      vmxnet3: Fix reading/writing guest memory specially when behind an IOMMU

Peter Lieven (1):
      net: fix qemu_announce_self not emitting packets

Prasad J Pandit (1):
      net: mipsnet: check transmit buffer size before sending

 hw/net/mipsnet.c       |   8 +-
 hw/net/rtl8139.c       |  40 ++++------
 hw/net/vmware_utils.h  |  55 ++++++++------
 hw/net/vmxnet3.c       | 197 +++++++++++++++++++++++++++----------------------
 include/qemu/sockets.h |  16 +++-
 net/net.c              |   2 +-
 net/socket.c           |  55 +++++++-------
 util/qemu-sockets.c    |  36 +++++++++
 8 files changed, 237 insertions(+), 172 deletions(-)

Re: [Qemu-devel] [PULL 0/5] Net patches

[Peter Maydell]

On 28 June 2016 at 04:35, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit 14e60aaece20a1cfc059a69f6491b0899f9257a8:
>
>   hw/net/e1000: Don't use *_to_cpup() (2016-06-27 16:39:56 +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 c508277335e3b6b20cf18e6ea3a35c1fa835c64a:
>
>   vmxnet3: Fix reading/writing guest memory specially when behind an IOMMU (2016-06-28 10:13:57 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/5] Net patches

[Jason Wang]

The following changes since commit 5dae13cd71f0755a1395b5a4cde635b8a6ee3f58:

  Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into staging (2017-02-14 09:55:48 +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 4154c7e03fa55b4cf52509a83d50d6c09d743b77:

  net: e1000e: fix an infinite loop issue (2017-02-15 11:18:57 +0800)

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

----------------------------------------------------------------
Li Qiang (1):
      net: e1000e: fix an infinite loop issue

Paolo Bonzini (1):
      net: e1000e: fix dead code in e1000e_write_packet_to_guest

Prasad J Pandit (1):
      net: imx: limit buffer descriptor count

Thomas Huth (1):
      net: Mark 'vlan' parameter as deprecated

Zhang Chen (1):
      colo-compare: sort TCP packet queue by sequence number

 hw/net/e1000e_core.c |  9 +++++++--
 hw/net/imx_fec.c     | 10 ++++++----
 net/colo-compare.c   | 19 +++++++++++++++++++
 net/net.c            |  6 ++++++
 4 files changed, 38 insertions(+), 6 deletions(-)

Re: [Qemu-devel] [PULL 0/5] Net patches

[Peter Maydell]

On 15 February 2017 at 03:53, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit 5dae13cd71f0755a1395b5a4cde635b8a6ee3f58:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into staging (2017-02-14 09:55:48 +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 4154c7e03fa55b4cf52509a83d50d6c09d743b77:
>
>   net: e1000e: fix an infinite loop issue (2017-02-15 11:18:57 +0800)
>
> ----------------------------------------------------------------
>
> ---------------------------------------------------------------

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/5] Net patches

[Jason Wang]

The following changes since commit 9db6ffc76676731a25a5538ab71e8ca6ac234f80:

  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2017-08-11 15:11:50 +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 131f6055f1f0eba4cd2e862a8ff907dbde4d94d1:

  qemu-doc: Mention host_net_add/-remove in the deprecation chapter (2017-08-14 10:56:47 +0800)

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

----------------------------------------------------------------
Mao Zhongyi (4):
      net/rocker: Remove the dead error handling
      net/rocker: Plug memory leak in pci_rocker_init()
      net/rocker: Convert to realize()
      net/rocker: Fix the unusual macro name

Thomas Huth (1):
      qemu-doc: Mention host_net_add/-remove in the deprecation chapter

 hw/net/rocker/rocker.c        | 94 +++++++++++--------------------------------
 hw/net/rocker/rocker_desc.c   | 10 -----
 hw/net/rocker/rocker_fp.c     |  4 --
 hw/net/rocker/rocker_of_dpa.c | 20 ---------
 hw/net/rocker/rocker_world.c  | 12 +++---
 qemu-doc.texi                 |  8 ++++
 6 files changed, 36 insertions(+), 112 deletions(-)

Re: [Qemu-devel] [PULL 0/5] Net patches

[Peter Maydell]

On 14 August 2017 at 04:33, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit 9db6ffc76676731a25a5538ab71e8ca6ac234f80:
>
>   Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2017-08-11 15:11:50 +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 131f6055f1f0eba4cd2e862a8ff907dbde4d94d1:
>
>   qemu-doc: Mention host_net_add/-remove in the deprecation chapter (2017-08-14 10:56:47 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Mao Zhongyi (4):
>       net/rocker: Remove the dead error handling
>       net/rocker: Plug memory leak in pci_rocker_init()
>       net/rocker: Convert to realize()
>       net/rocker: Fix the unusual macro name
>
> Thomas Huth (1):
>       qemu-doc: Mention host_net_add/-remove in the deprecation chapter

It's not clear to me why these should all be going into 2.10,
especially since the date for rc3 is tomorrow and that in theory
is our final rc. At this point we should only be taking patches
that are fixes for significant bugs or bugs that are regressions
since 2.9. (Docs changes are OK too.) Is there a good reason
for putting in all these rocker patches that you haven't
mentioned in the cover letter? They look like 2.11 material
just judging by the patch titles.

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/5] Net patches

[Jason Wang]

On 2017年08月14日 14:51, Peter Maydell wrote:
> On 14 August 2017 at 04:33, Jason Wang <jasowang@redhat.com> wrote:
>> The following changes since commit 9db6ffc76676731a25a5538ab71e8ca6ac234f80:
>>
>>    Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2017-08-11 15:11:50 +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 131f6055f1f0eba4cd2e862a8ff907dbde4d94d1:
>>
>>    qemu-doc: Mention host_net_add/-remove in the deprecation chapter (2017-08-14 10:56:47 +0800)
>>
>> ----------------------------------------------------------------
>>
>> ----------------------------------------------------------------
>> Mao Zhongyi (4):
>>        net/rocker: Remove the dead error handling
>>        net/rocker: Plug memory leak in pci_rocker_init()
>>        net/rocker: Convert to realize()
>>        net/rocker: Fix the unusual macro name
>>
>> Thomas Huth (1):
>>        qemu-doc: Mention host_net_add/-remove in the deprecation chapter
> It's not clear to me why these should all be going into 2.10,
> especially since the date for rc3 is tomorrow and that in theory
> is our final rc. At this point we should only be taking patches
> that are fixes for significant bugs or bugs that are regressions
> since 2.9. (Docs changes are OK too.) Is there a good reason
> for putting in all these rocker patches that you haven't
> mentioned in the cover letter? They look like 2.11 material
> just judging by the patch titles.
>
> thanks
> -- PMM

Ok, let me send a V2 and remove the rocker patches.

Thanks

[Qemu-devel] [PULL 0/5] Net patches

[Jason Wang]

The following changes since commit fff3159900d2b95613a9cb75fc3703e67a674729:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190726' into staging (2019-07-26 16:23:07 +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 f77bed14f01557596727c4eea042e9818c242049:

  net/colo-compare.c: Fix memory leak and code style issue. (2019-07-29 16:29:30 +0800)

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

----------------------------------------------------------------
Jason Wang (1):
      e1000: don't raise interrupt in pre_save()

Prasad J Pandit (3):
      qemu-bridge-helper: restrict interface name to IFNAMSIZ
      qemu-bridge-helper: move repeating code in parse_acl_file
      net: tap: replace snprintf with g_strdup_printf calls

Zhang Chen (1):
      net/colo-compare.c: Fix memory leak and code style issue.

 hw/net/e1000.c       |  8 ++------
 net/colo-compare.c   | 27 ++++++++++++++++++++-------
 net/tap.c            | 19 +++++++++++--------
 qemu-bridge-helper.c | 24 +++++++++++++++++-------
 4 files changed, 50 insertions(+), 28 deletions(-)

Re: [Qemu-devel] [PULL 0/5] Net patches

[Peter Maydell]

On Mon, 29 Jul 2019 at 09:33, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit fff3159900d2b95613a9cb75fc3703e67a674729:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190726' into staging (2019-07-26 16:23:07 +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 f77bed14f01557596727c4eea042e9818c242049:
>
>   net/colo-compare.c: Fix memory leak and code style issue. (2019-07-29 16:29:30 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Jason Wang (1):
>       e1000: don't raise interrupt in pre_save()
>
> Prasad J Pandit (3):
>       qemu-bridge-helper: restrict interface name to IFNAMSIZ
>       qemu-bridge-helper: move repeating code in parse_acl_file
>       net: tap: replace snprintf with g_strdup_printf calls
>
> Zhang Chen (1):
>       net/colo-compare.c: Fix memory leak and code style issue.


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.

-- PMM

Re: [Qemu-devel] [PULL 0/5] Net patches

[Jason Wang]

On 2019/7/29 下午7:47, Peter Maydell wrote:
> On Mon, 29 Jul 2019 at 09:33, Jason Wang <jasowang@redhat.com> wrote:
>> The following changes since commit fff3159900d2b95613a9cb75fc3703e67a674729:
>>
>>    Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190726' into staging (2019-07-26 16:23:07 +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 f77bed14f01557596727c4eea042e9818c242049:
>>
>>    net/colo-compare.c: Fix memory leak and code style issue. (2019-07-29 16:29:30 +0800)
>>
>> ----------------------------------------------------------------
>>
>> ----------------------------------------------------------------
>> Jason Wang (1):
>>        e1000: don't raise interrupt in pre_save()
>>
>> Prasad J Pandit (3):
>>        qemu-bridge-helper: restrict interface name to IFNAMSIZ
>>        qemu-bridge-helper: move repeating code in parse_acl_file
>>        net: tap: replace snprintf with g_strdup_printf calls
>>
>> Zhang Chen (1):
>>        net/colo-compare.c: Fix memory leak and code style issue.
>
> Applied, thanks.
>
> Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
> for any user-visible changes.
>
> -- PMM


Thanks for the reminding.

There's no user-visible changes.