From a6e891e733994e9d8416adc404e97ea4bbcbb549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 7 Apr 2026 10:13:38 +0200 Subject: [PATCH] runtime-rs: s/dbg_monitor_socket/extra_monitor_socket/g MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's align this with what's been already used for the go runtime. Signed-off-by: Fabiano Fidêncio --- src/libs/kata-types/src/config/hypervisor/mod.rs | 6 +++--- .../config/configuration-qemu-coco-dev-runtime-rs.toml.in | 2 +- src/runtime-rs/config/configuration-qemu-runtime-rs.toml.in | 2 +- .../config/configuration-qemu-snp-runtime-rs.toml.in | 2 +- .../config/configuration-qemu-tdx-runtime-rs.toml.in | 2 +- .../crates/hypervisor/src/qemu/cmdline_generator.rs | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libs/kata-types/src/config/hypervisor/mod.rs b/src/libs/kata-types/src/config/hypervisor/mod.rs index 29bf9eb2f3..42d884cbe8 100644 --- a/src/libs/kata-types/src/config/hypervisor/mod.rs +++ b/src/libs/kata-types/src/config/hypervisor/mod.rs @@ -708,10 +708,10 @@ pub struct DebugInfo { /// /// Example usage in configuration: /// ```toml - /// dbg_monitor_socket = "hmp" + /// extra_monitor_socket = "hmp" /// ``` - #[serde(default)] - pub dbg_monitor_socket: String, + #[serde(default, alias = "dbg_monitor_socket")] + pub extra_monitor_socket: String, } impl DebugInfo { diff --git a/src/runtime-rs/config/configuration-qemu-coco-dev-runtime-rs.toml.in b/src/runtime-rs/config/configuration-qemu-coco-dev-runtime-rs.toml.in index 7ed437883b..e6e07eacf9 100644 --- a/src/runtime-rs/config/configuration-qemu-coco-dev-runtime-rs.toml.in +++ b/src/runtime-rs/config/configuration-qemu-coco-dev-runtime-rs.toml.in @@ -339,7 +339,7 @@ enable_debug = false # # If set to the empty string "", no extra monitor socket is added. This is # the default. -dbg_monitor_socket = "" +extra_monitor_socket = "" # Disable the customizations done in the runtime when it detects # that it is running on top a VMM. This will result in the runtime diff --git a/src/runtime-rs/config/configuration-qemu-runtime-rs.toml.in b/src/runtime-rs/config/configuration-qemu-runtime-rs.toml.in index f9c82cfca2..597639c117 100644 --- a/src/runtime-rs/config/configuration-qemu-runtime-rs.toml.in +++ b/src/runtime-rs/config/configuration-qemu-runtime-rs.toml.in @@ -335,7 +335,7 @@ enable_debug = false # # If set to the empty string "", no extra monitor socket is added. This is # the default. -dbg_monitor_socket = "" +extra_monitor_socket = "" # Disable the customizations done in the runtime when it detects # that it is running on top a VMM. This will result in the runtime diff --git a/src/runtime-rs/config/configuration-qemu-snp-runtime-rs.toml.in b/src/runtime-rs/config/configuration-qemu-snp-runtime-rs.toml.in index 40d2894302..5488e1a873 100644 --- a/src/runtime-rs/config/configuration-qemu-snp-runtime-rs.toml.in +++ b/src/runtime-rs/config/configuration-qemu-snp-runtime-rs.toml.in @@ -392,7 +392,7 @@ disable_vhost_net = false # # If set to the empty string "", no extra monitor socket is added. This is # the default. -#dbg_monitor_socket = "hmp" +extra_monitor_socket = "" # # Default entropy source. diff --git a/src/runtime-rs/config/configuration-qemu-tdx-runtime-rs.toml.in b/src/runtime-rs/config/configuration-qemu-tdx-runtime-rs.toml.in index 74b576ffe2..222fa62ab8 100644 --- a/src/runtime-rs/config/configuration-qemu-tdx-runtime-rs.toml.in +++ b/src/runtime-rs/config/configuration-qemu-tdx-runtime-rs.toml.in @@ -349,7 +349,7 @@ enable_debug = false # # If set to the empty string "", no extra monitor socket is added. This is # the default. -dbg_monitor_socket = "" +extra_monitor_socket = "" # Disable the customizations done in the runtime when it detects # that it is running on top a VMM. This will result in the runtime diff --git a/src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs b/src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs index 17fff5010b..ebafd353a5 100644 --- a/src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs +++ b/src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs @@ -2248,8 +2248,8 @@ impl<'a> QemuCmdLine<'a> { qemu_cmd_line.add_iommu(); } - if config.debug_info.enable_debug && !config.debug_info.dbg_monitor_socket.is_empty() { - qemu_cmd_line.add_monitor(&config.debug_info.dbg_monitor_socket)?; + if config.debug_info.enable_debug && !config.debug_info.extra_monitor_socket.is_empty() { + qemu_cmd_line.add_monitor(&config.debug_info.extra_monitor_socket)?; } qemu_cmd_line.add_rtc();