From nobody Mon Dec 15 23:05:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1658846483; cv=none; d=zohomail.com; s=zohoarc; b=l4+GniG82GU6fVJbkTZoUfElqPHHs1WlOVwiWX0vgn4WDAcj+DJLtEoMVKPr7us1rfsKgt7ilFU5bktOFL1ql/QYgxP0+zVPromkdgiIGs0zOEECz9EFYMaLXYRUqMbfP/0vKJTSUYhKteGX40IWxFzrLDPmvryZuqGWuTXga90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846483; 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=dEj7x+A+gTib3adJGOzunA9uEFupEEj2IK2ajSVsgN0=; b=IhM3JB7xRaC4SNmgTJfsBAkuyW0cZQfz4gjbDnGW2WuB3YlPusQl1MqSAqUr0Jx1ijMmjOyIlxzq8VVCBf5qrrAjRc8s5ESV0PgIqJv+klb9gOwU7d2HDXahDaJHcUjEvUSY21Bi02nf4gRR2SbbyWBar727K1q98noHG9UxjGw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1658846482996662.7596062259965; Tue, 26 Jul 2022 07:41:22 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-67-ob5LMHFBMFKGCiso5LUfrQ-1; Tue, 26 Jul 2022 10:38:57 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1B08E8039AE; Tue, 26 Jul 2022 14:38:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 05A3B2026D07; Tue, 26 Jul 2022 14:38:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C2B471945DAD; Tue, 26 Jul 2022 14:38:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C1CB61945DAE for ; Tue, 26 Jul 2022 14:38:23 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B08E2400DFD7; Tue, 26 Jul 2022 14:38:23 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CBC5400EA8E for ; Tue, 26 Jul 2022 14:38:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846481; 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=dEj7x+A+gTib3adJGOzunA9uEFupEEj2IK2ajSVsgN0=; b=eGuXkyBKkf1OWdlbTP59QE2SRgyeRou93AIjT1UGC1zUH5jEVc+qNEOP3GbIOMF8OZD8yQ reVMydjP9NVGdIZRt/+dedQ+p7hOAtnSfLErXIgpRsTPIm/np1X1cQHMInlHgy+YDWAVNZ wOIYgSAG6XKzMVh9rnvXM52iJwHARRs= X-MC-Unique: ob5LMHFBMFKGCiso5LUfrQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 21/80] qemu: migration: Remove pre-blockdev code paths Date: Tue, 26 Jul 2022 16:36:59 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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) X-ZM-MESSAGEID: 1658846484231100003 Content-Type: text/plain; charset="utf-8" Assume that QEMU_CAPS_BLOCKDEV is present and remove all code executed when it's not. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_migration.c | 127 ++++++++------------------------------ 1 file changed, 25 insertions(+), 102 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8e9428a5bb..ef24a1dedf 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1080,46 +1080,6 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver= *driver, } -static int -qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriver *driver, - virDomainObj *vm, - const char *diskAlias, - const char *host, - int port, - const char *socket, - unsigned long long mirror_speed, - bool mirror_shallow) -{ - g_autofree char *nbd_dest =3D NULL; - int mon_ret; - - if (socket) { - nbd_dest =3D g_strdup_printf("nbd+unix:///%s?socket=3D%s", - diskAlias, socket); - } else if (strchr(host, ':')) { - nbd_dest =3D g_strdup_printf("nbd:[%s]:%d:exportname=3D%s", host, = port, - diskAlias); - } else { - nbd_dest =3D g_strdup_printf("nbd:%s:%d:exportname=3D%s", host, po= rt, - diskAlias); - } - - if (qemuDomainObjEnterMonitorAsync(driver, vm, - VIR_ASYNC_JOB_MIGRATION_OUT) < 0) - return -1; - - mon_ret =3D qemuMonitorDriveMirror(qemuDomainGetMonitor(vm), - diskAlias, nbd_dest, "raw", - mirror_speed, 0, 0, mirror_shallow, t= rue); - - qemuDomainObjExitMonitor(vm); - if (mon_ret < 0) - return -1; - - return 0; -} - - static int qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver, virDomainObj *vm, @@ -1133,13 +1093,9 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *dri= ver, const char *tlsHostname, unsigned int flags) { - qemuDomainObjPrivate *priv =3D vm->privateData; qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); qemuBlockJobData *job =3D NULL; g_autofree char *diskAlias =3D NULL; - const char *jobname =3D NULL; - const char *sourcename =3D NULL; - bool persistjob =3D false; bool syncWrites =3D !!(flags & VIR_MIGRATE_NON_SHARED_SYNCHRONOUS_WRIT= ES); int rc; int ret =3D -1; @@ -1150,35 +1106,18 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *dr= iver, if (!(job =3D qemuBlockJobDiskNew(vm, disk, QEMU_BLOCKJOB_TYPE_COPY, d= iskAlias))) return -1; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - jobname =3D diskAlias; - sourcename =3D qemuDomainDiskGetTopNodename(disk); - 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, jobname, - sourcename, persistjob, - host, port, socket, - mirror_speed, - mirror_shallow, - tlsAlias, - tlsHostname, - syncWrites); - } else { - rc =3D qemuMigrationSrcNBDStorageCopyDriveMirror(driver, vm, diskA= lias, - host, port, socket, - mirror_speed, - mirror_shallow); - } + rc =3D qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm, + disk, diskAlias, + qemuDomainDiskGetTopNodena= me(disk), + true, + host, port, socket, + mirror_speed, + mirror_shallow, + tlsAlias, + tlsHostname, + syncWrites); if (rc =3D=3D 0) { diskPriv->migrating =3D true; @@ -2687,41 +2626,25 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver, } if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)= ) { - if (flags & VIR_MIGRATE_NON_SHARED_SYNCHRONOUS_WRITES && - !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { + if (flags & VIR_MIGRATE_TUNNELLED) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("VIR_MIGRATE_NON_SHARED_SYNCHRONOUS_WRITES is= not supported by this QEMU")); - return NULL; + _("migration of non-shared storage is not suppo= rted with tunnelled migration and this QEMU")); } - if (flags & VIR_MIGRATE_TUNNELLED) { - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("migration of non-shared storage is not s= upported with tunnelled migration and this QEMU")); - return NULL; - } - - if (nmigrate_disks) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("Selecting disks to migrate is not implem= ented for tunnelled migration")); - return NULL; - } - } else { - if (nmigrate_disks) { - size_t i, j; - /* Check user requested only known disk targets. */ - for (i =3D 0; i < nmigrate_disks; i++) { - for (j =3D 0; j < vm->def->ndisks; j++) { - if (STREQ(vm->def->disks[j]->dst, migrate_disks[i]= )) - break; - } + if (nmigrate_disks) { + size_t i, j; + /* Check user requested only known disk targets. */ + for (i =3D 0; i < nmigrate_disks; i++) { + for (j =3D 0; j < vm->def->ndisks; j++) { + if (STREQ(vm->def->disks[j]->dst, migrate_disks[i])) + break; + } - if (j =3D=3D vm->def->ndisks) { - virReportError(VIR_ERR_INVALID_ARG, - _("disk target %s not found"), - migrate_disks[i]); - return NULL; - } + if (j =3D=3D vm->def->ndisks) { + virReportError(VIR_ERR_INVALID_ARG, + _("disk target %s not found"), + migrate_disks[i]); + return NULL; } } --=20 2.36.1