Merge pull request #9840 from stevenhorsman/bump-agent-rust-1.75.0

versions: Bump rust toolchain
This commit is contained in:
Steve Horsman 2024-06-17 11:28:07 +01:00 committed by GitHub
commit cce735a09e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 7 deletions

View File

@ -644,10 +644,7 @@ impl AddressSpaceMgr {
guest_numa_node_id: u32, guest_numa_node_id: u32,
vcpu_ids: &[u32], vcpu_ids: &[u32],
) { ) {
let node = self let node = self.numa_nodes.entry(guest_numa_node_id).or_default();
.numa_nodes
.entry(guest_numa_node_id)
.or_insert_with(NumaNode::new);
node.add_info(&NumaNodeInfo { node.add_info(&NumaNodeInfo {
base: region.start_addr(), base: region.start_addr(),
size: region.len(), size: region.len(),

View File

@ -424,7 +424,7 @@ impl DeviceOpContext {
fn generate_virtio_device_info(&self) -> Result<HashMap<(DeviceType, String), MMIODeviceInfo>> { fn generate_virtio_device_info(&self) -> Result<HashMap<(DeviceType, String), MMIODeviceInfo>> {
let mut dev_info = HashMap::new(); let mut dev_info = HashMap::new();
#[cfg(feature = "dbs-virtio-devices")] #[cfg(feature = "dbs-virtio-devices")]
for (_index, device) in self.virtio_devices.iter().enumerate() { for device in self.virtio_devices.iter() {
let (mmio_base, mmio_size, irq) = DeviceManager::get_virtio_mmio_device_info(device)?; let (mmio_base, mmio_size, irq) = DeviceManager::get_virtio_mmio_device_info(device)?;
let dev_type; let dev_type;
let device_id; let device_id;

View File

@ -369,12 +369,12 @@ languages:
rust: rust:
description: "Rust language" description: "Rust language"
notes: "'version' is the default minimum version used by this project." notes: "'version' is the default minimum version used by this project."
version: "1.72.0" version: "1.75.0"
meta: meta:
description: | description: |
'newest-version' is the latest version known to work when 'newest-version' is the latest version known to work when
building Kata building Kata
newest-version: "1.72.0" newest-version: "1.75.0"
golangci-lint: golangci-lint:
description: "golangci-lint" description: "golangci-lint"