From patchwork Fri Jul 13 21:30:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ronnie sahlberg X-Patchwork-Id: 170966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 40FC52C02EE for ; Sat, 14 Jul 2012 07:31:10 +1000 (EST) Received: from localhost ([::1]:39469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpnS8-0001LZ-Bx for incoming@patchwork.ozlabs.org; Fri, 13 Jul 2012 17:31:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpnRx-00019H-2J for qemu-devel@nongnu.org; Fri, 13 Jul 2012 17:30:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SpnRv-0005Kx-Va for qemu-devel@nongnu.org; Fri, 13 Jul 2012 17:30:56 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:63379) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SpnRv-0005Ks-PS for qemu-devel@nongnu.org; Fri, 13 Jul 2012 17:30:55 -0400 Received: by pbbro12 with SMTP id ro12so6355036pbb.4 for ; Fri, 13 Jul 2012 14:30:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=BaLWWsee8n33l6rXQBMnhCaUsNKJZPnDQHkY2geYys0=; b=jKlyvpQSybZoplTfFmXicqb8nRtH0dLVdd04hHzdDxqyFwymkrfG3UZDQjDa3IY+M/ nHq2s2CDsAKiX8gT1DU/3oH2AEK2xOHH/XfSTVTr15czzdiGRk+TOKaC+BIam7pee/en yhtUZvot9YYWH6ce+OLXo0rrGRQ23CgpgvJT5iMieiAKrzGgwGhbww/8zldMd5weXx+8 fMGMoSGP0cms9nuQuhdFsXb9zeAQwmqvNp/uu+8W6Xl8YlNTSTifJVsrOkTAeJfhrvwz PkXoRZr7d1ZC2TwK8NlcDPZDqRV8fXV/gLx4/FoS6+omdNWGDgiNjm7ZFz4Cz5b5V182 11Eg== Received: by 10.68.226.226 with SMTP id rv2mr6772036pbc.101.1342215054956; Fri, 13 Jul 2012 14:30:54 -0700 (PDT) Received: from ronniesahlberg@gmail.com (CPE-121-218-103-174.lnse4.ken.bigpond.net.au. [121.218.103.174]) by mx.google.com with ESMTPS id qd10sm6706292pbb.38.2012.07.13.14.30.52 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jul 2012 14:30:54 -0700 (PDT) Received: by ronniesahlberg@gmail.com (sSMTP sendmail emulation); Sat, 14 Jul 2012 07:30:53 +1000 From: Ronnie Sahlberg To: qemu-devel@nongnu.org, pbonzini@redhat.com Date: Sat, 14 Jul 2012 07:30:40 +1000 Message-Id: <1342215040-16128-2-git-send-email-ronniesahlberg@gmail.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1342215040-16128-1-git-send-email-ronniesahlberg@gmail.com> References: <1342215040-16128-1-git-send-email-ronniesahlberg@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Ronnie Sahlberg Subject: [Qemu-devel] [PATCH] SCSI: Fail medium writes with proper sense for readonly LUNs 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 Add sense code for DATA_PROTECT/WRITE_PROTECTED and return this error for any WRITE*/WRITE_VERIFY* calls if the device is readonly=on, i.e. write-protected Signed-off-by: Ronnie Sahlberg --- hw/scsi-bus.c | 5 +++++ hw/scsi-disk.c | 16 +++++++++++++--- hw/scsi.h | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 5ad1013..6299094 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1172,6 +1172,11 @@ const struct SCSISense sense_code_DEVICE_INTERNAL_RESET = { .key = UNIT_ATTENTION, .asc = 0x29, .ascq = 0x04 }; +/* Data Protection, Write Protected */ +const struct SCSISense sense_code_WRITE_PROTECTED = { + .key = DATA_PROTECT, .asc = 0x27, .ascq = 0x00 +}; + /* * scsi_build_sense * diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 2c2be33..0aca383 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1565,9 +1565,6 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) r->sector = r->req.cmd.lba * (s->qdev.blocksize / 512); r->sector_count = len * (s->qdev.blocksize / 512); break; - case VERIFY_10: - case VERIFY_12: - case VERIFY_16: case WRITE_6: case WRITE_10: case WRITE_12: @@ -1575,6 +1572,13 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) case WRITE_VERIFY_10: case WRITE_VERIFY_12: case WRITE_VERIFY_16: + if (bdrv_is_read_only(s->qdev.conf.bs)) { + goto write_protect; + } + /* fallthough */ + case VERIFY_10: + case VERIFY_12: + case VERIFY_16: len = r->req.cmd.xfer / s->qdev.blocksize; DPRINTF("Write %s(sector %" PRId64 ", count %d)\n", (command & 0xe) == 0xe ? "And Verify " : "", @@ -1621,6 +1625,9 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) DPRINTF("WRITE SAME() (sector %" PRId64 ", count %d)\n", r->req.cmd.lba, len); + if (bdrv_is_read_only(s->qdev.conf.bs)) { + goto write_protect; + } if (r->req.cmd.lba > s->qdev.max_lba) { goto illegal_lba; } @@ -1651,6 +1658,9 @@ static int32_t scsi_send_command(SCSIRequest *req, uint8_t *buf) illegal_lba: scsi_check_condition(r, SENSE_CODE(LBA_OUT_OF_RANGE)); return 0; + write_protect: + scsi_check_condition(r, SENSE_CODE(WRITE_PROTECTED)); + return 0; } if (r->sector_count == 0 && r->iov.iov_len == 0) { scsi_req_complete(&r->req, GOOD); diff --git a/hw/scsi.h b/hw/scsi.h index 76f06d4..94d2962 100644 --- a/hw/scsi.h +++ b/hw/scsi.h @@ -202,6 +202,8 @@ extern const struct SCSISense sense_code_MEDIUM_CHANGED; extern const struct SCSISense sense_code_REPORTED_LUNS_CHANGED; /* Unit attention, Device internal reset */ extern const struct SCSISense sense_code_DEVICE_INTERNAL_RESET; +/* Data Protection, Write Protected */ +extern const struct SCSISense sense_code_WRITE_PROTECTED; #define SENSE_CODE(x) sense_code_ ## x