diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 86416937fd..5df9f7a8a1 100644 --- 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 443d4fa2a3..2696c6f6a0 100644 --- 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 dd1a63a5cf..a6b41976c6 100644 --- 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 898b2fb428..0004e48a4a 100644 --- 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 636f188eb1..ed461cd12d 100644 --- 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 ea86451b09..dda786d772 100644 --- 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 012d482337..c91f372eb1 100644 --- 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 14afb906cb..3465d28b84 100644 --- 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 b1494d342a..7f3d7d8ed4 100644 --- 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 1f1872464a..094821cd30 100644 --- 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 19323c5ed2..871d0c962c 100644 --- 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,