External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 20:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

virDomainCheckpointAlignDisks: Use 'chkdisk' instead of 'disk'

Browse Source 
Clarify that the variable refers to the definition of the disk from the
checkpoint definition.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2020-12-01 17:22:21 +01:00
parent 99b39c7876
commit eb77192c3c
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/checkpoint_conf.c
View File

@ -326,35 +326,35 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefPtr chkdef)
/* Double check requested disks. */ /* Double check requested disks. */
for (i = 0; i < chkdef->ndisks; i++) { for (i = 0; i < chkdef->ndisks; i++) {
virDomainCheckpointDiskDefPtr disk = &chkdef->disks[i]; virDomainCheckpointDiskDefPtr chkdisk = &chkdef->disks[i];
int idx = virDomainDiskIndexByName(domdef, disk->name, false); int idx = virDomainDiskIndexByName(domdef, chkdisk->name, false);
if (idx < 0) { if (idx < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("no disk named '%s'"), disk->name); _("no disk named '%s'"), chkdisk->name);
return -1; return -1;
} }
if (virBitmapIsBitSet(map, idx)) { if (virBitmapIsBitSet(map, idx)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("disk '%s' specified twice"), _("disk '%s' specified twice"),
disk->name); chkdisk->name);
return -1; return -1;
} }
if ((virStorageSourceIsEmpty(domdef->disks[idx]->src) || if ((virStorageSourceIsEmpty(domdef->disks[idx]->src) ||
domdef->disks[idx]->src->readonly) && domdef->disks[idx]->src->readonly) &&
disk->type != VIR_DOMAIN_CHECKPOINT_TYPE_NONE) { chkdisk->type != VIR_DOMAIN_CHECKPOINT_TYPE_NONE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("disk '%s' is empty or readonly"), _("disk '%s' is empty or readonly"),
disk->name); chkdisk->name);
return -1; return -1;
} }
ignore_value(virBitmapSetBit(map, idx)); ignore_value(virBitmapSetBit(map, idx));
disk->idx = idx; chkdisk->idx = idx;
if (STRNEQ(disk->name, domdef->disks[idx]->dst)) { if (STRNEQ(chkdisk->name, domdef->disks[idx]->dst)) {
VIR_FREE(disk->name); VIR_FREE(chkdisk->name);
disk->name = g_strdup(domdef->disks[idx]->dst); chkdisk->name = g_strdup(domdef->disks[idx]->dst);
} }
} }
@ -365,20 +365,20 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefPtr chkdef)
return -1; return -1;
for (i = 0; i < domdef->ndisks; i++) { for (i = 0; i < domdef->ndisks; i++) {
virDomainCheckpointDiskDefPtr disk; virDomainCheckpointDiskDefPtr chkdisk;
if (virBitmapIsBitSet(map, i)) if (virBitmapIsBitSet(map, i))
continue; continue;
disk = &chkdef->disks[ndisks++]; chkdisk = &chkdef->disks[ndisks++];
disk->name = g_strdup(domdef->disks[i]->dst); chkdisk->name = g_strdup(domdef->disks[i]->dst);
disk->idx = i; chkdisk->idx = i;
/* Don't checkpoint empty or readonly drives */ /* Don't checkpoint empty or readonly drives */
if (virStorageSourceIsEmpty(domdef->disks[i]->src) || if (virStorageSourceIsEmpty(domdef->disks[i]->src) ||
domdef->disks[i]->src->readonly) domdef->disks[i]->src->readonly)
disk->type = VIR_DOMAIN_CHECKPOINT_TYPE_NONE; chkdisk->type = VIR_DOMAIN_CHECKPOINT_TYPE_NONE;
else else
disk->type = checkpoint_default; chkdisk->type = checkpoint_default;
} }
qsort(&chkdef->disks[0], chkdef->ndisks, sizeof(chkdef->disks[0]), qsort(&chkdef->disks[0], chkdef->ndisks, sizeof(chkdef->disks[0]),