From f8ac34f0a7c9dd3d3299590eaedbfdf68f441eb9 Mon Sep 17 00:00:00 2001
From: fanmingzhan <fanmingzhan@h-partners.com>
Date: Wed, 19 Nov 2025 19:41:55 +0800
Subject: [PATCH 6/7] ham migration: cleancode

---
 src/qemu/qemu_ham.c | 7 ++++---
 src/qemu/qemu_ham.h | 5 ++++-
 src/util/virham.c   | 5 +++--
 src/util/virham.h   | 6 +++++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_ham.c b/src/qemu/qemu_ham.c
index a00e8ca340..c1a2004118 100644
--- a/src/qemu/qemu_ham.c
+++ b/src/qemu/qemu_ham.c
@@ -10,6 +10,7 @@
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
+#define HTTPS_SUCCESS 200
 
 VIR_LOG_INIT("qemu.qemu_ham");
 
@@ -269,7 +270,7 @@ qemuHamGetBorrowInfo(qemuHamMigrationInfo *hamInfo,
         return -1;
     }
 
-    if (code != 200) {
+    if (code != HTTPS_SUCCESS) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("borrow info request failed with code %1$d"), code);
         return -1;
@@ -434,7 +435,7 @@ qemuHamRollbackPages(virDomainObj *vm)
 }
 
 static char *
-qemuHamGetClearReq(qemuHamMigrationInfo *hamInfo, virHamClearType type)
+qemuHamMakeClearReq(qemuHamMigrationInfo *hamInfo, virHamClearType type)
 {
     g_autofree char *clearReqInit = NULL;
     g_autoptr(virJSONValue) clearReq = NULL;
@@ -483,7 +484,7 @@ qemuHamSendClearReq(qemuHamMigrationInfo *hamInfo, virHamClearType type)
 {
     g_autofree char *req = NULL;
 
-    if (!(req = qemuHamGetClearReq(hamInfo, type))) {
+    if (!(req = qemuHamMakeClearReq(hamInfo, type))) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("failed to create clear request"));
         return;
diff --git a/src/qemu/qemu_ham.h b/src/qemu/qemu_ham.h
index a4d8b57c8d..d521fd280b 100644
--- a/src/qemu/qemu_ham.h
+++ b/src/qemu/qemu_ham.h
@@ -4,7 +4,8 @@
  * Copyright (C) 2025 Huawei Technologies Co., Ltd
  */
 
-#pragma once
+#ifndef QEMU_HAM_H
+#define QEMU_HAM_H
 
 #include "virconftypes.h"
 #include "virdomainjob.h"
@@ -38,3 +39,5 @@ int qemuHamModifyPgtable(virDomainObj *vm);
 int qemuHamRollbackPages(virDomainObj *vm);
 
 void qemuHamSendClearReq(qemuHamMigrationInfo *hamInfo, virHamClearType type);
+
+#endif
diff --git a/src/util/virham.c b/src/util/virham.c
index 463753abcb..4f149794e9 100644
--- a/src/util/virham.c
+++ b/src/util/virham.c
@@ -9,9 +9,9 @@
 #include "viralloc.h"
 #include "virerror.h"
 #include "virfile.h"
-#include "virham.h"
 #include "virjson.h"
 #include "virlog.h"
+#include "virham.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 
@@ -19,6 +19,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_SECOND_TRANS_TO_MILLIONSECOND 1000
 
 static unsigned long long virHamCancelledTimeout = VIR_HAM_CANCELLED_TIMEOUT;
 static uint16_t virHamRackIpcTimeout = VIR_HAM_RACK_IPC_TIMEOUT;
@@ -231,5 +232,5 @@ virHamSetupTimeOut(unsigned long long cancelledTimeout, uint16_t rackIpcTimeout)
 
 unsigned long long
 virHamGetCancelledTimeout(void){
-    return virHamCancelledTimeout * 1000;
+    return virHamCancelledTimeout * VIR_HAM_SECOND_TRANS_TO_MILLIONSECOND;
 }
diff --git a/src/util/virham.h b/src/util/virham.h
index 41dbdf65dd..4fb1609b67 100644
--- a/src/util/virham.h
+++ b/src/util/virham.h
@@ -4,7 +4,9 @@
  * Copyright (C) 2025 Huawei Technologies Co., Ltd
  */
 
-#pragma once
+#ifndef VIRHAM_H
+#define VIRHAM_H
+
 #define VIR_HAM_CANCELLED_TIMEOUT 1
 #define VIR_HAM_RACK_IPC_TIMEOUT 3
 
@@ -25,3 +27,5 @@ void virHamClearAll(const char *hostname);
 unsigned long long virHamGetCancelledTimeout(void);
 
 void virHamSetupTimeOut(unsigned long long cancelledTimeout, uint16_t rackIpcTimeout);
+
+#endif
\ No newline at end of file
-- 
2.51.0.windows.1