diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-22 13:31:17 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-22 13:31:17 -0500 |
| commit | a9b670b139ed381bd07df08bdfdcb515dff3ca8c (patch) | |
| tree | 59e4e8489ef3dfbb90635b3dc9ed805b8aef973c /hw/virtio-scsi.c | |
| parent | 7b2f89c435f895431d55b675dc412275c2069314 (diff) | |
| parent | 07a5298c3067ed63f7d82d8c1a6f479146447289 (diff) | |
| download | focaccia-qemu-a9b670b139ed381bd07df08bdfdcb515dff3ca8c.tar.gz focaccia-qemu-a9b670b139ed381bd07df08bdfdcb515dff3ca8c.zip | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* bonzini/scsi-next: virtio-scsi: add backwards-compatibility properties for 1.1 and earlier machines iscsi: fix races between task completion and abort iscsi: simplify iscsi_schedule_bh iscsi: move iscsi_schedule_bh and iscsi_readv_writev_bh_cb Revert "iscsi: Fix NULL dereferences / races between task completion and abort"
Diffstat (limited to 'hw/virtio-scsi.c')
| -rw-r--r-- | hw/virtio-scsi.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c index 5f737acd97..c1b47a8f4d 100644 --- a/hw/virtio-scsi.c +++ b/hw/virtio-scsi.c @@ -24,11 +24,6 @@ #define VIRTIO_SCSI_MAX_TARGET 255 #define VIRTIO_SCSI_MAX_LUN 16383 -/* Feature Bits */ -#define VIRTIO_SCSI_F_INOUT 0 -#define VIRTIO_SCSI_F_HOTPLUG 1 -#define VIRTIO_SCSI_F_CHANGE 2 - /* Response codes */ #define VIRTIO_SCSI_S_OK 0 #define VIRTIO_SCSI_S_OVERRUN 1 @@ -561,8 +556,6 @@ static void virtio_scsi_set_config(VirtIODevice *vdev, static uint32_t virtio_scsi_get_features(VirtIODevice *vdev, uint32_t requested_features) { - requested_features |= (1UL << VIRTIO_SCSI_F_HOTPLUG); - requested_features |= (1UL << VIRTIO_SCSI_F_CHANGE); return requested_features; } |