From nobody Mon Feb 9 00:55:51 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1602669875; cv=none; d=zohomail.com; s=zohoarc; b=daXEh4Dfs6Z+wAnaWrOQpn2rrjWfwlgUI8SQfPZ7ZhpNdb2nv74G8QLX4wMF1Jb1hEMxhnCGP23OkmVAajiBf0iUrZs5lkptjdq/FUKX5r+AjYm24uuf9/VSWOTOGSV5D9ESmcAo74KcvgJkv9aUHtqJKwzSiDQURpaYVs+wtt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602669875; 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=8f21Vy+C6has4IhPEJtVJvbgesAUEfqBOtc0/3y3iec=; b=bQ1VxJCuuOvVf4xWHt1TptQ4LmPNSx/fdaAmC/XFwuA/wnKY4l4YEwhBOdEt+3n3Dmcu2/yhBeTL9XCnb4X/Hj9OD88JaAzRW86PGvjAMH3/xYMgoxVKN7Y63N8IzlsWPLCdtUxdljrv1adoGewgPcqH7v0Lp+uc5D2zSdQJN3g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602669875705623.2888087712208; Wed, 14 Oct 2020 03:04:35 -0700 (PDT) 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-172-fagGPYZhO_G0Q8B_D2cUhA-1; Wed, 14 Oct 2020 06:04:32 -0400 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 DEF5264089; Wed, 14 Oct 2020 10:04:26 +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 BC13273661; Wed, 14 Oct 2020 10:04: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 80DCD181A07B; Wed, 14 Oct 2020 10:04:26 +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 09EA48eL001913 for ; Wed, 14 Oct 2020 06:04:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9501C5D9D3; Wed, 14 Oct 2020 10:04:08 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFAE45D9CD for ; Wed, 14 Oct 2020 10:04:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602669874; 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=8f21Vy+C6has4IhPEJtVJvbgesAUEfqBOtc0/3y3iec=; b=K+Plb1Q92BRmWkFV9N0yOLGEC2ZZMkDoG3Gz3EF8/nvoJtvx2Q1RJxjNJzuzBxb1UFoMdT 3iRliApsIDWKXtFI4MtC6d5VhCbiGSvXXOsUP9OOlQJc3ofnah6Mc6q5udsusiI6PAndIM MCzVSS3MPeNx/hpf3BuUtgQbBGag0Po= X-MC-Unique: fagGPYZhO_G0Q8B_D2cUhA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/6] qemu: block: Extract code for adding NBD exports to 'qemuBlockExportAddNBD' Date: Wed, 14 Oct 2020 12:03:57 +0200 Message-Id: <0030aef6f330c284d23e261daea914ea15990f86.1602669776.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 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Centralize the logic deciding which arguments to use when exporting a block backend via NBD to a single place so that it can be centrally fixed in upcoming commits to support the new export method via 'block-export-add'. Additionally this allows simplification of the caller from migration as the logic deciding which arguments to use is extracted too. Signed-off-by: Peter Krempa --- src/qemu/qemu_backup.c | 11 +++++------ src/qemu/qemu_block.c | 38 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_block.h | 8 ++++++++ src/qemu/qemu_migration.c | 12 +----------- 4 files changed, 52 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 4e61a5e52b..5376d9485d 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -502,7 +502,6 @@ qemuBackupBeginPullExportDisks(virDomainObjPtr vm, struct qemuBackupDiskData *disks, size_t ndisks) { - qemuDomainObjPrivatePtr priv =3D vm->privateData; size_t i; for (i =3D 0; i < ndisks; i++) { @@ -511,11 +510,11 @@ qemuBackupBeginPullExportDisks(virDomainObjPtr vm, if (!dd->backupdisk->exportname) dd->backupdisk->exportname =3D g_strdup(dd->domdisk->dst); - if (qemuMonitorNBDServerAdd(priv->mon, - dd->store->nodeformat, - dd->backupdisk->exportname, - false, - dd->incrementalBitmap) < 0) + if (qemuBlockExportAddNBD(vm, NULL, + dd->store, + dd->backupdisk->exportname, + false, + dd->incrementalBitmap) < 0) return -1; } diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 6bea21347a..0be612eb1f 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -3363,3 +3363,41 @@ qemuBlockUpdateRelativeBacking(virDomainObjPtr vm, return 0; } + + +/** + * qemuBlockExportAddNBD: + * @vm: domain object + * @drivealias: (optional) alias of -drive to export in pre-blockdev confi= gurations + * @src: disk source to export + * @exportname: name for the export + * @writable: whether the NBD export allows writes + * @bitmap: (optional) block dirty bitmap to export along + * + * This function automatically selects the proper invocation of exporting a + * block backend via NBD in qemu. This includes use of nodename for blockd= ev + * and proper configuration for the exportname for older qemus. + * + * This function must be called while in the monitor context. + */ +int +qemuBlockExportAddNBD(virDomainObjPtr vm, + const char *drivealias, + virStorageSourcePtr src, + const char *exportname, + bool writable, + const char *bitmap) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + const char *exportsrc =3D drivealias; + + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { + exportsrc =3D src->nodeformat; + } else { + /* older qemu versions didn't support configuring the exportname a= nd + * took the 'drivealias' as the export name */ + exportname =3D NULL; + } + + return qemuMonitorNBDServerAdd(priv->mon, exportsrc, exportname, writa= ble, bitmap); +} diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 0701fc18d1..0fc95fa6f6 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -276,3 +276,11 @@ int qemuBlockUpdateRelativeBacking(virDomainObjPtr vm, virStorageSourcePtr src, virStorageSourcePtr topsrc); + +int +qemuBlockExportAddNBD(virDomainObjPtr vm, + const char *drivealias, + virStorageSourcePtr src, + const char *exportname, + bool writable, + const char *bitmap); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 4e959abebf..132545c99f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -445,8 +445,6 @@ 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)) @@ -462,14 +460,6 @@ 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 (!server_started && server.transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP) { if (server.port) { @@ -493,7 +483,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, qemuMonitorNBDServerStart(priv->mon, &server, tls_alias) < 0) goto exit_monitor; - if (qemuMonitorNBDServerAdd(priv->mon, devicename, exportname, tru= e, NULL) < 0) + if (qemuBlockExportAddNBD(vm, diskAlias, disk->src, diskAlias, tru= e, NULL) < 0) goto exit_monitor; if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; --=20 2.26.2