[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/5] scsi-disk: Mask out serial number EVPD
From: |
Hannes Reinecke |
Subject: |
[Qemu-devel] [PATCH 4/5] scsi-disk: Mask out serial number EVPD |
Date: |
Tue, 5 Jul 2011 13:03:34 +0200 |
If the serial number is not set we should mask it out in the
list of supported VPD pages and mark it as not supported.
Signed-off-by: Hannes Reinecke <address@hidden>
---
hw/scsi-disk.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 5804662..05d14ab 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -398,7 +398,8 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req,
uint8_t *outbuf)
"buffer size %zd\n", req->cmd.xfer);
pages = buflen++;
outbuf[buflen++] = 0x00; // list of supported pages (this page)
- outbuf[buflen++] = 0x80; // unit serial number
+ if (s->serial)
+ outbuf[buflen++] = 0x80; // unit serial number
outbuf[buflen++] = 0x83; // device identification
if (s->drive_kind == SCSI_HD) {
outbuf[buflen++] = 0xb0; // block limits
@@ -409,8 +410,14 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req,
uint8_t *outbuf)
}
case 0x80: /* Device serial number, optional */
{
- int l = strlen(s->serial);
+ int l;
+ if (!s->serial) {
+ DPRINTF("Inquiry (EVPD[Serial number] not supported\n");
+ return -1;
+ }
+
+ l = strlen(s->serial);
if (l > req->cmd.xfer)
l = req->cmd.xfer;
if (l > 20)
@@ -1203,7 +1210,9 @@ static int scsi_initfn(SCSIDevice *dev, SCSIDriveKind
kind)
if (!s->serial) {
/* try to fall back to value set with legacy -drive serial=... */
dinfo = drive_get_by_blockdev(s->bs);
- s->serial = qemu_strdup(*dinfo->serial ? dinfo->serial : "0");
+ if (*dinfo->serial) {
+ s->serial = qemu_strdup(dinfo->serial);
+ }
}
if (!s->version) {
--
1.7.3.4
- [Qemu-devel] [PATCH 0/5][v6] Megasas HBA emulation, Hannes Reinecke, 2011/07/05
- [Qemu-devel] [PATCH 1/5] iov: Update parameter usage in iov_(to|from)_buf(), Hannes Reinecke, 2011/07/05
- [Qemu-devel] [PATCH 2/5] scsi: Add 'hba_private' to SCSIRequest, Hannes Reinecke, 2011/07/05
- [Qemu-devel] [PATCH 3/5] scsi-disk: Fixup debugging statement, Hannes Reinecke, 2011/07/05
- [Qemu-devel] [PATCH 4/5] scsi-disk: Mask out serial number EVPD,
Hannes Reinecke <=
- [Qemu-devel] [PATCH 5/5] megasas: LSI Megaraid SAS emulation, Hannes Reinecke, 2011/07/05
- Re: [Qemu-devel] [PATCH 5/5] megasas: LSI Megaraid SAS emulation, Alexander Graf, 2011/07/05
- Re: [Qemu-devel] [PATCH 5/5] megasas: LSI Megaraid SAS emulation, Alexander Graf, 2011/07/05
- Re: [Qemu-devel] [PATCH 5/5] megasas: LSI Megaraid SAS emulation, Paolo Bonzini, 2011/07/05
- Re: [Qemu-devel] [PATCH 5/5] megasas: LSI Megaraid SAS emulation, Alexander Graf, 2011/07/05
- Re: [Qemu-devel] [PATCH 5/5] megasas: LSI Megaraid SAS emulation, Stefan Hajnoczi, 2011/07/05
- Re: [Qemu-devel] [PATCH 5/5] megasas: LSI Megaraid SAS emulation, Hannes Reinecke, 2011/07/06
- Re: [Qemu-devel] [PATCH 5/5] megasas: LSI Megaraid SAS emulation, Paolo Bonzini, 2011/07/06
- Re: [Qemu-devel] [PATCH 4/5] scsi-disk: Mask out serial number EVPD, Paolo Bonzini, 2011/07/05
- Re: [Qemu-devel] [PATCH 3/5] scsi-disk: Fixup debugging statement, Paolo Bonzini, 2011/07/05