mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-02 11:35:46 +00:00
build: Remove "cmos" feature gate
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
e0d3efec6e
commit
ca68b9e7a9
@ -53,7 +53,7 @@ wait-timeout = "0.2.0"
|
|||||||
[features]
|
[features]
|
||||||
default = ["common", "kvm"]
|
default = ["common", "kvm"]
|
||||||
# Common features for all hypervisors
|
# Common features for all hypervisors
|
||||||
common = ["cmos", "fwdebug"]
|
common = ["fwdebug"]
|
||||||
amx = ["vmm/amx"]
|
amx = ["vmm/amx"]
|
||||||
cmos = ["vmm/cmos"]
|
cmos = ["vmm/cmos"]
|
||||||
fwdebug = ["vmm/fwdebug"]
|
fwdebug = ["vmm/fwdebug"]
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
// Use of this source code is governed by a BSD-style license that can be
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
// found in the LICENSE-BSD-3-Clause file.
|
// found in the LICENSE-BSD-3-Clause file.
|
||||||
|
|
||||||
#[cfg(feature = "cmos")]
|
|
||||||
mod cmos;
|
mod cmos;
|
||||||
#[cfg(feature = "fwdebug")]
|
#[cfg(feature = "fwdebug")]
|
||||||
mod fwdebug;
|
mod fwdebug;
|
||||||
@ -18,7 +17,6 @@ mod serial;
|
|||||||
#[cfg(target_arch = "aarch64")]
|
#[cfg(target_arch = "aarch64")]
|
||||||
mod uart_pl011;
|
mod uart_pl011;
|
||||||
|
|
||||||
#[cfg(feature = "cmos")]
|
|
||||||
pub use self::cmos::Cmos;
|
pub use self::cmos::Cmos;
|
||||||
#[cfg(feature = "fwdebug")]
|
#[cfg(feature = "fwdebug")]
|
||||||
pub use self::fwdebug::FwDebugDevice;
|
pub use self::fwdebug::FwDebugDevice;
|
||||||
|
@ -98,7 +98,7 @@ use vm_device::{Bus, BusDevice, Resource};
|
|||||||
use vm_memory::guest_memory::FileOffset;
|
use vm_memory::guest_memory::FileOffset;
|
||||||
use vm_memory::GuestMemoryRegion;
|
use vm_memory::GuestMemoryRegion;
|
||||||
use vm_memory::{Address, GuestAddress, GuestUsize, MmapRegion};
|
use vm_memory::{Address, GuestAddress, GuestUsize, MmapRegion};
|
||||||
#[cfg(all(target_arch = "x86_64", feature = "cmos"))]
|
#[cfg(target_arch = "x86_64")]
|
||||||
use vm_memory::{GuestAddressSpace, GuestMemory};
|
use vm_memory::{GuestAddressSpace, GuestMemory};
|
||||||
use vm_migration::{
|
use vm_migration::{
|
||||||
protocol::MemoryRangeTable, Migratable, MigratableError, Pausable, Snapshot,
|
protocol::MemoryRangeTable, Migratable, MigratableError, Pausable, Snapshot,
|
||||||
@ -1470,7 +1470,6 @@ impl DeviceManager {
|
|||||||
.io_bus
|
.io_bus
|
||||||
.insert(i8042, 0x61, 0x4)
|
.insert(i8042, 0x61, 0x4)
|
||||||
.map_err(DeviceManagerError::BusError)?;
|
.map_err(DeviceManagerError::BusError)?;
|
||||||
#[cfg(feature = "cmos")]
|
|
||||||
{
|
{
|
||||||
// Add a CMOS emulated device
|
// Add a CMOS emulated device
|
||||||
let mem_size = self
|
let mem_size = self
|
||||||
|
Loading…
Reference in New Issue
Block a user