summaryrefslogtreecommitdiff
path: root/hw/block/virtio-blk.c
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2015-07-27 17:49:19 +0800
committerMichael S. Tsirkin <mst@redhat.com>2015-07-27 18:11:53 +0300
commit9d5b731dd2d64deb3bc798ef4e3c08603d54ae02 (patch)
treef48bb5d3ac1a11ab88e4fe3255f80b3398cc4ae2 /hw/block/virtio-blk.c
parent27462695cde2a2208b1ff8074c2e917b8203590b (diff)
downloadqemu-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/block/virtio-blk.c')
-rw-r--r--hw/block/virtio-blk.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 015b9b5718..a6cf008ac0 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -722,7 +722,8 @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
aio_context_release(blk_get_aio_context(s->blk));
}
-static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features)
+static uint64_t virtio_blk_get_features(VirtIODevice *vdev, uint64_t features,
+ Error **errp)
{
VirtIOBlock *s = VIRTIO_BLK(vdev);