diff --git a/check_if_the_ham_dependency_exists.patch b/check_if_the_ham_dependency_exists.patch new file mode 100644 index 0000000000000000000000000000000000000000..e66ece884c2ab6a772c174cdaafaca87621e762b --- /dev/null +++ b/check_if_the_ham_dependency_exists.patch @@ -0,0 +1,32 @@ +From 3dd9e978e420f4984e27f295228c2e1a3e1f086e Mon Sep 17 00:00:00 2001 +From: fanmingzhan +Date: Tue, 2 Dec 2025 17:00:32 +0800 +Subject: [PATCH] ham migration: During initialization, check if the file + exists + +During initialization, check if the file exists. If it does not exist, issue a warning whithout throwing an error. + +Signed-off-by: fanmingzhan +--- + src/util/virham.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/util/virham.c b/src/util/virham.c +index 6a132738de..2d8298e6bf 100644 +--- a/src/util/virham.c ++++ b/src/util/virham.c +@@ -211,6 +211,11 @@ virHamRackIpcAsyncSendAndRecv(const char *req) + void + virHamClearAll(const char *hostname) + { ++ if (!virFileExists(VIR_HAM_RACK_IPC_PATH)) { ++ VIR_WARN("Ham rack ipc file doesn't exist"); ++ return; ++ } ++ + g_autofree char *req = NULL; + + if (!(req = virHamGetClearReqInit(VIR_HAM_CLEAR_ALL, hostname))) { +-- +2.28.0.windows.1 + diff --git a/libvirt.spec b/libvirt.spec index d09ed7ef0c83a2e21f6e8268d4c688916e8628d0..98145d006707be91014301f4423b7175a788dac0 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -262,7 +262,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 9.10.0 -Release: 21 +Release: 22 License: LGPLv2+ URL: https://libvirt.org/ @@ -379,6 +379,7 @@ Patch0105: 7-ham-migration-delete-virDomainQemuMonitorCommandAs.patch Patch0106: util-resctrl-fixed-an-issue-where-the-L3MAX-value-co.patch Patch0107: ham-migration-add-comment-to-libvirt_hammigrate.syms.patch Patch0108: ham-migration-The-dependency-has-been-changed-fro-ub.patch +Patch0109: check_if_the_ham_dependency_exists.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -2670,6 +2671,9 @@ exit 0 %endif %changelog +* Wed Dec 3 2025 fanmingzhan - 9.10.0-22 +- ham migration: During initialization, check if the file exists + * Wed Dec 3 2025 PengruiZhang - 9.10.0-21 - ham migration: The dependency has been changed fro ubse to virtAgent