[libvirt] [PATCH] qemu: Don't update count of vCPUs if hot-plug fails silently
When cpu hotplug fails without reporting an error, we would fail the command but update the count of vCPUs anyways. Commit 761fc481365703b861429d73a341bde352ba8d41 fixed the case when CPU hot-unplug failed silently, but forgot to fix up the value in this case. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1000357 --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0a8e518..c39f04d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3982,6 +3982,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, _("got wrong number of vCPU pids from QEMU monitor. " "got %d, wanted %d"), ncpupids, vcpus); + vcpus = oldvcpus; ret = -1; goto cleanup; } -- 1.8.3.2
On 08/26/2013 06:48 AM, Peter Krempa wrote:
When cpu hotplug fails without reporting an error, we would fail the command but update the count of vCPUs anyways.
Commit 761fc481365703b861429d73a341bde352ba8d41 fixed the case when CPU hot-unplug failed silently, but forgot to fix up the value in this case.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1000357 --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+)
ACK.
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0a8e518..c39f04d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3982,6 +3982,7 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, _("got wrong number of vCPU pids from QEMU monitor. " "got %d, wanted %d"), ncpupids, vcpus); + vcpus = oldvcpus; ret = -1; goto cleanup; }
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 08/26/13 15:01, Eric Blake wrote:
On 08/26/2013 06:48 AM, Peter Krempa wrote:
When cpu hotplug fails without reporting an error, we would fail the command but update the count of vCPUs anyways.
Commit 761fc481365703b861429d73a341bde352ba8d41 fixed the case when CPU hot-unplug failed silently, but forgot to fix up the value in this case.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1000357 --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+)
ACK.
Pushed; Thanks. Peter
participants (2)
-
Eric Blake -
Peter Krempa