NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: change virNWFilterBindingPtr to virNWFilterBindingDefPtr

Browse Source 
We are going to want to expose the NWFilter binding concept in the
public API, so the virNWFilterBindingPtr type needs to be used there.
Our internal type will shortly gain an XML representation, so rename
it to virNWFilterBindingDefPtr which follows our normal conventions.

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-05-08 13:45:26 +01:00
parent aa51063927
commit ce1144960c
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf/nwfilter_conf.c
View File

@ -3268,25 +3268,25 @@ virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule)
void void
virNWFilterBindingFree(virNWFilterBindingPtr binding) virNWFilterBindingDefFree(virNWFilterBindingDefPtr def)
{ {
if (!binding) if (!def)
return; return;
VIR_FREE(binding->ownername); VIR_FREE(def->ownername);
VIR_FREE(binding->portdevname); VIR_FREE(def->portdevname);
VIR_FREE(binding->linkdevname); VIR_FREE(def->linkdevname);
VIR_FREE(binding->filter); VIR_FREE(def->filter);
virHashFree(binding->filterparams); virHashFree(def->filterparams);
VIR_FREE(binding); VIR_FREE(def);
} }
virNWFilterBindingPtr virNWFilterBindingDefPtr
virNWFilterBindingCopy(virNWFilterBindingPtr src) virNWFilterBindingDefCopy(virNWFilterBindingDefPtr src)
{ {
virNWFilterBindingPtr ret; virNWFilterBindingDefPtr ret;
if (VIR_ALLOC(ret) < 0) if (VIR_ALLOC(ret) < 0)
return NULL; return NULL;
@ -3316,6 +3316,6 @@ virNWFilterBindingCopy(virNWFilterBindingPtr src)
return ret; return ret;
error: error:
virNWFilterBindingFree(ret); virNWFilterBindingDefFree(ret);
return NULL; return NULL;
} }

12
src/conf/nwfilter_conf.h
View File

@ -545,10 +545,10 @@ struct _virNWFilterDef {
virNWFilterEntryPtr *filterEntries; virNWFilterEntryPtr *filterEntries;
}; };
typedef struct virNWFilterBinding virNWFilterBinding; typedef struct _virNWFilterBindingDef virNWFilterBindingDef;
typedef virNWFilterBinding *virNWFilterBindingPtr; typedef virNWFilterBindingDef *virNWFilterBindingDefPtr;
struct virNWFilterBinding { struct _virNWFilterBindingDef {
char *ownername; char *ownername;
unsigned char owneruuid[VIR_UUID_BUFLEN]; unsigned char owneruuid[VIR_UUID_BUFLEN];
char *portdevname; char *portdevname;
@ -664,9 +664,9 @@ bool
virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule); virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule);
void void
virNWFilterBindingFree(virNWFilterBindingPtr binding); virNWFilterBindingDefFree(virNWFilterBindingDefPtr binding);
virNWFilterBindingPtr virNWFilterBindingDefPtr
virNWFilterBindingCopy(virNWFilterBindingPtr src); virNWFilterBindingDefCopy(virNWFilterBindingDefPtr src);
VIR_ENUM_DECL(virNWFilterRuleAction); VIR_ENUM_DECL(virNWFilterRuleAction);
VIR_ENUM_DECL(virNWFilterRuleDirection); VIR_ENUM_DECL(virNWFilterRuleDirection);

4
src/libvirt_private.syms
View File

@ -787,8 +787,8 @@ virDomainNumatuneSpecifiedMaxNode;
# conf/nwfilter_conf.h # conf/nwfilter_conf.h
virNWFilterBindingCopy; virNWFilterBindingDefCopy;
virNWFilterBindingFree; virNWFilterBindingDefFree;
virNWFilterCallbackDriversLock; virNWFilterCallbackDriversLock;
virNWFilterCallbackDriversUnlock; virNWFilterCallbackDriversUnlock;
virNWFilterChainSuffixTypeToString; virNWFilterChainSuffixTypeToString;