kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

arch, devices, vmm: Remove "acpi" feature gate

Browse Source 
Compile this feature in by default as it's well supported on both
aarch64 and x86_64 and we only officially support using it (no non-acpi
binaries are available.)

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2022-03-28 11:53:22 +01:00
committed by Bo Chen
parent fa7487629f
commit 7c0cf8cc23
16 changed files with 63 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/integration.rs
View File

@@ -744,7 +744,7 @@ fn test_vhost_user_net(
);
// ACPI feature is needed.
#[cfg(all(target_arch = "x86_64", feature = "acpi"))]
#[cfg(target_arch = "x86_64")]
{
guest.enable_memory_hotplug();
@@ -883,7 +883,7 @@ fn test_vhost_user_blk(
);
// ACPI feature is needed.
#[cfg(all(target_arch = "x86_64", feature = "acpi"))]
#[cfg(target_arch = "x86_64")]
{
guest.enable_memory_hotplug();
@@ -1121,7 +1121,7 @@ fn test_virtio_fs(
);
// ACPI feature is needed.
#[cfg(all(target_arch = "x86_64", feature = "acpi"))]
#[cfg(target_arch = "x86_64")]
{
guest.enable_memory_hotplug();
@@ -3303,7 +3303,6 @@ mod parallel {
let r = std::panic::catch_unwind(|| {
guest.wait_vm_boot(None).unwrap();
#[cfg(feature = "acpi")]
assert!(guest
.does_device_vendor_pair_match("0x1043", "0x1af4")
.unwrap_or_default());
@@ -4305,7 +4304,7 @@ mod parallel {
// On AArch64 when acpi is enabled, there is a 4 MiB gap between the RAM
// that the VMM gives and the guest can see.
// This is a temporary solution, will be fixed in future.
#[cfg(all(target_arch = "aarch64", feature = "acpi"))]
#[cfg(target_arch = "aarch64")]
let guest_memory_size_kb = guest_memory_size_kb - 4 * 1024;
let overhead = get_vmm_overhead(child.id(), guest_memory_size_kb);
@@ -7782,7 +7781,7 @@ mod live_migration {
}
}
#[cfg(all(target_arch = "aarch64", feature = "acpi"))]
#[cfg(target_arch = "aarch64")]
mod aarch64_acpi {
use crate::*;