From patchwork Tue Nov 17 10:17:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 38609 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 037CBB7B3E for ; Tue, 17 Nov 2009 21:27:36 +1100 (EST) Received: from localhost ([127.0.0.1]:46899 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NALHY-0002vC-M5 for incoming@patchwork.ozlabs.org; Tue, 17 Nov 2009 05:27:32 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAL8W-0000HV-7S for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAL8Q-0000Cy-Nj for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:11 -0500 Received: from [199.232.76.173] (port=58247 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAL8P-0000Cj-EQ for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27851) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAL8O-0006w5-Uq for qemu-devel@nongnu.org; Tue, 17 Nov 2009 05:18:05 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAHAI4m5026166 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 05:18:04 -0500 Received: from zweiblum.home.kraxel.org (vpn1-7-195.ams2.redhat.com [10.36.7.195]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id nAHAI0fg001839; Tue, 17 Nov 2009 05:18:02 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 29D5070062; Tue, 17 Nov 2009 11:17:52 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 17 Nov 2009 11:17:42 +0100 Message-Id: <1258453071-3496-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1258453071-3496-1-git-send-email-kraxel@redhat.com> References: <1258453071-3496-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 06/15] scsi: move blocksize from SCSIGenericState to SCSIDevice X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann Reviewed-by: Christoph Hellwig --- hw/scsi-disk.c | 1 + hw/scsi-generic.c | 23 +++++++++++------------ hw/scsi.h | 1 + 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index bb2d68c..00d2944 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -963,6 +963,7 @@ static int scsi_disk_initfn(SCSIDevice *dev) } else { s->cluster_size = 1; } + s->qdev.blocksize = 512; bdrv_get_geometry(s->dinfo->bdrv, &nb_sectors); nb_sectors /= s->cluster_size; if (nb_sectors) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 68518da..02ccf54 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -66,7 +66,6 @@ struct SCSIGenericState SCSIDevice qdev; DriveInfo *dinfo; int type; - int blocksize; int lun; int driver_status; uint8_t sensebuf[SCSI_SENSE_BUF_SIZE]; @@ -266,7 +265,7 @@ static void scsi_write_complete(void * opaque, int ret) if (r->req.cmd.buf[0] == MODE_SELECT && r->req.cmd.buf[4] == 12 && s->type == TYPE_TAPE) { - s->blocksize = (r->buf[9] << 16) | (r->buf[10] << 8) | r->buf[11]; + s->qdev.blocksize = (r->buf[9] << 16) | (r->buf[10] << 8) | r->buf[11]; DPRINTF("block size %d\n", s->blocksize); } @@ -489,12 +488,12 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag, int ret; if (s->type == TYPE_TAPE) { - if (scsi_stream_length(cmd, s->blocksize, &cmdlen, &len) == -1) { + if (scsi_stream_length(cmd, s->qdev.blocksize, &cmdlen, &len) == -1) { BADF("Unsupported command length, command %x\n", cmd[0]); return 0; } } else { - if (scsi_length(cmd, s->blocksize, &cmdlen, &len) == -1) { + if (scsi_length(cmd, s->qdev.blocksize, &cmdlen, &len) == -1) { BADF("Unsupported command length, command %x\n", cmd[0]); return 0; } @@ -670,20 +669,20 @@ static int scsi_generic_initfn(SCSIDevice *dev) s->type = scsiid.scsi_type; DPRINTF("device type %d\n", s->type); if (s->type == TYPE_TAPE) { - s->blocksize = get_stream_blocksize(s->dinfo->bdrv); - if (s->blocksize == -1) - s->blocksize = 0; + s->qdev.blocksize = get_stream_blocksize(s->dinfo->bdrv); + if (s->qdev.blocksize == -1) + s->qdev.blocksize = 0; } else { - s->blocksize = get_blocksize(s->dinfo->bdrv); + s->qdev.blocksize = get_blocksize(s->dinfo->bdrv); /* removable media returns 0 if not present */ - if (s->blocksize <= 0) { + if (s->qdev.blocksize <= 0) { if (s->type == TYPE_ROM || s->type == TYPE_WORM) - s->blocksize = 2048; + s->qdev.blocksize = 2048; else - s->blocksize = 512; + s->qdev.blocksize = 512; } } - DPRINTF("block size %d\n", s->blocksize); + DPRINTF("block size %d\n", s->qdev.blocksize); s->driver_status = 0; memset(s->sensebuf, 0, sizeof(s->sensebuf)); return 0; diff --git a/hw/scsi.h b/hw/scsi.h index e3f28ea..bba88f3 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -37,6 +37,7 @@ struct SCSIDevice uint32_t id; SCSIDeviceInfo *info; QTAILQ_HEAD(, SCSIRequest) requests; + int blocksize; }; /* cdrom.c */