* [Qemu-devel] [PULL 0/2] Net patches
@ 2017-03-31 1:15 Jason Wang
2017-03-31 1:15 ` [Qemu-devel] [PATCH] e1000: disable debug by default Jason Wang
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Jason Wang @ 2017-03-31 1:15 UTC (permalink / raw)
To: peter.maydell, qemu-devel; +Cc: 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(-)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH] e1000: disable debug by default
2017-03-31 1:15 [Qemu-devel] [PULL 0/2] Net patches Jason Wang
@ 2017-03-31 1:15 ` Jason Wang
2017-03-31 1:15 ` [Qemu-devel] [PULL 1/2] virtio-net: avoid call tap_enable when there's only one queue Jason Wang
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Jason Wang @ 2017-03-31 1:15 UTC (permalink / raw)
To: peter.maydell, qemu-devel
Cc: Jason Wang, Stefan Hajnoczi, Leonid Bloch, Dmitry Fleytman, qemu-stable
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PULL 1/2] virtio-net: avoid call tap_enable when there's only one queue
2017-03-31 1:15 [Qemu-devel] [PULL 0/2] Net patches Jason Wang
2017-03-31 1:15 ` [Qemu-devel] [PATCH] e1000: disable debug by default Jason Wang
@ 2017-03-31 1:15 ` Jason Wang
2017-03-31 1:15 ` [Qemu-devel] [PULL 2/2] e1000: disable debug by default Jason Wang
2017-03-31 10:09 ` [Qemu-devel] [PULL 0/2] Net patches Peter Maydell
3 siblings, 0 replies; 9+ messages in thread
From: Jason Wang @ 2017-03-31 1:15 UTC (permalink / raw)
To: peter.maydell, qemu-devel; +Cc: Jason Wang, qemu-stable
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PULL 2/2] e1000: disable debug by default
2017-03-31 1:15 [Qemu-devel] [PULL 0/2] Net patches Jason Wang
2017-03-31 1:15 ` [Qemu-devel] [PATCH] e1000: disable debug by default Jason Wang
2017-03-31 1:15 ` [Qemu-devel] [PULL 1/2] virtio-net: avoid call tap_enable when there's only one queue Jason Wang
@ 2017-03-31 1:15 ` Jason Wang
2017-03-31 10:09 ` [Qemu-devel] [PULL 0/2] Net patches Peter Maydell
3 siblings, 0 replies; 9+ messages in thread
From: Jason Wang @ 2017-03-31 1:15 UTC (permalink / raw)
To: peter.maydell, qemu-devel
Cc: Jason Wang, Stefan Hajnoczi, Leonid Bloch, Dmitry Fleytman, qemu-stable
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] Net patches
2017-03-31 1:15 [Qemu-devel] [PULL 0/2] Net patches Jason Wang
` (2 preceding siblings ...)
2017-03-31 1:15 ` [Qemu-devel] [PULL 2/2] e1000: disable debug by default Jason Wang
@ 2017-03-31 10:09 ` Peter Maydell
3 siblings, 0 replies; 9+ messages in thread
From: Peter Maydell @ 2017-03-31 10:09 UTC (permalink / raw)
To: Jason Wang; +Cc: QEMU Developers
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Qemu-devel] [PATCH] e1000: disable debug by default
@ 2017-03-22 3:07 Jason Wang
2017-03-22 16:35 ` Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Jason Wang @ 2017-03-22 3:07 UTC (permalink / raw)
To: jasowang, qemu-devel
Cc: Peter Maydell, Stefan Hajnoczi, Leonid Bloch, Dmitry Fleytman,
qemu-stable
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
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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] e1000: disable debug by default
2017-03-22 3:07 [Qemu-devel] [PATCH] e1000: disable debug by default Jason Wang
@ 2017-03-22 16:35 ` Philippe Mathieu-Daudé
2017-03-23 9:06 ` Stefan Hajnoczi
2017-03-29 4:49 ` Jason Wang
2 siblings, 0 replies; 9+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-03-22 16:35 UTC (permalink / raw)
To: Jason Wang, qemu-devel
Cc: Leonid Bloch, Peter Maydell, Dmitry Fleytman, qemu-stable,
Stefan Hajnoczi
On 03/22/2017 12:07 AM, Jason Wang wrote:
> 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
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> 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 {
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] e1000: disable debug by default
2017-03-22 3:07 [Qemu-devel] [PATCH] e1000: disable debug by default Jason Wang
2017-03-22 16:35 ` Philippe Mathieu-Daudé
@ 2017-03-23 9:06 ` Stefan Hajnoczi
2017-03-29 4:49 ` Jason Wang
2 siblings, 0 replies; 9+ messages in thread
From: Stefan Hajnoczi @ 2017-03-23 9:06 UTC (permalink / raw)
To: Jason Wang
Cc: qemu-devel, Peter Maydell, Leonid Bloch, Dmitry Fleytman, qemu-stable
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
On Wed, Mar 22, 2017 at 11:07:32AM +0800, Jason Wang wrote:
> 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
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
> hw/net/e1000.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PATCH] e1000: disable debug by default
2017-03-22 3:07 [Qemu-devel] [PATCH] e1000: disable debug by default Jason Wang
2017-03-22 16:35 ` Philippe Mathieu-Daudé
2017-03-23 9:06 ` Stefan Hajnoczi
@ 2017-03-29 4:49 ` Jason Wang
2 siblings, 0 replies; 9+ messages in thread
From: Jason Wang @ 2017-03-29 4:49 UTC (permalink / raw)
To: qemu-devel
Cc: Leonid Bloch, Peter Maydell, Dmitry Fleytman, qemu-stable,
Stefan Hajnoczi
On 2017年03月22日 11:07, Jason Wang wrote:
> 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
> 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 {
Applied, thanks.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2017-03-31 10:10 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-31 1:15 [Qemu-devel] [PULL 0/2] Net patches Jason Wang
2017-03-31 1:15 ` [Qemu-devel] [PATCH] e1000: disable debug by default Jason Wang
2017-03-31 1:15 ` [Qemu-devel] [PULL 1/2] virtio-net: avoid call tap_enable when there's only one queue Jason Wang
2017-03-31 1:15 ` [Qemu-devel] [PULL 2/2] e1000: disable debug by default Jason Wang
2017-03-31 10:09 ` [Qemu-devel] [PULL 0/2] Net patches Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2017-03-22 3:07 [Qemu-devel] [PATCH] e1000: disable debug by default Jason Wang
2017-03-22 16:35 ` Philippe Mathieu-Daudé
2017-03-23 9:06 ` Stefan Hajnoczi
2017-03-29 4:49 ` Jason Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.