From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 10 Jul 2012 16:15:10 +0200 Message-Id: <1341929710-21574-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1341929710-21574-1-git-send-email-pbonzini@redhat.com> References: <1341929710-21574-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 8/8] scsi-disk: support toggling the write cache List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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) -- 1.7.10.4