Commit 284a32f0 authored by Andreas Färber's avatar Andreas Färber Committed by Paolo Bonzini
Browse files

virtio-net: QOM realize preparations 



Rename variable qdev -> dev since that's what realize's argument is
called by convention.

Avoid duplicate VIRTIO_DEVICE() cast.

Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b1a20c3f

hw/net/virtio-net.c

+8 −10
Original line number Diff line number Diff line
@@ -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;

}