35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From dadf7e1307010e426a79f5c7133ad4d654f377f6 Mon Sep 17 00:00:00 2001
|
|
From: Erik Skultety <eskultet@redhat.com>
|
|
Date: Fri, 11 Sep 2020 14:44:27 +0200
|
|
Subject: [PATCH 028/108] qemu: qemuDomainPMSuspendAgent: Don't assign to 'ret'
|
|
in a conditional
|
|
|
|
When the guest agent isn't running, we still report success on a PM
|
|
suspend action even though we logged an error correctly, this is because
|
|
we poisoned the 'ret' value a few lines above.
|
|
|
|
Fixes: a663a860819287e041c3de672aad1d8543098ecc
|
|
|
|
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
(cherry picked from commit 9824a82198d97c40ff0e8f423888a7b9ccf5b301)
|
|
---
|
|
src/qemu/qemu_driver.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
index 7be84c88b2..25ca453d76 100644
|
|
--- a/src/qemu/qemu_driver.c
|
|
+++ b/src/qemu/qemu_driver.c
|
|
@@ -19893,7 +19893,7 @@ qemuDomainPMSuspendAgent(virQEMUDriverPtr driver,
|
|
if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0)
|
|
return -1;
|
|
|
|
- if ((ret = virDomainObjCheckActive(vm)) < 0)
|
|
+ if (virDomainObjCheckActive(vm) < 0)
|
|
goto endjob;
|
|
|
|
if (!qemuDomainAgentAvailable(vm, true))
|
|
--
|
|
2.33.0
|
|
|