From patchwork Mon Nov 14 13:31:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 125536 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 019FFB71FF for ; Tue, 15 Nov 2011 00:44:54 +1100 (EST) Received: from localhost ([::1]:34797 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPweX-0004dF-He for incoming@patchwork.ozlabs.org; Mon, 14 Nov 2011 08:32:49 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=iLe+Fm04ES+zRil33evYNQ/Cq8hFe9j42YAJuPh6V8M=; b=JP/QgCEC6UlL9L0K9LB7Wk9gqNO6mvdKH57nCgBd9lmSZf+g1aoDjgM31HzAVzKqHH BbePh2QPK0z1sHSWvZW/YgAWrz74D34hDQ6OScHYL5FU8H5goBt957mT8B/JIpoSTzL4 P7JUcocoQf5DqvUHDF3W9RN+/r+SaeDKXImF8= Received: by 10.236.85.174 with SMTP id u34mr10286410yhe.28.1321277530949; Mon, 14 Nov 2011 05:32:10 -0800 (PST) Received: from localhost.localdomain (93-34-178-161.ip50.fastwebnet.it. [93.34.178.161]) by mx.google.com with ESMTPS id 36sm61240663anz.2.2011.11.14.05.32.08 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Nov 2011 05:32:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 14 Nov 2011 14:31:50 +0100 Message-Id: <1321277512-9414-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1321277512-9414-1-git-send-email-pbonzini@redhat.com> References: <1321277512-9414-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.161.173 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH v2 4/6] 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 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 */