commit: 5231c7fa687892e2ccfc71e38a60d69a59c977d0 Author: Michal Privoznik <mprivozn <AT> redhat <DOT> com> AuthorDate: Sat Apr 4 07:45:31 2020 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Sun Apr 5 17:19:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5231c7fa
app-emulation/libvirt-6.0.0: And the agent job in qemuDomainSetTimeAgent Cherry-pick of d61f95cf6a6fbd564e104c168d325581acd9cd8d from the libvirt's upstream repo. Closes: https://bugs.gentoo.org/715494 Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com> Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> ...d-the-agent-job-in-qemuDomainSetTimeAgent.patch | 39 ++++++++++++++++++++++ ...irt-6.0.0-r1.ebuild => libvirt-6.0.0-r2.ebuild} | 1 + 2 files changed, 40 insertions(+) diff --git a/app-emulation/libvirt/files/libvirt-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch b/app-emulation/libvirt/files/libvirt-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch new file mode 100644 index 00000000000..62f89a378bc --- /dev/null +++ b/app-emulation/libvirt/files/libvirt-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch @@ -0,0 +1,39 @@ +From ba756e8d0928ac4ddb7decd1033de2121201d941 Mon Sep 17 00:00:00 2001 +Message-Id: <ba756e8d0928ac4ddb7decd1033de2121201d941.1585986243.git.mpriv...@redhat.com> +From: =?UTF-8?q?J=C3=A1n=20Tomko?= <[email protected]> +Date: Mon, 20 Jan 2020 07:55:48 +0100 +Subject: [PATCH] qemu: end the agent job in qemuDomainSetTimeAgent +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This function grabs an agent job but ends a monitor job. +End the agent job instead. + +https://bugzilla.redhat.com/show_bug.cgi?id=1792723 + +Signed-off-by: Ján Tomko <[email protected]> +Reported-by: Dan Zheng <[email protected]> +Fixes: e005c95f56fee9ed780be7f8db103d690bd34cbd +(cherry picked from commit d61f95cf6a6fbd564e104c168d325581acd9cd8d) +Signed-off-by: Michal Privoznik <[email protected]> +--- + 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 d6b1e9f00c..48cd5b95d9 100644 +--- a/src/qemu/qemu_driver.c ++++ b/src/qemu/qemu_driver.c +@@ -20376,7 +20376,7 @@ qemuDomainSetTimeAgent(virQEMUDriverPtr driver, + qemuDomainObjExitAgent(vm, agent); + + endjob: +- qemuDomainObjEndJob(driver, vm); ++ qemuDomainObjEndAgentJob(vm); + return ret; + } + +-- +2.24.1 + diff --git a/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild b/app-emulation/libvirt/libvirt-6.0.0-r2.ebuild similarity index 99% rename from app-emulation/libvirt/libvirt-6.0.0-r1.ebuild rename to app-emulation/libvirt/libvirt-6.0.0-r2.ebuild index d877620ac91..80289b5c551 100644 --- a/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-6.0.0-r2.ebuild @@ -128,6 +128,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch "${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch + "${FILESDIR}"/${PN}-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch ) pkg_setup() {
