From 7ce0d13bf27b887ce057414fc07aff722fc58a15 Mon Sep 17 00:00:00 2001 From: "ye.zou" Date: Thu, 12 Feb 2026 20:08:10 +0800 Subject: [PATCH 1/2] [kvm]: fix Hygon_Customized CPU mode migration failure When VM CPU mode is set to Hygon_Customized and live migration is performed, the migration fails because Hygon_Customized was being treated as a custom CPU model name rather than being converted to host-passthrough mode. This fix adds CPU_MODE_HYGON_CUSTOMIZED to the condition check and converts it to host-passthrough during VM start, preventing CPU feature mismatch errors during migration on Hygon CPU clusters. Resolves: ZSTAC-73095 Change-Id: Ic418091f1c466624ae7f9ee0b0f466092dde1b54 --- plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java b/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java index a245757517..f32318c1a2 100755 --- a/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java +++ b/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java @@ -4469,8 +4469,9 @@ protected void startVm(final VmInstanceSpec spec, final NeedReplyMessage msg, fi rootVolume.setCacheMode(rcf.getResourceConfigValue(KVMGlobalConfig.LIBVIRT_CACHE_MODE, spec.getDestRootVolume().getUuid(), String.class)); String vmCpuMode = rcf.getResourceConfigValue(KVMGlobalConfig.NESTED_VIRTUALIZATION, spec.getVmInventory().getUuid(), String.class); - if (vmCpuMode.equals(KVMConstant.CPU_MODE_NONE) || vmCpuMode.equals(KVMConstant.CPU_MODE_HOST_MODEL) || vmCpuMode.equals(KVMConstant.CPU_MODE_HOST_PASSTHROUGH)) { - cmd.setNestedVirtualization(vmCpuMode); + if (vmCpuMode.equals(KVMConstant.CPU_MODE_NONE) || vmCpuMode.equals(KVMConstant.CPU_MODE_HOST_MODEL) || vmCpuMode.equals(KVMConstant.CPU_MODE_HOST_PASSTHROUGH) || vmCpuMode.equals(KVMConstant.CPU_MODE_HYGON_CUSTOMIZED)) { + // For Hygon_Customized, we treat it as host-passthrough during VM start to avoid CPU model mismatch + cmd.setNestedVirtualization(vmCpuMode.equals(KVMConstant.CPU_MODE_HYGON_CUSTOMIZED) ? KVMConstant.CPU_MODE_HOST_PASSTHROUGH : vmCpuMode); } else { cmd.setNestedVirtualization(KVMConstant.CPU_MODE_CUSTOM); cmd.setVmCpuModel(vmCpuMode); From f741b16a4fae14593e83e8fc8dd6e333cc39e131 Mon Sep 17 00:00:00 2001 From: "ye.zou" Date: Fri, 13 Feb 2026 21:58:03 +0800 Subject: [PATCH 2/2] [ci]: trigger CI rerun for flaky tests Resolves: ZSTAC-73095 Change-Id: I6c2209ddfc8febd8f5644c031b96428b646bd692