conf: rename virNetDevSupportBandwidth to virNetDevSupportsBandwidth

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Mores <pmores@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index 5cbb9f46e446c21a9015949f2dfd81e7ebed5ce6..349b451e414f2ca8e8aca16917d4f660cc237aca 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -293,7 +293,7 @@ virDomainClearNetBandwidth(virDomainObjPtr vm)
     for (i = 0; i < vm->def->nnets; i++) {
         type = virDomainNetGetActualType(vm->def->nets[i]);
         if (virDomainNetGetActualBandwidth(vm->def->nets[i]) &&
-            virNetDevSupportBandwidth(type))
+            virNetDevSupportsBandwidth(type))
             virNetDevBandwidthClear(vm->def->nets[i]->ifname);
     }
 }

diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h
index b9e57168be8921f73976850940d8d470b0fe8a8f..172f9a50f932d46b556d41f92d27c26364a001e8 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.h
+++ b/src/conf/netdev_bandwidth_conf.h
@@ -37,7 +37,7 @@ int virNetDevBandwidthFormat(const virNetDevBandwidth *def,
 void virDomainClearNetBandwidth(virDomainObjPtr vm)
     ATTRIBUTE_NONNULL(1);
 
-static inline bool virNetDevSupportBandwidth(virDomainNetType type)
+static inline bool virNetDevSupportsBandwidth(virDomainNetType type)
 {
     switch (type) {
     case VIR_DOMAIN_NET_TYPE_BRIDGE:

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 7bf4134f7c7de920a14f3c1a16f80056d015724c..851894c459cab2b251ab4641245f32cb70cb537c 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -3521,7 +3521,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriverPtr driver,
     /* Set bandwidth or warn if requested and not supported. */
     actualBandwidth = virDomainNetGetActualBandwidth(net);
     if (actualBandwidth) {
-        if (virNetDevSupportBandwidth(actualType)) {
+        if (virNetDevSupportsBandwidth(actualType)) {
             if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false,
                                       !virDomainNetTypeSharesHostView(net)) < 0)
                 goto cleanup;
@@ -3978,7 +3978,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm,
 
     /* clear network bandwidth */
     if (virDomainNetGetActualBandwidth(detach) &&
-        virNetDevSupportBandwidth(actualType) &&
+        virNetDevSupportsBandwidth(actualType) &&
         virNetDevBandwidthClear(detach->ifname))
         goto cleanup;
 

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index f016cbe6eb7a3d15a55f6e34c3cb4d853c8e2fd3..0277ba8b62af07c927040d4d975f69533d114330 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -622,7 +622,7 @@ virLXCProcessSetupInterfaces(virLXCDriverPtr driver,
         /* Set bandwidth or warn if requested and not supported. */
         actualBandwidth = virDomainNetGetActualBandwidth(net);
         if (actualBandwidth) {
-            if (virNetDevSupportBandwidth(type)) {
+            if (virNetDevSupportsBandwidth(type)) {
                 if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false,
                                           !virDomainNetTypeSharesHostView(net)) < 0)
                     goto cleanup;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 7cb141cbd6261e55036aec88c21b9612a4823ab9..2ea13621db8f694ef023841e13b0395948620d69 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8081,7 +8081,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
     /* Set bandwidth or warn if requested and not supported. */
     actualBandwidth = virDomainNetGetActualBandwidth(net);
     if (actualBandwidth) {
-        if (virNetDevSupportBandwidth(actualType)) {
+        if (virNetDevSupportsBandwidth(actualType)) {
             if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false,
                                       !virDomainNetTypeSharesHostView(net)) < 0)
                 goto cleanup;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e9a62684f09e4fb1e89198930679b7e3f8506c5c..35ade1ef37bd61a657c082521b5a0998e1f8fe88 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -11220,12 +11220,12 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
 
     if (net) {
         actualType = virDomainNetGetActualType(net);
-        qosSupported = virNetDevSupportBandwidth(actualType);
+        qosSupported = virNetDevSupportsBandwidth(actualType);
     }
 
     if (qosSupported && persistentNet) {
         actualType = virDomainNetGetActualType(persistentNet);
-        qosSupported = virNetDevSupportBandwidth(actualType);
+        qosSupported = virNetDevSupportsBandwidth(actualType);
     }
 
     if (!qosSupported) {

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 9800491755aeeb43511efd9628fb64e08dd60df8..ca18bb9e5fe00082de936940ff24793b87fd62d4 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1342,7 +1342,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
     /* Set bandwidth or warn if requested and not supported. */
     actualBandwidth = virDomainNetGetActualBandwidth(net);
     if (actualBandwidth) {
-        if (virNetDevSupportBandwidth(actualType)) {
+        if (virNetDevSupportsBandwidth(actualType)) {
             if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false,
                                       !virDomainNetTypeSharesHostView(net)) < 0)
                 goto cleanup;
@@ -4582,7 +4582,7 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver,
         return -1;
 
     if (virDomainNetGetActualBandwidth(net) &&
-        virNetDevSupportBandwidth(virDomainNetGetActualType(net)) &&
+        virNetDevSupportsBandwidth(virDomainNetGetActualType(net)) &&
         virNetDevBandwidthClear(net->ifname) < 0)
         VIR_WARN("cannot clear bandwidth setting for device : %s",
                  net->ifname);