conf: make virDomainNetGetActualBandwidth arg/return value const

In this case, the virNetDevBandwidthPtr that is returned is not to a
region within the virDomainNetDef arg, but points elsewhere (the
NetDef has the pointer, not the entire object), so technically it's
not necessary to make the return value a const, but it's a bit
disingenuous to *not* do it.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 86416937fde5109a505f4486f00902630970aa85..5df9f7a8a16e5e79d368874f068a3a8497d52d57 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -29554,8 +29554,8 @@ virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface)
     }
 }
 
-virNetDevBandwidthPtr
-virDomainNetGetActualBandwidth(virDomainNetDefPtr iface)
+const virNetDevBandwidth *
+virDomainNetGetActualBandwidth(const virDomainNetDef *iface)
 {
     /* if there is an ActualNetDef, *always* return
      * its bandwidth rather than the NetDef's bandwidth.

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 443d4fa2a3e8c8938d77f81aea7a6422a4f2b5b1..2696c6f6a016aa1a7333fd8826852e4ebc045817 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3215,8 +3215,8 @@ int virDomainNetGetActualDirectMode(virDomainNetDefPtr iface);
 virDomainHostdevDefPtr virDomainNetGetActualHostdev(virDomainNetDefPtr iface);
 virNetDevVPortProfilePtr
 virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface);
-virNetDevBandwidthPtr
-virDomainNetGetActualBandwidth(virDomainNetDefPtr iface);
+const virNetDevBandwidth *
+virDomainNetGetActualBandwidth(const virDomainNetDef *iface);
 const virNetDevVlan *virDomainNetGetActualVlan(const virDomainNetDef *iface);
 bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface);
 const char *virDomainNetGetModelString(const virDomainNetDef *net);

diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index dd1a63a5cf84bbf74704e705d4c1fcd43ef38533..a6b41976c694076409b369c013d3219e46a4f8f2 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -260,7 +260,7 @@ virNetDevBandwidthRateFormat(virNetDevBandwidthRatePtr def,
  * Returns 0 on success, else -1.
  */
 int
-virNetDevBandwidthFormat(virNetDevBandwidthPtr def,
+virNetDevBandwidthFormat(const virNetDevBandwidth *def,
                          unsigned int class_id,
                          virBufferPtr buf)
 {

diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h
index 898b2fb4286802a745049ddc064f0f71f448a747..0004e48a4acb3d11d5b32653432965f3f6fdba21 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.h
+++ b/src/conf/netdev_bandwidth_conf.h
@@ -29,7 +29,7 @@ int virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
                             xmlNodePtr node,
                             bool allowFloor)
     ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT;
-int virNetDevBandwidthFormat(virNetDevBandwidthPtr def,
+int virNetDevBandwidthFormat(const virNetDevBandwidth *def,
                              unsigned int class_id,
                              virBufferPtr buf);
 

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 636f188eb106df2c3adaeff443f9db35516e4264..ed461cd12df98500a16f7e66c694fb049d12a132 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1202,7 +1202,7 @@ libxlMakeNic(virDomainDefPtr def,
     virDomainNetType actual_type = virDomainNetGetActualType(l_nic);
     virNetworkPtr network = NULL;
     virConnectPtr conn = NULL;
-    virNetDevBandwidthPtr actual_bw;
+    const virNetDevBandwidth *actual_bw;
     virNetDevVPortProfilePtr port_profile;
     const virNetDevVlan *virt_vlan;
     virBuffer buf = VIR_BUFFER_INITIALIZER;

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index ea86451b0955cb1824a94b53d20347fd0d0d6037..dda786d772e1753058cf76c33b37a94e2ab240e0 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -3812,7 +3812,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn,
     virLXCDomainObjPrivatePtr priv = vm->privateData;
     int ret = -1;
     virDomainNetType actualType;
-    virNetDevBandwidthPtr actualBandwidth;
+    const virNetDevBandwidth *actualBandwidth;
     char *veth = NULL;
 
     if (!priv->initpid) {

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 012d4823374e72e7321b1fd228d72f85b5cd79b0..c91f372eb1fe9931dad66cf2808fd5f09734d4a2 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -333,7 +333,7 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn,
     char *ret = NULL;
     char *res_ifname = NULL;
     virLXCDriverPtr driver = conn->privateData;
-    virNetDevBandwidthPtr bw;
+    const virNetDevBandwidth *bw;
     virNetDevVPortProfilePtr prof;
     virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver);
     const char *linkdev = virDomainNetGetActualDirectDev(net);
@@ -546,7 +546,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn,
 
     for (i = 0; i < def->nnets; i++) {
         char *veth = NULL;
-        virNetDevBandwidthPtr actualBandwidth;
+        const virNetDevBandwidth *actualBandwidth;
         /* If appropriate, grab a physical device from the configured
          * network's pool of devices, or resolve bridge device name
          * to the one defined in the network definition.

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 14afb906cb081d3d56cb2f153aea65f89c68d3ba..3465d28b844183e34bdad35757a9ced7aa918d23 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8295,7 +8295,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
     char **vhostfdName = NULL;
     g_autofree char *slirpfdName = NULL;
     virDomainNetType actualType = virDomainNetGetActualType(net);
-    virNetDevBandwidthPtr actualBandwidth;
+    const virNetDevBandwidth *actualBandwidth;
     bool requireNicdev = false;
     qemuSlirpPtr slirp;
     size_t i;

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index b1494d342aece7154732855a82c3fc9cb7e833cf..7f3d7d8ed43e987c7429d13aeb172635c7f0b12b 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1147,7 +1147,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
     bool releaseaddr = false;
     bool iface_connected = false;
     virDomainNetType actualType;
-    virNetDevBandwidthPtr actualBandwidth;
+    const virNetDevBandwidth *actualBandwidth;
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     virDomainCCWAddressSetPtr ccwaddrs = NULL;
     size_t i;
@@ -3812,7 +3812,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
     }
 
     if (needBandwidthSet) {
-        virNetDevBandwidthPtr newb = virDomainNetGetActualBandwidth(newdev);
+        const virNetDevBandwidth *newb = virDomainNetGetActualBandwidth(newdev);
 
         if (newb) {
             if (virNetDevBandwidthSet(newdev->ifname, newb, false,

diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 1f1872464ab8328eac863ce1c2f6e2d481ff6997..094821cd3022b1a259adba9fe6c1effe298a0faa 100644 (file)
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -188,7 +188,7 @@ virNetDevBandwidthManipulateFilter(const char *ifname,
  */
 int
 virNetDevBandwidthSet(const char *ifname,
-                      virNetDevBandwidthPtr bandwidth,
+                      const virNetDevBandwidth *bandwidth,
                       bool hierarchical_class,
                       bool swapped)
 {
@@ -478,8 +478,8 @@ virNetDevBandwidthCopy(virNetDevBandwidthPtr *dest,
 }
 
 bool
-virNetDevBandwidthEqual(virNetDevBandwidthPtr a,
-                        virNetDevBandwidthPtr b)
+virNetDevBandwidthEqual(const virNetDevBandwidth *a,
+                        const virNetDevBandwidth *b)
 {
     if (!a && !b)
         return true;

diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h
index 19323c5ed2eb182f4ff8a1102d7e5d0f44754024..871d0c962c6ef6a909f813f670c810408ccc60d7 100644 (file)
--- a/src/util/virnetdevbandwidth.h
+++ b/src/util/virnetdevbandwidth.h
@@ -39,7 +39,7 @@ struct _virNetDevBandwidth {
 void virNetDevBandwidthFree(virNetDevBandwidthPtr def);
 
 int virNetDevBandwidthSet(const char *ifname,
-                          virNetDevBandwidthPtr bandwidth,
+                          const virNetDevBandwidth *bandwidth,
                           bool hierarchical_class,
                           bool swapped)
     G_GNUC_WARN_UNUSED_RESULT;
@@ -48,7 +48,7 @@ int virNetDevBandwidthCopy(virNetDevBandwidthPtr *dest,
                            const virNetDevBandwidth *src)
     ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT;
 
-bool virNetDevBandwidthEqual(virNetDevBandwidthPtr a, virNetDevBandwidthPtr b);
+bool virNetDevBandwidthEqual(const virNetDevBandwidth *a, const virNetDevBandwidth *b);
 
 int virNetDevBandwidthPlug(const char *brname,
                            virNetDevBandwidthPtr net_bandwidth,