External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-31 18:15:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: checkpoint: Use disk definition directly when creating checkpoint

Browse Source 
Lookup the whole disk definition rather than just the node name.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-01-08 08:10:35 +01:00
parent f3e0a45a00
commit 7973f7d792
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_checkpoint.c
View File

@ -320,12 +320,16 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
for (i = 0; i < def->ndisks; i++) {
virDomainCheckpointDiskDef *chkdisk = &def->disks[i];
const char *node;
virDomainDiskDefPtr domdisk = virDomainDiskByTarget(vm->def, chkdisk->name);
if (chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
/* checkpoint definition validator mandates that the corresponding
* domdisk should exist */
if (!domdisk ||
chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
continue;
node = qemuDomainDiskNodeFormatLookup(vm, chkdisk->name);
if (qemuMonitorTransactionBitmapAdd(actions, node, chkdisk->bitmap, true, false, 0) < 0)
if (qemuMonitorTransactionBitmapAdd(actions, domdisk->src->nodeformat,
chkdisk->bitmap, true, false, 0) < 0)
return -1;
/* We only want one active bitmap for a disk along the
@ -348,7 +352,9 @@ qemuCheckpointAddActions(virDomainObjPtr vm,
if (STRNEQ(chkdisk->name, disk2->name) ||
disk2->type != VIR_DOMAIN_CHECKPOINT_TYPE_BITMAP)
continue;
if (qemuMonitorTransactionBitmapDisable(actions, node, disk2->bitmap) < 0)
if (qemuMonitorTransactionBitmapDisable(actions,
domdisk->src->nodeformat,
disk2->bitmap) < 0)
return -1;
search_parents = false;
break;