[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/30] virtio-net: Convert to QOM realize
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 25/30] virtio-net: Convert to QOM realize |
Date: |
Mon, 9 Dec 2013 21:48:27 +0100 |
From: Andreas Färber <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/net/virtio-net.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index a669f83..d9e4b8a 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1486,9 +1486,9 @@ void virtio_net_set_netclient_name(VirtIONet *n, const
char *name,
n->netclient_type = g_strdup(type);
}
-static int virtio_net_device_init(VirtIODevice *vdev)
+static void virtio_net_device_realize(DeviceState *dev, Error **errp)
{
- DeviceState *dev = DEVICE(vdev);
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIONet *n = VIRTIO_NET(dev);
NetClientState *nc;
int i;
@@ -1565,7 +1565,6 @@ static int virtio_net_device_init(VirtIODevice *vdev)
virtio_net_save, virtio_net_load, n);
add_boot_device_path(n->nic_conf.bootindex, dev, "/address@hidden");
- return 0;
}
static void virtio_net_device_exit(VirtIODevice *vdev)
@@ -1633,9 +1632,10 @@ static void virtio_net_class_init(ObjectClass *klass,
void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
+
dc->props = virtio_net_properties;
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
- vdc->init = virtio_net_device_init;
+ vdc->realize = virtio_net_device_realize;
vdc->exit = virtio_net_device_exit;
vdc->get_config = virtio_net_get_config;
vdc->set_config = virtio_net_set_config;
--
1.8.4.2
- [Qemu-devel] [PULL 15/30] virtio-blk: QOM realize preparations, (continued)
- [Qemu-devel] [PULL 15/30] virtio-blk: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 16/30] virtio-serial: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 17/30] virtio-net: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 18/30] virtio-balloon: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 19/30] virtio-rng: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 20/30] virtio-scsi: QOM realize preparations, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 21/30] virtio: Start converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 22/30] virtio-9p: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 23/30] virtio-blk: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 24/30] virtio-serial: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 25/30] virtio-net: Convert to QOM realize,
Paolo Bonzini <=
- [Qemu-devel] [PULL 26/30] virtio-balloon: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 27/30] virtio-rng: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 28/30] virtio-scsi: Convert to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 29/30] virtio: Complete converting VirtioDevice to QOM realize, Paolo Bonzini, 2013/12/09
- [Qemu-devel] [PULL 30/30] virtio: Convert exit to unrealize, Paolo Bonzini, 2013/12/09
- Re: [Qemu-devel] [PULL 00/30] virtio conversion to realize and hotplug/unplug fixes, Anthony Liguori, 2013/12/10