diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-28 17:09:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-28 17:09:56 +0100 |
| commit | 170f209d7848dc2f14b3f3dccc34a49558680d4d (patch) | |
| tree | 174270b1aaaa14a3ea9efb21687535274d7bd829 /hw/scsi | |
| parent | 8b89b3a8df0a7d1ddbc9744f66a495986af667ca (diff) | |
| parent | c147b5153e733a14fc65d2098e7036754c185ad1 (diff) | |
| download | qemu-170f209d7848dc2f14b3f3dccc34a49558680d4d.tar.gz qemu-170f209d7848dc2f14b3f3dccc34a49558680d4d.tar.bz2 qemu-170f209d7848dc2f14b3f3dccc34a49558680d4d.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio fixes for 2.4
Mostly virtio 1 spec compliance fixes.
We are unlikely to make it perfectly compliant in
the first release, but it seems worth it to try.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon Jul 27 21:55:48 2015 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
virtio: minor cleanup
acpi: fix pvpanic device is not shown in ui
virtio-blk: only clear VIRTIO_F_ANY_LAYOUT for legacy device
virtio-blk: fail get_features when both scsi and 1.0 were set
virtio: get_features() can fail
virtio-pci: fix memory MR cleanup for modern
virtio: set any_layout in virtio core
virtio-9p: fix any_layout
virtio-serial: fix ANY_LAYOUT
virtio: hide legacy features from modern guests
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/scsi')
| -rw-r--r-- | hw/scsi/vhost-scsi.c | 3 | ||||
| -rw-r--r-- | hw/scsi/virtio-scsi.c | 5 |
2 files changed, 4 insertions, 4 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 f7d3c7c48a..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); @@ -953,8 +954,6 @@ static Property virtio_scsi_properties[] = { 0xFFFF), DEFINE_PROP_UINT32("cmd_per_lun", VirtIOSCSI, parent_obj.conf.cmd_per_lun, 128), - DEFINE_PROP_BIT("any_layout", VirtIOSCSI, host_features, - VIRTIO_F_ANY_LAYOUT, true), DEFINE_PROP_BIT("hotplug", VirtIOSCSI, host_features, VIRTIO_SCSI_F_HOTPLUG, true), DEFINE_PROP_BIT("param_change", VirtIOSCSI, host_features, |