From nobody Thu Apr 25 20:09:38 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1567611746; cv=none; d=zoho.com; s=zohoarc; b=WZxzVKco/VcYti8rvHqoSDtDlv5VA9RGa430LcZyArl0SP/bJ0wGFZeC9w5Jy2DLTmg6++sCAY+AOU/LT9gehMHDqebNBAG85s2QdYndWgfwhiGbb+gk0FnvUMdMGV+jW8W/89EmJK2QeK4krvw33z4G5ewAOswH1YbPVO1mBaw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567611746; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8rY9l5G+anwIbUUEA0S3haeDHxGIHDqTXQjeoK8lkfU=; b=gRoqQep3A56cnIwKZ22tK7f76Zjlq1pBATtlrhtHERZ0YyL8doC2m4aYnglCSTl9lsChVwM2aYIhzmoU7ddKsI+Bs0Q4J3pqEKyHowbgZqqErs6lZZo5W2nYUjK9QGV0xphcUg3Q2agtoEESTnPjum8XhfdduUq2upsP8yCoDew= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567611746429648.163418132577; Wed, 4 Sep 2019 08:42:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE7C518C4271; Wed, 4 Sep 2019 15:42:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BC2FF60606; Wed, 4 Sep 2019 15:42:24 +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 8361FE204; Wed, 4 Sep 2019 15:42:24 +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 x84FdWsA028803 for ; Wed, 4 Sep 2019 11:39:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id B751260C18; Wed, 4 Sep 2019 15:39:32 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4030F60BFB for ; Wed, 4 Sep 2019 15:39:32 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 4 Sep 2019 17:39:25 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/4] qemu: migration: Refactor cleanup in qemuMigrationSrcNBDStorageCopyBlockdev 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: , 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Wed, 04 Sep 2019 15:42:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Remove the cleanup label as it's empty. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e387deb497..1a557851bb 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -796,50 +796,49 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverP= tr driver, VIR_AUTOPTR(qemuBlockStorageSourceAttachData) data =3D NULL; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); int mon_ret =3D 0; - int ret =3D -1; VIR_AUTOUNREF(virStorageSourcePtr) copysrc =3D NULL; VIR_DEBUG("starting blockdev mirror for disk=3D%s to host=3D%s", diskA= lias, host); if (!(copysrc =3D virStorageSourceNew())) - goto cleanup; + return -1; copysrc->type =3D VIR_STORAGE_TYPE_NETWORK; copysrc->protocol =3D VIR_STORAGE_NET_PROTOCOL_NBD; copysrc->format =3D VIR_STORAGE_FILE_RAW; if (!(copysrc->backingStore =3D virStorageSourceNew())) - goto cleanup; + return -1; if (VIR_STRDUP(copysrc->path, diskAlias) < 0) - goto cleanup; + return -1; if (VIR_ALLOC_N(copysrc->hosts, 1) < 0) - goto cleanup; + return -1; copysrc->nhosts =3D 1; copysrc->hosts->transport =3D VIR_STORAGE_NET_HOST_TRANS_TCP; copysrc->hosts->port =3D port; if (VIR_STRDUP(copysrc->hosts->name, host) < 0) - goto cleanup; + return -1; if (VIR_STRDUP(copysrc->tlsAlias, tlsAlias) < 0) - goto cleanup; + return -1; if (virAsprintf(©src->nodestorage, "migration-%s-storage", disk->d= st) < 0 || virAsprintf(©src->nodeformat, "migration-%s-format", disk->dst= ) < 0) - goto cleanup; + return -1; /* Migration via blockdev-mirror was supported sooner than the auto-re= ad-only * feature was added to qemu */ if (!(data =3D qemuBlockStorageSourceAttachPrepareBlockdev(copysrc, copysrc->back= ingStore, false))) - goto cleanup; + return -1; if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) - goto cleanup; + return -1; mon_ret =3D qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm)= , data); @@ -852,14 +851,11 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverP= tr driver, qemuBlockStorageSourceAttachRollback(qemuDomainGetMonitor(vm), dat= a); if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) - goto cleanup; + return -1; VIR_STEAL_PTR(diskPriv->migrSource, copysrc); - ret =3D 0; - - cleanup: - return ret; + return 0; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 20:09:38 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1567611681; cv=none; d=zoho.com; s=zohoarc; b=XJAFZe1+mXJ7dQgbfeFUsC7idbjdHe1z9L/WDiKR1vI3HxlFj4dfkBP3Nnq+ToeUbn9rDGC0sNXbbRbrAZsfoSB+8WveOjDFctSDc3o1lgwSV9mqIOEiXK6LlbChaVkOWbURzjcVC9LLm7apw9u63YYNHOoHt7DwtIBWDXM3poo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567611681; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=9MkSfKtDjLykh4rJMTGxLPUIvNdiFJHg6Ju2PqqYHPc=; b=btDfQWwrW0xziz7PhpFIJ1osETTii19jt5dnQrTTF2eQOADgytERWKzrSG+papl6RFL/JsR+b6dqKdrGU1KGdWhRFgN++TjD8FxU5IHRgDgAH0aN+c4R2/hPrVm7+5t3M/XQtac0O1yzazE0ZeVq5RSGZVHJcY8t/fY/k3OQUk4= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567611681737464.86627071855855; Wed, 4 Sep 2019 08:41:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7FCF2308219F; Wed, 4 Sep 2019 15:41:19 +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 55DC6809E; Wed, 4 Sep 2019 15:41:19 +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 1657A180221E; Wed, 4 Sep 2019 15:41:19 +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 x84FdXgT028816 for ; Wed, 4 Sep 2019 11:39:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 86FD760C57; Wed, 4 Sep 2019 15:39:33 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FA5F60C18 for ; Wed, 4 Sep 2019 15:39:32 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 4 Sep 2019 17:39:26 +0200 Message-Id: <9b58e83060b25eddb0343a0154811efa917c9e5c.1567611460.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] qemu: migration: Refactor cleanup in qemuMigrationSrcNBDStorageCopyDriveMirror 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: , 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Wed, 04 Sep 2019 15:41:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use VIR_AUTOFREE and remove the cleanup label. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1a557851bb..82625b2261 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -868,36 +868,31 @@ qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriv= erPtr driver, unsigned long long mirror_speed, bool mirror_shallow) { - char *nbd_dest =3D NULL; + VIR_AUTOFREE(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; + return -1; } else { if (virAsprintf(&nbd_dest, "nbd:%s:%d:exportname=3D%s", host, port, diskAlias) < 0) - goto cleanup; + return -1; } if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) - goto cleanup; + return -1; mon_ret =3D qemuMonitorDriveMirror(qemuDomainGetMonitor(vm), diskAlias, nbd_dest, "raw", mirror_speed, 0, 0, mirror_shallow, t= rue); if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - VIR_FREE(nbd_dest); - return ret; + return 0; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 20:09:38 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1567611684; cv=none; d=zoho.com; s=zohoarc; b=kM6IxyI0JdChZEuOYRMSxuEur6RxO1jHj7Muf3KKIUAdrf7iyeurBa1k/tkYmHwdmCc1+jvJklsZqVCb4d8WoGb2bhw11WNNb6tg49/P4N4+v6aWvmBmYyuwRAGFPQmuk0zSERHvNwLIzEKfbV5v8n1Ez6E6DdPDmjOnVNj3nQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567611684; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=7nnZsZQ2+FNoqS5DgizhrW+DLHmRcX5TvJOL/yv4vEM=; b=fmKfI/aKTQSQ+Rptjt7vzLEZD3jhjV8bQZHgOrtEZSpIfYV4yTdJ+fMF+ahkqLGHTOWazXxSBvJn3GxagHXo8TwCpg8vc2zesY30kjzg4oWacnycf5hG0RExuRK/jqL0ahomW+LrGSEVuHJmLMAnBxw8ux+L43MQ5c9nrYpM7ew= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567611684286503.94779121304737; Wed, 4 Sep 2019 08:41:24 -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 2A9532EF168; Wed, 4 Sep 2019 15:41:23 +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 057FB5C258; Wed, 4 Sep 2019 15:41:23 +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 B7BCB1802220; Wed, 4 Sep 2019 15:41:22 +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 x84FdY3a028823 for ; Wed, 4 Sep 2019 11:39:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5733660BFB; Wed, 4 Sep 2019 15:39:34 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id D330F60C18 for ; Wed, 4 Sep 2019 15:39:33 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 4 Sep 2019 17:39:27 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/4] qemu: migration: Refactor cleanup in qemuMigrationSrcNBDStorageCopy 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: , 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.29]); Wed, 04 Sep 2019 15:41:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use VIR_AUTOUNREF and remove the cleanup label. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 82625b2261..c13b21a0bb 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -983,13 +983,12 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr drive= r, unsigned int flags) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; int port; size_t i; unsigned long long mirror_speed =3D speed; bool mirror_shallow =3D *migrate_flags & QEMU_MONITOR_MIGRATE_NON_SHAR= ED_INC; int rv; - virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + VIR_AUTOUNREF(virQEMUDriverConfigPtr) cfg =3D virQEMUDriverGetConfig(d= river); VIR_DEBUG("Starting drive mirrors for domain %s", vm->def->name); @@ -997,7 +996,7 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver, virReportError(VIR_ERR_OVERFLOW, _("bandwidth must be less than %llu"), LLONG_MAX >> 20); - goto cleanup; + return -1; } mirror_speed <<=3D 20; @@ -1015,34 +1014,34 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr dri= ver, if (qemuMigrationSrcNBDStorageCopyOne(driver, vm, disk, host, port, mirror_speed, mirror_shallow, tlsAlias, flags) < 0) - goto cleanup; + return -1; if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver-= >caps) < 0) { VIR_WARN("Failed to save status on vm %s", vm->def->name); - goto cleanup; + return -1; } } while ((rv =3D qemuMigrationSrcNBDStorageCopyReady(vm, QEMU_ASYNC_JOB_= MIGRATION_OUT)) !=3D 1) { if (rv < 0) - goto cleanup; + return -1; if (priv->job.abortJob) { priv->job.current->status =3D QEMU_DOMAIN_JOB_STATUS_CANCELED; virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), qemuDomainAsyncJobTypeToString(priv->job.asyncJ= ob), _("canceled by client")); - goto cleanup; + return -1; } if (dconn && virConnectIsAlive(dconn) <=3D 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Lost connection to destination host")); - goto cleanup; + return -1; } if (virDomainObjWait(vm) < 0) - goto cleanup; + return -1; } qemuMigrationSrcFetchMirrorStats(driver, vm, QEMU_ASYNC_JOB_MIGRATION_= OUT, @@ -1051,11 +1050,8 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driv= er, /* Okay, all disks are ready. Modify migrate_flags */ *migrate_flags &=3D ~(QEMU_MONITOR_MIGRATE_NON_SHARED_DISK | QEMU_MONITOR_MIGRATE_NON_SHARED_INC); - ret =3D 0; - cleanup: - virObjectUnref(cfg); - return ret; + return 0; } --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 20:09:38 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1567611628; cv=none; d=zoho.com; s=zohoarc; b=OcovnOT31hYMy6vI9c573Vsa0HLY8klzKV3nwGCUlul9/qN1sWCTxWZ++Rq1MjY0rZzX4EquT2YQm+CtM4vYgZBqszeRkR0C3ZyGYHoh2gnI4vqOZeuy/VWF/dgxvZJlyDHs4DrdeC05CllyPnjswcct6E18V00CqmxzpQUkKt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567611628; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=IotVu7T3Gb1le+PHH8M1XwANXGQAegs4k1Xf8mAQ0PI=; b=dnMmdUr2FHiv1FwnVdmKCn5fWOYsVxZi1G4aM6DUr4MLJDCyMYcWvb3Fx5XjU9EQ35iXhxxaB8oSzu2CJMSgNFSfW/sHaJDQuxQMC9MKL9Zcu7wHBrwl/8m2tUL33+rkkbIUcYhGH9Ta9ihf26mIJjsT448f5n5t6AtDtJb2vBg= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1567611628483162.20906470691023; Wed, 4 Sep 2019 08:40:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 01D623082B41; Wed, 4 Sep 2019 15:40:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E1C65F7C0; Wed, 4 Sep 2019 15:40:26 +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 D8BFEE203; Wed, 4 Sep 2019 15:40:25 +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 x84FdZ21028833 for ; Wed, 4 Sep 2019 11:39:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 246D960C18; Wed, 4 Sep 2019 15:39:35 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1CB460BFB for ; Wed, 4 Sep 2019 15:39:34 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 4 Sep 2019 17:39:28 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] qemu: migration: Switch to blockdev mode for non-shared storage migration 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: , 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 04 Sep 2019 15:40:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" When blockdev is used we always should use the blockdev mode for non-shared storage migration. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index c13b21a0bb..6ff956b1f5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -907,6 +907,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriverPtr driv= er, const char *tlsAlias, unsigned int flags) { + qemuDomainObjPrivatePtr priv =3D vm->privateData; qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); qemuBlockJobDataPtr job =3D NULL; char *diskAlias =3D NULL; @@ -921,7 +922,8 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriverPtr driv= er, qemuBlockJobSyncBegin(job); - if (flags & VIR_MIGRATE_TLS) { + if (flags & VIR_MIGRATE_TLS || + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { rc =3D qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm, disk, diskAlias, host, port, --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list