nwfilter: Rename _virNWFilterInstantiateFilter

New API will be virNWFilterInstantiateFilterInternal as it's called from
the virNWFilterInstantiateFilter and virNWFilterUpdateInstantiateFilter.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2017-05-30 15:59:24 -04:00
parent 3a6e9a2950
commit 1cceb220f7

View File

@ -891,12 +891,12 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverStatePtr driver,
static int static int
_virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver, virNWFilterInstantiateFilterInternal(virNWFilterDriverStatePtr driver,
const unsigned char *vmuuid, const unsigned char *vmuuid,
const virDomainNetDef *net, const virDomainNetDef *net,
bool teardownOld, bool teardownOld,
enum instCase useNewFilter, enum instCase useNewFilter,
bool *foundNewFilter) bool *foundNewFilter)
{ {
const char *linkdev = (net->type == VIR_DOMAIN_NET_TYPE_DIRECT) const char *linkdev = (net->type == VIR_DOMAIN_NET_TYPE_DIRECT)
? net->data.direct.linkdev ? net->data.direct.linkdev
@ -976,10 +976,10 @@ virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver,
{ {
bool foundNewFilter = false; bool foundNewFilter = false;
return _virNWFilterInstantiateFilter(driver, vmuuid, net, return virNWFilterInstantiateFilterInternal(driver, vmuuid, net,
1, 1,
INSTANTIATE_ALWAYS, INSTANTIATE_ALWAYS,
&foundNewFilter); &foundNewFilter);
} }
@ -991,10 +991,10 @@ virNWFilterUpdateInstantiateFilter(virNWFilterDriverStatePtr driver,
{ {
bool foundNewFilter = false; bool foundNewFilter = false;
int rc = _virNWFilterInstantiateFilter(driver, vmuuid, net, int rc = virNWFilterInstantiateFilterInternal(driver, vmuuid, net,
0, 0,
INSTANTIATE_FOLLOW_NEWFILTER, INSTANTIATE_FOLLOW_NEWFILTER,
&foundNewFilter); &foundNewFilter);
*skipIface = !foundNewFilter; *skipIface = !foundNewFilter;
return rc; return rc;