[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 06/39] block: Add blk_is_available()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v6 06/39] block: Add blk_is_available() |
Date: |
Mon, 12 Oct 2015 22:00:09 +0200 |
blk_is_available() returns true iff the BDS is inserted (which means
blk_bs() is not NULL and bdrv_is_inserted() returns true) and if the
tray of the guest device is closed.
blk_is_inserted() is changed to return true only if blk_bs() is not
NULL.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
block/block-backend.c | 7 ++++++-
include/sysemu/block-backend.h | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index 1db002c..74642dc 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -771,7 +771,12 @@ void blk_invalidate_cache(BlockBackend *blk, Error **errp)
bool blk_is_inserted(BlockBackend *blk)
{
- return bdrv_is_inserted(blk->bs);
+ return blk->bs && bdrv_is_inserted(blk->bs);
+}
+
+bool blk_is_available(BlockBackend *blk)
+{
+ return blk_is_inserted(blk) && !blk_dev_is_tray_open(blk);
}
void blk_lock_medium(BlockBackend *blk, bool locked)
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 8f2bf10..1e19d1b 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -131,6 +131,7 @@ int blk_enable_write_cache(BlockBackend *blk);
void blk_set_enable_write_cache(BlockBackend *blk, bool wce);
void blk_invalidate_cache(BlockBackend *blk, Error **errp);
bool blk_is_inserted(BlockBackend *blk);
+bool blk_is_available(BlockBackend *blk);
void blk_lock_medium(BlockBackend *blk, bool locked);
void blk_eject(BlockBackend *blk, bool eject_flag);
int blk_get_flags(BlockBackend *blk);
--
2.6.1
- [Qemu-devel] [PATCH v6 26/39] blockdev: Allow more options for BB-less BDS tree, (continued)
- [Qemu-devel] [PATCH v6 26/39] blockdev: Allow more options for BB-less BDS tree, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 32/39] blockdev: Implement eject with basic operations, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 30/39] blockdev: Add blockdev-remove-medium, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 31/39] blockdev: Add blockdev-insert-medium, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 37/39] blockdev: read-only-mode for blockdev-change-medium, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 38/39] hmp: Add read-only-mode option to change command, Max Reitz, 2015/10/12
- [Qemu-devel] [PATCH v6 39/39] iotests: Add test for change-related QMP commands, Max Reitz, 2015/10/12
- Re: [Qemu-devel] [PATCH v6 00/39] blockdev: BlockBackend and media, Kevin Wolf, 2015/10/13
- [Qemu-devel] [PATCH v6 02/39] block: Set BDRV_O_INCOMING in bdrv_fill_options(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 06/39] block: Add blk_is_available(),
Max Reitz <=
- [Qemu-devel] [PATCH v6 14/39] block: Remove wr_highest_sector from BlockAcctStats, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 09/39] block: Invoke change media CB before NULLing drv, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 21/39] block: Prepare remaining BB functions for NULL BDS, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 22/39] block: Add blk_insert_bs(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 29/39] blockdev: Add blockdev-close-tray, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 27/39] block: Add blk_remove_bs(), Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 28/39] blockdev: Add blockdev-open-tray, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 33/39] blockdev: Implement change with basic operations, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 34/39] block: Inquire tray state before tray-moved events, Max Reitz, 2015/10/15
- [Qemu-devel] [PATCH v6 35/39] qmp: Introduce blockdev-change-medium, Max Reitz, 2015/10/15