External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 01:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: Extract data about dirty-bimaps in qemuMonitorBlockGetNamedNodeData

Browse Source 
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@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2019-11-28 14:27:00 +01:00
parent 2ecb855b83
commit fdb22e4e43
2 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/qemu/qemu_monitor.h
View File

@ -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

74
src/qemu/qemu_monitor_json.c
View File

@ -2868,14 +2868,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,
@ -2883,6 +2953,7 @@ qemuMonitorJSONBlockGetNamedNodeDataWorker(size_t pos G_GNUC_UNUSED,
{
virHashTablePtr nodes = opaque;
virJSONValuePtr img;
virJSONValuePtr bitmaps;
const char *nodename;
g_autoptr(qemuBlockNamedNodeData) ent = NULL;
@ -2899,6 +2970,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;