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

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

[Stefan Hajnoczi]

The following changes since commit 0169c511554cb0014a00290b0d3d26c31a49818f:

  Merge remote-tracking branch 'qemu-kvm/uq/master' into staging (2014-01-24 15:52:44 -0800)

are available in the git repository at:


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

for you to fetch changes up to 1f149e721feb617d14a3ee4f5911c47b29866a54:

  tap-linux: Get features once and use it many times (2014-01-27 15:44:06 +0100)

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

----------------------------------------------------------------
Hani Benhabiles (1):
      net: Use g_strdup_printf instead of snprintf.

Kusanagi Kouichi (1):
      tap-linux: Get features once and use it many times

Roy Franz (2):
      Fix lan9118 TX "CMD A" handling
      Fix lan9118 buffer length handling

 hw/net/lan9118.c |  6 +++---
 net/net.c        |  5 +----
 net/tap-linux.c  | 14 ++++++++------
 3 files changed, 12 insertions(+), 13 deletions(-)

-- 
1.8.4.2

[Qemu-devel] [PULL 1/4] net: Use g_strdup_printf instead of snprintf.

[Stefan Hajnoczi]

From: Hani Benhabiles <kroosec@gmail.com>

assign_name() in net/net.c is using snprintf + g_strdup to get the same
result as g_strdup_printf.

Signed-off-by: Hani Benhabiles <kroosec@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/net.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/net.c b/net/net.c
index f8db85f..2c3af20 100644
--- a/net/net.c
+++ b/net/net.c
@@ -164,7 +164,6 @@ void qemu_macaddr_default_if_unset(MACAddr *macaddr)
 static char *assign_name(NetClientState *nc1, const char *model)
 {
     NetClientState *nc;
-    char buf[256];
     int id = 0;
 
     QTAILQ_FOREACH(nc, &net_clients, next) {
@@ -176,9 +175,7 @@ static char *assign_name(NetClientState *nc1, const char *model)
         }
     }
 
-    snprintf(buf, sizeof(buf), "%s.%d", model, id);
-
-    return g_strdup(buf);
+    return g_strdup_printf("%s.%d", model, id);
 }
 
 static void qemu_net_client_destructor(NetClientState *nc)
-- 
1.8.4.2

[Qemu-devel] [PULL 2/4] Fix lan9118 TX "CMD A" handling

[Stefan Hajnoczi]

From: Roy Franz <roy.franz@linaro.org>

The 9118 ethernet controller supports transmission of multi-buffer packets
with arbitrary byte alignment of the start and end bytes.  All writes to
the packet fifo are 32 bits, so the controller discards bytes at the beginning
and end of each buffer based on the 'Data start offset' and 'Buffer size'
of the TX command 'A' format.

This patch changes the buffer size and offset internal state variables to be
updated on every "TX command A" write.  Previously they were only updated for
the first segment, which resulted incorrect behavior for packets with more
than one segment. Each segment of the packet has its own CMD A command, with
its own buffer size and start offset.

Also update extraction of fields from the CMD A word to use extract32().

Signed-off-by: Roy Franz <roy.franz@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/lan9118.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 2315f99..bb0c503 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -727,14 +727,14 @@ static void tx_fifo_push(lan9118_state *s, uint32_t val)
         s->txp->cmd_a = val & 0x831f37ff;
         s->txp->fifo_used++;
         s->txp->state = TX_B;
