[libvirt] [PATCH 2/7] conf: expand iotune params if only group name is given
Currenly if only iotune group name is given for some disk and
no any params then later start of domain will fail. I guess it will
be convinient to allow such configuration if there is another
disk in the same iotune group with iotune params set. The meaning
is that the first disk have same iotunes and the latter. Thus
one can easyly add disk to iotune group - just add group name
parameter and no need to copy all the params.
Also let's expand iotunes params in the described case so we don't
need to refer to another disk to know iotunes and this will make
logic in many places simple.
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
---
src/conf/domain_conf.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index abe21a93fd..f75841c60f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5106,6 +5106,33 @@ virDomainRNGDefPostParse(virDomainRNGDefPtr rng)
}
+static void
+virDomainDiskExpandGroupIoTune(virDomainDiskDefPtr disk,
+ const virDomainDef *def)
+{
+ size_t i;
+
+ if (!disk->blkdeviotune.group_name ||
+ virDomainBlockIoTuneInfoHasAny(&disk->blkdeviotune))
+ return;
+
+ for (i = 0; i < def->ndisks; i++) {
+ virDomainDiskDefPtr d = def->disks[i];
+
+ if (d->blkdeviotune.group_name &&
+ STREQ(disk->blkdeviotune.group_name, d->blkdeviotune.group_name)
&&
+ virDomainBlockIoTuneInfoHasAny(&d->blkdeviotune)) {
+ char *tmp = disk->blkdeviotune.group_name;
+
+ disk->blkdeviotune = d->blkdeviotune;
+ disk->blkdeviotune.group_name = tmp;
+
+ return;
+ }
+ }
+}
+
+
static int
virDomainDiskDefPostParse(virDomainDiskDefPtr disk,
const virDomainDef *def,
@@ -5151,6 +5178,8 @@ virDomainDiskDefPostParse(virDomainDiskDefPtr disk,
return -1;
}
+ virDomainDiskExpandGroupIoTune(disk, def);
+
return 0;
}
--
2.23.0