src: Unify argument name of virDomainMigratePrepare2()

The virDomainMigratePrepare2() 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 65c20cbb74b09653c9c660b3a84107044937b870..cd0b32c455db3493bb837fac5c5b135ef3f44058 100644 (file)
--- a/src/driver-hypervisor.h
+++ b/src/driver-hypervisor.h
@@ -644,7 +644,7 @@ typedef int
                                char **uri_out,
                                unsigned long flags,
                                const char *dname,
-                               unsigned long resource,
+                               unsigned long bandwidth,
                                const char *dom_xml);
 
 typedef virDomainPtr

diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h
index aead4dbfb61b8497e90150567e52552197666d51..626d794a8c096d313ef8c5c7b1cae5633d52d4f1 100644 (file)
--- a/src/libvirt_internal.h
+++ b/src/libvirt_internal.h
@@ -167,7 +167,7 @@ int virDomainMigratePrepare2 (virConnectPtr dconn,
                               char **uri_out,
                               unsigned long flags,
                               const char *dname,
-                              unsigned long resource,
+                              unsigned long bandwidth,
                               const char *dom_xml);
 virDomainPtr virDomainMigrateFinish2 (virConnectPtr dconn,
                                       const char *dname,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6e0ee785e07e31ceb0e31223d0b17a8a6e4666a7..1703d71d75bb55ae60baa4a6dfb239512ff63588 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10811,7 +10811,7 @@ qemuDomainMigratePrepare2(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 229bd677bb913ceeee54bfa6224ff244cf1bbe62..7ebaca6cf1acb0253ea8451c66398bab195170f4 100644 (file)
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -3125,7 +3125,7 @@ remoteDispatchDomainMigratePrepare2(virNetServer *server G_GNUC_UNUSED,
 
     if (virDomainMigratePrepare2(conn, &cookie, &cookielen,
                                  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 1609c6b391dcf78542f818c101715e76a62e250b..1d1b88df299df30b0ae579f2aa816e4d508a7858 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -2367,7 +2367,7 @@ remoteDomainMigratePrepare2(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,
                             const char *dom_xml)
 {
     remote_domain_migrate_prepare2_args args = {0};
@@ -2378,7 +2378,7 @@ remoteDomainMigratePrepare2(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_PREPARE2,

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 9210c0dc1ca1e52ee29fc101875287da00411d9f..ad29ecbd0652a2b3689c1419e79df5ce2b0a0992 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -1087,7 +1087,7 @@ struct remote_domain_migrate_prepare2_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 5c30e9d1073e76c1382da1222902e6c184375bfa..ced8120bab795babc93d555434e408e0cd2442e6 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -664,7 +664,7 @@ struct remote_domain_migrate_prepare2_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_prepare2_ret {

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