david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio: Remove unnecessary OBJECT() casts

Browse Source 
There's no need to cast the first argument of object_initialize()
to Object. Remove these unnecessary casts.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Peter Maydell 2013-08-23 14:38:55 +01:00 committed by Andreas Färber
parent 70392912ed
commit e65177a87f
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/s390x/s390-virtio-bus.c
View File

@ -170,7 +170,7 @@ static int s390_virtio_net_init(VirtIOS390Device *s390_dev)
static void s390_virtio_net_instance_init(Object *obj) static void s390_virtio_net_instance_init(Object *obj)
{ {
VirtIONetS390 *dev = VIRTIO_NET_S390(obj); VirtIONetS390 *dev = VIRTIO_NET_S390(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_NET); object_initialize(&dev->vdev, TYPE_VIRTIO_NET);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -189,7 +189,7 @@ static int s390_virtio_blk_init(VirtIOS390Device *s390_dev)
static void s390_virtio_blk_instance_init(Object *obj) static void s390_virtio_blk_instance_init(Object *obj)
{ {
VirtIOBlkS390 *dev = VIRTIO_BLK_S390(obj); VirtIOBlkS390 *dev = VIRTIO_BLK_S390(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_BLK); object_initialize(&dev->vdev, TYPE_VIRTIO_BLK);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -230,7 +230,7 @@ static int s390_virtio_serial_init(VirtIOS390Device *s390_dev)
static void s390_virtio_serial_instance_init(Object *obj) static void s390_virtio_serial_instance_init(Object *obj)
{ {
VirtIOSerialS390 *dev = VIRTIO_SERIAL_S390(obj); VirtIOSerialS390 *dev = VIRTIO_SERIAL_S390(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SERIAL); object_initialize(&dev->vdev, TYPE_VIRTIO_SERIAL);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -262,7 +262,7 @@ static int s390_virtio_scsi_init(VirtIOS390Device *s390_dev)
static void s390_virtio_scsi_instance_init(Object *obj) static void s390_virtio_scsi_instance_init(Object *obj)
{ {
VirtIOSCSIS390 *dev = VIRTIO_SCSI_S390(obj); VirtIOSCSIS390 *dev = VIRTIO_SCSI_S390(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SCSI); object_initialize(&dev->vdev, TYPE_VIRTIO_SCSI);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -283,7 +283,7 @@ static int s390_vhost_scsi_init(VirtIOS390Device *s390_dev)
static void s390_vhost_scsi_instance_init(Object *obj) static void s390_vhost_scsi_instance_init(Object *obj)
{ {
VHostSCSIS390 *dev = VHOST_SCSI_S390(obj); VHostSCSIS390 *dev = VHOST_SCSI_S390(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VHOST_SCSI); object_initialize(&dev->vdev, TYPE_VHOST_SCSI);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
#endif #endif
@ -309,7 +309,7 @@ static int s390_virtio_rng_init(VirtIOS390Device *s390_dev)
static void s390_virtio_rng_instance_init(Object *obj) static void s390_virtio_rng_instance_init(Object *obj)
{ {
VirtIORNGS390 *dev = VIRTIO_RNG_S390(obj); VirtIORNGS390 *dev = VIRTIO_RNG_S390(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_RNG); object_initialize(&dev->vdev, TYPE_VIRTIO_RNG);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
object_property_add_link(obj, "rng", TYPE_RNG_BACKEND, object_property_add_link(obj, "rng", TYPE_RNG_BACKEND,
(Object **)&dev->vdev.conf.rng, NULL); (Object **)&dev->vdev.conf.rng, NULL);

14
hw/s390x/virtio-ccw.c
View File

@ -659,7 +659,7 @@ static int virtio_ccw_net_init(VirtioCcwDevice *ccw_dev)
static void virtio_ccw_net_instance_init(Object *obj) static void virtio_ccw_net_instance_init(Object *obj)
{ {
VirtIONetCcw *dev = VIRTIO_NET_CCW(obj); VirtIONetCcw *dev = VIRTIO_NET_CCW(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_NET); object_initialize(&dev->vdev, TYPE_VIRTIO_NET);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -679,7 +679,7 @@ static int virtio_ccw_blk_init(VirtioCcwDevice *ccw_dev)
static void virtio_ccw_blk_instance_init(Object *obj) static void virtio_ccw_blk_instance_init(Object *obj)
{ {
VirtIOBlkCcw *dev = VIRTIO_BLK_CCW(obj); VirtIOBlkCcw *dev = VIRTIO_BLK_CCW(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_BLK); object_initialize(&dev->vdev, TYPE_VIRTIO_BLK);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -712,7 +712,7 @@ static int virtio_ccw_serial_init(VirtioCcwDevice *ccw_dev)
static void virtio_ccw_serial_instance_init(Object *obj) static void virtio_ccw_serial_instance_init(Object *obj)
{ {
VirtioSerialCcw *dev = VIRTIO_SERIAL_CCW(obj); VirtioSerialCcw *dev = VIRTIO_SERIAL_CCW(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SERIAL); object_initialize(&dev->vdev, TYPE_VIRTIO_SERIAL);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -758,7 +758,7 @@ static void balloon_ccw_stats_set_poll_interval(Object *obj, struct Visitor *v,
static void virtio_ccw_balloon_instance_init(Object *obj) static void virtio_ccw_balloon_instance_init(Object *obj)
{ {
VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(obj); VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_BALLOON); object_initialize(&dev->vdev, TYPE_VIRTIO_BALLOON);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
object_property_add(obj, "guest-stats", "guest statistics", object_property_add(obj, "guest-stats", "guest statistics",
@ -798,7 +798,7 @@ static int virtio_ccw_scsi_init(VirtioCcwDevice *ccw_dev)
static void virtio_ccw_scsi_instance_init(Object *obj) static void virtio_ccw_scsi_instance_init(Object *obj)
{ {
VirtIOSCSICcw *dev = VIRTIO_SCSI_CCW(obj); VirtIOSCSICcw *dev = VIRTIO_SCSI_CCW(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SCSI); object_initialize(&dev->vdev, TYPE_VIRTIO_SCSI);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -819,7 +819,7 @@ static int vhost_ccw_scsi_init(VirtioCcwDevice *ccw_dev)
static void vhost_ccw_scsi_instance_init(Object *obj) static void vhost_ccw_scsi_instance_init(Object *obj)
{ {
VHostSCSICcw *dev = VHOST_SCSI_CCW(obj); VHostSCSICcw *dev = VHOST_SCSI_CCW(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VHOST_SCSI); object_initialize(&dev->vdev, TYPE_VHOST_SCSI);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
#endif #endif
@ -1170,7 +1170,7 @@ static const TypeInfo vhost_ccw_scsi = {
static void virtio_ccw_rng_instance_init(Object *obj) static void virtio_ccw_rng_instance_init(Object *obj)
{ {
VirtIORNGCcw *dev = VIRTIO_RNG_CCW(obj); VirtIORNGCcw *dev = VIRTIO_RNG_CCW(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_RNG); object_initialize(&dev->vdev, TYPE_VIRTIO_RNG);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
object_property_add_link(obj, "rng", TYPE_RNG_BACKEND, object_property_add_link(obj, "rng", TYPE_RNG_BACKEND,
(Object **)&dev->vdev.conf.rng, NULL); (Object **)&dev->vdev.conf.rng, NULL);

16
hw/virtio/virtio-pci.c
View File

@ -918,7 +918,7 @@ static void virtio_9p_pci_class_init(ObjectClass *klass, void *data)
static void virtio_9p_pci_instance_init(Object *obj) static void virtio_9p_pci_instance_init(Object *obj)
{ {
V9fsPCIState *dev = VIRTIO_9P_PCI(obj); V9fsPCIState *dev = VIRTIO_9P_PCI(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_9P); object_initialize(&dev->vdev, TYPE_VIRTIO_9P);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -1078,7 +1078,7 @@ static void virtio_blk_pci_class_init(ObjectClass *klass, void *data)
static void virtio_blk_pci_instance_init(Object *obj) static void virtio_blk_pci_instance_init(Object *obj)
{ {
VirtIOBlkPCI *dev = VIRTIO_BLK_PCI(obj); VirtIOBlkPCI *dev = VIRTIO_BLK_PCI(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_BLK); object_initialize(&dev->vdev, TYPE_VIRTIO_BLK);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -1148,7 +1148,7 @@ static void virtio_scsi_pci_class_init(ObjectClass *klass, void *data)
static void virtio_scsi_pci_instance_init(Object *obj) static void virtio_scsi_pci_instance_init(Object *obj)
{ {
VirtIOSCSIPCI *dev = VIRTIO_SCSI_PCI(obj); VirtIOSCSIPCI *dev = VIRTIO_SCSI_PCI(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SCSI); object_initialize(&dev->vdev, TYPE_VIRTIO_SCSI);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -1205,7 +1205,7 @@ static void vhost_scsi_pci_class_init(ObjectClass *klass, void *data)
static void vhost_scsi_pci_instance_init(Object *obj) static void vhost_scsi_pci_instance_init(Object *obj)
{ {
VHostSCSIPCI *dev = VHOST_SCSI_PCI(obj); VHostSCSIPCI *dev = VHOST_SCSI_PCI(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VHOST_SCSI); object_initialize(&dev->vdev, TYPE_VHOST_SCSI);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -1286,7 +1286,7 @@ static void virtio_balloon_pci_class_init(ObjectClass *klass, void *data)
static void virtio_balloon_pci_instance_init(Object *obj) static void virtio_balloon_pci_instance_init(Object *obj)
{ {
VirtIOBalloonPCI *dev = VIRTIO_BALLOON_PCI(obj); VirtIOBalloonPCI *dev = VIRTIO_BALLOON_PCI(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_BALLOON); object_initialize(&dev->vdev, TYPE_VIRTIO_BALLOON);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
object_property_add(obj, "guest-stats", "guest statistics", object_property_add(obj, "guest-stats", "guest statistics",
@ -1372,7 +1372,7 @@ static void virtio_serial_pci_class_init(ObjectClass *klass, void *data)
static void virtio_serial_pci_instance_init(Object *obj) static void virtio_serial_pci_instance_init(Object *obj)
{ {
VirtIOSerialPCI *dev = VIRTIO_SERIAL_PCI(obj); VirtIOSerialPCI *dev = VIRTIO_SERIAL_PCI(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_SERIAL); object_initialize(&dev->vdev, TYPE_VIRTIO_SERIAL);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -1431,7 +1431,7 @@ static void virtio_net_pci_class_init(ObjectClass *klass, void *data)
static void virtio_net_pci_instance_init(Object *obj) static void virtio_net_pci_instance_init(Object *obj)
{ {
VirtIONetPCI *dev = VIRTIO_NET_PCI(obj); VirtIONetPCI *dev = VIRTIO_NET_PCI(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_NET); object_initialize(&dev->vdev, TYPE_VIRTIO_NET);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
} }
@ -1487,7 +1487,7 @@ static void virtio_rng_pci_class_init(ObjectClass *klass, void *data)
static void virtio_rng_initfn(Object *obj) static void virtio_rng_initfn(Object *obj)
{ {
VirtIORngPCI *dev = VIRTIO_RNG_PCI(obj); VirtIORngPCI *dev = VIRTIO_RNG_PCI(obj);
object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_RNG); object_initialize(&dev->vdev, TYPE_VIRTIO_RNG);
object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL);
object_property_add_link(obj, "rng", TYPE_RNG_BACKEND, object_property_add_link(obj, "rng", TYPE_RNG_BACKEND,
(Object **)&dev->vdev.conf.rng, NULL); (Object **)&dev->vdev.conf.rng, NULL);