src: Unify argument name of virDomainMigratePrepare3()

The virDomainMigratePrepare3() 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 975a6b97005610246ce7eb1bb46ae92edd3cda06..8302f0b42e916c1a6c4745ef6bfa8a082da3d7e9 100644 (file)
--- a/src/driver-hypervisor.h
+++ b/src/driver-hypervisor.h
@@ -993,7 +993,7 @@ typedef int
                                char **uri_out,
                                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 51510c34b3ce1732849a5410234d2b7b56257803..62ba807ec56843788cf5fdac21e5f758d1539d32 100644 (file)
--- a/src/libvirt_internal.h
+++ b/src/libvirt_internal.h
@@ -201,7 +201,7 @@ int virDomainMigratePrepare3(virConnectPtr dconn,
                              char **uri_out,
                              unsigned long flags,
                              const char *dname,
-                             unsigned long resource,
+                             unsigned long bandwidth,
                              const char *dom_xml);
 
 int virDomainMigratePrepareTunnel3(virConnectPtr dconn,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6a5f76cdb52c5fa6e160f95b3996526653ffed13..a6451077c174877aee822e64fa7d327973ed69f2 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11041,7 +11041,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn,
                           char **uri_out,
                           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_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
index 7ebaca6cf1acb0253ea8451c66398bab195170f4..12ad1ce548ffaaa08b018ff6d8f2619438fbdfd3 100644 (file)
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -4855,7 +4855,7 @@ remoteDispatchDomainMigratePrepare3(virNetServer *server G_GNUC_UNUSED,
                                  args->cookie_in.cookie_in_len,
                                  &cookieout, &cookieoutlen,
                                  uri_in, uri_out,
-                                 args->flags, dname, args->resource,
+                                 args->flags, dname, args->bandwidth,
                                  args->dom_xml) < 0)
         goto cleanup;
 

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 1d1b88df299df30b0ae579f2aa816e4d508a7858..42f98f132f4ec7367b5d555d4160c1d41996163a 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -5691,7 +5691,7 @@ remoteDomainMigratePrepare3(virConnectPtr dconn,
                             char **uri_out,
                             unsigned long flags,
                             const char *dname,
-                            unsigned long resource,
+                            unsigned long bandwidth,
                             const char *dom_xml)
 {
     remote_domain_migrate_prepare3_args args = {0};
@@ -5704,7 +5704,7 @@ remoteDomainMigratePrepare3(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;
     args.dom_xml = (char *) dom_xml;
 
     if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE3,

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 9457bb603d2c1c17ceaa01c0b86c006434b4a1a9..a56b4cdeb90e1e11d8454a0f3313ba8e71dc8f44 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -2960,7 +2960,7 @@ struct remote_domain_migrate_prepare3_args {
     remote_string uri_in;
     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 6cf7b8e9e3f842dcd6968bc6822ce94fce349650..e3d16ea0619a0546eabf6094c693ade18ae2add2 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -2279,7 +2279,7 @@ struct remote_domain_migrate_prepare3_args {
         remote_string              uri_in;
         uint64_t                   flags;
         remote_string              dname;
-        uint64_t                   resource;
+        uint64_t                   bandwidth;
         remote_nonnull_string      dom_xml;
 };
 struct remote_domain_migrate_prepare3_ret {

diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index 0cc4d3fe42ee748f98b7a0e126a98fb04c8def32..4c699337b16105070b3517b3cfbcaea1b25d5391 100755 (executable)
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -407,7 +407,7 @@ my $long_legacy = {
     DomainMigratePerform3       => { arg => { flags => 1, resource => 1 } },
     DomainMigratePrepare        => { arg => { flags => 1, bandwidth => 1 } },
     DomainMigratePrepare2       => { arg => { flags => 1, bandwidth => 1 } },
-    DomainMigratePrepare3       => { arg => { flags => 1, resource => 1 } },
+    DomainMigratePrepare3       => { arg => { flags => 1, bandwidth => 1 } },
     DomainMigratePrepareTunnel  => { arg => { flags => 1, bandwidth => 1 } },
     DomainMigratePrepareTunnel3 => { arg => { flags => 1, resource => 1 } },
     DomainMigrateToURI          => { arg => { flags => 1, resource => 1 } },