From patchwork Fri Mar 9 09:00:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 145695 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 5AACFB6EF3 for ; Fri, 9 Mar 2012 20:20:41 +1100 (EST) Received: from localhost ([::1]:38942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5w07-0004Ao-3C for incoming@patchwork.ozlabs.org; Fri, 09 Mar 2012 04:20:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5vhz-0000SP-Ga for qemu-devel@nongnu.org; Fri, 09 Mar 2012 04:02:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5vhu-0008CU-52 for qemu-devel@nongnu.org; Fri, 09 Mar 2012 04:01:55 -0500 Received: from e38.co.us.ibm.com ([32.97.110.159]:40784) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5vht-0008CG-T7 for qemu-devel@nongnu.org; Fri, 09 Mar 2012 04:01:50 -0500 Received: from /spool/local by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 9 Mar 2012 02:01:48 -0700 Received: from d01dlp03.pok.ibm.com (9.56.224.17) by e38.co.us.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 9 Mar 2012 02:01:45 -0700 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id BA1FDC90060 for ; Fri, 9 Mar 2012 04:01:44 -0500 (EST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2991ivn316530 for ; Fri, 9 Mar 2012 04:01:44 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q29EWauB017371 for ; Fri, 9 Mar 2012 09:32:36 -0500 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q29EWV1V017021; Fri, 9 Mar 2012 09:32:32 -0500 Received: by us.ibm.com (sSMTP sendmail emulation); Fri, 9 Mar 2012 17:01:37 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Fri, 9 Mar 2012 17:00:25 +0800 Message-Id: <1331283625-26439-13-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1331283625-26439-1-git-send-email-zwu.kernel@gmail.com> References: <1331283625-26439-1-git-send-email-zwu.kernel@gmail.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12030909-5518-0000-0000-000002D60C30 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.159 Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, kvm@vger.kernel.org, linuxram@us.ibm.com, zwu.kernel@gmail.com, ryanh@us.ibm.com, luowenj@cn.ibm.com, Zhi Yong Wu Subject: [Qemu-devel] [PATCH v1 12/12] net: Rename qemu_del_vlan_client() to qemu_del_net_client() 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 From: Stefan Hajnoczi Another step in moving the vlan feature out of net core. Users only deal with NetClientState and therefore qemu_del_vlan_client() should be named qemu_del_net_client(). Signed-off-by: Stefan Hajnoczi Signed-off-by: Zhi Yong Wu --- hw/e1000.c | 2 +- hw/eepro100.c | 2 +- hw/ne2000.c | 2 +- hw/pcnet-pci.c | 2 +- hw/rtl8139.c | 2 +- hw/usb-net.c | 2 +- hw/virtio-net.c | 2 +- hw/xen_nic.c | 2 +- net.c | 20 ++++++++++---------- net.h | 2 +- net/slirp.c | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index f8423e1..5768cdf 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1119,7 +1119,7 @@ pci_e1000_uninit(PCIDevice *dev) memory_region_destroy(&d->mmio); memory_region_destroy(&d->io); - qemu_del_vlan_client(&d->nic->nc); + qemu_del_net_client(&d->nic->nc); return 0; } diff --git a/hw/eepro100.c b/hw/eepro100.c index 5aee946..27edb50 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -1841,7 +1841,7 @@ static int 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_vlan_client(&s->nic->nc); + qemu_del_net_client(&s->nic->nc); return 0; } diff --git a/hw/ne2000.c b/hw/ne2000.c index 25a6d2f..bda3727 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -774,7 +774,7 @@ static int pci_ne2000_exit(PCIDevice *pci_dev) NE2000State *s = &d->ne2000; memory_region_destroy(&s->io); - qemu_del_vlan_client(&s->nic->nc); + qemu_del_net_client(&s->nic->nc); return 0; } diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index 8c82667..8bbad47 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -279,7 +279,7 @@ static int 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_vlan_client(&d->state.nic->nc); + qemu_del_net_client(&d->state.nic->nc); return 0; } diff --git a/hw/rtl8139.c b/hw/rtl8139.c index c0fddc1..9f58e35 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -3436,7 +3436,7 @@ static int pci_rtl8139_uninit(PCIDevice *dev) } qemu_del_timer(s->timer); qemu_free_timer(s->timer); - qemu_del_vlan_client(&s->nic->nc); + qemu_del_net_client(&s->nic->nc); return 0; } diff --git a/hw/usb-net.c b/hw/usb-net.c index 436e72b..d0e33e3 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1309,7 +1309,7 @@ static void usb_net_handle_destroy(USBDevice *dev) /* TODO: remove the nd_table[] entry */ rndis_clear_responsequeue(s); - qemu_del_vlan_client(&s->nic->nc); + qemu_del_net_client(&s->nic->nc); } static NetClientInfo net_usbnet_info = { diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 3af1972..f8f67d6 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -1073,6 +1073,6 @@ void virtio_net_exit(VirtIODevice *vdev) qemu_bh_delete(n->tx_bh); } - qemu_del_vlan_client(&n->nic->nc); + qemu_del_net_client(&n->nic->nc); virtio_cleanup(&n->vdev); } diff --git a/hw/xen_nic.c b/hw/xen_nic.c index 6391a04..ba4a45c 100644 --- a/hw/xen_nic.c +++ b/hw/xen_nic.c @@ -409,7 +409,7 @@ static void net_disconnect(struct XenDevice *xendev) netdev->rxs = NULL; } if (netdev->nic) { - qemu_del_vlan_client(&netdev->nic->nc); + qemu_del_net_client(&netdev->nic->nc); netdev->nic = NULL; } } diff --git a/net.c b/net.c index 56cfc94..dd67d16 100644 --- a/net.c +++ b/net.c @@ -246,7 +246,7 @@ NICState *qemu_new_nic(NetClientInfo *info, return nic; } -static void qemu_cleanup_vlan_client(NetClientState *nc) +static void qemu_cleanup_net_client(NetClientState *nc) { QTAILQ_REMOVE(&net_clients, nc, next); @@ -255,7 +255,7 @@ static void qemu_cleanup_vlan_client(NetClientState *nc) } } -static void qemu_free_vlan_client(NetClientState *nc) +static void qemu_free_net_client(NetClientState *nc) { if (nc->send_queue) { qemu_del_net_queue(nc->send_queue); @@ -268,7 +268,7 @@ static void qemu_free_vlan_client(NetClientState *nc) g_free(nc); } -void qemu_del_vlan_client(NetClientState *nc) +void qemu_del_net_client(NetClientState *nc) { /* If there is a peer NIC, delete and cleanup client, but do not free. */ if (nc->peer && nc->peer->info->type == NET_CLIENT_TYPE_NIC) { @@ -282,7 +282,7 @@ void qemu_del_vlan_client(NetClientState *nc) if (nc->peer->info->link_status_changed) { nc->peer->info->link_status_changed(nc->peer); } - qemu_cleanup_vlan_client(nc); + qemu_cleanup_net_client(nc); return; } @@ -290,12 +290,12 @@ void qemu_del_vlan_client(NetClientState *nc) if (nc->peer && nc->info->type == NET_CLIENT_TYPE_NIC) { NICState *nic = DO_UPCAST(NICState, nc, nc); if (nic->peer_deleted) { - qemu_free_vlan_client(nc->peer); + qemu_free_net_client(nc->peer); } } - qemu_cleanup_vlan_client(nc); - qemu_free_vlan_client(nc); + qemu_cleanup_net_client(nc); + qemu_free_net_client(nc); } void qemu_foreach_nic(qemu_nic_foreach func, void *opaque) @@ -1032,7 +1032,7 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict) monitor_printf(mon, "invalid host network device %s\n", device); return; } - qemu_del_vlan_client(nc); + qemu_del_net_client(nc); } int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data) @@ -1063,7 +1063,7 @@ int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data) qerror_report(QERR_DEVICE_NOT_FOUND, id); return -1; } - qemu_del_vlan_client(nc); + qemu_del_net_client(nc); qemu_opts_del(qemu_opts_find(qemu_find_opts("netdev"), id)); return 0; } @@ -1133,7 +1133,7 @@ void net_cleanup(void) NetClientState *nc, *next_vc; QTAILQ_FOREACH_SAFE(nc, &net_clients, next, next_vc) { - qemu_del_vlan_client(nc); + qemu_del_net_client(nc); } } diff --git a/net.h b/net.h index b8d11b8..60837ab 100644 --- a/net.h +++ b/net.h @@ -89,7 +89,7 @@ NICState *qemu_new_nic(NetClientInfo *info, const char *model, const char *name, void *opaque); -void qemu_del_vlan_client(NetClientState *nc); +void qemu_del_net_client(NetClientState *nc); NetClientState *qemu_find_vlan_client_by_name(Monitor *mon, int vlan_id, const char *client_str); typedef void (*qemu_nic_foreach)(NICState *nic, void *opaque); diff --git a/net/slirp.c b/net/slirp.c index 142b6b6..d3e56fc 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -274,7 +274,7 @@ static int net_slirp_init(NetClientState *peer, const char *model, return 0; error: - qemu_del_vlan_client(nc); + qemu_del_net_client(nc); return -1; }