src: Unify argument name of virDomainMigratePrepareTunnel()

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 confusion. Unify the name.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
index cd0b32c455db3493bb837fac5c5b135ef3f44058..975a6b97005610246ce7eb1bb46ae92edd3cda06 100644 (file)
--- 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 626d794a8c096d313ef8c5c7b1cae5633d52d4f1..51510c34b3ce1732849a5410234d2b7b56257803 100644 (file)
--- 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 1703d71d75bb55ae60baa4a6dfb239512ff63588..6a5f76cdb52c5fa6e160f95b3996526653ffed13 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10761,7 +10761,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 ad29ecbd0652a2b3689c1419e79df5ce2b0a0992..9457bb603d2c1c17ceaa01c0b86c006434b4a1a9 100644 (file)
--- 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 ced8120bab795babc93d555434e408e0cd2442e6..6cf7b8e9e3f842dcd6968bc6822ce94fce349650 100644 (file)
--- 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 e867dda9c97e96cd5196bbd97b98abcd174c816c..0cc4d3fe42ee748f98b7a0e126a98fb04c8def32 100755 (executable)
--- 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 } },