External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: make virDomainNetGetActualVlan arg/return val const

Browse Source 
This is needed if we want to call the function when the
virDomainNetDef* we have is a const.

Since virDomainNetGetActualVlan returns a pointer to memory that is
within the virDomainNetDefPtr arg, the returned pointer must also be
made const. This leads to a cascade of other virNetDevVlanPtr's that
must be changed to "const virNetDevVlan *".

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:25:47 -04:00
parent 1b029a929d
commit 12207fcfcf
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -29566,10 +29566,10 @@ virDomainNetGetActualBandwidth(virDomainNetDefPtr iface)
return iface->bandwidth; return iface->bandwidth;
} }
virNetDevVlanPtr const virNetDevVlan *
virDomainNetGetActualVlan(virDomainNetDefPtr iface) virDomainNetGetActualVlan(const virDomainNetDef *iface)
{ {
virNetDevVlanPtr vlan = &iface->vlan; const virNetDevVlan *vlan = &iface->vlan;
/* if there is an ActualNetDef, *always* return /* if there is an ActualNetDef, *always* return
* its vlan rather than the NetDef's vlan. * its vlan rather than the NetDef's vlan.

2
src/conf/domain_conf.h
View File

@ -3217,7 +3217,7 @@ virNetDevVPortProfilePtr
virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface); virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface);
virNetDevBandwidthPtr virNetDevBandwidthPtr
virDomainNetGetActualBandwidth(virDomainNetDefPtr iface); virDomainNetGetActualBandwidth(virDomainNetDefPtr iface);
virNetDevVlanPtr virDomainNetGetActualVlan(virDomainNetDefPtr iface); const virNetDevVlan *virDomainNetGetActualVlan(const virDomainNetDef *iface);
bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface); bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface);
const char *virDomainNetGetModelString(const virDomainNetDef *net); const char *virDomainNetGetModelString(const virDomainNetDef *net);
int virDomainNetSetModelString(virDomainNetDefPtr et, int virDomainNetSetModelString(virDomainNetDefPtr et,

2
src/libxl/libxl_conf.c
View File

@ -1204,7 +1204,7 @@ libxlMakeNic(virDomainDefPtr def,
virConnectPtr conn = NULL; virConnectPtr conn = NULL;
virNetDevBandwidthPtr actual_bw; virNetDevBandwidthPtr actual_bw;
virNetDevVPortProfilePtr port_profile; virNetDevVPortProfilePtr port_profile;
virNetDevVlanPtr virt_vlan; const virNetDevVlan *virt_vlan;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
size_t i; size_t i;
const char *script = NULL; const char *script = NULL;

2
src/libxl/xen_common.c
View File

@ -1668,7 +1668,7 @@ xenFormatNet(virConnectPtr conn,
case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_BRIDGE:
{ {
virNetDevVPortProfilePtr port_profile = virDomainNetGetActualVirtPortProfile(net); virNetDevVPortProfilePtr port_profile = virDomainNetGetActualVirtPortProfile(net);
virNetDevVlanPtr virt_vlan = virDomainNetGetActualVlan(net); const virNetDevVlan *virt_vlan = virDomainNetGetActualVlan(net);
const char *script = net->script; const char *script = net->script;
size_t i; size_t i;

2
src/util/virhostdev.c
View File

@ -497,7 +497,7 @@ virHostdevSetNetConfig(virDomainHostdevDefPtr hostdev,
const unsigned char *uuid) const unsigned char *uuid)
{ {
g_autofree char *linkdev = NULL; g_autofree char *linkdev = NULL;
virNetDevVlanPtr vlan; const virNetDevVlan *vlan;
virNetDevVPortProfilePtr virtPort; virNetDevVPortProfilePtr virtPort;
int vf = -1; int vf = -1;
bool port_profile_associate = true; bool port_profile_associate = true;

4
src/util/virnetdev.c
View File

@ -2168,7 +2168,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf,
int int
virNetDevSetNetConfig(const char *linkdev, int vf, virNetDevSetNetConfig(const char *linkdev, int vf,
const virMacAddr *adminMAC, const virMacAddr *adminMAC,
virNetDevVlanPtr vlan, const virNetDevVlan *vlan,
const virMacAddr *MAC, const virMacAddr *MAC,
bool setVlan) bool setVlan)
{ {
@ -2391,7 +2391,7 @@ int
virNetDevSetNetConfig(const char *linkdev G_GNUC_UNUSED, virNetDevSetNetConfig(const char *linkdev G_GNUC_UNUSED,
int vf G_GNUC_UNUSED, int vf G_GNUC_UNUSED,
const virMacAddr *adminMAC G_GNUC_UNUSED, const virMacAddr *adminMAC G_GNUC_UNUSED,
virNetDevVlanPtr vlan G_GNUC_UNUSED, const virNetDevVlan *vlan G_GNUC_UNUSED,
const virMacAddr *MAC G_GNUC_UNUSED, const virMacAddr *MAC G_GNUC_UNUSED,
bool setVlan G_GNUC_UNUSED) bool setVlan G_GNUC_UNUSED)
{ {

2
src/util/virnetdev.h
View File

@ -253,7 +253,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf,
int int
virNetDevSetNetConfig(const char *linkdev, int vf, virNetDevSetNetConfig(const char *linkdev, int vf,
const virMacAddr *adminMAC, const virMacAddr *adminMAC,
virNetDevVlanPtr vlan, const virNetDevVlan *vlan,
const virMacAddr *MAC, const virMacAddr *MAC,
bool setVLan) bool setVLan)
ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT;

4
src/util/virnetdevmacvlan.c
View File

@ -893,7 +893,7 @@ virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested,
const virMacAddr *macaddress, const virMacAddr *macaddress,
const char *linkdev, const char *linkdev,
virNetDevMacVLanMode mode, virNetDevMacVLanMode mode,
virNetDevVlanPtr vlan, const virNetDevVlan *vlan,
const unsigned char *vmuuid, const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
char **ifnameResult, char **ifnameResult,
@ -1222,7 +1222,7 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname G_GNUC_UNUSED,
const virMacAddr *macaddress G_GNUC_UNUSED, const virMacAddr *macaddress G_GNUC_UNUSED,
const char *linkdev G_GNUC_UNUSED, const char *linkdev G_GNUC_UNUSED,
virNetDevMacVLanMode mode G_GNUC_UNUSED, virNetDevMacVLanMode mode G_GNUC_UNUSED,
virNetDevVlanPtr vlan G_GNUC_UNUSED, const virNetDevVlan *vlan G_GNUC_UNUSED,
const unsigned char *vmuuid G_GNUC_UNUSED, const unsigned char *vmuuid G_GNUC_UNUSED,
virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED, virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED,
char **res_ifname G_GNUC_UNUSED, char **res_ifname G_GNUC_UNUSED,

2
src/util/virnetdevmacvlan.h
View File

@ -76,7 +76,7 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname,
const virMacAddr *macaddress, const virMacAddr *macaddress,
const char *linkdev, const char *linkdev,
virNetDevMacVLanMode mode, virNetDevMacVLanMode mode,
virNetDevVlanPtr vlan, const virNetDevVlan *vlan,
const unsigned char *vmuuid, const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
char **res_ifname, char **res_ifname,

6
src/util/virnetdevopenvswitch.c
View File

@ -68,7 +68,7 @@ virNetDevOpenvswitchAddTimeout(virCommandPtr cmd)
* Returns 0 in case of success or -1 in case of failure. * Returns 0 in case of success or -1 in case of failure.
*/ */
static int static int
virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, virNetDevVlanPtr virtVlan) virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, const virNetDevVlan *virtVlan)
{ {
int ret = -1; int ret = -1;
size_t i = 0; size_t i = 0;
@ -133,7 +133,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
const virMacAddr *macaddr, const virMacAddr *macaddr,
const unsigned char *vmuuid, const unsigned char *vmuuid,
virNetDevVPortProfilePtr ovsport, virNetDevVPortProfilePtr ovsport,
virNetDevVlanPtr virtVlan) const virNetDevVlan *virtVlan)
{ {
char macaddrstr[VIR_MAC_STRING_BUFLEN]; char macaddrstr[VIR_MAC_STRING_BUFLEN];
char ifuuidstr[VIR_UUID_STRING_BUFLEN]; char ifuuidstr[VIR_UUID_STRING_BUFLEN];
@ -538,7 +538,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
* Returns 0 in case of success or -1 in case of failure. * Returns 0 in case of success or -1 in case of failure.
*/ */
int virNetDevOpenvswitchUpdateVlan(const char *ifname, int virNetDevOpenvswitchUpdateVlan(const char *ifname,
virNetDevVlanPtr virtVlan) const virNetDevVlan *virtVlan)
{ {
g_autoptr(virCommand) cmd = NULL; g_autoptr(virCommand) cmd = NULL;

4
src/util/virnetdevopenvswitch.h
View File

@ -33,7 +33,7 @@ int virNetDevOpenvswitchAddPort(const char *brname,
const virMacAddr *macaddr, const virMacAddr *macaddr,
const unsigned char *vmuuid, const unsigned char *vmuuid,
virNetDevVPortProfilePtr ovsport, virNetDevVPortProfilePtr ovsport,
virNetDevVlanPtr virtVlan) const virNetDevVlan *virtVlan)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
@ -65,5 +65,5 @@ int virNetDevOpenvswitchGetVhostuserIfname(const char *path,
ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE; ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
int virNetDevOpenvswitchUpdateVlan(const char *ifname, int virNetDevOpenvswitchUpdateVlan(const char *ifname,
virNetDevVlanPtr virtVlan) const virNetDevVlan *virtVlan)
ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT;

6
src/util/virnetdevtap.c
View File

@ -500,7 +500,7 @@ virNetDevTapAttachBridge(const char *tapname,
const virMacAddr *macaddr, const virMacAddr *macaddr,
const unsigned char *vmuuid, const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
virNetDevVlanPtr virtVlan, const virNetDevVlan *virtVlan,
unsigned int mtu, unsigned int mtu,
unsigned int *actualMTU) unsigned int *actualMTU)
{ {
@ -572,7 +572,7 @@ virNetDevTapReattachBridge(const char *tapname,
const virMacAddr *macaddr, const virMacAddr *macaddr,
const unsigned char *vmuuid, const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
virNetDevVlanPtr virtVlan, const virNetDevVlan *virtVlan,
unsigned int mtu, unsigned int mtu,
unsigned int *actualMTU) unsigned int *actualMTU)
{ {
@ -658,7 +658,7 @@ int virNetDevTapCreateInBridgePort(const char *brname,
int *tapfd, int *tapfd,
size_t tapfdSize, size_t tapfdSize,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
virNetDevVlanPtr virtVlan, const virNetDevVlan *virtVlan,
virNetDevCoalescePtr coalesce, virNetDevCoalescePtr coalesce,
unsigned int mtu, unsigned int mtu,
unsigned int *actualMTU, unsigned int *actualMTU,

6
src/util/virnetdevtap.h
View File

@ -64,7 +64,7 @@ virNetDevTapAttachBridge(const char *tapname,
const virMacAddr *macaddr, const virMacAddr *macaddr,
const unsigned char *vmuuid, const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
virNetDevVlanPtr virtVlan, const virNetDevVlan *virtVlan,
unsigned int mtu, unsigned int mtu,
unsigned int *actualMTU) unsigned int *actualMTU)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
@ -76,7 +76,7 @@ virNetDevTapReattachBridge(const char *tapname,
const virMacAddr *macaddr, const virMacAddr *macaddr,
const unsigned char *vmuuid, const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
virNetDevVlanPtr virtVlan, const virNetDevVlan *virtVlan,
unsigned int mtu, unsigned int mtu,
unsigned int *actualMTU) unsigned int *actualMTU)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
@ -90,7 +90,7 @@ int virNetDevTapCreateInBridgePort(const char *brname,
int *tapfd, int *tapfd,
size_t tapfdSize, size_t tapfdSize,
virNetDevVPortProfilePtr virtPortProfile, virNetDevVPortProfilePtr virtPortProfile,
virNetDevVlanPtr virtVlan, const virNetDevVlan *virtVlan,
virNetDevCoalescePtr coalesce, virNetDevCoalescePtr coalesce,
unsigned int mtu, unsigned int mtu,
unsigned int *actualMTU, unsigned int *actualMTU,

2
tests/bhyvexml2argvmock.c
View File

@ -27,7 +27,7 @@ int virNetDevTapCreateInBridgePort(const char *brname G_GNUC_UNUSED,
int *tapfd G_GNUC_UNUSED, int *tapfd G_GNUC_UNUSED,
size_t tapfdSize G_GNUC_UNUSED, size_t tapfdSize G_GNUC_UNUSED,
virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED, virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED,
virNetDevVlanPtr virtVlan G_GNUC_UNUSED, const virNetDevVlan *virtVlan G_GNUC_UNUSED,
virNetDevCoalescePtr coalesce G_GNUC_UNUSED, virNetDevCoalescePtr coalesce G_GNUC_UNUSED,
unsigned int mtu G_GNUC_UNUSED, unsigned int mtu G_GNUC_UNUSED,
unsigned int *actualMTU G_GNUC_UNUSED, unsigned int *actualMTU G_GNUC_UNUSED,