From patchwork Tue Jul 10 14:15:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 170196 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 E8F472C007C for ; Wed, 11 Jul 2012 00:27:23 +1000 (EST) Received: from localhost ([::1]:33723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SobEm-0004mh-3u for incoming@patchwork.ozlabs.org; Tue, 10 Jul 2012 10:16:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SobEO-0003kR-He for qemu-devel@nongnu.org; Tue, 10 Jul 2012 10:16:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SobEF-0002Iw-5u for qemu-devel@nongnu.org; Tue, 10 Jul 2012 10:16:00 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:59253) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SobEE-00025c-UB for qemu-devel@nongnu.org; Tue, 10 Jul 2012 10:15:51 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so369507pbb.4 for ; Tue, 10 Jul 2012 07:15:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=F5fkEkI/X9KdHqXVW5cPXBj9wV9VXAldquCe4OzM6hw=; b=zFYxnlG/6CD6gNmfiyaCuR6juKL0YD2wLVozGaAd165MYSCq/cx/MyYxv5+wn9nDrZ ZFqLaFERtBMKeT9fmfKULWcmnPXvtpDLmaHtl7rTNGGS5/5vjGPsSmzBHZeMzq6l6TQJ LEqmgI8hPzw8ye3V4xzgTGPatsu6bLyY0SuoLyFoeOpotAo3lAMjkjwOWke96LSGSP+C TTmYsIjF0mmeEnqBcnTEBHE8X5jLk1uUMZS+5NWHMcjET+pRzZ8Wlab4Y4q8kpfy8zXK gZyUdOggxjEB0zMBnzIE6fQU+iaGrfGcdOyaJjUy74GfFqnGnvjjgHx4Cj4XzFrD964a pQqw== Received: by 10.68.239.164 with SMTP id vt4mr67973407pbc.166.1341929749990; Tue, 10 Jul 2012 07:15:49 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id ru4sm29941485pbc.66.2012.07.10.07.15.46 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 Jul 2012 07:15:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 10 Jul 2012 16:15:10 +0200 Message-Id: <1341929710-21574-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1341929710-21574-1-git-send-email-pbonzini@redhat.com> References: <1341929710-21574-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Subject: [Qemu-devel] [PATCH 8/8] scsi-disk: support toggling the write cache 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 Finally, this uses the "plumbing" in the previous patch to add support for toggling the WCE bit of the caching mode page. Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index cd0c389..d4d3ae6 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1048,10 +1049,8 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, case MODE_PAGE_CACHING: p[0] = 8; p[1] = 0x12; - if (page_control == 1) { /* Changeable Values */ - break; - } - if (bdrv_enable_write_cache(s->qdev.conf.bs)) { + if (page_control == 1 || /* Changeable Values */ + bdrv_enable_write_cache(s->qdev.conf.bs)) { p[2] = 4; /* WCE */ } break; @@ -1319,6 +1319,14 @@ static int scsi_disk_check_mode_select(SCSIDiskState *s, int page, static void scsi_disk_apply_mode_select(SCSIDiskState *s, int page, uint8_t *p) { + switch (page) { + case MODE_PAGE_CACHING: + bdrv_set_enable_write_cache(s->qdev.conf.bs, (p[2] & 4) != 0); + break; + + default: + break; + } } static int mode_select_pages(SCSIDiskReq *r, uint8_t *p, int len, bool change)