Make wayland socket names byte arrays

3 files changed, 7 insertions, 7 deletions

diff --git a/src/crosvm.rs b/src/crosvm.rs
index ab4429a..ad257d3 100644
--- a/src/crosvm.rs
+++ b/src/crosvm.rs
@@ -181,7 +181,7 @@ pub struct Config {
     pub tap_fd: Vec<RawFd>,
     pub cid: Option<u64>,
     pub wl_memfd: bool,
-    pub wayland_socket_paths: BTreeMap<String, PathBuf>,
+    pub wayland_socket_paths: BTreeMap<Vec<u8>, PathBuf>,
     pub remote_wayland_device_socket_path: Option<PathBuf>,
     pub wayland_dmabuf: bool,
     pub x_display: Option<String>,
diff --git a/src/linux.rs b/src/linux.rs
index e9ee659..9d1f547 100644
--- a/src/linux.rs
+++ b/src/linux.rs
@@ -779,7 +779,7 @@ fn create_wayland_device(
     let mut wayland_socket_paths = cfg.wayland_socket_paths.clone();
 
     if let Some(memfd_socket_path) = memfd_socket_path {
-        wayland_socket_paths.insert("__crosvm_memfd".to_string(), memfd_socket_path.into());
+        wayland_socket_paths.insert(b"__crosvm_memfd".to_vec(), memfd_socket_path.into());
     }
 
     let wayland_socket_dirs = wayland_socket_paths
diff --git a/src/main.rs b/src/main.rs
index 81f1b50..7b47d3c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -841,7 +841,7 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument::
                             expected: String::from("missing socket path"),
                         })?,
                 );
-            let mut name = "";
+            let mut name: &[u8] = b"";
             for c in components {
                 let mut kv = c.splitn(2, '=');
                 let (kind, value) = match (kv.next(), kv.next()) {
@@ -854,7 +854,7 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument::
                     }
                 };
                 match kind {
-                    "name" => name = value,
+                    "name" => name = value.as_bytes(),
                     _ => {
                         return Err(argument::Error::InvalidValue {
                             value: kind.to_owned(),
@@ -866,10 +866,10 @@ fn set_argument(cfg: &mut Config, name: &str, value: Option<&str>) -> argument::
             if cfg.wayland_socket_paths.contains_key(name) {
                 return Err(argument::Error::TooManyArguments(format!(
                     "wayland socket name already used: '{}'",
-                    name
+                    String::from_utf8_lossy(&name)
                 )));
             }
-            cfg.wayland_socket_paths.insert(name.to_string(), path);
+            cfg.wayland_socket_paths.insert(name.to_vec(), path);
         }
         "wayland-device-sock" => {
             let path = PathBuf::from(value.unwrap());
@@ -2190,7 +2190,7 @@ fn wl_cmd(mut args: std::env::Args) -> std::result::Result<(), ()> {
 
     let request = match subcommand {
         "add" => {
-            let name = args.next().unwrap();
+            let name = args.next().unwrap().as_bytes().to_vec();
             let path = args.next().unwrap().into();
             VmRequest::WlCommand(WlControlCommand::AddSocket { name, path })
         }