commit 67cdc6aedc94958f2ce23f8efe7bb2f3e818c174
author Daniel Verkamp <dverkamp@chromium.org> Mon Oct 31 12:55:11 2022 -0700
committer crosvm LUCI <crosvm-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Oct 31 20:23:43 2022 +0000
tree 9537f9df1c43a2b2952b2588e933b0e37840ce9a
parent 74db80eb13c4ccae364cf7ab3aafa2096e98649c

crosvm: fix build without --features=gpu

Add cfg checks to types that are only available when the gpu feature is
enabled. This fixes the `tools/presubmit --all` build.

BUG=None
TEST=cargo build --no-default-features
TEST=cargo build --no-default-features --features=gpu

Change-Id: Ibb6adb73f196dc798ba114cbae5e06e989a6e96d
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3993687
Auto-Submit: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Idan Raiter <idanr@google.com>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>

src/crosvm/cmdline.rs

diff --git a/src/crosvm/cmdline.rs b/src/crosvm/cmdline.rs
index c237a96..3e5101b 100644
--- a/src/crosvm/cmdline.rs
+++ b/src/crosvm/cmdline.rs
@@ -38,6 +38,7 @@
 #[cfg(feature = "audio")]
 use devices::virtio::snd::parameters::Parameters as SndParameters;
 use devices::virtio::vhost::user::device;
+#[cfg(feature = "gpu")]
 use devices::virtio::GpuParameters;
 use devices::virtio::NetParameters;
 #[cfg(feature = "audio")]
@@ -49,6 +50,7 @@
 use hypervisor::ProtectionType;
 use resources::AddressRange;
 use serde::Deserialize;
+#[cfg(feature = "gpu")]
 use serde_keyvalue::FromKeyValues;
 #[cfg(feature = "gpu")]
 use vm_control::gpu::DisplayParameters as GpuDisplayParameters;

src/crosvm/sys/unix/config.rs

diff --git a/src/crosvm/sys/unix/config.rs b/src/crosvm/sys/unix/config.rs
index 25430d9..c8c4e6a 100644
--- a/src/crosvm/sys/unix/config.rs
+++ b/src/crosvm/sys/unix/config.rs
@@ -20,6 +20,7 @@
 use serde::Deserialize;
 use serde::Serialize;
 
+#[cfg(feature = "gpu")]
 use crate::crosvm::cmdline::FixedGpuParameters;
 use crate::crosvm::config::invalid_value_err;
 use crate::crosvm::config::Config;