From ae3b82266d5d9c825f5c3639e2cea59d4060b5ff Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 12 May 2017 17:46:31 +0200 Subject: [PATCH] qemu: hotplug: print correct vcpu when validating hot(un)plug config The error message would contain first vcpu id after the list of vcpus selected for modification. To print the proper vcpu id remember the first vcpu selected to be modified. --- src/qemu/qemu_hotplug.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e8d29186eb..1d7f2cc71b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5866,6 +5866,7 @@ qemuDomainVcpuValidateConfig(virDomainDefPtr def, virDomainVcpuDefPtr vcpu; size_t maxvcpus = virDomainDefGetVcpusMax(def); ssize_t next; + ssize_t firstvcpu = -1; /* vcpu 0 can't be disabled */ if (!state && virBitmapIsBitSet(map, 0)) { @@ -5880,13 +5881,17 @@ qemuDomainVcpuValidateConfig(virDomainDefPtr def, continue; /* skip vcpus being modified */ - if (virBitmapIsBitSet(map, next)) + if (virBitmapIsBitSet(map, next)) { + if (firstvcpu < 0) + firstvcpu = next; + continue; + } if (vcpu->online && vcpu->hotpluggable == VIR_TRISTATE_BOOL_NO) { virReportError(VIR_ERR_INVALID_ARG, _("vcpu '%zd' can't be modified as it is followed " - "by non-hotpluggable online vcpus"), next); + "by non-hotpluggable online vcpus"), firstvcpu); return -1; } } -- 2.47.2