From: Michal Privoznik <mpriv...@redhat.com>
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 <mpriv...@redhat.com>
---
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);
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);
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 = 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;
};
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 = {
DomainMigratePrepare => { arg => { flags => 1, bandwidth => 1 } },
DomainMigratePrepare2 => { arg => { flags => 1, bandwidth => 1 } },
DomainMigratePrepare3 => { arg => { flags => 1, resource => 1 } },
- DomainMigratePrepareTunnel => { arg => { flags => 1, resource => 1 } },
+ DomainMigratePrepareTunnel => { arg => { flags => 1, bandwidth => 1 } },
DomainMigratePrepareTunnel3 => { arg => { flags => 1, resource => 1 } },
DomainMigrateToURI => { arg => { flags => 1, resource => 1 } },
DomainMigrateToURI2 => { arg => { flags => 1, resource => 1 } },
--
2.49.0
