From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFUOM-0005cA-Dp for qemu-devel@nongnu.org; Fri, 30 Aug 2013 15:30:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFUOG-00008P-IQ for qemu-devel@nongnu.org; Fri, 30 Aug 2013 15:29:58 -0400 Received: from cantor2.suse.de ([195.135.220.15]:54884 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFUOG-00007n-5l for qemu-devel@nongnu.org; Fri, 30 Aug 2013 15:29:52 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 30 Aug 2013 21:29:28 +0200 Message-Id: <1377890983-6481-3-git-send-email-afaerber@suse.de> In-Reply-To: <1377890983-6481-1-git-send-email-afaerber@suse.de> References: <1377890983-6481-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 02/17] virtio: Remove unnecessary OBJECT() casts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Alexander Graf , Anthony Liguori , Cornelia Huck , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson From: Peter Maydell There's no need to cast the first argument of object_initialize() to Object. Remove these unnecessary casts. Signed-off-by: Peter Maydell Signed-off-by: Andreas F=C3=A4rber --- hw/s390x/s390-virtio-bus.c | 12 ++++++------ hw/s390x/virtio-ccw.c | 14 +++++++------- hw/virtio/virtio-pci.c | 16 ++++++++-------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index f0aa941..e46b8c8 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -170,7 +170,7 @@ static int s390_virtio_net_init(VirtIOS390Device *s39= 0_dev) static void s390_virtio_net_instance_init(Object *obj) { VirtIONetS390 *dev =3D 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); } =20 @@ -189,7 +189,7 @@ static int s390_virtio_blk_init(VirtIOS390Device *s39= 0_dev) static void s390_virtio_blk_instance_init(Object *obj) { VirtIOBlkS390 *dev =3D 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); } =20 @@ -230,7 +230,7 @@ static int s390_virtio_serial_init(VirtIOS390Device *= s390_dev) static void s390_virtio_serial_instance_init(Object *obj) { VirtIOSerialS390 *dev =3D 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); } =20 @@ -262,7 +262,7 @@ static int s390_virtio_scsi_init(VirtIOS390Device *s3= 90_dev) static void s390_virtio_scsi_instance_init(Object *obj) { VirtIOSCSIS390 *dev =3D 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); } =20 @@ -283,7 +283,7 @@ static int s390_vhost_scsi_init(VirtIOS390Device *s39= 0_dev) static void s390_vhost_scsi_instance_init(Object *obj) { VHostSCSIS390 *dev =3D 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); } #endif @@ -309,7 +309,7 @@ static int s390_virtio_rng_init(VirtIOS390Device *s39= 0_dev) static void s390_virtio_rng_instance_init(Object *obj) { VirtIORNGS390 *dev =3D 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_link(obj, "rng", TYPE_RNG_BACKEND, (Object **)&dev->vdev.conf.rng, NULL); diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 8835bd4..e3b207f 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -659,7 +659,7 @@ static int virtio_ccw_net_init(VirtioCcwDevice *ccw_d= ev) static void virtio_ccw_net_instance_init(Object *obj) { VirtIONetCcw *dev =3D 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); } =20 @@ -679,7 +679,7 @@ static int virtio_ccw_blk_init(VirtioCcwDevice *ccw_d= ev) static void virtio_ccw_blk_instance_init(Object *obj) { VirtIOBlkCcw *dev =3D 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); } =20 @@ -712,7 +712,7 @@ static int virtio_ccw_serial_init(VirtioCcwDevice *cc= w_dev) static void virtio_ccw_serial_instance_init(Object *obj) { VirtioSerialCcw *dev =3D 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); } =20 @@ -758,7 +758,7 @@ static void balloon_ccw_stats_set_poll_interval(Objec= t *obj, struct Visitor *v, static void virtio_ccw_balloon_instance_init(Object *obj) { VirtIOBalloonCcw *dev =3D 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); =20 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) { VirtIOSCSICcw *dev =3D 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); } =20 @@ -819,7 +819,7 @@ static int vhost_ccw_scsi_init(VirtioCcwDevice *ccw_d= ev) static void vhost_ccw_scsi_instance_init(Object *obj) { VHostSCSICcw *dev =3D 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); } #endif @@ -1170,7 +1170,7 @@ static const TypeInfo vhost_ccw_scsi =3D { static void virtio_ccw_rng_instance_init(Object *obj) { VirtIORNGCcw *dev =3D 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_link(obj, "rng", TYPE_RNG_BACKEND, (Object **)&dev->vdev.conf.rng, NULL); diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index f2c489b..8df43d6 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -918,7 +918,7 @@ static void virtio_9p_pci_class_init(ObjectClass *kla= ss, void *data) static void virtio_9p_pci_instance_init(Object *obj) { V9fsPCIState *dev =3D 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); } =20 @@ -1078,7 +1078,7 @@ static void virtio_blk_pci_class_init(ObjectClass *= klass, void *data) static void virtio_blk_pci_instance_init(Object *obj) { VirtIOBlkPCI *dev =3D 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); } =20 @@ -1148,7 +1148,7 @@ static void virtio_scsi_pci_class_init(ObjectClass = *klass, void *data) static void virtio_scsi_pci_instance_init(Object *obj) { VirtIOSCSIPCI *dev =3D 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); } =20 @@ -1205,7 +1205,7 @@ static void vhost_scsi_pci_class_init(ObjectClass *= klass, void *data) static void vhost_scsi_pci_instance_init(Object *obj) { VHostSCSIPCI *dev =3D 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); } =20 @@ -1286,7 +1286,7 @@ static void virtio_balloon_pci_class_init(ObjectCla= ss *klass, void *data) static void virtio_balloon_pci_instance_init(Object *obj) { VirtIOBalloonPCI *dev =3D 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); =20 object_property_add(obj, "guest-stats", "guest statistics", @@ -1372,7 +1372,7 @@ static void virtio_serial_pci_class_init(ObjectClas= s *klass, void *data) static void virtio_serial_pci_instance_init(Object *obj) { VirtIOSerialPCI *dev =3D 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); } =20 @@ -1431,7 +1431,7 @@ static void virtio_net_pci_class_init(ObjectClass *= klass, void *data) static void virtio_net_pci_instance_init(Object *obj) { VirtIONetPCI *dev =3D 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); } =20 @@ -1487,7 +1487,7 @@ static void virtio_rng_pci_class_init(ObjectClass *= klass, void *data) static void virtio_rng_initfn(Object *obj) { VirtIORngPCI *dev =3D 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_link(obj, "rng", TYPE_RNG_BACKEND, (Object **)&dev->vdev.conf.rng, NULL); --=20 1.8.1.4