diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-14 08:50:45 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-14 08:50:45 -0600 |
| commit | 5f580e9411a24b7decc07013edeb8abf8d5ae25c (patch) | |
| tree | b5f0120fc2acc4080d09ecd903c647b4e8140bbd /hw/megasas.c | |
| parent | ce5e5b522e8d3b848b6445c34226b69c77c46403 (diff) | |
| parent | dd72fdd06268860a24f9f3828efade547ee2e2a9 (diff) | |
| download | focaccia-qemu-5f580e9411a24b7decc07013edeb8abf8d5ae25c.tar.gz focaccia-qemu-5f580e9411a24b7decc07013edeb8abf8d5ae25c.zip | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* bonzini/scsi-next: virtio-scsi: use dma_context_memory dma: Define dma_context_memory and use in sysbus-ohci megasas: Correct target/lun mapping scsi-disk: flush cache after disabling it megasas: do not include block_int.h scsi: remove superfluous call to scsi_device_set_ua virtio-scsi: factor checks for VIRTIO_SCSI_S_DRIVER_OK when reporting events scsi: do not return short responses for emulated commands Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/megasas.c')
| -rw-r--r-- | hw/megasas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/megasas.c b/hw/megasas.c index 7a2036eb76..291ff40403 100644 --- a/hw/megasas.c +++ b/hw/megasas.c @@ -25,7 +25,6 @@ #include "iov.h" #include "scsi.h" #include "scsi-defs.h" -#include "block_int.h" #include "trace.h" #include "mfi.h" @@ -1080,6 +1079,7 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, MegasasCmd *cmd) /* Logical device size is in blocks */ bdrv_get_geometry(conf->bs, &ld_size); info.ld_list[num_ld_disks].ld.v.target_id = sdev->id; + info.ld_list[num_ld_disks].ld.v.lun_id = sdev->lun; info.ld_list[num_ld_disks].state = MFI_LD_STATE_OPTIMAL; info.ld_list[num_ld_disks].size = cpu_to_le64(ld_size); num_ld_disks++; |