commit b5e861fc69f35f9dd01207ab31d58606e5d5737d
author Alexandre Courbot <acourbot@chromium.org> Wed Aug 03 12:23:20 2022 +0900
committer crosvm LUCI <crosvm-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 12 18:05:03 2022 +0000
tree 56e4b2f44a70f74b818fc04023e4942377c2c3fe
parent 96e98ef88299570f66f207d70bb7b29e0cdeb4b5

crosvm: rename DevicesSubcommand to DeviceSubcommand

DevicesSubcommand was for the `device` command, so rename it to avoid
confusion with the `devices` one.

BUG=b:217480043
TEST=cargo build

Change-Id: I4c321ff61a71d0ca731b23951d583beb9ce5d46c
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3827603
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: Alexandre Courbot <acourbot@chromium.org>
Auto-Submit: Alexandre Courbot <acourbot@chromium.org>

src/crosvm/cmdline.rs

diff --git a/src/crosvm/cmdline.rs b/src/crosvm/cmdline.rs
index 34bf1ab..078f048 100644
--- a/src/crosvm/cmdline.rs
+++ b/src/crosvm/cmdline.rs
@@ -381,7 +381,7 @@
 #[derive(argh_helpers::FlattenSubcommand)]
 pub enum DeviceSubcommand {
     CrossPlatform(CrossPlatformDevicesCommands),
-    Sys(super::sys::cmdline::DevicesSubcommand),
+    Sys(super::sys::cmdline::DeviceSubcommand),
 }
 
 #[derive(FromArgs)]

src/crosvm/sys/unix/cmdline.rs

diff --git a/src/crosvm/sys/unix/cmdline.rs b/src/crosvm/sys/unix/cmdline.rs
index 3732468..a6b735d 100644
--- a/src/crosvm/sys/unix/cmdline.rs
+++ b/src/crosvm/sys/unix/cmdline.rs
@@ -13,7 +13,7 @@
 #[derive(FromArgs)]
 #[argh(subcommand)]
 /// Unix Devices
-pub enum DevicesSubcommand {
+pub enum DeviceSubcommand {
     Console(device::ConsoleOptions),
     #[cfg(feature = "audio")]
     Snd(device::SndOptions),

src/crosvm/sys/windows/cmdline.rs

diff --git a/src/crosvm/sys/windows/cmdline.rs b/src/crosvm/sys/windows/cmdline.rs
index d09270d..3aec39c 100644
--- a/src/crosvm/sys/windows/cmdline.rs
+++ b/src/crosvm/sys/windows/cmdline.rs
@@ -7,7 +7,7 @@
 #[derive(Debug, FromArgs)]
 #[argh(subcommand)]
 /// Windows Devices
-pub enum DevicesSubcommand {}
+pub enum DeviceSubcommand {}
 
 #[cfg(feature = "slirp")]
 #[generate_catchall_args]

src/sys/unix/main.rs

diff --git a/src/sys/unix/main.rs b/src/sys/unix/main.rs
index a732c7d..3920e4d 100644
--- a/src/sys/unix/main.rs
+++ b/src/sys/unix/main.rs
@@ -22,21 +22,21 @@
 use devices::virtio::vhost::user::device::run_wl_device;
 
 use crate::crosvm::sys::cmdline::Commands;
-use crate::crosvm::sys::cmdline::DevicesSubcommand;
+use crate::crosvm::sys::cmdline::DeviceSubcommand;
 use crate::crosvm::sys::unix::start_devices;
 use crate::CommandStatus;
 use crate::Config;
 
-pub(crate) fn start_device(command: DevicesSubcommand) -> anyhow::Result<()> {
+pub(crate) fn start_device(command: DeviceSubcommand) -> anyhow::Result<()> {
     match command {
-        DevicesSubcommand::Console(cfg) => run_console_device(cfg),
+        DeviceSubcommand::Console(cfg) => run_console_device(cfg),
         #[cfg(feature = "audio")]
-        DevicesSubcommand::Snd(cfg) => run_snd_device(cfg),
-        DevicesSubcommand::Fs(cfg) => run_fs_device(cfg),
+        DeviceSubcommand::Snd(cfg) => run_snd_device(cfg),
+        DeviceSubcommand::Fs(cfg) => run_fs_device(cfg),
         #[cfg(feature = "gpu")]
-        DevicesSubcommand::Gpu(cfg) => run_gpu_device(cfg),
-        DevicesSubcommand::Vsock(cfg) => run_vsock_device(cfg),
-        DevicesSubcommand::Wl(cfg) => run_wl_device(cfg),
+        DeviceSubcommand::Gpu(cfg) => run_gpu_device(cfg),
+        DeviceSubcommand::Vsock(cfg) => run_vsock_device(cfg),
+        DeviceSubcommand::Wl(cfg) => run_wl_device(cfg),
     }
 }
 

src/sys/windows/main.rs

diff --git a/src/sys/windows/main.rs b/src/sys/windows/main.rs
index 6c6f21c..76a7c05 100644
--- a/src/sys/windows/main.rs
+++ b/src/sys/windows/main.rs
@@ -30,7 +30,7 @@
 use crate::crosvm::argument::Argument;
 use crate::crosvm::cmdline::RunCommand;
 use crate::crosvm::sys::cmdline::Commands;
-use crate::crosvm::sys::cmdline::DevicesSubcommand;
+use crate::crosvm::sys::cmdline::DeviceSubcommand;
 use crate::crosvm::sys::windows::exit::Exit;
 use crate::crosvm::sys::windows::exit::ExitContext;
 use crate::crosvm::sys::windows::exit::ExitContextAnyhow;
@@ -132,7 +132,7 @@
     )
 }
 
-pub(crate) fn start_device(command: DevicesSubcommand) -> Result<()> {
+pub(crate) fn start_device(command: DeviceSubcommand) -> Result<()> {
     Err(anyhow!("unknown device name: {:?}", command))
 }