From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVFg1-0002vg-Ga for qemu-devel@nongnu.org; Tue, 10 Mar 2015 04:38:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVFfs-0000or-8I for qemu-devel@nongnu.org; Tue, 10 Mar 2015 04:38:09 -0400 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:52001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVFfs-0000oE-0N for qemu-devel@nongnu.org; Tue, 10 Mar 2015 04:38:00 -0400 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 10 Mar 2015 08:37:59 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id B855617D806C for ; Tue, 10 Mar 2015 08:38:18 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2A8bvgJ66322608 for ; Tue, 10 Mar 2015 08:37:57 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2A8bt2q029617 for ; Tue, 10 Mar 2015 02:37:56 -0600 From: Christian Borntraeger Date: Tue, 10 Mar 2015 09:38:05 +0100 Message-Id: <1425976693-18087-13-git-send-email-borntraeger@de.ibm.com> In-Reply-To: <1425976693-18087-1-git-send-email-borntraeger@de.ibm.com> References: <1425976693-18087-1-git-send-email-borntraeger@de.ibm.com> Subject: [Qemu-devel] [PULL 12/20] virtio-s390: s390_virtio_device_init() can't fail, simplify List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Alexander Graf , Markus Armbruster , qemu-devel , Christian Borntraeger , Jens Freimann , Cornelia Huck , Richard Henderson From: Markus Armbruster Signed-off-by: Markus Armbruster Message-Id: <1425045337-20138-2-git-send-email-armbru@redhat.com> Acked-by: Michael S. Tsirkin Signed-off-by: Christian Borntraeger --- 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) -- 2.3.0