src: Unify argument name of virDomainMigratePerform3()

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
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 3f367806eedcb7a0086a6cf2a480f9cabde6b654..6a43688b0c48469467601fcfc1e46cef55c0d013 100644 (file)
--- 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);
 
 typedef virDomainPtr
 (*virDrvDomainMigrateFinish3)(virConnectPtr dconn,

diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h
index df99fe260c8257314bd02f4e8664b1c26955ca18..b3376e4a24199bf9567bf6076cbf74768bd584f0 100644 (file)
--- 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);
 
 virDomainPtr virDomainMigrateFinish3(virConnectPtr dconn,
                                      const char *dname,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c87e981cc0f05abb5aa8bddb9c396bb9c17a4c0a..2c06e50454a53f59414fb9b861314124f5bcaf4f 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11288,7 +11288,7 @@ qemuDomainMigratePerform3(virDomainPtr dom,
                           const char *uri,
                           unsigned long flags,
                           const char *dname,
-                          unsigned long resource)
+                          unsigned long bandwidth)
 {
     virQEMUDriver *driver = dom->conn->privateData;
     virDomainObj *vm = NULL;
@@ -11312,7 +11312,7 @@ qemuDomainMigratePerform3(virDomainPtr dom,
                                   NULL, migParams,
                                   cookiein, cookieinlen,
                                   cookieout, cookieoutlen,
-                                  flags, dname, resource, true);
+                                  flags, dname, bandwidth, true);
 
  cleanup:
     virDomainObjEndAPI(&vm);

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index 2abfe7bf3b456a05045ffe0645f7ac99085b3466..7e74ff063f5b6eb093824b2db33fbcf2288b95c8 100644 (file)
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -4910,7 +4910,7 @@ remoteDispatchDomainMigratePerform3(virNetServer *server 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;
 
     /* remoteDispatchClientRequest will free cookie

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 8fd387fc1c91924a38275b49e1127ada95633961..ec71eaed8762968bfa4a8fc4fad72053f8413cfc 100644 (file)
--- 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 = {0};
     g_auto(remote_domain_migrate_perform3_ret) ret = {0};
@@ -5822,7 +5822,7 @@ remoteDomainMigratePerform3(virDomainPtr dom,
     args.dname = dname == NULL ? NULL : (char **) &dname;
     args.uri = uri == NULL ? NULL : (char **) &uri;
     args.dconnuri = dconnuri == NULL ? NULL : (char **) &dconnuri;
-    args.resource = resource;
+    args.bandwidth = bandwidth;
 
     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 21aaf615baaf832348888f840f6627e90281891d..3c9320321031b3d7392df053041ab391435d26db 100644 (file)
--- 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;
 };
 
 struct remote_domain_migrate_perform3_ret {

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index 63a51e33621d49ad41ec27f30798fd97519ee9bc..0f87d13a5ae142401b8ec0d83366499ffb95baf6 100644 (file)
--- 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 1a7d09056e04fd74148f99740d89c8e3d88cd1f8..dd3362c8313ace125a5908cea9a91af740cde83e 100755 (executable)
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -404,7 +404,7 @@ my $long_legacy = {
     DomainMigrateFinish3        => { arg => { flags => 1 } },
     DomainMigratePeer2Peer      => { arg => { flags => 1, resource => 1 } },
     DomainMigratePerform        => { arg => { flags => 1, bandwidth => 1 } },
-    DomainMigratePerform3       => { arg => { flags => 1, resource => 1 } },
+    DomainMigratePerform3       => { arg => { flags => 1, bandwidth => 1 } },
     DomainMigratePrepare        => { arg => { flags => 1, bandwidth => 1 } },
     DomainMigratePrepare2       => { arg => { flags => 1, bandwidth => 1 } },
     DomainMigratePrepare3       => { arg => { flags => 1, bandwidth => 1 } },