From 67cdc6aedc94958f2ce23f8efe7bb2f3e818c174 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 31 Oct 2022 12:55:11 -0700 Subject: [PATCH] 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 Reviewed-by: Idan Raiter Reviewed-by: Dennis Kempin Commit-Queue: Dennis Kempin --- src/crosvm/cmdline.rs | 2 ++ src/crosvm/sys/unix/config.rs | 1 + 2 files changed, 3 insertions(+) diff --git a/src/crosvm/cmdline.rs b/src/crosvm/cmdline.rs index c237a96e3b..3e5101b441 100644 --- a/src/crosvm/cmdline.rs +++ b/src/crosvm/cmdline.rs @@ -38,6 +38,7 @@ use devices::virtio::device_constants::video::VideoDeviceConfig; #[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 devices::StubPciParameters; 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; diff --git a/src/crosvm/sys/unix/config.rs b/src/crosvm/sys/unix/config.rs index 25430d9bba..c8c4e6a1de 100644 --- a/src/crosvm/sys/unix/config.rs +++ b/src/crosvm/sys/unix/config.rs @@ -20,6 +20,7 @@ use devices::SerialParameters; 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;