xl/libxl: disable PV vNUMA

Update xl manual and disable PV vNUMA in libxl.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Dario Faggioli <dario.faggioli@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5
index c78c3ba4722cb10d181b873470f89cb01c77c87f..80e51bba5e6b4b0bf5c1396b9bfdf75e42b103eb 100644 (file)
--- a/docs/man/xl.cfg.pod.5
+++ b/docs/man/xl.cfg.pod.5
@@ -261,6 +261,9 @@ Specify virtual NUMA configuration with positional arguments. The
 nth B<VNODE_SPEC> in the list specifies the configuration of nth
 virtual node.
 
+Note that virtual NUMA for PV guest is not yet supported, because
+there is an issue with cpuid handling that affects PV virtual NUMA.
+
 Each B<VNODE_SPEC> is a list, which has a form of
 "[VNODE_CONFIG_OPTION,VNODE_CONFIG_OPTION, ... ]"  (without quotes).
 

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 4f2f50b9bd006e08009eabb18bfa788bf19cee0f..2348ffcf399335e2ce8ea937378e0acd519a14af 100644 (file)
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -860,6 +860,15 @@ static void initiate_domain_create(libxl__egc *egc,
         goto error_out;
     }
 
+    /* PV vNUMA is not yet supported because there is an issue with
+     * cpuid handling.
+     */
+    if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV &&
+        d_config->b_info.num_vnuma_nodes) {
+        LOG(ERROR, "PV vNUMA is not yet supported");
+        goto error_out;
+    }
+
     ret = libxl__domain_create_info_setdefault(gc, &d_config->c_info);
     if (ret) {
         LOG(ERROR, "Unable to set domain create info defaults");