You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
2.7 KiB
68 lines
2.7 KiB
From 531c9abeb0483ed64adafdd0546d77b13d913445 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <531c9abeb0483ed64adafdd0546d77b13d913445.1769699807.git.jdenemar@redhat.com>
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Fri, 16 Jan 2026 16:38:38 +0100
|
|
Subject: [PATCH] qemuDomainSetBlockIoTuneField: Move setting of 'group_name'
|
|
out of the loop
|
|
|
|
The refactor will simplify further change which will introduce another
|
|
source for the group name.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
(cherry picked from commit fa064375668df0e67b4d68fdfc4a386862026f3f)
|
|
|
|
https://issues.redhat.com/browse/RHEL-141820 [rhel-10.2]
|
|
https://issues.redhat.com/browse/RHEL-144010 [rhel-9.8]
|
|
---
|
|
src/qemu/qemu_driver.c | 20 ++++++++++++--------
|
|
1 file changed, 12 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
index 194017a29a..ecfb65c535 100644
|
|
--- a/src/qemu/qemu_driver.c
|
|
+++ b/src/qemu/qemu_driver.c
|
|
@@ -15173,6 +15173,7 @@ qemuDomainSetBlockIoTuneFields(virDomainBlockIoTuneInfo *info,
|
|
int *eventNparams,
|
|
int *eventMaxparams)
|
|
{
|
|
+ const char *param_group_name = NULL;
|
|
size_t i;
|
|
|
|
#define SET_IOTUNE_FIELD(FIELD, BOOL, CONST) \
|
|
@@ -15218,15 +15219,8 @@ qemuDomainSetBlockIoTuneFields(virDomainBlockIoTuneInfo *info,
|
|
WRITE_IOPS_SEC_MAX);
|
|
SET_IOTUNE_FIELD(size_iops_sec, SIZE_IOPS, SIZE_IOPS_SEC);
|
|
|
|
- /* NB: Cannot use macro since this is a value.s not a value.ul */
|
|
if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_GROUP_NAME)) {
|
|
- info->group_name = g_strdup(param->value.s);
|
|
- *set_fields |= QEMU_BLOCK_IOTUNE_SET_GROUP_NAME;
|
|
- if (virTypedParamsAddString(eventParams, eventNparams,
|
|
- eventMaxparams,
|
|
- VIR_DOMAIN_TUNABLE_BLKDEV_GROUP_NAME,
|
|
- param->value.s) < 0)
|
|
- return -1;
|
|
+ param_group_name = param->value.s;
|
|
continue;
|
|
}
|
|
|
|
@@ -15244,6 +15238,16 @@ qemuDomainSetBlockIoTuneFields(virDomainBlockIoTuneInfo *info,
|
|
WRITE_IOPS_SEC_MAX_LENGTH);
|
|
}
|
|
|
|
+ if (param_group_name) {
|
|
+ info->group_name = g_strdup(param_group_name);
|
|
+ *set_fields |= QEMU_BLOCK_IOTUNE_SET_GROUP_NAME;
|
|
+ if (virTypedParamsAddString(eventParams, eventNparams,
|
|
+ eventMaxparams,
|
|
+ VIR_DOMAIN_TUNABLE_BLKDEV_GROUP_NAME,
|
|
+ param_group_name) < 0)
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
#undef SET_IOTUNE_FIELD
|
|
|
|
return 0;
|
|
--
|
|
2.52.0
|
|
|