From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qe3SQ-0000Gp-Sl for qemu-devel@nongnu.org; Tue, 05 Jul 2011 07:06:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qe3SO-00061j-GS for qemu-devel@nongnu.org; Tue, 05 Jul 2011 07:06:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50803) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qe3SO-00061T-0k for qemu-devel@nongnu.org; Tue, 05 Jul 2011 07:06:20 -0400 Message-ID: <4E12F026.8020708@redhat.com> Date: Tue, 05 Jul 2011 13:06:14 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1309863815-28236-1-git-send-email-hare@suse.de> <1309863815-28236-2-git-send-email-hare@suse.de> <1309863815-28236-3-git-send-email-hare@suse.de> <1309863815-28236-4-git-send-email-hare@suse.de> <1309863815-28236-5-git-send-email-hare@suse.de> In-Reply-To: <1309863815-28236-5-git-send-email-hare@suse.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 4/5] scsi-disk: Mask out serial number EVPD List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hannes Reinecke Cc: Alexander Graf , qemu-devel@nongnu.org, kvm@vger.kernel.org, Stefan Haynoczi On 07/05/2011 01:03 PM, Hannes Reinecke wrote: > 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 > --- > 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) { Acked-by: Paolo Bonzini Paolo