From patchwork Mon May 14 13:51:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 159010 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 B928DB701F for ; Mon, 14 May 2012 23:52:50 +1000 (EST) Received: from localhost ([::1]:47893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STvhg-0003eb-3T for incoming@patchwork.ozlabs.org; Mon, 14 May 2012 09:52:48 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STvhU-0003dr-RV for qemu-devel@nongnu.org; Mon, 14 May 2012 09:52:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STvhM-0000XX-Jr for qemu-devel@nongnu.org; Mon, 14 May 2012 09:52:36 -0400 Received: from e32.co.us.ibm.com ([32.97.110.150]:42000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STvhM-0000S8-EU for qemu-devel@nongnu.org; Mon, 14 May 2012 09:52:28 -0400 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 14 May 2012 07:51:54 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 14 May 2012 07:51:51 -0600 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 233C319D8052 for ; Mon, 14 May 2012 07:51:39 -0600 (MDT) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q4EDpadj119854 for ; Mon, 14 May 2012 07:51:38 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q4EDpXVb013408 for ; Mon, 14 May 2012 07:51:33 -0600 Received: from us.ibm.com (f15.cn.ibm.com [9.115.118.120] (may be forged)) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q4EDpS1e012746; Mon, 14 May 2012 07:51:29 -0600 Received: by us.ibm.com (sSMTP sendmail emulation); Mon, 14 May 2012 21:51:22 +0800 From: zwu.kernel@gmail.com To: qemu-devel@nongnu.org Date: Mon, 14 May 2012 21:51:21 +0800 Message-Id: <1337003481-30215-1-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12051413-3270-0000-0000-00000652856D X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.150 Cc: kwolf@redhat.com, pbonzini@redhat.com, wuzhy@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH] qcow2: adjust qcow2_co_flush_to_os -> qcow2_co_flush_to_disk 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 From: Zhi Yong Wu qcow2_co_flush_to_os() actually flush all cached data to the disk. To keep its name consistent with its actual function, adjust its name accordingly. Signed-off-by: Zhi Yong Wu --- block/qcow2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index ee4678f..a04c304 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1435,7 +1435,7 @@ fail: return ret; } -static coroutine_fn int qcow2_co_flush_to_os(BlockDriverState *bs) +static coroutine_fn int qcow2_co_flush_to_disk(BlockDriverState *bs) { BDRVQcowState *s = bs->opaque; int ret; @@ -1580,7 +1580,7 @@ static BlockDriver bdrv_qcow2 = { .bdrv_co_readv = qcow2_co_readv, .bdrv_co_writev = qcow2_co_writev, - .bdrv_co_flush_to_os = qcow2_co_flush_to_os, + .bdrv_co_flush_to_disk = qcow2_co_flush_to_disk, .bdrv_co_write_zeroes = qcow2_co_write_zeroes, .bdrv_co_discard = qcow2_co_discard,