From 8ebb42e25a62bf587c84c109e5e4efe722b35881 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 16 May 2016 22:29:58 +0100
Subject: [PATCH] appliance: Reenable ACPI.

Previously I disabled ACPI because it was not necessary and was slow.
However measuring it again now, I can see no significant difference in
performance, and it is necessary if we are going to use DAX.

It's also useful to keep the appliance kernel state as similar to the
ordinary state, and setting acpi=off is a massive change to the way
that the kernel boots.

Therefore, reenable it.

(cherry picked from commit db1f811b29b055625ae1b03cf0daa9fed0d443ac)
---
 src/launch.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/launch.c b/src/launch.c
index e7cb325..269eeca 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -336,7 +336,6 @@ guestfs_int_appliance_command_line (guestfs_h *g, const char *appliance_dev,
      " udev.event-timeout=6000" /* for newer udevd */
      " no_timer_check"  /* fix for RHBZ#502058 */
      "%s"               /* lpj */
-     " acpi=off"        /* ACPI is slow - 150-200ms extra on my laptop */
      " printk.time=1"   /* display timestamp before kernel messages */
      " cgroup_disable=memory"   /* saves us about 5 MB of RAM */
      " usbcore.nousb"           /* disable USB, only saves about 1ms */
-- 
2.7.4