+        s->txp->buffer_size = extract32(s->txp->cmd_a, 0, 11);
+        s->txp->offset = extract32(s->txp->cmd_a, 16, 5);
         break;
     case TX_B:
         if (s->txp->cmd_a & 0x2000) {
             /* First segment */
             s->txp->cmd_b = val;
             s->txp->fifo_used++;
-            s->txp->buffer_size = s->txp->cmd_a & 0x7ff;
-            s->txp->offset = (s->txp->cmd_a >> 16) & 0x1f;
             /* End alignment does not include command words.  */
             n = (s->txp->buffer_size + s->txp->offset + 3) >> 2;
             switch ((n >> 24) & 3) {
-- 
1.8.4.2

[Qemu-devel] [PULL 3/4] Fix lan9118 buffer length handling

[Stefan Hajnoczi]

From: Roy Franz <roy.franz@linaro.org>

The 9118 ethernet controller supports transmission of multi-buffer packets
with arbitrary byte alignment of the start and end bytes.  All writes to
the packet fifo are 32 bits, so the controller discards bytes at the beginning
and end of each buffer based on the 'Data start offset' and 'Buffer size'
of the TX command 'A' format.

This patch uses the provided buffer length to limit the bytes transmitted.
Previously all the bytes of the last 32-bit word written to the TX fifo
were added to the internal transmit buffer structure resulting in more bytes
being transmitted than were submitted to the hardware in the command.  This
resulted in extra bytes being inserted into the middle of multi-buffer
packets when the non-final buffers had non-32bit aligned ending addresses.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/lan9118.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index bb0c503..e528290 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -763,7 +763,7 @@ static void tx_fifo_push(lan9118_state *s, uint32_t val)
         if (s->txp->buffer_size <= 0 && s->txp->pad != 0) {
             s->txp->pad--;
         } else {
-            n = 4;
+            n = MIN(4, s->txp->buffer_size + s->txp->offset);
             while (s->txp->offset) {
                 val >>= 8;
                 n--;
-- 
1.8.4.2

[Qemu-devel] [PULL 4/4] tap-linux: Get features once and use it many times

[Stefan Hajnoczi]

From: Kusanagi Kouichi <slash@ac.auone-net.jp>

Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 net/tap-linux.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/net/tap-linux.c b/net/tap-linux.c
index 36c09e2..812bf2d 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -52,14 +52,17 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
     memset(&ifr, 0, sizeof(ifr));
     ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
 
-    if (ioctl(fd, TUNGETFEATURES, &features) == 0 &&
-        features & IFF_ONE_QUEUE) {
+    if (ioctl(fd, TUNGETFEATURES, &features) == -1) {
+        error_report("warning: TUNGETFEATURES failed: %s", strerror(errno));
+        features = 0;
+    }
+
+    if (features & IFF_ONE_QUEUE) {
         ifr.ifr_flags |= IFF_ONE_QUEUE;
     }
 
     if (*vnet_hdr) {
-        if (ioctl(fd, TUNGETFEATURES, &features) == 0 &&
-            features & IFF_VNET_HDR) {
+        if (features & IFF_VNET_HDR) {
             *vnet_hdr = 1;
             ifr.ifr_flags |= IFF_VNET_HDR;
         } else {
@@ -82,8 +85,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
     }
 
     if (mq_required) {
-        if ((ioctl(fd, TUNGETFEATURES, &features) != 0) ||
-            !(features & IFF_MULTI_QUEUE)) {
+        if (!(features & IFF_MULTI_QUEUE)) {
             error_report("multiqueue required, but no kernel "
                          "support for IFF_MULTI_QUEUE available");
             close(fd);
-- 
1.8.4.2

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

[Peter Maydell]

On 27 January 2014 14:48, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 0169c511554cb0014a00290b0d3d26c31a49818f:
>
>   Merge remote-tracking branch 'qemu-kvm/uq/master' into staging (2014-01-24 15:52:44 -0800)
>
> are available in the git repository at:
>
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 1f149e721feb617d14a3ee4f5911c47b29866a54:
>
>   tap-linux: Get features once and use it many times (2014-01-27 15:44:06 +0100)

Applied, thanks.

-- PMM

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

[Jason Wang]

The following changes since commit d8276573da58e8ce78dab8c46dd660efd664bcb7:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190510' into staging (2019-05-16 13:15:08 +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 78e4f446d2569210a8558946b2321f9ff2ef47f6:

  net/colo-compare.c: Fix a crash in COLO Primary. (2019-05-17 17:00:12 +0800)

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

----------------------------------------------------------------
Chris Kenna (1):
      e1000: Never increment the RX undersize count register

Jason Wang (1):
      vhost_net: don't set backend for the uninitialized virtqueue

Lukas Straub (1):
      net/colo-compare.c: Fix a crash in COLO Primary.

Stefano Garzarella (1):
      net/slirp: fix the IPv6 prefix length error message

 hw/net/e1000.c             |  1 -
 hw/net/vhost_net.c         | 10 ++++++++++
 hw/virtio/virtio.c         |  5 +++++
 include/hw/virtio/virtio.h |  1 +
 net/colo-compare.c         |  3 +--
 net/slirp.c                |  3 ++-
 6 files changed, 19 insertions(+), 4 deletions(-)

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

[Peter Maydell]

On Fri, 17 May 2019 at 10:07, Jason Wang <jasowang@redhat.com> wrote:
>
> The following changes since commit d8276573da58e8ce78dab8c46dd660efd664bcb7:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190510' into staging (2019-05-16 13:15:08 +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 78e4f446d2569210a8558946b2321f9ff2ef47f6:
>
>   net/colo-compare.c: Fix a crash in COLO Primary. (2019-05-17 17:00:12 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------


Applied, thanks.

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

-- PMM

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

[Jason Wang]

The following changes since commit 409c241f887a38bb7a2ac12e34d3a8d73922a9a5:

  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' into staging (2018-06-14 14:04:14 +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 c67daf4a24442d1bb404a11a6a54dc45ea10f234:

  vhost-user: delete net client if necessary (2018-06-15 10:39:53 +0800)

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

----------------------------------------------------------------
Brijesh Singh (1):
      tap: set vhostfd passed from qemu cli to non-blocking

Jan Kiszka (1):
      e1000e: Do not auto-clear ICR bits which aren't set in EIAC

Lin Ma (1):
      net: Fix a potential segfault

linzhecheng (1):
      vhost-user: delete net client if necessary

 hw/net/e1000e_core.c | 4 ----
 net/net.c            | 4 +++-
 net/tap.c            | 2 ++
 net/vhost-user.c     | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

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

[Peter Maydell]

On 15 June 2018 at 04:01, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit 409c241f887a38bb7a2ac12e34d3a8d73922a9a5:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' into staging (2018-06-14 14:04:14 +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 c67daf4a24442d1bb404a11a6a54dc45ea10f234:
>
>   vhost-user: delete net client if necessary (2018-06-15 10:39:53 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

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

[Jason Wang]

The following changes since commit c74e62ee3e2dc2955e07d004c71badecb68a84eb:

  Merge remote-tracking branch 'remotes/rth/tags/cota-target-pull-request' into staging (2018-05-11 15:41:29 +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 0e0266c2e475b82b39a757c875fa03e64272fbe7:

  net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files (2018-05-14 15:47:14 +0800)

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

----------------------------------------------------------------
Thomas Huth (4):
      net: Fix memory leak in net_param_nic()
      net: Remove the deprecated "vlan" parameter
      net: Get rid of 'vlan' terminology and use 'hub' instead in the source files
      net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files

 docs/qdev-device-use.txt         |  3 --
 hw/core/qdev-properties-system.c | 80 ----------------------------------------
 include/hw/qdev-properties.h     |  3 --
 include/net/net.h                |  1 -
 net/hub.c                        |  7 ++--
 net/net.c                        | 18 ++++-----
 net/slirp.c                      |  8 ++--
 net/tap.c                        |  4 +-
 qapi/net.json                    | 15 ++++----
 qemu-doc.texi                    | 51 ++++++++++++-------------
 qemu-options.hx                  | 29 ++++++---------
 11 files changed, 58 insertions(+), 161 deletions(-)

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

[Peter Maydell]

On 14 May 2018 at 08:55, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit c74e62ee3e2dc2955e07d004c71badecb68a84eb:
>
>   Merge remote-tracking branch 'remotes/rth/tags/cota-target-pull-request' into staging (2018-05-11 15:41:29 +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 0e0266c2e475b82b39a757c875fa03e64272fbe7:
>
>   net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files (2018-05-14 15:47:14 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Thomas Huth (4):
>       net: Fix memory leak in net_param_nic()
>       net: Remove the deprecated "vlan" parameter
>       net: Get rid of 'vlan' terminology and use 'hub' instead in the source files
>       net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files
>

Applied, thanks.

-- PMM

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

[Stefan Hajnoczi]

The following changes since commit 619622424dba749feef752d76d79ef2569f7f250:

  Merge remote-tracking branch 'remotes/berrange/tags/vnc-crypto-v9-for-upstream' into staging (2015-09-15 15:42:58 +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 271a234a2359975101396916f37f3c7d347c61b8:

  net: smc91c111: flush packets on RCR register changes (2015-09-17 12:36:03 +0100)

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

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

Jason Wang (1):
  MAINTAINERS: Stefan will not maintain net subsystem

Peter Crosthwaite (3):
  net: smc91c111: guard flush_queued_packets() on can_rx()
  net: smc91c111: gate can_receive() on rx FIFO having a slot
  net: smc91c111: flush packets on RCR register changes

 MAINTAINERS        |  3 +--
 hw/net/smc91c111.c | 33 +++++++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 10 deletions(-)

-- 
2.4.3

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

[Peter Maydell]

On 17 September 2015 at 12:43, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 619622424dba749feef752d76d79ef2569f7f250:
>
>   Merge remote-tracking branch 'remotes/berrange/tags/vnc-crypto-v9-for-upstream' into staging (2015-09-15 15:42:58 +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 271a234a2359975101396916f37f3c7d347c61b8:
>
>   net: smc91c111: flush packets on RCR register changes (2015-09-17 12:36:03 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

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

[Stefan Hajnoczi]

The following changes since commit 3b730f570c5872ceea2137848f1d4554d4847441:

  Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging (2015-06-04 14:04:14 +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 73e47f4bc1a1aac59dba3f3a5feb27fbcb1cde50:

  qmp/hmp: add rocker device support (2015-06-05 11:19:53 +0100)

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

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

David Ahern (1):
  rocker: Add support for phys name

Scott Feldman (3):
  rocker: update tests using hw-derived interface names
  rocker: bring link up/down on PHY enable/disable
  qmp/hmp: add rocker device support

 docs/specs/rocker.txt         |   1 +
 hmp-commands.hx               |  24 ++++
 hmp.c                         | 303 ++++++++++++++++++++++++++++++++++++++++
 hmp.h                         |   4 +
 hw/net/Makefile.objs          |   1 +
 hw/net/rocker/qmp-norocker.c  |  50 +++++++
 hw/net/rocker/rocker.c        |  68 ++++++++-
 hw/net/rocker/rocker_fp.c     |  29 +++-
 hw/net/rocker/rocker_fp.h     |   2 +
 hw/net/rocker/rocker_hw.h     |   1 +
 hw/net/rocker/rocker_of_dpa.c | 312 ++++++++++++++++++++++++++++++++++++++++++
 monitor.c                     |  28 ++++
 qapi-schema.json              |   3 +
 qapi/rocker.json              | 286 ++++++++++++++++++++++++++++++++++++++
 qmp-commands.hx               |  97 +++++++++++++
 tests/rocker/bridge           |  25 ++--
 tests/rocker/bridge-stp       |  25 ++--
 tests/rocker/bridge-vlan      |  37 +++--
 tests/rocker/bridge-vlan-stp  |  37 +++--
 tests/rocker/port             |   8 +-
 20 files changed, 1263 insertions(+), 78 deletions(-)
 create mode 100644 hw/net/rocker/qmp-norocker.c
 create mode 100644 qapi/rocker.json

-- 
2.4.2

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

[Peter Maydell]

On 5 June 2015 at 11:22, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 3b730f570c5872ceea2137848f1d4554d4847441:
>
>   Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging (2015-06-04 14:04:14 +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 73e47f4bc1a1aac59dba3f3a5feb27fbcb1cde50:
>
>   qmp/hmp: add rocker device support (2015-06-05 11:19:53 +0100)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
> David Ahern (1):
>   rocker: Add support for phys name
>
> Scott Feldman (3):
>   rocker: update tests using hw-derived interface names
>   rocker: bring link up/down on PHY enable/disable
>   qmp/hmp: add rocker device support

Eric has some review comments on the qmp/hmp patch which haven't
been addressed yet, so I'm not applying this one. (I noticed the
commit message misformatting too...)

thanks
-- PMM

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

[Stefan Hajnoczi]

The following changes since commit 64ea8038ffbf703dcd438a108d2d5499c8ff95d9:

  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150109.0' into staging (2015-01-10 22:29:09 +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 a39d97c7becca5fd679d70d17ae5b1d62b9b5da6:

  hw/net/xen_nic.c: Set 'netdev->mac' to NULL after free it (2015-01-12 10:16:23 +0000)

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

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

Chen Gang (3):
  hw/net/xen_nic.c: Free 'netdev->txs' when map 'netdev->rxs' fails
  hw/net/xen_nic.c: Need free 'netdev->nic' in net_free() instead of
    net_disconnect()
  hw/net/xen_nic.c: Set 'netdev->mac' to NULL after free it

Paolo Bonzini (1):
  net: remove all cleanup methods from NIC NetClientInfos

 hw/net/allwinner_emac.c     |  8 --------
 hw/net/cadence_gem.c        |  9 ---------
 hw/net/dp8393x.c            | 11 -----------
 hw/net/e1000.c              |  9 ---------
 hw/net/eepro100.c           |  8 --------
 hw/net/etraxfs_eth.c        | 13 -------------
 hw/net/fsl_etsec/etsec.c    |  6 ------
 hw/net/lan9118.c            |  8 --------
 hw/net/lance.c              |  8 --------
 hw/net/mcf_fec.c            |  8 --------
 hw/net/milkymist-minimac2.c |  8 --------
 hw/net/mipsnet.c            |  8 --------
 hw/net/ne2000-isa.c         |  8 --------
 hw/net/ne2000.c             |  8 --------
 hw/net/opencores_eth.c      |  5 -----
 hw/net/pcnet-pci.c          |  8 --------
 hw/net/pcnet.c              |  5 -----
 hw/net/pcnet.h              |  1 -
 hw/net/rtl8139.c            |  8 --------
 hw/net/smc91c111.c          |  8 --------
 hw/net/spapr_llan.c         |  8 --------
 hw/net/stellaris_enet.c     |  8 --------
 hw/net/virtio-net.c         |  8 --------
 hw/net/vmxnet3.c            |  7 -------
 hw/net/xen_nic.c            | 16 +++++++++++-----
 hw/net/xgmac.c              |  8 --------
 hw/net/xilinx_axienet.c     |  9 ---------
 hw/net/xilinx_ethlite.c     |  8 --------
 28 files changed, 11 insertions(+), 216 deletions(-)

-- 
2.1.0

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

[Peter Maydell]

On 12 January 2015 at 10:27, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit 64ea8038ffbf703dcd438a108d2d5499c8ff95d9:
>
>   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150109.0' into staging (2015-01-10 22:29:09 +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 a39d97c7becca5fd679d70d17ae5b1d62b9b5da6:
>
>   hw/net/xen_nic.c: Set 'netdev->mac' to NULL after free it (2015-01-12 10:16:23 +0000)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
>
>  28 files changed, 11 insertions(+), 216 deletions(-)

If only all pullreqs could have diffstats like this :-)

Applied, thanks.

-- PMM

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

[Stefan Hajnoczi]

The following changes since commit a1d22a367d5780c9553b2cd5a24f665534ce6ed6:

  target-cris: Use new qemu_ld/st opcodes (2013-12-08 09:36:02 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git net-next

for you to fetch changes up to 02d38fcb2caa4454cf4ed728d5908c3cc9ba47be:

  net: Update netdev peer on link change (2013-12-09 13:33:20 +0100)

----------------------------------------------------------------
Amos Kong (1):
      virtio-net: don't update mac_table in error state

Vincenzo Maffione (2):
      net: Adding netmap network backend
      MAINTAINERS: Add netmap maintainers

Vlad Yasevich (1):
      net: Update netdev peer on link change

 MAINTAINERS         |   8 +
 configure           |  32 ++++
 hmp-commands.hx     |   4 +-
 hw/net/virtio-net.c |  35 +++--
 net/Makefile.objs   |   1 +
 net/clients.h       |   5 +
 net/net.c           |  32 ++--
 net/netmap.c        | 435 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 qapi-schema.json    |  24 ++-
 qemu-options.hx     |   9 ++
 10 files changed, 558 insertions(+), 27 deletions(-)
 create mode 100644 net/netmap.c

-- 
1.8.4.2

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

[Stefan Hajnoczi]

The following changes since commit 1680d485777ecf436d724631ea8722cc0c66990e:

  Merge remote-tracking branch 'rth/tcg-ldst-6' into staging (2013-10-14 09:59:59 -0700)

are available in the git repository at:


  git://github.com/stefanha/qemu.git net

for you to fetch changes up to 6e6247e54da991cbc7e0c05040bd6a14d505fc89:

  net: disallow to specify multicast MAC address (2013-10-18 13:28:09 +0200)

----------------------------------------------------------------
Amos Kong (3):
      net: update nic info during device reset
      net/e1000: update network information when macaddr is changed in guest
      net/rtl8139: update network information when macaddr is changed in guest

Dmitry Krivenok (1):
      net: disallow to specify multicast MAC address

 hw/net/e1000.c   | 9 +++++++++
 hw/net/rtl8139.c | 7 ++++++-
 net/net.c        | 5 +++++
 net/util.c       | 5 +++++
 net/util.h       | 2 ++
 5 files changed, 27 insertions(+), 1 deletion(-)

-- 
1.8.3.1

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

[Stefan Hajnoczi]

The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:

  Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)

are available in the git repository at:


  git://github.com/stefanha/qemu.git net

for you to fetch changes up to e21f6f23606e90f5cc6df2d9b1d8b862b54d2796:

  vmxnet3: Eliminate __packed redefined warning (2013-09-02 13:35:50 +0200)

----------------------------------------------------------------
Brad Smith (2):
      tap: Use numbered tap/tun devices on all *BSD OS's
      vmxnet3: Eliminate __packed redefined warning

Jan Kiszka (1):
      net: Rename send_queue to incoming_queue

Vincenzo Maffione (1):
      e1000: add interrupt mitigation support

 hw/i386/pc_piix.c    |  18 ++++++-
 hw/i386/pc_q35.c     |  16 ++++++-
 hw/net/e1000.c       | 131 +++++++++++++++++++++++++++++++++++++++++++++++++--
 hw/net/vmxnet3.h     |   2 -
 include/hw/i386/pc.h |   8 ++++
 include/net/net.h    |   2 +-
 net/hub.c            |   2 +-
 net/net.c            |  14 +++---
 net/tap-bsd.c        |  11 -----
 9 files changed, 176 insertions(+), 28 deletions(-)

-- 
1.8.3.1

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

[Anthony Liguori]

Stefan Hajnoczi <stefanha@redhat.com> writes:

> The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:
>
>   Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)
>
> are available in the git repository at:

Sorry, I forgot to send you this feedback earlier.

This conflicts badly with a pull request from Michael Tsirkin that I
merged already.  Can you rebase against master and resubmit?

Thanks!

Regards,

Anthony Liguori

>
>
>   git://github.com/stefanha/qemu.git net
>
> for you to fetch changes up to e21f6f23606e90f5cc6df2d9b1d8b862b54d2796:
>
>   vmxnet3: Eliminate __packed redefined warning (2013-09-02 13:35:50 +0200)
>
> ----------------------------------------------------------------
> Brad Smith (2):
>       tap: Use numbered tap/tun devices on all *BSD OS's
>       vmxnet3: Eliminate __packed redefined warning
>
> Jan Kiszka (1):
>       net: Rename send_queue to incoming_queue
>
> Vincenzo Maffione (1):
>       e1000: add interrupt mitigation support
>
>  hw/i386/pc_piix.c    |  18 ++++++-
>  hw/i386/pc_q35.c     |  16 ++++++-
>  hw/net/e1000.c       | 131 +++++++++++++++++++++++++++++++++++++++++++++++++--
>  hw/net/vmxnet3.h     |   2 -
>  include/hw/i386/pc.h |   8 ++++
>  include/net/net.h    |   2 +-
>  net/hub.c            |   2 +-
>  net/net.c            |  14 +++---
>  net/tap-bsd.c        |  11 -----
>  9 files changed, 176 insertions(+), 28 deletions(-)
>
> -- 
> 1.8.3.1

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

[Stefan Hajnoczi]

On Thu, Sep 05, 2013 at 01:38:23PM -0500, Anthony Liguori wrote:
> Stefan Hajnoczi <stefanha@redhat.com> writes:
> 
> > The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:
> >
> >   Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)
> >
> > are available in the git repository at:
> 
> Sorry, I forgot to send you this feedback earlier.
> 
> This conflicts badly with a pull request from Michael Tsirkin that I
> merged already.  Can you rebase against master and resubmit?

Sure, will do.

Stefan

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

[Paolo Bonzini]

Il 02/09/2013 13:38, Stefan Hajnoczi ha scritto:
> The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:
> 
>   Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)
> 
> are available in the git repository at:
> 
> 
>   git://github.com/stefanha/qemu.git net
> 
> for you to fetch changes up to e21f6f23606e90f5cc6df2d9b1d8b862b54d2796:
> 
>   vmxnet3: Eliminate __packed redefined warning (2013-09-02 13:35:50 +0200)

Is Aurelien going to apply the ne2k patch himself?

Paolo

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

[Aurelien Jarno]

On Thu, Sep 05, 2013 at 09:49:46PM +0200, Paolo Bonzini wrote:
> Il 02/09/2013 13:38, Stefan Hajnoczi ha scritto:
> > The following changes since commit 4ff78e0dbcd5c795962567fdc1b31e9e03c55b07:
> > 
> >   Merge remote-tracking branch 'luiz/queue/qmp' into staging (2013-08-30 12:26:04 -0500)
> > 
> > are available in the git repository at:
> > 
> > 
> >   git://github.com/stefanha/qemu.git net
> > 
> > for you to fetch changes up to e21f6f23606e90f5cc6df2d9b1d8b862b54d2796:
> > 
> >   vmxnet3: Eliminate __packed redefined warning (2013-09-02 13:35:50 +0200)
> 
> Is Aurelien going to apply the ne2k patch himself?

It would be nice if you can get the pcnet fix in your tree. For the ne2k
patch, as reported it might break the non-PCI version. I have to look at
that more in details, probably this week-end.

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

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

[Paolo Bonzini]

Il 05/09/2013 23:02, Aurelien Jarno ha scritto:
> It would be nice if you can get the pcnet fix in your tree. For the ne2k
> patch, as reported it might break the non-PCI version. I have to look at
> that more in details, probably this week-end.

No, that's fine.  The non-PCI version is also little endian.

Paolo

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

[Stefan Hajnoczi]

On Fri, Sep 06, 2013 at 08:03:27AM +0200, Paolo Bonzini wrote:
> Il 05/09/2013 23:02, Aurelien Jarno ha scritto:
> > It would be nice if you can get the pcnet fix in your tree. For the ne2k
> > patch, as reported it might break the non-PCI version. I have to look at
> > that more in details, probably this week-end.
> 
> No, that's fine.  The non-PCI version is also little endian.

Good.  I just wanted confirmation because I'm not up-to-speed on device
endianness.

I'll merge the patch.

Stefan

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

[Aurelien Jarno]

On Fri, Sep 06, 2013 at 04:59:06PM +0200, Stefan Hajnoczi wrote:
> On Fri, Sep 06, 2013 at 08:03:27AM +0200, Paolo Bonzini wrote:
> > Il 05/09/2013 23:02, Aurelien Jarno ha scritto:
> > > It would be nice if you can get the pcnet fix in your tree. For the ne2k
> > > patch, as reported it might break the non-PCI version. I have to look at
> > > that more in details, probably this week-end.
> > 
> > No, that's fine.  The non-PCI version is also little endian.
> 
> Good.  I just wanted confirmation because I'm not up-to-speed on device
> endianness.
> 
> I'll merge the patch.
> 

Thanks. Would it be possible to also merge the following patch:

http://patchwork.ozlabs.org/patch/270487/

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

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

[Stefan Hajnoczi]

On Mon, Sep 09, 2013 at 04:49:06PM +0200, Aurelien Jarno wrote:
> On Fri, Sep 06, 2013 at 04:59:06PM +0200, Stefan Hajnoczi wrote:
> > On Fri, Sep 06, 2013 at 08:03:27AM +0200, Paolo Bonzini wrote:
> > > Il 05/09/2013 23:02, Aurelien Jarno ha scritto:
> > > > It would be nice if you can get the pcnet fix in your tree. For the ne2k
> > > > patch, as reported it might break the non-PCI version. I have to look at
> > > > that more in details, probably this week-end.
> > > 
> > > No, that's fine.  The non-PCI version is also little endian.
> > 
> > Good.  I just wanted confirmation because I'm not up-to-speed on device
> > endianness.
> > 
> > I'll merge the patch.
> > 
> 
> Thanks. Would it be possible to also merge the following patch:
> 
> http://patchwork.ozlabs.org/patch/270487/

Merged onto my net-next tree.  I'll send a pull request at the end of
the week.

Stefan

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

[Stefan Hajnoczi]

The following changes since commit 8e4a424b305e29dc0e454f52df3b35577f342975:

  Revert "virtio-pci: replace byte swap hack" (2013-01-06 18:30:17 +0000)

are available in the git repository at:

  git://github.com/stefanha/qemu.git net

for you to fetch changes up to 83f58e570f21c3e7227e7fbef1fc0e18b5ed7ea9:

  rtl8139: preserve link state across device reset (2013-01-07 10:43:21 +0100)

----------------------------------------------------------------
Amos Kong (3):
      net: clean up network at qemu process termination
      e1000: no need auto-negotiation if link was down
      rtl8139: preserve link state across device reset

Michael Contreras (1):
      e1000: Discard oversized packets based on SBP|LPE

 hw/e1000.c   | 12 ++++++++++--
 hw/rtl8139.c |  3 ++-
 vl.c         |  4 +++-
 3 files changed, 15 insertions(+), 4 deletions(-)

-- 
1.8.0.2

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

[Anthony Liguori]

Pulled, thanks.

Regards,

Anthony Liguori

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

[Stefan Hajnoczi]

The following changes since commit 6801038bc52d61f81ac8a25fbe392f1bad982887:

  target-mips: fix wrong microMIPS opcode encoding (2012-11-15 14:48:16 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git net

for you to fetch changes up to 315d78d7f9d70c44eecfdad7f0cb5d51c612f884:

  tap: reset vnet header size on open (2012-11-16 14:28:33 +0100)

----------------------------------------------------------------
Michael S. Tsirkin (1):
      tap: reset vnet header size on open

Stefan Hajnoczi (3):
      net: add public qemu_net_poll() function
      net: extract notify_link_status_changed() function
      net: convert NetClientState to QOM

 hw/cadence_gem.c        |  27 +++++++---
 hw/dp8393x.c            |  41 ++++++++++----
 hw/e1000.c              |  32 +++++++----
 hw/eepro100.c           |  27 +++++++---
 hw/etraxfs_eth.c        |  27 +++++++---
 hw/lan9118.c            |  27 +++++++---
 hw/lance.c              |  18 +------
 hw/mcf_fec.c            |  32 ++++++++---
 hw/milkymist-minimac2.c |  26 ++++++---
 hw/mipsnet.c            |  25 ++++++---
 hw/musicpal.c           |  26 ++++++---
 hw/ne2000-isa.c         |  17 +-----
 hw/ne2000.c             |  23 +++++---
 hw/ne2000.h             |   2 +
 hw/opencores_eth.c      |  28 +++++++---
 hw/pcnet-pci.c          |  18 +------
 hw/pcnet.c              |  36 +++++++++++--
 hw/pcnet.h              |   3 +-
 hw/rtl8139.c            |  28 +++++++---
 hw/smc91c111.c          |  26 ++++++---
 hw/spapr_llan.c         |  24 ++++++---
 hw/stellaris_enet.c     |  26 ++++++---
 hw/usb/dev-network.c    |  25 ++++++---
 hw/vhost_net.c          |  11 ++--
 hw/virtio-net.c         |  42 ++++++++++-----
 hw/xen_nic.c            |  29 +++++++---
 hw/xgmac.c              |  26 ++++++---
 hw/xilinx_axienet.c     |  26 ++++++---
 hw/xilinx_ethlite.c     |  26 ++++++---
 net.c                   | 140 +++++++++++++++++++++++++++++++++---------------
 net.h                   |  35 ++++++++----
 net/dump.c              |  30 ++++++++---
 net/hub.c               |  64 +++++++++++++---------
 net/slirp.c             |  29 +++++++---
 net/socket.c            |  74 ++++++++++++++++---------
 net/tap-win32.c         |  27 ++++++++--
 net/tap.c               |  84 ++++++++++++++++-------------
 net/tap.h               |   4 ++
 net/vde.c               |  28 ++++++++--
 39 files changed, 850 insertions(+), 389 deletions(-)

-- 
1.8.0

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

[Stefan Hajnoczi]

The following changes since commit 4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4:

  Merge branch 'master' of git.qemu.org:/pub/git/qemu (2012-10-07 18:42:18 +0000)

are available in the git repository at:


  git://github.com/stefanha/qemu.git net

for you to fetch changes up to a245fc18352fe286ba45ae0661a73b3841514889:

  net: consolidate NetClientState header files into one (2012-10-08 13:59:40 +0200)

----------------------------------------------------------------
Amos Kong (2):
      e1000: update nc.link_down in e1000_post_load()
      virtio-net: update nc.link_down in virtio_net_load()

Jason Wang (1):
      rtl8139: implement 8139cp link status

Paolo Bonzini (1):
      net: consolidate NetClientState header files into one

 hw/e1000.c                  | 12 ++++++++++++
 hw/rtl8139.c                | 24 ++++++++++++++++++++++--
 hw/virtio-net.c             |  5 +++++
 net.c                       | 11 ++++-------
 net/{socket.h => clients.h} | 28 +++++++++++++++++++++++++---
 net/dump.c                  |  2 +-
 net/dump.h                  | 33 ---------------------------------
 net/hub.c                   |  1 +
 net/hub.h                   |  2 --
 net/slirp.c                 |  3 ++-
 net/slirp.h                 |  3 ---
 net/socket.c                |  3 +--
 net/tap-win32.c             |  2 +-
 net/tap.c                   |  3 ++-
 net/tap.h                   |  6 ------
 net/vde.c                   |  3 +--
 net/vde.h                   | 37 -------------------------------------
 17 files changed, 77 insertions(+), 101 deletions(-)
 rename net/{socket.h => clients.h} (62%)
 delete mode 100644 net/dump.h
 delete mode 100644 net/vde.h

-- 
1.7.11.4

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

[Anthony Liguori]

Stefan Hajnoczi <stefanha@redhat.com> writes:

> The following changes since commit 4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4:
>
>   Merge branch 'master' of git.qemu.org:/pub/git/qemu (2012-10-07 18:42:18 +0000)
>
> are available in the git repository at:
>
>
>   git://github.com/stefanha/qemu.git net
>
> for you to fetch changes up to a245fc18352fe286ba45ae0661a73b3841514889:
>
>   net: consolidate NetClientState header files into one (2012-10-08 13:59:40 +0200)
>

Pulled. Thanks.

Regards,

Anthony Liguori

> ----------------------------------------------------------------
> Amos Kong (2):
>       e1000: update nc.link_down in e1000_post_load()
>       virtio-net: update nc.link_down in virtio_net_load()
>
> Jason Wang (1):
>       rtl8139: implement 8139cp link status
>
> Paolo Bonzini (1):
>       net: consolidate NetClientState header files into one
>
>  hw/e1000.c                  | 12 ++++++++++++
>  hw/rtl8139.c                | 24 ++++++++++++++++++++++--
>  hw/virtio-net.c             |  5 +++++
>  net.c                       | 11 ++++-------
>  net/{socket.h => clients.h} | 28 +++++++++++++++++++++++++---
>  net/dump.c                  |  2 +-
>  net/dump.h                  | 33 ---------------------------------
>  net/hub.c                   |  1 +
>  net/hub.h                   |  2 --
>  net/slirp.c                 |  3 ++-
>  net/slirp.h                 |  3 ---
>  net/socket.c                |  3 +--
>  net/tap-win32.c             |  2 +-
>  net/tap.c                   |  3 ++-
>  net/tap.h                   |  6 ------
>  net/vde.c                   |  3 +--
>  net/vde.h                   | 37 -------------------------------------
>  17 files changed, 77 insertions(+), 101 deletions(-)
>  rename net/{socket.h => clients.h} (62%)
>  delete mode 100644 net/dump.h
>  delete mode 100644 net/vde.h
>
> -- 
> 1.7.11.4