mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-26 15:45:28 +00:00
955af4d4c1
'const fooPtr' is the same as 'foo * const' (the pointer won't change, but it's contents can). But in general, if an interface is trying to be const-correct, it should be using 'const foo *' (the pointer is to data that can't be changed). Fix up remaining offenders in src/util. * src/util/virnetdev.h (virNetDevSetMAC) (virNetDevReplaceMacAddress, virNetDevValidateConfig) (virNetDevReplaceNetConfig): Use intended type. * src/util/virnetdevbandwidth.h (virNetDevBandwidthCopy) (virNetDevBandwidthPlug): Likewise. * src/util/virnetdevmacvlan.h (virNetDevMacVLanCreate) (virNetDevMacVLanCreateWithVPortProfile) (virNetDevMacVLanDeleteWithVPortProfile) (virNetDevMacVLanRestartWithVPortProfile) (virNetDevMacVLanVPortProfileRegisterCallback): Likewise. * src/util/virnetdevopenvswitch.h (virNetDevOpenvswitchAddPort): Likewise. * src/util/virnetdevtap.h (virNetDevTapCreateInBridgePort): Likewise. * src/util/virnetdevvlan.h (virNetDevVlanEqual) (virNetDevVlanCopy): Likewise. * src/util/virnetdevvportprofile.h (virNetDevVPortProfileAssociate) (virNetDevVPortProfileDisassociate): Likewise. * src/util/virnetlink.h (virNetlinkEventRemoveCallback) (virNetlinkEventAddClient, virNetlinkEventRemoveClient): Likewise. * src/util/virnetdev.c (virNetDevSetMAC) (virNetDevReplaceMacAddress, virNetDevValidateConfig) (virNetDevReplaceNetConfig): Fix fallout. * src/util/virnetdevbandwidth.c (virNetDevBandwidthCopy) (virNetDevBandwidthPlug): Likewise. * src/util/virnetdevmacvlan.c (virNetDevMacVLanCreate) (virNetDevMacVLanCreateWithVPortProfile) (virNetDevMacVLanDeleteWithVPortProfile) (virNetDevMacVLanRestartWithVPortProfile) (virNetDevMacVLanVPortProfileRegisterCallback): Likewise. * src/util/virnetdevopenvswitch.c (virNetDevOpenvswitchAddPort): Likewise. * src/util/virnetdevtap.c (virNetDevTapCreateInBridgePort): Likewise. * src/util/virnetdevvlan.c (virNetDevVlanEqual) (virNetDevVlanCopy): Likewise. * src/util/virnetdevvportprofile.c (virNetDevVPortProfileAssociate) (virNetDevVPortProfileDisassociate) (virNetDevVPortProfileOpSetLink, virNetDevVPortProfileOpCommon) (virNetDevVPortProfileOp8021Qbg, virNetDevVPortProfileOp8021Qbh): Likewise. * src/util/virnetlink.c (virNetlinkEventRemoveCallback) (virNetlinkEventAddClient, virNetlinkEventRemoveClient): Likewise. Signed-off-by: Eric Blake <eblake@redhat.com>
99 lines
2.4 KiB
C
99 lines
2.4 KiB
C
/*
|
|
* Copyright (C) 2009-2013 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Authors:
|
|
* Laine Stump <laine@redhat.com>
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "internal.h"
|
|
#include "virerror.h"
|
|
#include "virnetdevvlan.h"
|
|
#include "viralloc.h"
|
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
void
|
|
virNetDevVlanClear(virNetDevVlanPtr vlan)
|
|
{
|
|
VIR_FREE(vlan->tag);
|
|
vlan->nTags = 0;
|
|
vlan->nativeMode = 0;
|
|
vlan->nativeTag = 0;
|
|
}
|
|
|
|
void
|
|
virNetDevVlanFree(virNetDevVlanPtr vlan)
|
|
{
|
|
if (vlan)
|
|
virNetDevVlanClear(vlan);
|
|
VIR_FREE(vlan);
|
|
}
|
|
|
|
int
|
|
virNetDevVlanEqual(const virNetDevVlan *a, const virNetDevVlan *b)
|
|
{
|
|
int ai, bi;
|
|
|
|
if (!(a || b))
|
|
return true;
|
|
if (!a || !b)
|
|
return false;
|
|
|
|
if (a->trunk != b->trunk ||
|
|
a->nTags != b->nTags ||
|
|
a->nativeMode != b->nativeMode ||
|
|
a->nativeTag != b->nativeTag) {
|
|
return false;
|
|
}
|
|
|
|
for (ai = 0; ai < a->nTags; ai++) {
|
|
for (bi = 0; bi < b->nTags; bi++) {
|
|
if (a->tag[ai] == b->tag[bi])
|
|
break;
|
|
}
|
|
if (bi >= b->nTags) {
|
|
/* no matches for a->tag[ai] anywhere in b->tag */
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/*
|
|
* virNetDevVlanCopy - copy from src into (already existing) dst.
|
|
* If src is NULL, dst will have nTags set to 0.
|
|
* dst is assumed to be empty on entry.
|
|
*/
|
|
int
|
|
virNetDevVlanCopy(virNetDevVlanPtr dst, const virNetDevVlan *src)
|
|
{
|
|
if (!src || src->nTags == 0)
|
|
return 0;
|
|
|
|
if (VIR_ALLOC_N(dst->tag, src->nTags) < 0)
|
|
return -1;
|
|
|
|
dst->trunk = src->trunk;
|
|
dst->nTags = src->nTags;
|
|
dst->nativeMode = src->nativeMode;
|
|
dst->nativeTag = src->nativeTag;
|
|
memcpy(dst->tag, src->tag, src->nTags * sizeof(*src->tag));
|
|
return 0;
|
|
}
|