From db0945f0402811145f17d6c03c48d26f99de54f8 Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Wed, 25 Jun 2025 11:44:24 +0800 Subject: [PATCH] call virNetDaemonCallInhibit with raw parameters passed in (#ICHNA3) --- ...nCallInhibit-with-raw-parameters-pas.patch | 28 +++++++++++++++++++ libvirt.spec | 8 +++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100755 1000-call-virNetDaemonCallInhibit-with-raw-parameters-pas.patch diff --git a/1000-call-virNetDaemonCallInhibit-with-raw-parameters-pas.patch b/1000-call-virNetDaemonCallInhibit-with-raw-parameters-pas.patch new file mode 100755 index 0000000..5edb6f2 --- /dev/null +++ b/1000-call-virNetDaemonCallInhibit-with-raw-parameters-pas.patch @@ -0,0 +1,28 @@ +From b259acf76a5841fb61eeef5c91e7599bef42c416 Mon Sep 17 00:00:00 2001 +From: liuxinhao +Date: Wed, 25 Jun 2025 16:14:50 +0800 +Subject: [PATCH] call virNetDaemonCallInhibit with raw parameters passed in + (#ICHNA3) + +--- + src/rpc/virnetdaemon.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c +index bb81a43..1d0b763 100644 +--- a/src/rpc/virnetdaemon.c ++++ b/src/rpc/virnetdaemon.c +@@ -564,8 +564,8 @@ virNetDaemonAddShutdownInhibition(virNetDaemonPtr dmn) + if (dmn->autoShutdownInhibitions == 1) + virNetDaemonCallInhibit(dmn, + "shutdown", +- _("Libvirt"), +- _("Virtual machines need to be saved"), ++ "Libvirt", ++ "Virtual machines need to be saved", + "delay"); + #endif + +-- +2.33.0 + diff --git a/libvirt.spec b/libvirt.spec index 5d238ff..fc02f1a 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -101,7 +101,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 6.2.0 -Release: 63 +Release: 64 License: LGPLv2+ URL: https://libvirt.org/ @@ -511,6 +511,9 @@ Patch0398: util-keep-track-of-full-GSource-object-not-source-ID.patch Patch0399: rpc-mark-source-returned-by-virEventGLibAddSocketWat.patch Patch0400: rpc-ensure-temporary-GSource-is-removed-from-client-.patch + +Patch1000: 1000-call-virNetDaemonCallInhibit-with-raw-parameters-pas.patch + Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} @@ -2246,6 +2249,9 @@ exit 0 %changelog +* Wed Jun 25 2025 liuxinhao - 6.2.0-64 +- rpc: call virNetDaemonCallInhibit with raw parameters passed in (#ICHNA3) + * Fri May 24 2024 jiangjiacheng - 6.2.0-63 - util: keep track of full GSource object not source ID number - rpc: mark source returned by virEventGLibAddSocketWatch as unused -- Gitee