From nobody Wed May 14 07:02:47 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 1526642993957176.29955934327552; Fri, 18 May 2018 04:29:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B6F01B2526; Fri, 18 May 2018 11:29:51 +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 4388730012B9; Fri, 18 May 2018 11:29:51 +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 EB9A1180BADA; Fri, 18 May 2018 11:29:50 +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 w4IBTPha016109 for ; Fri, 18 May 2018 07:29:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 44F702026E03; Fri, 18 May 2018 11:29:25 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id DE7482026DFD for ; Fri, 18 May 2018 11:29:24 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 18 May 2018 13:29:04 +0200 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 Subject: [libvirt] [PATCH 14/15] qemu: migration: Extract code responsible for calling drive-mirror 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 18 May 2018 11:29:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Separate the code relevant for this approach so that we can later add a second implementation without making the function messy. Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 76 ++++++++++++++++++++++++++++++-------------= ---- 1 file changed, 49 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fdf71b2c0b..6617b7aea6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -748,6 +748,48 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver, } +static int +qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *diskAlias, + const char *host, + int port, + unsigned long long mirror_speed, + unsigned int mirror_flags) +{ + char *nbd_dest =3D NULL; + int mon_ret; + int ret =3D -1; + + if (strchr(host, ':')) { + if (virAsprintf(&nbd_dest, "nbd:[%s]:%d:exportname=3D%s", + host, port, diskAlias) < 0) + goto cleanup; + } else { + if (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=3D%s", + host, port, diskAlias) < 0) + goto cleanup; + } + + if (qemuDomainObjEnterMonitorAsync(driver, vm, + QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) + goto cleanup; + + mon_ret =3D qemuMonitorDriveMirror(qemuDomainGetMonitor(vm), + diskAlias, nbd_dest, "raw", + mirror_speed, 0, 0, mirror_flags); + + if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) + goto cleanup; + + ret =3D 0; + + cleanup: + VIR_FREE(nbd_dest); + return ret; +} + + /** * qemuMigrationSrcNBDStorageCopy: * @driver: qemu driver @@ -783,8 +825,6 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, int port; size_t i; char *diskAlias =3D NULL; - char *nbd_dest =3D NULL; - char *hoststr =3D NULL; unsigned long long mirror_speed =3D speed; unsigned int mirror_flags =3D VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT; int rv; @@ -804,47 +844,31 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr drive= r, port =3D mig->nbd->port; mig->nbd->port =3D 0; - /* escape literal IPv6 address */ - if (strchr(host, ':')) { - if (virAsprintf(&hoststr, "[%s]", host) < 0) - goto cleanup; - } else if (VIR_STRDUP(hoststr, host) < 0) { - goto cleanup; - } - if (*migrate_flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC) mirror_flags |=3D VIR_DOMAIN_BLOCK_REBASE_SHALLOW; for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk =3D vm->def->disks[i]; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(dis= k); - int mon_ret; /* check whether disk should be migrated */ if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) continue; - if (!(diskAlias =3D qemuAliasFromDisk(disk)) || - (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=3D%s", - hoststr, port, diskAlias) < 0)) + if (!(diskAlias =3D qemuAliasFromDisk(disk))) goto cleanup; qemuBlockJobSyncBegin(disk); - if (qemuDomainObjEnterMonitorAsync(driver, vm, - QEMU_ASYNC_JOB_MIGRATION_OUT) <= 0) - goto cleanup; - - /* Force "raw" format for NBD export */ - mon_ret =3D qemuMonitorDriveMirror(priv->mon, diskAlias, nbd_dest, - "raw", mirror_speed, 0, 0, mirror= _flags); - VIR_FREE(diskAlias); - VIR_FREE(nbd_dest); - - if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) { + if (qemuMigrationSrcNBDStorageCopyDriveMirror(driver, vm, diskAlia= s, + host, port, + mirror_speed, + mirror_flags) < 0) { qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_MIGRATION_OUT, disk); goto cleanup; } + + VIR_FREE(diskAlias); diskPriv->migrating =3D true; if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver-= >caps) < 0) { @@ -886,8 +910,6 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, cleanup: virObjectUnref(cfg); VIR_FREE(diskAlias); - VIR_FREE(nbd_dest); - VIR_FREE(hoststr); return ret; } --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list