]> xenbits.xensource.com Git - libvirt.git/commitdiff
vz: fixed migration in p2p mode
authorPavel Glushchak <pglushchak@virtuozzo.com>
Mon, 14 Nov 2016 15:20:30 +0000 (18:20 +0300)
committerMaxim Nestratov <mnestratov@virtuozzo.com>
Mon, 14 Nov 2016 18:22:40 +0000 (21:22 +0300)
dom xml generated on begin step should be passed
to perform step in VIR_MIGRATE_PARAM_DEST_XML parameter.
Otherwise 'XML error: failed to parse xml document' is
raised on destination host as dom xml is NULL.

Signed-off-by: Pavel Glushchak <pglushchak@virtuozzo.com>
src/vz/vz_driver.c

index b7c37bb964edc69e72ca7c24b631282d4cabc161..b2c3e31c5faabfe6abb99e25f5d293153f9b3f7b 100644 (file)
@@ -3199,6 +3199,7 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom,
     virConnectPtr dconn = NULL;
     virTypedParameterPtr params = NULL;
     int ret = -1;
+    int maxparams = nparams;
 
     if (virTypedParamsCopy(&params, orig_params, nparams) < 0)
         return -1;
@@ -3210,6 +3211,10 @@ vzDomainMigratePerformP2P(virDomainObjPtr dom,
                                              &cookieout, &cookieoutlen)))
         goto done;
 
+    if (virTypedParamsAddString(&params, &nparams, &maxparams,
+                                VIR_MIGRATE_PARAM_DEST_XML, dom_xml) < 0)
+        goto done;
+
     cookiein = cookieout;
     cookieinlen = cookieoutlen;
     cookieout = NULL;