From patchwork Mon Jun 11 05:24:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 164062 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 959E5B6FA2 for ; Mon, 11 Jun 2012 15:24:37 +1000 (EST) Received: from localhost ([::1]:50505 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sdx7D-0007VD-CU for incoming@patchwork.ozlabs.org; Mon, 11 Jun 2012 01:24:35 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sdx6z-0007SC-1w for qemu-devel@nongnu.org; Mon, 11 Jun 2012 01:24:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sdx6x-0002X4-83 for qemu-devel@nongnu.org; Mon, 11 Jun 2012 01:24:20 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:56734) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sdx6w-0002We-VZ for qemu-devel@nongnu.org; Mon, 11 Jun 2012 01:24:19 -0400 Received: by wibhn14 with SMTP id hn14so2038852wib.10 for ; Sun, 10 Jun 2012 22:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=IDfeI1HrOhi35/Qokxm1RC0TLn30zSqbrIgFjTvkULU=; b=bX6VmIVC6d6kL+OoXgI5+7tFb5D0cZDPgnoekx3mO2pUMbeuRKewCxkIGu79aU810x qkoRywAPLv4fQn/8Rz6TJRk/w2tBvVU3R31rxvnB9y6kmn2j14CpAu/vX+meqvqht6Ll S7BKXz0bOE3PjmDONb2KX5ylEEX46PUjpuRG4KAfUQ/ZFGeoTqaUW+n6sWlQrpcyiO0W g0O7Xj1wDEgS0mGx0MmqG/jkD9Pszx2tTeP3OxFqMHQP50Bm8Fd0Eod4ijMaugfWS1yf J+a/w5p/HyQ47+Gzc3ILpBdFd4tWkP1acctGUiHasypwPxPeeYIf4OdctO/8pOKd0Sd6 ruXA== Received: by 10.180.92.69 with SMTP id ck5mr17733796wib.14.1339392256801; Sun, 10 Jun 2012 22:24:16 -0700 (PDT) Received: from yakj.lan (93-34-204-25.ip51.fastwebnet.it. [93.34.204.25]) by mx.google.com with ESMTPS id gv7sm21828966wib.4.2012.06.10.22.24.15 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Jun 2012 22:24:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 11 Jun 2012 07:24:03 +0200 Message-Id: <1339392246-20201-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1339392246-20201-1-git-send-email-pbonzini@redhat.com> References: <1339392246-20201-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.181 Subject: [Qemu-devel] [PATCH 1/4] scsi: simplify and fix handling of the VPD page length field X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The last four bytes of the thin provisioning page were cut out. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 045c764..2bd8907 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -511,6 +511,7 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, req->dev); int buflen = 0; + int start; if (req->cmd.buf[1] & 0x1) { /* Vital product data */ @@ -519,14 +520,14 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) outbuf[buflen++] = s->qdev.type & 0x1f; outbuf[buflen++] = page_code ; // this page outbuf[buflen++] = 0x00; + outbuf[buflen++] = 0x00; + start = buflen; switch (page_code) { case 0x00: /* Supported page codes, mandatory */ { - int pages; DPRINTF("Inquiry EVPD[Supported pages] " "buffer size %zd\n", req->cmd.xfer); - pages = buflen++; outbuf[buflen++] = 0x00; // list of supported pages (this page) if (s->serial) { outbuf[buflen++] = 0x80; // unit serial number @@ -536,7 +537,6 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) outbuf[buflen++] = 0xb0; // block limits outbuf[buflen++] = 0xb2; // thin provisioning } - outbuf[pages] = buflen - pages - 1; // number of pages break; } case 0x80: /* Device serial number, optional */ @@ -555,7 +555,6 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) DPRINTF("Inquiry EVPD[Serial number] " "buffer size %zd\n", req->cmd.xfer); - outbuf[buflen++] = l; memcpy(outbuf+buflen, s->serial, l); buflen += l; break; @@ -573,7 +572,6 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) DPRINTF("Inquiry EVPD[Device identification] " "buffer size %zd\n", req->cmd.xfer); - outbuf[buflen++] = 4 + id_len; outbuf[buflen++] = 0x2; // ASCII outbuf[buflen++] = 0; // not officially assigned outbuf[buflen++] = 0; // reserved @@ -598,8 +596,7 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) return -1; } /* required VPD size with unmap support */ - outbuf[3] = buflen = 0x3c; - + buflen = 0x40; memset(outbuf + 4, 0, buflen - 4); /* optimal transfer length granularity */ @@ -621,7 +618,7 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) } case 0xb2: /* thin provisioning */ { - outbuf[3] = buflen = 8; + buflen = 8; outbuf[4] = 0; outbuf[5] = 0x60; /* write_same 10/16 supported */ outbuf[6] = s->qdev.conf.discard_granularity ? 2 : 1; @@ -632,6 +629,8 @@ static int scsi_disk_emulate_inquiry(SCSIRequest *req, uint8_t *outbuf) return -1; } /* done with EVPD */ + assert(buflen - start <= 255); + outbuf[start - 1] = buflen - start; return buflen; }