From nobody Mon Feb 9 06:26:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1575655869; cv=none; d=zohomail.com; s=zohoarc; b=JMVnEEw8SjAZQfno64B8haIGFOsARuHALD29+U8xmxcSkERdh1cDgB8o5NSOHQTpzDtKhc85GGSH4KD7Q8vENfwQHblBFo3AqaceaaPUH+Yl4ZUVRLAqFs7m9ccSE+hq4rpyEus0PFoLri+QQEnap6f8muQgIHI9GRwsXXGq4j8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575655869; 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; bh=AJUsbBfVlByuVVQiGQv6vjvF0DwQOg3Fz0Gl6+bInUI=; b=ZJ0gq8FCGHpAVlgy3APVTNXMtueWe0SDfMlr28+K8wy236eEK0j9AADt56DZAKmunyeedWtUODZYms6m5pDxHR6aUi8m+2Ch7cQ+aKLWuh6XLBTD1rKKY31vu53vtoIdiLwcu/BCw/HhWGWuN53Ttb1LDWKJsY6zeNe6zp0i0d8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1575655869177730.883400797401; Fri, 6 Dec 2019 10:11:09 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-25-TWJ9Y9WuNfe7JZPMaRzCPw-1; Fri, 06 Dec 2019 13:10:16 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4281D91230; Fri, 6 Dec 2019 18:10:08 +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 180285D6C3; Fri, 6 Dec 2019 18:10:08 +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 BABBF18089D5; Fri, 6 Dec 2019 18:10:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB6I9wHQ000666 for ; Fri, 6 Dec 2019 13:09:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id CB12A5DA60; Fri, 6 Dec 2019 18:09:58 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 544625DA32 for ; Fri, 6 Dec 2019 18:09:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575655868; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=AJUsbBfVlByuVVQiGQv6vjvF0DwQOg3Fz0Gl6+bInUI=; b=ZFAsOj0dlusXkmNHfw7SQK1H/BHBVELTwKoQ9vqpy44pX7blHX+bu1V+jUsl3naNatU+R5 O2ZOSgOwuLZQtROJ3KuZT/jWeKfY4NuIXFDfLtwCT8FoXzW2ocT0SNnSxFB4IWkv52wg71 +O4OH7V8j3e5a7GrrVLYfRzTV+FKRok= From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 6 Dec 2019 19:09:48 +0100 Message-Id: <437c642614a354b3f3737ad11f20fcff6c4d6aa4.1575655650.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/8] qemu: migration: Split out setup of the migration target 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: , 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-MC-Unique: TWJ9Y9WuNfe7JZPMaRzCPw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Separate out allocation of the virStorageSource corresponding to the target NBD export of the migration. As part of the splitout we allocate the export name explicitly as that one must not change regardless whether blockdev is used or not to provide compatibility. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 55 +++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 9062be38ab..8bf23e9f30 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -776,38 +776,28 @@ qemuMigrationSrcNBDCopyCancel(virQEMUDriverPtr driver, } -static int -qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virDomainDiskDefPtr disk, - const char *diskAlias, - const char *host, - int port, - unsigned long long mirror_speed, - unsigned int mirror_shallow, - const char *tlsAlias) +static virStorageSourcePtr +qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(virDomainDiskDefPtr di= sk, + const char *host, + int port, + const char *tlsAlias) { - g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; - qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); - int mon_ret =3D 0; g_autoptr(virStorageSource) copysrc =3D NULL; - VIR_DEBUG("starting blockdev mirror for disk=3D%s to host=3D%s", diskA= lias, host); - if (!(copysrc =3D virStorageSourceNew())) - return -1; + return NULL; 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())) - return -1; + return NULL; - copysrc->path =3D g_strdup(diskAlias); + if (!(copysrc->path =3D qemuAliasDiskDriveFromDisk(disk))) + return NULL; - if (VIR_ALLOC_N(copysrc->hosts, 1) < 0) - return -1; + copysrc->hosts =3D g_new0(virStorageNetHostDef, 1); copysrc->nhosts =3D 1; copysrc->hosts->transport =3D VIR_STORAGE_NET_HOST_TRANS_TCP; @@ -819,6 +809,31 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPt= r driver, copysrc->nodestorage =3D g_strdup_printf("migration-%s-storage", disk-= >dst); copysrc->nodeformat =3D g_strdup_printf("migration-%s-format", disk->d= st); + return g_steal_pointer(©src); +} + + +static int +qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainDiskDefPtr disk, + const char *diskAlias, + const char *host, + int port, + unsigned long long mirror_speed, + unsigned int mirror_shallow, + const char *tlsAlias) +{ + g_autoptr(qemuBlockStorageSourceAttachData) data =3D NULL; + qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); + int mon_ret =3D 0; + g_autoptr(virStorageSource) copysrc =3D NULL; + + VIR_DEBUG("starting blockdev mirror for disk=3D%s to host=3D%s", diskA= lias, host); + + if (!(copysrc =3D qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(= disk, host, port, tlsAlias))) + 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, --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list