From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRLOS-000189-Tj for qemu-devel@nongnu.org; Fri, 27 Feb 2015 08:55:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRLOH-0007QE-5e for qemu-devel@nongnu.org; Fri, 27 Feb 2015 08:55:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58515) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRLOG-0007Pq-Cd for qemu-devel@nongnu.org; Fri, 27 Feb 2015 08:55:40 -0500 From: Markus Armbruster Date: Fri, 27 Feb 2015 14:55:36 +0100 Message-Id: <1425045337-20138-2-git-send-email-armbru@redhat.com> In-Reply-To: <1425045337-20138-1-git-send-email-armbru@redhat.com> References: <1425045337-20138-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] virtio-s390: s390_virtio_device_init() can't fail, simplify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agraf@suse.de, mst@redhat.com Signed-off-by: Markus Armbruster --- hw/s390x/s390-virtio-bus.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 39dc201..f69ff11 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -111,7 +111,8 @@ VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size) return bus; } -static int s390_virtio_device_init(VirtIOS390Device *dev, VirtIODevice *vdev) +static void s390_virtio_device_init(VirtIOS390Device *dev, + VirtIODevice *vdev) { VirtIOS390Bus *bus; int dev_len; @@ -135,8 +136,6 @@ static int s390_virtio_device_init(VirtIOS390Device *dev, VirtIODevice *vdev) if (dev->qdev.hotplugged) { s390_virtio_irq(VIRTIO_PARAM_DEV_ADD, dev->dev_offs); } - - return 0; } static int s390_virtio_net_init(VirtIOS390Device *s390_dev) @@ -153,7 +152,8 @@ static int s390_virtio_net_init(VirtIOS390Device *s390_dev) return -1; } - return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + return 0; } static void s390_virtio_net_instance_init(Object *obj) @@ -174,7 +174,8 @@ static int s390_virtio_blk_init(VirtIOS390Device *s390_dev) if (qdev_init(vdev) < 0) { return -1; } - return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + return 0; } static void s390_virtio_blk_instance_init(Object *obj) @@ -215,12 +216,9 @@ static int s390_virtio_serial_init(VirtIOS390Device *s390_dev) return -1; } - r = s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); - if (!r) { - bus->console = s390_dev; - } - - return r; + s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + bus->console = s390_dev; + return 0; } static void s390_virtio_serial_instance_init(Object *obj) @@ -253,7 +251,8 @@ static int s390_virtio_scsi_init(VirtIOS390Device *s390_dev) return -1; } - return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + return 0; } static void s390_virtio_scsi_instance_init(Object *obj) @@ -275,7 +274,8 @@ static int s390_vhost_scsi_init(VirtIOS390Device *s390_dev) return -1; } - return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + return 0; } static void s390_vhost_scsi_instance_init(Object *obj) @@ -302,7 +302,8 @@ static int s390_virtio_rng_init(VirtIOS390Device *s390_dev) OBJECT(dev->vdev.conf.rng), "rng", NULL); - return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + return 0; } static void s390_virtio_rng_instance_init(Object *obj) -- 1.9.3