From patchwork Fri Nov 29 10:17:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 295221 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A99102C008A for ; Fri, 29 Nov 2013 21:21:33 +1100 (EST) Received: from localhost ([::1]:46543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmLCU-0001y6-Om for incoming@patchwork.ozlabs.org; Fri, 29 Nov 2013 05:21:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9d-0006Nb-FH for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmL9X-0004OT-Rb for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:33 -0500 Received: from mail-ea0-x22f.google.com ([2a00:1450:4013:c01::22f]:58605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9X-0004KF-JU for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:27 -0500 Received: by mail-ea0-f175.google.com with SMTP id z10so6629179ead.34 for ; Fri, 29 Nov 2013 02:18:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=tFBlyGGvZuXIfSBp7ck9qNLxtnQgHQYsjfEQ2Gan+Kg=; b=oCLN3IU3bFsY7OXFMM1nN8Lo+dyrBny4PUWoBtMHfE4VU6bWpDNyYI2yM9Nk3XH4rD 2Ct43JLemaL3yEobpW6TmLL2/y6tSXG9hd1zijKKcsD0FdXN7bN0VRyVM+7dsxge3yG0 rBK+GIa6tgR3kcJkfK0HCqAQNwNg8B84viAkbfZOkvVeGwOdmgcBOn4YSAcbCnYiaQDm qmRfx6zzCujMWjf0rrDHAUkD6hW/xmkqRnLhNkFKkhNYrwtTeV5iEUkjAi7rtTZiXWpH drTanCbl6YnDLKA+9Bhbi847fthjYw+n15AF9qz7Ehor1huTqgjVxoB5v9ou924Tl+vV rqVQ== X-Received: by 10.14.119.1 with SMTP id m1mr9480934eeh.39.1385720306822; Fri, 29 Nov 2013 02:18:26 -0800 (PST) Received: from playground.lan (net-37-117-137-113.cust.dsl.vodafone.it. [37.117.137.113]) by mx.google.com with ESMTPSA id b42sm39055362eem.9.2013.11.29.02.18.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Nov 2013 02:18:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 29 Nov 2013 11:17:29 +0100 Message-Id: <1385720262-14107-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1385720262-14107-1-git-send-email-pbonzini@redhat.com> References: <1385720262-14107-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22f Cc: afaerber@suse.de, mst@redhat.com Subject: [Qemu-devel] [PATCH 17/30] virtio-net: QOM realize preparations 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: Andreas Färber Rename variable qdev -> dev since that's what realize's argument is called by convention. Avoid duplicate VIRTIO_DEVICE() cast. Signed-off-by: Andreas Färber Signed-off-by: Paolo Bonzini --- hw/net/virtio-net.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 93a81eb..a669f83 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1488,14 +1488,12 @@ void virtio_net_set_netclient_name(VirtIONet *n, const char *name, static int virtio_net_device_init(VirtIODevice *vdev) { - int i; - - DeviceState *qdev = DEVICE(vdev); - VirtIONet *n = VIRTIO_NET(vdev); + DeviceState *dev = DEVICE(vdev); + VirtIONet *n = VIRTIO_NET(dev); NetClientState *nc; + int i; - virtio_init(VIRTIO_DEVICE(n), "virtio-net", VIRTIO_ID_NET, - n->config_size); + virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size); n->max_queues = MAX(n->nic_conf.queues, 1); n->vqs = g_malloc0(sizeof(VirtIONetQueue) * n->max_queues); @@ -1535,7 +1533,7 @@ static int virtio_net_device_init(VirtIODevice *vdev) n->netclient_type, n->netclient_name, n); } else { n->nic = qemu_new_nic(&net_virtio_info, &n->nic_conf, - object_get_typename(OBJECT(qdev)), qdev->id, n); + object_get_typename(OBJECT(dev)), dev->id, n); } peer_test_vnet_hdr(n); @@ -1562,11 +1560,11 @@ static int virtio_net_device_init(VirtIODevice *vdev) nc = qemu_get_queue(n->nic); nc->rxfilter_notify_enabled = 1; - n->qdev = qdev; - register_savevm(qdev, "virtio-net", -1, VIRTIO_NET_VM_VERSION, + n->qdev = dev; + register_savevm(dev, "virtio-net", -1, VIRTIO_NET_VM_VERSION, virtio_net_save, virtio_net_load, n); - add_boot_device_path(n->nic_conf.bootindex, qdev, "/ethernet-phy@0"); + add_boot_device_path(n->nic_conf.bootindex, dev, "/ethernet-phy@0"); return 0; }