]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
block/qapi: Include anonymous BBs in query-blockstats
authorKevin Wolf <kwolf@redhat.com>
Fri, 27 Jul 2018 14:09:25 +0000 (16:09 +0200)
committerKevin Wolf <kwolf@redhat.com>
Mon, 30 Jul 2018 13:35:37 +0000 (15:35 +0200)
Consistent with query-block, query-blockstats should not only include
named BlockBackends, but also those that are anonymous, but belong to a
device model.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
block/qapi.c

index 50f867d6344367a2018ccdd047a11666d57764be..339727f0f49c906a523cfb2ae60df7de9a15fe20 100644 (file)
@@ -593,12 +593,16 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,
             p_next = &info->next;
         }
     } else {
-        for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {
+        for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) {
             BlockStatsList *info = g_malloc0(sizeof(*info));
             AioContext *ctx = blk_get_aio_context(blk);
             BlockStats *s;
             char *qdev;
 
+            if (!*blk_name(blk) && !blk_get_attached_dev(blk)) {
+                continue;
+            }
+
             aio_context_acquire(ctx);
             s = bdrv_query_bds_stats(blk_bs(blk), true);
             s->has_device = true;