From 61210a820ac477f9d44d523f9906a8744d4682b6 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 2 Oct 2012 17:25:47 +0200 Subject: [PATCH] --- yaml --- r: 334139 b: refs/heads/master c: 9da5f5ac6affad8dd8cd80f5cca26e4335e1728b h: refs/heads/master i: 334137: f03a8e3cd87ce3d4f253daf48af3351211d0d2c7 334135: 7b8a7cb72b788c53cc41cf90291f4fcd7410eb0e v: v3 --- [refs] | 2 +- trunk/drivers/scsi/virtio_scsi.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9b20bce668a0..a7eebf075d51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e9c9dfde00a6466441e93033cf2c37f720bdacf +refs/heads/master: 9da5f5ac6affad8dd8cd80f5cca26e4335e1728b diff --git a/trunk/drivers/scsi/virtio_scsi.c b/trunk/drivers/scsi/virtio_scsi.c index 7554d7856434..a7cf726bc747 100644 --- a/trunk/drivers/scsi/virtio_scsi.c +++ b/trunk/drivers/scsi/virtio_scsi.c @@ -677,7 +677,11 @@ static int __devinit virtscsi_probe(struct virtio_device *vdev) cmd_per_lun = virtscsi_config_get(vdev, cmd_per_lun) ?: 1; shost->cmd_per_lun = min_t(u32, cmd_per_lun, shost->can_queue); shost->max_sectors = virtscsi_config_get(vdev, max_sectors) ?: 0xFFFF; - shost->max_lun = virtscsi_config_get(vdev, max_lun) + 1; + + /* LUNs > 256 are reported with format 1, so they go in the range + * 16640-32767. + */ + shost->max_lun = virtscsi_config_get(vdev, max_lun) + 1 + 0x4000; shost->max_id = num_targets; shost->max_channel = 0; shost->max_cmd_len = VIRTIO_SCSI_CDB_SIZE;