diff options
| author | Jason Wang <jasowang@redhat.com> | 2015-05-29 14:15:25 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 16:44:12 +0200 |
| commit | e83980455c8c7eb066405de512be7c4bace3ac4d (patch) | |
| tree | f7645a8c93fef52e18a3f5cf9a49265e22a0566e /hw/virtio/virtio-bus.c | |
| parent | da51a335aa61ec0e45879d80f3c5e2ee4f87cd2f (diff) | |
| download | focaccia-qemu-e83980455c8c7eb066405de512be7c4bace3ac4d.tar.gz focaccia-qemu-e83980455c8c7eb066405de512be7c4bace3ac4d.zip | |
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>
Diffstat (limited to 'hw/virtio/virtio-bus.c')
| -rw-r--r-- | hw/virtio/virtio-bus.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index fac452bd1d..3926f7ee1e 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -38,7 +38,7 @@ do { printf("virtio_bus: " fmt , ## __VA_ARGS__); } while (0) #endif /* 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); 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); if (klass->device_plugged != NULL) { - klass->device_plugged(qbus->parent); + klass->device_plugged(qbus->parent, errp); } /* Get the features of the plugged device. */ assert(vdc->get_features != NULL); vdev->host_features = vdc->get_features(vdev, vdev->host_features); - return 0; } /* Reset the virtio_bus */ |