External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

conf: make virDomainNetGetActualBandwidth arg/return value const

Browse Source 
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>
This commit is contained in:
Laine Stump 2019-10-01 12:52:03 -04:00
parent 12207fcfcf
commit 583ac17f5d
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/domain_conf.c
View File

@ -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.

4
src/conf/domain_conf.h
View File

@ -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);

2
src/conf/netdev_bandwidth_conf.c
View File

@ -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)
{

2
src/conf/netdev_bandwidth_conf.h
View File

@ -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);

2
src/libxl/libxl_conf.c
View File

@ -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;

2
src/lxc/lxc_driver.c
View File

@ -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) {

4
src/lxc/lxc_process.c
View File

@ -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.

2
src/qemu/qemu_command.c
View File

@ -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;

4
src/qemu/qemu_hotplug.c
View File

@ -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,

6
src/util/virnetdevbandwidth.c
View File

@ -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;

4
src/util/virnetdevbandwidth.h
View File

@ -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,