From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 840EC138350 for ; Sun, 5 Apr 2020 17:19:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAC05E0A9F; Sun, 5 Apr 2020 17:19:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8FB2CE0A9F for ; Sun, 5 Apr 2020 17:19:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 38B2234EF26 for ; Sun, 5 Apr 2020 17:19:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A78FB19B for ; Sun, 5 Apr 2020 17:19:35 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1586107156.5231c7fa687892e2ccfc71e38a60d69a59c977d0.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/files/, app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/files/libvirt-6.0.0-qemu-end-the-agent-job-in-qemuDomainSetTimeAgent.patch app-emulation/libvirt/libvirt-6.0.0-r1.ebuild app-emulation/libvirt/libvirt-6.0.0-r2.ebuild X-VCS-Directories: app-emulation/libvirt/ app-emulation/libvirt/files/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 5231c7fa687892e2ccfc71e38a60d69a59c977d0 X-VCS-Branch: master Date: Sun, 5 Apr 2020 17:19:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bed99f6e-c4e5-4463-b377-54d958369a3b X-Archives-Hash: d4752322d3e7b817e7428c9de8a87bb7 commit: 5231c7fa687892e2ccfc71e38a60d69a59c977d0 Author: Michal Privoznik redhat com> AuthorDate: Sat Apr 4 07:45:31 2020 +0000 Commit: Matthias Maier gentoo 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 redhat.com> Signed-off-by: Matthias Maier 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: +From: =?UTF-8?q?J=C3=A1n=20Tomko?= +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 +Reported-by: Dan Zheng +Fixes: e005c95f56fee9ed780be7f8db103d690bd34cbd +(cherry picked from commit d61f95cf6a6fbd564e104c168d325581acd9cd8d) +Signed-off-by: Michal Privoznik +--- + 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() {