From: Wei Liu <wei.liu2@citrix.com>
Date: Thu, 3 Nov 2016 16:13:05 +0000 (+0000)
Subject: Revert "libxl: disallow enabling PoD and ALTP2M at the same time"
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~124
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bd41a22f2d7ac66ff71bacff391ee21f658a8fa2;p=xen.git

Revert "libxl: disallow enabling PoD and ALTP2M at the same time"

This reverts commit ff53c65311a32e54dba51f2b8112632e9dd2af3b.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 47c297b4bf..d986cd277b 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -885,13 +885,6 @@ static void initiate_domain_create(libxl__egc *egc,
         goto error_out;
     }
 
-    if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM &&
-        libxl_defbool_val(d_config->b_info.u.hvm.altp2m) &&
-        pod_enabled) {
-        LOG(ERROR, "Cannot enable PoD and ALTP2M at the same time");
-        goto error_out;
-    }
-
     /* PV vNUMA is not yet supported because there is an issue with
      * cpuid handling.
      */