[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/9] block: List anonymous device BBs in query-bl
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 5/9] block: List anonymous device BBs in query-block |
Date: |
Thu, 13 Jul 2017 13:41:31 +0200 |
Instead of listing only monitor-owned BlockBackends in query-block, also
add those anonymous BlockBackends that are owned by a qdev device and as
such under the control of the user.
This allows using query-block to inspect BlockBackends for the modern
configuration syntax with -blockdev and -device.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/qapi.c | 2 +-
hmp.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/qapi.c b/block/qapi.c
index 2f86c79..b5bb42b 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -475,7 +475,7 @@ BlockInfoList *qmp_query_block(Error **errp)
for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) {
BlockInfoList *info;
- if (!*blk_name(blk)) {
+ if (!*blk_name(blk) && !blk_get_attached_dev(blk)) {
continue;
}
diff --git a/hmp.c b/hmp.c
index d1d769e..4caa9c1 100644
--- a/hmp.c
+++ b/hmp.c
@@ -401,16 +401,16 @@ static void print_block_info(Monitor *mon, BlockInfo
*info,
assert(!info || !info->has_inserted || info->inserted == inserted);
- if (info) {
+ if (info && *info->device) {
monitor_printf(mon, "%s", info->device);
if (inserted && inserted->has_node_name) {
monitor_printf(mon, " (%s)", inserted->node_name);
}
} else {
- assert(inserted);
+ assert(info || inserted);
monitor_printf(mon, "%s",
- inserted->has_node_name
- ? inserted->node_name
+ inserted && inserted->has_node_name ?
inserted->node_name
+ : info && info->has_qdev ? info->qdev
: "<anonymous>");
}
--
1.8.3.1
- [Qemu-devel] [PATCH v2 0/9] block: -device drive=<node-name> fixes, Kevin Wolf, 2017/07/13
- [Qemu-devel] [PATCH v2 1/9] block: Make blk_get_attached_dev_id() public, Kevin Wolf, 2017/07/13
- [Qemu-devel] [PATCH v2 2/9] block/qapi: Add qdev device name to query-block, Kevin Wolf, 2017/07/13
- [Qemu-devel] [PATCH v2 3/9] block: Make blk_all_next() public, Kevin Wolf, 2017/07/13
- [Qemu-devel] [PATCH v2 5/9] block: List anonymous device BBs in query-block,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 4/9] block/qapi: Use blk_all_next() for query-block, Kevin Wolf, 2017/07/13
- [Qemu-devel] [PATCH v2 6/9] ide: bdrv_attach_dev() for empty CD-ROM, Kevin Wolf, 2017/07/13
- [Qemu-devel] [PATCH v2 7/9] scsi-disk: bdrv_attach_dev() for empty CD-ROM, Kevin Wolf, 2017/07/13
- [Qemu-devel] [PATCH v2 9/9] qemu-iotests: Test unplug of -device without drive, Kevin Wolf, 2017/07/13
- [Qemu-devel] [PATCH v2 8/9] qemu-iotests: Test 'info block', Kevin Wolf, 2017/07/13
- Re: [Qemu-devel] [PATCH v2 0/9] block: -device drive=<node-name> fixes, John Snow, 2017/07/13
- Re: [Qemu-devel] [PATCH v2 0/9] block: -device drive=<node-name> fixes, Kevin Wolf, 2017/07/17