mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 14:15:28 +00:00
conf: Reformat many function headers in domain_conf.c
Many of the headers were using the old style and even overflowing the 80 column mark.
This commit is contained in:
Peter Krempa
parent
6d35a84cc8
commit
00a9da9b88
@ -8093,7 +8093,8 @@ error:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int virDomainEventActionParseXML(xmlXPathContextPtr ctxt,
|
||||
static int
|
||||
virDomainEventActionParseXML(xmlXPathContextPtr ctxt,
|
||||
const char *name,
|
||||
const char *xpath,
|
||||
int *val,
|
||||
@ -8138,7 +8139,8 @@ virDomainPMStateParseXML(xmlXPathContextPtr ctxt,
|
||||
return ret;
|
||||
}
|
||||
|
||||
virDomainDeviceDefPtr virDomainDeviceDefParse(virCapsPtr caps,
|
||||
virDomainDeviceDefPtr
|
||||
virDomainDeviceDefParse(virCapsPtr caps,
|
||||
virDomainDefPtr def,
|
||||
const char *xmlStr,
|
||||
unsigned int flags)
|
||||
@ -9129,7 +9131,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps,
|
||||
static virDomainDefPtr
|
||||
virDomainDefParseXML(virCapsPtr caps,
|
||||
xmlDocPtr xml,
|
||||
xmlNodePtr root,
|
||||
xmlXPathContextPtr ctxt,
|
||||
@ -10739,7 +10742,8 @@ no_memory:
|
||||
}
|
||||
|
||||
|
||||
static virDomainObjPtr virDomainObjParseXML(virCapsPtr caps,
|
||||
static virDomainObjPtr
|
||||
virDomainObjParseXML(virCapsPtr caps,
|
||||
xmlDocPtr xml,
|
||||
xmlXPathContextPtr ctxt,
|
||||
unsigned int expectedVirtTypes,
|
||||
@ -10857,7 +10861,8 @@ virDomainDefParse(const char *xmlStr,
|
||||
return def;
|
||||
}
|
||||
|
||||
virDomainDefPtr virDomainDefParseString(virCapsPtr caps,
|
||||
virDomainDefPtr
|
||||
virDomainDefParseString(virCapsPtr caps,
|
||||
const char *xmlStr,
|
||||
unsigned int expectedVirtTypes,
|
||||
unsigned int flags)
|
||||
@ -10865,7 +10870,8 @@ virDomainDefPtr virDomainDefParseString(virCapsPtr caps,
|
||||
return virDomainDefParse(xmlStr, NULL, caps, expectedVirtTypes, flags);
|
||||
}
|
||||
|
||||
virDomainDefPtr virDomainDefParseFile(virCapsPtr caps,
|
||||
virDomainDefPtr
|
||||
virDomainDefParseFile(virCapsPtr caps,
|
||||
const char *filename,
|
||||
unsigned int expectedVirtTypes,
|
||||
unsigned int flags)
|
||||
@ -10874,7 +10880,8 @@ virDomainDefPtr virDomainDefParseFile(virCapsPtr caps,
|
||||
}
|
||||
|
||||
|
||||
virDomainDefPtr virDomainDefParseNode(virCapsPtr caps,
|
||||
virDomainDefPtr
|
||||
virDomainDefParseNode(virCapsPtr caps,
|
||||
xmlDocPtr xml,
|
||||
xmlNodePtr root,
|
||||
unsigned int expectedVirtTypes,
|
||||
@ -10961,7 +10968,8 @@ virDomainObjParseFile(virCapsPtr caps,
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainTimerDefCheckABIStability(virDomainTimerDefPtr src,
|
||||
static bool
|
||||
virDomainTimerDefCheckABIStability(virDomainTimerDefPtr src,
|
||||
virDomainTimerDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11005,7 +11013,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainDeviceInfoCheckABIStability(virDomainDeviceInfoPtr src,
|
||||
static bool
|
||||
virDomainDeviceInfoCheckABIStability(virDomainDeviceInfoPtr src,
|
||||
virDomainDeviceInfoPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11084,7 +11093,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainDiskDefCheckABIStability(virDomainDiskDefPtr src,
|
||||
static bool
|
||||
virDomainDiskDefCheckABIStability(virDomainDiskDefPtr src,
|
||||
virDomainDiskDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11135,7 +11145,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainControllerDefCheckABIStability(virDomainControllerDefPtr src,
|
||||
static bool
|
||||
virDomainControllerDefCheckABIStability(virDomainControllerDefPtr src,
|
||||
virDomainControllerDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11188,7 +11199,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainFsDefCheckABIStability(virDomainFSDefPtr src,
|
||||
static bool
|
||||
virDomainFsDefCheckABIStability(virDomainFSDefPtr src,
|
||||
virDomainFSDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11216,7 +11228,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainNetDefCheckABIStability(virDomainNetDefPtr src,
|
||||
static bool
|
||||
virDomainNetDefCheckABIStability(virDomainNetDefPtr src,
|
||||
virDomainNetDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11249,7 +11262,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainInputDefCheckABIStability(virDomainInputDefPtr src,
|
||||
static bool
|
||||
virDomainInputDefCheckABIStability(virDomainInputDefPtr src,
|
||||
virDomainInputDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11280,7 +11294,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainSoundDefCheckABIStability(virDomainSoundDefPtr src,
|
||||
static bool
|
||||
virDomainSoundDefCheckABIStability(virDomainSoundDefPtr src,
|
||||
virDomainSoundDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11303,7 +11318,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainVideoDefCheckABIStability(virDomainVideoDefPtr src,
|
||||
static bool
|
||||
virDomainVideoDefCheckABIStability(virDomainVideoDefPtr src,
|
||||
virDomainVideoDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11363,7 +11379,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainHostdevDefCheckABIStability(virDomainHostdevDefPtr src,
|
||||
static bool
|
||||
virDomainHostdevDefCheckABIStability(virDomainHostdevDefPtr src,
|
||||
virDomainHostdevDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11396,7 +11413,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainSmartcardDefCheckABIStability(virDomainSmartcardDefPtr src,
|
||||
static bool
|
||||
virDomainSmartcardDefCheckABIStability(virDomainSmartcardDefPtr src,
|
||||
virDomainSmartcardDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11411,7 +11429,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainSerialDefCheckABIStability(virDomainChrDefPtr src,
|
||||
static bool
|
||||
virDomainSerialDefCheckABIStability(virDomainChrDefPtr src,
|
||||
virDomainChrDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11433,7 +11452,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainParallelDefCheckABIStability(virDomainChrDefPtr src,
|
||||
static bool
|
||||
virDomainParallelDefCheckABIStability(virDomainChrDefPtr src,
|
||||
virDomainChrDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11455,7 +11475,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainChannelDefCheckABIStability(virDomainChrDefPtr src,
|
||||
static bool
|
||||
virDomainChannelDefCheckABIStability(virDomainChrDefPtr src,
|
||||
virDomainChrDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11511,7 +11532,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainConsoleDefCheckABIStability(virDomainChrDefPtr src,
|
||||
static bool
|
||||
virDomainConsoleDefCheckABIStability(virDomainChrDefPtr src,
|
||||
virDomainChrDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11534,7 +11556,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainWatchdogDefCheckABIStability(virDomainWatchdogDefPtr src,
|
||||
static bool
|
||||
virDomainWatchdogDefCheckABIStability(virDomainWatchdogDefPtr src,
|
||||
virDomainWatchdogDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11557,7 +11580,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainMemballoonDefCheckABIStability(virDomainMemballoonDefPtr src,
|
||||
static bool
|
||||
virDomainMemballoonDefCheckABIStability(virDomainMemballoonDefPtr src,
|
||||
virDomainMemballoonDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11580,7 +11604,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static bool virDomainHubDefCheckABIStability(virDomainHubDefPtr src,
|
||||
static bool
|
||||
virDomainHubDefCheckABIStability(virDomainHubDefPtr src,
|
||||
virDomainHubDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11662,7 +11687,8 @@ cleanup:
|
||||
* which will affect the guest ABI. This is primarily to allow
|
||||
* validation of custom XML config passed in during migration
|
||||
*/
|
||||
bool virDomainDefCheckABIStability(virDomainDefPtr src,
|
||||
bool
|
||||
virDomainDefCheckABIStability(virDomainDefPtr src,
|
||||
virDomainDefPtr dst)
|
||||
{
|
||||
bool identical = false;
|
||||
@ -11969,7 +11995,8 @@ cleanup:
|
||||
}
|
||||
|
||||
|
||||
static int virDomainDefAddDiskControllersForType(virDomainDefPtr def,
|
||||
static int
|
||||
virDomainDefAddDiskControllersForType(virDomainDefPtr def,
|
||||
int controllerType,
|
||||
int diskBus)
|
||||
{
|
||||
@ -11996,7 +12023,8 @@ static int virDomainDefAddDiskControllersForType(virDomainDefPtr def,
|
||||
}
|
||||
|
||||
|
||||
static int virDomainDefMaybeAddVirtioSerialController(virDomainDefPtr def)
|
||||
static int
|
||||
virDomainDefMaybeAddVirtioSerialController(virDomainDefPtr def)
|
||||
{
|
||||
/* Look for any virtio serial or virtio console devs */
|
||||
int i;
|
||||
@ -12079,7 +12107,8 @@ virDomainDefMaybeAddSmartcardController(virDomainDefPtr def)
|
||||
* in the XML. This is for compat with existing apps which will
|
||||
* not know/care about <controller> info in the XML
|
||||
*/
|
||||
int virDomainDefAddImplicitControllers(virDomainDefPtr def)
|
||||
int
|
||||
virDomainDefAddImplicitControllers(virDomainDefPtr def)
|
||||
{
|
||||
if (virDomainDefAddDiskControllersForType(def,
|
||||
VIR_DOMAIN_CONTROLLER_TYPE_SCSI,
|
||||
@ -12148,7 +12177,8 @@ virDomainVcpuPinFindByVcpu(virDomainVcpuPinDefPtr *def,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int virDomainVcpuPinAdd(virDomainVcpuPinDefPtr **vcpupin_list,
|
||||
int
|
||||
virDomainVcpuPinAdd(virDomainVcpuPinDefPtr **vcpupin_list,
|
||||
int *nvcpupin,
|
||||
unsigned char *cpumap,
|
||||
int maplen,
|
||||
@ -12388,7 +12418,8 @@ virDomainLeaseDefFormat(virBufferPtr buf,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void virDomainDiskGeometryDefFormat(virBufferPtr buf,
|
||||
static void
|
||||
virDomainDiskGeometryDefFormat(virBufferPtr buf,
|
||||
virDomainDiskDefPtr def)
|
||||
{
|
||||
const char *trans =
|
||||
@ -12409,7 +12440,8 @@ static void virDomainDiskGeometryDefFormat(virBufferPtr buf,
|
||||
virBufferAddLit(buf, "/>\n");
|
||||
}
|
||||
}
|
||||
static void virDomainDiskBlockIoDefFormat(virBufferPtr buf,
|
||||
static void
|
||||
virDomainDiskBlockIoDefFormat(virBufferPtr buf,
|
||||
virDomainDiskDefPtr def)
|
||||
{
|
||||
if (def->blockio.logical_block_size > 0 ||
|
||||
@ -14868,7 +14900,8 @@ virDomainDefFormat(virDomainDefPtr def, unsigned int flags)
|
||||
}
|
||||
|
||||
|
||||
static char *virDomainObjFormat(virCapsPtr caps,
|
||||
static char *
|
||||
virDomainObjFormat(virCapsPtr caps,
|
||||
virDomainObjPtr obj,
|
||||
unsigned int flags)
|
||||
{
|
||||
@ -14964,7 +14997,8 @@ virDomainDefCompatibleDevice(virDomainDefPtr def,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int virDomainSaveXML(const char *configDir,
|
||||
int
|
||||
virDomainSaveXML(const char *configDir,
|
||||
virDomainDefPtr def,
|
||||
const char *xml)
|
||||
{
|
||||
@ -14992,7 +15026,8 @@ int virDomainSaveXML(const char *configDir,
|
||||
return ret;
|
||||
}
|
||||
|
||||
int virDomainSaveConfig(const char *configDir,
|
||||
int
|
||||
virDomainSaveConfig(const char *configDir,
|
||||
virDomainDefPtr def)
|
||||
{
|
||||
int ret = -1;
|
||||
@ -15011,7 +15046,8 @@ cleanup:
|
||||
return ret;
|
||||
}
|
||||
|
||||
int virDomainSaveStatus(virCapsPtr caps,
|
||||
int
|
||||
virDomainSaveStatus(virCapsPtr caps,
|
||||
const char *statusDir,
|
||||
virDomainObjPtr obj)
|
||||
{
|
||||
@ -15130,7 +15166,8 @@ error:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int virDomainObjListLoadAllConfigs(virDomainObjListPtr doms,
|
||||
int
|
||||
virDomainObjListLoadAllConfigs(virDomainObjListPtr doms,
|
||||
virCapsPtr caps,
|
||||
const char *configDir,
|
||||
const char *autostartDir,
|
||||
@ -15196,7 +15233,8 @@ int virDomainObjListLoadAllConfigs(virDomainObjListPtr doms,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int virDomainDeleteConfig(const char *configDir,
|
||||
int
|
||||
virDomainDeleteConfig(const char *configDir,
|
||||
const char *autostartDir,
|
||||
virDomainObjPtr dom)
|
||||
{
|
||||
@ -15227,7 +15265,8 @@ cleanup:
|
||||
return ret;
|
||||
}
|
||||
|
||||
char *virDomainConfigFile(const char *dir,
|
||||
char
|
||||
*virDomainConfigFile(const char *dir,
|
||||
const char *name)
|
||||
{
|
||||
char *ret = NULL;
|
||||
@ -15248,7 +15287,8 @@ char *virDomainConfigFile(const char *dir,
|
||||
* @param devIdx parsed device number
|
||||
* @return 0 on success, -1 on failure
|
||||
*/
|
||||
int virDiskNameToBusDeviceIndex(const virDomainDiskDefPtr disk,
|
||||
int
|
||||
virDiskNameToBusDeviceIndex(const virDomainDiskDefPtr disk,
|
||||
int *busIdx,
|
||||
int *devIdx) {
|
||||
|
||||
@ -15278,7 +15318,8 @@ int virDiskNameToBusDeviceIndex(const virDomainDiskDefPtr disk,
|
||||
return 0;
|
||||
}
|
||||
|
||||
virDomainFSDefPtr virDomainGetRootFilesystem(virDomainDefPtr def)
|
||||
virDomainFSDefPtr
|
||||
virDomainGetRootFilesystem(virDomainDefPtr def)
|
||||
{
|
||||
int i;
|
||||
|
||||
@ -15294,7 +15335,10 @@ virDomainFSDefPtr virDomainGetRootFilesystem(virDomainDefPtr def)
|
||||
}
|
||||
|
||||
|
||||
static void virDomainObjListCountActive(void *payload, const void *name ATTRIBUTE_UNUSED, void *data)
|
||||
static void
|
||||
virDomainObjListCountActive(void *payload,
|
||||
const void *name ATTRIBUTE_UNUSED,
|
||||
void *data)
|
||||
{
|
||||
virDomainObjPtr obj = payload;
|
||||
int *count = data;
|
||||
@ -15304,7 +15348,10 @@ static void virDomainObjListCountActive(void *payload, const void *name ATTRIBUT
|
||||
virObjectUnlock(obj);
|
||||
}
|
||||
|
||||
static void virDomainObjListCountInactive(void *payload, const void *name ATTRIBUTE_UNUSED, void *data)
|
||||
static void
|
||||
virDomainObjListCountInactive(void *payload,
|
||||
const void *name ATTRIBUTE_UNUSED,
|
||||
void *data)
|
||||
{
|
||||
virDomainObjPtr obj = payload;
|
||||
int *count = data;
|
||||
@ -15314,7 +15361,9 @@ static void virDomainObjListCountInactive(void *payload, const void *name ATTRIB
|
||||
virObjectUnlock(obj);
|
||||
}
|
||||
|
||||
int virDomainObjListNumOfDomains(virDomainObjListPtr doms, int active)
|
||||
int
|
||||
virDomainObjListNumOfDomains(virDomainObjListPtr doms,
|
||||
int active)
|
||||
{
|
||||
int count = 0;
|
||||
virObjectLock(doms);
|
||||
@ -15332,7 +15381,10 @@ struct virDomainIDData {
|
||||
int *ids;
|
||||
};
|
||||
|
||||
static void virDomainObjListCopyActiveIDs(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque)
|
||||
static void
|
||||
virDomainObjListCopyActiveIDs(void *payload,
|
||||
const void *name ATTRIBUTE_UNUSED,
|
||||
void *opaque)
|
||||
{
|
||||
virDomainObjPtr obj = payload;
|
||||
struct virDomainIDData *data = opaque;
|
||||
@ -15342,7 +15394,8 @@ static void virDomainObjListCopyActiveIDs(void *payload, const void *name ATTRIB
|
||||
virObjectUnlock(obj);
|
||||
}
|
||||
|
||||
int virDomainObjListGetActiveIDs(virDomainObjListPtr doms,
|
||||
int
|
||||
virDomainObjListGetActiveIDs(virDomainObjListPtr doms,
|
||||
int *ids,
|
||||
int maxids)
|
||||
{
|
||||
@ -15360,7 +15413,10 @@ struct virDomainNameData {
|
||||
char **const names;
|
||||
};
|
||||
|
||||
static void virDomainObjListCopyInactiveNames(void *payload, const void *name ATTRIBUTE_UNUSED, void *opaque)
|
||||
static void
|
||||
virDomainObjListCopyInactiveNames(void *payload,
|
||||
const void *name ATTRIBUTE_UNUSED,
|
||||
void *opaque)
|
||||
{
|
||||
virDomainObjPtr obj = payload;
|
||||
struct virDomainNameData *data = opaque;
|
||||
@ -15379,7 +15435,8 @@ static void virDomainObjListCopyInactiveNames(void *payload, const void *name AT
|
||||
}
|
||||
|
||||
|
||||
int virDomainObjListGetInactiveNames(virDomainObjListPtr doms,
|
||||
int
|
||||
virDomainObjListGetInactiveNames(virDomainObjListPtr doms,
|
||||
char **const names,
|
||||
int maxnames)
|
||||
{
|
||||
@ -15419,7 +15476,8 @@ virDomainObjListHelper(void *payload,
|
||||
data->ret = -1;
|
||||
}
|
||||
|
||||
int virDomainObjListForEach(virDomainObjListPtr doms,
|
||||
int
|
||||
virDomainObjListForEach(virDomainObjListPtr doms,
|
||||
virDomainObjListIterator callback,
|
||||
void *opaque)
|
||||
{
|
||||
@ -15433,7 +15491,8 @@ int virDomainObjListForEach(virDomainObjListPtr doms,
|
||||
}
|
||||
|
||||
|
||||
int virDomainChrDefForeach(virDomainDefPtr def,
|
||||
int
|
||||
virDomainChrDefForeach(virDomainDefPtr def,
|
||||
bool abortOnError,
|
||||
virDomainChrDefIterator iter,
|
||||
void *opaque)
|
||||
@ -15485,7 +15544,8 @@ done:
|
||||
}
|
||||
|
||||
|
||||
int virDomainSmartcardDefForeach(virDomainDefPtr def,
|
||||
int
|
||||
virDomainSmartcardDefForeach(virDomainDefPtr def,
|
||||
bool abortOnError,
|
||||
virDomainSmartcardDefIterator iter,
|
||||
void *opaque)
|
||||
@ -15513,7 +15573,8 @@ done:
|
||||
* ignoreOpenFailure determines whether to warn about a chain that
|
||||
* mentions a backing file without also having metadata on that
|
||||
* file. */
|
||||
int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk,
|
||||
int
|
||||
virDomainDiskDefForeachPath(virDomainDiskDefPtr disk,
|
||||
bool ignoreOpenFailure,
|
||||
virDomainDiskDefPathIterator iter,
|
||||
void *opaque)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user