[Qemu-devel] [PATCH 2/2] pc: reject do pc_acpi_init if acpi_enabled is false

[liguang]

Signed-off-by: liguang <lig.f...@cn.fujitsu.com>
---
 hw/i386/pc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 197d218..77025a8 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -982,7 +982,7 @@ void pc_acpi_init(const char *default_dsdt)
 {
     char *filename;
 
-    if (acpi_tables != NULL) {
+    if (acpi_tables != NULL || !acpi_enabled) {
         /* manually set via -acpitable, leave it alone */
         return;
     }
-- 
1.7.2.5