[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/20] virtio-s390: s390_virtio_device_init() can't f
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 12/20] virtio-s390: s390_virtio_device_init() can't fail, simplify |
Date: |
Tue, 10 Mar 2015 09:38:05 +0100 |
From: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
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
- [Qemu-devel] [PULL 01/20] synchronize Linux headers to 4.0-rc3, (continued)
- [Qemu-devel] [PULL 01/20] synchronize Linux headers to 4.0-rc3, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 20/20] s390-ccw: rebuild BIOS, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 11/20] s390x/kvm: enable the new SIGP handling in user space, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 16/20] s390-ccw.img: Allow bigger ramdisk sizes or offsets, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 17/20] s390-ccw.img: Reinitialize guessing on reboot, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 18/20] elf-loader: Provide the possibility to relocate s390 ELF files, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 03/20] s390x/kvm: more details for SIGP handler with one destination vcpu, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 09/20] s390x: add function to deliver restart irqs, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 13/20] virtio-s390: Convert to realize(), Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 07/20] s390x/kvm: implement handling of new SIGP orders, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 12/20] virtio-s390: s390_virtio_device_init() can't fail, simplify,
Christian Borntraeger <=
- [Qemu-devel] [PULL 19/20] s390/bios: Make the s390-ccw.img relocatable, Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 14/20] virtio-ccw: Convert to realize(), Christian Borntraeger, 2015/03/10
- [Qemu-devel] [PULL 15/20] s390x/kvm: passing max memory size to accelerator, Christian Borntraeger, 2015/03/10
- Re: [Qemu-devel] [PULL 00/20] s390x/kvm: Features and fixes for 2.3, Peter Maydell, 2015/03/10
- Re: [Qemu-devel] [PULL 00/20] s390x/kvm: Features and fixes for 2.3, Christian Borntraeger, 2015/03/10
- Re: [Qemu-devel] [PULL 00/20] s390x/kvm: Features and fixes for 2.3, Markus Armbruster, 2015/03/11
- Re: [Qemu-devel] [PULL 00/20] s390x/kvm: Features and fixes for 2.3, Thomas Huth, 2015/03/11
- Re: [Qemu-devel] [PULL 00/20] s390x/kvm: Features and fixes for 2.3, Christian Borntraeger, 2015/03/11
- Re: [Qemu-devel] [PULL 00/20] s390x/kvm: Features and fixes for 2.3, Thomas Huth, 2015/03/11
- Re: [Qemu-devel] [PULL 00/20] s390x/kvm: Features and fixes for 2.3, Christian Borntraeger, 2015/03/11