11:18 a.m.
We will need to inspect the presence and attributes for dirty bitmaps.
Extract them when processing reply of query-named-block-nodes.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor.h | 15 ++++++++
src/qemu/qemu_monitor_json.c | 74 ++++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 79e078fca4..1c990923d6 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -676,12 +676,27 @@ int qemuMonitorBlockStatsUpdateCapacityBlockdev(qemuMonitorPtr mon,
virHashTablePtr stats)
ATTRIBUTE_NONNULL(2);
+typedef struct _qemuBlockNamedNodeDataBitmap qemuBlockNamedNodeDataBitmap;
+typedef qemuBlockNamedNodeDataBitmap *qemuBlockNamedNodeDataBitmapPtr;
+struct _qemuBlockNamedNodeDataBitmap {
+ char *name;
+ bool recording;
+ bool busy;
+ bool persistent;
+ bool inconsistent;
+
+ unsigned long long dirtybytes;
+ unsigned long long granularity;
+};
typedef struct _qemuBlockNamedNodeData qemuBlockNamedNodeData;
typedef qemuBlockNamedNodeData *qemuBlockNamedNodeDataPtr;
struct _qemuBlockNamedNodeData {
unsigned long long capacity;
unsigned long long physical;
+
+ qemuBlockNamedNodeDataBitmapPtr *bitmaps;
+ size_t nbitmaps;
};
virHashTablePtr
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 00e1d3ce15..e3a6e3a6a2 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2873,14 +2873,84 @@ qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(qemuMonitorPtr
mon,
}
+static void
+qemuMonitorJSONBlockNamedNodeDataBitmapFree(qemuBlockNamedNodeDataBitmapPtr bitmap)
+{
+ if (!bitmap)
+ return;
+
+ g_free(bitmap->name);
+ g_free(bitmap);
+}
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockNamedNodeDataBitmap,
+ qemuMonitorJSONBlockNamedNodeDataBitmapFree);
+
+
static void
qemuMonitorJSONBlockNamedNodeDataFree(qemuBlockNamedNodeDataPtr data)
{
+ size_t i;
+
+ if (!data)
+ return;
+
+ for (i = 0; i < data->nbitmaps; i++)
+ qemuMonitorJSONBlockNamedNodeDataBitmapFree(data->bitmaps[i]);
+ g_free(data->bitmaps);
g_free(data);
}
G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockNamedNodeData,
qemuMonitorJSONBlockNamedNodeDataFree);
+static qemuBlockNamedNodeDataBitmapPtr
+qemuMonitorJSONBlockGetNamedNodeDataBitmapOne(virJSONValuePtr val)
+{
+ g_autoptr(qemuBlockNamedNodeDataBitmap) bitmap = NULL;
+ const char *name;
+
+ bitmap = g_new0(qemuBlockNamedNodeDataBitmap, 1);
+
+ if (!(name = virJSONValueObjectGetString(val, "name")))
+ return NULL;
+
+ bitmap->name = g_strdup(name);
+
+ ignore_value(virJSONValueObjectGetBoolean(val, "recording",
&bitmap->recording));
+ ignore_value(virJSONValueObjectGetBoolean(val, "persistent",
&bitmap->persistent));
+ ignore_value(virJSONValueObjectGetBoolean(val, "busy",
&bitmap->busy));
+ ignore_value(virJSONValueObjectGetBoolean(val, "inconsistent",
&bitmap->inconsistent));
+ ignore_value(virJSONValueObjectGetNumberUlong(val, "granularity",
&bitmap->granularity));
+ ignore_value(virJSONValueObjectGetNumberUlong(val, "count",
&bitmap->dirtybytes));
+
+ return g_steal_pointer(&bitmap);
+}
+
+
+static void
+qemuMonitorJSONBlockGetNamedNodeDataBitmaps(virJSONValuePtr bitmaps,
+ qemuBlockNamedNodeDataPtr data)
+{
+ size_t nbitmaps = virJSONValueArraySize(bitmaps);
+ size_t i;
+
+ data->bitmaps = g_new0(qemuBlockNamedNodeDataBitmapPtr, nbitmaps);
+
+ for (i = 0; i < nbitmaps; i++) {
+ virJSONValuePtr bitmap = virJSONValueArrayGet(bitmaps, i);
+ qemuBlockNamedNodeDataBitmapPtr tmp;
+
+ if (!bitmap)
+ continue;
+
+ if (!(tmp = qemuMonitorJSONBlockGetNamedNodeDataBitmapOne(bitmap)))
+ continue;
+
+ data->bitmaps[data->nbitmaps++] = tmp;
+ }
+}
+
+
static int
qemuMonitorJSONBlockGetNamedNodeDataWorker(size_t pos G_GNUC_UNUSED,
virJSONValuePtr val,
@@ -2888,6 +2958,7 @@ qemuMonitorJSONBlockGetNamedNodeDataWorker(size_t pos
G_GNUC_UNUSED,
{
virHashTablePtr nodes = opaque;
virJSONValuePtr img;
+ virJSONValuePtr bitmaps;
const char *nodename;
g_autoptr(qemuBlockNamedNodeData) ent = NULL;
@@ -2904,6 +2975,9 @@ qemuMonitorJSONBlockGetNamedNodeDataWorker(size_t pos
G_GNUC_UNUSED,
if (virJSONValueObjectGetNumberUlong(img, "actual-size",
&ent->physical) < 0)
ent->physical = ent->capacity;
+ if ((bitmaps = virJSONValueObjectGetArray(val, "dirty-bitmaps")))
+ qemuMonitorJSONBlockGetNamedNodeDataBitmaps(bitmaps, ent);
+
if (virHashAddEntry(nodes, nodename, ent) < 0)
return -1;
--
2.23.0