falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio: device_plugged() can fail 

This patch passes error pointer to transport specific device_plugged()
callback. Through this way, device_plugged() can do some transport
specific check and fail. This will be uesd by following patches that
check the number of virtqueues against the transport limitation.

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jason Wang 2015-05-29 14:15:25 +08:00 committed by Michael S. Tsirkin
parent da51a335aa
commit e83980455c
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/virtio-ccw.c
View File

@ -1378,7 +1378,7 @@ static int virtio_ccw_load_config(DeviceState *d, QEMUFile *f)
} }
/* This is called by virtio-bus just after the device is plugged. */ /* This is called by virtio-bus just after the device is plugged. */
static void virtio_ccw_device_plugged(DeviceState *d) static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
{ {
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d); VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
SubchDev *sch = dev->sch; SubchDev *sch = dev->sch;

5
hw/virtio/virtio-bus.c
View File

@ -38,7 +38,7 @@ do { printf("virtio_bus: " fmt , ## __VA_ARGS__); } while (0)
#endif #endif
/* A VirtIODevice is being plugged */ /* A VirtIODevice is being plugged */
int virtio_bus_device_plugged(VirtIODevice *vdev) void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp)
{ {
DeviceState *qdev = DEVICE(vdev); DeviceState *qdev = DEVICE(vdev);
BusState *qbus = BUS(qdev_get_parent_bus(qdev)); BusState *qbus = BUS(qdev_get_parent_bus(qdev));
@ -49,13 +49,12 @@ int virtio_bus_device_plugged(VirtIODevice *vdev)
DPRINTF("%s: plug device.\n", qbus->name); DPRINTF("%s: plug device.\n", qbus->name);
if (klass->device_plugged != NULL) { if (klass->device_plugged != NULL) {
klass->device_plugged(qbus->parent); klass->device_plugged(qbus->parent, errp);
} }
/* Get the features of the plugged device. */ /* Get the features of the plugged device. */
assert(vdc->get_features != NULL); assert(vdc->get_features != NULL);
vdev->host_features = vdc->get_features(vdev, vdev->host_features); vdev->host_features = vdc->get_features(vdev, vdev->host_features);
return 0;
} }
/* Reset the virtio_bus */ /* Reset the virtio_bus */

2
hw/virtio/virtio-pci.c
View File

@ -912,7 +912,7 @@ static int virtio_pci_query_nvectors(DeviceState *d)
} }
/* This is called by virtio-bus just after the device is plugged. */ /* This is called by virtio-bus just after the device is plugged. */
static void virtio_pci_device_plugged(DeviceState *d) static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
{ {
VirtIOPCIProxy *proxy = VIRTIO_PCI(d); VirtIOPCIProxy *proxy = VIRTIO_PCI(d);
VirtioBusState *bus = &proxy->bus; VirtioBusState *bus = &proxy->bus;

7
hw/virtio/virtio.c
View File

@ -1323,7 +1323,12 @@ static void virtio_device_realize(DeviceState *dev, Error **errp)
return; return;
} }
} }
virtio_bus_device_plugged(vdev);
virtio_bus_device_plugged(vdev, &err);
if (err != NULL) {
error_propagate(errp, err);
return;
}
} }
static void virtio_device_unrealize(DeviceState *dev, Error **errp) static void virtio_device_unrealize(DeviceState *dev, Error **errp)

4
include/hw/virtio/virtio-bus.h
View File

@ -55,7 +55,7 @@ typedef struct VirtioBusClass {
* transport independent init function. * transport independent init function.
* This is called by virtio-bus just after the device is plugged. * This is called by virtio-bus just after the device is plugged.
*/ */
void (*device_plugged)(DeviceState *d); void (*device_plugged)(DeviceState *d, Error **errp);
/* /*
* transport independent exit function. * transport independent exit function.
* This is called by virtio-bus just before the device is unplugged. * This is called by virtio-bus just before the device is unplugged.
@ -74,7 +74,7 @@ struct VirtioBusState {
BusState parent_obj; BusState parent_obj;
}; };
int virtio_bus_device_plugged(VirtIODevice *vdev); void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp);
void virtio_bus_reset(VirtioBusState *bus); void virtio_bus_reset(VirtioBusState *bus);
void virtio_bus_device_unplugged(VirtIODevice *bus); void virtio_bus_device_unplugged(VirtIODevice *bus);
/* Get the device id of the plugged device. */ /* Get the device id of the plugged device. */