qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] vmxnet3: fix NICState cleanup
@ 2013-06-04 12:47 Stefan Hajnoczi
  2013-06-04 12:57 ` Paolo Bonzini
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2013-06-04 12:47 UTC (permalink / raw)
  To: qemu-devel; +Cc: Dmitry Fleytman, Paolo Bonzini, Stefan Hajnoczi

Use qemu_del_nic() instead of qemu_del_net_client() to correctly free
the entire NICState.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/net/vmxnet3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 5f483e7..4c575e5 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -1892,7 +1892,7 @@ static void vmxnet3_net_uninit(VMXNET3State *s)
     vmxnet_tx_pkt_reset(s->tx_pkt);
     vmxnet_tx_pkt_uninit(s->tx_pkt);
     vmxnet_rx_pkt_uninit(s->rx_pkt);
-    qemu_del_net_client(qemu_get_queue(s->nic));
+    qemu_del_nic(s->nic);
 }
 
 static void vmxnet3_net_init(VMXNET3State *s)
-- 
1.8.1.4

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] vmxnet3: fix NICState cleanup
  2013-06-04 12:47 [Qemu-devel] [PATCH] vmxnet3: fix NICState cleanup Stefan Hajnoczi
@ 2013-06-04 12:57 ` Paolo Bonzini
  2013-06-04 13:18 ` Dmitry Fleytman
  2013-06-05  8:35 ` Stefan Hajnoczi
  2 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2013-06-04 12:57 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: Dmitry Fleytman, qemu-devel, 1.5.x

Il 04/06/2013 14:47, Stefan Hajnoczi ha scritto:
> Use qemu_del_nic() instead of qemu_del_net_client() to correctly free
> the entire NICState.
> 
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Cc: qemu-stable@nongnu.org

> ---
>  hw/net/vmxnet3.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
> index 5f483e7..4c575e5 100644
> --- a/hw/net/vmxnet3.c
> +++ b/hw/net/vmxnet3.c
> @@ -1892,7 +1892,7 @@ static void vmxnet3_net_uninit(VMXNET3State *s)
>      vmxnet_tx_pkt_reset(s->tx_pkt);
>      vmxnet_tx_pkt_uninit(s->tx_pkt);
>      vmxnet_rx_pkt_uninit(s->rx_pkt);
> -    qemu_del_net_client(qemu_get_queue(s->nic));
> +    qemu_del_nic(s->nic);
>  }
>  
>  static void vmxnet3_net_init(VMXNET3State *s)
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] vmxnet3: fix NICState cleanup
  2013-06-04 12:47 [Qemu-devel] [PATCH] vmxnet3: fix NICState cleanup Stefan Hajnoczi
  2013-06-04 12:57 ` Paolo Bonzini
@ 2013-06-04 13:18 ` Dmitry Fleytman
  2013-06-05  8:35 ` Stefan Hajnoczi
  2 siblings, 0 replies; 4+ messages in thread
From: Dmitry Fleytman @ 2013-06-04 13:18 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: Paolo Bonzini, <qemu-devel@nongnu.org>

Hi Stefan,

Thanks for fixing this.

Dmitry.

Sent from my iPad

On Jun 4, 2013, at 2:47 PM, Stefan Hajnoczi <stefanha@redhat.com> wrote:

> Use qemu_del_nic() instead of qemu_del_net_client() to correctly free
> the entire NICState.
> 
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
> hw/net/vmxnet3.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
> index 5f483e7..4c575e5 100644
> --- a/hw/net/vmxnet3.c
> +++ b/hw/net/vmxnet3.c
> @@ -1892,7 +1892,7 @@ static void vmxnet3_net_uninit(VMXNET3State *s)
>     vmxnet_tx_pkt_reset(s->tx_pkt);
>     vmxnet_tx_pkt_uninit(s->tx_pkt);
>     vmxnet_rx_pkt_uninit(s->rx_pkt);
> -    qemu_del_net_client(qemu_get_queue(s->nic));
> +    qemu_del_nic(s->nic);
> }
> 
> static void vmxnet3_net_init(VMXNET3State *s)
> -- 
> 1.8.1.4
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Qemu-devel] [PATCH] vmxnet3: fix NICState cleanup
  2013-06-04 12:47 [Qemu-devel] [PATCH] vmxnet3: fix NICState cleanup Stefan Hajnoczi
  2013-06-04 12:57 ` Paolo Bonzini
  2013-06-04 13:18 ` Dmitry Fleytman
@ 2013-06-05  8:35 ` Stefan Hajnoczi
  2 siblings, 0 replies; 4+ messages in thread
From: Stefan Hajnoczi @ 2013-06-05  8:35 UTC (permalink / raw)
  To: qemu-devel; +Cc: Dmitry Fleytman, Paolo Bonzini, qemu-stable

On Tue, Jun 04, 2013 at 02:47:26PM +0200, Stefan Hajnoczi wrote:
> Use qemu_del_nic() instead of qemu_del_net_client() to correctly free
> the entire NICState.
> 
> Reported-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  hw/net/vmxnet3.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, applied to my net tree:
https://github.com/stefanha/qemu/commits/net

Stefan

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2013-06-05  8:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-04 12:47 [Qemu-devel] [PATCH] vmxnet3: fix NICState cleanup Stefan Hajnoczi
2013-06-04 12:57 ` Paolo Bonzini
2013-06-04 13:18 ` Dmitry Fleytman
2013-06-05  8:35 ` Stefan Hajnoczi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).