]> xenbits.xensource.com Git - xen.git/commitdiff
libxl: set ret in the check for nestedhvm and altp2m
authorWei Liu <wei.liu2@citrix.com>
Thu, 3 Nov 2016 16:41:56 +0000 (16:41 +0000)
committerWei Liu <wei.liu2@citrix.com>
Fri, 4 Nov 2016 15:08:21 +0000 (15:08 +0000)
The error path expects ret to be set, otherwise an assertion is
triggered.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>
tools/libxl/libxl_create.c

index d986cd277bd9ee33e75569dfe5b1b0cd5f16642c..abd2272e1bab7e1f9b1d1d32db0b578906bf34ef 100644 (file)
@@ -910,6 +910,7 @@ static void initiate_domain_create(libxl__egc *egc,
     if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM &&
         (libxl_defbool_val(d_config->b_info.u.hvm.nested_hvm) &&
          libxl_defbool_val(d_config->b_info.u.hvm.altp2m))) {
+        ret = ERROR_INVAL;
         LOG(ERROR, "nestedhvm and altp2mhvm cannot be used together");
         goto error_out;
     }