Merge tag 'x86-asm-2024-01-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[linux-2.6-microblaze.git] / tools / testing / selftests / kvm / get-reg-list.c

diff --git a/tools/testing/selftests/kvm/get-reg-list.c b/tools/testing/selftests/kvm/get-reg-list.c
index be7bf52..8274ef0 100644 (file)
--- a/tools/testing/selftests/kvm/get-reg-list.c
+++ b/tools/testing/selftests/kvm/get-reg-list.c
@@ -71,11 +71,12 @@ static const char *config_name(struct vcpu_reg_list *c)
        for_each_sublist(c, s) {
                if (!strcmp(s->name, "base"))
                        continue;
-               strcat(c->name + len, s->name);
-               len += strlen(s->name) + 1;
-               c->name[len - 1] = '+';
+               if (len)
+                       c->name[len++] = '+';
+               strcpy(c->name + len, s->name);
+               len += strlen(s->name);
        }
-       c->name[len - 1] = '\0';
+       c->name[len] = '\0';
 
        return c->name;
 }