From 751e76db0866488d3fa456766cbf7cb75bea0c0d Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Fri, 5 Nov 2021 15:25:17 +0000 Subject: [PATCH] vmm: acpi: Use Aml::append_aml_bytes() to generate DSDT Signed-off-by: Rob Bradford --- vmm/src/acpi.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vmm/src/acpi.rs b/vmm/src/acpi.rs index 9f42af4d1..8534bffa2 100644 --- a/vmm/src/acpi.rs +++ b/vmm/src/acpi.rs @@ -176,9 +176,12 @@ pub fn create_dsdt_table( // DSDT let mut dsdt = Sdt::new(*b"DSDT", 36, 6, *b"CLOUDH", *b"CHDSDT ", 1); - dsdt.append_slice(device_manager.lock().unwrap().to_aml_bytes().as_slice()); - dsdt.append_slice(cpu_manager.lock().unwrap().to_aml_bytes().as_slice()); - dsdt.append_slice(memory_manager.lock().unwrap().to_aml_bytes().as_slice()); + let mut bytes = Vec::new(); + + device_manager.lock().unwrap().append_aml_bytes(&mut bytes); + cpu_manager.lock().unwrap().append_aml_bytes(&mut bytes); + memory_manager.lock().unwrap().append_aml_bytes(&mut bytes); + dsdt.append_slice(&bytes); dsdt }