From nobody Tue Sep 9 03:19:54 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 --- 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