diff options
| author | Jason Wang <jasowang@redhat.com> | 2015-07-27 17:49:19 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-07-27 18:11:53 +0300 |
| commit | 9d5b731dd2d64deb3bc798ef4e3c08603d54ae02 (patch) | |
| tree | f48bb5d3ac1a11ab88e4fe3255f80b3398cc4ae2 /hw/virtio | |
| parent | 27462695cde2a2208b1ff8074c2e917b8203590b (diff) | |
| download | focaccia-qemu-9d5b731dd2d64deb3bc798ef4e3c08603d54ae02.tar.gz focaccia-qemu-9d5b731dd2d64deb3bc798ef4e3c08603d54ae02.zip | |
virtio: get_features() can fail
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> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/virtio')
| -rw-r--r-- | hw/virtio/virtio-balloon.c | 3 | ||||
| -rw-r--r-- | hw/virtio/virtio-bus.c | 3 | ||||
| -rw-r--r-- | hw/virtio/virtio-rng.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 2990f8de5d..3577b7af91 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -310,7 +310,8 @@ static void virtio_balloon_set_config(VirtIODevice *vdev, trace_virtio_balloon_set_config(dev->actual, oldactual); } -static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f) +static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f, + Error **errp) { VirtIOBalloon *dev = VIRTIO_BALLOON(vdev); f |= dev->host_features; diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c index 3926f7ee1e..febda76b94 100644 --- a/hw/virtio/virtio-bus.c +++ b/hw/virtio/virtio-bus.c @@ -54,7 +54,8 @@ void virtio_bus_device_plugged(VirtIODevice *vdev, Error **errp) /* Get the features of the plugged device. */ 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, + errp); } /* Reset the virtio_bus */ diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 6e5f022301..97d1541918 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -104,7 +104,7 @@ static void handle_input(VirtIODevice *vdev, VirtQueue *vq) virtio_rng_process(vrng); } -static uint64_t get_features(VirtIODevice *vdev, uint64_t f) +static uint64_t get_features(VirtIODevice *vdev, uint64_t f, Error **errp) { return f; } |