From patchwork Tue Jan 15 14:09:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 212207 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 6FC8A2C00A2 for ; Wed, 16 Jan 2013 01:56:16 +1100 (EST) Received: from localhost ([::1]:54867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7Ff-0004cK-QK for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 09:12:31 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7EW-0001jl-7p for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:12:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv7E6-000156-6k for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:11:19 -0500 Received: from greensocs.com ([87.106.252.221]:60426 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7E5-00014G-Rd for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:10:54 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id AC73943EE38; Tue, 15 Jan 2013 14:10:52 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gjQKvu5OKQuX; Tue, 15 Jan 2013 15:10:52 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id D022E43EE39; Tue, 15 Jan 2013 15:10:26 +0100 (CET) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id 1A43B43EE33; Tue, 15 Jan 2013 15:10:25 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Tue, 15 Jan 2013 15:09:26 +0100 Message-Id: <1358258998-6504-13-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358258998-6504-1-git-send-email-fred.konrad@greensocs.com> References: <1358258998-6504-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: kwolf@redhat.com, peter.maydell@linaro.org, e.voevodin@samsung.com, mst@redhat.com, mark.burton@greensocs.com, agraf@suse.de, amit.shah@redhat.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com, deepakcs@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH V3 12/44] virtio-net: cleanup: init and exit function. 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: KONRAD Frederic This remove old init and exit function as they are no longer needed. Signed-off-by: KONRAD Frederic --- hw/virtio-net.c | 95 ++++++++++++--------------------------------------------- 1 file changed, 20 insertions(+), 75 deletions(-) diff --git a/hw/virtio-net.c b/hw/virtio-net.c index c52e962..62b8cb5 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -1007,26 +1007,13 @@ void virtio_net_set_conf(DeviceState *dev, virtio_net_conf *net_conf, memcpy(&(n->nic_conf), nic_conf, sizeof(struct NICConf)); } -static VirtIODevice *virtio_net_common_init(DeviceState *dev, NICConf *conf, - virtio_net_conf *net, VirtIONet **pn) +static int virtio_net_device_init(VirtIODevice *vdev) { - VirtIONet *n = *pn; - VirtIODevice *vdev = VIRTIO_DEVICE(dev); - - /* - * We have two cases here: the old virtio-net-pci device, and the - * refactored virtio-net. - */ - if (n == NULL) { - /* virtio-net-pci */ - n = (VirtIONet *)virtio_common_init("virtio-net", VIRTIO_ID_NET, - sizeof(struct virtio_net_config), - sizeof(VirtIONet)); - } else { - /* virtio-net */ - virtio_init(VIRTIO_DEVICE(n), "virtio-net", VIRTIO_ID_NET, - sizeof(struct virtio_net_config)); - } + DeviceState *qdev = DEVICE(vdev); + VirtIONet *n = VIRTIO_NET(vdev); + + virtio_init(VIRTIO_DEVICE(n), "virtio-net", VIRTIO_ID_NET, + sizeof(struct virtio_net_config)); vdev->get_config = virtio_net_get_config; vdev->set_config = virtio_net_set_config; @@ -1039,27 +1026,29 @@ static VirtIODevice *virtio_net_common_init(DeviceState *dev, NICConf *conf, vdev->guest_notifier_pending = virtio_net_guest_notifier_pending; n->rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx); - if (net->tx && strcmp(net->tx, "timer") && strcmp(net->tx, "bh")) { + if (n->net_conf.tx && strcmp(n->net_conf.tx, "timer") && + strcmp(n->net_conf.tx, "bh")) { error_report("virtio-net: " "Unknown option tx=%s, valid options: \"timer\" \"bh\"", - net->tx); + n->net_conf.tx); error_report("Defaulting to \"bh\""); } - if (net->tx && !strcmp(net->tx, "timer")) { + if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) { n->tx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer); n->tx_timer = qemu_new_timer_ns(vm_clock, virtio_net_tx_timer, n); - n->tx_timeout = net->txtimer; + n->tx_timeout = n->net_conf.txtimer; } else { n->tx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_tx_bh); n->tx_bh = qemu_bh_new(virtio_net_tx_bh, n); } n->ctrl_vq = virtio_add_queue(vdev, 64, virtio_net_handle_ctrl); - qemu_macaddr_default_if_unset(&conf->macaddr); - memcpy(&n->mac[0], &conf->macaddr, sizeof(n->mac)); + qemu_macaddr_default_if_unset(&(n->nic_conf.macaddr)); + memcpy(&n->mac[0], &n->nic_conf.macaddr, sizeof(n->mac)); n->status = VIRTIO_NET_S_LINK_UP; - n->nic = qemu_new_nic(&net_virtio_info, conf, object_get_typename(OBJECT(dev)), dev->id, n); + n->nic = qemu_new_nic(&net_virtio_info, &(n->nic_conf), + object_get_typename(OBJECT(qdev)), qdev->id, n); peer_test_vnet_hdr(n); if (peer_has_vnet_hdr(n)) { tap_using_vnet_hdr(n->nic->nc.peer, 1); @@ -1068,10 +1057,10 @@ static VirtIODevice *virtio_net_common_init(DeviceState *dev, NICConf *conf, n->host_hdr_len = 0; } - qemu_format_nic_info_str(&n->nic->nc, conf->macaddr.a); + qemu_format_nic_info_str(&n->nic->nc, n->nic_conf.macaddr.a); n->tx_waiting = 0; - n->tx_burst = net->txburst; + n->tx_burst = n->net_conf.txburst; virtio_net_set_mrg_rx_bufs(n, 0); n->promisc = 1; /* for compatibility */ @@ -1079,55 +1068,11 @@ static VirtIODevice *virtio_net_common_init(DeviceState *dev, NICConf *conf, n->vlans = g_malloc0(MAX_VLAN >> 3); - n->qdev = dev; - register_savevm(dev, "virtio-net", -1, VIRTIO_NET_VM_VERSION, + n->qdev = qdev; + register_savevm(qdev, "virtio-net", -1, VIRTIO_NET_VM_VERSION, virtio_net_save, virtio_net_load, n); - add_boot_device_path(conf->bootindex, dev, "/ethernet-phy@0"); - - return vdev; -} - -VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf, - virtio_net_conf *net) -{ - VirtIONet *n = NULL; - return virtio_net_common_init(dev, conf, net, &n); -} - -void virtio_net_exit(VirtIODevice *vdev) -{ - VirtIONet *n = VIRTIO_NET(vdev); - - /* This will stop vhost backend if appropriate. */ - virtio_net_set_status(vdev, 0); - - qemu_purge_queued_packets(&n->nic->nc); - - unregister_savevm(n->qdev, "virtio-net", n); - - g_free(n->mac_table.macs); - g_free(n->vlans); - - if (n->tx_timer) { - qemu_del_timer(n->tx_timer); - qemu_free_timer(n->tx_timer); - } else { - qemu_bh_delete(n->tx_bh); - } - - qemu_del_net_client(&n->nic->nc); - virtio_cleanup(vdev); -} - -static int virtio_net_device_init(VirtIODevice *vdev) -{ - DeviceState *qdev = DEVICE(vdev); - VirtIONet *n = VIRTIO_NET(vdev); - if (virtio_net_common_init(qdev, &(n->nic_conf), - &(n->net_conf), &n) == NULL) { - return -1; - } + add_boot_device_path(n->nic_conf.bootindex, qdev, "/ethernet-phy@0"); return 0; }