From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QgG9b-0004rS-34 for qemu-devel@nongnu.org; Mon, 11 Jul 2011 09:04:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QgG9W-0006se-4h for qemu-devel@nongnu.org; Mon, 11 Jul 2011 09:04:02 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36857 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QgG9V-0006sY-PN for qemu-devel@nongnu.org; Mon, 11 Jul 2011 09:03:58 -0400 From: Hannes Reinecke Date: Mon, 11 Jul 2011 15:02:26 +0200 Message-Id: <1310389346-30790-5-git-send-email-hare@suse.de> In-Reply-To: <1310389346-30790-4-git-send-email-hare@suse.de> References: <1310389346-30790-1-git-send-email-hare@suse.de> <1310389346-30790-2-git-send-email-hare@suse.de> <1310389346-30790-3-git-send-email-hare@suse.de> <1310389346-30790-4-git-send-email-hare@suse.de> Subject: [Qemu-devel] [PATCH 4/4] scsi-disk: Mask out serial number EVPD List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Hannes Reinecke , Stefan Haynoczi , kvm@vger.kernel.org, Alexander Graf 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 Acked-by: Paolo Bonzini --- 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