From patchwork Wed Nov 23 11:44:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 127275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B03C51007D2 for ; Wed, 23 Nov 2011 22:47:03 +1100 (EST) Received: from localhost ([::1]:52094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTBHz-0005sk-F2 for incoming@patchwork.ozlabs.org; Wed, 23 Nov 2011 06:46:55 -0500 Received: from eggs.gnu.org ([140.186.70.92]:56015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTBHn-0005kK-IA for qemu-devel@nongnu.org; Wed, 23 Nov 2011 06:46:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RTBHl-0001wX-I7 for qemu-devel@nongnu.org; Wed, 23 Nov 2011 06:46:43 -0500 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:36852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTBHk-0001wI-VV for qemu-devel@nongnu.org; Wed, 23 Nov 2011 06:46:41 -0500 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id pANBke9d018285 for ; Wed, 23 Nov 2011 11:46:40 GMT Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pANBkdhD2703430 for ; Wed, 23 Nov 2011 11:46:39 GMT Received: from d06av04.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pANBkdr5003729 for ; Wed, 23 Nov 2011 04:46:39 -0700 Received: from localhost (sig-9-79-13-177.uk.ibm.com [9.79.13.177]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pANBkdfb003721; Wed, 23 Nov 2011 04:46:39 -0700 From: Stefan Hajnoczi To: Date: Wed, 23 Nov 2011 11:44:57 +0000 Message-Id: <1322048728-26061-8-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1322048728-26061-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1322048728-26061-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.161 Cc: Kevin Wolf , Paolo Bonzini , Marcelo Tosatti Subject: [Qemu-devel] [PATCH v3 07/38] scsi: remove block descriptors from CDs 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 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 */