From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhM-00061j-H5 for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QjZhE-0001N7-AQ for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:34 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:39237) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QjZhC-0001LJ-Q1 for qemu-devel@nongnu.org; Wed, 20 Jul 2011 12:32:27 -0400 From: Markus Armbruster Date: Wed, 20 Jul 2011 18:24:16 +0200 Message-Id: <1311179069-27882-43-git-send-email-armbru@redhat.com> In-Reply-To: <1311179069-27882-1-git-send-email-armbru@redhat.com> References: <1311179069-27882-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 42/55] block: Clean up bdrv_flush_all() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, quintela@redhat.com, dbaryshkov@gmail.com, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, amit.shah@redhat.com Change (!bdrv_is_removable(bs) || bdrv_is_inserted(bs)) to just bdrv_is_inserted(). Rationale: The value of bdrv_is_removable(bs) matters only when bdrv_is_inserted(bs) is false. bdrv_is_inserted(bs) is true when bs is open (bs->drv != NULL) and not an empty host drive (CD-ROM or floppy). Therefore, bdrv_is_removable(bs) matters only when: 1. bs is not open old: may call bdrv_flush(bs), which does nothing new: won't call 2. bs is an empty host drive old: may call bdrv_flush(bs), which calls driver method raw_flush(), which calls fdatasync() or equivalent, which can't do anything useful while the drive is empty new: won't call Result is bs->drv && !bdrv_is_read_only(bs) && bdrv_is_inserted(bs). bdrv_is_inserted(bs) implies bs->drv. Drop the redundant test. Signed-off-by: Markus Armbruster --- block.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 2225be5..f233062 100644 --- a/block.c +++ b/block.c @@ -1626,8 +1626,7 @@ void bdrv_flush_all(void) BlockDriverState *bs; QTAILQ_FOREACH(bs, &bdrv_states, list) { - if (bs->drv && !bdrv_is_read_only(bs) && - (!bdrv_is_removable(bs) || bdrv_is_inserted(bs))) { + if (!bdrv_is_read_only(bs) && bdrv_is_inserted(bs)) { bdrv_flush(bs); } } -- 1.7.2.3