src: Unify argument name of virDomainMigratePrepareTunnel3()

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 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 8302f0b42e916c1a6c4745ef6bfa8a082da3d7e9..c0099198bbb55f36a4febcee2e17c80f938007a0 100644 (file)
--- 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);
 
 

diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h
index 62ba807ec56843788cf5fdac21e5f758d1539d32..293a11be4ea34b4fa3dd79739769f76beae1bcaa 100644 (file)
--- 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);
 
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a6451077c174877aee822e64fa7d327973ed69f2..b2f7e76fd6fa3f49df081984b555a485626b9d9f 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11192,7 +11192,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 = dconn->privateData;

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 42f98f132f4ec7367b5d555d4160c1d41996163a..815be8548d12d700840729fc19764c49b2d94fff 100644 (file)
--- 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 = dconn->privateData;
@@ -5769,7 +5769,7 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn,
     args.cookie_in.cookie_in_len = cookieinlen;
     args.flags = flags;
     args.dname = dname == NULL ? NULL : (char **) &dname;
-    args.resource = resource;
+    args.bandwidth = bandwidth;
     args.dom_xml = (char *) dom_xml;
 
     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 a56b4cdeb90e1e11d8454a0f3313ba8e71dc8f44..f6d0ad30b68bad7f3c3802869f778b9e696d4616 100644 (file)
--- 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<REMOTE_MIGRATE_COOKIE_MAX>;
     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 e3d16ea0619a0546eabf6094c693ade18ae2add2..370a5e234491ea5153cb972b2a641b5e36aa8edd 100644 (file)
--- 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 4c699337b16105070b3517b3cfbcaea1b25d5391..abc260ea5683041a90626d26d6681d010c431ebf 100755 (executable)
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -409,7 +409,7 @@ my $long_legacy = {
     DomainMigratePrepare2       => { arg => { flags => 1, bandwidth => 1 } },
     DomainMigratePrepare3       => { arg => { flags => 1, bandwidth => 1 } },
     DomainMigratePrepareTunnel  => { arg => { flags => 1, bandwidth => 1 } },
-    DomainMigratePrepareTunnel3 => { arg => { flags => 1, resource => 1 } },
+    DomainMigratePrepareTunnel3 => { arg => { flags => 1, bandwidth => 1 } },
     DomainMigrateToURI          => { arg => { flags => 1, resource => 1 } },
     DomainMigrateToURI2         => { arg => { flags => 1, resource => 1 } },
     DomainMigrateVersion1       => { arg => { flags => 1, resource => 1 } },