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

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

[Jason Wang]

The following changes since commit ddc2c3a57e0752c0650fdb735a8b8322542d4248:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-03-30 18:02:33 +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 b4053c64833762f1249b2d704d2da30b5b10c8ff:

  e1000: disable debug by default (2017-03-31 08:48:13 +0800)

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

----------------------------------------------------------------
Jason Wang (2):
      virtio-net: avoid call tap_enable when there's only one queue
      e1000: disable debug by default

 hw/net/e1000.c      | 2 +-
 hw/net/virtio-net.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

[Qemu-devel] [PATCH] e1000: disable debug by default

[Jason Wang]

Disable debug output by default, the information were not needed for
release.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Stefan Hajnoczi <stefanha@gmail.com>
Cc: Leonid Bloch <leonid.bloch@ravellosystems.com>
Cc: Dmitry Fleytman <dmitry.fleytman@ravellosystems.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 9324949..f2e5072 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -40,7 +40,7 @@
 
 static const uint8_t bcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-#define E1000_DEBUG
+/* #define E1000_DEBUG */
 
 #ifdef E1000_DEBUG
 enum {
-- 
2.7.4

[Qemu-devel] [PULL 1/2] virtio-net: avoid call tap_enable when there's only one queue

[Jason Wang]

We call tap_enable() even if for multiqueue is not enabled. This is
wrong since it should be used for multiqueue codes to enable a
disabled queue. Fixing this by only calling this when multiqueue is
used.

Fixes: 16dbaf905b72 ("tap: support enabling or disabling a queue")
Reported-by: Andrew Baumann <Andrew.Baumann@microsoft.com>
Tested-by: Andrew Baumann <Andrew.Baumann@microsoft.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/virtio-net.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index c321680..7d091c9 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -510,6 +510,10 @@ static int peer_attach(VirtIONet *n, int index)
         return 0;
     }
 
+    if (n->max_queues == 1) {
+        return 0;
+    }
+
     return tap_enable(nc->peer);
 }
 
-- 
2.7.4

[Qemu-devel] [PULL 2/2] e1000: disable debug by default

[Jason Wang]

Disable debug output by default, the information were not needed for
release.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Stefan Hajnoczi <stefanha@gmail.com>
Cc: Leonid Bloch <leonid.bloch@ravellosystems.com>
Cc: Dmitry Fleytman <dmitry.fleytman@ravellosystems.com>
Cc: qemu-stable@nongnu.org
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/e1000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 9324949..f2e5072 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -40,7 +40,7 @@
 
 static const uint8_t bcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
-#define E1000_DEBUG
+/* #define E1000_DEBUG */
 
 #ifdef E1000_DEBUG
 enum {
-- 
2.7.4

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

[Peter Maydell]

On 31 March 2017 at 02:15, Jason Wang <jasowang@redhat.com> wrote:
> The following changes since commit ddc2c3a57e0752c0650fdb735a8b8322542d4248:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-03-30 18:02:33 +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 b4053c64833762f1249b2d704d2da30b5b10c8ff:
>
>   e1000: disable debug by default (2017-03-31 08:48:13 +0800)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
> Jason Wang (2):
>       virtio-net: avoid call tap_enable when there's only one queue
>       e1000: disable debug by default
>
>  hw/net/e1000.c      | 2 +-
>  hw/net/virtio-net.c | 4 ++++
>  2 files changed, 5 insertions(+), 1 deletion(-)

Applied, thanks.

-- PMM