[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 03/16] block: Add BB-BDS remove/insert notifiers
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v9 03/16] block: Add BB-BDS remove/insert notifiers |
Date: |
Fri, 29 Jan 2016 16:36:03 +0100 |
bdrv_close() no longer signifies ejection of a medium, this is now done
by removing the BDS from the BB. Therefore, we want to have a notifier
for that in the BB instead of a close notifier in the BDS. The former is
added now, the latter is removed later.
Symmetrically, another notifier list is added that is invoked whenever a
BDS is inserted. We will need that for virtio-blk and virtio-scsi, which
can then remove their op blockers on BDS ejection and set them up on
insertion.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
---
block/block-backend.c | 20 ++++++++++++++++++++
include/sysemu/block-backend.h | 2 ++
2 files changed, 22 insertions(+)
diff --git a/block/block-backend.c b/block/block-backend.c
index a4208f1..1872191 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -49,6 +49,8 @@ struct BlockBackend {
BlockdevOnError on_read_error, on_write_error;
bool iostatus_enabled;
BlockDeviceIoStatus iostatus;
+
+ NotifierList remove_bs_notifiers, insert_bs_notifiers;
};
typedef struct BlockBackendAIOCB {
@@ -99,6 +101,8 @@ BlockBackend *blk_new(const char *name, Error **errp)
blk = g_new0(BlockBackend, 1);
blk->name = g_strdup(name);
blk->refcnt = 1;
+ notifier_list_init(&blk->remove_bs_notifiers);
+ notifier_list_init(&blk->insert_bs_notifiers);
QTAILQ_INSERT_TAIL(&blk_backends, blk, link);
return blk;
}
@@ -167,6 +171,8 @@ static void blk_delete(BlockBackend *blk)
bdrv_unref(blk->bs);
blk->bs = NULL;
}
+ assert(QLIST_EMPTY(&blk->remove_bs_notifiers.notifiers));
+ assert(QLIST_EMPTY(&blk->insert_bs_notifiers.notifiers));
if (blk->root_state.throttle_state) {
g_free(blk->root_state.throttle_group);
throttle_group_unref(blk->root_state.throttle_state);
@@ -345,6 +351,8 @@ void blk_hide_on_behalf_of_hmp_drive_del(BlockBackend *blk)
*/
void blk_remove_bs(BlockBackend *blk)
{
+ notifier_list_notify(&blk->remove_bs_notifiers, blk);
+
blk_update_root_state(blk);
blk->bs->blk = NULL;
@@ -361,6 +369,8 @@ void blk_insert_bs(BlockBackend *blk, BlockDriverState *bs)
bdrv_ref(bs);
blk->bs = bs;
bs->blk = blk;
+
+ notifier_list_notify(&blk->insert_bs_notifiers, blk);
}
/*
@@ -1126,6 +1136,16 @@ void blk_remove_aio_context_notifier(BlockBackend *blk,
}
}
+void blk_add_remove_bs_notifier(BlockBackend *blk, Notifier *notify)
+{
+ notifier_list_add(&blk->remove_bs_notifiers, notify);
+}
+
+void blk_add_insert_bs_notifier(BlockBackend *blk, Notifier *notify)
+{
+ notifier_list_add(&blk->insert_bs_notifiers, notify);
+}
+
void blk_add_close_notifier(BlockBackend *blk, Notifier *notify)
{
if (blk->bs) {
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 1568554..e12be67 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -164,6 +164,8 @@ void blk_remove_aio_context_notifier(BlockBackend *blk,
void *),
void (*detach_aio_context)(void *),
void *opaque);
+void blk_add_remove_bs_notifier(BlockBackend *blk, Notifier *notify);
+void blk_add_insert_bs_notifier(BlockBackend *blk, Notifier *notify);
void blk_add_close_notifier(BlockBackend *blk, Notifier *notify);
void blk_io_plug(BlockBackend *blk);
void blk_io_unplug(BlockBackend *blk);
--
2.7.0
- [Qemu-devel] [PATCH v9 00/16] block: Rework bdrv_close_all(), Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 01/16] block: Release named dirty bitmaps in bdrv_close(), Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 04/16] virtio-blk: Functions for op blocker management, Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 03/16] block: Add BB-BDS remove/insert notifiers,
Max Reitz <=
- [Qemu-devel] [PATCH v9 02/16] iotests: Add test for eject under NBD server, Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 05/16] virtio-scsi: Catch BDS-BB removal/insertion, Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 06/16] nbd: Switch from close to eject notifier, Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 07/16] block: Remove BDS close notifier, Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 08/16] block: Use blk_remove_bs() in blk_delete(), Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 09/16] blockdev: Use blk_remove_bs() in do_drive_del(), Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 11/16] block: Add list of all BlockDriverStates, Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 13/16] block: Add blk_remove_all_bs(), Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 10/16] block: Make bdrv_close() static, Max Reitz, 2016/01/29
- [Qemu-devel] [PATCH v9 14/16] block: Rewrite bdrv_close_all(), Max Reitz, 2016/01/29