From c81d5fcad8811325ba7cd161551d1ad69d07cdfc Mon Sep 17 00:00:00 2001
From: Chuanxiao Dong <chuanxiao.dong@intel.corp-partner.google.com>
Date: Wed, 20 Nov 2019 18:14:38 +0800
Subject: [PATCH] x86_64: fix the incorrect parameter for disabling ACPI

noacpi is not used by the current guest linux kernel to disable ACPI.
Instead, acpi=off is the right parameter to be used.

BUG=chromium:1026497
TEST=launch crosvm linux guest and ACPI is disabled

Change-Id: I9c9001146abb57ea9dbc078ee6188b8c60cb056e
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1925999
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 x86_64/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x86_64/src/lib.rs b/x86_64/src/lib.rs
index 7cff650189..158a11c714 100644
--- a/x86_64/src/lib.rs
+++ b/x86_64/src/lib.rs
@@ -600,7 +600,7 @@ impl X8664arch {
             let tty_string = get_serial_tty_string(stdio_serial_num);
             cmdline.insert("console", &tty_string).unwrap();
         }
-        cmdline.insert_str("noacpi reboot=k panic=-1").unwrap();
+        cmdline.insert_str("acpi=off reboot=k panic=-1").unwrap();
 
         cmdline
     }