External/libvirt
1
0
Fork 0
Code

qemu: checkpoint: Implement VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE

Browse Source 
Validate that the bitmaps are present when redefining a checkpoint.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-11-04 10:16:02 +01:00
parent 93873c9bcc
commit a4d4d2bd5d
1 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/qemu/qemu_checkpoint.c
View File

@ -371,18 +371,56 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
} }
static int
qemuCheckpointRedefineValidateBitmaps(virDomainObjPtr vm,
virDomainCheckpointDefPtr chkdef)
{
g_autoptr(GHashTable) blockNamedNodeData = NULL;
size_t i;
if (virDomainObjCheckActive(vm) < 0)
return -1;
if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, QEMU_ASYNC_JOB_NONE)))
return -1;
for (i = 0; i < chkdef->ndisks; i++) {
virDomainCheckpointDiskDefPtr chkdisk = chkdef->disks + i;
virDomainDiskDefPtr domdisk;
if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
continue;
/* we tolerate missing disks due to possible detach */
if (!(domdisk = virDomainDiskByTarget(vm->def, chkdisk->name)))
continue;
if (!qemuBlockBitmapChainIsValid(domdisk->src, chkdef->parent.name,
blockNamedNodeData)) {
virReportError(VIR_ERR_CHECKPOINT_INCONSISTENT,
_("missing or broken bitmap '%s' for disk '%s'"),
chkdef->parent.name, domdisk->dst);
return -1;
}
}
return 0;
}
static virDomainMomentObjPtr static virDomainMomentObjPtr
qemuCheckpointRedefine(virQEMUDriverPtr driver, qemuCheckpointRedefine(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainCheckpointDefPtr *def, virDomainCheckpointDefPtr *def,
bool *update_current) bool *update_current,
bool validate_bitmaps)
{ {
if (virDomainCheckpointRedefinePrep(vm, *def, update_current) < 0) if (virDomainCheckpointRedefinePrep(vm, *def, update_current) < 0)
return NULL; return NULL;
/* XXX Should we validate that the redefined checkpoint even if (validate_bitmaps &&
* makes sense, such as checking that qemu-img recognizes the qemuCheckpointRedefineValidateBitmaps(vm, *def) < 0)
* checkpoint bitmap name in at least one of the domain's disks? */ return NULL;
return virDomainCheckpointRedefineCommit(vm, def, driver->xmlopt); return virDomainCheckpointRedefineCommit(vm, def, driver->xmlopt);
} }
@ -500,11 +538,13 @@ qemuCheckpointCreateXML(virDomainPtr domain,
virDomainCheckpointPtr checkpoint = NULL; virDomainCheckpointPtr checkpoint = NULL;
bool update_current = true; bool update_current = true;
bool redefine = flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE; bool redefine = flags & VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE;
bool validate_bitmaps = flags & VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE;
unsigned int parse_flags = 0; unsigned int parse_flags = 0;
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
g_autoptr(virDomainCheckpointDef) def = NULL; g_autoptr(virDomainCheckpointDef) def = NULL;
virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE, NULL); virCheckFlags(VIR_DOMAIN_CHECKPOINT_CREATE_REDEFINE |
VIR_DOMAIN_CHECKPOINT_REDEFINE_VALIDATE, NULL);
if (redefine) { if (redefine) {
parse_flags |= VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; parse_flags |= VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE;
@ -535,7 +575,7 @@ qemuCheckpointCreateXML(virDomainPtr domain,
return NULL; return NULL;
if (redefine) { if (redefine) {
chk = qemuCheckpointRedefine(driver, vm, &def, &update_current); chk = qemuCheckpointRedefine(driver, vm, &def, &update_current, validate_bitmaps);
} else { } else {
chk = qemuCheckpointCreate(driver, vm, &def); chk = qemuCheckpointCreate(driver, vm, &def);
} }