From nobody Thu Dec 18 03:57:05 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1658846325; cv=none; d=zohomail.com; s=zohoarc; b=IkmE/MPBjZOFwsWS1F9HR3o/8I9dxLy0tDd50yV5h3wt6nGL4Zv1S6BzKww6TA5mXAvDjwZp3aOfnH+Yr29OmH9bzbesQ3iUfsEh1W5rfxHkGxbdPIuxYSGW475G8NKe0tOGhk7Az2Cde6JpPhEFp1+/dPQDdNNYLnzAWaJRoyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846325; 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=y39TCInkjqWI8hgVRk+IfmBx7j+mQi+j75fWvoVgVUM=; b=K878xETK34J6yBibq+m0LU2gvWLbFNFzYpTLJSXx3fDFgVfZbmxASmnypWRYIjfNCTxlNQ8Cn3zqzW+17uhokD2HfthU4WzxLhtjEjDEtDsPKIp+Wo+LTBM7vzhRgIcyaG6qAnmI86SMaTMUkPwZoIm4DHDeEHnM5vcWJZnnXpc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1658846325728301.6154892377216; Tue, 26 Jul 2022 07:38:45 -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-43-caw9ejs2NPazUTQAle52FA-1; Tue, 26 Jul 2022 10:38:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 712748039AC; Tue, 26 Jul 2022 14:38:30 +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 5BFD7C28100; Tue, 26 Jul 2022 14:38:30 +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 D68101945D99; Tue, 26 Jul 2022 14:38:29 +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 DF1031945D9B for ; Tue, 26 Jul 2022 14:38:24 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C4A3E40CFD0A; Tue, 26 Jul 2022 14:38:24 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 413FB400DFD7 for ; Tue, 26 Jul 2022 14:38:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846324; 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=y39TCInkjqWI8hgVRk+IfmBx7j+mQi+j75fWvoVgVUM=; b=GePdrb2Hr2x4EAacMLEwo9cQYvKuTA489reyu9Db5+GDfDq4/KhEfPTdgq/SSOAnKjQil5 h5F3s/IIgbtKTlinkMCjdyosJ7EGq9/ZgZK2LJ/6VZt0sx+FR6qxBKBcV4tVEJVv+qO5fi MALxMGzYYAm614d4AmbjANbnMlEXD1w= X-MC-Unique: caw9ejs2NPazUTQAle52FA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 22/80] qemuMigrationSrcNBDStorageCopyBlockdev: Remove some arguments Date: Tue, 26 Jul 2022 16:37:00 +0200 Message-Id: <7c4168c5aee6dab813e83eaa575c75bf9c311e1e.1658843187.git.pkrempa@redhat.com> 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.85 on 10.11.54.8 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: 1658846326208100001 Content-Type: text/plain; charset="utf-8" We no longer need the arguments which were conditionally filled based on presence of the QEMU_CAPS_BLOCKDEV feature. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_migration.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ef24a1dedf..042e8bb10a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1025,9 +1025,6 @@ static int qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver, virDomainObj *vm, virDomainDiskDef *disk, - const char *jobname, - const char *sourcename, - bool persistjob, const char *host, int port, const char *socket, @@ -1041,6 +1038,10 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver= *driver, qemuDomainDiskPrivate *diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); int mon_ret =3D 0; g_autoptr(virStorageSource) copysrc =3D NULL; + g_autofree char *diskAlias =3D qemuAliasDiskDriveFromDisk(disk); + + if (!diskAlias) + return -1; VIR_DEBUG("starting blockdev mirror for disk=3D%s to host=3D%s", disk-= >dst, host); @@ -1062,8 +1063,9 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver = *driver, mon_ret =3D qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm)= , data); if (mon_ret =3D=3D 0) - mon_ret =3D qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), jo= bname, persistjob, - sourcename, copysrc->nodeforma= t, + mon_ret =3D qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), di= skAlias, true, + qemuDomainDiskGetTopNodename(d= isk), + copysrc->nodeformat, mirror_speed, 0, 0, mirror_sha= llow, syncWrites); @@ -1109,9 +1111,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driv= er, qemuBlockJobSyncBegin(job); rc =3D qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm, - disk, diskAlias, - qemuDomainDiskGetTopNodena= me(disk), - true, + disk, host, port, socket, mirror_speed, mirror_shallow, --=20 2.36.1