External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-03 16:42:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: return a const from virDomainNetGetActualVirtPortProfile

Browse Source 
This also isn't required (due to the vportprofile being stored in the
NetDef as a pointer rather than being directly contained), but it
seemed dishonest to not mark it as const (and thus permit users to
modify its contents)

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:56:35 -04:00
parent 583ac17f5d
commit fdcd273be2
24 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_conf.c
View File

@ -29521,7 +29521,7 @@ virDomainNetGetActualHostdev(virDomainNetDefPtr iface)
return NULL;
}
virNetDevVPortProfilePtr
const virNetDevVPortProfile *
virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface)
{
switch (iface->type) {

2
src/conf/domain_conf.h
View File

@ -3213,7 +3213,7 @@ int virDomainNetGetActualBridgeMACTableManager(virDomainNetDefPtr iface);
const char *virDomainNetGetActualDirectDev(virDomainNetDefPtr iface);
int virDomainNetGetActualDirectMode(virDomainNetDefPtr iface);
virDomainHostdevDefPtr virDomainNetGetActualHostdev(virDomainNetDefPtr iface);
virNetDevVPortProfilePtr
const virNetDevVPortProfile *
virDomainNetGetActualVirtPortProfile(const virDomainNetDef *iface);
const virNetDevBandwidth *
virDomainNetGetActualBandwidth(const virDomainNetDef *iface);

2
src/conf/netdev_vport_profile_conf.c
View File

@ -197,7 +197,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags)
int
virNetDevVPortProfileFormat(virNetDevVPortProfilePtr virtPort,
virNetDevVPortProfileFormat(const virNetDevVPortProfile *virtPort,
virBufferPtr buf)
{
enum virNetDevVPortProfile type;

2
src/conf/netdev_vport_profile_conf.h
View File

@ -40,5 +40,5 @@ virNetDevVPortProfilePtr
virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags);
int
virNetDevVPortProfileFormat(virNetDevVPortProfilePtr virtPort,
virNetDevVPortProfileFormat(const virNetDevVPortProfile *virtPort,
virBufferPtr buf);

2
src/libxl/libxl_conf.c
View File

@ -1203,7 +1203,7 @@ libxlMakeNic(virDomainDefPtr def,
virNetworkPtr network = NULL;
virConnectPtr conn = NULL;
const virNetDevBandwidth *actual_bw;
virNetDevVPortProfilePtr port_profile;
const virNetDevVPortProfile *port_profile;
const virNetDevVlan *virt_vlan;
virBuffer buf = VIR_BUFFER_INITIALIZER;
size_t i;

2
src/libxl/xen_common.c
View File

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

2
src/lxc/lxc_driver.c
View File

@ -4331,7 +4331,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm,
int detachidx, ret = -1;
virDomainNetType actualType;
virDomainNetDefPtr detach = NULL;
virNetDevVPortProfilePtr vport = NULL;
const virNetDevVPortProfile *vport = NULL;
virErrorPtr save_err = NULL;
if ((detachidx = virDomainNetFindIdx(vm->def, dev->data.net)) < 0)

8
src/lxc/lxc_process.c
View File

@ -162,7 +162,7 @@ static void virLXCProcessCleanup(virLXCDriverPtr driver,
{
size_t i;
virLXCDomainObjPrivatePtr priv = vm->privateData;
virNetDevVPortProfilePtr vport = NULL;
const virNetDevVPortProfile *vport = NULL;
virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver);
virConnectPtr conn = NULL;
@ -282,7 +282,7 @@ virLXCProcessSetupInterfaceTap(virDomainDefPtr vm,
{
char *parentVeth;
char *containerVeth = NULL;
virNetDevVPortProfilePtr vport = virDomainNetGetActualVirtPortProfile(net);
const virNetDevVPortProfile *vport = virDomainNetGetActualVirtPortProfile(net);
VIR_DEBUG("calling vethCreate()");
parentVeth = net->ifname;
@ -334,7 +334,7 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn,
char *res_ifname = NULL;
virLXCDriverPtr driver = conn->privateData;
const virNetDevBandwidth *bw;
virNetDevVPortProfilePtr prof;
const virNetDevVPortProfile *prof;
virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver);
const char *linkdev = virDomainNetGetActualDirectDev(net);
unsigned int macvlan_create_flags = VIR_NETDEV_MACVLAN_CREATE_IFUP;
@ -633,7 +633,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn,
virErrorPreserveLast(&save_err);
for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr iface = def->nets[i];
virNetDevVPortProfilePtr vport = virDomainNetGetActualVirtPortProfile(iface);
const virNetDevVPortProfile *vport = virDomainNetGetActualVirtPortProfile(iface);
if (vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH)
ignore_value(virNetDevOpenvswitchRemovePort(
virDomainNetGetActualBridgeName(iface),

2
src/qemu/qemu_domain.c
View File

@ -5491,7 +5491,7 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net,
* a <virtualport> element in the config)
*/
if (net->filter) {
virNetDevVPortProfilePtr vport = virDomainNetGetActualVirtPortProfile(net);
const virNetDevVPortProfile *vport = virDomainNetGetActualVirtPortProfile(net);
if (!(actualType == VIR_DOMAIN_NET_TYPE_NETWORK ||
actualType == VIR_DOMAIN_NET_TYPE_BRIDGE ||

2
src/qemu/qemu_hotplug.c
View File

@ -1109,7 +1109,7 @@ qemuDomainAttachDeviceDiskLive(virQEMUDriverPtr driver,
static void
qemuDomainNetDeviceVportRemove(virDomainNetDefPtr net)
{
virNetDevVPortProfilePtr vport = virDomainNetGetActualVirtPortProfile(net);
const virNetDevVPortProfile *vport = virDomainNetGetActualVirtPortProfile(net);
const char *brname;
if (!vport)

2
src/qemu/qemu_migration_cookie.c
View File

@ -242,7 +242,7 @@ qemuMigrationCookieNetworkAlloc(virQEMUDriverPtr driver G_GNUC_UNUSED,
for (i = 0; i < def->nnets; i++) {
virDomainNetDefPtr netptr;
virNetDevVPortProfilePtr vport;
const virNetDevVPortProfile *vport;
netptr = def->nets[i];
vport = virDomainNetGetActualVirtPortProfile(netptr);

2
src/qemu/qemu_process.c
View File

@ -7328,7 +7328,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
qemuDomainObjPrivatePtr priv = vm->privateData;
virErrorPtr orig_err;
virDomainDefPtr def = vm->def;
virNetDevVPortProfilePtr vport = NULL;
const virNetDevVPortProfile *vport = NULL;
size_t i;
char *timestamp;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);

6
src/util/virhostdev.c
View File

@ -402,7 +402,7 @@ virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev)
static int
virHostdevNetConfigVirtPortProfile(const char *linkdev, int vf,
virNetDevVPortProfilePtr virtPort,
const virNetDevVPortProfile *virtPort,
const virMacAddr *macaddr,
const unsigned char *uuid,
bool associate)
@ -498,7 +498,7 @@ virHostdevSetNetConfig(virDomainHostdevDefPtr hostdev,
{
g_autofree char *linkdev = NULL;
const virNetDevVlan *vlan;
virNetDevVPortProfilePtr virtPort;
const virNetDevVPortProfile *virtPort;
int vf = -1;
bool port_profile_associate = true;
@ -548,7 +548,7 @@ virHostdevRestoreNetConfig(virDomainHostdevDefPtr hostdev,
g_autofree virMacAddrPtr MAC = NULL;
g_autofree virMacAddrPtr adminMAC = NULL;
g_autoptr(virNetDevVlan) vlan = NULL;
virNetDevVPortProfilePtr virtPort;
const virNetDevVPortProfile *virtPort;
int vf = -1;
bool port_profile_associate = false;

16
src/util/virnetdevmacvlan.c
View File

@ -826,7 +826,7 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname,
const virMacAddr *macaddress,
const char *linkdev,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
virNetDevVPortProfileOp vmOp)
{
virNetlinkCallbackDataPtr calld = NULL;
@ -895,7 +895,7 @@ virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested,
virNetDevMacVLanMode mode,
const virNetDevVlan *vlan,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
char **ifnameResult,
virNetDevVPortProfileOp vmOp,
char *stateDir,
@ -1092,7 +1092,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
const virMacAddr *macaddr,
const char *linkdev,
int mode,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
char *stateDir)
{
int ret = 0;
@ -1147,7 +1147,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname,
const virMacAddr *macaddress,
const char *linkdev,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
virNetDevVPortProfileOp vmOp)
{
int rc = 0;
@ -1224,7 +1224,7 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname G_GNUC_UNUSED,
virNetDevMacVLanMode mode G_GNUC_UNUSED,
const virNetDevVlan *vlan G_GNUC_UNUSED,
const unsigned char *vmuuid G_GNUC_UNUSED,
virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED,
const virNetDevVPortProfile *virtPortProfile G_GNUC_UNUSED,
char **res_ifname G_GNUC_UNUSED,
virNetDevVPortProfileOp vmop G_GNUC_UNUSED,
char *stateDir G_GNUC_UNUSED,
@ -1241,7 +1241,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname G_GNUC_UNUSED,
const virMacAddr *macaddress G_GNUC_UNUSED,
const char *linkdev G_GNUC_UNUSED,
int mode G_GNUC_UNUSED,
virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED,
const virNetDevVPortProfile *virtPortProfile G_GNUC_UNUSED,
char *stateDir G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
@ -1253,7 +1253,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname G_GNUC_UNUSED,
const virMacAddr *macaddress G_GNUC_UNUSED,
const char *linkdev G_GNUC_UNUSED,
const unsigned char *vmuuid G_GNUC_UNUSED,
virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED,
const virNetDevVPortProfile *virtPortProfile G_GNUC_UNUSED,
virNetDevVPortProfileOp vmOp G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
@ -1265,7 +1265,7 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname G_GNUC_UNUSE
const virMacAddr *macaddress G_GNUC_UNUSED,
const char *linkdev G_GNUC_UNUSED,
const unsigned char *vmuuid G_GNUC_UNUSED,
virNetDevVPortProfilePtr virtPortProfile G_GNUC_UNUSED,
const virNetDevVPortProfile *virtPortProfile G_GNUC_UNUSED,
virNetDevVPortProfileOp vmOp G_GNUC_UNUSED)
{
virReportSystemError(ENOSYS, "%s",

8
src/util/virnetdevmacvlan.h
View File

@ -78,7 +78,7 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *ifname,
virNetDevMacVLanMode mode,
const virNetDevVlan *vlan,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
char **res_ifname,
virNetDevVPortProfileOp vmop,
char *stateDir,
@ -101,7 +101,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname,
const virMacAddr *macaddress,
const char *linkdev,
int mode,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
char *stateDir)
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
ATTRIBUTE_NONNULL(6) G_GNUC_WARN_UNUSED_RESULT;
@ -110,7 +110,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname,
const virMacAddr *macaddress,
const char *linkdev,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
virNetDevVPortProfileOp vmOp)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT;
@ -119,7 +119,7 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname,
const virMacAddr *macaddress,
const char *linkdev,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
virNetDevVPortProfileOp vmOp)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT;

4
src/util/virnetdevmidonet.c
View File

@ -37,7 +37,7 @@
*/
int
virNetDevMidonetBindPort(const char *ifname,
virNetDevVPortProfilePtr virtualport)
const virNetDevVPortProfile *virtualport)
{
int ret = -1;
virCommandPtr cmd = NULL;
@ -71,7 +71,7 @@ virNetDevMidonetBindPort(const char *ifname,
* Returns 0 in case of success or -1 in case of failure.
*/
int
virNetDevMidonetUnbindPort(virNetDevVPortProfilePtr virtualport)
virNetDevMidonetUnbindPort(const virNetDevVPortProfile *virtualport)
{
int ret = -1;
virCommandPtr cmd = NULL;

4
src/util/virnetdevmidonet.h
View File

@ -23,8 +23,8 @@
int virNetDevMidonetBindPort(const char *ifname,
virNetDevVPortProfilePtr virtualport)
const virNetDevVPortProfile *virtualport)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
int virNetDevMidonetUnbindPort(virNetDevVPortProfilePtr virtualport)
int virNetDevMidonetUnbindPort(const virNetDevVPortProfile *virtualport)
ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT;

2
src/util/virnetdevopenvswitch.c
View File

@ -132,7 +132,7 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, const virNetDevVlan *virtV
int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
const virMacAddr *macaddr,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr ovsport,
const virNetDevVPortProfile *ovsport,
const virNetDevVlan *virtVlan)
{
char macaddrstr[VIR_MAC_STRING_BUFLEN];

2
src/util/virnetdevopenvswitch.h
View File

@ -32,7 +32,7 @@ int virNetDevOpenvswitchAddPort(const char *brname,
const char *ifname,
const virMacAddr *macaddr,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr ovsport,
const virNetDevVPortProfile *ovsport,
const virNetDevVlan *virtVlan)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
G_GNUC_WARN_UNUSED_RESULT;

6
src/util/virnetdevtap.c
View File

@ -499,7 +499,7 @@ virNetDevTapAttachBridge(const char *tapname,
const char *brname,
const virMacAddr *macaddr,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
const virNetDevVlan *virtVlan,
unsigned int mtu,
unsigned int *actualMTU)
@ -571,7 +571,7 @@ virNetDevTapReattachBridge(const char *tapname,
const char *brname,
const virMacAddr *macaddr,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
const virNetDevVlan *virtVlan,
unsigned int mtu,
unsigned int *actualMTU)
@ -657,7 +657,7 @@ int virNetDevTapCreateInBridgePort(const char *brname,
const char *tunpath,
int *tapfd,
size_t tapfdSize,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
const virNetDevVlan *virtVlan,
virNetDevCoalescePtr coalesce,
unsigned int mtu,

6
src/util/virnetdevtap.h
View File

@ -63,7 +63,7 @@ virNetDevTapAttachBridge(const char *tapname,
const char *brname,
const virMacAddr *macaddr,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
const virNetDevVlan *virtVlan,
unsigned int mtu,
unsigned int *actualMTU)
@ -75,7 +75,7 @@ virNetDevTapReattachBridge(const char *tapname,
const char *brname,
const virMacAddr *macaddr,
const unsigned char *vmuuid,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
const virNetDevVlan *virtVlan,
unsigned int mtu,
unsigned int *actualMTU)
@ -89,7 +89,7 @@ int virNetDevTapCreateInBridgePort(const char *brname,
const char *tunpath,
int *tapfd,
size_t tapfdSize,
virNetDevVPortProfilePtr virtPortProfile,
const virNetDevVPortProfile *virtPortProfile,
const virNetDevVlan *virtVlan,
virNetDevCoalescePtr coalesce,
unsigned int mtu,

12
src/util/virnetdevvportprofile.c
View File

@ -85,7 +85,7 @@ enum virNetDevVPortProfileLinkOp {
#endif
bool
virNetDevVPortProfileEqual(virNetDevVPortProfilePtr a, virNetDevVPortProfilePtr b)
virNetDevVPortProfileEqual(const virNetDevVPortProfile *a, const virNetDevVPortProfile *b)
{
/* NULL resistant */
if (!a && !b)
@ -226,7 +226,7 @@ virNetDevVPortProfileCheckComplete(virNetDevVPortProfilePtr virtport,
* an error is logged and -1 is returned.
*/
int
virNetDevVPortProfileCheckNoExtras(virNetDevVPortProfilePtr virtport)
virNetDevVPortProfileCheckNoExtras(const virNetDevVPortProfile *virtport)
{
const char *extra = NULL;
@ -283,7 +283,7 @@ virNetDevVPortProfileCheckNoExtras(virNetDevVPortProfilePtr virtport)
*/
static int
virNetDevVPortProfileMerge(virNetDevVPortProfilePtr orig,
virNetDevVPortProfilePtr mods)
const virNetDevVPortProfile *mods)
{
enum virNetDevVPortProfile otype;
@ -423,9 +423,9 @@ virNetDevVPortProfileMerge(virNetDevVPortProfilePtr orig,
*/
int virNetDevVPortProfileMerge3(virNetDevVPortProfilePtr *result,
virNetDevVPortProfilePtr fromInterface,
virNetDevVPortProfilePtr fromNetwork,
virNetDevVPortProfilePtr fromPortgroup)
const virNetDevVPortProfile *fromInterface,
const virNetDevVPortProfile *fromNetwork,
const virNetDevVPortProfile *fromPortgroup)
{
int ret = -1;
*result = NULL;

12
src/util/virnetdevvportprofile.h
View File

@ -77,19 +77,19 @@ struct _virNetDevVPortProfile {
};
bool virNetDevVPortProfileEqual(virNetDevVPortProfilePtr a,
virNetDevVPortProfilePtr b);
bool virNetDevVPortProfileEqual(const virNetDevVPortProfile *a,
const virNetDevVPortProfile *b);
int virNetDevVPortProfileCopy(virNetDevVPortProfilePtr *dst,
const virNetDevVPortProfile *src);
int virNetDevVPortProfileCheckComplete(virNetDevVPortProfilePtr virtport,
bool generateMissing);
int virNetDevVPortProfileCheckNoExtras(virNetDevVPortProfilePtr virtport);
int virNetDevVPortProfileCheckNoExtras(const virNetDevVPortProfile *virtport);
int virNetDevVPortProfileMerge3(virNetDevVPortProfilePtr *result,
virNetDevVPortProfilePtr fromInterface,
virNetDevVPortProfilePtr fromNetwork,
virNetDevVPortProfilePtr fromPortgroup);
const virNetDevVPortProfile *fromInterface,
const virNetDevVPortProfile *fromNetwork,
const virNetDevVPortProfile *fromPortgroup);
int virNetDevVPortProfileAssociate(const char *ifname,
const virNetDevVPortProfile *virtPort,

2
tests/bhyvexml2argvmock.c
View File

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