From 12a694e45e8c1a9aa7cad4d9d327620008d66e24 Mon Sep 17 00:00:00 2001 From: Keiichi Watanabe Date: Mon, 16 Aug 2021 17:23:43 +0900 Subject: [PATCH] Remove vhost_user_devices crate BUG=b:195495971 TEST=cargo build Change-Id: Ib1b43e40fbdcebb7dc66c5a5f349b8de2da25cb5 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3070725 Tested-by: kokoro Commit-Queue: Keiichi Watanabe Reviewed-by: Chirantan Ekbote --- Cargo.lock | 8 -------- Cargo.toml | 1 - vhost_user_devices/Cargo.toml | 25 ------------------------ vhost_user_devices/src/block_device.rs | 11 ----------- vhost_user_devices/src/console_device.rs | 11 ----------- vhost_user_devices/src/net_device.rs | 11 ----------- vhost_user_devices/src/wl_device.rs | 11 ----------- 7 files changed, 78 deletions(-) delete mode 100644 vhost_user_devices/Cargo.toml delete mode 100644 vhost_user_devices/src/block_device.rs delete mode 100644 vhost_user_devices/src/console_device.rs delete mode 100644 vhost_user_devices/src/net_device.rs delete mode 100644 vhost_user_devices/src/wl_device.rs diff --git a/Cargo.lock b/Cargo.lock index 830e814810..15f784d5cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1243,14 +1243,6 @@ dependencies = [ "vm_memory", ] -[[package]] -name = "vhost_user_devices" -version = "0.1.0" -dependencies = [ - "anyhow", - "devices", -] - [[package]] name = "virtio_sys" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 625f02e59c..4a4ab2c6ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,6 @@ members = [ "qcow_utils", "integration_tests", "libcrosvm_control", - "vhost_user_devices", ] exclude = [ "assertions", diff --git a/vhost_user_devices/Cargo.toml b/vhost_user_devices/Cargo.toml deleted file mode 100644 index 24f85e859a..0000000000 --- a/vhost_user_devices/Cargo.toml +++ /dev/null @@ -1,25 +0,0 @@ -[package] -name = "vhost_user_devices" -version = "0.1.0" -authors = ["The Chromium OS Authors"] -edition = "2018" - -[[bin]] -name = "vhost-user-console-device" -path = "src/console_device.rs" - -[[bin]] -name = "vhost-user-net-device" -path = "src/net_device.rs" - -[[bin]] -name = "vhost-user-wl-device" -path = "src/wl_device.rs" - -[[bin]] -name = "vhost-user-block-device" -path = "src/block_device.rs" - -[dependencies] -anyhow = "*" -devices = { path = "../devices", features = ["minigbm"] } diff --git a/vhost_user_devices/src/block_device.rs b/vhost_user_devices/src/block_device.rs deleted file mode 100644 index 2bd391a1bd..0000000000 --- a/vhost_user_devices/src/block_device.rs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2021 The Chromium OS Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -use devices::virtio::vhost::user::device::run_block_device; - -fn main() -> anyhow::Result<()> { - let mut args = std::env::args(); - let program_name = args.next().expect("empty args"); - run_block_device(&program_name, args) -} diff --git a/vhost_user_devices/src/console_device.rs b/vhost_user_devices/src/console_device.rs deleted file mode 100644 index 0e6554ce37..0000000000 --- a/vhost_user_devices/src/console_device.rs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2021 The Chromium OS Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -use devices::virtio::vhost::user::device::run_console_device; - -fn main() -> anyhow::Result<()> { - let mut args = std::env::args(); - let program_name = args.next().expect("empty args"); - run_console_device(&program_name, args) -} diff --git a/vhost_user_devices/src/net_device.rs b/vhost_user_devices/src/net_device.rs deleted file mode 100644 index 6a79a77966..0000000000 --- a/vhost_user_devices/src/net_device.rs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2021 The Chromium OS Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -use devices::virtio::vhost::user::device::run_net_device; - -fn main() -> anyhow::Result<()> { - let mut args = std::env::args(); - let program_name = args.next().expect("empty args"); - run_net_device(&program_name, args) -} diff --git a/vhost_user_devices/src/wl_device.rs b/vhost_user_devices/src/wl_device.rs deleted file mode 100644 index c3b92b5d4b..0000000000 --- a/vhost_user_devices/src/wl_device.rs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2021 The Chromium OS Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -use devices::virtio::vhost::user::device::run_wl_device; - -fn main() -> anyhow::Result<()> { - let mut args = std::env::args(); - let program_name = args.next().expect("empty args"); - run_wl_device(&program_name, args) -}