From nobody Wed May 1 16:27:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1521568367779937.2640936163976; Tue, 20 Mar 2018 10:52:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA7D47FDC5; Tue, 20 Mar 2018 17:52:44 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6683F5C545; Tue, 20 Mar 2018 17:52:44 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 505A2181B9FB; Tue, 20 Mar 2018 17:52:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2KHqg77010169 for ; Tue, 20 Mar 2018 13:52:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 18C3BBA69; Tue, 20 Mar 2018 17:52:42 +0000 (UTC) Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0DB5D51DDE for ; Tue, 20 Mar 2018 17:52:33 +0000 (UTC) Received: from smtp2.provo.novell.com (smtp2.provo.novell.com [137.65.250.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4FA1A81E01 for ; Tue, 20 Mar 2018 17:52:30 +0000 (UTC) Received: from linux-tbji.provo.novell.com (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by smtp2.provo.novell.com with ESMTP (NOT encrypted); Tue, 20 Mar 2018 11:52:29 -0600 From: Jim Fehlig To: libvir-list@redhat.com Date: Tue, 20 Mar 2018 11:52:20 -0600 Message-Id: <20180320175220.17206-1-jfehlig@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 20 Mar 2018 17:52:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 20 Mar 2018 17:52:31 +0000 (UTC) for IP:'137.65.250.81' DOMAIN:'smtp2.provo.novell.com' HELO:'smtp2.provo.novell.com' FROM:'jfehlig@suse.com' RCPT:'' X-RedHat-Spam-Score: -2.301 (RCVD_IN_DNSWL_MED, SPF_PASS) 137.65.250.81 smtp2.provo.novell.com 137.65.250.81 smtp2.provo.novell.com X-Scanned-By: MIMEDefang 2.83 on 10.5.110.25 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] libxl: rename migration APIs to include Src or Dst in their name X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 20 Mar 2018 17:52:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Inspired by commit ffb7954f to improve readability of the libxl migration APIs. Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- Suggested by jferlan while reviewing other patches touch the libxl migration code https://www.redhat.com/archives/libvir-list/2018-March/msg00769.html src/libxl/libxl_driver.c | 28 +++---- src/libxl/libxl_migration.c | 179 ++++++++++++++++++++++------------------= ---- src/libxl/libxl_migration.h | 80 ++++++++++---------- 3 files changed, 144 insertions(+), 143 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 89432d03c..52eeb18f9 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5894,8 +5894,8 @@ libxlDomainMigrateBegin3Params(virDomainPtr domain, goto cleanup; } =20 - xmlout =3D libxlDomainMigrationBegin(domain->conn, vm, xmlin, - cookieout, cookieoutlen); + xmlout =3D libxlDomainMigrationSrcBegin(domain->conn, vm, xmlin, + cookieout, cookieoutlen); =20 cleanup: virDomainObjEndAPI(&vm); @@ -5940,14 +5940,14 @@ libxlDomainMigratePrepareTunnel3Params(virConnectPt= r dconn, =20 goto error; =20 - if (!(def =3D libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def =3D libxlDomainMigrationDstPrepareDef(driver, dom_xml, dname= ))) goto error; =20 if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) goto error; =20 - if (libxlDomainMigrationPrepareTunnel3(dconn, st, &def, cookiein, - cookieinlen, flags) < 0) + if (libxlDomainMigrationDstPrepareTunnel3(dconn, st, &def, cookiein, + cookieinlen, flags) < 0) goto error; =20 return 0; @@ -5995,14 +5995,14 @@ libxlDomainMigratePrepare3Params(virConnectPtr dcon= n, =20 goto error; =20 - if (!(def =3D libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def =3D libxlDomainMigrationDstPrepareDef(driver, dom_xml, dname= ))) goto error; =20 if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) goto error; =20 - if (libxlDomainMigrationPrepare(dconn, &def, uri_in, uri_out, - cookiein, cookieinlen, flags) < 0) + if (libxlDomainMigrationDstPrepare(dconn, &def, uri_in, uri_out, + cookiein, cookieinlen, flags) < 0) goto error; =20 return 0; @@ -6058,12 +6058,12 @@ libxlDomainMigratePerform3Params(virDomainPtr dom, goto cleanup; =20 if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { - if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml, - dconnuri, uri, dname, flags) < = 0) + if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_x= ml, + dconnuri, uri, dname, flags)= < 0) goto cleanup; } else { - if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri, - uri, dname, flags) < 0) + if (libxlDomainMigrationSrcPerform(driver, vm, dom_xml, dconnuri, + uri, dname, flags) < 0) goto cleanup; } =20 @@ -6124,7 +6124,7 @@ libxlDomainMigrateFinish3Params(virConnectPtr dconn, return NULL; } =20 - ret =3D libxlDomainMigrationFinish(dconn, vm, flags, cancelled); + ret =3D libxlDomainMigrationDstFinish(dconn, vm, flags, cancelled); =20 libxlDomainObjEndJob(driver, vm); =20 @@ -6161,7 +6161,7 @@ libxlDomainMigrateConfirm3Params(virDomainPtr domain, if (virDomainMigrateConfirm3ParamsEnsureACL(domain->conn, vm->def) < 0) goto cleanup; =20 - ret =3D libxlDomainMigrationConfirm(driver, vm, flags, cancelled); + ret =3D libxlDomainMigrationSrcConfirm(driver, vm, flags, cancelled); =20 cleanup: virDomainObjEndAPI(&vm); diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 7dc39ae02..bfe359f59 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -256,7 +256,7 @@ libxlMigrationDstArgsOnceInit(void) VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs) =20 static void -libxlDoMigrateReceive(void *opaque) +libxlDoMigrateDstReceive(void *opaque) { libxlMigrationDstArgs *args =3D opaque; virDomainObjPtr vm =3D args->vm; @@ -306,9 +306,9 @@ libxlDoMigrateReceive(void *opaque) =20 =20 static void -libxlMigrateReceive(virNetSocketPtr sock, - int events ATTRIBUTE_UNUSED, - void *opaque) +libxlMigrateDstReceive(virNetSocketPtr sock, + int events ATTRIBUTE_UNUSED, + void *opaque) { libxlMigrationDstArgs *args =3D opaque; virNetSocketPtr *socks =3D args->socks; @@ -335,7 +335,7 @@ libxlMigrateReceive(virNetSocketPtr sock, */ args->recvfd =3D recvfd; if (virThreadCreate(&thread, false, - libxlDoMigrateReceive, args) < 0) { + libxlDoMigrateDstReceive, args) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration = data")); goto fail; @@ -357,10 +357,10 @@ libxlMigrateReceive(virNetSocketPtr sock, } =20 static int -libxlDoMigrateSend(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned long flags, - int sockfd) +libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + int sockfd) { libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); int xl_flags =3D 0; @@ -395,11 +395,11 @@ libxlDomainMigrationIsAllowed(virDomainDefPtr def) } =20 char * -libxlDomainMigrationBegin(virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - char **cookieout, - int *cookieoutlen) +libxlDomainMigrationSrcBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + char **cookieout, + int *cookieoutlen) { libxlDriverPrivatePtr driver =3D conn->privateData; libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); @@ -449,9 +449,9 @@ libxlDomainMigrationBegin(virConnectPtr conn, } =20 virDomainDefPtr -libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, - const char *dom_xml, - const char *dname) +libxlDomainMigrationDstPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname) { libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); virDomainDefPtr def; @@ -554,12 +554,12 @@ libxlDomainMigrationPrepareAny(virConnectPtr dconn, } =20 int -libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, - virStreamPtr st, - virDomainDefPtr *def, - const char *cookiein, - int cookieinlen, - unsigned int flags) +libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn, + virStreamPtr st, + virDomainDefPtr *def, + const char *cookiein, + int cookieinlen, + unsigned int flags) { libxlMigrationCookiePtr mig =3D NULL; libxlDriverPrivatePtr driver =3D dconn->privateData; @@ -619,7 +619,7 @@ libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, args->nsocks =3D 0; mig =3D NULL; =20 - if (virThreadCreate(&thread, false, libxlDoMigrateReceive, args) < 0) { + if (virThreadCreate(&thread, false, libxlDoMigrateDstReceive, args) < = 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration = data")); goto error; @@ -645,13 +645,13 @@ libxlDomainMigrationPrepareTunnel3(virConnectPtr dcon= n, } =20 int -libxlDomainMigrationPrepare(virConnectPtr dconn, - virDomainDefPtr *def, - const char *uri_in, - char **uri_out, - const char *cookiein, - int cookieinlen, - unsigned int flags) +libxlDomainMigrationDstPrepare(virConnectPtr dconn, + virDomainDefPtr *def, + const char *uri_in, + char **uri_out, + const char *cookiein, + int cookieinlen, + unsigned int flags) { libxlDriverPrivatePtr driver =3D dconn->privateData; libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); @@ -783,7 +783,7 @@ libxlDomainMigrationPrepare(virConnectPtr dconn, =20 if (virNetSocketAddIOCallback(socks[i], VIR_EVENT_HANDLE_READABLE, - libxlMigrateReceive, + libxlMigrateDstReceive, args, NULL) < 0) continue; @@ -834,10 +834,10 @@ struct _libxlTunnelMigrationThread { =20 /* * The data flow of tunnel3 migration in the src side: - * libxlDoMigrateSend() -> pipe - * libxlTunnel3MigrationFunc() polls pipe out and then write to dest strea= m. + * libxlDoMigrateSrcSend() -> pipe + * libxlTunnel3MigrationSrcFunc() polls pipe out and then write to dest st= ream. */ -static void libxlTunnel3MigrationFunc(void *arg) +static void libxlTunnel3MigrationSrcFunc(void *arg) { libxlTunnelMigrationThread *data =3D (libxlTunnelMigrationThread *)arg; char *buffer =3D NULL; @@ -858,7 +858,7 @@ static void libxlTunnel3MigrationFunc(void *arg) if (errno =3D=3D EAGAIN || errno =3D=3D EINTR) continue; virReportError(errno, "%s", - _("poll failed in libxlTunnel3MigrationFunc")); + _("poll failed in libxlTunnel3MigrationSrcFunc"= )); goto cleanup; } =20 @@ -904,11 +904,11 @@ struct libxlTunnelControl { }; =20 static int -libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned long flags, - virStreamPtr st, - struct libxlTunnelControl **tnl) +libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + virStreamPtr st, + struct libxlTunnelControl **tnl) { struct libxlTunnelControl *tc =3D NULL; libxlTunnelMigrationThread *arg =3D NULL; @@ -931,7 +931,7 @@ libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, /* Write to dest stream */ arg->st =3D st; if (virThreadCreate(&tc->thread, true, - libxlTunnel3MigrationFunc, arg) < 0) { + libxlTunnel3MigrationSrcFunc, arg) < 0) { virReportError(errno, "%s", _("Unable to create tunnel migration thread")); goto out; @@ -939,16 +939,17 @@ libxlMigrationStartTunnel(libxlDriverPrivatePtr drive= r, =20 virObjectUnlock(vm); /* Send data to pipe */ - ret =3D libxlDoMigrateSend(driver, vm, flags, tc->dataFD[1]); + ret =3D libxlDoMigrateSrcSend(driver, vm, flags, tc->dataFD[1]); virObjectLock(vm); =20 out: - /* libxlMigrationStopTunnel will be called in libxlDoMigrateP2P to free - * all resources for us. */ + /* libxlMigrationSrcStopTunnel will be called in libxlDoMigrateSrcP2P + * to free all resources for us. + */ return ret; } =20 -static void libxlMigrationStopTunnel(struct libxlTunnelControl *tc) +static void libxlMigrationSrcStopTunnel(struct libxlTunnelControl *tc) { if (!tc) return; @@ -966,15 +967,15 @@ static void libxlMigrationStopTunnel(struct libxlTunn= elControl *tc) * introduced in libxl. */ static int -libxlDoMigrateP2P(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - virConnectPtr sconn, - const char *xmlin, - virConnectPtr dconn, - const char *dconnuri ATTRIBUTE_UNUSED, - const char *dname, - const char *uri, - unsigned int flags) +libxlDoMigrateSrcP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *xmlin, + virConnectPtr dconn, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *dname, + const char *uri, + unsigned int flags) { virDomainPtr ddomain =3D NULL; virTypedParameterPtr params =3D NULL; @@ -992,8 +993,8 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, virStreamPtr st =3D NULL; struct libxlTunnelControl *tc =3D NULL; =20 - dom_xml =3D libxlDomainMigrationBegin(sconn, vm, xmlin, - &cookieout, &cookieoutlen); + dom_xml =3D libxlDomainMigrationSrcBegin(sconn, vm, xmlin, + &cookieout, &cookieoutlen); if (!dom_xml) goto cleanup; =20 @@ -1048,10 +1049,10 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, =20 VIR_DEBUG("Perform3 uri=3D%s", NULLSTR(uri_out)); if (flags & VIR_MIGRATE_TUNNELLED) - ret =3D libxlMigrationStartTunnel(driver, vm, flags, st, &tc); + ret =3D libxlMigrationSrcStartTunnel(driver, vm, flags, st, &tc); else - ret =3D libxlDomainMigrationPerform(driver, vm, NULL, NULL, - uri_out, NULL, flags); + ret =3D libxlDomainMigrationSrcPerform(driver, vm, NULL, NULL, + uri_out, NULL, flags); if (ret < 0) orig_err =3D virSaveLastError(); =20 @@ -1082,7 +1083,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, orig_err =3D virSaveLastError(); =20 VIR_DEBUG("Confirm3 cancelled=3D%d vm=3D%p", cancelled, vm); - ret =3D libxlDomainMigrationConfirm(driver, vm, flags, cancelled); + ret =3D libxlDomainMigrationSrcConfirm(driver, vm, flags, cancelled); =20 if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", @@ -1090,7 +1091,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, =20 cleanup: if (flags & VIR_MIGRATE_TUNNELLED) { - libxlMigrationStopTunnel(tc); + libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } =20 @@ -1129,14 +1130,14 @@ static virConnectAuth virConnectAuthConfig =3D { * the migration process with an established virConnectPtr to the destinat= ion. */ int -libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - virConnectPtr sconn, - const char *xmlin, - const char *dconnuri, - const char *uri_str ATTRIBUTE_UNUSED, - const char *dname, - unsigned int flags) +libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *xmlin, + const char *dconnuri, + const char *uri_str ATTRIBUTE_UNUSED, + const char *dname, + unsigned int flags) { int ret =3D -1; bool useParams; @@ -1170,8 +1171,8 @@ libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr = driver, goto cleanup; } =20 - ret =3D libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri, - dname, uri_str, flags); + ret =3D libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, + dname, uri_str, flags); =20 cleanup: orig_err =3D virSaveLastError(); @@ -1187,13 +1188,13 @@ libxlDomainMigrationPerformP2P(libxlDriverPrivatePt= r driver, } =20 int -libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - const char *dom_xml ATTRIBUTE_UNUSED, - const char *dconnuri ATTRIBUTE_UNUSED, - const char *uri_str, - const char *dname ATTRIBUTE_UNUSED, - unsigned int flags) +libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *dom_xml ATTRIBUTE_UNUSED, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *uri_str, + const char *dname ATTRIBUTE_UNUSED, + unsigned int flags) { libxlDomainObjPrivatePtr priv =3D vm->privateData; char *hostname =3D NULL; @@ -1233,7 +1234,7 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr dri= ver, =20 /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); - ret =3D libxlDoMigrateSend(driver, vm, flags, sockfd); + ret =3D libxlDoMigrateSrcSend(driver, vm, flags, sockfd); virObjectLock(vm); =20 if (ret < 0) @@ -1249,10 +1250,10 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr d= river, } =20 virDomainPtr -libxlDomainMigrationFinish(virConnectPtr dconn, - virDomainObjPtr vm, - unsigned int flags, - int cancelled) +libxlDomainMigrationDstFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) { libxlDriverPrivatePtr driver =3D dconn->privateData; libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); @@ -1347,10 +1348,10 @@ libxlDomainMigrationFinish(virConnectPtr dconn, } =20 int -libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned int flags, - int cancelled) +libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) { libxlDriverConfigPtr cfg =3D libxlDriverConfigGet(driver); libxlDomainObjPrivatePtr priv =3D vm->privateData; @@ -1358,7 +1359,7 @@ libxlDomainMigrationConfirm(libxlDriverPrivatePtr dri= ver, int ret =3D -1; =20 if (cancelled) { - /* Resume lock process that was paused in MigrationPerform */ + /* Resume lock process that was paused in MigrationSrcPerform */ virDomainLockProcessResume(driver->lockManager, "xen:///system", vm, diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index 3bc2d0eae..42897426d 100644 --- a/src/libxl/libxl_migration.h +++ b/src/libxl/libxl_migration.h @@ -42,63 +42,63 @@ NULL =20 char * -libxlDomainMigrationBegin(virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - char **cookieout, - int *cookieoutlen); +libxlDomainMigrationSrcBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + char **cookieout, + int *cookieoutlen); =20 virDomainDefPtr -libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, - const char *dom_xml, - const char *dname); +libxlDomainMigrationDstPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname); =20 int -libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, - virStreamPtr st, - virDomainDefPtr *def, - const char *cookiein, - int cookieinlen, - unsigned int flags); +libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn, + virStreamPtr st, + virDomainDefPtr *def, + const char *cookiein, + int cookieinlen, + unsigned int flags); =20 int -libxlDomainMigrationPrepare(virConnectPtr dconn, - virDomainDefPtr *def, - const char *uri_in, - char **uri_out, - const char *cookiein, - int cookieinlen, - unsigned int flags); +libxlDomainMigrationDstPrepare(virConnectPtr dconn, + virDomainDefPtr *def, + const char *uri_in, + char **uri_out, + const char *cookiein, + int cookieinlen, + unsigned int flags); =20 int -libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, +libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *dom_xml, + const char *dconnuri, + const char *uri_str, + const char *dname, + unsigned int flags); + +int +libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, virDomainObjPtr vm, - virConnectPtr sconn, const char *dom_xml, const char *dconnuri, const char *uri_str, const char *dname, unsigned int flags); =20 -int -libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - const char *dom_xml, - const char *dconnuri, - const char *uri_str, - const char *dname, - unsigned int flags); - virDomainPtr -libxlDomainMigrationFinish(virConnectPtr dconn, - virDomainObjPtr vm, - unsigned int flags, - int cancelled); +libxlDomainMigrationDstFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); =20 int -libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned int flags, - int cancelled); +libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); =20 #endif /* LIBXL_DRIVER_H */ --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list