mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
Use K&R style for curly braces in src/conf/
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
parent
7fa91525bd
commit
9c487f6505
@ -6193,7 +6193,8 @@ virDomainNetGenerateMAC(virDomainXMLOptionPtr xmlopt,
|
|||||||
static virDomainFSDefPtr
|
static virDomainFSDefPtr
|
||||||
virDomainFSDefParseXML(xmlNodePtr node,
|
virDomainFSDefParseXML(xmlNodePtr node,
|
||||||
xmlXPathContextPtr ctxt,
|
xmlXPathContextPtr ctxt,
|
||||||
unsigned int flags) {
|
unsigned int flags)
|
||||||
|
{
|
||||||
virDomainFSDefPtr def;
|
virDomainFSDefPtr def;
|
||||||
xmlNodePtr cur, save_node = ctxt->node;
|
xmlNodePtr cur, save_node = ctxt->node;
|
||||||
char *type = NULL;
|
char *type = NULL;
|
||||||
@ -7013,7 +7014,8 @@ error:
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virDomainChrDefaultTargetType(int devtype) {
|
virDomainChrDefaultTargetType(int devtype)
|
||||||
|
{
|
||||||
switch ((enum virDomainChrDeviceType) devtype) {
|
switch ((enum virDomainChrDeviceType) devtype) {
|
||||||
case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
|
case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
|
||||||
virReportError(VIR_ERR_XML_ERROR,
|
virReportError(VIR_ERR_XML_ERROR,
|
||||||
@ -7419,7 +7421,8 @@ error:
|
|||||||
* default port.
|
* default port.
|
||||||
*/
|
*/
|
||||||
virDomainChrDefPtr
|
virDomainChrDefPtr
|
||||||
virDomainChrDefNew(void) {
|
virDomainChrDefNew(void)
|
||||||
|
{
|
||||||
virDomainChrDefPtr def = NULL;
|
virDomainChrDefPtr def = NULL;
|
||||||
|
|
||||||
if (VIR_ALLOC(def) < 0)
|
if (VIR_ALLOC(def) < 0)
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* domain_nwfilter.c:
|
* domain_nwfilter.c:
|
||||||
*
|
*
|
||||||
|
* Copyright (C) 2014 Red Hat, Inc.
|
||||||
* Copyright (C) 2010 IBM Corporation
|
* Copyright (C) 2010 IBM Corporation
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
@ -31,14 +32,16 @@
|
|||||||
static virDomainConfNWFilterDriverPtr nwfilterDriver;
|
static virDomainConfNWFilterDriverPtr nwfilterDriver;
|
||||||
|
|
||||||
void
|
void
|
||||||
virDomainConfNWFilterRegister(virDomainConfNWFilterDriverPtr driver) {
|
virDomainConfNWFilterRegister(virDomainConfNWFilterDriverPtr driver)
|
||||||
|
{
|
||||||
nwfilterDriver = driver;
|
nwfilterDriver = driver;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
virDomainConfNWFilterInstantiate(virConnectPtr conn,
|
virDomainConfNWFilterInstantiate(virConnectPtr conn,
|
||||||
const unsigned char *vmuuid,
|
const unsigned char *vmuuid,
|
||||||
virDomainNetDefPtr net) {
|
virDomainNetDefPtr net)
|
||||||
|
{
|
||||||
if (nwfilterDriver != NULL)
|
if (nwfilterDriver != NULL)
|
||||||
return nwfilterDriver->instantiateFilter(conn, vmuuid, net);
|
return nwfilterDriver->instantiateFilter(conn, vmuuid, net);
|
||||||
/* driver module not available -- don't indicate failure */
|
/* driver module not available -- don't indicate failure */
|
||||||
@ -46,13 +49,15 @@ virDomainConfNWFilterInstantiate(virConnectPtr conn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
virDomainConfNWFilterTeardown(virDomainNetDefPtr net) {
|
virDomainConfNWFilterTeardown(virDomainNetDefPtr net)
|
||||||
|
{
|
||||||
if (nwfilterDriver != NULL)
|
if (nwfilterDriver != NULL)
|
||||||
nwfilterDriver->teardownFilter(net);
|
nwfilterDriver->teardownFilter(net);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
virDomainConfVMNWFilterTeardown(virDomainObjPtr vm) {
|
virDomainConfVMNWFilterTeardown(virDomainObjPtr vm)
|
||||||
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
if (nwfilterDriver != NULL) {
|
if (nwfilterDriver != NULL) {
|
||||||
|
@ -44,7 +44,8 @@ static int
|
|||||||
virInterfaceDefDevFormat(virBufferPtr buf, const virInterfaceDef *def);
|
virInterfaceDefDevFormat(virBufferPtr buf, const virInterfaceDef *def);
|
||||||
|
|
||||||
static
|
static
|
||||||
void virInterfaceIpDefFree(virInterfaceIpDefPtr def) {
|
void virInterfaceIpDefFree(virInterfaceIpDefPtr def)
|
||||||
|
{
|
||||||
if (def == NULL)
|
if (def == NULL)
|
||||||
return;
|
return;
|
||||||
VIR_FREE(def->address);
|
VIR_FREE(def->address);
|
||||||
@ -52,7 +53,8 @@ void virInterfaceIpDefFree(virInterfaceIpDefPtr def) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static
|
static
|
||||||
void virInterfaceProtocolDefFree(virInterfaceProtocolDefPtr def) {
|
void virInterfaceProtocolDefFree(virInterfaceProtocolDefPtr def)
|
||||||
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
if (def == NULL)
|
if (def == NULL)
|
||||||
@ -112,7 +114,8 @@ void virInterfaceDefFree(virInterfaceDefPtr def)
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseName(virInterfaceDefPtr def,
|
virInterfaceDefParseName(virInterfaceDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
char *tmp;
|
char *tmp;
|
||||||
|
|
||||||
tmp = virXPathString("string(./@name)", ctxt);
|
tmp = virXPathString("string(./@name)", ctxt);
|
||||||
@ -127,7 +130,8 @@ virInterfaceDefParseName(virInterfaceDefPtr def,
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseMtu(virInterfaceDefPtr def,
|
virInterfaceDefParseMtu(virInterfaceDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
unsigned long mtu;
|
unsigned long mtu;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
@ -144,7 +148,8 @@ virInterfaceDefParseMtu(virInterfaceDefPtr def,
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseStartMode(virInterfaceDefPtr def,
|
virInterfaceDefParseStartMode(virInterfaceDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
char *tmp;
|
char *tmp;
|
||||||
|
|
||||||
tmp = virXPathString("string(./start/@mode)", ctxt);
|
tmp = virXPathString("string(./start/@mode)", ctxt);
|
||||||
@ -167,7 +172,8 @@ virInterfaceDefParseStartMode(virInterfaceDefPtr def,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseBondMode(xmlXPathContextPtr ctxt) {
|
virInterfaceDefParseBondMode(xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
char *tmp;
|
char *tmp;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
@ -198,7 +204,8 @@ virInterfaceDefParseBondMode(xmlXPathContextPtr ctxt) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseBondMiiCarrier(xmlXPathContextPtr ctxt) {
|
virInterfaceDefParseBondMiiCarrier(xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
char *tmp;
|
char *tmp;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
@ -219,7 +226,8 @@ virInterfaceDefParseBondMiiCarrier(xmlXPathContextPtr ctxt) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseBondArpValid(xmlXPathContextPtr ctxt) {
|
virInterfaceDefParseBondArpValid(xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
char *tmp;
|
char *tmp;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
@ -243,7 +251,8 @@ virInterfaceDefParseBondArpValid(xmlXPathContextPtr ctxt) {
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseDhcp(virInterfaceProtocolDefPtr def,
|
virInterfaceDefParseDhcp(virInterfaceProtocolDefPtr def,
|
||||||
xmlNodePtr dhcp, xmlXPathContextPtr ctxt) {
|
xmlNodePtr dhcp, xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
xmlNodePtr save;
|
xmlNodePtr save;
|
||||||
char *tmp;
|
char *tmp;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
@ -273,7 +282,8 @@ virInterfaceDefParseDhcp(virInterfaceProtocolDefPtr def,
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseIp(virInterfaceIpDefPtr def,
|
virInterfaceDefParseIp(virInterfaceIpDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
char *tmp;
|
char *tmp;
|
||||||
long l;
|
long l;
|
||||||
@ -296,7 +306,8 @@ virInterfaceDefParseIp(virInterfaceIpDefPtr def,
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def,
|
virInterfaceDefParseProtoIPv4(virInterfaceProtocolDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
xmlNodePtr dhcp;
|
xmlNodePtr dhcp;
|
||||||
xmlNodePtr *ipNodes = NULL;
|
xmlNodePtr *ipNodes = NULL;
|
||||||
int nIpNodes, ret = -1;
|
int nIpNodes, ret = -1;
|
||||||
@ -346,7 +357,8 @@ error:
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def,
|
virInterfaceDefParseProtoIPv6(virInterfaceProtocolDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
xmlNodePtr dhcp, autoconf;
|
xmlNodePtr dhcp, autoconf;
|
||||||
xmlNodePtr *ipNodes = NULL;
|
xmlNodePtr *ipNodes = NULL;
|
||||||
int nIpNodes, ret = -1;
|
int nIpNodes, ret = -1;
|
||||||
@ -400,7 +412,8 @@ error:
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseIfAdressing(virInterfaceDefPtr def,
|
virInterfaceDefParseIfAdressing(virInterfaceDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
xmlNodePtr save;
|
xmlNodePtr save;
|
||||||
xmlNodePtr *protoNodes = NULL;
|
xmlNodePtr *protoNodes = NULL;
|
||||||
int nProtoNodes, pp, ret = -1;
|
int nProtoNodes, pp, ret = -1;
|
||||||
@ -469,7 +482,8 @@ error:
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseBridge(virInterfaceDefPtr def,
|
virInterfaceDefParseBridge(virInterfaceDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
xmlNodePtr *interfaces = NULL;
|
xmlNodePtr *interfaces = NULL;
|
||||||
xmlNodePtr bridge;
|
xmlNodePtr bridge;
|
||||||
virInterfaceDefPtr itf;
|
virInterfaceDefPtr itf;
|
||||||
@ -510,7 +524,8 @@ error:
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseBondItfs(virInterfaceDefPtr def,
|
virInterfaceDefParseBondItfs(virInterfaceDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
xmlNodePtr *interfaces = NULL;
|
xmlNodePtr *interfaces = NULL;
|
||||||
xmlNodePtr bond = ctxt->node;
|
xmlNodePtr bond = ctxt->node;
|
||||||
virInterfaceDefPtr itf;
|
virInterfaceDefPtr itf;
|
||||||
@ -556,7 +571,8 @@ error:
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseBond(virInterfaceDefPtr def,
|
virInterfaceDefParseBond(virInterfaceDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
int res;
|
int res;
|
||||||
|
|
||||||
def->data.bond.mode = virInterfaceDefParseBondMode(ctxt);
|
def->data.bond.mode = virInterfaceDefParseBondMode(ctxt);
|
||||||
@ -627,7 +643,8 @@ virInterfaceDefParseBond(virInterfaceDefPtr def,
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
virInterfaceDefParseVlan(virInterfaceDefPtr def,
|
virInterfaceDefParseVlan(virInterfaceDefPtr def,
|
||||||
xmlXPathContextPtr ctxt) {
|
xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
def->data.vlan.tag = virXPathString("string(./@tag)", ctxt);
|
def->data.vlan.tag = virXPathString("string(./@tag)", ctxt);
|
||||||
if (def->data.vlan.tag == NULL) {
|
if (def->data.vlan.tag == NULL) {
|
||||||
virReportError(VIR_ERR_XML_ERROR,
|
virReportError(VIR_ERR_XML_ERROR,
|
||||||
@ -646,7 +663,8 @@ virInterfaceDefParseVlan(virInterfaceDefPtr def,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static virInterfaceDefPtr
|
static virInterfaceDefPtr
|
||||||
virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType) {
|
virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType)
|
||||||
|
{
|
||||||
virInterfaceDefPtr def;
|
virInterfaceDefPtr def;
|
||||||
int type;
|
int type;
|
||||||
char *tmp;
|
char *tmp;
|
||||||
|
@ -147,17 +147,20 @@ static virRWLock updateLock;
|
|||||||
static bool initialized = false;
|
static bool initialized = false;
|
||||||
|
|
||||||
void
|
void
|
||||||
virNWFilterReadLockFilterUpdates(void) {
|
virNWFilterReadLockFilterUpdates(void)
|
||||||
|
{
|
||||||
virRWLockRead(&updateLock);
|
virRWLockRead(&updateLock);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
virNWFilterWriteLockFilterUpdates(void) {
|
virNWFilterWriteLockFilterUpdates(void)
|
||||||
|
{
|
||||||
virRWLockWrite(&updateLock);
|
virRWLockWrite(&updateLock);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
virNWFilterUnlockFilterUpdates(void) {
|
virNWFilterUnlockFilterUpdates(void)
|
||||||
|
{
|
||||||
virRWLockUnlock(&updateLock);
|
virRWLockUnlock(&updateLock);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -280,7 +283,8 @@ intMapGetByString(const struct int_map *intmap, const char *str, int casecmp,
|
|||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
virNWFilterRuleDefFree(virNWFilterRuleDefPtr def) {
|
virNWFilterRuleDefFree(virNWFilterRuleDefPtr def)
|
||||||
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
if (!def)
|
if (!def)
|
||||||
return;
|
return;
|
||||||
@ -299,7 +303,8 @@ virNWFilterRuleDefFree(virNWFilterRuleDefPtr def) {
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
virNWFilterIncludeDefFree(virNWFilterIncludeDefPtr inc) {
|
virNWFilterIncludeDefFree(virNWFilterIncludeDefPtr inc)
|
||||||
|
{
|
||||||
if (!inc)
|
if (!inc)
|
||||||
return;
|
return;
|
||||||
virNWFilterHashTableFree(inc->params);
|
virNWFilterHashTableFree(inc->params);
|
||||||
@ -309,7 +314,8 @@ virNWFilterIncludeDefFree(virNWFilterIncludeDefPtr inc) {
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
virNWFilterEntryFree(virNWFilterEntryPtr entry) {
|
virNWFilterEntryFree(virNWFilterEntryPtr entry)
|
||||||
|
{
|
||||||
if (!entry)
|
if (!entry)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -320,7 +326,8 @@ virNWFilterEntryFree(virNWFilterEntryPtr entry) {
|
|||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
virNWFilterDefFree(virNWFilterDefPtr def) {
|
virNWFilterDefFree(virNWFilterDefPtr def)
|
||||||
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
if (!def)
|
if (!def)
|
||||||
return;
|
return;
|
||||||
@ -2493,7 +2500,8 @@ err_exit:
|
|||||||
}
|
}
|
||||||
|
|
||||||
static virNWFilterDefPtr
|
static virNWFilterDefPtr
|
||||||
virNWFilterDefParseXML(xmlXPathContextPtr ctxt) {
|
virNWFilterDefParseXML(xmlXPathContextPtr ctxt)
|
||||||
|
{
|
||||||
virNWFilterDefPtr ret;
|
virNWFilterDefPtr ret;
|
||||||
xmlNodePtr curr = ctxt->node;
|
xmlNodePtr curr = ctxt->node;
|
||||||
char *uuid = NULL;
|
char *uuid = NULL;
|
||||||
@ -2622,7 +2630,8 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) {
|
|||||||
|
|
||||||
virNWFilterDefPtr
|
virNWFilterDefPtr
|
||||||
virNWFilterDefParseNode(xmlDocPtr xml,
|
virNWFilterDefParseNode(xmlDocPtr xml,
|
||||||
xmlNodePtr root) {
|
xmlNodePtr root)
|
||||||
|
{
|
||||||
xmlXPathContextPtr ctxt = NULL;
|
xmlXPathContextPtr ctxt = NULL;
|
||||||
virNWFilterDefPtr def = NULL;
|
virNWFilterDefPtr def = NULL;
|
||||||
|
|
||||||
@ -2650,7 +2659,8 @@ cleanup:
|
|||||||
|
|
||||||
static virNWFilterDefPtr
|
static virNWFilterDefPtr
|
||||||
virNWFilterDefParse(const char *xmlStr,
|
virNWFilterDefParse(const char *xmlStr,
|
||||||
const char *filename) {
|
const char *filename)
|
||||||
|
{
|
||||||
virNWFilterDefPtr def = NULL;
|
virNWFilterDefPtr def = NULL;
|
||||||
xmlDocPtr xml;
|
xmlDocPtr xml;
|
||||||
|
|
||||||
|
@ -684,7 +684,8 @@ virNWFilterHashTableFree(virNWFilterHashTablePtr table)
|
|||||||
|
|
||||||
|
|
||||||
virNWFilterHashTablePtr
|
virNWFilterHashTablePtr
|
||||||
virNWFilterHashTableCreate(int n) {
|
virNWFilterHashTableCreate(int n)
|
||||||
|
{
|
||||||
virNWFilterHashTablePtr ret;
|
virNWFilterHashTablePtr ret;
|
||||||
|
|
||||||
if (VIR_ALLOC(ret) < 0)
|
if (VIR_ALLOC(ret) < 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user