From e1f5f8516f76ba18999d87bf27784d498f358db3 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki Date: Wed, 7 Oct 2009 15:33:36 +0200 Subject: [PATCH] Fix handling return value of qemuMonitorSetBalloon * src/qemu/qemu_driver.c: The positive return value of qemuMonitorSetBalloon should be handled as a success --- src/qemu/qemu_driver.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f03f054311..8aff874ab9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3020,17 +3020,20 @@ static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) { } if (virDomainIsActive(vm)) { - ret = qemuMonitorSetBalloon(vm, newmem); - /* Turn lack of balloon support into a fatal error */ - if (ret == 0) { + int r = qemuMonitorSetBalloon(vm, newmem); + if (r < 0) + goto cleanup; + + /* Lack of balloon support is a fatal error */ + if (r == 0) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, "%s", _("cannot set memory of an active domain")); - ret = -1; + goto cleanup; } } else { vm->def->memory = newmem; - ret = 0; } + ret = 0; cleanup: if (vm)