From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPwdw-00036t-OC for qemu-devel@nongnu.org; Mon, 14 Nov 2011 08:32:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPwdv-000531-Ex for qemu-devel@nongnu.org; Mon, 14 Nov 2011 08:32:12 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:35348) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPwdv-00052x-CR for qemu-devel@nongnu.org; Mon, 14 Nov 2011 08:32:11 -0500 Received: by ggnr4 with SMTP id r4so104547ggn.4 for ; Mon, 14 Nov 2011 05:32:11 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 14 Nov 2011 14:31:50 +0100 Message-Id: <1321277512-9414-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1321277512-9414-1-git-send-email-pbonzini@redhat.com> References: <1321277512-9414-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/6] scsi: remove block descriptors from CDs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com Reported-by: Thomas Schmitt Tested-by: Thomas Schmitt Signed-off-by: Paolo Bonzini --- 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 5ce17e7..9224b04 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -987,8 +987,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.7.1