From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:45624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobRO-0004CU-G9 for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:24:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QobRM-0004sR-Cd for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:24:54 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:50140) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QobRM-0004rf-7Y for qemu-devel@nongnu.org; Wed, 03 Aug 2011 09:24:52 -0400 From: Markus Armbruster Date: Wed, 3 Aug 2011 15:08:10 +0200 Message-Id: <1312376904-16115-32-git-send-email-armbru@redhat.com> In-Reply-To: <1312376904-16115-1-git-send-email-armbru@redhat.com> References: <1312376904-16115-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 31/45] 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, stefano.stabellini@eu.citrix.com, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de 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 f4f320e..1ff42b5 100644 --- a/block.c +++ b/block.c @@ -1721,8 +1721,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.6