External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-26 06:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: Add 'granularity' parameter for block-dirty-bitmap-add

Browse Source 
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 16:03:16 +01:00
parent 1946485207
commit f1bc1f0fe5
7 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_backup.c
View File

@ -201,7 +201,7 @@ qemuBackupDiskPrepareOneBitmaps(struct qemuBackupDiskData *dd,
dd->domdisk->src->nodeformat, dd->domdisk->src->nodeformat,
dd->incrementalBitmap, dd->incrementalBitmap,
false, false,
true) < 0) true, 0) < 0)
return -1; return -1;
if (qemuMonitorTransactionBitmapMerge(actions, if (qemuMonitorTransactionBitmapMerge(actions,
@ -214,7 +214,7 @@ qemuBackupDiskPrepareOneBitmaps(struct qemuBackupDiskData *dd,
dd->store->nodeformat, dd->store->nodeformat,
dd->incrementalBitmap, dd->incrementalBitmap,
false, false,
true) < 0) true, 0) < 0)
return -1; return -1;
if (qemuMonitorTransactionBitmapMerge(actions, if (qemuMonitorTransactionBitmapMerge(actions,

2
src/qemu/qemu_checkpoint.c
View File

@ -309,7 +309,7 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP) if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
continue; continue;
node = qemuDomainDiskNodeFormatLookup(vm, disk->name); node = qemuDomainDiskNodeFormatLookup(vm, disk->name);
if (qemuMonitorTransactionBitmapAdd(actions, node, disk->bitmap, true, false) < 0) if (qemuMonitorTransactionBitmapAdd(actions, node, disk->bitmap, true, false, 0) < 0)
return -1; return -1;
/* We only want one active bitmap for a disk along the /* We only want one active bitmap for a disk along the

6
src/qemu/qemu_monitor.c
View File

@ -4543,9 +4543,11 @@ qemuMonitorTransactionBitmapAdd(virJSONValuePtr actions,
const char *node, const char *node,
const char *name, const char *name,
bool persistent, bool persistent,
bool disabled) bool disabled,
unsigned long long granularity)
{ {
return qemuMonitorJSONTransactionBitmapAdd(actions, node, name, persistent, disabled); return qemuMonitorJSONTransactionBitmapAdd(actions, node, name, persistent,
disabled, granularity);
} }

3
src/qemu/qemu_monitor.h
View File

@ -1374,7 +1374,8 @@ qemuMonitorTransactionBitmapAdd(virJSONValuePtr actions,
const char *node, const char *node,
const char *name, const char *name,
bool persistent, bool persistent,
bool disabled); bool disabled,
unsigned long long granularity);
int int
qemuMonitorTransactionBitmapRemove(virJSONValuePtr actions, qemuMonitorTransactionBitmapRemove(virJSONValuePtr actions,
const char *node, const char *node,

4
src/qemu/qemu_monitor_json.c
View File

@ -9153,7 +9153,8 @@ qemuMonitorJSONTransactionBitmapAdd(virJSONValuePtr actions,
const char *node, const char *node,
const char *name, const char *name,
bool persistent, bool persistent,
bool disabled) bool disabled,
unsigned long long granularity)
{ {
return qemuMonitorJSONTransactionAdd(actions, return qemuMonitorJSONTransactionAdd(actions,
"block-dirty-bitmap-add", "block-dirty-bitmap-add",
@ -9161,6 +9162,7 @@ qemuMonitorJSONTransactionBitmapAdd(virJSONValuePtr actions,
"s:name", name, "s:name", name,
"b:persistent", persistent, "b:persistent", persistent,
"b:disabled", disabled, "b:disabled", disabled,
"P:granularity", granularity,
NULL); NULL);
} }

3
src/qemu/qemu_monitor_json.h
View File

@ -636,7 +636,8 @@ qemuMonitorJSONTransactionBitmapAdd(virJSONValuePtr actions,
const char *node, const char *node,
const char *name, const char *name,
bool persistent, bool persistent,
bool disabled); bool disabled,
unsigned long long granularity);
int int
qemuMonitorJSONTransactionBitmapRemove(virJSONValuePtr actions, qemuMonitorJSONTransactionBitmapRemove(virJSONValuePtr actions,
const char *node, const char *node,

2
tests/qemumonitorjsontest.c
View File

@ -2956,7 +2956,7 @@ testQemuMonitorJSONTransaction(const void *opaque)
qemuMonitorTransactionBitmapMergeSourceAddBitmap(mergebitmaps, "node2", "bitmap2") < 0) qemuMonitorTransactionBitmapMergeSourceAddBitmap(mergebitmaps, "node2", "bitmap2") < 0)
return -1; return -1;
if (qemuMonitorTransactionBitmapAdd(actions, "node1", "bitmap1", true, true) < 0 || if (qemuMonitorTransactionBitmapAdd(actions, "node1", "bitmap1", true, true, 1234) < 0 ||
qemuMonitorTransactionBitmapRemove(actions, "node2", "bitmap2") < 0 || qemuMonitorTransactionBitmapRemove(actions, "node2", "bitmap2") < 0 ||
qemuMonitorTransactionBitmapEnable(actions, "node3", "bitmap3") < 0 || qemuMonitorTransactionBitmapEnable(actions, "node3", "bitmap3") < 0 ||
qemuMonitorTransactionBitmapDisable(actions, "node4", "bitmap4") < 0 || qemuMonitorTransactionBitmapDisable(actions, "node4", "bitmap4") < 0 ||