From nobody Wed May 14 20:18:50 2025 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519639814514280.66027008798494; Mon, 26 Feb 2018 02:10:14 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 91E9FC0587D4; Mon, 26 Feb 2018 10:06:47 +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 476135D793; Mon, 26 Feb 2018 10:06:47 +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 736CA18033F2; Mon, 26 Feb 2018 10:06:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1QA62Do024971 for ; Mon, 26 Feb 2018 05:06:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id B2D252024CA2; Mon, 26 Feb 2018 10:06:02 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-22.brq.redhat.com [10.40.204.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 010D3202699C; Mon, 26 Feb 2018 10:06:01 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 26 Feb 2018 11:05:51 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: jdenemar@redhat.com Subject: [libvirt] [PATCH 3/3] qemu: Add virConnectPtr back to some migration methods 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 26 Feb 2018 10:06:48 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This partially reverts 82592551cb8c4112cfa2264d50b8dce5349533d5. When migrating a domain, qemuMigrationDstPrepareAny() is called which eventually calls qemuProcessLaunch(conn =3D NULL, flags =3D VIR_QEMU_PROCESS_START_AUTODESTROY); But the very first thing that qemuProcessLaunch does is check if AUTODESTROY flag is set and @conn is not NULL. Well, it is. Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_driver.c | 12 ++++++------ src/qemu/qemu_migration.c | 17 ++++++++++------- src/qemu/qemu_migration.h | 2 ++ 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 313d730c7..96454c17c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12138,7 +12138,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, if (virDomainMigratePrepareTunnelEnsureACL(dconn, def) < 0) goto cleanup; =20 - ret =3D qemuMigrationDstPrepareTunnel(driver, + ret =3D qemuMigrationDstPrepareTunnel(driver, dconn, NULL, 0, NULL, NULL, /* No cookies= in v2 */ st, &def, origname, flags); =20 @@ -12201,7 +12201,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, * length was not sufficiently large, causing failures * migrating between old & new libvirtd */ - ret =3D qemuMigrationDstPrepareDirect(driver, + ret =3D qemuMigrationDstPrepareDirect(driver, dconn, NULL, 0, NULL, NULL, /* No cookies= */ uri_in, uri_out, &def, origname, NULL, 0, NULL, 0, @@ -12439,7 +12439,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, if (virDomainMigratePrepare3EnsureACL(dconn, def) < 0) goto cleanup; =20 - ret =3D qemuMigrationDstPrepareDirect(driver, + ret =3D qemuMigrationDstPrepareDirect(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, @@ -12525,7 +12525,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) goto cleanup; =20 - ret =3D qemuMigrationDstPrepareDirect(driver, + ret =3D qemuMigrationDstPrepareDirect(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, uri_out, @@ -12574,7 +12574,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, if (virDomainMigratePrepareTunnel3EnsureACL(dconn, def) < 0) goto cleanup; =20 - ret =3D qemuMigrationDstPrepareTunnel(driver, + ret =3D qemuMigrationDstPrepareTunnel(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, st, &def, origname, flags); @@ -12627,7 +12627,7 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr= dconn, if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) goto cleanup; =20 - ret =3D qemuMigrationDstPrepareTunnel(driver, + ret =3D qemuMigrationDstPrepareTunnel(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, st, &def, origname, flags); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e98b1e4ce..bf89e184e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2600,6 +2600,7 @@ qemuMigrationParamsResetTLS(virQEMUDriverPtr driver, =20 static int qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, + virConnectPtr dconn, const char *cookiein, int cookieinlen, char **cookieout, @@ -2809,7 +2810,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, if (qemuProcessPrepareHost(driver, vm, startFlags) < 0) goto stopjob; =20 - rv =3D qemuProcessLaunch(NULL, driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, + rv =3D qemuProcessLaunch(dconn, driver, vm, QEMU_ASYNC_JOB_MIGRATION_I= N, incoming, NULL, VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_START, startFlags); @@ -2993,6 +2994,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, */ int qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver, + virConnectPtr dconn, const char *cookiein, int cookieinlen, char **cookieout, @@ -3005,10 +3007,10 @@ qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driv= er, qemuMigrationCompressionPtr compression =3D NULL; int ret; =20 - VIR_DEBUG("driver=3D%p, cookiein=3D%s, cookieinlen=3D%d, " + VIR_DEBUG("driver=3D%p, dconn=3D%p, cookiein=3D%s, cookieinlen=3D%d, " "cookieout=3D%p, cookieoutlen=3D%p, st=3D%p, def=3D%p, " "origname=3D%s, flags=3D0x%lx", - driver, NULLSTR(cookiein), cookieinlen, + driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, st, *def, origname, flags); =20 if (st =3D=3D NULL) { @@ -3020,7 +3022,7 @@ qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver, if (!(compression =3D qemuMigrationAnyCompressionParse(NULL, 0, flags)= )) return -1; =20 - ret =3D qemuMigrationDstPrepareAny(driver, cookiein, cookieinlen, + ret =3D qemuMigrationDstPrepareAny(driver, dconn, cookiein, cookieinle= n, cookieout, cookieoutlen, def, orignam= e, st, NULL, 0, false, NULL, 0, NULL, 0, compression, flags); @@ -3054,6 +3056,7 @@ qemuMigrationAnyParseURI(const char *uri, bool *wellF= ormed) =20 int qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, + virConnectPtr dconn, const char *cookiein, int cookieinlen, char **cookieout, @@ -3077,11 +3080,11 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driv= er, virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); const char *migrateHost =3D cfg->migrateHost; =20 - VIR_DEBUG("driver=3D%p, cookiein=3D%s, cookieinlen=3D%d, " + VIR_DEBUG("driver=3D%p, dconn=3D%p, cookiein=3D%s, cookieinlen=3D%d, " "cookieout=3D%p, cookieoutlen=3D%p, uri_in=3D%s, uri_out=3D%= p, " "def=3D%p, origname=3D%s, listenAddress=3D%s, " "nmigrate_disks=3D%zu, migrate_disks=3D%p, nbdPort=3D%d, fla= gs=3D0x%lx", - driver, NULLSTR(cookiein), cookieinlen, + driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, *def, origname, NULLSTR(listenAddress), nmigrate_disks, migrate_disks, nbdPort, flags); @@ -3185,7 +3188,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, if (*uri_out) VIR_DEBUG("Generated uri_out=3D%s", *uri_out); =20 - ret =3D qemuMigrationDstPrepareAny(driver, cookiein, cookieinlen, + ret =3D qemuMigrationDstPrepareAny(driver, dconn, cookiein, cookieinle= n, cookieout, cookieoutlen, def, orignam= e, NULL, uri ? uri->scheme : "tcp", port, autoPort, listenAddress, diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index ecb176e06..a075aec12 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -170,6 +170,7 @@ qemuMigrationAnyPrepareDef(virQEMUDriverPtr driver, =20 int qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver, + virConnectPtr dconn, const char *cookiein, int cookieinlen, char **cookieout, @@ -181,6 +182,7 @@ qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver, =20 int qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, + virConnectPtr dconn, const char *cookiein, int cookieinlen, char **cookieout, --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list