From 2278a5236a75ea3d8dbdf5a6d5223ced4dfec7db Mon Sep 17 00:00:00 2001 From: Demi Marie Obenour Date: Fri, 19 Dec 2025 23:10:41 -0500 Subject: [PATCH] misc: Fix mis-sorting of command line options This un-breaks the test suite with the dbus_api feature enabled. Signed-off-by: Demi Marie Obenour --- cloud-hypervisor/src/main.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cloud-hypervisor/src/main.rs b/cloud-hypervisor/src/main.rs index d08293b6e..3abc382f3 100644 --- a/cloud-hypervisor/src/main.rs +++ b/cloud-hypervisor/src/main.rs @@ -218,18 +218,6 @@ fn get_cli_options_sorted( ) .default_value(default_vcpus) .group("vm-config"), - #[cfg(target_arch = "x86_64")] - Arg::new("debug-console") - .long("debug-console") - .help("Debug console: off|pty|tty|file=,iobase=") - .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")] Arg::new("dbus-object-path") .long("dbus-object-path") @@ -237,12 +225,24 @@ fn get_cli_options_sorted( .num_args(1) .group("vmm-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")] Arg::new("dbus-system-bus") .long("dbus-system-bus") .action(ArgAction::SetTrue) .help("Use the system bus instead of a session bus") .num_args(0) .group("vmm-config"), + #[cfg(target_arch = "x86_64")] + Arg::new("debug-console") + .long("debug-console") + .help("Debug console: off|pty|tty|file=,iobase=") + .default_value("off,iobase=0xe9") + .group("vm-config"), Arg::new("device") .long("device") .help(DeviceConfig::SYNTAX)