From nobody Tue Sep 9 03:19:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1749125956; cv=none; d=zohomail.com; s=zohoarc; b=Vcdlwu1s0XYH6f+CkrhCJKv4lBq+Xl6VXm0lgjYWthJhKxV/0MHsstjpByBT7fyOp7d5ryVB7Vyl3tB6EWEtxy+/EWEwedvGcYTV6zURkB3gxZWPHqCXqtz3wpDIPygCz5PH5X9TB8mb7M1WmmEbqrKji1wdvhcQ0CoFtfgNGiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749125956; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=tC87vZdrsEkJilobdpr0cyxmCHwT8eOouMmdZokLdSI=; b=TV7+rsAxHWpiF/GDjzBiXl0Otz2/suEkOM2SgcbsAg0FotOFLQkfYVbLLhb71Su59TMfHa3GVcj9dfI3I3q3lei7NOnn9qHmsQ3cvhd1iib5LvFbrfOC5kMhq8BotxoLCDoxHrDxnMGR8yTLpRehzmEaMKb4BYvBjORUXJshUUY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1749125956129488.8345007724954; Thu, 5 Jun 2025 05:19:16 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 0F4011569; Thu, 5 Jun 2025 08:19:15 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BDB5714AA; Thu, 5 Jun 2025 08:16:34 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C10DC142D; Thu, 5 Jun 2025 08:16:29 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id A044A142D for ; Thu, 5 Jun 2025 08:16:19 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-drTFq03SNx2l6mFMjJtaoA-1; Thu, 05 Jun 2025 08:16:18 -0400 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3E33418001E3 for ; Thu, 5 Jun 2025 12:16:17 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.3.236]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8840F1956087 for ; Thu, 5 Jun 2025 12:16:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749125779; h=from:from: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; bh=gSOSCZ7Ny3EAOfIK6eVISFe17Vhu0LvSgYNUKrLH2dI=; b=GG4rk3HyDQaHjKZQ1dNYEv1CZqx/qepSsGSiYSTtI6uQ1QwIj0WMJieQ8HrLvqB18T63z4 f/sN34Sd/6UUILBeJEyGKM4ndcNu7bR4lpL3QmLNf58vwgBzxHOXuuff6xGACLGIipttlc n4AMqb2gmpDOOBSt3UY5G3kMFt+d1/s= X-MC-Unique: drTFq03SNx2l6mFMjJtaoA-1 X-Mimecast-MFC-AGG-ID: drTFq03SNx2l6mFMjJtaoA_1749125777 To: devel@lists.libvirt.org Subject: [PATCH 05/10] src: Unify argument name of virDomainMigratePrepare3() Date: Thu, 5 Jun 2025 14:16:02 +0200 Message-ID: <5d875d27531708f778e6d87b6530421343fed08d.1749125656.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ubCFuh5qM2nulppNAWtAMqxEfwu_8s9Gfl3E-Rwt0yQ_1749125777 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: F5KVELEDMUALCUKMTSTVW56AALBPNL6H X-Message-ID-Hash: F5KVELEDMUALCUKMTSTVW56AALBPNL6H X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1749125957535116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The virDomainMigratePrepare3() API declares one of its argument as 'bandwidth', though throughout various typedefs, RPC and callback implementations the name is changed to 'resource'. This creates a confusing. Unify the name. Signed-off-by: Michal Privoznik --- src/driver-hypervisor.h | 2 +- src/libvirt_internal.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_daemon_dispatch.c | 2 +- src/remote/remote_driver.c | 4 ++-- src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- src/rpc/gendispatch.pl | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index 975a6b9700..8302f0b42e 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -993,7 +993,7 @@ typedef int char **uri_out, unsigned long flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, const char *dom_xml); =20 typedef int diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 51510c34b3..62ba807ec5 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -201,7 +201,7 @@ int virDomainMigratePrepare3(virConnectPtr dconn, char **uri_out, unsigned long flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, const char *dom_xml); =20 int virDomainMigratePrepareTunnel3(virConnectPtr dconn, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c6ace58491..dda0a32681 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11037,7 +11037,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, char **uri_out, unsigned long flags, const char *dname, - unsigned long resource G_GNUC_UNUSED, + unsigned long bandwidth G_GNUC_UNUSED, const char *dom_xml) { virQEMUDriver *driver =3D dconn->privateData; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 7ebaca6cf1..12ad1ce548 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -4855,7 +4855,7 @@ remoteDispatchDomainMigratePrepare3(virNetServer *ser= ver G_GNUC_UNUSED, args->cookie_in.cookie_in_len, &cookieout, &cookieoutlen, uri_in, uri_out, - args->flags, dname, args->resource, + args->flags, dname, args->bandwidth, args->dom_xml) < 0) goto cleanup; =20 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 1d1b88df29..42f98f132f 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5691,7 +5691,7 @@ remoteDomainMigratePrepare3(virConnectPtr dconn, char **uri_out, unsigned long flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, const char *dom_xml) { remote_domain_migrate_prepare3_args args =3D {0}; @@ -5704,7 +5704,7 @@ remoteDomainMigratePrepare3(virConnectPtr dconn, args.uri_in =3D uri_in =3D=3D NULL ? NULL : (char **) &uri_in; args.flags =3D flags; args.dname =3D dname =3D=3D NULL ? NULL : (char **) &dname; - args.resource =3D resource; + args.bandwidth =3D bandwidth; args.dom_xml =3D (char *) dom_xml; =20 if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE3, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 9457bb603d..a56b4cdeb9 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2960,7 +2960,7 @@ struct remote_domain_migrate_prepare3_args { remote_string uri_in; unsigned hyper flags; remote_string dname; - unsigned hyper resource; + unsigned hyper bandwidth; remote_nonnull_string dom_xml; }; =20 diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 6cf7b8e9e3..e3d16ea061 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2279,7 +2279,7 @@ struct remote_domain_migrate_prepare3_args { remote_string uri_in; uint64_t flags; remote_string dname; - uint64_t resource; + uint64_t bandwidth; remote_nonnull_string dom_xml; }; struct remote_domain_migrate_prepare3_ret { diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 0cc4d3fe42..4c699337b1 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -407,7 +407,7 @@ my $long_legacy =3D { DomainMigratePerform3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigratePrepare =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigratePrepare2 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, - DomainMigratePrepare3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, + DomainMigratePrepare3 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigratePrepareTunnel =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigratePrepareTunnel3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigrateToURI =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, --=20 2.49.0