From nobody Mon May 6 09:00:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.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=1575655817; cv=none; d=zohomail.com; s=zohoarc; b=LTq1xXjr+s7mFRY4bAWGcn5e8U7SWhVWYazbLzrt0RUbOc2Hoh87onaOal0mzhm4/JCrRYUDST0FtzfxV7qNmyLhv+XBvfNcyxl7X9Ey8LHGmAjt2EvlL/Nsyzg/J4p8kMCA+YyQN88z9ddFmk26NrQ1o7bEz/uevJWgM1J8Sco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575655817; 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=FHNCZfgGtqNn4EeMMQELz+3topzN/7vgfkv94Td168c=; b=Kf3U2T4VbM5Pk55RfoUV2PEVWTVAAbMSsngM2gO4E5S9Lsh66OSo3e+T5anjYuVqH+HpTeOVBOOxQJoQZDrn71NoF+ZQX3b5/2RmTSlzf/DRDVRxKVsHIJ68kPkC0C9ADnodvavgZxGZr6AAikYn1rqVXNLJl0hJwMz5fsbo12Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 157565581761714.720139219564885; Fri, 6 Dec 2019 10:10:17 -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-398-Fmsg7rkpMEWNP7XbQBk3sg-1; Fri, 06 Dec 2019 13:10:12 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94C4B801E7A; Fri, 6 Dec 2019 18:10:07 +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 5DCB260BF4; Fri, 6 Dec 2019 18:10:07 +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 DC36618089CF; Fri, 6 Dec 2019 18:10:06 +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 xB6I9sZ7000627 for ; Fri, 6 Dec 2019 13:09:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id C3BA75DA32; Fri, 6 Dec 2019 18:09:54 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B4BD5D9E2 for ; Fri, 6 Dec 2019 18:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575655814; 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=FHNCZfgGtqNn4EeMMQELz+3topzN/7vgfkv94Td168c=; b=H80/CFaIS7emv8lWO6quG7vC3ax37pmfAPR8mT7bHOc8nmHWCyyZL+jW0r/k/uluW24/wF kIJUHFJ+E/RSKdSiX8OsDnLTHR1F9Jbh1KH/ypCj5JPjj1DhLoyZdTFG/V05hNE5CZ7aIl lHKvzdpPP1tFa1NnkmT6NWtscXuwz5k= From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 6 Dec 2019 19:09:43 +0100 Message-Id: <888cc9837dd940bc75c01faedcc60b875103b610.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 1/8] qemu: migration: Simplify handling of 'diskAlias' when adding NBD exports 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.12 X-MC-Unique: Fmsg7rkpMEWNP7XbQBk3sg-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" Declare the variable inside the loop with automatic clearing. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index dabdda2715..af22dfb48d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -377,7 +377,6 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, int ret =3D -1; qemuDomainObjPrivatePtr priv =3D vm->privateData; unsigned short port =3D 0; - char *diskAlias =3D NULL; size_t i; virStorageNetHostDef server =3D { .name =3D (char *)listenAddr, /* cast away const */ @@ -392,6 +391,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk =3D vm->def->disks[i]; + g_autofree char *diskAlias =3D NULL; /* check whether disk should be migrated */ if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) @@ -404,7 +404,6 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, goto cleanup; } - VIR_FREE(diskAlias); if (!(diskAlias =3D qemuAliasDiskDriveFromDisk(disk))) goto cleanup; @@ -433,7 +432,6 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, ret =3D 0; cleanup: - VIR_FREE(diskAlias); if (ret < 0 && nbdPort =3D=3D 0) virPortAllocatorRelease(port); return ret; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 09:00:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1575655807; cv=none; d=zohomail.com; s=zohoarc; b=A0/y7XGEaR0BILyX8kvJm+z38j0DjkKwyxG6nVlE4twjIG88qGe5Y4x4dm7BJpU/x/+sC0yZA3BQroF9LMuJHfIogk+BXI6kG7gU146bWmMjQUGKJi12hGXEgY/epKzyMN12Mq3IZBwACqum930YU493MdJ5wdTEUzn1ofd0C9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575655807; 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=nTpdtPibJJFnk9DonN4qgE8R+82IyDJW/+yoJy+ebzs=; b=A6L1UFvyNZKvzZ+yZqdMC3EeDLz3WSuvCgzIMkB3MADGr0EfacZ5Ih/mLVp6AP4pSD6/vk1ufGJLIReuQlNuH4WuSEcn9l5KBtHKIhW17J2MTwpks+ZADOqEj9aVuQrU+z5RR3Vk1ON6N+WUJebIHLNZb1blGp0roCmPyW5eGKM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1575655807783192.4915213303584; Fri, 6 Dec 2019 10:10:07 -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-204-qxzgm8CTO6qdrcwrp_nLKg-1; Fri, 06 Dec 2019 13:10:04 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 766EB800D5E; Fri, 6 Dec 2019 18:09:59 +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 4EC941000322; Fri, 6 Dec 2019 18:09:59 +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 D5CB66B51B; Fri, 6 Dec 2019 18:09:58 +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 xB6I9tHB000633 for ; Fri, 6 Dec 2019 13:09:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id 941165DA32; Fri, 6 Dec 2019 18:09:55 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C6065D9E2 for ; Fri, 6 Dec 2019 18:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575655806; 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=nTpdtPibJJFnk9DonN4qgE8R+82IyDJW/+yoJy+ebzs=; b=BPpiE7YtXVFxRi7prdobBQSPsfjpb6XwhT/5Sf2U18kgtB+woQYybPZ6cq2HFSdexwq0Zm 1K8aW4yxQ7ENXyMNsc0bDfNza8Mvog05QVpSvkpzzJAskgFgWpWZ3orOVOj4ge+X3nxzIk lw2wP30/j/Vyu/wwg0aGEyyeag2TzGA= From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 6 Dec 2019 19:09:44 +0100 Message-Id: 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 2/8] qemu: migration: Properly export backend for NBD 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: qxzgm8CTO6qdrcwrp_nLKg-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" With -blockdev we must use the nodename as the export but we must keep the name of the export as it was before to ensure compatiblity. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index af22dfb48d..2416dbe432 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -392,6 +392,8 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk =3D vm->def->disks[i]; g_autofree char *diskAlias =3D NULL; + const char *exportname =3D NULL; + const char *devicename =3D NULL; /* check whether disk should be migrated */ if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) @@ -407,6 +409,14 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, if (!(diskAlias =3D qemuAliasDiskDriveFromDisk(disk))) goto cleanup; + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { + exportname =3D diskAlias; + devicename =3D disk->src->nodeformat; + } else { + exportname =3D NULL; + devicename =3D diskAlias; + } + if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN) < = 0) goto cleanup; @@ -422,7 +432,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, goto exit_monitor; } - if (qemuMonitorNBDServerAdd(priv->mon, diskAlias, NULL, true, NULL= ) < 0) + if (qemuMonitorNBDServerAdd(priv->mon, devicename, exportname, tru= e, NULL) < 0) goto exit_monitor; if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 09:00:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1575655821; cv=none; d=zohomail.com; s=zohoarc; b=cBXN3/HHtNE1PWFMGG7WzL+WELJw6Bm0RLOeNeP335b/j2wwWGYw8CaMEcen85oG07D9Olagg/W+TZLbuwff10bsWYFBHwcxybcjgwflsqewDQBTclQUmHoRs85Fv5UY34FwLtsLpdrvmmERw//HHrswwMJOJxFnef884PPVT0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575655821; 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=/orXMj1JIXKWEeqBH0CWKhdyTRtxLtX/bzmtpcwcs98=; b=X/1v3tQ5J+w0fQgHegj2PSyF9oKT33GQ6JiN+tR7aygYNi+8CtPL0bBU4g7KOHdbX5xQtWpB6Yb+M7khTw1GmwXFiHrg/ukHeFx6+aHZuK4lT9XsabIPMdwfI3tLrC8iUIayjoFk0oerTNKM+KUDD3WidOw3bMeZs4kbHCAKNfI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 15756558217420.084898548083288; Fri, 6 Dec 2019 10:10:21 -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-277-19Sos00mMm61TuWon9Ipbg-1; Fri, 06 Dec 2019 13:10:19 -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 375A19123D; Fri, 6 Dec 2019 18:10:12 +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 031F05D6D0; Fri, 6 Dec 2019 18:10:12 +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 9B4FD6B51A; Fri, 6 Dec 2019 18:10:11 +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 xB6I9uOg000643 for ; Fri, 6 Dec 2019 13:09:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id 642E25DA32; Fri, 6 Dec 2019 18:09:56 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id E16985D9E2 for ; Fri, 6 Dec 2019 18:09:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575655820; 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=/orXMj1JIXKWEeqBH0CWKhdyTRtxLtX/bzmtpcwcs98=; b=JLANrgFsDnKndTSx/locRuJw3CKjKc4qFgnaIJtd1OUh2PgxDO4NM+GXPRBD2xuQuiMqHE mPzU3R37OaxeKt496iYIfmRt2K+NGoS8m6zldeXBue1E15xNZDdnfkVW7i6lWxONULlsQH PabLGqkIz47j4djkhuf8We3Zf+oNE4Q= From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 6 Dec 2019 19:09:45 +0100 Message-Id: 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 3/8] qemu: migration: Access job name from job struct 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: 19Sos00mMm61TuWon9Ipbg-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" qemuMigrationSrcNBDCopyCancelOne uses the block job data structure but generated it's own job name rather than taking it from the block job data. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2416dbe432..b14a1bcd15 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -649,7 +649,6 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr drive= r, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - char *diskAlias =3D NULL; int ret =3D -1; int status; int rv; @@ -668,13 +667,10 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr dri= ver, goto cleanup; } - if (!(diskAlias =3D qemuAliasDiskDriveFromDisk(disk))) - return -1; - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) goto cleanup; - rv =3D qemuMonitorBlockJobCancel(priv->mon, diskAlias); + rv =3D qemuMonitorBlockJobCancel(priv->mon, job->name); if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) goto cleanup; @@ -682,7 +678,6 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr drive= r, ret =3D 0; cleanup: - VIR_FREE(diskAlias); return ret; } --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 09:00:02 2024 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=1575655825; cv=none; d=zohomail.com; s=zohoarc; b=Rs6AYFW8TpaDIQZJq0Y79sY9JXa5VydEQbo43T7jcwoX5FCAJn27XfIt/+Q8DskVKxslyur5D44Scz6aTiBNGjXTA5ZSZoawCQK/zPdROstppUcIvk3yOuz/YgHM8VXXORMV1sstN46A/phR67dPe/8YvfHi1K48stGJYj3EkXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575655825; 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=MrGax/lBFxZ81k25Gg9uRDjYFR2E1AT0dKSBqt644w8=; b=COmCG1X24Q3sX+XQfRrugGVmsNfrrx+CsuR9DTWM+wSpFcKKL5bGQzHE+I9U41DSarXmTWseRD0v4nD8NDwQl/Voic/hkebF41xKSDX5F2gX1Zo+8D4oZcmdkiVGgpX6v96HqlgyIexGu14kO90K46fAcLxpb8unTz9Vdn6uRpk= 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 1575655825302332.733831948068; Fri, 6 Dec 2019 10:10:25 -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-359-3lEETvLJPNCs0TF8g_oc0w-1; Fri, 06 Dec 2019 13:10:22 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 984CC190D345; Fri, 6 Dec 2019 18:10:16 +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 6AD015D9E2; Fri, 6 Dec 2019 18:10:16 +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 211F36B54E; Fri, 6 Dec 2019 18:10:16 +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 xB6I9vAA000655 for ; Fri, 6 Dec 2019 13:09:57 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3439A5DA32; Fri, 6 Dec 2019 18:09:57 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id B1B605D9E2 for ; Fri, 6 Dec 2019 18:09:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575655824; 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=MrGax/lBFxZ81k25Gg9uRDjYFR2E1AT0dKSBqt644w8=; b=VHeW8YUgQYUrAHD1oBqMG8KL39JOX5eKFZIoyFsFiWNIPL/kEE2DwdwptedAVLY5DRspfh a/UtzU30tb51GkSc3fO+wejJjLTnRYcMUoHX++3yujmTpZ+evZAJaQcWLLh7N63peCBqR1 PzBMTj5p2DPehpRWk4pV7I908mQmLR8= From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 6 Dec 2019 19:09:46 +0100 Message-Id: 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 4/8] qemu: migration: Simplify cleanup in qemuMigrationSrcNBDCopyCancelOne 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.14 X-MC-Unique: 3lEETvLJPNCs0TF8g_oc0w-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" Now that the cleanup section does not exist remove the label. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b14a1bcd15..9062be38ab 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -649,7 +649,6 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr drive= r, qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv =3D vm->privateData; - int ret =3D -1; int status; int rv; @@ -659,26 +658,22 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr dri= ver, case VIR_DOMAIN_BLOCK_JOB_CANCELED: if (failNoJob) { qemuMigrationNBDReportMirrorError(job, disk->dst); - goto cleanup; + return -1; } G_GNUC_FALLTHROUGH; case VIR_DOMAIN_BLOCK_JOB_COMPLETED: - ret =3D 1; - goto cleanup; + return 1; } if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) - goto cleanup; + return -1; rv =3D qemuMonitorBlockJobCancel(priv->mon, job->name); if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0) - goto cleanup; - - ret =3D 0; + return -1; - cleanup: - return ret; + return 0; } --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 09:00:02 2024 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=1575655866; cv=none; d=zohomail.com; s=zohoarc; b=H3YrMy7tO7epTFTEshbcmQmKPzl3A9440HDUhENyfj4FBRO8wcViDC2FchrRzSnugzayNlaHlhyvlAZUao3CaQQ4Yo1PLfz41796KsMvq++rW1HRy63ZJy9kda/4NvLgiQFR9FIXd8hmy/eTvXNoNplHZoiMzVjl5B5n9DmccN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575655866; 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=ByiWMpXgt/oBhtml1a41mf3v43tyBqTjIXYFyuMIL08=; b=RSoLSEbVlrxutCfv+xVSZWX2ebtMRymZVxI9aod1/L5xh49FSkoO74Q7orWioQS8p6PRr75WQxhGnLx0h7L1R7MO2RzooGepc4WfsRwyLApZo+6Oxo5Y9dHTE7eOOBtN+txM9Ntn8gFB2/uyYqQg1mhAMRRd+xheQqgeZ6ytc7I= 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 1575655866617490.9432268480075; Fri, 6 Dec 2019 10:11:06 -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-311-GL5vP9kgOD60XyNs9W5d_g-1; Fri, 06 Dec 2019 13:10:27 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 04D8E800C76; Fri, 6 Dec 2019 18:10:21 +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 CE6366B8F9; Fri, 6 Dec 2019 18:10:20 +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 7B2A618089CE; Fri, 6 Dec 2019 18:10:20 +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 xB6I9wjA000661 for ; Fri, 6 Dec 2019 13:09:58 -0500 Received: by smtp.corp.redhat.com (Postfix) id 059C85DA32; 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 8283D5D9E2 for ; Fri, 6 Dec 2019 18:09:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575655865; 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=ByiWMpXgt/oBhtml1a41mf3v43tyBqTjIXYFyuMIL08=; b=PZ4m3JN1CISr0r/QQbsatyLdUtPfvSYa2qVenk2RARwDekT+foXdpAXaZqH2kh9dfkadT/ +Re1tUu1JG4NOgQ4ZrPagDWMym8GWGB4aKzG/nh7RxVBWF4McBohyZcaVKv4I5JXzGDijB QhmMzrUverhNeMcNKpOUA6A+aePxgL8= From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 6 Dec 2019 19:09:47 +0100 Message-Id: <50c2f96ed83a27743d58415cc5e9736b5e0d4547.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 5/8] qemu: blockjob: Allow NULL 'mirror' for block copy jobs due to 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: , 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-MC-Unique: GL5vP9kgOD60XyNs9W5d_g-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" The non-shared-storage migration tracks the storage source used explicitly in the migration data so we must allow for processing of the block job which has NULL mirror as the mirror will not be populated. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_blockjob.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index baa79ea80c..2773acc990 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -1139,7 +1139,9 @@ qemuBlockJobProcessEventConcludedCopyPivot(virQEMUDri= verPtr driver, { VIR_DEBUG("copy job '%s' on VM '%s' pivoted", job->name, vm->def->name= ); - if (!job->disk) + /* mirror may be NULL for copy job corresponding to migragion */ + if (!job->disk || + !job->disk->mirror) return; /* for shallow copy without reusing external image the user can either= not @@ -1166,7 +1168,9 @@ qemuBlockJobProcessEventConcludedCopyAbort(virQEMUDri= verPtr driver, { VIR_DEBUG("copy job '%s' on VM '%s' aborted", job->name, vm->def->name= ); - if (!job->disk) + /* mirror may be NULL for copy job corresponding to migragion */ + if (!job->disk || + !job->disk->mirror) return; qemuBlockJobEventProcessConcludedRemoveChain(driver, vm, asyncJob, job= ->disk->mirror); @@ -1383,7 +1387,8 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, break; case QEMU_BLOCKJOB_STATE_READY: - if (job->disk && job->disk->mirror) { + /* mirror may be NULL for copy job corresponding to migragion */ + if (job->disk) { job->disk->mirrorState =3D VIR_DOMAIN_DISK_MIRROR_STATE_READY; qemuBlockJobEmitEvents(driver, vm, job->disk, job->type, job->= newstate); } --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 09:00:02 2024 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 From nobody Mon May 6 09:00:02 2024 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=1575655825; cv=none; d=zohomail.com; s=zohoarc; b=CI+wUoPTOQrHvesCVrFB9PGsXMzUR+tdvbRIueAVqWOZ6BUhspdRW5cvsVgEddPDoVf73GJ4F7ZYigzcQ1KJj3XpFiwKpcX+CaeoIT15iNhxjUaMpNhj6mluxNesCd+DiU63q8F5lT1fJ95LzFG7kwcyrSicgGVarCdLxQqr/0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575655825; 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=0/Ahet/xSna4Epx1vsWn68U0yXqXmjfS9K2ULxkigq8=; b=lvvJL5D/NKI+S8N5q24kg0dDhYF0BnuZO5i1g7LW3sqIwhRv8HZlBqmQUGcnT9o+JR9jYMTGgCEnSspzTYqu8s3FgqmFrOevMld7zj7aDHa7e6MonNs7B3lwXV6hBugxfB8azq4AAdQ94c/4I7xc7ath4vk31rLUjM7hBobchyc= 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 1575655825470100.96552077163494; Fri, 6 Dec 2019 10:10:25 -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-357-WAVAnuC0N22ivjHuVinhUA-1; Fri, 06 Dec 2019 13:10:22 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A2F39801E79; Fri, 6 Dec 2019 18:10:12 +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 6D5611001B2D; Fri, 6 Dec 2019 18:10:12 +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 1A1116B529; Fri, 6 Dec 2019 18:10:12 +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 xB6I9xSf000680 for ; Fri, 6 Dec 2019 13:09:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9BE275D9E2; Fri, 6 Dec 2019 18:09:59 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 250ED5D9E1 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=1575655824; 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=0/Ahet/xSna4Epx1vsWn68U0yXqXmjfS9K2ULxkigq8=; b=agKb9eWEndu8JZZEDKqByTQsnUeyasnAU2/BjpOaUoxHz5StzcCNE/MoPmOrhl8ZId8odR PZ+QwOQlsSBvbZRPe2uiClyTf/WwmntpTluJKV4bPKx4eVyXY06aQafotMcWCgB+hF5i0Y BBeTzpVlQ+RX7Z4cmOhl4BzgdL9C9AU= From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 6 Dec 2019 19:09:49 +0100 Message-Id: <3e3de3ea2df5ecfa756e925fa5d01d4d5fd55e92.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 7/8] qemu: migration: Mention disk target rather than the drive name in debug msg 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.84 on 10.5.11.22 X-MC-Unique: WAVAnuC0N22ivjHuVinhUA-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" Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8bf23e9f30..27023c94b1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -829,7 +829,7 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr= driver, 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); + VIR_DEBUG("starting blockdev mirror for disk=3D%s to host=3D%s", disk-= >dst, host); if (!(copysrc =3D qemuMigrationSrcNBDStorageCopyBlockdevPrepareSource(= disk, host, port, tlsAlias))) return -1; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 09:00:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1575655818; cv=none; d=zohomail.com; s=zohoarc; b=TgWYG7ygRvKu5Ny8/tM0Pq73N4orvi5RILg/Sox4Rs1gcBZiEmp2a9tKDfWEJqUbgz1esLhk81V60gLBAUoaHJI+25N7vHGbUFJmAgr7y8SlHU2bfZpjV6JJ7L7/ip63nWLIvM1vjq5FDXt6lsw7DORYXUW13RkIlON72xwjrug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575655818; 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=lSIao+fw1wL9r1Wq1TV+LOtpfsIrB+E7DVrQgJJloe0=; b=E5Pg6scpUkGdEo5vjQod40FS0+25rkEVJKbTegkJ16bfURGLi+cYRzI1nmhJ8Jtw1S4TdRB8nL7znCTrrRQhEzP8vc/mt4xgMbkiydoeePKdHdY1OZiIohXDStPU8+wNxtwlEpVHC4h8KcVVKmL3bPpcLf6GUGnQxQQ6KcERYmo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1575655818420856.3227783121231; Fri, 6 Dec 2019 10:10:18 -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-175--uAHrwmiMseXx8rgMTLPeQ-1; Fri, 06 Dec 2019 13:10:15 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4088107ACFB; 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 8991F694A3; 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 3604418089D7; Fri, 6 Dec 2019 18:10:08 +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 xB6IA0hE000695 for ; Fri, 6 Dec 2019 13:10:00 -0500 Received: by smtp.corp.redhat.com (Postfix) id 6DF6A5D9E2; Fri, 6 Dec 2019 18:10:00 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id E901D5D9E1 for ; Fri, 6 Dec 2019 18:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575655817; 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=lSIao+fw1wL9r1Wq1TV+LOtpfsIrB+E7DVrQgJJloe0=; b=a1VJt9qIVPV/0aEb5pb0il4L33XDVn9hg/ybm5KGuZzNmmEkVv6VrdhDf+SB3xJoSOim2j c8zOHuGqdvfMSTDst1tEEyJQH7dtKDpVKHV0u9rshjViFMkxNMTH1dHYdEKQj5SO6sEXuy djfKACEKlI8yU87SybU06N6Vt+GRypU= From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 6 Dec 2019 19:09:50 +0100 Message-Id: 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 8/8] qemu: migration: Properly setup mirror for blockdev configurations 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.13 X-MC-Unique: -uAHrwmiMseXx8rgMTLPeQ-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" With blockdev we need to refer to the nodename of the disk source image as the source argument for the blockdev-mirror operation while still keeping the old job name. With blockdev we must also persist the job in qemu. Signed-off-by: Peter Krempa Reviewed-by: Eric Blake --- src/qemu/qemu_migration.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 27023c94b1..6dfcd5a642 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -817,7 +817,9 @@ static int qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDiskDefPtr disk, - const char *diskAlias, + const char *jobname, + const char *sourcename, + bool persistjob, const char *host, int port, unsigned long long mirror_speed, @@ -848,8 +850,8 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriverPtr= driver, mon_ret =3D qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm)= , data); if (mon_ret =3D=3D 0) - mon_ret =3D qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), NU= LL, false, - diskAlias, copysrc->nodeformat, + mon_ret =3D qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), jo= bname, persistjob, + sourcename, copysrc->nodeforma= t, mirror_speed, 0, 0, mirror_sha= llow); if (mon_ret !=3D 0) @@ -914,6 +916,9 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriverPtr driv= er, qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); qemuBlockJobDataPtr job =3D NULL; char *diskAlias =3D NULL; + const char *jobname =3D NULL; + const char *sourcename =3D NULL; + bool persistjob =3D false; int rc; int ret =3D -1; @@ -923,12 +928,23 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriverPtr dr= iver, if (!(job =3D qemuBlockJobDiskNew(vm, disk, QEMU_BLOCKJOB_TYPE_COPY, d= iskAlias))) goto cleanup; + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { + jobname =3D diskAlias; + sourcename =3D disk->src->nodeformat; + persistjob =3D true; + } else { + jobname =3D NULL; + sourcename =3D diskAlias; + persistjob =3D false; + } + qemuBlockJobSyncBegin(job); if (flags & VIR_MIGRATE_TLS || virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { rc =3D qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm, - disk, diskAlias, + disk, jobname, + sourcename, persistjob, host, port, mirror_speed, mirror_shallow, --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list