|
 |
984721 |
From 34188b9f1bb1e53d2372e02c0388430a85f4cad5 Mon Sep 17 00:00:00 2001
|
|
|
984721 |
Message-Id: <34188b9f1bb1e53d2372e02c0388430a85f4cad5@dist-git>
|
|
|
984721 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
984721 |
Date: Thu, 18 Jun 2020 12:31:46 +0200
|
|
|
984721 |
Subject: [PATCH] qemu: end the agent job in qemuDomainSetTimeAgent
|
|
|
984721 |
MIME-Version: 1.0
|
|
|
984721 |
Content-Type: text/plain; charset=UTF-8
|
|
|
984721 |
Content-Transfer-Encoding: 8bit
|
|
|
984721 |
|
|
|
984721 |
This function grabs an agent job but ends a monitor job.
|
|
|
984721 |
End the agent job instead.
|
|
|
984721 |
|
|
|
984721 |
https://bugzilla.redhat.com/show_bug.cgi?id=1792723
|
|
|
984721 |
|
|
|
984721 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
984721 |
Reported-by: Dan Zheng <dzheng@redhat.com>
|
|
|
984721 |
Fixes: e005c95f56fee9ed780be7f8db103d690bd34cbd
|
|
|
984721 |
(cherry picked from commit d61f95cf6a6fbd564e104c168d325581acd9cd8d)
|
|
|
984721 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
984721 |
|
|
|
984721 |
https://bugzilla.redhat.com/show_bug.cgi?id=1844952
|
|
|
984721 |
Message-Id: <7fa0860281f9f2a08acf488784738f54a8158e63.1592476262.git.jtomko@redhat.com>
|
|
|
984721 |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
984721 |
---
|
|
|
984721 |
src/qemu/qemu_driver.c | 2 +-
|
|
|
984721 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
984721 |
|
|
|
984721 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
984721 |
index e1d9bbae99..449d869f98 100644
|
|
|
984721 |
--- a/src/qemu/qemu_driver.c
|
|
|
984721 |
+++ b/src/qemu/qemu_driver.c
|
|
|
984721 |
@@ -19478,7 +19478,7 @@ qemuDomainSetTimeAgent(virQEMUDriverPtr driver,
|
|
|
984721 |
qemuDomainObjExitAgent(vm, agent);
|
|
|
984721 |
|
|
|
984721 |
endjob:
|
|
|
984721 |
- qemuDomainObjEndJob(driver, vm);
|
|
|
984721 |
+ qemuDomainObjEndAgentJob(vm);
|
|
|
984721 |
return ret;
|
|
|
984721 |
}
|
|
|
984721 |
|
|
|
984721 |
--
|
|
|
984721 |
2.27.0
|
|
|
984721 |
|