External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-23 13:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: change args/return values of remaining virDomainNetGetActual*() to const

Browse Source 
These all just return a scalar value, so there's no daisy-chained
fallout from changing them, and they can easily be combined in a
single patch.

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 13:06:24 -04:00
parent fdcd273be2
commit 012624217e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/conf/domain_conf.c
View File

@ -29462,7 +29462,7 @@ virDomainNetGetActualType(const virDomainNetDef *iface)
} }
const char * const char *
virDomainNetGetActualBridgeName(virDomainNetDefPtr iface) virDomainNetGetActualBridgeName(const virDomainNetDef *iface)
{ {
if (iface->type == VIR_DOMAIN_NET_TYPE_BRIDGE) if (iface->type == VIR_DOMAIN_NET_TYPE_BRIDGE)
return iface->data.bridge.brname; return iface->data.bridge.brname;
@ -29475,7 +29475,7 @@ virDomainNetGetActualBridgeName(virDomainNetDefPtr iface)
} }
int int
virDomainNetGetActualBridgeMACTableManager(virDomainNetDefPtr iface) virDomainNetGetActualBridgeMACTableManager(const virDomainNetDef *iface)
{ {
if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK &&
iface->data.network.actual && iface->data.network.actual &&
@ -29486,7 +29486,7 @@ virDomainNetGetActualBridgeMACTableManager(virDomainNetDefPtr iface)
} }
const char * const char *
virDomainNetGetActualDirectDev(virDomainNetDefPtr iface) virDomainNetGetActualDirectDev(const virDomainNetDef *iface)
{ {
if (iface->type == VIR_DOMAIN_NET_TYPE_DIRECT) if (iface->type == VIR_DOMAIN_NET_TYPE_DIRECT)
return iface->data.direct.linkdev; return iface->data.direct.linkdev;
@ -29498,7 +29498,7 @@ virDomainNetGetActualDirectDev(virDomainNetDefPtr iface)
} }
int int
virDomainNetGetActualDirectMode(virDomainNetDefPtr iface) virDomainNetGetActualDirectMode(const virDomainNetDef *iface)
{ {
if (iface->type == VIR_DOMAIN_NET_TYPE_DIRECT) if (iface->type == VIR_DOMAIN_NET_TYPE_DIRECT)
return iface->data.direct.mode; return iface->data.direct.mode;
@ -29585,7 +29585,7 @@ virDomainNetGetActualVlan(const virDomainNetDef *iface)
bool bool
virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface) virDomainNetGetActualTrustGuestRxFilters(const virDomainNetDef *iface)
{ {
if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK &&
iface->data.network.actual) iface->data.network.actual)

10
src/conf/domain_conf.h
View File

@ -3208,17 +3208,17 @@ int virDomainGraphicsListenAppendSocket(virDomainGraphicsDefPtr def,
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
virDomainNetType virDomainNetGetActualType(const virDomainNetDef *iface); virDomainNetType virDomainNetGetActualType(const virDomainNetDef *iface);
const char *virDomainNetGetActualBridgeName(virDomainNetDefPtr iface); const char *virDomainNetGetActualBridgeName(const virDomainNetDef *iface);
int virDomainNetGetActualBridgeMACTableManager(virDomainNetDefPtr iface); int virDomainNetGetActualBridgeMACTableManager(const virDomainNetDef *iface);
const char *virDomainNetGetActualDirectDev(virDomainNetDefPtr iface); const char *virDomainNetGetActualDirectDev(const virDomainNetDef *iface);
int virDomainNetGetActualDirectMode(virDomainNetDefPtr iface); int virDomainNetGetActualDirectMode(const virDomainNetDef *iface);
virDomainHostdevDefPtr virDomainNetGetActualHostdev(virDomainNetDefPtr iface); virDomainHostdevDefPtr virDomainNetGetActualHostdev(virDomainNetDefPtr iface);
const virNetDevVPortProfile * const virNetDevVPortProfile *
virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface); virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface);
const virNetDevBandwidth * const virNetDevBandwidth *
virDomainNetGetActualBandwidth(const virDomainNetDef *iface); virDomainNetGetActualBandwidth(const virDomainNetDef *iface);
const virNetDevVlan *virDomainNetGetActualVlan(const virDomainNetDef *iface); const virNetDevVlan *virDomainNetGetActualVlan(const virDomainNetDef *iface);
bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface); bool virDomainNetGetActualTrustGuestRxFilters(const virDomainNetDef *iface);
const char *virDomainNetGetModelString(const virDomainNetDef *net); const char *virDomainNetGetModelString(const virDomainNetDef *net);
int virDomainNetSetModelString(virDomainNetDefPtr et, int virDomainNetSetModelString(virDomainNetDefPtr et,
const char *model); const char *model);