From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RROzO-0007lh-0P for qemu-devel@nongnu.org; Fri, 18 Nov 2011 09:00:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RROzM-0002Yl-R8 for qemu-devel@nongnu.org; Fri, 18 Nov 2011 09:00:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RROzM-0002Yc-0W for qemu-devel@nongnu.org; Fri, 18 Nov 2011 09:00:20 -0500 From: Kevin Wolf Date: Fri, 18 Nov 2011 15:03:11 +0100 Message-Id: <1321624993-19033-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1321624993-19033-1-git-send-email-kwolf@redhat.com> References: <1321624993-19033-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 7/9] scsi: remove block descriptors from CDs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini Reported-by: Thomas Schmitt Tested-by: Thomas Schmitt Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- hw/scsi-disk.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 0b06fef..9dd2be8 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -956,8 +956,9 @@ static int scsi_disk_emulate_mode_sense(SCSIDiskReq *r, uint8_t *outbuf) p += 8; } + /* MMC prescribes that CD/DVD drives have no block descriptors. */ bdrv_get_geometry(s->qdev.conf.bs, &nb_sectors); - if (!dbd && nb_sectors) { + if (!dbd && s->qdev.type == TYPE_DISK && nb_sectors) { if (r->req.cmd.buf[0] == MODE_SENSE) { outbuf[3] = 8; /* Block descriptor length */ } else { /* MODE_SENSE_10 */ -- 1.7.6.4