[libvirt] [PATCH 6/9] qemu: checkpoint: Replace open-coded transaction action generators

Use the generators provided by the monitor code instead. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_checkpoint.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 30d1b6ae3a..04320b8e39 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -23,7 +23,6 @@ #include "qemu_checkpoint.h" #include "qemu_capabilities.h" #include "qemu_monitor.h" -#include "qemu_monitor_json.h" #include "qemu_domain.h" #include "virerror.h" @@ -306,12 +305,7 @@ qemuDomainCheckpointAddActions(virDomainObjPtr vm, if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP) continue; node = qemuDomainDiskNodeFormatLookup(vm, disk->name); - if (qemuMonitorJSONTransactionAdd(actions, - "block-dirty-bitmap-add", - "s:node", node, - "s:name", disk->bitmap, - "b:persistent", true, - NULL) < 0) + if (qemuMonitorTransactionBitmapAdd(actions, node, disk->bitmap, true, false) < 0) return -1; /* We only want one active bitmap for a disk along the @@ -334,11 +328,7 @@ qemuDomainCheckpointAddActions(virDomainObjPtr vm, if (STRNEQ(disk->name, disk2->name) || disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP) continue; - if (qemuMonitorJSONTransactionAdd(actions, - "block-dirty-bitmap-disable", - "s:node", node, - "s:name", disk2->bitmap, - NULL) < 0) + if (qemuMonitorTransactionBitmapDisable(actions, node, disk2->bitmap) < 0) return -1; search_parents = false; break; -- 2.21.0