From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4iSo-0003Q1-IA for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:18:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V4iSi-0006Jz-Ak for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:18:02 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60991 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V4iSi-0006Ji-2H for qemu-devel@nongnu.org; Wed, 31 Jul 2013 22:17:56 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 1 Aug 2013 04:17:33 +0200 Message-Id: <1375323463-32747-13-git-send-email-afaerber@suse.de> In-Reply-To: <1375323463-32747-1-git-send-email-afaerber@suse.de> References: <1375323463-32747-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-next v2 12/22] virtio-net: QOM realize preparations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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=C3=A4rber --- hw/net/virtio-net.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index aa1880c..05ad605 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1486,14 +1486,12 @@ void virtio_net_set_netclient_name(VirtIONet *n, = const char *name, =20 static int virtio_net_device_init(VirtIODevice *vdev) { - int i; - - DeviceState *qdev =3D DEVICE(vdev); - VirtIONet *n =3D VIRTIO_NET(vdev); + DeviceState *dev =3D DEVICE(vdev); + VirtIONet *n =3D VIRTIO_NET(dev); NetClientState *nc; + int i; =20 - virtio_init(VIRTIO_DEVICE(n), "virtio-net", VIRTIO_ID_NET, - n->config_size); + virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size); =20 n->max_queues =3D MAX(n->nic_conf.queues, 1); n->vqs =3D g_malloc0(sizeof(VirtIONetQueue) * n->max_queues); @@ -1533,7 +1531,7 @@ static int virtio_net_device_init(VirtIODevice *vde= v) n->netclient_type, n->netclient_name, n); } else { n->nic =3D qemu_new_nic(&net_virtio_info, &n->nic_conf, - object_get_typename(OBJECT(qdev)), qdev->i= d, n); + object_get_typename(OBJECT(dev)), dev->id,= n); } =20 peer_test_vnet_hdr(n); @@ -1560,24 +1558,24 @@ static int virtio_net_device_init(VirtIODevice *v= dev) nc =3D qemu_get_queue(n->nic); nc->rxfilter_notify_enabled =3D 1; =20 - n->qdev =3D qdev; - register_savevm(qdev, "virtio-net", -1, VIRTIO_NET_VM_VERSION, + n->qdev =3D dev; + register_savevm(dev, "virtio-net", -1, VIRTIO_NET_VM_VERSION, virtio_net_save, virtio_net_load, n); =20 - 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; } =20 -static int virtio_net_device_exit(DeviceState *qdev) +static int virtio_net_device_exit(DeviceState *dev) { - VirtIONet *n =3D VIRTIO_NET(qdev); - VirtIODevice *vdev =3D VIRTIO_DEVICE(qdev); + VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); + VirtIONet *n =3D VIRTIO_NET(dev); int i; =20 /* This will stop vhost backend if appropriate. */ virtio_net_set_status(vdev, 0); =20 - unregister_savevm(qdev, "virtio-net", n); + unregister_savevm(dev, "virtio-net", n); =20 if (n->netclient_name) { g_free(n->netclient_name); --=20 1.8.1.4