From patchwork Mon Nov 12 14:03:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 198399 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 7594B2C0080 for ; Tue, 13 Nov 2012 01:26:45 +1100 (EST) Received: from localhost ([::1]:53614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXucu-000846-9y for incoming@patchwork.ozlabs.org; Mon, 12 Nov 2012 09:04:36 -0500 Received: from eggs.gnu.org ([208.118.235.92]:60930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXucN-0006aS-Dv for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:04:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TXucK-0006ct-5Q for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:04:03 -0500 Received: from mail-pb0-f45.google.com ([209.85.160.45]:37252) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TXucJ-0006bl-Va for qemu-devel@nongnu.org; Mon, 12 Nov 2012 09:04:00 -0500 Received: by mail-pb0-f45.google.com with SMTP id mc8so1679149pbc.4 for ; Mon, 12 Nov 2012 06:03:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=rbD9yLffEqJseZcmNIdZ+AtRMZZeXD8wlq03sxLQ8Do=; b=DrT6Q3qfAXcCYxXJzGRYrzMpT9+Rwzzi5SyaIbhvle7DJEeVi2f1nbZhrCDU/n2X3i 1UgikSS3HybAW4Nvm3Tw7HHc5/NC5qDz115ehWmTAV8iKmp0Rf4YxbfL9KCAhl2BpEe1 8de1Ipq8KpZdMhaZ/UALrEwQ/tsGDmb35MX/FO2crK1wQtgpS+HXcZ4WL5x1CwfKq2zA 1oA7EdRqEboyT6KJa5Qr582vyLATf6q6zNqI0pFNkz2K2Sr7iQ/C8qZUzPPUdqrMGCEQ 2RPj+bfLaOYu8IIwKzE2MWFT5/MhYLTXgU/hgJjqX2Xi21zCY7Ebz1QLYlyL7H6cLrYV 8M6w== Received: by 10.66.72.36 with SMTP id a4mr22541833pav.16.1352729039115; Mon, 12 Nov 2012 06:03:59 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id a4sm4366188pax.12.2012.11.12.06.03.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Nov 2012 06:03:58 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 12 Nov 2012 15:03:31 +0100 Message-Id: <1352729011-27799-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1352729011-27799-1-git-send-email-pbonzini@redhat.com> References: <1352729011-27799-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.45 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 5/5] scsi-disk: flush cache after disabling it 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 SBC says that "if an application client changes the WCE bit from one to zero via a MODE SELECT command, then the device server shall write any data in volatile cache to non-volatile medium before completing the command". Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 9 +++++++++ 1 file modificato, 9 inserzioni(+) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index d15f891..49b5686 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1387,6 +1387,7 @@ invalid_param_len: static void scsi_disk_emulate_mode_select(SCSIDiskReq *r, uint8_t *inbuf) { + SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev); uint8_t *p = inbuf; int cmd = r->req.cmd.buf[0]; int len = r->req.cmd.xfer; @@ -1423,6 +1424,14 @@ static void scsi_disk_emulate_mode_select(SCSIDiskReq *r, uint8_t *inbuf) return; } } + if (!bdrv_enable_write_cache(s->qdev.conf.bs)) { + /* The request is used as the AIO opaque value, so add a ref. */ + scsi_req_ref(&r->req); + bdrv_acct_start(s->qdev.conf.bs, &r->acct, 0, BDRV_ACCT_FLUSH); + r->req.aiocb = bdrv_aio_flush(s->qdev.conf.bs, scsi_aio_complete, r); + return; + } + scsi_req_complete(&r->req, GOOD); return;