6:47 a.m.
Time to actually issue the QMP transactions that create and
delete persistent checkpoints. For create, we only need one
transaction: inside, we visit all disks affected by the
checkpoint, and create a new enabled bitmap, as well as
disabling the bitmap of the parent checkpoint (if any). For
deletion, we need multiple calls: if the checkpoint to be
deleted is active, we must enable the parent; then we must
merge the existing checkpoint into the parent, and finally
we can delete the checkpoint.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
src/qemu/qemu_domain.c | 106 +++++++++++++++++++++++++++++------------
src/qemu/qemu_driver.c | 84 +++++++++++++++++++++++++++++++-
2 files changed, 159 insertions(+), 31 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f995721bb0..2161e7b3b4 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1,7 +1,7 @@
/*
* qemu_domain.c: QEMU domain private state
*
- * Copyright (C) 2006-2018 Red Hat, Inc.
+ * Copyright (C) 2006-2019 Red Hat, Inc.
* Copyright (C) 2006 Daniel P. Berrange
*
* This library is free software; you can redistribute it and/or
@@ -8709,44 +8709,89 @@ qemuDomainCheckpointDiscard(virQEMUDriverPtr driver,
int ret = -1;
virDomainCheckpointObjPtr parentchk = NULL;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
+ size_t i, j;
+ virJSONValuePtr arr = NULL;
- if (!metadata_only) {
- if (!virDomainObjIsActive(vm)) {
- virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
- _("cannot remove checkpoint from inactive
domain"));
- goto cleanup;
- } else {
- /* TODO: Implement QMP sequence to merge bitmaps */
- // qemuDomainObjPrivatePtr priv;
- // priv = vm->privateData;
- // qemuDomainObjEnterMonitor(driver, vm);
- // /* we continue on even in the face of error */
- // qemuMonitorDeleteCheckpoint(priv->mon, chk->def->name);
- // ignore_value(qemuDomainObjExitMonitor(driver, vm));
- }
+ if (!metadata_only && !virDomainObjIsActive(vm)) {
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+ _("cannot remove checkpoint from inactive domain"));
+ goto cleanup;
}
if (virAsprintf(&chkFile, "%s/%s/%s.xml", cfg->checkpointDir,
vm->def->name, chk->def->name) < 0)
goto cleanup;
+ if (chk->def->parent) {
+ parentchk = virDomainCheckpointFindByName(vm->checkpoints,
+ chk->def->parent);
+ if (!parentchk) {
+ VIR_WARN("missing parent checkpoint matching name '%s'",
+ chk->def->parent);
+ }
+ }
+
+ if (!metadata_only) {
+ qemuDomainObjPrivatePtr priv = vm->privateData;
+ bool success = true;
+
+ if (qemuBlockNodeNamesDetect(driver, vm, QEMU_ASYNC_JOB_NONE) < 0)
+ goto cleanup;
+ qemuDomainObjEnterMonitor(driver, vm);
+ for (i = 0; i < chk->def->ndisks; i++) {
+ virDomainCheckpointDiskDef *disk = &chk->def->disks[i];
+ const char *node;
+
+ if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+ continue;
+
+ node = qemuBlockNodeLookup(vm, disk->name);
+ if (parentchk) {
+ arr = virJSONValueNewArray();
+ if (!arr ||
+ virJSONValueArrayAppendString(arr, disk->bitmap) < 0) {
+ success = false;
+ break;
+ }
+
+ for (j = 0; j < parentchk->def->ndisks; j++) {
+ virDomainCheckpointDiskDef *disk2;
+
+ disk2 = &parentchk->def->disks[j];
+ if (STRNEQ(disk->name, disk2->name))
+ continue;
+ if (chk == vm->current_checkpoint &&
+ qemuMonitorEnableBitmap(priv->mon, node,
+ disk2->bitmap) < 0) {
+ success = false;
+ break;
+ }
+ if (qemuMonitorMergeBitmaps(priv->mon, node,
+ disk2->bitmap, &arr) < 0) {
+ success = false;
+ break;
+ }
+ }
+ }
+ if (qemuMonitorDeleteBitmap(priv->mon, node, disk->bitmap) < 0) {
+ success = false;
+ break;
+ }
+ }
+ if (qemuDomainObjExitMonitor(driver, vm) < 0 || !success)
+ goto cleanup;
+ }
+
if (chk == vm->current_checkpoint) {
- if (update_parent && chk->def->parent) {
- parentchk = virDomainCheckpointFindByName(vm->checkpoints,
- chk->def->parent);
- if (!parentchk) {
- VIR_WARN("missing parent checkpoint matching name
'%s'",
+ if (update_parent && parentchk) {
+ parentchk->def->current = true;
+ if (qemuDomainCheckpointWriteMetadata(vm, parentchk, driver->caps,
+ driver->xmlopt,
+ cfg->checkpointDir) < 0) {
+ VIR_WARN("failed to set parent checkpoint '%s' as
current",
chk->def->parent);
- } else {
- parentchk->def->current = true;
- if (qemuDomainCheckpointWriteMetadata(vm, parentchk, driver->caps,
- driver->xmlopt,
- cfg->checkpointDir) < 0) {
- VIR_WARN("failed to set parent checkpoint '%s' as
current",
- chk->def->parent);
- parentchk->def->current = false;
- parentchk = NULL;
- }
+ parentchk->def->current = false;
+ parentchk = NULL;
}
}
vm->current_checkpoint = parentchk;
@@ -8763,6 +8808,7 @@ qemuDomainCheckpointDiscard(virQEMUDriverPtr driver,
cleanup:
VIR_FREE(chkFile);
virObjectUnref(cfg);
+ virJSONValueFree(arr);
return ret;
}
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 76a62d2d76..07db03dca3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -48,6 +48,7 @@
#include "qemu_hostdev.h"
#include "qemu_hotplug.h"
#include "qemu_monitor.h"
+#include "qemu_monitor_json.h"
#include "qemu_process.h"
#include "qemu_migration.h"
#include "qemu_migration_params.h"
@@ -17256,6 +17257,51 @@ qemuDomainCheckpointPrepare(virQEMUDriverPtr driver, virCapsPtr
caps,
return ret;
}
+static int
+qemuDomainCheckpointAddActions(virDomainObjPtr vm,
+ virJSONValuePtr actions,
+ virDomainCheckpointObjPtr old_current,
+ virDomainCheckpointDefPtr def)
+{
+ size_t i, j;
+ int ret = -1;
+
+ for (i = 0; i < def->ndisks; i++) {
+ virDomainCheckpointDiskDef *disk = &def->disks[i];
+ const char *node;
+
+ if (disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
+ continue;
+ node = qemuBlockNodeLookup(vm, disk->name);
+ if (qemuMonitorJSONTransactionAdd(actions,
+ "block-dirty-bitmap-add",
+ "s:node", node,
+ "s:name", disk->bitmap,
+ "b:persistent", true,
+ NULL) < 0)
+ goto cleanup;
+ if (old_current) {
+ for (j = 0; j < old_current->def->ndisks; j++) {
+ virDomainCheckpointDiskDef *disk2;
+
+ disk2 = &old_current->def->disks[j];
+ if (STRNEQ(disk->name, disk2->name))
+ continue;
+ if (disk2->type == VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP &&
+ qemuMonitorJSONTransactionAdd(actions,
+
"block-dirty-bitmap-disable",
+ "s:node", node,
+ "s:name", disk2->bitmap,
+ NULL) < 0)
+ goto cleanup;
+ }
+ }
+ }
+ ret = 0;
+
+ cleanup:
+ return ret;
+}
/* Struct and hash-iterator callback used when bulk redefining checkpoints */
@@ -17297,6 +17343,9 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain,
virDomainCheckpointObjPtr other = NULL;
virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
+ qemuDomainObjPrivatePtr priv;
+ virJSONValuePtr actions = NULL;
+ int ret;
virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE |
VIR_DOMAIN_CHECKPOINT_CREATE_CURRENT |
@@ -17313,11 +17362,18 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain,
if (!(vm = qemuDomObjFromDomain(domain)))
goto cleanup;
+ priv = vm->privateData;
cfg = virQEMUDriverGetConfig(driver);
if (virDomainCheckpointCreateXMLEnsureACL(domain->conn, vm->def) < 0)
goto cleanup;
+ if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BITMAP_MERGE)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("qemu binary lacks persistent bitmaps support"));
+ goto cleanup;
+ }
+
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup;
@@ -17394,6 +17450,7 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain,
if (update_current)
chk->def->current = true;
if (vm->current_checkpoint) {
+ other = vm->current_checkpoint;
if (!redefine &&
VIR_STRDUP(chk->def->parent,
vm->current_checkpoint->def->name) < 0)
goto endjob;
@@ -17413,7 +17470,14 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain,
* makes sense, such as checking that qemu-img recognizes the
* checkpoint bitmap name in at least one of the domain's disks? */
} else {
- /* TODO: issue QMP transaction command */
+ if (!(actions = virJSONValueNewArray()))
+ goto endjob;
+ if (qemuDomainCheckpointAddActions(vm, actions, other, chk->def) < 0)
+ goto endjob;
+ qemuDomainObjEnterMonitor(driver, vm);
+ ret = qemuMonitorTransaction(priv->mon, &actions);
+ if (qemuDomainObjExitMonitor(driver, vm) < 0 || ret < 0)
+ goto endjob;
}
/* If we fail after this point, there's not a whole lot we can do;
@@ -17452,6 +17516,7 @@ qemuDomainCheckpointCreateXML(virDomainPtr domain,
qemuDomainObjEndJob(driver, vm);
cleanup:
+ virJSONValueFree(actions);
virDomainObjEndAPI(&vm);
virDomainCheckpointDefFree(def);
VIR_FREE(xml);
@@ -17824,6 +17889,7 @@ qemuDomainCheckpointDelete(virDomainCheckpointPtr checkpoint,
{
virQEMUDriverPtr driver = checkpoint->domain->conn->privateData;
virDomainObjPtr vm = NULL;
+ qemuDomainObjPrivatePtr priv;
int ret = -1;
virDomainCheckpointObjPtr chk = NULL;
virQEMUDependentRemove rem;
@@ -17846,6 +17912,22 @@ qemuDomainCheckpointDelete(virDomainCheckpointPtr checkpoint,
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
goto cleanup;
+ priv = vm->privateData;
+ if (!metadata_only) {
+ /* Until qemu-img supports offline bitmap deletion, we are stuck
+ * with requiring a running guest */
+ if (!virDomainObjIsActive(vm)) {
+ virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+ _("cannot delete checkpoint for inactive domain"));
+ goto endjob;
+ }
+ if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BITMAP_MERGE)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("qemu binary lacks persistent bitmaps support"));
+ goto endjob;
+ }
+ }
+
if (!(chk = qemuCheckObjFromCheckpoint(vm, checkpoint)))
goto endjob;
--
2.20.1