|
 |
1bdc94 |
From 50a74a6f33a66effb2c4f28e2c6ca8ca3041d312 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Date: Tue, 7 Aug 2018 14:04:00 +0200
|
|
|
1bdc94 |
Subject: [PATCH 07/13] block/qapi: Include anonymous BBs in query-blockstats
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180807140401.23995-3-kwolf@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81664
|
|
|
1bdc94 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 2/3] block/qapi: Include anonymous BBs in query-blockstats
|
|
|
1bdc94 |
Bugzilla: 1612114
|
|
|
1bdc94 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Consistent with query-block, query-blockstats should not only include
|
|
|
1bdc94 |
named BlockBackends, but also those that are anonymous, but belong to a
|
|
|
1bdc94 |
device model.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 567dcb31f23657fb71060067b0b1c9ac29110d16)
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
block/qapi.c | 6 +++++-
|
|
|
1bdc94 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/block/qapi.c b/block/qapi.c
|
|
|
1bdc94 |
index 50f867d..339727f 100644
|
|
|
1bdc94 |
--- a/block/qapi.c
|
|
|
1bdc94 |
+++ b/block/qapi.c
|
|
|
1bdc94 |
@@ -593,12 +593,16 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,
|
|
|
1bdc94 |
p_next = &info->next;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
} else {
|
|
|
1bdc94 |
- for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {
|
|
|
1bdc94 |
+ for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) {
|
|
|
1bdc94 |
BlockStatsList *info = g_malloc0(sizeof(*info));
|
|
|
1bdc94 |
AioContext *ctx = blk_get_aio_context(blk);
|
|
|
1bdc94 |
BlockStats *s;
|
|
|
1bdc94 |
char *qdev;
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+ if (!*blk_name(blk) && !blk_get_attached_dev(blk)) {
|
|
|
1bdc94 |
+ continue;
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
aio_context_acquire(ctx);
|
|
|
1bdc94 |
s = bdrv_query_bds_stats(blk_bs(blk), true);
|
|
|
1bdc94 |
s->has_device = true;
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|