conf: Move virDomainClearNetBandwidth() to src/hypervisor/

The reason virDomainClearNetBandwidth() exists in src/conf/ is
that at the time its introduction we did not have a better place.
But now we do. Firstly, virDomainClearNetBandwidth() is
hypervisor agnostic code, but really has nothing to do with
domain configuration (it doesn't parse/format XML). Secondly, in
near future it'll call another function from src/hypervisor/ and
that's not really allowed from src/conf/.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index cdf289270a3362e1dcc35e6aa04680c313e0a9f2..9faa46a27fb3cdc082ec7654c9bb227c8eeff4b7 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -199,20 +199,6 @@ virNetDevBandwidthFormat(const virNetDevBandwidth *def,
     return 0;
 }
 
-void
-virDomainClearNetBandwidth(virDomainDef *def)
-{
-    size_t i;
-    virDomainNetType type;
-
-    for (i = 0; i < def->nnets; i++) {
-        type = virDomainNetGetActualType(def->nets[i]);
-        if (virDomainNetGetActualBandwidth(def->nets[i]) &&
-            virNetDevSupportsBandwidth(type))
-            virNetDevBandwidthClear(def->nets[i]->ifname);
-    }
-}
-
 
 bool virNetDevSupportsBandwidth(virDomainNetType type)
 {

diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h
index c698cc9dbc7e722e4c975064912d9ddc552bdf48..b679b0f51f2e294bbeaf17913b069a2375dfccff 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.h
+++ b/src/conf/netdev_bandwidth_conf.h
@@ -34,9 +34,6 @@ int virNetDevBandwidthFormat(const virNetDevBandwidth *def,
                              unsigned int class_id,
                              virBuffer *buf);
 
-void virDomainClearNetBandwidth(virDomainDef *def)
-    ATTRIBUTE_NONNULL(1);
-
 bool virNetDevSupportsBandwidth(virDomainNetType type);
 bool virNetDevBandwidthHasFloor(const virNetDevBandwidth *b);
 bool virNetDevBandwidthSupportsFloor(virNetworkForwardType type);

diff --git a/src/hypervisor/domain_interface.c b/src/hypervisor/domain_interface.c
index ccf4cb94bddca0c267a3b4d1fffd316a19927b89..0a9cad80111722df2a9877a5661689751a6dfedc 100644 (file)
--- a/src/hypervisor/domain_interface.c
+++ b/src/hypervisor/domain_interface.c
@@ -27,6 +27,7 @@
 #include "domain_driver.h"
 #include "domain_interface.h"
 #include "domain_nwfilter.h"
+#include "netdev_bandwidth_conf.h"
 #include "network_conf.h"
 #include "viralloc.h"
 #include "virconftypes.h"
@@ -469,3 +470,18 @@ virDomainInterfaceDeleteDevice(virDomainDef *def,
     }
 
 }
+
+
+void
+virDomainClearNetBandwidth(virDomainDef *def)
+{
+    size_t i;
+    virDomainNetType type;
+
+    for (i = 0; i < def->nnets; i++) {
+        type = virDomainNetGetActualType(def->nets[i]);
+        if (virDomainNetGetActualBandwidth(def->nets[i]) &&
+            virNetDevSupportsBandwidth(type))
+            virNetDevBandwidthClear(def->nets[i]->ifname);
+    }
+}

diff --git a/src/hypervisor/domain_interface.h b/src/hypervisor/domain_interface.h
index 8047fdadfa929b8fd1b8377bf7f243e32d52f1d6..bb212cf3b827dad950ab22d8f82a081d62302940 100644 (file)
--- a/src/hypervisor/domain_interface.h
+++ b/src/hypervisor/domain_interface.h
@@ -44,3 +44,5 @@ void virDomainInterfaceDeleteDevice(virDomainDef *def,
                                 virDomainNetDef *net,
                                 bool priv_net_created,
                                 char *stateDir);
+void virDomainClearNetBandwidth(virDomainDef *def)
+    ATTRIBUTE_NONNULL(1);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 8642305a8bf5b774492c33f30d35f093fb53004b..328f5b347be49de2629dd5416b73051e2439e608 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -813,7 +813,6 @@ virDomainMomentDefPostParse;
 
 
 # conf/netdev_bandwidth_conf.h
-virDomainClearNetBandwidth;
 virNetDevBandwidthFormat;
 virNetDevBandwidthHasFloor;
 virNetDevBandwidthParse;
@@ -1635,6 +1634,7 @@ virDomainDriverParseBlkioDeviceStr;
 virDomainDriverSetupPersistentDefBlkioParams;
 
 # hypervisor/domain_interface.h
+virDomainClearNetBandwidth;
 virDomainInterfaceDeleteDevice;
 virDomainInterfaceEthernetConnect;
 virDomainInterfaceIsVnetCompatModel;