[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next v2 13/22] virtio-net: Convert to QOM realiz
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next v2 13/22] virtio-net: Convert to QOM realize |
Date: |
Thu, 1 Aug 2013 04:17:34 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/net/virtio-net.c | 18 ++++++++++--------
include/hw/virtio/virtio-net.h | 2 ++
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 05ad605..16c230f 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1484,10 +1484,12 @@ 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);
+ ObjectClass *parent_oc = VIRTIO_NET_GET_PARENT_CLASS(dev);
+ DeviceClass *parent_dc = DEVICE_CLASS(parent_oc);
NetClientState *nc;
int i;
@@ -1563,10 +1565,11 @@ 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;
+
+ parent_dc->realize(dev, errp);
}
-static int virtio_net_device_exit(DeviceState *dev)
+static void virtio_net_device_unrealize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIONet *n = VIRTIO_NET(dev);
@@ -1606,8 +1609,6 @@ static int virtio_net_device_exit(DeviceState *dev)
g_free(n->vqs);
qemu_del_nic(n->nic);
virtio_cleanup(vdev);
-
- return 0;
}
static void virtio_net_instance_init(Object *obj)
@@ -1634,10 +1635,11 @@ static void virtio_net_class_init(ObjectClass *klass,
void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
- dc->exit = virtio_net_device_exit;
+
+ dc->realize = virtio_net_device_realize;
+ dc->unrealize = virtio_net_device_unrealize;
dc->props = virtio_net_properties;
set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
- vdc->init = virtio_net_device_init;
vdc->get_config = virtio_net_get_config;
vdc->set_config = virtio_net_set_config;
vdc->get_features = virtio_net_get_features;
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
index df60f16..f1efed2 100644
--- a/include/hw/virtio/virtio-net.h
+++ b/include/hw/virtio/virtio-net.h
@@ -20,6 +20,8 @@
#define TYPE_VIRTIO_NET "virtio-net-device"
#define VIRTIO_NET(obj) \
OBJECT_CHECK(VirtIONet, (obj), TYPE_VIRTIO_NET)
+#define VIRTIO_NET_GET_PARENT_CLASS(obj) \
+ OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_NET)
#define ETH_ALEN 6
--
1.8.1.4
- [Qemu-devel] [PATCH for-next v2 07/22] virtio-9p: Convert to QOM realize, (continued)
- [Qemu-devel] [PATCH for-next v2 07/22] virtio-9p: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 08/22] virtio-blk: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 02/22] virtio-console: Use exitfn for virtserialport, too, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 06/22] virtio-9p: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 04/22] virtio-blk-dataplane: Improve error reporting, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 10/22] virtio-serial: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 09/22] virtio-blk: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 11/22] virtio-serial: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 12/22] virtio-net: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 14/22] virtio-balloon: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 13/22] virtio-net: Convert to QOM realize,
Andreas Färber <=
- [Qemu-devel] [PATCH for-next v2 15/22] virtio-balloon: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 16/22] virtio-rng: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 17/22] virtio-rng: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 18/22] virtio-scsi: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 20/22] virtio: Convert VirtioDevice to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 21/22] virtio: Unrealize parent, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 19/22] virtio-scsi: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH RFC for-next v2 22/22] virtio-scsi: Convert virtio_scsi_common_[un]realize to QOM realize, Andreas Färber, 2013/07/31
- Re: [Qemu-devel] [PATCH for-next v2 00/22] QOM realize for virtio, Andreas Färber, 2013/07/31