From 1183e296c04cd4adaaab9a004a4ab1014c597d91 Mon Sep 17 00:00:00 2001 From: guomangmang Date: Thu, 20 Nov 2025 14:30:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=97=B6=E7=9A=84=E6=8D=A2=E8=A1=8C=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=87=E6=A1=A3=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=A5=E5=BF=97=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- virtrust/docs/002-virtrust-api.md | 3 ++- virtrust/src/virtrust/api/domain.cpp | 2 +- virtrust/src/virtrust/base/custom_logger.cpp | 8 ++++---- virtrust/src/virtrust/link/migration_session.cpp | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/virtrust/docs/002-virtrust-api.md b/virtrust/docs/002-virtrust-api.md index eaa2b35..8b12327 100644 --- a/virtrust/docs/002-virtrust-api.md +++ b/virtrust/docs/002-virtrust-api.md @@ -7,7 +7,8 @@ ### 连接上下文 (ConnCtx) - **作用**:表示与 libvirt 的连接上下文 - **默认 URI**:`qemu:///session` -- **创建方式**:使用 `std::make_unique()` 创建,可通过 `SetUri()` 方法设置连接地址 +- **创建方式**:使用 `std::make_unique()` 创建,可通过 `SetUri(std::string uri)` 方法设置连接地址,可设置 + `qemu:///session`和`qemu:///system`,通过`GetUri()`方法可查看当前设置的uri ### 返回值 (VirtrustRc) 所有 API 函数都返回 `VirtrustRc` 枚举类型的返回值: diff --git a/virtrust/src/virtrust/api/domain.cpp b/virtrust/src/virtrust/api/domain.cpp index 8e267ce..53a399d 100644 --- a/virtrust/src/virtrust/api/domain.cpp +++ b/virtrust/src/virtrust/api/domain.cpp @@ -979,7 +979,7 @@ VirtrustRc DomainUndefine(const std::unique_ptr &conn, const std::strin if (tsbRet != 0) { VIRTRUST_LOG_ERROR("|DomainUndefine|END|returnF||tsb resource remove " "failed, maybe not exist tsb resource uuid: " - "{},domainName: {},use virsh to undefine domain.", + "{},domainName: {}.", uuid, domainName); return VirtrustRc::ERROR; } diff --git a/virtrust/src/virtrust/base/custom_logger.cpp b/virtrust/src/virtrust/base/custom_logger.cpp index 02d15fd..42aa8e1 100644 --- a/virtrust/src/virtrust/base/custom_logger.cpp +++ b/virtrust/src/virtrust/base/custom_logger.cpp @@ -68,7 +68,7 @@ void Logger::Log(LogLevel level, std::string_view msg) void Logger::SetDisplayLogLevel(LogLevel level) { if (static_cast(level) >= static_cast(LogLevel::UNKNOWN)) { - fmt::print(stderr, "log level is invalid : {}", static_cast(level)); + fmt::print(stderr, "log level is invalid : {}\n", static_cast(level)); } if (LogAdapt::gSpdLogger != nullptr && LogAdapt::gSpdLogger->spdLogger != nullptr) { @@ -93,21 +93,21 @@ VirtrustRc Logger::InitLog(int logLevel, const char *path, int rotationFileSize, { if (logLevel < static_cast(LogLevel::TRACE) || logLevel > static_cast(LogLevel::CRITICAL)) { - fmt::print(stderr, "Invalid log level: {}", logLevel); + fmt::print(stderr, "Invalid log level: {}\n", logLevel); return VirtrustRc::ERROR; } int logType = (path != nullptr) ? FILE_TYPE : STDOUT_TYPE; auto rc = LogAdapt::ValidateParams(logType, path, rotationFileSize, rotationFileCount); if (rc != VirtrustRc::OK) { - fmt::print(stderr, "LogAdapt param validation failed, return: {}, msg: {}", static_cast(rc), + fmt::print(stderr, "LogAdapt param validation failed, return: {}, msg: {}\n", static_cast(rc), LogAdapt::gLastErrorMessage); return rc; } rc = LogAdapt::CreateInstance(logType, logLevel, path, rotationFileSize, rotationFileCount); if (rc != VirtrustRc::OK) { - fmt::print(stderr, "LogAdapt create instance failed, return: {}", static_cast(rc)); + fmt::print(stderr, "LogAdapt create instance failed, return: {}\n", static_cast(rc)); return rc; } diff --git a/virtrust/src/virtrust/link/migration_session.cpp b/virtrust/src/virtrust/link/migration_session.cpp index 15ac602..dd64733 100644 --- a/virtrust/src/virtrust/link/migration_session.cpp +++ b/virtrust/src/virtrust/link/migration_session.cpp @@ -278,7 +278,7 @@ MigrateSessionRc MigrationSession::OnTransferResponseReceived(bool transferRet) if (tsbRet != 0) { VIRTRUST_LOG_ERROR("|OnTransferResponseReceived|END|returnF||tsb resource remove " "failed, maybe not exist tsb resource uuid: " - "{},domainName: {},use virsh to undefine domain.", + "{},domainName: {}.", sessionId_, domainName_); } } -- Gitee