From: Peter Krempa <pkrempa@redhat.com>

The refactor will simplify further change which will introduce another
source for the group name.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 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 bed60d1ca7..8c7a2e9fe2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15182,6 +15182,7 @@ qemuDomainSetBlockIoTuneFields(virDomainBlockIoTuneInfo *info,
                                int *eventNparams,
                                int *eventMaxparams)
 {
+    const char *param_group_name = NULL;
     size_t i;

 #define SET_IOTUNE_FIELD(FIELD, BOOL, CONST) \
@@ -15227,15 +15228,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;
         }

@@ -15253,6 +15247,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