From patchwork Fri Dec 28 10:31:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 208435 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9F9AC2C00C1 for ; Fri, 28 Dec 2012 21:41:43 +1100 (EST) Received: from localhost ([::1]:43849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ToXNl-0000OY-Ap for incoming@patchwork.ozlabs.org; Fri, 28 Dec 2012 05:41:41 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ToXNV-0000EP-8R for qemu-devel@nongnu.org; Fri, 28 Dec 2012 05:41:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ToXNT-0003K5-7U for qemu-devel@nongnu.org; Fri, 28 Dec 2012 05:41:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ToXNS-0003Jq-W0 for qemu-devel@nongnu.org; Fri, 28 Dec 2012 05:41:23 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBSAfGNB028604 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 28 Dec 2012 05:41:17 -0500 Received: from amd-6168-8-1.englab.nay.redhat.com (amd-6168-8-1.englab.nay.redhat.com [10.66.104.52]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBSAeCRN012168; Fri, 28 Dec 2012 05:41:12 -0500 From: Jason Wang To: mst@redhat.com, aliguori@us.ibm.com, stefanha@redhat.com, qemu-devel@nongnu.org Date: Fri, 28 Dec 2012 18:31:56 +0800 Message-Id: <1356690724-37891-5-git-send-email-jasowang@redhat.com> In-Reply-To: <1356690724-37891-1-git-send-email-jasowang@redhat.com> References: <1356690724-37891-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: krkumar2@in.ibm.com, kvm@vger.kernel.org, mprivozn@redhat.com, Jason Wang , rusty@rustcorp.com.au, jwhan@filewood.snu.ac.kr, shiyer@redhat.com Subject: [Qemu-devel] [PATCH 04/12] net: intorduce qemu_del_nic() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To support multiqueue nic, this patch separate the nic destructor from qemu_del_net_client() to a new helper qemu_del_nic(). The following patches would refactor this function to support multiqueue nic. Signed-off-by: Jason Wang --- hw/e1000.c | 2 +- hw/eepro100.c | 2 +- hw/ne2000.c | 2 +- hw/pcnet-pci.c | 2 +- hw/rtl8139.c | 2 +- hw/usb/dev-network.c | 2 +- hw/virtio-net.c | 2 +- hw/xen_nic.c | 2 +- net.c | 15 ++++++++++++++- net.h | 1 + 10 files changed, 23 insertions(+), 9 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 004f057..eb181d8 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1234,7 +1234,7 @@ pci_e1000_uninit(PCIDevice *dev) qemu_free_timer(d->autoneg_timer); memory_region_destroy(&d->mmio); memory_region_destroy(&d->io); - qemu_del_net_client(qemu_get_queue(d->nic)); + qemu_del_nic(d->nic); } static NetClientInfo net_e1000_info = { diff --git a/hw/eepro100.c b/hw/eepro100.c index c09a315..d072131 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1849,7 +1849,7 @@ static void pci_nic_uninit(PCIDevice *pci_dev) memory_region_destroy(&s->flash_bar); vmstate_unregister(&pci_dev->qdev, s->vmstate, s); eeprom93xx_free(&pci_dev->qdev, s->eeprom); - qemu_del_net_client(qemu_get_queue(s->nic)); + qemu_del_nic(s->nic); } static NetClientInfo net_eepro100_info = { diff --git a/hw/ne2000.c b/hw/ne2000.c index 64b73fe..e6810ad 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -750,7 +750,7 @@ static void pci_ne2000_exit(PCIDevice *pci_dev) NE2000State *s = &d->ne2000; memory_region_destroy(&s->io); - qemu_del_net_client(qemu_get_queue(s->nic)); + qemu_del_nic(s->nic); } static Property ne2000_properties[] = { diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index f4a03eb..c910fa3 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -279,7 +279,7 @@ static void pci_pcnet_uninit(PCIDevice *dev) memory_region_destroy(&d->io_bar); qemu_del_timer(d->state.poll_timer); qemu_free_timer(d->state.poll_timer); - qemu_del_net_client(qemu_get_queue(d->state.nic)); + qemu_del_nic(d->state.nic); } static NetClientInfo net_pci_pcnet_info = { diff --git a/hw/rtl8139.c b/hw/rtl8139.c index b6cb90e..a8acd19 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3445,7 +3445,7 @@ static void pci_rtl8139_uninit(PCIDevice *dev) } qemu_del_timer(s->timer); qemu_free_timer(s->timer); - qemu_del_net_client(qemu_get_queue(s->nic)); + qemu_del_nic(s->nic); } static void rtl8139_set_link_status(NetClientState *nc) diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 3de6218..6de0521 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1329,7 +1329,7 @@ static void usb_net_handle_destroy(USBDevice *dev) /* TODO: remove the nd_table[] entry */ rndis_clear_responsequeue(s); - qemu_del_net_client(qemu_get_queue(s->nic)); + qemu_del_nic(s->nic); } static NetClientInfo net_usbnet_info = { diff --git a/hw/virtio-net.c b/hw/virtio-net.c index bf6414b..d57a5a5 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -1098,6 +1098,6 @@ void virtio_net_exit(VirtIODevice *vdev) qemu_bh_delete(n->tx_bh); } - qemu_del_net_client(qemu_get_queue(n->nic)); + qemu_del_nic(n->nic); virtio_cleanup(&n->vdev); } diff --git a/hw/xen_nic.c b/hw/xen_nic.c index 055adf4..6275cd3 100644 --- a/hw/xen_nic.c +++ b/hw/xen_nic.c @@ -406,7 +406,7 @@ static void net_disconnect(struct XenDevice *xendev) netdev->rxs = NULL; } if (netdev->nic) { - qemu_del_net_client(qemu_get_queue(netdev->nic)); + qemu_del_nic(netdev->nic); netdev->nic = NULL; } } diff --git a/net.c b/net.c index ef5b8c9..97ee542 100644 --- a/net.c +++ b/net.c @@ -290,6 +290,15 @@ void qemu_del_net_client(NetClientState *nc) return; } + assert(nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC); + + qemu_cleanup_net_client(nc); + qemu_free_net_client(nc); +} + +void qemu_del_nic(NICState *nic) +{ + NetClientState *nc = qemu_get_queue(nic); /* If this is a peer NIC and peer has already been deleted, free it now. */ if (nc->peer && nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) { NICState *nic = qemu_get_nic(nc); @@ -932,7 +941,11 @@ void net_cleanup(void) NetClientState *nc, *next_vc; QTAILQ_FOREACH_SAFE(nc, &net_clients, next, next_vc) { - qemu_del_net_client(nc); + if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) { + qemu_del_nic(qemu_get_nic(nc)); + } else { + qemu_del_net_client(nc); + } } } diff --git a/net.h b/net.h index 56b79fb..0d53337 100644 --- a/net.h +++ b/net.h @@ -77,6 +77,7 @@ NICState *qemu_new_nic(NetClientInfo *info, const char *model, const char *name, void *opaque); +void qemu_del_nic(NICState *nic); NetClientState *qemu_get_queue(NICState *nic); NICState *qemu_get_nic(NetClientState *nc); void *qemu_get_nic_opaque(NetClientState *nc);