External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 05:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Bump acpi_tables version

Browse Source 
Fix newly added deprecation for mispelling of cacheable.

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
This commit is contained in:
Rob Bradford 2023-09-07 13:02:03 +01:00 committed by Rob Bradford
parent 1b9ce69afa
commit 4548de194d
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -5,7 +5,7 @@ version = 3
[[package]] [[package]]
name = "acpi_tables" name = "acpi_tables"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#05a609136387cc1cc9b499cee4320020325c263f" source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#1029d22777f07b04849234bbe756da34a6df2913"
dependencies = [ dependencies = [
"zerocopy 0.6.1", "zerocopy 0.6.1",
] ]

2
devices/src/acpi.rs
View File

@ -134,7 +134,7 @@ impl Aml for AcpiGedDevice {
&aml::Name::new( &aml::Name::new(
"_CRS".into(), "_CRS".into(),
&aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory( &aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory(
aml::AddressSpaceCachable::NotCacheable, aml::AddressSpaceCacheable::NotCacheable,
true, true,
self.address.0, self.address.0,
self.address.0 + GED_DEVICE_ACPI_SIZE as u64 - 1, self.address.0 + GED_DEVICE_ACPI_SIZE as u64 - 1,

3
fuzz/Cargo.lock generated
View File

@ -5,7 +5,7 @@ version = 3
[[package]] [[package]]
name = "acpi_tables" name = "acpi_tables"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#05a609136387cc1cc9b499cee4320020325c263f" source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#1029d22777f07b04849234bbe756da34a6df2913"
dependencies = [ dependencies = [
"zerocopy", "zerocopy",
] ]
@ -1032,6 +1032,7 @@ dependencies = [
"arch", "arch",
"bitflags 2.3.3", "bitflags 2.3.3",
"block", "block",
"cfg-if",
"devices", "devices",
"epoll", "epoll",
"event_monitor", "event_monitor",

2
vmm/src/cpu.rs
View File

@ -2019,7 +2019,7 @@ impl Aml for CpuManager {
&aml::Name::new( &aml::Name::new(
"_CRS".into(), "_CRS".into(),
&aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory( &aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory(
aml::AddressSpaceCachable::NotCacheable, aml::AddressSpaceCacheable::NotCacheable,
true, true,
acpi_address.0, acpi_address.0,
acpi_address.0 + CPU_MANAGER_ACPI_SIZE as u64 - 1, acpi_address.0 + CPU_MANAGER_ACPI_SIZE as u64 - 1,

2
vmm/src/device_manager.rs
View File

@ -4383,7 +4383,7 @@ impl Aml for DeviceManager {
&aml::Name::new( &aml::Name::new(
"_CRS".into(), "_CRS".into(),
&aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory( &aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory(
aml::AddressSpaceCachable::NotCacheable, aml::AddressSpaceCacheable::NotCacheable,
true, true,
self.acpi_address.0, self.acpi_address.0,
self.acpi_address.0 + DEVICE_MANAGER_ACPI_SIZE as u64 - 1, self.acpi_address.0 + DEVICE_MANAGER_ACPI_SIZE as u64 - 1,

6
vmm/src/memory_manager.rs
View File

@ -2331,7 +2331,7 @@ impl Aml for MemoryMethods {
&aml::Name::new( &aml::Name::new(
"MR64".into(), "MR64".into(),
&aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory( &aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory(
aml::AddressSpaceCachable::Cacheable, aml::AddressSpaceCacheable::Cacheable,
true, true,
0x0000_0000_0000_0000u64, 0x0000_0000_0000_0000u64,
0xFFFF_FFFF_FFFF_FFFEu64, 0xFFFF_FFFF_FFFF_FFFEu64,
@ -2414,7 +2414,7 @@ impl Aml for MemoryManager {
&aml::Name::new( &aml::Name::new(
"_CRS".into(), "_CRS".into(),
&aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory( &aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory(
aml::AddressSpaceCachable::NotCacheable, aml::AddressSpaceCacheable::NotCacheable,
true, true,
acpi_address.0, acpi_address.0,
acpi_address.0 + MEMORY_MANAGER_ACPI_SIZE as u64 - 1, acpi_address.0 + MEMORY_MANAGER_ACPI_SIZE as u64 - 1,
@ -2510,7 +2510,7 @@ impl Aml for MemoryManager {
&aml::Name::new( &aml::Name::new(
"_CRS".into(), "_CRS".into(),
&aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory( &aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory(
aml::AddressSpaceCachable::NotCacheable, aml::AddressSpaceCacheable::NotCacheable,
true, true,
min, min,
max, max,

6
vmm/src/pci_segment.rs
View File

@ -348,7 +348,7 @@ impl Aml for PciSegment {
#[cfg(target_arch = "x86_64")] #[cfg(target_arch = "x86_64")]
&aml::IO::new(0xcf8, 0xcf8, 1, 0x8), &aml::IO::new(0xcf8, 0xcf8, 1, 0x8),
&aml::AddressSpace::new_memory( &aml::AddressSpace::new_memory(
aml::AddressSpaceCachable::NotCacheable, aml::AddressSpaceCacheable::NotCacheable,
true, true,
layout::MEM_32BIT_DEVICES_START.0 as u32, layout::MEM_32BIT_DEVICES_START.0 as u32,
(layout::MEM_32BIT_DEVICES_START.0 + layout::MEM_32BIT_DEVICES_SIZE - 1) (layout::MEM_32BIT_DEVICES_START.0 + layout::MEM_32BIT_DEVICES_SIZE - 1)
@ -356,7 +356,7 @@ impl Aml for PciSegment {
None, None,
), ),
&aml::AddressSpace::new_memory( &aml::AddressSpace::new_memory(
aml::AddressSpaceCachable::NotCacheable, aml::AddressSpaceCacheable::NotCacheable,
true, true,
self.start_of_device_area, self.start_of_device_area,
self.end_of_device_area, self.end_of_device_area,
@ -379,7 +379,7 @@ impl Aml for PciSegment {
layout::PCI_MMIO_CONFIG_SIZE_PER_SEGMENT as u32, layout::PCI_MMIO_CONFIG_SIZE_PER_SEGMENT as u32,
), ),
&aml::AddressSpace::new_memory( &aml::AddressSpace::new_memory(
aml::AddressSpaceCachable::NotCacheable, aml::AddressSpaceCacheable::NotCacheable,
true, true,
self.start_of_device_area, self.start_of_device_area,
self.end_of_device_area, self.end_of_device_area,