mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio-net: QOM realize preparations

Browse Source 
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 <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Andreas Färber 2013-07-30 05:02:48 +02:00 committed by Paolo Bonzini
parent b1a20c3fca
commit 284a32f0b3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/net/virtio-net.c
View File

@ -1488,14 +1488,12 @@ void virtio_net_set_netclient_name(VirtIONet *n, const char *name,
static int virtio_net_device_init(VirtIODevice *vdev) static int virtio_net_device_init(VirtIODevice *vdev)
{ {
DeviceState *dev = DEVICE(vdev);
VirtIONet *n = VIRTIO_NET(dev);
NetClientState *nc;
int i; int i;
DeviceState *qdev = DEVICE(vdev); virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size);
VirtIONet *n = VIRTIO_NET(vdev);
NetClientState *nc;
virtio_init(VIRTIO_DEVICE(n), "virtio-net", VIRTIO_ID_NET,
n->config_size);
n->max_queues = MAX(n->nic_conf.queues, 1); n->max_queues = MAX(n->nic_conf.queues, 1);
n->vqs = g_malloc0(sizeof(VirtIONetQueue) * n->max_queues); 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); n->netclient_type, n->netclient_name, n);
} else { } else {
n->nic = qemu_new_nic(&net_virtio_info, &n->nic_conf, 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); peer_test_vnet_hdr(n);
@ -1562,11 +1560,11 @@ static int virtio_net_device_init(VirtIODevice *vdev)
nc = qemu_get_queue(n->nic); nc = qemu_get_queue(n->nic);
nc->rxfilter_notify_enabled = 1; nc->rxfilter_notify_enabled = 1;
n->qdev = qdev; n->qdev = dev;
register_savevm(qdev, "virtio-net", -1, VIRTIO_NET_VM_VERSION, register_savevm(dev, "virtio-net", -1, VIRTIO_NET_VM_VERSION,
virtio_net_save, virtio_net_load, n); 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; return 0;
} }