diff options
| author | Jason Wang | 2015-07-27 11:49:19 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-07-27 17:11:53 +0200 |
| commit | 9d5b731dd2d64deb3bc798ef4e3c08603d54ae02 (patch) | |
| tree | f48bb5d3ac1a11ab88e4fe3255f80b3398cc4ae2 /hw/scsi | |
| parent | virtio-pci: fix memory MR cleanup for modern (diff) | |
| download | qemu-9d5b731dd2d64deb3bc798ef4e3c08603d54ae02.tar.gz qemu-9d5b731dd2d64deb3bc798ef4e3c08603d54ae02.tar.xz 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/scsi')
| -rw-r--r-- | hw/scsi/vhost-scsi.c | 3 | ||||
| -rw-r--r-- | hw/scsi/virtio-scsi.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 52549f8beb..a69918bef8 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -153,7 +153,8 @@ static void vhost_scsi_stop(VHostSCSI *s) } static uint64_t vhost_scsi_get_features(VirtIODevice *vdev, - uint64_t features) + uint64_t features, + Error **errp) { VHostSCSI *s = VHOST_SCSI(vdev); diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index d17698d0d3..811c3da8bd 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -629,7 +629,8 @@ static void virtio_scsi_set_config(VirtIODevice *vdev, } static uint64_t virtio_scsi_get_features(VirtIODevice *vdev, - uint64_t requested_features) + uint64_t requested_features, + Error **errp) { VirtIOSCSI *s = VIRTIO_SCSI(vdev); |