f375e62ad9
Fix libvirt + seccomp combo (bz #855162) Fix scsi hotplug crash (bz #879657) Fix QOM refcount crash (bz #881486)
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 8444d4c996120a2fc21547a784c258e639f1e8fb Mon Sep 17 00:00:00 2001
|
|
From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
|
|
Date: Fri, 14 Sep 2012 18:13:29 -0700
|
|
Subject: [PATCH] SCSI: Standard INQUIRY data should report HiSup flag as set.
|
|
|
|
QEMU as far as I know only reports LUN numbers using the modes that
|
|
are described in SAM4.
|
|
As such, since all LUN numbers generated by the SCSI emulation in QEMU
|
|
follow SAM4, we should set the HiSup bit in the standard INQUIRY data
|
|
to indicate such.
|
|
|
|
From SAM4:
|
|
4.6.3 LUNs overview
|
|
All LUN formats described in this standard are hierarchical in
|
|
structure even when only a single level in that hierarchy is used.
|
|
The HISUP bit shall be set to one in the standard INQUIRY data
|
|
(see SPC-4) when any LUN format described in this standard is used.
|
|
Non-hierarchical formats are outside the scope of this standard.
|
|
|
|
Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
|
|
(cherry picked from commit 1109c894052751df99962c009fd7dbae397721f5)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
hw/scsi-disk.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
|
|
index d621852..7ed1bde 100644
|
|
--- a/hw/scsi-disk.c
|
|
+++ b/hw/scsi-disk.c
|
|
@@ -678,7 +678,7 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf)
|
|
* is actually implemented, but we're good enough.
|
|
*/
|
|
outbuf[2] = 5;
|
|
- outbuf[3] = 2; /* Format 2 */
|
|
+ outbuf[3] = 2 | 0x10; /* Format 2, HiSup */
|
|
|
|
if (buflen > 36) {
|
|
outbuf[4] = buflen - 5; /* Additional Length = (Len - 1) - 4 */
|
|
--
|
|
1.8.0.2
|
|
|