commit 9d09f57aa8ca6afbdb9bb60d5f899dfc5fac6607
author Chris Wailes <chriswailes@google.com> Tue Jan 16 13:31:02 2024 -0800
committer Chris Wailes <chriswailes@google.com> Tue Jan 16 13:57:20 2024 -0800
tree 1521f2fe0340c7db55033961bb04c419530a6c0e
parent a99b1ce512aadf67cf03418fe3b11db9d6cdc46f

Update source for Rust 1.74.1

Test: m rust
Bug: 310977762
Change-Id: I2fc22bf54a8ec3a88191ce0410709a6c2f0beebd

pvmfw/src/device_assignment.rs

diff --git a/pvmfw/src/device_assignment.rs b/pvmfw/src/device_assignment.rs
index 3d060ac..54b5a47 100644
--- a/pvmfw/src/device_assignment.rs
+++ b/pvmfw/src/device_assignment.rs
@@ -601,7 +601,7 @@
 }
 
 impl DeviceAssignmentInfo {
-    const PVIOMMU_COMPATIBLE: &CStr = cstr!("pkvm,pviommu");
+    const PVIOMMU_COMPATIBLE: &'static CStr = cstr!("pkvm,pviommu");
 
     /// Parses pvIOMMUs in fdt
     // Note: This will validate pvIOMMU ids' uniqueness, even when unassigned.

pvmfw/src/instance.rs

diff --git a/pvmfw/src/instance.rs b/pvmfw/src/instance.rs
index e98f663..6daadd9 100644
--- a/pvmfw/src/instance.rs
+++ b/pvmfw/src/instance.rs
@@ -177,7 +177,7 @@
 }
 
 impl Header {
-    const MAGIC: &[u8] = b"Android-VM-instance";
+    const MAGIC: &'static [u8] = b"Android-VM-instance";
     const VERSION_1: u16 = 1;
 
     pub fn is_valid(&self) -> bool {