From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org
Subject: [Qemu-devel] [PATCH 19/26] vmxnet3: fix NICState cleanup
Date: Wed, 12 Jun 2013 16:41:31 -0500 [thread overview]
Message-ID: <1371073298-14519-20-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1371073298-14519-1-git-send-email-mdroth@linux.vnet.ibm.com>
From: Stefan Hajnoczi <stefanha@redhat.com>
Use qemu_del_nic() instead of qemu_del_net_client() to correctly free
the entire NICState.
Cc: qemu-stable@nongnu.org
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 3ffee3cd5fb29de2115bdcbde0a02f47ce69a24c)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.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.7.9.5
next prev parent reply other threads:[~2013-06-12 21:46 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-12 21:41 [Qemu-devel] Patch Round-up for stable 1.5.1, freeze on 2013-06-19 Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 01/26] hw/9pfs: Fix segfault with 9p2000.u Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 02/26] hw/9pfs: use O_NOFOLLOW for mapped readlink operation Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 03/26] rtl8139: flush queued packets when RxBufPtr is written Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 04/26] qom/object: Don't poll cast cache for NULL objects Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 05/26] xen: simplify xen_enabled Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 06/26] main_loop: do not set nonblocking if xen_enabled() Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 07/26] xen_machine_pv: do not create a dummy CPU in machine->init Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 08/26] chardev: fix "info chardev" output Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 09/26] ide: Set BSY bit during FLUSH Michael Roth
2013-07-03 20:10 ` Alex Williamson
2013-07-03 20:16 ` Michael Roth
2013-07-03 21:51 ` Alex Williamson
2013-08-12 22:43 ` Michael Roth
2013-08-13 0:12 ` Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 10/26] Revert "roms: switch oldnoconfig to olddefconfig" Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 11/26] update seabios to release 1.7.2.2 Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 12/26] target-i386: fix abort on bad PML4E/PDPTE/PDE/PTE addresses Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 13/26] Remove OSS support for OpenBSD Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 14/26] xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional) Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 15/26] do not check pointers after dereferencing them Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 16/26] qdev: fix get_fw_dev_path to support to add nothing to fw_dev_path Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 17/26] host-libusb: Correct test for USB packet state Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 18/26] Fix usage of USB_DEV_FLAG_IS_HOST flag Michael Roth
2013-06-12 21:41 ` Michael Roth [this message]
2013-06-12 21:41 ` [Qemu-devel] [PATCH 20/26] ui/gtk.c: Fix *BSD build of Gtk+ UI Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 21/26] s390x/css: Fix concurrent sense Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 22/26] virtio-ccw: Fix unsetting of indicators Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 23/26] xilinx_axidma: Do not set DMA .notify to NULL after notify Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 24/26] qemu-char: don't issue CHR_EVENT_OPEN in a BH Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 25/26] target-i386: Fix aflag logic for CODE64 and the 0x67 prefix Michael Roth
2013-06-12 21:41 ` [Qemu-devel] [PATCH 26/26] q35: set fw_name Michael Roth
2013-06-13 9:16 ` [Qemu-devel] Patch Round-up for stable 1.5.1, freeze on 2013-06-19 Stefan Hajnoczi
2013-06-13 12:27 ` Paolo Bonzini
2013-06-13 12:36 ` Andreas Färber
2013-06-13 13:47 ` mdroth
2013-06-17 22:29 ` mdroth
2013-06-13 12:36 ` Frederic Konrad
2013-06-13 12:44 ` Frederic Konrad
2013-06-13 13:21 ` Andreas Färber
2013-06-13 13:29 ` Frederic Konrad
2013-06-13 14:10 ` mdroth
2013-06-17 22:56 ` mdroth
2013-06-17 23:04 ` Richard Henderson
2013-06-17 23:17 ` mdroth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371073298-14519-20-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).