[XIU]: add HVM and HAP flags to the hypercall simulator.

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/xc/xc_lib_injection.c b/xc/xc_lib_injection.c
index 5e0e51d23e2304f4429d955423290a65fd36cce3..6cf3dfe8159c1dfcdacef043a167e1785c500722 100644 (file)
--- a/xc/xc_lib_injection.c
+++ b/xc/xc_lib_injection.c
@@ -71,9 +71,10 @@ static int fake_xen_domctl(int handle, struct xen_domctl *domctl)
                marshall_command(handle, "%s,%d,%d\n", DOMCTLcmd, domctl->cmd, domctl->domain);
                return unmarshall_return(handle);
        case XEN_DOMCTL_createdomain: /* W ssidref */
-               marshall_command(handle, "%s,%d,%d," DOMAINHANDLE "\n", DOMCTLcmd,
+               marshall_command(handle, "%s,%d,%d,%d," DOMAINHANDLE "\n", DOMCTLcmd,
                                 domctl->cmd,
-                                domctl->u.createdomain.flags,
+                                (domctl->u.createdomain.flags|XEN_DOMCTL_CDF_hvm_guest)?1:0,
+                                (domctl->u.createdomain.flags|XEN_DOMCTL_CDF_hap)?1:0,
                                 domctl->u.createdomain.handle[0],
                                 domctl->u.createdomain.handle[1],
                                 domctl->u.createdomain.handle[2],