From d17d70fae115d95e0912b531603a142941ef4891 Mon Sep 17 00:00:00 2001
From: Rob Bradford <rbradford@rivosinc.com>
Date: Wed, 26 Apr 2023 17:09:07 +0100
Subject: [PATCH] vmm: Update for new acpi_tables version

In particular the Std::write() API requires that the value implements
AsBytes and copies the slice representation into the table data. This
avoids unaligned writes which can cause a panic with the updated
toolchain.

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
---
 Cargo.lock      | 2 +-
 fuzz/Cargo.lock | 2 +-
 vmm/src/acpi.rs | 2 +-
 vmm/src/cpu.rs  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 693d4cd0e..d43d4f9bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 3
 [[package]]
 name = "acpi_tables"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#0b892e2c2053c4ecfac8d9e5a52babae75114702"
+source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#98dcb0309d362dd83f6ffcac4f66914a2fbd5a73"
 dependencies = [
  "zerocopy",
 ]
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
index 46158d2f2..537d2df77 100644
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
@@ -5,7 +5,7 @@ version = 3
 [[package]]
 name = "acpi_tables"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#0b892e2c2053c4ecfac8d9e5a52babae75114702"
+source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#98dcb0309d362dd83f6ffcac4f66914a2fbd5a73"
 dependencies = [
  "zerocopy",
 ]
diff --git a/vmm/src/acpi.rs b/vmm/src/acpi.rs
index a2d6a7a72..075a6c613 100644
--- a/vmm/src/acpi.rs
+++ b/vmm/src/acpi.rs
@@ -239,7 +239,7 @@ fn create_facp_table(dsdt_offset: GuestAddress, device_manager: &Arc<Mutex<Devic
     // X_DSDT
     facp.write(140, dsdt_offset.0);
     // Hypervisor Vendor Identity
-    facp.write(268, b"CLOUDHYP");
+    facp.write_bytes(268, b"CLOUDHYP");
 
     facp.update_checksum();
 
diff --git a/vmm/src/cpu.rs b/vmm/src/cpu.rs
index fc7885443..c110e4874 100644
--- a/vmm/src/cpu.rs
+++ b/vmm/src/cpu.rs
@@ -1274,7 +1274,7 @@ impl CpuManager {
         let mut madt = Sdt::new(*b"APIC", 44, 5, *b"CLOUDH", *b"CHMADT  ", 1);
         #[cfg(target_arch = "x86_64")]
         {
-            madt.write(36, arch::layout::APIC_START);
+            madt.write(36, arch::layout::APIC_START.0);
 
             for cpu in 0..self.config.max_vcpus {
                 let lapic = LocalApic {