kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: Fix mis-sorting of command line options

Browse Source 
This un-breaks the test suite with the dbus_api feature enabled.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
This commit is contained in:
Demi Marie Obenour
2025-12-19 23:10:41 -05:00
committed by Rob Bradford
parent 9a24680abd
commit 2278a5236a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cloud-hypervisor/src/main.rs
View File

@@ -218,18 +218,6 @@ fn get_cli_options_sorted(
) )
.default_value(default_vcpus) .default_value(default_vcpus)
.group("vm-config"), .group("vm-config"),
#[cfg(target_arch = "x86_64")]
Arg::new("debug-console")
.long("debug-console")
.help("Debug console: off|pty|tty|file=</path/to/a/file>,iobase=<port in hex>")
.default_value("off,iobase=0xe9")
.group("vm-config"),
#[cfg(feature = "dbus_api")]
Arg::new("dbus-service-name")
.long("dbus-service-name")
.help("Well known name of the device")
.num_args(1)
.group("vmm-config"),
#[cfg(feature = "dbus_api")] #[cfg(feature = "dbus_api")]
Arg::new("dbus-object-path") Arg::new("dbus-object-path")
.long("dbus-object-path") .long("dbus-object-path")
@@ -237,12 +225,24 @@ fn get_cli_options_sorted(
.num_args(1) .num_args(1)
.group("vmm-config"), .group("vmm-config"),
#[cfg(feature = "dbus_api")] #[cfg(feature = "dbus_api")]
Arg::new("dbus-service-name")
.long("dbus-service-name")
.help("Well known name of the device")
.num_args(1)
.group("vmm-config"),
#[cfg(feature = "dbus_api")]
Arg::new("dbus-system-bus") Arg::new("dbus-system-bus")
.long("dbus-system-bus") .long("dbus-system-bus")
.action(ArgAction::SetTrue) .action(ArgAction::SetTrue)
.help("Use the system bus instead of a session bus") .help("Use the system bus instead of a session bus")
.num_args(0) .num_args(0)
.group("vmm-config"), .group("vmm-config"),
#[cfg(target_arch = "x86_64")]
Arg::new("debug-console")
.long("debug-console")
.help("Debug console: off|pty|tty|file=</path/to/a/file>,iobase=<port in hex>")
.default_value("off,iobase=0xe9")
.group("vm-config"),
Arg::new("device") Arg::new("device")
.long("device") .long("device")
.help(DeviceConfig::SYNTAX) .help(DeviceConfig::SYNTAX)