[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 42/55] block: Clean up bdrv_flush_all()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 42/55] block: Clean up bdrv_flush_all() |
Date: |
Wed, 20 Jul 2011 18:24:16 +0200 |
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 <address@hidden>
---
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
- Re: [Qemu-devel] [PATCH 50/55] block: New bdrv_set_buffer_alignment(), (continued)
- [Qemu-devel] [PATCH 52/55] block: Move BlockDriverAIOCB & friends from block_int.h to block.h, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 38/55] scsi-disk: Preserve tray state on migration, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 51/55] block: Reset buffer alignment on detach, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 37/55] ide/atapi: Preserve tray state on migration, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 41/55] fdc: Make media change detection more robust, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 30/55] block: Rename bdrv_set_locked() to bdrv_lock_medium(), Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 42/55] block: Clean up bdrv_flush_all(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 35/55] scsi-disk: Avoid physical/virtual tray state mismatch, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 45/55] block: Clean up remaining users of "removable", Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 54/55] block: New change_media_cb() parameter load, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 55/55] ide/atapi scsi-disk: Make monitor eject -f, then change work, Markus Armbruster, 2011/07/20