Consolidate CLI functions for vhost_user_media in vhu_media

Bug: 519646531
Test: cd base/cvd && bazel build cuttlefish/package:cvd
      # Repeat with v4l2_emulated_camera_mplane
      cvd create -media=type=v4l2_emulated_camera_splane
      # Ensure pixel format changes with each type
      v4l2-ctl -d1 --all
      # Ensure it passes with no failures
      v4l2-compliance -d1 -s

Author: Brian Daniels

base/cvd/cuttlefish/host/commands/vhost_user_media/emulated_camera_mplane/BUILD.bazel

@@ -20,10 +20,8 @@ rust_binary(
     edition = "2024",
     deps = crate_deps([
         "clap",
-        "env_logger",
         "libc",
         "log",
-        "thiserror",
         "v4l2r",
         "vhost-user-backend",
         "virtio-media",

base/cvd/cuttlefish/host/commands/vhost_user_media/emulated_camera_mplane/Cargo.toml

@@ -5,10 +5,8 @@ edition = "2024"
 
 [dependencies]
 clap = { workspace = true }
-env_logger = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true }
-thiserror = { workspace = true }
 v4l2r = { workspace = true }
 vhost-user-backend = { workspace = true }
 vhu_media = { workspace = true }

base/cvd/cuttlefish/host/commands/vhost_user_media/emulated_camera_mplane/src/main.rs

@@ -12,62 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::path::PathBuf;
-use std::sync::{Arc, RwLock};
-
 use clap::Parser;
-use log::error;
-use thiserror::Error;
+use std::sync::{Arc, RwLock};
 use vhost_user_backend::VhostUserDaemon;
 use vhu_media::VhuMediaBackend;
+use vhu_media::cli::{CmdLineArgs, Config, Error, init_logging, Result};
 use virtio_media::protocol::VirtioMediaDeviceConfig;
 use vm_memory::{GuestMemoryAtomic, GuestMemoryMmap};
 
 mod device;
 
-#[derive(Debug, Error)]
-pub(crate) enum Error {
-    #[error("Could not create daemon: {0}")]
-    CouldNotCreateDaemon(vhost_user_backend::Error),
-    #[error("Fatal error: {0}")]
-    ServeFailed(vhost_user_backend::Error),
-}
-
-type Result<T> = std::result::Result<T, Error>;
-
-#[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
-struct CmdLineArgs {
-    /// Location of vhost-user Unix domain socket.
-    #[clap(short, long, value_name = "SOCKET")]
-    socket_path: PathBuf,
-    /// Log verbosity, one of Off, Error, Warning, Info, Debug, Trace.
-    #[clap(short, long, default_value_t = log::LevelFilter::Debug)]
-    verbosity: log::LevelFilter,
-}
-
-#[derive(PartialEq, Debug)]
-struct Config {
-    socket_path: PathBuf,
-}
-
-impl TryFrom<CmdLineArgs> for Config {
-    type Error = Error;
-
-    fn try_from(args: CmdLineArgs) -> Result<Self> {
-        Ok(Config {
-            socket_path: args.socket_path,
-        })
-    }
-}
-
-fn init_logging(verbosity: log::LevelFilter) -> Result<()> {
-    env_logger::builder()
-        .format_timestamp_secs()
-        .filter_level(verbosity)
-        .init();
-    Ok(())
-}
 
 const VFL_TYPE_VIDEO: u32 = 0;
 

base/cvd/cuttlefish/host/commands/vhost_user_media/emulated_camera_splane/BUILD.bazel

@@ -20,7 +20,6 @@ rust_binary(
     edition = "2024",
     deps = crate_deps([
         "clap",
-        "env_logger",
         "image",
         "libc",
         "log",

base/cvd/cuttlefish/host/commands/vhost_user_media/emulated_camera_splane/Cargo.toml

@@ -5,7 +5,6 @@ edition = "2024"
 
 [dependencies]
 clap = { workspace = true }
-env_logger = { workspace = true }
 image = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true }

base/cvd/cuttlefish/host/commands/vhost_user_media/emulated_camera_splane/src/main.rs

@@ -12,54 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::path::PathBuf;
-use std::sync::{Arc, RwLock};
-
 use clap::Parser;
+use std::sync::{Arc, RwLock};
 use vhost_user_backend::VhostUserDaemon;
 use vhu_media::VhuMediaBackend;
-use vhu_media::cli::Error;
+use vhu_media::cli::{CmdLineArgs, Config, Error, init_logging, Result};
 use virtio_media::protocol::VirtioMediaDeviceConfig;
 use vm_memory::{GuestMemoryAtomic, GuestMemoryMmap};
 
 mod device;
 
-type Result<T> = std::result::Result<T, Error>;
-
-#[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
-struct CmdLineArgs {
-    /// Location of vhost-user Unix domain socket.
-    #[clap(short, long, value_name = "SOCKET")]
-    socket_path: PathBuf,
-    /// Log verbosity, one of Off, Error, Warning, Info, Debug, Trace.
-    #[clap(short, long, default_value_t = log::LevelFilter::Debug)]
-    verbosity: log::LevelFilter,
-}
-
-#[derive(PartialEq, Debug)]
-struct Config {
-    socket_path: PathBuf,
-}
-
-impl TryFrom<CmdLineArgs> for Config {
-    type Error = Error;
-
-    fn try_from(args: CmdLineArgs) -> Result<Self> {
-        Ok(Config {
-            socket_path: args.socket_path,
-        })
-    }
-}
-
-fn init_logging(verbosity: log::LevelFilter) -> Result<()> {
-    env_logger::builder()
-        .format_timestamp_secs()
-        .filter_level(verbosity)
-        .init();
-    Ok(())
-}
-
 const VFL_TYPE_VIDEO: u32 = 0;
 
 fn start_backend(config: Config) -> Result<()> {

base/cvd/cuttlefish/host/commands/vhost_user_media/vhu_media/BUILD.bazel

@@ -5,9 +5,15 @@ package(default_visibility = ["//visibility:public"])
 
 rust_library(
     name = "vhu_media",
-    srcs = ["src/devices.rs", "src/lib.rs"],
+    srcs = [
+        "src/cli.rs",
+        "src/devices.rs",
+        "src/lib.rs",
+    ],
     edition = "2024",
     deps = crate_deps([
+        "clap",
+        "env_logger",
         "libc",
         "log",
         "thiserror",

base/cvd/cuttlefish/host/commands/vhost_user_media/vhu_media/Cargo.toml

@@ -4,6 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+clap = { workspace = true }
+env_logger = { workspace = true }
 libc = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }

base/cvd/cuttlefish/host/commands/vhost_user_media/vhu_media/src/cli.rs

@@ -0,0 +1,62 @@
+// Copyright 2026, The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use clap::Parser;
+use log::error;
+use std::path::PathBuf;
+use thiserror::Error as ThisError;
+
+#[derive(Debug, ThisError)]
+pub enum Error {
+    #[error("Could not create daemon: {0}")]
+    CouldNotCreateDaemon(vhost_user_backend::Error),
+    #[error("Fatal error: {0}")]
+    ServeFailed(vhost_user_backend::Error),
+}
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+#[derive(PartialEq, Debug)]
+pub struct Config {
+    pub socket_path: PathBuf,
+}
+
+#[derive(Parser, Debug)]
+#[clap(author, version, about, long_about = None)]
+pub struct CmdLineArgs {
+    /// Location of vhost-user Unix domain socket.
+    #[clap(short, long, value_name = "SOCKET")]
+    pub socket_path: PathBuf,
+    /// Log verbosity, one of Off, Error, Warning, Info, Debug, Trace.
+    #[clap(short, long, default_value_t = log::LevelFilter::Debug)]
+    pub verbosity: log::LevelFilter,
+}
+
+impl TryFrom<CmdLineArgs> for Config {
+    type Error = Error;
+
+    fn try_from(args: CmdLineArgs) -> Result<Self> {
+        Ok(Config {
+            socket_path: args.socket_path,
+        })
+    }
+}
+
+pub fn init_logging(verbosity: log::LevelFilter) -> Result<()> {
+    env_logger::builder()
+        .format_timestamp_secs()
+        .filter_level(verbosity)
+        .init();
+    Ok(())
+}

base/cvd/cuttlefish/host/commands/vhost_user_media/vhu_media/src/lib.rs

@@ -41,18 +41,7 @@ use vmm_sys_util::epoll::EventSet;
 use vmm_sys_util::event::new_event_consumer_and_notifier;
 use vmm_sys_util::event::{EventConsumer, EventFlag, EventNotifier};
 
-pub mod cli {
-    use thiserror::Error as ThisError;
-
-    #[derive(Debug, ThisError)]
-    pub enum Error {
-        #[error("Could not create daemon: {0}")]
-        CouldNotCreateDaemon(vhost_user_backend::Error),
-        #[error("Fatal error: {0}")]
-        ServeFailed(vhost_user_backend::Error),
-    }
-}
-
+pub mod cli;
 pub mod devices;
 
 #[derive(Debug, ThisError)]