Skip to content

Commit

Permalink
block: Add bdrv_next_monitor_owned()
Browse files Browse the repository at this point in the history
Add a function for iterating over all monitor-owned BlockDriverStates so
the generic block layer can do so.

Signed-off-by: Max Reitz <[email protected]>
Signed-off-by: Kevin Wolf <[email protected]>
  • Loading branch information
XanClic authored and kevmw committed Mar 17, 2016
1 parent fe1a9cb commit 262b4e8
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 0 deletions.
7 changes: 7 additions & 0 deletions blockdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,13 @@ void blockdev_close_all_bdrv_states(void)
}
}

/* Iterates over the list of monitor-owned BlockDriverStates */
BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs)
{
return bs ? QTAILQ_NEXT(bs, monitor_list)
: QTAILQ_FIRST(&monitor_bdrv_states);
}

static void qemu_opt_rename(QemuOpts *opts, const char *from, const char *to,
Error **errp)
{
Expand Down
1 change: 1 addition & 0 deletions include/block/block.h
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ BlockDriverState *bdrv_lookup_bs(const char *device,
bool bdrv_chain_contains(BlockDriverState *top, BlockDriverState *base);
BlockDriverState *bdrv_next_node(BlockDriverState *bs);
BlockDriverState *bdrv_next(BlockDriverState *bs);
BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs);
int bdrv_is_encrypted(BlockDriverState *bs);
int bdrv_key_required(BlockDriverState *bs);
int bdrv_set_key(BlockDriverState *bs, const char *key);
Expand Down
1 change: 1 addition & 0 deletions stubs/Makefile.objs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
stub-obj-y += arch-query-cpu-def.o
stub-obj-y += bdrv-next-monitor-owned.o
stub-obj-y += blk-commit-all.o
stub-obj-y += blockdev-close-all-bdrv-states.o
stub-obj-y += clock-warp.o
Expand Down
8 changes: 8 additions & 0 deletions stubs/bdrv-next-monitor-owned.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "block/block.h"

BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs)
{
return NULL;
}

0 comments on commit 262b4e8

Please sign in to comment.