Preliminary cleanups to make search-and-replace easier in later patches. * src/libvirt.c: Uniform two spaces between functions, return type and open brace on separate line, and label in column 1. Signed-off-by: Eric Blake <eblake@xxxxxxxxxx> --- src/libvirt.c | 718 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 536 insertions(+), 182 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 6aaa3a4..8066b7c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -128,7 +128,9 @@ static int virStateDriverTabCount = 0; #if defined(POLKIT_AUTH) -static int virConnectAuthGainPolkit(const char *privilege) { +static int +virConnectAuthGainPolkit(const char *privilege) +{ virCommandPtr cmd; int status; int ret = -1; @@ -148,9 +150,12 @@ cleanup: } #endif -static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred, - unsigned int ncred, - void *cbdata ATTRIBUTE_UNUSED) { + +static int +virConnectAuthCallbackDefault(virConnectCredentialPtr cred, + unsigned int ncred, + void *cbdata ATTRIBUTE_UNUSED) +{ size_t i; for (i = 0; i < ncred; i++) { @@ -225,6 +230,7 @@ static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred, return 0; } + /* Don't typically want VIR_CRED_USERNAME. It enables you to authenticate * as one user, and act as another. It just results in annoying * prompts for the username twice & is very rarely what you want @@ -273,7 +279,8 @@ winsock_init(void) #ifdef WITH_GNUTLS_GCRYPT -static int virTLSMutexInit(void **priv) +static int +virTLSMutexInit(void **priv) { virMutexPtr lock = NULL; @@ -289,7 +296,9 @@ static int virTLSMutexInit(void **priv) return 0; } -static int virTLSMutexDestroy(void **priv) + +static int +virTLSMutexDestroy(void **priv) { virMutexPtr lock = *priv; virMutexDestroy(lock); @@ -297,20 +306,25 @@ static int virTLSMutexDestroy(void **priv) return 0; } -static int virTLSMutexLock(void **priv) + +static int +virTLSMutexLock(void **priv) { virMutexPtr lock = *priv; virMutexLock(lock); return 0; } -static int virTLSMutexUnlock(void **priv) + +static int +virTLSMutexUnlock(void **priv) { virMutexPtr lock = *priv; virMutexUnlock(lock); return 0; } + static struct gcry_thread_cbs virTLSThreadImpl = { /* GCRY_THREAD_OPTION_VERSION was added in gcrypt 1.4.2 */ # ifdef GCRY_THREAD_OPTION_VERSION @@ -506,6 +520,7 @@ error: virGlobalError = true; } + /** * virInitialize: * @@ -532,6 +547,7 @@ virInitialize(void) return 0; } + #ifdef WIN32 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID ignore); @@ -566,6 +582,7 @@ DllMain(HINSTANCE instance ATTRIBUTE_UNUSED, } #endif + #define virLibConnError(code, ...) \ virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \ __FUNCTION__, __LINE__, __VA_ARGS__) @@ -628,6 +645,7 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) return virNetworkDriverTabCount++; } + /** * virRegisterInterfaceDriver: * @driver: pointer to an interface driver block @@ -655,6 +673,7 @@ virRegisterInterfaceDriver(virInterfaceDriverPtr driver) return virInterfaceDriverTabCount++; } + /** * virRegisterStorageDriver: * @driver: pointer to a storage driver block @@ -682,6 +701,7 @@ virRegisterStorageDriver(virStorageDriverPtr driver) return virStorageDriverTabCount++; } + /** * virRegisterNodeDeviceDriver: * @driver: pointer to a device monitor block @@ -709,6 +729,7 @@ virRegisterNodeDeviceDriver(virNodeDeviceDriverPtr driver) return virNodeDeviceDriverTabCount++; } + /** * virRegisterSecretDriver: * @driver: pointer to a secret driver block @@ -736,6 +757,7 @@ virRegisterSecretDriver(virSecretDriverPtr driver) return virSecretDriverTabCount++; } + /** * virRegisterNWFilterDriver: * @driver: pointer to a network filter driver block @@ -793,6 +815,7 @@ virRegisterDriver(virDriverPtr driver) return virDriverTabCount++; } + #ifdef WITH_LIBVIRTD /** * virRegisterStateDriver: @@ -818,6 +841,7 @@ virRegisterStateDriver(virStateDriverPtr driver) return virStateDriverTabCount++; } + /** * virStateInitialize: * @privileged: set to true if running with root privilege, false otherwise @@ -832,9 +856,10 @@ virRegisterStateDriver(virStateDriverPtr driver) * * Returns 0 if all succeed, -1 upon any failure. */ -int virStateInitialize(bool privileged, - virStateInhibitCallback callback, - void *opaque) +int +virStateInitialize(bool privileged, + virStateInhibitCallback callback, + void *opaque) { size_t i; @@ -867,6 +892,7 @@ int virStateInitialize(bool privileged, return 0; } + /** * virStateCleanup: * @@ -874,7 +900,9 @@ int virStateInitialize(bool privileged, * * Returns 0 if all succeed, -1 upon any failure. */ -int virStateCleanup(void) { +int +virStateCleanup(void) +{ size_t i; int ret = 0; @@ -886,6 +914,7 @@ int virStateCleanup(void) { return ret; } + /** * virStateReload: * @@ -893,7 +922,9 @@ int virStateCleanup(void) { * * Returns 0 if all succeed, -1 upon any failure. */ -int virStateReload(void) { +int +virStateReload(void) +{ size_t i; int ret = 0; @@ -905,6 +936,7 @@ int virStateReload(void) { return ret; } + /** * virStateStop: * @@ -912,7 +944,9 @@ int virStateReload(void) { * * Returns 0 if successful, -1 on failure */ -int virStateStop(void) { +int +virStateStop(void) +{ size_t i; int ret = 0; @@ -923,9 +957,7 @@ int virStateStop(void) { } return ret; } - -#endif - +#endif /* WITH_LIBVIRTD */ /** @@ -971,6 +1003,7 @@ error: return -1; } + static char * virConnectGetConfigFilePath(void) { @@ -995,6 +1028,7 @@ virConnectGetConfigFilePath(void) return path; } + static int virConnectGetConfigFile(virConfPtr *conf) { @@ -1024,8 +1058,10 @@ cleanup: #define URI_ALIAS_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-" + static int -virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char **uri) +virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, + char **uri) { virConfValuePtr entry; size_t alias_len; @@ -1078,6 +1114,7 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char * return 0; } + static int virConnectOpenResolveURIAlias(virConfPtr conf, const char *alias, char **uri) @@ -1121,6 +1158,7 @@ cleanup: return ret; } + static virConnectPtr do_open(const char *name, virConnectAuthPtr auth, @@ -1372,6 +1410,7 @@ failed: return NULL; } + /** * virConnectOpen: * @name: (optional) URI of the hypervisor @@ -1414,6 +1453,7 @@ error: return NULL; } + /** * virConnectOpenReadOnly: * @name: (optional) URI of the hypervisor @@ -1449,6 +1489,7 @@ error: return NULL; } + /** * virConnectOpenAuth: * @name: (optional) URI of the hypervisor @@ -1488,6 +1529,7 @@ error: return NULL; } + /** * virConnectClose: * @conn: pointer to the hypervisor connection @@ -1538,6 +1580,7 @@ error: return ret; } + /** * virConnectRef: * @conn: the connection to hold a reference on @@ -1568,6 +1611,7 @@ virConnectRef(virConnectPtr conn) return 0; } + /* * Not for public use. This function is part of the internal * implementation of driver features in the remote case. @@ -1597,6 +1641,7 @@ virConnectSupportsFeature(virConnectPtr conn, int feature) return ret; } + /** * virConnectGetType: * @conn: pointer to the hypervisor connection @@ -1633,6 +1678,7 @@ virConnectGetType(virConnectPtr conn) return conn->driver->name; } + /** * virConnectGetVersion: * @conn: pointer to the hypervisor connection @@ -1675,6 +1721,7 @@ error: return -1; } + /** * virConnectGetLibVersion: * @conn: pointer to the hypervisor connection @@ -1717,6 +1764,7 @@ error: return ret; } + /** * virConnectGetHostname: * @conn: pointer to a hypervisor connection @@ -1757,6 +1805,7 @@ error: return NULL; } + /** * virConnectGetURI: * @conn: pointer to a hypervisor connection @@ -1796,6 +1845,7 @@ error: return NULL; } + /** * virConnectGetSysinfo: * @conn: pointer to a hypervisor connection @@ -1836,6 +1886,7 @@ error: return NULL; } + /** * virConnectGetMaxVcpus: * @conn: pointer to the hypervisor connection @@ -1874,6 +1925,7 @@ error: return -1; } + /** * virConnectListDomains: * @conn: pointer to the hypervisor connection @@ -1920,6 +1972,7 @@ error: return -1; } + /** * virConnectNumOfDomains: * @conn: pointer to the hypervisor connection @@ -1954,6 +2007,7 @@ error: return -1; } + /** * virDomainGetConnect: * @dom: pointer to a domain @@ -1983,6 +2037,7 @@ virDomainGetConnect(virDomainPtr dom) return dom->conn; } + /** * virDomainCreateXML: * @conn: pointer to the hypervisor connection @@ -2042,6 +2097,7 @@ error: return NULL; } + /** * virDomainCreateXMLWithFiles: * @conn: pointer to the hypervisor connection @@ -2115,6 +2171,7 @@ error: return NULL; } + /** * virDomainCreateLinux: * @conn: pointer to the hypervisor connection @@ -2134,6 +2191,7 @@ virDomainCreateLinux(virConnectPtr conn, const char *xmlDesc, return virDomainCreateXML(conn, xmlDesc, flags); } + /** * virDomainLookupByID: * @conn: pointer to the hypervisor connection @@ -2175,6 +2233,7 @@ error: return NULL; } + /** * virDomainLookupByUUID: * @conn: pointer to the hypervisor connection @@ -2214,6 +2273,7 @@ error: return NULL; } + /** * virDomainLookupByUUIDString: * @conn: pointer to the hypervisor connection @@ -2253,6 +2313,7 @@ error: return NULL; } + /** * virDomainLookupByName: * @conn: pointer to the hypervisor connection @@ -2292,6 +2353,7 @@ error: return NULL; } + /** * virDomainDestroy: * @domain: a domain object @@ -2352,6 +2414,7 @@ error: return -1; } + /** * virDomainDestroyFlags: * @domain: a domain object @@ -2418,6 +2481,7 @@ error: return -1; } + /** * virDomainFree: * @domain: a domain object @@ -2443,6 +2507,7 @@ virDomainFree(virDomainPtr domain) return 0; } + /** * virDomainRef: * @domain: the domain to hold a reference on @@ -2525,6 +2590,7 @@ error: return -1; } + /** * virDomainResume: * @domain: a domain object @@ -2573,6 +2639,7 @@ error: return -1; } + /** * virDomainPMSuspendForDuration: * @dom: a domain object @@ -2641,6 +2708,7 @@ error: return -1; } + /** * virDomainPMWakeup: * @dom: a domain object @@ -2691,6 +2759,7 @@ error: return -1; } + /** * virDomainSave: * @domain: a domain object @@ -2755,6 +2824,7 @@ error: return -1; } + /** * virDomainSaveFlags: * @domain: a domain object @@ -2850,6 +2920,7 @@ error: return -1; } + /** * virDomainRestore: * @conn: pointer to the hypervisor connection @@ -2906,6 +2977,7 @@ error: return -1; } + /** * virDomainRestoreFlags: * @conn: pointer to the hypervisor connection @@ -2989,6 +3061,7 @@ error: return -1; } + /** * virDomainSaveImageGetXMLDesc: * @conn: pointer to the hypervisor connection @@ -3057,6 +3130,7 @@ error: return NULL; } + /** * virDomainSaveImageDefineXML: * @conn: pointer to the hypervisor connection @@ -3138,6 +3212,7 @@ error: return -1; } + /** * virDomainCoreDump: * @domain: a domain object @@ -3229,6 +3304,7 @@ error: return -1; } + /** * virDomainScreenshot: * @domain: a domain object @@ -3294,6 +3370,7 @@ error: return NULL; } + /** * virDomainShutdown: * @domain: a domain object @@ -3350,6 +3427,7 @@ error: return -1; } + /** * virDomainShutdownFlags: * @domain: a domain object @@ -3413,6 +3491,7 @@ error: return -1; } + /** * virDomainReboot: * @domain: a domain object @@ -3477,6 +3556,7 @@ error: return -1; } + /** * virDomainReset: * @domain: a domain object @@ -3527,6 +3607,7 @@ error: return -1; } + /** * virDomainGetName: * @domain: a domain object @@ -3551,6 +3632,7 @@ virDomainGetName(virDomainPtr domain) return domain->name; } + /** * virDomainGetUUID: * @domain: a domain object @@ -3579,6 +3661,7 @@ virDomainGetUUID(virDomainPtr domain, unsigned char *uuid) return 0; } + /** * virDomainGetUUIDString: * @domain: a domain object @@ -3616,6 +3699,7 @@ error: return -1; } + /** * virDomainGetID: * @domain: a domain object @@ -3639,6 +3723,7 @@ virDomainGetID(virDomainPtr domain) return domain->id; } + /** * virDomainGetOSType: * @domain: a domain object @@ -3680,6 +3765,7 @@ error: return NULL; } + /** * virDomainGetMaxMemory: * @domain: a domain object or NULL @@ -3728,6 +3814,7 @@ error: return 0; } + /** * virDomainSetMaxMemory: * @domain: a domain object or NULL @@ -3781,6 +3868,7 @@ error: return -1; } + /** * virDomainSetMemory: * @domain: a domain object or NULL @@ -3833,6 +3921,7 @@ error: return -1; } + /** * virDomainSetMemoryFlags: * @domain: a domain object or NULL @@ -3858,7 +3947,6 @@ error: * * Returns 0 in case of success, -1 in case of failure. */ - int virDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, unsigned int flags) @@ -3898,6 +3986,7 @@ error: return -1; } + /** * virDomainSetMemoryStatsPeriod: * @domain: a domain object or NULL @@ -3920,7 +4009,6 @@ error: * * Returns 0 in case of success, -1 in case of failure. */ - int virDomainSetMemoryStatsPeriod(virDomainPtr domain, int period, unsigned int flags) @@ -3962,6 +4050,7 @@ error: return -1; } + /* Helper function called to validate incoming client array on any * interface that sets typed parameters in the hypervisor. */ static int @@ -4003,6 +4092,7 @@ virTypedParameterValidateSet(virConnectPtr conn, return 0; } + /** * virDomainSetMemoryParameters: * @domain: pointer to domain object @@ -4061,6 +4151,7 @@ error: return -1; } + /** * virDomainGetMemoryParameters: * @domain: pointer to domain object @@ -4146,6 +4237,7 @@ error: return -1; } + /** * virDomainSetNumaParameters: * @domain: pointer to domain object @@ -4204,6 +4296,7 @@ error: return -1; } + /** * virDomainGetNumaParameters: * @domain: pointer to domain object @@ -4230,7 +4323,6 @@ error: * * Returns -1 in case of error, 0 in case of success. */ - int virDomainGetNumaParameters(virDomainPtr domain, virTypedParameterPtr params, @@ -4274,6 +4366,7 @@ error: return -1; } + /** * virDomainSetBlkioParameters: * @domain: pointer to domain object @@ -4332,6 +4425,7 @@ error: return -1; } + /** * virDomainGetBlkioParameters: * @domain: pointer to domain object @@ -4408,6 +4502,7 @@ error: return -1; } + /** * virDomainGetInfo: * @domain: a domain object @@ -4454,6 +4549,7 @@ error: return -1; } + /** * virDomainGetState: * @domain: a domain object @@ -4503,6 +4599,7 @@ error: return -1; } + /** * virDomainGetControlInfo: * @domain: a domain object @@ -4548,6 +4645,7 @@ error: return -1; } + /** * virDomainGetXMLDesc: * @domain: a domain object @@ -4607,6 +4705,7 @@ error: return NULL; } + /** * virConnectDomainXMLFromNative: * @conn: a connection object @@ -4662,6 +4761,7 @@ error: return NULL; } + /** * virConnectDomainXMLToNative: * @conn: a connection object @@ -4802,12 +4902,13 @@ virDomainMigrateVersion1(virDomainPtr domain, else ddomain = virDomainLookupByName(dconn, dname); - done: +done: VIR_FREE(uri_out); VIR_FREE(cookie); return ddomain; } + /* * Sequence v2: * @@ -4933,7 +5034,7 @@ finish: ddomain = dconn->driver->domainMigrateFinish2 (dconn, dname, cookie, cookielen, uri, destflags, cancelled); - done: +done: if (orig_err) { virSetError(orig_err); virFreeError(orig_err); @@ -5228,7 +5329,7 @@ confirm: } } - done: +done: if (orig_err) { virSetError(orig_err); virFreeError(orig_err); @@ -5241,6 +5342,7 @@ confirm: return ddomain; } + static virDomainPtr virDomainMigrateVersion3(virDomainPtr domain, virConnectPtr dconn, @@ -5254,6 +5356,7 @@ virDomainMigrateVersion3(virDomainPtr domain, bandwidth, NULL, 0, false, flags); } + static virDomainPtr virDomainMigrateVersion3Params(virDomainPtr domain, virConnectPtr dconn, @@ -5266,20 +5369,20 @@ virDomainMigrateVersion3Params(virDomainPtr domain, } - /* - * In normal migration, the libvirt client co-ordinates communication - * between the 2 libvirtd instances on source & dest hosts. - * - * In this peer-2-peer migration alternative, the libvirt client - * only talks to the source libvirtd instance. The source libvirtd - * then opens its own connection to the destination and co-ordinates - * migration itself. - * - * If useParams is true, params and nparams contain migration parameters and - * we know it's safe to call the API which supports extensible parameters. - * Otherwise, we have to use xmlin, dname, uri, and bandwidth and pass them - * to the old-style APIs. - */ +/* + * In normal migration, the libvirt client co-ordinates communication + * between the 2 libvirtd instances on source & dest hosts. + * + * In this peer-2-peer migration alternative, the libvirt client + * only talks to the source libvirtd instance. The source libvirtd + * then opens its own connection to the destination and co-ordinates + * migration itself. + * + * If useParams is true, params and nparams contain migration parameters and + * we know it's safe to call the API which supports extensible parameters. + * Otherwise, we have to use xmlin, dname, uri, and bandwidth and pass them + * to the old-style APIs. + */ static int virDomainMigratePeer2PeerFull(virDomainPtr domain, const char *dconnuri, @@ -5349,6 +5452,7 @@ virDomainMigratePeer2PeerFull(virDomainPtr domain, } } + static int virDomainMigratePeer2Peer(virDomainPtr domain, const char *xmlin, @@ -5362,6 +5466,7 @@ virDomainMigratePeer2Peer(virDomainPtr domain, bandwidth, NULL, 0, false, flags); } + static int virDomainMigratePeer2PeerParams(virDomainPtr domain, const char *dconnuri, @@ -6621,6 +6726,7 @@ error: return -1; } + /* * Not for public use. This function is part of the internal * implementation of migration in the remote case. @@ -6671,6 +6777,7 @@ error: return -1; } + /* * Not for public use. This function is part of the internal * implementation of migration in the remote case. @@ -6769,6 +6876,7 @@ error: return -1; } + /* * Not for public use. This function is part of the internal * implementation of migration in the remote case. @@ -6870,6 +6978,7 @@ error: return -1; } + /* * Not for public use. This function is part of the internal * implementation of migration in the remote case. @@ -6979,6 +7088,7 @@ error: return -1; } + /* * Not for public use. This function is part of the internal * implementation of migration in the remote case. @@ -7566,6 +7676,7 @@ error: return -1; } + /** * virConnectGetCapabilities: * @conn: pointer to the hypervisor connection @@ -7605,6 +7716,7 @@ error: return NULL; } + /** * virNodeGetCPUStats: * @conn: pointer to the hypervisor connection. @@ -7659,10 +7771,11 @@ error: * * Returns -1 in case of error, 0 in case of success. */ -int virNodeGetCPUStats(virConnectPtr conn, - int cpuNum, - virNodeCPUStatsPtr params, - int *nparams, unsigned int flags) +int +virNodeGetCPUStats(virConnectPtr conn, + int cpuNum, + virNodeCPUStatsPtr params, + int *nparams, unsigned int flags) { VIR_DEBUG("conn=%p, cpuNum=%d, params=%p, nparams=%d, flags=%x", conn, cpuNum, params, nparams ? *nparams : -1, flags); @@ -7698,6 +7811,7 @@ error: return -1; } + /** * virNodeGetMemoryStats: * @conn: pointer to the hypervisor connection. @@ -7748,10 +7862,11 @@ error: * * Returns -1 in case of error, 0 in case of success. */ -int virNodeGetMemoryStats(virConnectPtr conn, - int cellNum, - virNodeMemoryStatsPtr params, - int *nparams, unsigned int flags) +int +virNodeGetMemoryStats(virConnectPtr conn, + int cellNum, + virNodeMemoryStatsPtr params, + int *nparams, unsigned int flags) { VIR_DEBUG("conn=%p, cellNum=%d, params=%p, nparams=%d, flags=%x", conn, cellNum, params, nparams ? *nparams : -1, flags); @@ -7787,6 +7902,7 @@ error: return -1; } + /** * virNodeGetFreeMemory: * @conn: pointer to the hypervisor connection @@ -7825,6 +7941,7 @@ error: return 0; } + /** * virNodeSuspendForDuration: * @conn: pointer to the hypervisor connection @@ -7885,6 +8002,7 @@ error: return -1; } + /* * virNodeGetMemoryParameters: * @conn: pointer to the hypervisor connection @@ -7949,6 +8067,7 @@ error: return -1; } + /* * virNodeSetMemoryParameters: * @conn: pointer to the hypervisor connection @@ -8015,6 +8134,7 @@ error: return -1; } + /** * virDomainGetSchedulerType: * @domain: pointer to domain object @@ -8114,6 +8234,7 @@ error: return -1; } + /** * virDomainGetSchedulerParametersFlags: * @domain: pointer to domain object @@ -8197,6 +8318,7 @@ error: return -1; } + /** * virDomainSetSchedulerParameters: * @domain: pointer to domain object @@ -8392,6 +8514,7 @@ error: return -1; } + /** * virDomainBlockStatsFlags: * @dom: pointer to domain object @@ -8429,11 +8552,12 @@ error: * * Returns -1 in case of error, 0 in case of success. */ -int virDomainBlockStatsFlags(virDomainPtr dom, - const char *disk, - virTypedParameterPtr params, - int *nparams, - unsigned int flags) +int +virDomainBlockStatsFlags(virDomainPtr dom, + const char *disk, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) { virConnectPtr conn; @@ -8538,7 +8662,8 @@ error: return -1; } - /** + +/** * virDomainSetInterfaceParameters: * @domain: pointer to domain object * @device: the interface name or mac address @@ -8605,7 +8730,8 @@ error: return -1; } - /** + +/** * virDomainGetInterfaceParameters: * @domain: pointer to domain object * @device: the interface name or mac address @@ -8631,7 +8757,6 @@ error: * * Returns -1 in case of error, 0 in case of success. */ - int virDomainGetInterfaceParameters(virDomainPtr domain, const char *device, @@ -8677,6 +8802,7 @@ error: return -1; } + /** * virDomainMemoryStats: * @dom: pointer to the domain object @@ -8709,8 +8835,9 @@ error: * * Returns: The number of stats provided or -1 in case of failure. */ -int virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats, - unsigned int nr_stats, unsigned int flags) +int +virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats, + unsigned int nr_stats, unsigned int flags) { virConnectPtr conn; unsigned long nr_stats_ret = 0; @@ -8748,6 +8875,7 @@ error: return -1; } + /** * virDomainBlockPeek: * @dom: pointer to the domain object @@ -8841,6 +8969,7 @@ error: return -1; } + /** * virDomainBlockResize: * @dom: pointer to the domain object @@ -8868,7 +8997,6 @@ error: * * Returns: 0 in case of success or -1 in case of failure. */ - int virDomainBlockResize(virDomainPtr dom, const char *disk, @@ -8910,6 +9038,7 @@ error: return -1; } + /** * virDomainMemoryPeek: * @dom: pointer to the domain object @@ -9102,7 +9231,8 @@ error: * Returns NULL in case of error, a pointer to the domain otherwise */ virDomainPtr -virDomainDefineXML(virConnectPtr conn, const char *xml) { +virDomainDefineXML(virConnectPtr conn, const char *xml) +{ VIR_DEBUG("conn=%p, xml=%s", conn, xml); virResetLastError(); @@ -9133,6 +9263,7 @@ error: return NULL; } + /** * virDomainUndefine: * @domain: pointer to a defined domain @@ -9149,7 +9280,8 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virDomainUndefine(virDomainPtr domain) { +virDomainUndefine(virDomainPtr domain) +{ virConnectPtr conn; VIR_DOMAIN_DEBUG(domain); @@ -9182,6 +9314,7 @@ error: return -1; } + /** * virDomainUndefineFlags: * @domain: pointer to a defined domain @@ -9279,6 +9412,7 @@ error: return -1; } + /** * virConnectListDefinedDomains: * @conn: pointer to the hypervisor connection @@ -9299,7 +9433,8 @@ error: */ int virConnectListDefinedDomains(virConnectPtr conn, char **const names, - int maxnames) { + int maxnames) +{ VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); virResetLastError(); @@ -9328,6 +9463,7 @@ error: return -1; } + /** * virConnectListAllDomains: * @conn: Pointer to the hypervisor connection. @@ -9433,6 +9569,7 @@ error: return -1; } + /** * virDomainCreate: * @domain: pointer to a defined domain @@ -9445,7 +9582,8 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virDomainCreate(virDomainPtr domain) { +virDomainCreate(virDomainPtr domain) +{ virConnectPtr conn; VIR_DOMAIN_DEBUG(domain); @@ -9478,6 +9616,7 @@ error: return -1; } + /** * virDomainCreateWithFlags: * @domain: pointer to a defined domain @@ -9512,7 +9651,8 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) { +virDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) +{ virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); @@ -9545,6 +9685,7 @@ error: return -1; } + /** * virDomainCreateWithFiles: * @domain: pointer to a defined domain @@ -9626,6 +9767,7 @@ error: return -1; } + /** * virDomainGetAutostart: * @domain: a domain object @@ -9671,6 +9813,7 @@ error: return -1; } + /** * virDomainSetAutostart: * @domain: a domain object @@ -9719,6 +9862,7 @@ error: return -1; } + /** * virDomainInjectNMI: * @domain: pointer to domain object, or NULL for Domain0 @@ -9728,8 +9872,8 @@ error: * * Returns 0 in case of success, -1 in case of failure. */ - -int virDomainInjectNMI(virDomainPtr domain, unsigned int flags) +int +virDomainInjectNMI(virDomainPtr domain, unsigned int flags) { virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); @@ -9763,6 +9907,7 @@ error: return -1; } + /** * virDomainSendKey: * @domain: pointer to domain object, or NULL for Domain0 @@ -9776,13 +9921,13 @@ error: * * Returns 0 in case of success, -1 in case of failure. */ - -int virDomainSendKey(virDomainPtr domain, - unsigned int codeset, - unsigned int holdtime, - unsigned int *keycodes, - int nkeycodes, - unsigned int flags) +int +virDomainSendKey(virDomainPtr domain, + unsigned int codeset, + unsigned int holdtime, + unsigned int *keycodes, + int nkeycodes, + unsigned int flags) { virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "codeset=%u, holdtime=%u, nkeycodes=%u, flags=%x", @@ -9859,10 +10004,11 @@ error: * * Returns 0 in case of success, -1 in case of failure. */ -int virDomainSendProcessSignal(virDomainPtr domain, - long long pid_value, - unsigned int signum, - unsigned int flags) +int +virDomainSendProcessSignal(virDomainPtr domain, + long long pid_value, + unsigned int signum, + unsigned int flags) { virConnectPtr conn; VIR_DOMAIN_DEBUG(domain, "pid=%lld, signum=%u flags=%x", @@ -9921,7 +10067,6 @@ error: * * Returns 0 in case of success, -1 in case of failure. */ - int virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) { @@ -9960,6 +10105,7 @@ error: return -1; } + /** * virDomainSetVcpusFlags: * @domain: pointer to domain object, or NULL for Domain0 @@ -9996,7 +10142,6 @@ error: * * Returns 0 in case of success, -1 in case of failure. */ - int virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, unsigned int flags) @@ -10049,6 +10194,7 @@ error: return -1; } + /** * virDomainGetVcpusFlags: * @domain: pointer to domain object, or NULL for Domain0 @@ -10077,7 +10223,6 @@ error: * * Returns the number of vCPUs in case of success, -1 in case of failure. */ - int virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) { @@ -10119,6 +10264,7 @@ error: return -1; } + /** * virDomainPinVcpu: * @domain: pointer to domain object, or NULL for Domain0 @@ -10186,6 +10332,7 @@ error: return -1; } + /** * virDomainPinVcpuFlags: * @domain: pointer to domain object, or NULL for Domain0 @@ -10264,9 +10411,9 @@ virDomainPinVcpuFlags(virDomainPtr domain, unsigned int vcpu, error: virDispatchError(domain->conn); return -1; - } + /** * virDomainGetVcpuPinInfo: * @domain: pointer to domain object, or NULL for Domain0 @@ -10344,6 +10491,7 @@ error: return -1; } + /** * virDomainPinEmulator: * @domain: pointer to domain object, or NULL for Domain0 @@ -10420,6 +10568,7 @@ error: return -1; } + /** * virDomainGetEmulatorPinInfo: * @domain: pointer to domain object, or NULL for Domain0 @@ -10486,6 +10635,7 @@ error: return -1; } + /** * virDomainGetVcpus: * @domain: pointer to domain object, or NULL for Domain0 @@ -10562,6 +10712,7 @@ error: return -1; } + /** * virDomainGetMaxVcpus: * @domain: pointer to domain object @@ -10606,6 +10757,7 @@ error: return -1; } + /** * virDomainGetSecurityLabel: * @domain: a domain object @@ -10649,6 +10801,7 @@ error: return -1; } + /** * virDomainGetSecurityLabelList: * @domain: a domain object @@ -10792,6 +10945,7 @@ error: return -1; } + /** * virDomainGetMetadata: * @domain: a domain object @@ -10868,6 +11022,7 @@ error: return NULL; } + /** * virNodeGetSecurityModel: * @conn: a connection object @@ -10907,6 +11062,7 @@ error: return -1; } + /** * virDomainAttachDevice: * @domain: pointer to domain object @@ -10959,6 +11115,7 @@ error: return -1; } + /** * virDomainAttachDeviceFlags: * @domain: pointer to domain object @@ -11022,6 +11179,7 @@ error: return -1; } + /** * virDomainDetachDevice: * @domain: pointer to domain object @@ -11070,6 +11228,7 @@ error: return -1; } + /** * virDomainDetachDeviceFlags: * @domain: pointer to domain object @@ -11149,6 +11308,7 @@ error: return -1; } + /** * virDomainUpdateDeviceFlags: * @domain: pointer to domain object @@ -11212,6 +11372,7 @@ error: return -1; } + /** * virNodeGetCellsFreeMemory: * @conn: pointer to the hypervisor connection @@ -11229,7 +11390,6 @@ error: * * Returns the number of entries filled in freeMems, or -1 in case of error. */ - int virNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems, int startCell, int maxCells) @@ -11264,6 +11424,7 @@ error: return -1; } + /** * virNetworkGetConnect: * @net: pointer to a network @@ -11293,6 +11454,7 @@ virNetworkGetConnect(virNetworkPtr net) return net->conn; } + /** * virConnectListAllNetworks: * @conn: Pointer to the hypervisor connection. @@ -11399,6 +11561,7 @@ error: return -1; } + /** * virConnectListNetworks: * @conn: pointer to the hypervisor connection @@ -11446,6 +11609,7 @@ error: return -1; } + /** * virConnectNumOfDefinedNetworks: * @conn: pointer to the hypervisor connection @@ -11482,6 +11646,7 @@ error: return -1; } + /** * virConnectListDefinedNetworks: * @conn: pointer to the hypervisor connection @@ -11530,6 +11695,7 @@ error: return -1; } + /** * virNetworkLookupByName: * @conn: pointer to the hypervisor connection @@ -11569,6 +11735,7 @@ error: return NULL; } + /** * virNetworkLookupByUUID: * @conn: pointer to the hypervisor connection @@ -11609,6 +11776,7 @@ error: return NULL; } + /** * virNetworkLookupByUUIDString: * @conn: pointer to the hypervisor connection @@ -11649,6 +11817,7 @@ error: return NULL; } + /** * virNetworkCreateXML: * @conn: pointer to the hypervisor connection @@ -11693,6 +11862,7 @@ error: return NULL; } + /** * virNetworkDefineXML: * @conn: pointer to the hypervisor connection @@ -11735,6 +11905,7 @@ error: return NULL; } + /** * virNetworkUndefine: * @network: pointer to a defined network @@ -11744,7 +11915,8 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virNetworkUndefine(virNetworkPtr network) { +virNetworkUndefine(virNetworkPtr network) +{ virConnectPtr conn; VIR_DEBUG("network=%p", network); @@ -11776,6 +11948,7 @@ error: return -1; } + /** * virNetworkUpdate: * @network: pointer to a defined network @@ -11838,6 +12011,7 @@ error: return -1; } + /** * virNetworkCreate: * @network: pointer to a defined network @@ -11881,6 +12055,7 @@ error: return -1; } + /** * virNetworkDestroy: * @network: a network object @@ -11927,6 +12102,7 @@ error: return -1; } + /** * virNetworkFree: * @network: a network object @@ -11952,6 +12128,7 @@ virNetworkFree(virNetworkPtr network) return 0; } + /** * virNetworkRef: * @network: the network to hold a reference on @@ -11982,6 +12159,7 @@ virNetworkRef(virNetworkPtr network) return 0; } + /** * virNetworkGetName: * @network: a network object @@ -12006,6 +12184,7 @@ virNetworkGetName(virNetworkPtr network) return network->name; } + /** * virNetworkGetUUID: * @network: a network object @@ -12038,6 +12217,7 @@ error: return -1; } + /** * virNetworkGetUUIDString: * @network: a network object @@ -12074,6 +12254,7 @@ error: return -1; } + /** * virNetworkGetXMLDesc: * @network: a network object @@ -12121,6 +12302,7 @@ error: return NULL; } + /** * virNetworkGetBridgeName: * @network: a network object @@ -12162,6 +12344,7 @@ error: return NULL; } + /** * virNetworkGetAutostart: * @network: a network object @@ -12206,6 +12389,7 @@ error: return -1; } + /** * virNetworkSetAutostart: * @network: a network object @@ -12253,6 +12437,7 @@ error: return -1; } + /** * virInterfaceGetConnect: * @iface: pointer to an interface @@ -12282,6 +12467,7 @@ virInterfaceGetConnect(virInterfacePtr iface) return iface->conn; } + /** * virConnectListAllInterfaces: * @conn: Pointer to the hypervisor connection. @@ -12343,6 +12529,7 @@ error: return -1; } + /** * virConnectNumOfInterfaces: * @conn: pointer to the hypervisor connection @@ -12379,6 +12566,7 @@ error: return -1; } + /** * virConnectListInterfaces: * @conn: pointer to the hypervisor connection @@ -12427,6 +12615,7 @@ error: return -1; } + /** * virConnectNumOfDefinedInterfaces: * @conn: pointer to the hypervisor connection @@ -12463,6 +12652,7 @@ error: return -1; } + /** * virConnectListDefinedInterfaces: * @conn: pointer to the hypervisor connection @@ -12513,6 +12703,7 @@ error: return -1; } + /** * virInterfaceLookupByName: * @conn: pointer to the hypervisor connection @@ -12552,6 +12743,7 @@ error: return NULL; } + /** * virInterfaceLookupByMACString: * @conn: pointer to the hypervisor connection @@ -12591,6 +12783,7 @@ error: return NULL; } + /** * virInterfaceGetName: * @iface: an interface object @@ -12615,6 +12808,7 @@ virInterfaceGetName(virInterfacePtr iface) return iface->name; } + /** * virInterfaceGetMACString: * @iface: an interface object @@ -12641,6 +12835,7 @@ virInterfaceGetMACString(virInterfacePtr iface) return iface->mac; } + /** * virInterfaceGetXMLDesc: * @iface: an interface object @@ -12690,6 +12885,7 @@ error: return NULL; } + /** * virInterfaceDefineXML: * @conn: pointer to the hypervisor connection @@ -12743,6 +12939,7 @@ error: return NULL; } + /** * virInterfaceUndefine: * @iface: pointer to a defined interface @@ -12763,7 +12960,8 @@ error: * Returns 0 in case of success, -1 in case of error */ int -virInterfaceUndefine(virInterfacePtr iface) { +virInterfaceUndefine(virInterfacePtr iface) +{ virConnectPtr conn; VIR_DEBUG("iface=%p", iface); @@ -12795,6 +12993,7 @@ error: return -1; } + /** * virInterfaceCreate: * @iface: pointer to a defined interface @@ -12843,6 +13042,7 @@ error: return -1; } + /** * virInterfaceDestroy: * @iface: an interface object @@ -12896,6 +13096,7 @@ error: return -1; } + /** * virInterfaceRef: * @iface: the interface to hold a reference on @@ -12926,6 +13127,7 @@ virInterfaceRef(virInterfacePtr iface) return 0; } + /** * virInterfaceFree: * @iface: an interface object @@ -12951,6 +13153,7 @@ virInterfaceFree(virInterfacePtr iface) return 0; } + /** * virInterfaceChangeBegin: * @conn: pointer to hypervisor connection @@ -13001,6 +13204,7 @@ error: return -1; } + /** * virInterfaceChangeCommit: * @conn: pointer to hypervisor connection @@ -13048,6 +13252,7 @@ error: return -1; } + /** * virInterfaceChangeRollback: * @conn: pointer to hypervisor connection @@ -13126,6 +13331,7 @@ virStoragePoolGetConnect(virStoragePoolPtr pool) return pool->conn; } + /** * virConnectListAllStoragePools: * @conn: Pointer to the hypervisor connection. @@ -13210,6 +13416,7 @@ error: return -1; } + /** * virConnectNumOfStoragePools: * @conn: pointer to hypervisor connection @@ -13246,6 +13453,7 @@ error: return -1; } + /** * virConnectListStoragePools: * @conn: pointer to hypervisor connection @@ -13603,6 +13811,7 @@ error: return NULL; } + /** * virStoragePoolCreateXML: * @conn: pointer to hypervisor connection @@ -13651,6 +13860,7 @@ error: return NULL; } + /** * virStoragePoolDefineXML: * @conn: pointer to hypervisor connection @@ -13697,6 +13907,7 @@ error: return NULL; } + /** * virStoragePoolBuild: * @pool: pointer to storage pool @@ -13880,6 +14091,7 @@ error: return -1; } + /** * virStoragePoolDelete: * @pool: pointer to storage pool @@ -13985,6 +14197,7 @@ virStoragePoolRef(virStoragePoolPtr pool) return 0; } + /** * virStoragePoolRefresh: * @pool: pointer to storage pool @@ -14090,6 +14303,7 @@ error: return -1; } + /** * virStoragePoolGetUUIDString: * @pool: pointer to storage pool @@ -14307,6 +14521,7 @@ error: return -1; } + /** * virStoragePoolListAllVolumes: * @pool: Pointer to storage pool @@ -14356,6 +14571,7 @@ error: return -1; } + /** * virStoragePoolNumOfVolumes: * @pool: pointer to storage pool @@ -14512,7 +14728,6 @@ error: } - /** * virStorageVolLookupByKey: * @conn: pointer to hypervisor connection @@ -14554,6 +14769,7 @@ error: return NULL; } + /** * virStorageVolLookupByPath: * @conn: pointer to hypervisor connection @@ -15050,6 +15266,7 @@ error: return -1; } + /** * virStorageVolFree: * @vol: pointer to storage volume @@ -15106,6 +15323,7 @@ virStorageVolRef(virStorageVolPtr vol) return 0; } + /** * virStorageVolGetInfo: * @vol: pointer to storage volume @@ -15239,6 +15457,7 @@ error: return NULL; } + /** * virStorageVolResize: * @vol: pointer to storage volume @@ -15320,6 +15539,7 @@ error: return -1; } + /** * virNodeNumOfDevices: * @conn: pointer to the hypervisor connection @@ -15361,6 +15581,7 @@ error: return -1; } + /** * virConnectListAllNodeDevices: * @conn: Pointer to the hypervisor connection. @@ -15434,6 +15655,7 @@ error: return -1; } + /** * virNodeListDevices: * @conn: pointer to the hypervisor connection @@ -15495,7 +15717,8 @@ error: * * Returns a virNodeDevicePtr if found, NULL otherwise. */ -virNodeDevicePtr virNodeDeviceLookupByName(virConnectPtr conn, const char *name) +virNodeDevicePtr +virNodeDeviceLookupByName(virConnectPtr conn, const char *name) { VIR_DEBUG("conn=%p, name=%p", conn, name); @@ -15524,6 +15747,7 @@ error: return NULL; } + /** * virNodeDeviceLookupSCSIHostByWWN: * @conn: pointer to the hypervisor connection @@ -15571,6 +15795,7 @@ error: return NULL; } + /** * virNodeDeviceGetXMLDesc: * @dev: pointer to the node device @@ -15630,6 +15855,7 @@ const char *virNodeDeviceGetName(virNodeDevicePtr dev) return dev->name; } + /** * virNodeDeviceGetParent: * @dev: the device @@ -15663,6 +15889,7 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev) return dev->parent; } + /** * virNodeDeviceNumOfCaps: * @dev: the device @@ -15671,7 +15898,8 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev) * * Returns the number of capabilities supported by the device. */ -int virNodeDeviceNumOfCaps(virNodeDevicePtr dev) +int +virNodeDeviceNumOfCaps(virNodeDevicePtr dev) { VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); @@ -15698,6 +15926,7 @@ error: return -1; } + /** * virNodeDeviceListCaps: * @dev: the device @@ -15708,9 +15937,10 @@ error: * * Returns the number of capability names listed in @names. */ -int virNodeDeviceListCaps(virNodeDevicePtr dev, - char **const names, - int maxnames) +int +virNodeDeviceListCaps(virNodeDevicePtr dev, + char **const names, + int maxnames) { VIR_DEBUG("dev=%p, conn=%p, names=%p, maxnames=%d", dev, dev ? dev->conn : NULL, names, maxnames); @@ -15751,7 +15981,8 @@ error: * * Returns the 0 for success, -1 for error. */ -int virNodeDeviceFree(virNodeDevicePtr dev) +int +virNodeDeviceFree(virNodeDevicePtr dev) { VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); @@ -15797,6 +16028,7 @@ virNodeDeviceRef(virNodeDevicePtr dev) return 0; } + /** * virNodeDeviceDettach: * @dev: pointer to the node device @@ -15854,6 +16086,7 @@ error: return -1; } + /** * virNodeDeviceDetachFlags: * @dev: pointer to the node device @@ -15918,6 +16151,7 @@ error: return -1; } + /** * virNodeDeviceReAttach: * @dev: pointer to the node device @@ -15966,6 +16200,7 @@ error: return -1; } + /** * virNodeDeviceReset: * @dev: pointer to the node device @@ -16169,6 +16404,7 @@ error: return -1; } + /** * virConnectDomainEventDeregister: * @conn: pointer to the connection @@ -16212,6 +16448,7 @@ error: return -1; } + /** * virSecretGetConnect: * @secret: A virSecret secret @@ -16239,6 +16476,7 @@ virSecretGetConnect(virSecretPtr secret) return secret->conn; } + /** * virConnectNumOfSecrets: * @conn: virConnect connection @@ -16277,6 +16515,7 @@ error: return -1; } + /** * virConnectListAllSecrets: * @conn: Pointer to the hypervisor connection. @@ -16344,6 +16583,7 @@ error: return -1; } + /** * virConnectListSecrets: * @conn: virConnect connection @@ -16385,6 +16625,7 @@ error: return -1; } + /** * virSecretLookupByUUID: * @conn: pointer to the hypervisor connection @@ -16426,6 +16667,7 @@ error: return NULL; } + /** * virSecretLookupByUUIDString: * @conn: pointer to the hypervisor connection @@ -16562,6 +16804,7 @@ error: return NULL; } + /** * virSecretGetUUID: * @secret: A virSecret secret @@ -16595,6 +16838,7 @@ error: return -1; } + /** * virSecretGetUUIDString: * @secret: a secret object @@ -16631,6 +16875,7 @@ error: return -1; } + /** * virSecretGetUsageType: * @secret: a secret object @@ -16659,6 +16904,7 @@ virSecretGetUsageType(virSecretPtr secret) return secret->usageType; } + /** * virSecretGetUsageID: * @secret: a secret object @@ -16733,6 +16979,7 @@ error: return NULL; } + /** * virSecretSetValue: * @secret: A virSecret secret @@ -16783,6 +17030,7 @@ error: return -1; } + /** * virSecretGetValue: * @secret: A virSecret connection @@ -16831,6 +17079,7 @@ error: return NULL; } + /** * virSecretUndefine: * @secret: A virSecret secret @@ -16876,6 +17125,7 @@ error: return -1; } + /** * virSecretRef: * @secret: the secret to hold a reference on @@ -16905,6 +17155,7 @@ virSecretRef(virSecretPtr secret) return 0; } + /** * virSecretFree: * @secret: pointer to a secret @@ -17064,9 +17315,10 @@ virStreamRef(virStreamPtr stream) * Returns -2 if the outgoing transmit buffers are full & * the stream is marked as non-blocking. */ -int virStreamSend(virStreamPtr stream, - const char *data, - size_t nbytes) +int +virStreamSend(virStreamPtr stream, + const char *data, + size_t nbytes) { VIR_DEBUG("stream=%p, data=%p, nbytes=%zi", stream, data, nbytes); @@ -17161,9 +17413,10 @@ error: * Returns -2 if there is no data pending to be read & the * stream is marked as non-blocking. */ -int virStreamRecv(virStreamPtr stream, - char *data, - size_t nbytes) +int +virStreamRecv(virStreamPtr stream, + char *data, + size_t nbytes) { VIR_DEBUG("stream=%p, data=%p, nbytes=%zi", stream, data, nbytes); @@ -17236,9 +17489,10 @@ error: * having been called, so the caller need only call * virStreamFree() */ -int virStreamSendAll(virStreamPtr stream, - virStreamSourceFunc handler, - void *opaque) +int +virStreamSendAll(virStreamPtr stream, + virStreamSourceFunc handler, + void *opaque) { char *bytes = NULL; int want = 1024*64; @@ -17333,9 +17587,10 @@ cleanup: * having been called, so the caller need only call * virStreamFree() */ -int virStreamRecvAll(virStreamPtr stream, - virStreamSinkFunc handler, - void *opaque) +int +virStreamRecvAll(virStreamPtr stream, + virStreamSinkFunc handler, + void *opaque) { char *bytes = NULL; int want = 1024*64; @@ -17406,11 +17661,12 @@ cleanup: * * Returns 0 on success, -1 upon error */ -int virStreamEventAddCallback(virStreamPtr stream, - int events, - virStreamEventCallback cb, - void *opaque, - virFreeCallback ff) +int +virStreamEventAddCallback(virStreamPtr stream, + int events, + virStreamEventCallback cb, + void *opaque, + virFreeCallback ff) { VIR_DEBUG("stream=%p, events=%d, cb=%p, opaque=%p, ff=%p", stream, events, cb, opaque, ff); @@ -17451,8 +17707,9 @@ error: * * Returns 0 on success, -1 if no callback is registered */ -int virStreamEventUpdateCallback(virStreamPtr stream, - int events) +int +virStreamEventUpdateCallback(virStreamPtr stream, + int events) { VIR_DEBUG("stream=%p, events=%d", stream, events); @@ -17480,6 +17737,7 @@ error: return -1; } + /** * virStreamEventRemoveCallback: * @stream: pointer to the stream object @@ -17488,7 +17746,8 @@ error: * * Returns 0 on success, -1 on error */ -int virStreamEventRemoveCallback(virStreamPtr stream) +int +virStreamEventRemoveCallback(virStreamPtr stream) { VIR_DEBUG("stream=%p", stream); @@ -17516,6 +17775,7 @@ error: return -1; } + /** * virStreamFinish: * @stream: pointer to the stream object @@ -17531,7 +17791,8 @@ error: * * Returns 0 on success, -1 upon error */ -int virStreamFinish(virStreamPtr stream) +int +virStreamFinish(virStreamPtr stream) { VIR_DEBUG("stream=%p", stream); @@ -17559,6 +17820,7 @@ error: return -1; } + /** * virStreamAbort: * @stream: pointer to the stream object @@ -17572,7 +17834,8 @@ error: * * Returns 0 on success, -1 upon error */ -int virStreamAbort(virStreamPtr stream) +int +virStreamAbort(virStreamPtr stream) { VIR_DEBUG("stream=%p", stream); @@ -17604,6 +17867,7 @@ error: return -1; } + /** * virStreamFree: * @stream: pointer to the stream object @@ -17618,7 +17882,8 @@ error: * * Returns 0 upon success, or -1 on error */ -int virStreamFree(virStreamPtr stream) +int +virStreamFree(virStreamPtr stream) { VIR_DEBUG("stream=%p", stream); @@ -17645,7 +17910,8 @@ int virStreamFree(virStreamPtr stream) * * Returns 1 if running, 0 if inactive, -1 on error */ -int virDomainIsActive(virDomainPtr dom) +int +virDomainIsActive(virDomainPtr dom) { VIR_DEBUG("dom=%p", dom); @@ -17670,6 +17936,7 @@ error: return -1; } + /** * virDomainIsPersistent: * @dom: pointer to the domain object @@ -17679,7 +17946,8 @@ error: * * Returns 1 if persistent, 0 if transient, -1 on error */ -int virDomainIsPersistent(virDomainPtr dom) +int +virDomainIsPersistent(virDomainPtr dom) { VIR_DOMAIN_DEBUG(dom); @@ -17704,6 +17972,7 @@ error: return -1; } + /** * virDomainIsUpdated: * @dom: pointer to the domain object @@ -17712,7 +17981,8 @@ error: * * Returns 1 if updated, 0 if not, -1 on error */ -int virDomainIsUpdated(virDomainPtr dom) +int +virDomainIsUpdated(virDomainPtr dom) { VIR_DOMAIN_DEBUG(dom); @@ -17737,6 +18007,7 @@ error: return -1; } + /** * virNetworkIsActive: * @net: pointer to the network object @@ -17745,7 +18016,8 @@ error: * * Returns 1 if running, 0 if inactive, -1 on error */ -int virNetworkIsActive(virNetworkPtr net) +int +virNetworkIsActive(virNetworkPtr net) { VIR_DEBUG("net=%p", net); @@ -17780,7 +18052,8 @@ error: * * Returns 1 if persistent, 0 if transient, -1 on error */ -int virNetworkIsPersistent(virNetworkPtr net) +int +virNetworkIsPersistent(virNetworkPtr net) { VIR_DEBUG("net=%p", net); @@ -17814,7 +18087,8 @@ error: * * Returns 1 if running, 0 if inactive, -1 on error */ -int virStoragePoolIsActive(virStoragePoolPtr pool) +int +virStoragePoolIsActive(virStoragePoolPtr pool) { VIR_DEBUG("pool=%p", pool); @@ -17849,7 +18123,8 @@ error: * * Returns 1 if persistent, 0 if transient, -1 on error */ -int virStoragePoolIsPersistent(virStoragePoolPtr pool) +int +virStoragePoolIsPersistent(virStoragePoolPtr pool) { VIR_DEBUG("pool=%p", pool); @@ -17875,7 +18150,6 @@ error: } - /** * virConnectNumOfNWFilters: * @conn: pointer to the hypervisor connection @@ -17912,6 +18186,7 @@ error: return -1; } + /** * virConnectListAllNWFilters: * @conn: Pointer to the hypervisor connection. @@ -17963,6 +18238,7 @@ error: return -1; } + /** * virConnectListNWFilters: * @conn: pointer to the hypervisor connection @@ -18044,6 +18320,7 @@ error: return NULL; } + /** * virNWFilterLookupByUUID: * @conn: pointer to the hypervisor connection @@ -18083,6 +18360,7 @@ error: return NULL; } + /** * virNWFilterLookupByUUIDString: * @conn: pointer to the hypervisor connection @@ -18122,6 +18400,7 @@ error: return NULL; } + /** * virNWFilterFree: * @nwfilter: a nwfilter object @@ -18148,6 +18427,7 @@ virNWFilterFree(virNWFilterPtr nwfilter) return 0; } + /** * virNWFilterGetName: * @nwfilter: a nwfilter object @@ -18172,6 +18452,7 @@ virNWFilterGetName(virNWFilterPtr nwfilter) return nwfilter->name; } + /** * virNWFilterGetUUID: * @nwfilter: a nwfilter object @@ -18204,6 +18485,7 @@ error: return -1; } + /** * virNWFilterGetUUIDString: * @nwfilter: a nwfilter object @@ -18414,7 +18696,8 @@ virNWFilterRef(virNWFilterPtr nwfilter) * * Returns 1 if running, 0 if inactive, -1 on error */ -int virInterfaceIsActive(virInterfacePtr iface) +int +virInterfaceIsActive(virInterfacePtr iface) { VIR_DEBUG("iface=%p", iface); @@ -18448,7 +18731,8 @@ error: * * Returns 1 if encrypted, 0 if not encrypted, -1 on error */ -int virConnectIsEncrypted(virConnectPtr conn) +int +virConnectIsEncrypted(virConnectPtr conn) { VIR_DEBUG("conn=%p", conn); @@ -18473,6 +18757,7 @@ error: return -1; } + /** * virConnectIsSecure: * @conn: pointer to the connection object @@ -18485,7 +18770,8 @@ error: * * Returns 1 if secure, 0 if not secure, -1 on error */ -int virConnectIsSecure(virConnectPtr conn) +int +virConnectIsSecure(virConnectPtr conn) { VIR_DEBUG("conn=%p", conn); @@ -18866,6 +19152,7 @@ error: return -1; } + /** * virDomainMigrateGetCompressionCache: * @domain: a domain object @@ -18911,6 +19198,7 @@ error: return -1; } + /** * virDomainMigrateSetCompressionCache: * @domain: a domain object @@ -18961,6 +19249,7 @@ error: return -1; } + /** * virDomainMigrateSetMaxSpeed: * @domain: a domain object @@ -19008,6 +19297,7 @@ error: return -1; } + /** * virDomainMigrateGetMaxSpeed: * @domain: a domain object @@ -19057,6 +19347,7 @@ error: return -1; } + /** * virConnectDomainEventRegisterAny: * @conn: pointer to the connection @@ -19137,6 +19428,7 @@ error: return -1; } + /** * virConnectDomainEventDeregisterAny: * @conn: pointer to the connection @@ -19176,6 +19468,7 @@ error: return -1; } + /** * virConnectNetworkEventRegisterAny: * @conn: pointer to the connection @@ -19260,6 +19553,7 @@ error: return -1; } + /** * virConnectNetworkEventDeregisterAny: * @conn: pointer to the connection @@ -19301,6 +19595,7 @@ error: return -1; } + /** * virDomainManagedSave: * @dom: pointer to the domain @@ -19330,7 +19625,8 @@ error: * * Returns 0 in case of success or -1 in case of failure */ -int virDomainManagedSave(virDomainPtr dom, unsigned int flags) +int +virDomainManagedSave(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; @@ -19373,6 +19669,7 @@ error: return -1; } + /** * virDomainHasManagedSaveImage: * @dom: pointer to the domain @@ -19385,7 +19682,8 @@ error: * Returns 0 if no image is present, 1 if an image is present, and * -1 in case of error */ -int virDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) +int +virDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; @@ -19417,6 +19715,7 @@ error: return -1; } + /** * virDomainManagedSaveRemove: * @dom: pointer to the domain @@ -19426,7 +19725,8 @@ error: * * Returns 0 in case of success, and -1 in case of error */ -int virDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) +int +virDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) { virConnectPtr conn; @@ -19462,6 +19762,7 @@ error: return -1; } + /** * virDomainSnapshotGetName: * @snapshot: a snapshot object @@ -19487,6 +19788,7 @@ virDomainSnapshotGetName(virDomainSnapshotPtr snapshot) return snapshot->name; } + /** * virDomainSnapshotGetDomain: * @snapshot: a snapshot object @@ -19516,6 +19818,7 @@ virDomainSnapshotGetDomain(virDomainSnapshotPtr snapshot) return snapshot->domain; } + /** * virDomainSnapshotGetConnect: * @snapshot: a snapshot object @@ -19545,6 +19848,7 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot) return snapshot->domain->conn; } + /** * virDomainSnapshotCreateXML: * @domain: a domain object @@ -19704,6 +20008,7 @@ error: return NULL; } + /** * virDomainSnapshotGetXMLDesc: * @snapshot: a domain snapshot object @@ -19757,6 +20062,7 @@ error: return NULL; } + /** * virDomainSnapshotNum: * @domain: a domain object @@ -19827,6 +20133,7 @@ error: return -1; } + /** * virDomainSnapshotListNames: * @domain: a domain object @@ -19918,6 +20225,7 @@ error: return -1; } + /** * virDomainListAllSnapshots: * @domain: a domain object @@ -20003,6 +20311,7 @@ error: return -1; } + /** * virDomainSnapshotNumChildren: * @snapshot: a domain snapshot object @@ -20074,6 +20383,7 @@ error: return -1; } + /** * virDomainSnapshotListChildrenNames: * @snapshot: a domain snapshot object @@ -20171,6 +20481,7 @@ error: return -1; } + /** * virDomainSnapshotListAllChildren: * @snapshot: a domain snapshot object @@ -20259,6 +20570,7 @@ error: return -1; } + /** * virDomainSnapshotLookupByName: * @domain: a domain object @@ -20306,6 +20618,7 @@ error: return NULL; } + /** * virDomainHasCurrentSnapshot: * @domain: pointer to the domain object @@ -20345,6 +20658,7 @@ error: return -1; } + /** * virDomainSnapshotCurrent: * @domain: a domain object @@ -20388,6 +20702,7 @@ error: return NULL; } + /** * virDomainSnapshotGetParent: * @snapshot: a snapshot object @@ -20432,6 +20747,7 @@ error: return NULL; } + /** * virDomainSnapshotIsCurrent: * @snapshot: a snapshot object @@ -20442,8 +20758,9 @@ error: * * Returns 1 if current, 0 if not current, or -1 on error. */ -int virDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, - unsigned int flags) +int +virDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, + unsigned int flags) { virConnectPtr conn; @@ -20474,6 +20791,7 @@ error: return -1; } + /** * virDomainSnapshotHasMetadata: * @snapshot: a snapshot object @@ -20485,8 +20803,9 @@ error: * Returns 1 if the snapshot has metadata, 0 if the snapshot exists without * help from libvirt, or -1 on error. */ -int virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, - unsigned int flags) +int +virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, + unsigned int flags) { virConnectPtr conn; @@ -20517,6 +20836,7 @@ error: return -1; } + /** * virDomainRevertToSnapshot: * @snapshot: a domain snapshot object @@ -20604,6 +20924,7 @@ error: return -1; } + /** * virDomainSnapshotDelete: * @snapshot: a domain snapshot object @@ -20673,6 +20994,7 @@ error: return -1; } + /** * virDomainSnapshotRef: * @snapshot: the snapshot to hold a reference on @@ -20704,6 +21026,7 @@ virDomainSnapshotRef(virDomainSnapshotPtr snapshot) return 0; } + /** * virDomainSnapshotFree: * @snapshot: a domain snapshot object @@ -20730,6 +21053,7 @@ virDomainSnapshotFree(virDomainSnapshotPtr snapshot) return 0; } + /** * virDomainOpenConsole: * @dom: a domain object @@ -20760,10 +21084,11 @@ virDomainSnapshotFree(virDomainSnapshotPtr snapshot) * * Returns 0 if the console was opened, -1 on error */ -int virDomainOpenConsole(virDomainPtr dom, - const char *dev_name, - virStreamPtr st, - unsigned int flags) +int +virDomainOpenConsole(virDomainPtr dom, + const char *dev_name, + virStreamPtr st, + unsigned int flags) { virConnectPtr conn; @@ -20799,6 +21124,7 @@ error: return -1; } + /** * virDomainOpenChannel: * @dom: a domain object @@ -20821,10 +21147,11 @@ error: * * Returns 0 if the channel was opened, -1 on error */ -int virDomainOpenChannel(virDomainPtr dom, - const char *name, - virStreamPtr st, - unsigned int flags) +int +virDomainOpenChannel(virDomainPtr dom, + const char *name, + virStreamPtr st, + unsigned int flags) { virConnectPtr conn; @@ -20860,6 +21187,7 @@ error: return -1; } + /** * virDomainBlockJobAbort: * @dom: pointer to domain object @@ -20900,8 +21228,9 @@ error: * * Returns -1 in case of failure, 0 when successful. */ -int virDomainBlockJobAbort(virDomainPtr dom, const char *disk, - unsigned int flags) +int +virDomainBlockJobAbort(virDomainPtr dom, const char *disk, + unsigned int flags) { virConnectPtr conn; @@ -20938,6 +21267,7 @@ error: return -1; } + /** * virDomainGetBlockJobInfo: * @dom: pointer to domain object @@ -20957,8 +21287,9 @@ error: * * Returns -1 in case of failure, 0 when nothing found, 1 when info was found. */ -int virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, - virDomainBlockJobInfoPtr info, unsigned int flags) +int +virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, + virDomainBlockJobInfoPtr info, unsigned int flags) { virConnectPtr conn; @@ -20993,6 +21324,7 @@ error: return -1; } + /** * virDomainBlockJobSetSpeed: * @dom: pointer to domain object @@ -21012,8 +21344,9 @@ error: * * Returns -1 in case of failure, 0 when successful. */ -int virDomainBlockJobSetSpeed(virDomainPtr dom, const char *disk, - unsigned long bandwidth, unsigned int flags) +int +virDomainBlockJobSetSpeed(virDomainPtr dom, const char *disk, + unsigned long bandwidth, unsigned int flags) { virConnectPtr conn; @@ -21051,6 +21384,7 @@ error: return -1; } + /** * virDomainBlockPull: * @dom: pointer to domain object @@ -21084,8 +21418,9 @@ error: * * Returns 0 if the operation has started, -1 on failure. */ -int virDomainBlockPull(virDomainPtr dom, const char *disk, - unsigned long bandwidth, unsigned int flags) +int +virDomainBlockPull(virDomainPtr dom, const char *disk, + unsigned long bandwidth, unsigned int flags) { virConnectPtr conn; @@ -21202,9 +21537,10 @@ error: * * Returns 0 if the operation has started, -1 on failure. */ -int virDomainBlockRebase(virDomainPtr dom, const char *disk, - const char *base, unsigned long bandwidth, - unsigned int flags) +int +virDomainBlockRebase(virDomainPtr dom, const char *disk, + const char *base, unsigned long bandwidth, + unsigned int flags) { virConnectPtr conn; @@ -21320,9 +21656,10 @@ error: * * Returns 0 if the operation has started, -1 on failure. */ -int virDomainBlockCommit(virDomainPtr dom, const char *disk, - const char *base, const char *top, - unsigned long bandwidth, unsigned int flags) +int +virDomainBlockCommit(virDomainPtr dom, const char *disk, + const char *base, const char *top, + unsigned long bandwidth, unsigned int flags) { virConnectPtr conn; @@ -21386,10 +21723,11 @@ error: * * Returns 0 on success, -1 on failure */ -int virDomainOpenGraphics(virDomainPtr dom, - unsigned int idx, - int fd, - unsigned int flags) +int +virDomainOpenGraphics(virDomainPtr dom, + unsigned int idx, + int fd, + unsigned int flags) { struct stat sb; VIR_DOMAIN_DEBUG(dom, "idx=%u, fd=%d, flags=%x", @@ -21470,9 +21808,10 @@ error: * Returns -1 on error, 0 on success, 1 when remote party doesn't support * keepalive messages. */ -int virConnectSetKeepAlive(virConnectPtr conn, - int interval, - unsigned int count) +int +virConnectSetKeepAlive(virConnectPtr conn, + int interval, + unsigned int count) { int ret = -1; @@ -21500,6 +21839,7 @@ error: return -1; } + /** * virConnectIsAlive: * @conn: pointer to the connection object @@ -21511,7 +21851,8 @@ error: * * Returns 1 if alive, 0 if dead, -1 on error */ -int virConnectIsAlive(virConnectPtr conn) +int +virConnectIsAlive(virConnectPtr conn) { VIR_DEBUG("conn=%p", conn); @@ -21560,10 +21901,11 @@ error: * * Returns 0 on success, -1 on error */ -int virConnectRegisterCloseCallback(virConnectPtr conn, - virConnectCloseFunc cb, - void *opaque, - virFreeCallback freecb) +int +virConnectRegisterCloseCallback(virConnectPtr conn, + virConnectCloseFunc cb, + void *opaque, + virFreeCallback freecb) { VIR_DEBUG("conn=%p", conn); @@ -21606,6 +21948,7 @@ error: return -1; } + /** * virConnectUnregisterCloseCallback: * @conn: pointer to connection object @@ -21619,8 +21962,9 @@ error: * * Returns 0 on success, -1 on error */ -int virConnectUnregisterCloseCallback(virConnectPtr conn, - virConnectCloseFunc cb) +int +virConnectUnregisterCloseCallback(virConnectPtr conn, + virConnectCloseFunc cb) { VIR_DEBUG("conn=%p", conn); @@ -21661,6 +22005,7 @@ error: return -1; } + /** * virDomainSetBlockIoTune: * @dom: pointer to domain object @@ -21681,11 +22026,12 @@ error: * * Returns -1 in case of error, 0 in case of success. */ -int virDomainSetBlockIoTune(virDomainPtr dom, - const char *disk, - virTypedParameterPtr params, - int nparams, - unsigned int flags) +int +virDomainSetBlockIoTune(virDomainPtr dom, + const char *disk, + virTypedParameterPtr params, + int nparams, + unsigned int flags) { virConnectPtr conn; @@ -21730,6 +22076,7 @@ error: return -1; } + /** * virDomainGetBlockIoTune: * @dom: pointer to domain object @@ -21763,11 +22110,12 @@ error: * * Returns -1 in case of error, 0 in case of success. */ -int virDomainGetBlockIoTune(virDomainPtr dom, - const char *disk, - virTypedParameterPtr params, - int *nparams, - unsigned int flags) +int +virDomainGetBlockIoTune(virDomainPtr dom, + const char *disk, + virTypedParameterPtr params, + int *nparams, + unsigned int flags) { virConnectPtr conn; @@ -21818,6 +22166,7 @@ error: return -1; } + /** * virDomainGetCPUStats: * @domain: domain to query @@ -21892,12 +22241,13 @@ error: * @ncpus is too large). The caller is responsible for freeing any * returned string parameters. */ -int virDomainGetCPUStats(virDomainPtr domain, - virTypedParameterPtr params, - unsigned int nparams, - int start_cpu, - unsigned int ncpus, - unsigned int flags) +int +virDomainGetCPUStats(virDomainPtr domain, + virTypedParameterPtr params, + unsigned int nparams, + int start_cpu, + unsigned int ncpus, + unsigned int flags) { virConnectPtr conn; @@ -21963,6 +22313,7 @@ error: return -1; } + /** * virDomainGetDiskErrors: * @dom: a domain object @@ -22028,6 +22379,7 @@ error: return -1; } + /** * virDomainGetHostname: * @domain: a domain object @@ -22073,6 +22425,7 @@ error: return NULL; } + /** * virNodeGetCPUMap: * @conn: pointer to the hypervisor connection @@ -22124,6 +22477,7 @@ error: return -1; } + /** * virDomainFSTrim: * @dom: a domain object -- 1.8.4.2 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list