openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virDomainCheckpointAlignDisks: Extract domain disk def pointer to 'domdisk' 

Add a local variable holding the pointer instead of indexing the array
multiple times.

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 18:03:47 +01:00
parent eb77192c3c
commit 5429f60428
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/conf/checkpoint_conf.c
View File

@ -328,6 +328,7 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefPtr chkdef)
for (i = 0; i < chkdef->ndisks; i++) { for (i = 0; i < chkdef->ndisks; i++) {
virDomainCheckpointDiskDefPtr chkdisk = &chkdef->disks[i]; virDomainCheckpointDiskDefPtr chkdisk = &chkdef->disks[i];
int idx = virDomainDiskIndexByName(domdef, chkdisk->name, false); int idx = virDomainDiskIndexByName(domdef, chkdisk->name, false);
virDomainDiskDefPtr domdisk;
if (idx < 0) { if (idx < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@ -335,14 +336,17 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefPtr chkdef)
return -1; return -1;
} }
domdisk = domdef->disks[idx];
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"),
chkdisk->name); chkdisk->name);
return -1; return -1;
} }
if ((virStorageSourceIsEmpty(domdef->disks[idx]->src) ||
domdef->disks[idx]->src->readonly) && if ((virStorageSourceIsEmpty(domdisk->src) ||
domdisk->src->readonly) &&
chkdisk->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"),
@ -352,9 +356,9 @@ virDomainCheckpointAlignDisks(virDomainCheckpointDefPtr chkdef)
ignore_value(virBitmapSetBit(map, idx)); ignore_value(virBitmapSetBit(map, idx));
chkdisk->idx = idx; chkdisk->idx = idx;
if (STRNEQ(chkdisk->name, domdef->disks[idx]->dst)) { if (STRNEQ(chkdisk->name, domdisk->dst)) {
VIR_FREE(chkdisk->name); VIR_FREE(chkdisk->name);
chkdisk->name = g_strdup(domdef->disks[idx]->dst); chkdisk->name = g_strdup(domdisk->dst);
} }
} }