From: Chunyan Liu <cyliu@suse.com>
Date: Tue, 23 Dec 2014 06:36:04 +0000 (+0800)
Subject: xenconfig: set HVM pae/apic/acpi/ default to 1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=90ed3bd0aac6d29f0c184bd5e168fc9956c04848;p=libvirt.git

xenconfig: set HVM pae/apic/acpi/ default to 1

According to xm.config manual, HVM pae|apic|acpi feature default
is 1 (enabled). But in conversion from xm config to libvirt xml,
if xm config doesn't contain pae|apic|acpi, it sets default value
to 0, this causes some problems in HVM guest.

Update parser codes to set HVM pae|apic|acpi default value to 1
to match xm config convension.

Signed-off-by: Chunyan Liu <cyliu@suse.com>
---

diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index e612fdc30a..dd17827408 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -512,17 +512,17 @@ xenParseCPUFeatures(virConfPtr conf, virDomainDefPtr def)
         return -1;
 
     if (STREQ(def->os.type, "hvm")) {
-        if (xenConfigGetBool(conf, "pae", &val, 0) < 0)
+        if (xenConfigGetBool(conf, "pae", &val, 1) < 0)
             return -1;
 
         else if (val)
             def->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON;
-        if (xenConfigGetBool(conf, "acpi", &val, 0) < 0)
+        if (xenConfigGetBool(conf, "acpi", &val, 1) < 0)
             return -1;
 
         else if (val)
             def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ON;
-        if (xenConfigGetBool(conf, "apic", &val, 0) < 0)
+        if (xenConfigGetBool(conf, "apic", &val, 1) < 0)
             return -1;
 
         else if (val)