src: Unify argument name of virDomainMigratePrepare()

The virDomainMigratePrepare() 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 8e080620bb38ab8754984e64168d87ea07b1a0a4..fa2c08391f413750ed63c4013f2170bc51b1ddbc 100644 (file)
--- a/src/driver-hypervisor.h
+++ b/src/driver-hypervisor.h
@@ -584,7 +584,7 @@ typedef int
                               char **uri_out,
                               unsigned long flags,
                               const char *dname,
-                              unsigned long resource);
+                              unsigned long bandwidth);
 
 typedef int
 (*virDrvDomainMigratePerform)(virDomainPtr domain,

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 512ca6c0282db1590f4a98cba4355494303a5008..34c0e28d315bebd090437e78f08eb8d35358c3ce 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -3614,7 +3614,7 @@ esxDomainMigratePrepare(virConnectPtr dconn,
                         char **uri_out,
                         unsigned long flags,
                         const char *dname G_GNUC_UNUSED,
-                        unsigned long resource G_GNUC_UNUSED)
+                        unsigned long bandwidth G_GNUC_UNUSED)
 {
     esxPrivate *priv = dconn->privateData;
 

diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h
index 1ae3e2b2e0f7bc623e39a1c4a54b94855803571d..c532218226baa42204a15e24a6f643edf3631677 100644 (file)
--- a/src/libvirt_internal.h
+++ b/src/libvirt_internal.h
@@ -146,7 +146,7 @@ int virDomainMigratePrepare (virConnectPtr dconn,
                              char **uri_out,
                              unsigned long flags,
                              const char *dname,
-                             unsigned long resource);
+                             unsigned long bandwidth);
 int virDomainMigratePerform (virDomainPtr domain,
                              const char *cookie,
                              int cookielen,

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index 5dfed7ceefe6daf4079d66a610ebb308dc7ce505..229bd677bb913ceeee54bfa6224ff244cf1bbe62 100644 (file)
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -3075,7 +3075,7 @@ remoteDispatchDomainMigratePrepare(virNetServer *server G_GNUC_UNUSED,
 
     if (virDomainMigratePrepare(conn, &cookie, &cookielen,
                                 uri_in, uri_out,
-                                args->flags, dname, args->resource) < 0)
+                                args->flags, dname, args->bandwidth) < 0)
         goto cleanup;
 
     /* remoteDispatchClientRequest will free cookie, uri_out and

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 2690c05267f76cd98ee8317da6684be266d2512b..1609c6b391dcf78542f818c101715e76a62e250b 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -2333,7 +2333,7 @@ remoteDomainMigratePrepare(virConnectPtr dconn,
                            char **cookie, int *cookielen,
                            const char *uri_in, char **uri_out,
                            unsigned long flags, const char *dname,
-                           unsigned long resource)
+                           unsigned long bandwidth)
 {
     remote_domain_migrate_prepare_args args = {0};
     g_auto(remote_domain_migrate_prepare_ret) ret = {0};
@@ -2343,7 +2343,7 @@ remoteDomainMigratePrepare(virConnectPtr dconn,
     args.uri_in = uri_in == NULL ? NULL : (char **) &uri_in;
     args.flags = flags;
     args.dname = dname == NULL ? NULL : (char **) &dname;
-    args.resource = resource;
+    args.bandwidth = bandwidth;
 
     if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE,
              (xdrproc_t) xdr_remote_domain_migrate_prepare_args, (char *) &args,

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 57cd5796af5773bc5877c9cefc4dbe429ae4d339..2dc0a6fea6becd58105ee0ca350ed698217a133b 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -1055,7 +1055,7 @@ struct remote_domain_migrate_prepare_args {
     remote_string uri_in;
     unsigned hyper flags;
     remote_string dname;
-    unsigned hyper resource;
+    unsigned hyper bandwidth;
 };
 
 struct remote_domain_migrate_prepare_ret {

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index dd612b4dc67fc36810b4e22c6e74d8380967aabf..50fcdaa1341a8992b06d24a89c14205cabf1cf6b 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -628,7 +628,7 @@ struct remote_domain_migrate_prepare_args {
         remote_string              uri_in;
         uint64_t                   flags;
         remote_string              dname;
-        uint64_t                   resource;
+        uint64_t                   bandwidth;
 };
 struct remote_domain_migrate_prepare_ret {
         struct {

diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index f9fae39fb1d612dc9a2227aa5e7be4154fc14725..2b7fd657cbdfd2450d3bada2f62be657f309b990 100755 (executable)
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -405,7 +405,7 @@ my $long_legacy = {
     DomainMigratePeer2Peer      => { arg => { flags => 1, resource => 1 } },
     DomainMigratePerform        => { arg => { flags => 1, resource => 1 } },
     DomainMigratePerform3       => { arg => { flags => 1, resource => 1 } },
-    DomainMigratePrepare        => { arg => { flags => 1, resource => 1 } },
+    DomainMigratePrepare        => { arg => { flags => 1, bandwidth => 1 } },
     DomainMigratePrepare2       => { arg => { flags => 1, resource => 1 } },
     DomainMigratePrepare3       => { arg => { flags => 1, resource => 1 } },
     DomainMigratePrepareTunnel  => { arg => { flags => 1, resource => 1 } },