From 10d9fe8281eac7239aa827e82eb62be6618ec964 Mon Sep 17 00:00:00 2001 From: fanmingzhan Date: Wed, 3 Dec 2025 18:57:59 +0800 Subject: [PATCH 1/9] libvirt update to version 9.10.0-21 --- ...s_been_changed_fro_ubse_to_virtAgent.patch | 19 +++++++++++++++++++ libvirt.spec | 8 +++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ham_migration__The_dependency_has_been_changed_fro_ubse_to_virtAgent.patch diff --git a/ham_migration__The_dependency_has_been_changed_fro_ubse_to_virtAgent.patch b/ham_migration__The_dependency_has_been_changed_fro_ubse_to_virtAgent.patch new file mode 100644 index 0000000..ec41815 --- /dev/null +++ b/ham_migration__The_dependency_has_been_changed_fro_ubse_to_virtAgent.patch @@ -0,0 +1,19 @@ +Subject: [PATCH] ham migration: The dependency has been changed fro ubse to virtAgent +--- +Index: src/util/virham.c +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/src/util/virham.c b/src/util/virham.c +--- a/src/util/virham.c (revision 99517152789af4d21cdb567e5742838b3be520d7) ++++ b/src/util/virham.c (revision 3d442ea7db1f4adb1c65d09f6f5e76c363968204) +@@ -18,7 +18,7 @@ + VIR_LOG_INIT("util.ham"); + + /* rack ipc path for ham migration */ +-#define VIR_HAM_RACK_IPC_PATH "/usr/local/softbus/ctrlbus/lib/librack_com.so" ++#define VIR_HAM_RACK_IPC_PATH "/usr/lib64/libubs-virt-agent.so" + #define VIR_HAM_SECOND_TRANS_TO_MILLIONSECOND 1000 + + static unsigned long long virHamCancelledTimeout = VIR_HAM_CANCELLED_TIMEOUT; diff --git a/libvirt.spec b/libvirt.spec index f5f6cba..b3cae13 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: 20 +Release: 21 License: LGPLv2+ URL: https://libvirt.org/ @@ -378,6 +378,7 @@ Patch0104: ham-migration-cleancode.patch 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_ubse_to_virtAgent.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -2669,6 +2670,11 @@ exit 0 %endif %changelog +* Thu Dec 03 2025 fanmingzhan - 9.10.0-21 +- migration: fix ham migration +- [patch] ham migration: The dependency has been changed fro ubse to virtAgent + + * Thu Nov 27 2025 PengruiZhang - 9.10.0-20 - migration: support onecopy migration - migration: support 'urma' protocol header type -- Gitee From 3af5c30c68bfff93ad4655aab32d51563b7dfd1a Mon Sep 17 00:00:00 2001 From: fanmingzhan Date: Wed, 3 Dec 2025 19:04:19 +0800 Subject: [PATCH 2/9] libvirt update to version 9.10.0-21 --- libvirt.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index b3cae13..c5e101f 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -2670,10 +2670,8 @@ exit 0 %endif %changelog -* Thu Dec 03 2025 fanmingzhan - 9.10.0-21 +* Wed Dec 03 2025 fanmingzhan - 9.10.0-21 - migration: fix ham migration -- [patch] ham migration: The dependency has been changed fro ubse to virtAgent - * Thu Nov 27 2025 PengruiZhang - 9.10.0-20 - migration: support onecopy migration -- Gitee From 1c7aa124caae8a987345ee6c9f4f380193c827df Mon Sep 17 00:00:00 2001 From: fanmingzhan Date: Wed, 3 Dec 2025 19:20:03 +0800 Subject: [PATCH 3/9] libvirt update to version 9.10.0-21 --- ...-The-dependency-has-been-changed-fro-ubse-to-virtAgent.patch | 0 libvirt.spec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename ham_migration__The_dependency_has_been_changed_fro_ubse_to_virtAgent.patch => ham-migration-The-dependency-has-been-changed-fro-ubse-to-virtAgent.patch (100%) diff --git a/ham_migration__The_dependency_has_been_changed_fro_ubse_to_virtAgent.patch b/ham-migration-The-dependency-has-been-changed-fro-ubse-to-virtAgent.patch similarity index 100% rename from ham_migration__The_dependency_has_been_changed_fro_ubse_to_virtAgent.patch rename to ham-migration-The-dependency-has-been-changed-fro-ubse-to-virtAgent.patch diff --git a/libvirt.spec b/libvirt.spec index c5e101f..101998d 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -378,7 +378,7 @@ Patch0104: ham-migration-cleancode.patch 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_ubse_to_virtAgent.patch +Patch0108: ham-migration-The-dependency-has-been-changed-fro-ubse-to-virtAgent.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} -- Gitee From bfe9971e43966db743767b33a34d560ed28dc552 Mon Sep 17 00:00:00 2001 From: fanmingzhan Date: Wed, 3 Dec 2025 19:34:02 +0800 Subject: [PATCH 4/9] libvirt update to version 9.10.0-21 --- libvirt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index 101998d..8825d1e 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -2671,7 +2671,7 @@ exit 0 %changelog * Wed Dec 03 2025 fanmingzhan - 9.10.0-21 -- migration: fix ham migration +- ham migration: The dependency has been changed fro ubse to virtAgent * Thu Nov 27 2025 PengruiZhang - 9.10.0-20 - migration: support onecopy migration -- Gitee From 2ae31d21e8b60db82551fb7aba5f3b657935f197 Mon Sep 17 00:00:00 2001 From: fanmingzhan Date: Wed, 3 Dec 2025 19:54:42 +0800 Subject: [PATCH 5/9] libvirt update to version 9.10.0-21 --- ...The-dependency-has-been-changed-from-ubse-to-virtAgent.patch | 0 libvirt.spec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename ham-migration-The-dependency-has-been-changed-fro-ubse-to-virtAgent.patch => ham-migration-The-dependency-has-been-changed-from-ubse-to-virtAgent.patch (100%) diff --git a/ham-migration-The-dependency-has-been-changed-fro-ubse-to-virtAgent.patch b/ham-migration-The-dependency-has-been-changed-from-ubse-to-virtAgent.patch similarity index 100% rename from ham-migration-The-dependency-has-been-changed-fro-ubse-to-virtAgent.patch rename to ham-migration-The-dependency-has-been-changed-from-ubse-to-virtAgent.patch diff --git a/libvirt.spec b/libvirt.spec index 8825d1e..756130f 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -378,7 +378,7 @@ Patch0104: ham-migration-cleancode.patch 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-ubse-to-virtAgent.patch +Patch0108: ham-migration-The-dependency-has-been-changed-from-ubse-to-virtAgent.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} -- Gitee From d9de949337f3c859cfc6e0d341adc2e64b7b76e7 Mon Sep 17 00:00:00 2001 From: fanmingzhan Date: Wed, 3 Dec 2025 20:02:42 +0800 Subject: [PATCH 6/9] libvirt update to version 9.10.0-21 --- libvirt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index 756130f..336abf3 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -2671,7 +2671,7 @@ exit 0 %changelog * Wed Dec 03 2025 fanmingzhan - 9.10.0-21 -- ham migration: The dependency has been changed fro ubse to virtAgent +- ham migration: The dependency has been changed from ubse to virtAgent * Thu Nov 27 2025 PengruiZhang - 9.10.0-20 - migration: support onecopy migration -- Gitee From 5c6aeec7b0d1edb6a99608e6b77b513c302d9bd5 Mon Sep 17 00:00:00 2001 From: fanmingzhan Date: Wed, 3 Dec 2025 20:09:42 +0800 Subject: [PATCH 7/9] libvirt update to version 9.10.0-21 --- ... => ham-migration-The-dependency-changed-to-virtAgent.patch | 0 libvirt.spec | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename ham-migration-The-dependency-has-been-changed-from-ubse-to-virtAgent.patch => ham-migration-The-dependency-changed-to-virtAgent.patch (100%) diff --git a/ham-migration-The-dependency-has-been-changed-from-ubse-to-virtAgent.patch b/ham-migration-The-dependency-changed-to-virtAgent.patch similarity index 100% rename from ham-migration-The-dependency-has-been-changed-from-ubse-to-virtAgent.patch rename to ham-migration-The-dependency-changed-to-virtAgent.patch diff --git a/libvirt.spec b/libvirt.spec index 336abf3..a470cb7 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -378,7 +378,7 @@ Patch0104: ham-migration-cleancode.patch 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-from-ubse-to-virtAgent.patch +Patch0108: ham-migration-The-dependency-changed-to-virtAgent.patch Requires: libvirt-daemon = %{version}-%{release} Requires: libvirt-daemon-config-network = %{version}-%{release} @@ -2671,6 +2671,7 @@ exit 0 %changelog * Wed Dec 03 2025 fanmingzhan - 9.10.0-21 +- migration: change ham migrate dependency file - ham migration: The dependency has been changed from ubse to virtAgent * Thu Nov 27 2025 PengruiZhang - 9.10.0-20 -- Gitee From 7efdc8c41b178e00dc258058fbb9d7de290afe01 Mon Sep 17 00:00:00 2001 From: fanmingzhan Date: Wed, 3 Dec 2025 20:24:23 +0800 Subject: [PATCH 8/9] libvirt update to version 9.10.0-21 --- libvirt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec b/libvirt.spec index a470cb7..7cb5cbd 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -2672,7 +2672,7 @@ exit 0 %changelog * Wed Dec 03 2025 fanmingzhan - 9.10.0-21 - migration: change ham migrate dependency file -- ham migration: The dependency has been changed from ubse to virtAgent +- ham migration: The dependency has been changed from ubse to virtAgent * Thu Nov 27 2025 PengruiZhang - 9.10.0-20 - migration: support onecopy migration -- Gitee From b5f5d9a553059a5e9a67119ac42852edcc944fb7 Mon Sep 17 00:00:00 2001 From: fanmingzhan Date: Wed, 3 Dec 2025 20:25:45 +0800 Subject: [PATCH 9/9] libvirt update to version 9.10.0-21 --- libvirt.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec b/libvirt.spec index 7cb5cbd..f212fc5 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/ @@ -2670,7 +2670,7 @@ exit 0 %endif %changelog -* Wed Dec 03 2025 fanmingzhan - 9.10.0-21 +* Wed Dec 03 2025 fanmingzhan - 9.10.0-22 - migration: change ham migrate dependency file - ham migration: The dependency has been changed from ubse to virtAgent -- Gitee