commit 550fe6c6fc3cfcb9ed62340492326ae86b4329de
author Laszlo Ast <laszlo.ast@siemens-enterprise.com> Thu Nov 19 11:07:12 2009 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Thu Dec 03 15:25:57 2009 -0600
tree 36b59d41234206c22a2a5ffed71dd2dbe986828a
parent a0fb002c6462d21ceb9eac8c5772e469ec189374

SCSI: Fix Standard INQUIRY data

Vendor identification, product identification and product revision level
should be padded with spaces without a terminating NULL character, see
SCSI-2 standard, 8.2.5.1 Standard INQUIRY data.

Signed-off-by: Laszlo Ast <laszlo.ast@siemens-enterprise.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

hw/scsi-disk.c

diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 67e3008..642d791 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -424,12 +424,12 @@
     if (bdrv_get_type_hint(bdrv) == BDRV_TYPE_CDROM) {
         outbuf[0] = 5;
         outbuf[1] = 0x80;
-        memcpy(&outbuf[16], "QEMU CD-ROM    ", 16);
+        memcpy(&outbuf[16], "QEMU CD-ROM     ", 16);
     } else {
         outbuf[0] = 0;
-        memcpy(&outbuf[16], "QEMU HARDDISK  ", 16);
+        memcpy(&outbuf[16], "QEMU HARDDISK   ", 16);
     }
-    memcpy(&outbuf[8], "QEMU   ", 8);
+    memcpy(&outbuf[8], "QEMU    ", 8);
     memcpy(&outbuf[32], QEMU_VERSION, 4);
     /* Identify device as SCSI-3 rev 1.
        Some later commands are also implemented. */