From nobody Mon Sep 8 21:39:53 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=1749125834; cv=none; d=zohomail.com; s=zohoarc; b=WNGJglxGuFdAxsO+N1eLO1j0JKiTpAOWY1hQFatgUqtPDpICYyoDgMuiRdYmBBf9RyrPBbygSiz7sSWoYj5s6S+1T/Ohz+4HRG4bHmz/9TlBH+X31Sm1vpiMf9b6o/XKyAeCzxa83ICTj8/XjvN2zB6SYKihaGD+F/HtvsLgbbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749125834; 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=pe3M5e6vc7hcrkAoxq1hMDttStCeWznOWYf+DH9CGT0=; b=E8x7SbtgsahzIE3lzIEfF4ZIHHJSas+sLzx2WaMWM6ChSpGXYI2+nEk0yqruJqIKTlU0m1sy22WRiMcUUzYf3K8IzgTf5HRDuLmvOvgJeyM1mIRLkZkyt3o38zRAkwXGd+YaJweTfQmYAjk299zFMXVaW/6pJPwFhwjnfHuQchU= 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 174912583497647.28566271477803; Thu, 5 Jun 2025 05:17:14 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 061D0121D; Thu, 5 Jun 2025 08:17:14 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 68C4114A9; Thu, 5 Jun 2025 08:16:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6722E10F5; Thu, 5 Jun 2025 08:16:17 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 D5958CA5 for ; Thu, 5 Jun 2025 08:16:16 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-260-GECrGISVO8GUxy7HIf8EFA-1; Thu, 05 Jun 2025 08:16:14 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B226B195608D for ; Thu, 5 Jun 2025 12:16:12 +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 0809F1956087 for ; Thu, 5 Jun 2025 12:16:11 +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=1749125776; 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=XXc0cSPY7m2oWs2ugLhGa+6DWcDXNL0Isyiz0ozxxNk=; b=Y7lnfNXViO/Si4druhm730ELOhFkB4e0ppNk+3Qn5O8niXGV6yNR6LUTQLSIBf5BV8SXrY 5+Vgkny5okbRDPDoN+JS2Nm4KnABLBa9msMNfg+j/T5X2rSkXqTeRimQ8fz8sxF0ZKdZnl mqY2T7HA1WNwOZLdiP1FolD+iVpWV4o= X-MC-Unique: GECrGISVO8GUxy7HIf8EFA-1 X-Mimecast-MFC-AGG-ID: GECrGISVO8GUxy7HIf8EFA_1749125773 To: devel@lists.libvirt.org Subject: [PATCH 01/10] src: Unify argument name of virDomainMigratePrepare() Date: Thu, 5 Jun 2025 14:15:58 +0200 Message-ID: <4876893427cbfddc227316d4c36017963bdfc823.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: lw1Unny7YVJACo5xVmsoOgf1DNdzCuqmLCAtFnnWIUA_1749125773 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2XTKPQPATMO2NV62QBJGONX4HB2FG6IG X-Message-ID-Hash: 2XTKPQPATMO2NV62QBJGONX4HB2FG6IG 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: 1749125836137116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The virDomainMigratePrepare() API declares its last 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 Reviewed-by: J=C3=A1n Tomko --- src/driver-hypervisor.h | 2 +- src/esx/esx_driver.c | 2 +- src/libvirt_internal.h | 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 8e080620bb..fa2c08391f 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -584,7 +584,7 @@ typedef int char **uri_out, unsigned long flags, const char *dname, - unsigned long resource); + unsigned long bandwidth); =20 typedef int (*virDrvDomainMigratePerform)(virDomainPtr domain, diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 512ca6c028..34c0e28d31 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3614,7 +3614,7 @@ esxDomainMigratePrepare(virConnectPtr dconn, char **uri_out, unsigned long flags, const char *dname G_GNUC_UNUSED, - unsigned long resource G_GNUC_UNUSED) + unsigned long bandwidth G_GNUC_UNUSED) { esxPrivate *priv =3D dconn->privateData; =20 diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 1ae3e2b2e0..c532218226 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -146,7 +146,7 @@ int virDomainMigratePrepare (virConnectPtr dconn, char **uri_out, unsigned long flags, const char *dname, - unsigned long resource); + unsigned long bandwidth); int virDomainMigratePerform (virDomainPtr domain, const char *cookie, int cookielen, diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 5dfed7ceef..229bd677bb 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -3075,7 +3075,7 @@ remoteDispatchDomainMigratePrepare(virNetServer *serv= er G_GNUC_UNUSED, =20 if (virDomainMigratePrepare(conn, &cookie, &cookielen, uri_in, uri_out, - args->flags, dname, args->resource) < 0) + args->flags, dname, args->bandwidth) < 0) goto cleanup; =20 /* remoteDispatchClientRequest will free cookie, uri_out and diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 2690c05267..1609c6b391 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2333,7 +2333,7 @@ remoteDomainMigratePrepare(virConnectPtr dconn, char **cookie, int *cookielen, const char *uri_in, char **uri_out, unsigned long flags, const char *dname, - unsigned long resource) + unsigned long bandwidth) { remote_domain_migrate_prepare_args args =3D {0}; g_auto(remote_domain_migrate_prepare_ret) ret =3D {0}; @@ -2343,7 +2343,7 @@ remoteDomainMigratePrepare(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; =20 if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE, (xdrproc_t) xdr_remote_domain_migrate_prepare_args, (char *) = &args, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 57cd5796af..2dc0a6fea6 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1055,7 +1055,7 @@ struct remote_domain_migrate_prepare_args { remote_string uri_in; unsigned hyper flags; remote_string dname; - unsigned hyper resource; + unsigned hyper bandwidth; }; =20 struct remote_domain_migrate_prepare_ret { diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index dd612b4dc6..50fcdaa134 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -628,7 +628,7 @@ struct remote_domain_migrate_prepare_args { remote_string uri_in; uint64_t flags; remote_string dname; - uint64_t resource; + uint64_t bandwidth; }; struct remote_domain_migrate_prepare_ret { struct { diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index f9fae39fb1..2b7fd657cb 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -405,7 +405,7 @@ my $long_legacy =3D { DomainMigratePeer2Peer =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigratePerform =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigratePerform3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, - DomainMigratePrepare =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, resource = =3D> 1 } }, DomainMigratePrepare3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigratePrepareTunnel =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, --=20 2.49.0 From nobody Mon Sep 8 21:39:53 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=1749125896; cv=none; d=zohomail.com; s=zohoarc; b=bz8QE0Y+JjAF7q/8UkQbubWZuHFVK7FhM+IjU08d/qRm3vCWAfvXKNqceLISlRNdsNpRgVusxv+g640+qxYI8g9e+kxIO58ZZPoegC/eooDBd+UmasYr0m0i0DU0/9LgFz/TN/Oj2GJSWyYKoU/dtRqdj4VZOzVS6LBUT/E9Jx0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749125896; 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=xAY5mt/Cm7T80/+efsW15sHZan/5qBVw4+z2D7CqNuE=; b=cfGRyMmYIUIBTdrcKh6vcFHT1A4oHg2x+WVqFN0nv6ypkfOTvlZIGPi+xY/lNmz8McBeiL/ql8hPQV5IbJxy14sQcppVMU7/jTff+VPSsnpNldwEJwXUY2C13sGrhK4kCblZcXbFUKPY94bp+/6nmLJZ1trdeo4l3NF5W/I5vZ4= 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 1749125896154998.4828997266952; Thu, 5 Jun 2025 05:18:16 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 04D8214A3; Thu, 5 Jun 2025 08:18:15 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2B93A14F4; Thu, 5 Jun 2025 08:16:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 034D9D61; Thu, 5 Jun 2025 08:16:17 -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 4B28E10F3 for ; Thu, 5 Jun 2025 08:16:17 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-589--TVtpNZ6OhuKh6ZfN8X_qw-1; Thu, 05 Jun 2025 08:16:14 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CFDB11956086 for ; Thu, 5 Jun 2025 12:16:13 +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 263A11956087 for ; Thu, 5 Jun 2025 12:16:12 +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=1749125776; 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=koB6FLUX/cXV875WJXXH2NcIN1sv06KXMEgcr/9MoW8=; b=N6rVKK0QpqJNtAx0lSyvg6l/cjgUD1ZKBJQs+GEPulYOPJyzX+I9iTg05XABlteChkUHKv 7sVBJV64xOwe0O/UyES0H5rh3MP3MC+YvaHeR7iBBgzY33ebd1rKz0rE6ZOduQb9XdDFhJ R5kG6/piKiQndDDMC9STc7QBpC5PGYA= X-MC-Unique: -TVtpNZ6OhuKh6ZfN8X_qw-1 X-Mimecast-MFC-AGG-ID: -TVtpNZ6OhuKh6ZfN8X_qw_1749125773 To: devel@lists.libvirt.org Subject: [PATCH 02/10] src: Unify argument name of virDomainMigratePerform() Date: Thu, 5 Jun 2025 14:15:59 +0200 Message-ID: <9646a81aeef3b2516d50019283e578c1dd648722.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: j-cCsz97bXAoJXq-jiRpVGe8RK1D8oXOSVo6qlEyUjs_1749125773 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 7PG47S3KBEH2SHSIWYU7H3TYLIW7VSKJ X-Message-ID-Hash: 7PG47S3KBEH2SHSIWYU7H3TYLIW7VSKJ 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: 1749125898952116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The virDomainMigratePerform() API declares its last 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 Reviewed-by: J=C3=A1n Tomko --- src/driver-hypervisor.h | 2 +- src/libvirt_internal.h | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_migration.c | 12 ++++++------ src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- src/rpc/gendispatch.pl | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index fa2c08391f..65c20cbb74 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -593,7 +593,7 @@ typedef int const char *uri, unsigned long flags, const char *dname, - unsigned long resource); + unsigned long bandwidth); =20 typedef virDomainPtr (*virDrvDomainMigrateFinish)(virConnectPtr dconn, diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index c532218226..aead4dbfb6 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -153,7 +153,7 @@ int virDomainMigratePerform (virDomainPtr domain, const char *uri, unsigned long flags, const char *dname, - unsigned long resource); + unsigned long bandwidth); virDomainPtr virDomainMigrateFinish (virConnectPtr dconn, const char *dname, const char *cookie, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b3b0ee66f8..a531bdc581 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10863,7 +10863,7 @@ qemuDomainMigratePerform(virDomainPtr dom, const char *uri, unsigned long flags, const char *dname, - unsigned long resource) + unsigned long bandwidth) { virQEMUDriver *driver =3D dom->conn->privateData; virDomainObj *vm =3D NULL; @@ -10904,7 +10904,7 @@ qemuDomainMigratePerform(virDomainPtr dom, NULL, migParams, cookie, cookielen, NULL, NULL, /* No output cookies in v2 */ - flags, dname, resource, false); + flags, dname, bandwidth, false); =20 cleanup: virDomainObjEndAPI(&vm); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2400750ee4..38ffcdf428 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -6447,7 +6447,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, int *cookieoutlen, unsigned int flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, bool v3proto) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); @@ -6457,12 +6457,12 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, "migrate_disks=3D%p, nbdPort=3D%d, " "nbdURI=3D%s, " "cookiein=3D%s, cookieinlen=3D%d, cookieout=3D%p, cookieoutl= en=3D%p, " - "flags=3D0x%x, dname=3D%s, resource=3D%lu, v3proto=3D%d", + "flags=3D0x%x, dname=3D%s, bandwidth=3D%lu, v3proto=3D%d", driver, conn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), migrate_disks, nbdPort, NULLSTR(nbdURI), NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, - flags, NULLSTR(dname), resource, v3proto); + flags, NULLSTR(dname), bandwidth, v3proto); =20 if (cfg->migrateTLSForce && !(flags & VIR_MIGRATE_TUNNELLED) && @@ -6485,7 +6485,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, nbdURI, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, - flags, dname, resource, v3proto); + flags, dname, bandwidth, v3proto= ); } =20 if (dconnuri) { @@ -6501,7 +6501,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, - flags, resource, nbdURI); + flags, bandwidth, nbdURI); } =20 return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml= , NULL, @@ -6510,7 +6510,7 @@ qemuMigrationSrcPerform(virQEMUDriver *driver, nbdURI, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, flags, - dname, resource, v3proto); + dname, bandwidth, v3proto); } =20 static int diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 2dc0a6fea6..9210c0dc1c 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1069,7 +1069,7 @@ struct remote_domain_migrate_perform_args { remote_nonnull_string uri; unsigned hyper flags; remote_string dname; - unsigned hyper resource; + unsigned hyper bandwidth; }; =20 struct remote_domain_migrate_finish_args { diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 50fcdaa134..5c30e9d107 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -646,7 +646,7 @@ struct remote_domain_migrate_perform_args { remote_nonnull_string uri; uint64_t flags; remote_string dname; - uint64_t resource; + uint64_t bandwidth; }; struct remote_domain_migrate_finish_args { remote_nonnull_string dname; diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 2b7fd657cb..fc8e7e8891 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -403,7 +403,7 @@ my $long_legacy =3D { DomainMigrateFinish2 =3D> { arg =3D> { flags =3D> 1 } }, DomainMigrateFinish3 =3D> { arg =3D> { flags =3D> 1 } }, DomainMigratePeer2Peer =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, - DomainMigratePerform =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, + DomainMigratePerform =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, 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, resource = =3D> 1 } }, --=20 2.49.0 From nobody Mon Sep 8 21:39:53 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=1749125866; cv=none; d=zohomail.com; s=zohoarc; b=h0gBv3BoqZIJiUUot8W5P1E+XY3z/J3jHpOpND8toVEZGg1d1rQRmeujzia8SG6cRH+7yAuVO1CjtQcEbpU5EuRvBH4zlv90QfBt8EQf4g/hp35Fk5pARyz6D1yLePraKhNsXVPygcGLN7BBwiQjOjfIM3r8b7489qUvoZDtAMQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749125866; 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=by6HZnsKf4uHg3nUSfwhFjbsKiSgnw7lCJWeKASZ3tk=; b=O2CHlkjiluYRrXl/8C6Vxt/DpSq2xXymzRlr5QyECtneh7LifnuD28EyVGVj/vZy7pocxLq6fin8Jf9HpI/9U4xhXuFgIvHsRoPwuSNAkLvm6vISp2pLcxkSjEnomoU9pPDKWwRg8J1YWbEbgm7qN1XyYfR5hJcPK0nQOvTLW3Y= 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 1749125866310730.3095779289471; Thu, 5 Jun 2025 05:17:46 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3C92514B4; Thu, 5 Jun 2025 08:17:45 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3DC8414B6; Thu, 5 Jun 2025 08:16:24 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D1301CA5; Thu, 5 Jun 2025 08:16:17 -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 3CEAED61 for ; Thu, 5 Jun 2025 08:16:17 -0400 (EDT) Received: from mx-prod-mc-06.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-687-o6qK8gd5PLu_XqR7npuRkw-1; Thu, 05 Jun 2025 08:16:15 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EDDBE180036E for ; Thu, 5 Jun 2025 12:16:14 +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 442951956096 for ; Thu, 5 Jun 2025 12:16:14 +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=1749125777; 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=VMjPq9K6mOiX9tTp/Em3UEWB/Fx69CjJPiVl3kNWJhM=; b=jWAUwPOKXERbxcdqCtsAohnADUcMdUQ4oKIuCGhH5Vej9Lh8YcrLI37DhXOvtcHBOpuaAt zx7Fto0BJfjziBPuv2NJjMeb1mK67rpwy+G96gq4DH/LAnqJYXLPobOmDXz4Oul8CyNgqb oKRIRAhA0q1WcLG4THBfgLfwOaTe+4w= X-MC-Unique: o6qK8gd5PLu_XqR7npuRkw-1 X-Mimecast-MFC-AGG-ID: o6qK8gd5PLu_XqR7npuRkw_1749125775 To: devel@lists.libvirt.org Subject: [PATCH 03/10] src: Unify argument name of virDomainMigratePrepare2() Date: Thu, 5 Jun 2025 14:16:00 +0200 Message-ID: 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: jfBLkgrQtFu9YOki2-QYhiR5SqdpcNFWVpC_5C8bGG8_1749125775 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: T424GB2NYY5Q56BLVRS3S44EZFVTKOFY X-Message-ID-Hash: T424GB2NYY5Q56BLVRS3S44EZFVTKOFY 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: 1749125868629116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The virDomainMigratePrepare2() 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 Reviewed-by: J=C3=A1n Tomko --- 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 65c20cbb74..cd0b32c455 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -644,7 +644,7 @@ typedef int char **uri_out, unsigned long flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, const char *dom_xml); =20 typedef virDomainPtr diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index aead4dbfb6..626d794a8c 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -167,7 +167,7 @@ int virDomainMigratePrepare2 (virConnectPtr dconn, char **uri_out, unsigned long flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, const char *dom_xml); virDomainPtr virDomainMigrateFinish2 (virConnectPtr dconn, const char *dname, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a531bdc581..f5657dbd0e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10807,7 +10807,7 @@ qemuDomainMigratePrepare2(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 229bd677bb..7ebaca6cf1 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -3125,7 +3125,7 @@ remoteDispatchDomainMigratePrepare2(virNetServer *ser= ver G_GNUC_UNUSED, =20 if (virDomainMigratePrepare2(conn, &cookie, &cookielen, 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 1609c6b391..1d1b88df29 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2367,7 +2367,7 @@ remoteDomainMigratePrepare2(virConnectPtr dconn, char **cookie, int *cookielen, const char *uri_in, char **uri_out, unsigned long flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, const char *dom_xml) { remote_domain_migrate_prepare2_args args =3D {0}; @@ -2378,7 +2378,7 @@ remoteDomainMigratePrepare2(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_PREPARE2, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 9210c0dc1c..ad29ecbd06 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -1087,7 +1087,7 @@ struct remote_domain_migrate_prepare2_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 5c30e9d107..ced8120bab 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -664,7 +664,7 @@ struct remote_domain_migrate_prepare2_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_prepare2_ret { diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index fc8e7e8891..e867dda9c9 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -406,7 +406,7 @@ my $long_legacy =3D { DomainMigratePerform =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, 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, resource = =3D> 1 } }, + DomainMigratePrepare2 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigratePrepare3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigratePrepareTunnel =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigratePrepareTunnel3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, --=20 2.49.0 From nobody Mon Sep 8 21:39:53 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=1749125920; cv=none; d=zohomail.com; s=zohoarc; b=cKaIM53U4YJcTvipxLBwG9rGh+8DJdwfLq6OHwDWqU5O4A43mL3JlJptgctITYyvc7iu33VF92NEIz/fJSbNFaO2cME/WI+LSkMLijduGUJNdKRASj0tDpvtfstCXqlwt09fnyQF/jVo7SNvVmmJFfdTltdHuRxNbuw2m5D6KO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749125920; 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=RkDXiAQskWkYhf6Vg4kla8UiqCuqR5ivzbqSsBySwmw=; b=TM/lr5AvUjVUKR/bRAgjuEjBN6fDojgVTVDiN9LnLMNss7DGy8kEC78LPXPWzStZSjra0FTnkqDRrDnzKFUEqn4a49mA/5suFFgl1WtzvUsTzcHQv9weTP3G7x9Pt2abUWYt1T1VtjpI9U0yww+YR6M/nf6uOTIXcGZNXknht+4= 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 1749125920559437.5743864826801; Thu, 5 Jun 2025 05:18:40 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9B4FF14B4; Thu, 5 Jun 2025 08:18:39 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3830E1363; Thu, 5 Jun 2025 08:16:30 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E212C12C8; Thu, 5 Jun 2025 08:16:24 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 999611258 for ; Thu, 5 Jun 2025 08:16:18 -0400 (EDT) Received: from mx-prod-mc-06.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-320-k5ByL4anPPuNnauT6ViaVw-1; Thu, 05 Jun 2025 08:16:17 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4814B18004A3 for ; Thu, 5 Jun 2025 12:16:16 +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 6A4311956096 for ; Thu, 5 Jun 2025 12:16:15 +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=1749125778; 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=SgUyV3LB7vZHSrVl1dmrO8XraaYxk6KOGysTx26GzjY=; b=d9eZ9PThbJKr3lmiMZ36HW7QU3sscYEXhbyNIB28qc1svDAu004/WjatzIXD5fZLXlNrAD 0I6v8Nu69dgudE0CaMn3HVYV1F5BvWf2P+7BIlJl92nUE2IIzHdR0KwfB1UwDXqsuLu6Kc cUklxAl9Z2/N8AQsjy8Rf1mo/3d8mXo= X-MC-Unique: k5ByL4anPPuNnauT6ViaVw-1 X-Mimecast-MFC-AGG-ID: k5ByL4anPPuNnauT6ViaVw_1749125776 To: devel@lists.libvirt.org Subject: [PATCH 04/10] src: Unify argument name of virDomainMigratePrepareTunnel() Date: Thu, 5 Jun 2025 14:16:01 +0200 Message-ID: <4367611ac97b71aec74fb9825dde8a4ed679e001.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: j6Z0CU2Au5jl_BA5aCncwjWMGmkW4Q8wRx8H3zkgsXU_1749125776 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: G2CQY3MFDSHS5JTQUDD7PFOH6BW6AZQG X-Message-ID-Hash: G2CQY3MFDSHS5JTQUDD7PFOH6BW6AZQG 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: 1749125921052116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The virDomainMigratePrepareTunnel() 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 Reviewed-by: J=C3=A1n Tomko --- src/driver-hypervisor.h | 2 +- src/libvirt_internal.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- src/rpc/gendispatch.pl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index cd0b32c455..975a6b9700 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -675,7 +675,7 @@ typedef int virStreamPtr st, 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 626d794a8c..51510c34b3 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -180,7 +180,7 @@ int virDomainMigratePrepareTunnel(virConnectPtr dconn, virStreamPtr st, unsigned long flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, const char *dom_xml); =20 =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f5657dbd0e..c6ace58491 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10757,7 +10757,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, virStreamPtr st, 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_protocol.x b/src/remote/remote_protocol.x index ad29ecbd06..9457bb603d 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2373,7 +2373,7 @@ struct remote_secret_lookup_by_usage_ret { struct remote_domain_migrate_prepare_tunnel_args { 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 ced8120bab..6cf7b8e9e3 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1786,7 +1786,7 @@ struct remote_secret_lookup_by_usage_ret { struct remote_domain_migrate_prepare_tunnel_args { uint64_t flags; remote_string dname; - uint64_t resource; + uint64_t bandwidth; remote_nonnull_string dom_xml; }; struct remote_connect_is_secure_ret { diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index e867dda9c9..0cc4d3fe42 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -408,7 +408,7 @@ my $long_legacy =3D { 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 } }, - DomainMigratePrepareTunnel =3D> { arg =3D> { flags =3D> 1, resource = =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 } }, DomainMigrateToURI2 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, --=20 2.49.0 From nobody Mon Sep 8 21:39:53 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 Reviewed-by: J=C3=A1n Tomko --- 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 From nobody Mon Sep 8 21:39:53 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=1749125982; cv=none; d=zohomail.com; s=zohoarc; b=iePWdf+GMaONL73/+x5rCVnZdka7HTFFeQIwec8ZiqS+ujBWHooMXtag8PbHNp4E6aE/s+YwqIcRc3UuPaaTiEzPo6p3NE9FY5Sx1w4rSjceG3F5mNF2WVlQi3+gwzEzB2ksPXqAyOyPBvBFFqIhx6Ena3+jN53pMlXXtMUwkrg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749125982; 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=OY6/SgbFtAtt5FdoM+/envKUGFfaicEkogL6kEpbYzA=; b=KVEXPd+3pdRXy1MB5g+kuYGVAy55yH8mc2ehmdXkbiSL5E9bw+ptUVx6b/weQwqmcQvJnhUb28HHg3/PB0ibfog+b9c/Bm97llcylRsE3N9MLwmn2ac83VtwtPjC/D+q1YELW/QwiSIqmaHCukHuD3i7F/Y/RqRaJX6JoiRr/ZM= 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 1749125982944310.00632395515197; Thu, 5 Jun 2025 05:19:42 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EAC6D12B1; Thu, 5 Jun 2025 08:19:41 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8C94010F3; Thu, 5 Jun 2025 08:16:36 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9F9DB1226; Thu, 5 Jun 2025 08:16:32 -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 02B2B11D0 for ; Thu, 5 Jun 2025 08:16:20 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-151-TPqO2uQSP3ecFe3c7BbIXQ-1; Thu, 05 Jun 2025 08:16:19 -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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7C2E01956056 for ; Thu, 5 Jun 2025 12:16:18 +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 A6493195609D for ; Thu, 5 Jun 2025 12:16:17 +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=1749125780; 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=VSGSf7lM8pZ20zS6pWWaTQL/iVT556NJ27a5AKsL1Zo=; b=AphLD5bEsb/CgBe4ahoXB5RN1f4097yneudiUd1LOPohpKvg5M7UYPtj8m0N1dAEg+I3wC 50oolLe0sTxF2cMr850sznzpbuBMzcnMmIIdSAkxaUpl3SW0K1v+QwsGqFTZdjHsx8HkFg UImFkYg0NbToRxSPoGi57lHMZg6lP6M= X-MC-Unique: TPqO2uQSP3ecFe3c7BbIXQ-1 X-Mimecast-MFC-AGG-ID: TPqO2uQSP3ecFe3c7BbIXQ_1749125778 To: devel@lists.libvirt.org Subject: [PATCH 06/10] src: Unify argument name of virDomainMigratePrepareTunnel3() Date: Thu, 5 Jun 2025 14:16:03 +0200 Message-ID: <48a8c80ff84f8a44372a3cfcd0fb2270d461acdf.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: PoFQmNlu3pt9S3ZqQOA3h95bLE1QYrmkuD8LXEaa3lU_1749125778 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: IQMB52THSJP6W5YQVUKJBMF34E4WO6AU X-Message-ID-Hash: IQMB52THSJP6W5YQVUKJBMF34E4WO6AU 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: 1749125983804116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The virDomainMigratePrepareTunnel3() 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 Reviewed-by: J=C3=A1n Tomko --- src/driver-hypervisor.h | 2 +- src/libvirt_internal.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_driver.c | 4 ++-- src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- src/rpc/gendispatch.pl | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index 8302f0b42e..c0099198bb 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -1005,7 +1005,7 @@ typedef int int *cookieoutlen, unsigned long flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, const char *dom_xml); =20 =20 diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 62ba807ec5..293a11be4e 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -212,7 +212,7 @@ int virDomainMigratePrepareTunnel3(virConnectPtr dconn, int *cookieoutlen, unsigned long flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, const char *dom_xml); =20 =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dda0a32681..6b8f60cc23 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11188,7 +11188,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, int *cookieoutlen, 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_driver.c b/src/remote/remote_driver.c index 42f98f132f..815be8548d 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5744,7 +5744,7 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn, int *cookieoutlen, unsigned long flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, const char *dom_xml) { struct private_data *priv =3D dconn->privateData; @@ -5769,7 +5769,7 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn, args.cookie_in.cookie_in_len =3D cookieinlen; 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_PREPARE_TUNNEL3, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index a56b4cdeb9..f6d0ad30b6 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2973,7 +2973,7 @@ struct remote_domain_migrate_prepare_tunnel3_args { opaque cookie_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 e3d16ea061..370a5e2344 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2296,7 +2296,7 @@ struct remote_domain_migrate_prepare_tunnel3_args { } cookie_in; uint64_t flags; remote_string dname; - uint64_t resource; + uint64_t bandwidth; remote_nonnull_string dom_xml; }; struct remote_domain_migrate_prepare_tunnel3_ret { diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 4c699337b1..abc260ea56 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -409,7 +409,7 @@ my $long_legacy =3D { DomainMigratePrepare2 =3D> { arg =3D> { flags =3D> 1, bandwidth = =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 } }, + DomainMigratePrepareTunnel3 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigrateToURI =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigrateToURI2 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigrateVersion1 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, --=20 2.49.0 From nobody Mon Sep 8 21:39:53 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=1749126008; cv=none; d=zohomail.com; s=zohoarc; b=KYHlSF+j5MFemvIoYmvIg3iK3DjHKV3UezQ9eQ3/4awvzFTBiVBnB44XwiY2NPH6hAjmZyOU/lzhKx0JMe3VUPjJuuom/V/huRxOCNXPtRhITZA3jBJ/ORXo5c/YDWD/ZsBqa7EQFotC9YOnUTtMsdjexNmv0/FsCd961c9NDH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749126008; 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=5yOXmMXGglXCQYu5/v4dpqQGMx5RdxyPGwMMZNLO3DA=; b=Lbtf+6qvpHTvWQT6FtkCZ53XXlCXDPy7KnizxrzzUQGx0TK2SYMkyZhqywm7nfJEgJAG8fPJOm+h3Q5t3jye+GjDQBBPctVWQJ2VNBmej8DuegE15/XYY722jydrFRg0IW6O7dmZOBT4t/5jtSMCw50Sou9acgK0nl45pQvxYq0= 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 1749126008328418.75432841859356; Thu, 5 Jun 2025 05:20:08 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 59F6E159B; Thu, 5 Jun 2025 08:20:07 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 268161534; Thu, 5 Jun 2025 08:16:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 562011239; Thu, 5 Jun 2025 08:16:33 -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 DBBD412C0 for ; Thu, 5 Jun 2025 08:16:21 -0400 (EDT) Received: from mx-prod-mc-06.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-673-IyFCEYL9Nni-n47OWIyGJA-1; Thu, 05 Jun 2025 08:16:20 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A7CF11800257 for ; Thu, 5 Jun 2025 12:16:19 +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 F21151956087 for ; Thu, 5 Jun 2025 12:16:18 +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=1749125781; 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=h10aj41ktTQP+8hWn3R0il7DVF77X1NA1PHMtTQyUzY=; b=RR8vo+utXMqbR2wckgNp6jflzI6tEfbJYgzMLdK5yaRArObD/9RCPFzUVj9jLn+G3FTSWO ud161MoSxdR9b2zQfN8f4GtpisREwFIm7u89r7I0+feqz7jP5wevHw7R9YtXozBZrwm/hd +sLt2ZMuwRHxv+qvXd0psoV5YIitDJs= X-MC-Unique: IyFCEYL9Nni-n47OWIyGJA-1 X-Mimecast-MFC-AGG-ID: IyFCEYL9Nni-n47OWIyGJA_1749125779 To: devel@lists.libvirt.org Subject: [PATCH 07/10] src: Unify argument name of virDomainMigrateBegin3() Date: Thu, 5 Jun 2025 14:16:04 +0200 Message-ID: <1920c0fea708f2fefc244b9afd7e51f2288f1848.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: 5CeeHfIg9WM3_eXMjzmI2QpAGJ1mp86IGQNcuTWm0f4_1749125779 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: T5M4CTFBRKXB27Z2L52ZBUV4BU6XEOMT X-Message-ID-Hash: T5M4CTFBRKXB27Z2L52ZBUV4BU6XEOMT 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: 1749126010120116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The virDomainMigrateBegin3() API declares its last 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 Reviewed-by: J=C3=A1n Tomko --- 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 c0099198bb..3f367806ee 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -981,7 +981,7 @@ typedef char * int *cookieoutlen, unsigned long flags, const char *dname, - unsigned long resource); + unsigned long bandwidth); =20 typedef int (*virDrvDomainMigratePrepare3)(virConnectPtr dconn, diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 293a11be4e..df99fe260c 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -190,7 +190,7 @@ char *virDomainMigrateBegin3(virDomainPtr domain, int *cookieoutlen, unsigned long flags, const char *dname, - unsigned long resource); + unsigned long bandwidth); =20 int virDomainMigratePrepare3(virConnectPtr dconn, const char *cookiein, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6b8f60cc23..a89b78d5d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10961,7 +10961,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, int *cookieoutlen, unsigned long flags, const char *dname, - unsigned long resource G_GNUC_UNUSED) + unsigned long bandwidth G_GNUC_UNUSED) { virDomainObj *vm; =20 diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 12ad1ce548..2abfe7bf3b 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -4805,7 +4805,7 @@ remoteDispatchDomainMigrateBegin3(virNetServer *serve= r G_GNUC_UNUSED, =20 if (!(xml =3D virDomainMigrateBegin3(dom, xmlin, &cookieout, &cookieoutlen, - args->flags, dname, args->resource)= )) + args->flags, dname, args->bandwidth= ))) goto cleanup; =20 /* remoteDispatchClientRequest will free cookie and diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 815be8548d..8fd387fc1c 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5648,7 +5648,7 @@ remoteDomainMigrateBegin3(virDomainPtr domain, int *cookieoutlen, unsigned long flags, const char *dname, - unsigned long resource) + unsigned long bandwidth) { remote_domain_migrate_begin3_args args =3D {0}; g_auto(remote_domain_migrate_begin3_ret) ret =3D {0}; @@ -5659,7 +5659,7 @@ remoteDomainMigrateBegin3(virDomainPtr domain, args.xmlin =3D xmlin =3D=3D NULL ? NULL : (char **) &xmlin; args.flags =3D flags; args.dname =3D dname =3D=3D NULL ? NULL : (char **) &dname; - args.resource =3D resource; + args.bandwidth =3D bandwidth; =20 if (call(domain->conn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_BEGIN3, (xdrproc_t) xdr_remote_domain_migrate_begin3_args, (char *) &= args, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index f6d0ad30b6..21aaf615ba 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2947,7 +2947,7 @@ struct remote_domain_migrate_begin3_args { remote_string xmlin; unsigned hyper flags; remote_string dname; - unsigned hyper resource; + unsigned hyper bandwidth; }; =20 struct remote_domain_migrate_begin3_ret { diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 370a5e2344..63a51e3362 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2262,7 +2262,7 @@ struct remote_domain_migrate_begin3_args { remote_string xmlin; uint64_t flags; remote_string dname; - uint64_t resource; + uint64_t bandwidth; }; struct remote_domain_migrate_begin3_ret { struct { diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index abc260ea56..1a7d09056e 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -396,7 +396,7 @@ my $long_legacy =3D { DomainGetInfo =3D> { ret =3D> { maxMem =3D> 1, memory = =3D> 1 } }, DomainMigrate =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigrate2 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, - DomainMigrateBegin3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, + DomainMigrateBegin3 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigrateConfirm3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigrateDirect =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigrateFinish =3D> { arg =3D> { flags =3D> 1 } }, --=20 2.49.0 From nobody Mon Sep 8 21:39:53 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=1749126041; cv=none; d=zohomail.com; s=zohoarc; b=ApAmLjS+Bd+qaTBJmRoWm4oYdu+RKakFWPNJW0rna/3O20YdDAW2+vV07BhYfxVd2leIIxYdH7P+DaP596ARjfl4lEmrr8CuD4CvMVaoCLrAu+IumnxhzLzspEDTo5ALkS3infRiESIbPYdWFMSL+acFUQNd7jquz4DEDxSbMN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749126041; 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=VMxzhJ1I//a5pYHO3c90m739zZqVevAQ3OfVeHY5teU=; b=d8UxKgLbeZdlYdnF+EeYg3GKlNxca1/8rQYVJD0b8PvKzzquQBM4ROSPViA4sqg3Ash3WWT7dvzhxIMWx1ZEBvvwiI8U3Z4m5F9KDN4q/PMtPF29caN1J5NWYIX8ABqKZ9isr4XlJFFIpIxasULhiuokzgVnWNEea1iVv5bl1WQ= 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 1749126041602373.68204105564485; Thu, 5 Jun 2025 05:20:41 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 9D3DE10F3; Thu, 5 Jun 2025 08:20:40 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4078C1500; Thu, 5 Jun 2025 08:16:43 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D952213EA; Thu, 5 Jun 2025 08:16:38 -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 C23D7128A for ; Thu, 5 Jun 2025 08:16:23 -0400 (EDT) Received: from mx-prod-mc-06.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-689-VFvY67IjOhCcUgtCkpIiJA-1; Thu, 05 Jun 2025 08:16:21 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C5D3F18004A3 for ; Thu, 5 Jun 2025 12:16:20 +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 1C1831956087 for ; Thu, 5 Jun 2025 12:16:19 +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=1749125783; 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=feB+emOZX7F8ED2NhscuWgnhQuoWM+2kY56NqWN6gzM=; b=VjrlMRWqgR+kVqf6duUmkOfRCYQXRvLBCvYt8cF6gLT2Any3CDtfhNfeLyaj7FqAf2KzSr 3s7NBLBSpx92RwYgKaszUtTL/8DQJaXSWuHHFYDz1AAGPzsiF2GjZUiVfHHGBHOwx3gEav 2O8gJ5egp1jHxKQ/BVakuz9hibtfIFs= X-MC-Unique: VFvY67IjOhCcUgtCkpIiJA-1 X-Mimecast-MFC-AGG-ID: VFvY67IjOhCcUgtCkpIiJA_1749125780 To: devel@lists.libvirt.org Subject: [PATCH 08/10] src: Unify argument name of virDomainMigratePerform3() Date: Thu, 5 Jun 2025 14:16:05 +0200 Message-ID: <05be667afe05abd5402735f5ce2548e972ce3fb0.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: C7FkpZMSx66v0SAmRhoygxdSkjsb33L1OT9etbbgfnk_1749125780 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ITQ2HQOE5BDBCRNPDLQ7TZT5JTOHTPPH X-Message-ID-Hash: ITQ2HQOE5BDBCRNPDLQ7TZT5JTOHTPPH 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: 1749126042451116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The virDomainMigratePerform3() API declares its last 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 Reviewed-by: J=C3=A1n Tomko --- src/driver-hypervisor.h | 2 +- src/libvirt_internal.h | 2 +- src/qemu/qemu_driver.c | 4 ++-- 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, 10 insertions(+), 10 deletions(-) diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index 3f367806ee..6a43688b0c 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -1020,7 +1020,7 @@ typedef int const char *uri, unsigned long flags, const char *dname, - unsigned long resource); + unsigned long bandwidth); =20 typedef virDomainPtr (*virDrvDomainMigrateFinish3)(virConnectPtr dconn, diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index df99fe260c..b3376e4a24 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -226,7 +226,7 @@ int virDomainMigratePerform3(virDomainPtr dom, const char *uri, /* VM Migration URI */ unsigned long flags, const char *dname, - unsigned long resource); + unsigned long bandwidth); =20 virDomainPtr virDomainMigrateFinish3(virConnectPtr dconn, const char *dname, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a89b78d5d8..99db92008f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11284,7 +11284,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, const char *uri, unsigned long flags, const char *dname, - unsigned long resource) + unsigned long bandwidth) { virQEMUDriver *driver =3D dom->conn->privateData; virDomainObj *vm =3D NULL; @@ -11308,7 +11308,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, NULL, migParams, cookiein, cookieinlen, cookieout, cookieoutlen, - flags, dname, resource, true); + flags, dname, bandwidth, true); =20 cleanup: virDomainObjEndAPI(&vm); diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 2abfe7bf3b..7e74ff063f 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -4910,7 +4910,7 @@ remoteDispatchDomainMigratePerform3(virNetServer *ser= ver G_GNUC_UNUSED, args->cookie_in.cookie_in_len, &cookieout, &cookieoutlen, dconnuri, uri, - args->flags, dname, args->resource) < 0) + args->flags, dname, args->bandwidth) < 0) goto cleanup; =20 /* remoteDispatchClientRequest will free cookie diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 8fd387fc1c..ec71eaed87 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5806,7 +5806,7 @@ remoteDomainMigratePerform3(virDomainPtr dom, const char *uri, unsigned long flags, const char *dname, - unsigned long resource) + unsigned long bandwidth) { remote_domain_migrate_perform3_args args =3D {0}; g_auto(remote_domain_migrate_perform3_ret) ret =3D {0}; @@ -5822,7 +5822,7 @@ remoteDomainMigratePerform3(virDomainPtr dom, args.dname =3D dname =3D=3D NULL ? NULL : (char **) &dname; args.uri =3D uri =3D=3D NULL ? NULL : (char **) &uri; args.dconnuri =3D dconnuri =3D=3D NULL ? NULL : (char **) &dconnuri; - args.resource =3D resource; + args.bandwidth =3D bandwidth; =20 if (call(dom->conn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PERFORM3, (xdrproc_t) xdr_remote_domain_migrate_perform3_args, (char *)= &args, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 21aaf615ba..3c93203210 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2989,7 +2989,7 @@ struct remote_domain_migrate_perform3_args { remote_string uri; unsigned hyper flags; remote_string dname; - unsigned hyper resource; + unsigned hyper bandwidth; }; =20 struct remote_domain_migrate_perform3_ret { diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 63a51e3362..0f87d13a5a 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2316,7 +2316,7 @@ struct remote_domain_migrate_perform3_args { remote_string uri; uint64_t flags; remote_string dname; - uint64_t resource; + uint64_t bandwidth; }; struct remote_domain_migrate_perform3_ret { struct { diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 1a7d09056e..dd3362c831 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -404,7 +404,7 @@ my $long_legacy =3D { DomainMigrateFinish3 =3D> { arg =3D> { flags =3D> 1 } }, DomainMigratePeer2Peer =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, DomainMigratePerform =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, - DomainMigratePerform3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, + DomainMigratePerform3 =3D> { arg =3D> { flags =3D> 1, bandwidth = =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, bandwidth = =3D> 1 } }, --=20 2.49.0 From nobody Mon Sep 8 21:39:53 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=1749126077; cv=none; d=zohomail.com; s=zohoarc; b=OxwKH5dOZmMl0xpu7L/libxOZMHfzQw2+INRZLQHFL5kXoJuRWIsel1t4Pjw6JiikuU+ysQ7hvR3vkOYQipKB1wAT+FmPyhfERG+HLHb4sz7WEcgHypT3qxHDQo+V+npAdiOZOR2p8LfbwFLZ4ddCSEFe0/8NvahMPVQgD41Moo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749126077; 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=WtAtEMUGqjBe9lqwKdsFCrix8cmytOcN1v2hpS1ntRI=; b=lCFFOm8lYyKuV+7ysR2zthpBYHdv1AIPYyDGE0Pf4J7jfkarvp3AKUHEey0n1UDk3uIcjosaJ2wv94v7bZLNEgSv/1PToP7FeaDAAltQYPZ+EJ1t5rdWub6bamQTErEZIYyGGL73OUaa2yHQx8X9SS67nYI9You8Cel17dpxuRY= 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 1749126077209528.9546218169024; Thu, 5 Jun 2025 05:21:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 32B54D61; Thu, 5 Jun 2025 08:21:16 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 38D141542; Thu, 5 Jun 2025 08:16:46 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 21C64148B; Thu, 5 Jun 2025 08:16:40 -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 8FA6C11EC for ; Thu, 5 Jun 2025 08:16:24 -0400 (EDT) Received: from mx-prod-mc-06.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-691-xoeXV5K-PvOruJCyFbfVow-1; Thu, 05 Jun 2025 08:16:22 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E492B1800378 for ; Thu, 5 Jun 2025 12:16:21 +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 3A45A1956087 for ; Thu, 5 Jun 2025 12:16:21 +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=1749125784; 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=pkZiDxGSJ6RqcgMfu/EF0866WZ9ubpqLPf/kMKA8KBo=; b=LDzsh8RZkFaPPpNaP8cR9fSP6FsAoO01DfoAWO1ZA/l7vxQYKBlGrfJFhWjvmvaoJNxfGC mofCziIms2ZhMUqI4MEosFNXiul7R3EI+wbsy2T+ZBkeEV1izaK4JZyCB8fkMt4tgoemEY 76SaTAlyh6VJ75hNNW8V//7W9PZJd6g= X-MC-Unique: xoeXV5K-PvOruJCyFbfVow-1 X-Mimecast-MFC-AGG-ID: xoeXV5K-PvOruJCyFbfVow_1749125782 To: devel@lists.libvirt.org Subject: [PATCH 09/10] qemu: Finish argument rename Date: Thu, 5 Jun 2025 14:16:06 +0200 Message-ID: <3978182958448d3be16cbebc64d59ba131c1e763.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: 7_j3ktejouJbCN1KJFbKgyFdyduJR0gFELdoJ-GLvo8_1749125782 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: JG3X7LLZWS2JO5IGHKVLMTBWCBO6STFJ X-Message-ID-Hash: JG3X7LLZWS2JO5IGHKVLMTBWCBO6STFJ 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: 1749126079191116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik There are still some functions around migration code that use 'resource' instead 'bandwidth'. Rename the variable/argument inside them. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_migration.c | 60 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 38ffcdf428..c8974dbc5b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4897,7 +4897,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, char **cookieout, int *cookieoutlen, unsigned int flags, - unsigned long resource, + unsigned long bandwidth, qemuMigrationSpec *spec, virConnectPtr dconn, const char *graphicsuri, @@ -4922,15 +4922,15 @@ qemuMigrationSrcRun(virQEMUDriver *driver, g_autoptr(virDomainDef) persistDef =3D NULL; int rc; =20 - if (resource > 0) - priv->migMaxBandwidth =3D resource; + if (bandwidth > 0) + priv->migMaxBandwidth =3D bandwidth; =20 VIR_DEBUG("driver=3D%p, vm=3D%p, cookiein=3D%s, cookieinlen=3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, resource= =3D%lu, " + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, bandwidth= =3D%lu, " "spec=3D%p (dest=3D%d, fwd=3D%d), dconn=3D%p, graphicsuri=3D= %s, " "migrate_disks=3D%p, migrate_disks_detect_zeroes=3D%p", driver, vm, NULLSTR(cookiein), cookieinlen, - cookieout, cookieoutlen, flags, resource, + cookieout, cookieoutlen, flags, bandwidth, spec, spec->destType, spec->fwdType, dconn, NULLSTR(graphicsuri), migrate_disks, migrate_disks_detect_ze= roes); =20 @@ -5322,7 +5322,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, char **cookieout, int *cookieoutlen, unsigned int flags, - unsigned long resource, + unsigned long bandwidth, virConnectPtr dconn, const char *graphicsuri, const char **migrate_disks, @@ -5336,10 +5336,10 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, qemuMigrationSpec spec; =20 VIR_DEBUG("driver=3D%p, vm=3D%p, uri=3D%s, cookiein=3D%s, cookieinlen= =3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, resource= =3D%lu, " + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, bandwidth= =3D%lu, " "graphicsuri=3D%s, migrate_disks=3D%p, migrate_disks_detect_= zeroes=3D%p", driver, vm, uri, NULLSTR(cookiein), cookieinlen, - cookieout, cookieoutlen, flags, resource, + cookieout, cookieoutlen, flags, bandwidth, NULLSTR(graphicsuri), migrate_disks, migrate_disks_detect_ze= roes); =20 if (!(uribits =3D qemuMigrationAnyParseURI(uri, NULL))) @@ -5404,7 +5404,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, cookieout, cookieoutlen, &spec, dconn= , flags); } else { ret =3D qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, coo= kieinlen, - cookieout, cookieoutlen, flags, resource, + cookieout, cookieoutlen, flags, bandwidt= h, &spec, dconn, graphicsuri, migrate_disks, migrate_disks_detect_zero= es, migParams, nbdURI); @@ -5427,7 +5427,7 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver, char **cookieout, int *cookieoutlen, unsigned int flags, - unsigned long resource, + unsigned long bandwidth, virConnectPtr dconn, const char *graphicsuri, const char **migrate_disks, @@ -5438,10 +5438,10 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver, int fds[2] =3D { -1, -1 }; =20 VIR_DEBUG("driver=3D%p, vm=3D%p, st=3D%p, cookiein=3D%s, cookieinlen= =3D%d, " - "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, resource= =3D%lu, " + "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%x, bandwidth= =3D%lu, " "graphicsuri=3D%s, migrate_disks=3D%p", driver, vm, st, NULLSTR(cookiein), cookieinlen, - cookieout, cookieoutlen, flags, resource, + cookieout, cookieoutlen, flags, bandwidth, NULLSTR(graphicsuri), migrate_disks); =20 spec.fwdType =3D MIGRATION_FWD_STREAM; @@ -5469,7 +5469,7 @@ qemuMigrationSrcPerformTunnel(virQEMUDriver *driver, /* Migration with NBD is not supported with _TUNNELLED, thus * 'migrate_disks_detect_zeroes' is NULL here */ ret =3D qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookiei= nlen, - cookieout, cookieoutlen, flags, resource, &s= pec, + cookieout, cookieoutlen, flags, bandwidth, &= spec, dconn, graphicsuri, migrate_disks, NULL, migParams, NULL); =20 @@ -5534,7 +5534,7 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driv= er, const char *dconnuri, unsigned int flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, qemuMigrationParams *migParams) { virDomainPtr ddomain =3D NULL; @@ -5548,9 +5548,9 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driv= er, unsigned long destflags; =20 VIR_DEBUG("driver=3D%p, sconn=3D%p, dconn=3D%p, vm=3D%p, dconnuri=3D%s= , " - "flags=3D0x%x, dname=3D%s, resource=3D%lu", + "flags=3D0x%x, dname=3D%s, bandwidth=3D%lu", driver, sconn, dconn, vm, NULLSTR(dconnuri), - flags, NULLSTR(dname), resource); + flags, NULLSTR(dname), bandwidth); =20 /* In version 2 of the protocol, the prepare step is slightly * different. We fetch the domain XML of the source domain @@ -5579,14 +5579,14 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *dr= iver, =20 qemuDomainObjEnterRemote(vm); ret =3D dconn->driver->domainMigratePrepareTunnel - (dconn, st, destflags, dname, resource, dom_xml); + (dconn, st, destflags, dname, bandwidth, dom_xml); if (qemuDomainObjExitRemote(vm, true) < 0) goto cleanup; } else { qemuDomainObjEnterRemote(vm); ret =3D dconn->driver->domainMigratePrepare2 (dconn, &cookie, &cookielen, NULL, &uri_out, - destflags, dname, resource, dom_xml); + destflags, dname, bandwidth, dom_xml); if (qemuDomainObjExitRemote(vm, true) < 0) goto cleanup; } @@ -5611,13 +5611,13 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *dr= iver, if (flags & VIR_MIGRATE_TUNNELLED) ret =3D qemuMigrationSrcPerformTunnel(driver, vm, st, NULL, NULL, 0, NULL, NULL, - flags, resource, dconn, + flags, bandwidth, dconn, NULL, NULL, migParams); else ret =3D qemuMigrationSrcPerformNative(driver, vm, NULL, uri_out, cookie, cookielen, NULL, NULL, /* No out cookie w= ith v2 migration */ - flags, resource, dconn, NULL, = NULL, + flags, bandwidth, dconn, NULL,= NULL, NULL, migParams, NULL); =20 /* Perform failed. Make sure Finish doesn't overwrite the error */ @@ -6075,7 +6075,7 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *drive= r, qemuMigrationParams *migParams, unsigned int flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, bool *v3proto) { int ret =3D -1; @@ -6091,11 +6091,11 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *dri= ver, VIR_DEBUG("driver=3D%p, sconn=3D%p, vm=3D%p, xmlin=3D%s, dconnuri=3D%s= , uri=3D%s, " "graphicsuri=3D%s, listenAddress=3D%s, " "migrate_disks=3D%p, nbdPort=3D%d, nbdURI=3D%s, flags=3D0x%x= , " - "dname=3D%s, resource=3D%lu", + "dname=3D%s, bandwidth=3D%lu", driver, sconn, vm, NULLSTR(xmlin), NULLSTR(dconnuri), NULLSTR(uri), NULLSTR(graphicsuri), NULLSTR(listenAddress), migrate_disks, nbdPort, NULLSTR(nbdURI), - flags, NULLSTR(dname), resource); + flags, NULLSTR(dname), bandwidth); =20 if (flags & VIR_MIGRATE_TUNNELLED && uri) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", @@ -6195,11 +6195,11 @@ qemuMigrationSrcPerformPeer2Peer(virQEMUDriver *dri= ver, ret =3D qemuMigrationSrcPerformPeer2Peer3(driver, sconn, dconn, dc= onnuri, vm, xmlin, persist_xml, dname, uri, g= raphicsuri, listenAddress, migrate_dis= ks, migrate_disks_detect_zeroes, - nbdPort, nbdURI, migParams= , resource, + nbdPort, nbdURI, migParams= , bandwidth, !!useParams, flags); } else { ret =3D qemuMigrationSrcPerformPeer2Peer2(driver, sconn, dconn, vm, - dconnuri, flags, dname, re= source, + dconnuri, flags, dname, ba= ndwidth, migParams); } =20 @@ -6241,7 +6241,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, int *cookieoutlen, unsigned int flags, const char *dname, - unsigned long resource, + unsigned long bandwidth, bool v3proto) { virObjectEvent *event =3D NULL; @@ -6283,7 +6283,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, dconnuri, uri, graphicsuri,= listenAddress, migrate_disks, migrate_disk= s_detect_zeroes, nbdPort, nbdURI, - migParams, flags, dname, re= source, + migParams, flags, dname, ba= ndwidth, &v3proto); } else { if (qemuMigrationJobStartPhase(vm, QEMU_MIGRATION_PHASE_PERFORM2) = < 0) @@ -6291,7 +6291,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, =20 ret =3D qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri= , cookiein, cookieinlen, cookieout, cookieoutlen, - flags, resource, NULL, NULL, N= ULL, NULL, + flags, bandwidth, NULL, NULL, = NULL, NULL, migParams, nbdURI); } if (ret < 0) @@ -6365,7 +6365,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, char **cookieout, int *cookieoutlen, unsigned int flags, - unsigned long resource, + unsigned long bandwidth, const char *nbdURI) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -6393,7 +6393,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, =20 if (qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookie= in, cookieinlen, cookieout, cookieoutlen, - flags, resource, NULL, graphicsuri, + flags, bandwidth, NULL, graphicsuri, migrate_disks, migrate_disks_detect_= zeroes, migParams, nbdURI) < 0) goto cleanup; --=20 2.49.0 From nobody Mon Sep 8 21:39:53 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=1749126097; cv=none; d=zohomail.com; s=zohoarc; b=TGpd2Y8tncYM4AtiPS56nLlc6ZT9kucTCJaPP8HHLk62nRdo9Fdmm6FCs1MM3vu7EAApYeeuqBEfQzdVTfD3E9l5waLylJFflKCFwH5DR9Zgy38Z4XWjNR89XGYfqNzIYI/Odi+vIVS0a4R7d/c2zbg2hrz5Qc+VeLPW+TeevyE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749126097; 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=P9w4J5/85wE2AE6F/9n4bBfBl63zTC/TBt4MaLz0fTg=; b=RcgBv1XeyZxEAX+Sr6UE71zmV7+Gc/GQaNw7G2b4oXK2OobDuEH9ILFJS9yonUJ4aW76VTlwE7H7v5doFP7JX21h9VnRqTxebL5M3Io8w+v3NgxBbMzTQbzg0ZNMCOOIqSrxeLKHaZperJHuGZ6EAVukMz6AFybSswqg2zj0UXs= 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 1749126097264164.9564645480666; Thu, 5 Jun 2025 05:21:37 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 54841A35; Thu, 5 Jun 2025 08:21:36 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id E685A1547; Thu, 5 Jun 2025 08:16:47 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 237D312BA; Thu, 5 Jun 2025 08:16:41 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 D8C9112BA for ; Thu, 5 Jun 2025 08:16:25 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-322-9h7W8PhiMG-BY_Re21qtiQ-1; Thu, 05 Jun 2025 08:16:23 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0E232195608C for ; Thu, 5 Jun 2025 12:16:23 +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 5872F1956096 for ; Thu, 5 Jun 2025 12:16:22 +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=1749125785; 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=ChaQDg9Qs62peE9g/J7jk9FXUhHF2/cjBCRjp2APglA=; b=KJXJ9EjEI4RPhDwjxPI1fLfSeZ40QS/sAQnRZg6MPTHBjeN3c9rf0DFS+FmMMeT0CGj00+ 55LY19hIq4ffcVg9EKxIXrWvWZDGB7u7nBo4bE2V99LZIdhH7BYaPKw+JOiilEKsY9U+2n iOF6AT+d40mDJkJnvDZgmhC7OdBwwe0= X-MC-Unique: 9h7W8PhiMG-BY_Re21qtiQ-1 X-Mimecast-MFC-AGG-ID: 9h7W8PhiMG-BY_Re21qtiQ_1749125783 To: devel@lists.libvirt.org Subject: [PATCH 10/10] gendispatch: Finish rename of the migration argument Date: Thu, 5 Jun 2025 14:16:07 +0200 Message-ID: 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: QAct_CeCcFf4dDotb6H04qHTjFZTt1mt1ph4lxcB_u8_1749125783 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QM5UOH4VLDD2PE62FW656UCTT53MFFEL X-Message-ID-Hash: QM5UOH4VLDD2PE62FW656UCTT53MFFEL 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: 1749126099218116600 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik This patch is useless. Either APIs it don't have 'resource' nor 'bandwidth' argument to begin with, or they serve as a wrapper over different API (changed in previous commits). Nonetheless, in the name of consistency, let's just change those variable names. Signed-off-by: Michal Privoznik Reviewed-by: J=C3=A1n Tomko --- src/rpc/gendispatch.pl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index dd3362c831..8cb7d7eda2 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -394,15 +394,15 @@ close(PROTOCOL); # hyper to [unsigned] long long my $long_legacy =3D { DomainGetInfo =3D> { ret =3D> { maxMem =3D> 1, memory = =3D> 1 } }, - DomainMigrate =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, - DomainMigrate2 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, + DomainMigrate =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, + DomainMigrate2 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigrateBegin3 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, - DomainMigrateConfirm3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, - DomainMigrateDirect =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, + DomainMigrateConfirm3 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, + DomainMigrateDirect =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigrateFinish =3D> { arg =3D> { flags =3D> 1 } }, DomainMigrateFinish2 =3D> { arg =3D> { flags =3D> 1 } }, DomainMigrateFinish3 =3D> { arg =3D> { flags =3D> 1 } }, - DomainMigratePeer2Peer =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, + DomainMigratePeer2Peer =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigratePerform =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigratePerform3 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigratePrepare =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, @@ -410,11 +410,11 @@ my $long_legacy =3D { 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, bandwidth = =3D> 1 } }, - DomainMigrateToURI =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, - DomainMigrateToURI2 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, - DomainMigrateVersion1 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, - DomainMigrateVersion2 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, - DomainMigrateVersion3 =3D> { arg =3D> { flags =3D> 1, resource = =3D> 1 } }, + DomainMigrateToURI =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, + DomainMigrateToURI2 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, + DomainMigrateVersion1 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, + DomainMigrateVersion2 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, + DomainMigrateVersion3 =3D> { arg =3D> { flags =3D> 1, bandwidth = =3D> 1 } }, DomainMigrateSetMaxSpeed =3D> { arg =3D> { bandwidth =3D> 1 } }, DomainSetMaxMemory =3D> { arg =3D> { memory =3D> 1 } }, DomainSetMemory =3D> { arg =3D> { memory =3D> 1 } }, --=20 2.49.0