motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 17:23:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qdev: add return value to init() callbacks.

Browse source 
Sorry folks, but it has to be.  One more of these invasive qdev patches.

We have a serious design bug in the qdev interface:  device init
callbacks can't signal failure because the init() callback has no
return value.  This patch fixes it.

We have already one case in-tree where this is needed:
Try -device virtio-blk-pci (without drive= specified) and watch qemu
segfault.  This patch fixes it.

With usb+scsi being converted to qdev we'll get more devices where the
init callback can fail for various reasons.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-08-14 10:36:05 +02:00 • committed by Anthony Liguori
parent 24e6f3551f
commit 81a322d4a1
102 changed files with 334 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hw/max111x.c
View file

@ -125,7 +125,7 @@ static int max111x_load(QEMUFile *f, void *opaque, int version_id)
return 0;
}
static void max111x_init(SSISlave *dev, int inputs)
static int max111x_init(SSISlave *dev, int inputs)
{
MAX111xState *s = FROM_SSI_SLAVE(MAX111xState, dev);
@ -144,16 +144,17 @@ static void max111x_init(SSISlave *dev, int inputs)
s->com = 0;
register_savevm("max111x", -1, 0, max111x_save, max111x_load, s);
return 0;
}
static void max1110_init(SSISlave *dev)
static int max1110_init(SSISlave *dev)
{
max111x_init(dev, 8);
return max111x_init(dev, 8);
}
static void max1111_init(SSISlave *dev)
static int max1111_init(SSISlave *dev)
{
max111x_init(dev, 4);
return max111x_init(dev, 4);
}
void max111x_set_input(DeviceState *dev, int line, uint8_t value)