提交 80aed9f8 编写于 作者: E Eric Blake

maint: consistent formatting in libvirt.c

Preliminary cleanups to make search-and-replace easier in later
patches.  Many of these were done by grepping for (multiline)
pattern violations, then bundled all into one patch.

* src/libvirt.c: Uniform two spaces between functions, return
type and open brace on separate line, avoid blank lines around
open brace, label in column 1, drop redundant (), consistent
indentation for function headers split across lines.
Signed-off-by: NEric Blake <eblake@redhat.com>
上级 c8f95fff
...@@ -128,7 +128,9 @@ static int virStateDriverTabCount = 0; ...@@ -128,7 +128,9 @@ static int virStateDriverTabCount = 0;
#if defined(POLKIT_AUTH) #if defined(POLKIT_AUTH)
static int virConnectAuthGainPolkit(const char *privilege) { static int
virConnectAuthGainPolkit(const char *privilege)
{
virCommandPtr cmd; virCommandPtr cmd;
int status; int status;
int ret = -1; int ret = -1;
...@@ -148,9 +150,12 @@ cleanup: ...@@ -148,9 +150,12 @@ cleanup:
} }
#endif #endif
static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred,
static int
virConnectAuthCallbackDefault(virConnectCredentialPtr cred,
unsigned int ncred, unsigned int ncred,
void *cbdata ATTRIBUTE_UNUSED) { void *cbdata ATTRIBUTE_UNUSED)
{
size_t i; size_t i;
for (i = 0; i < ncred; i++) { for (i = 0; i < ncred; i++) {
...@@ -225,6 +230,7 @@ static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred, ...@@ -225,6 +230,7 @@ static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred,
return 0; return 0;
} }
/* Don't typically want VIR_CRED_USERNAME. It enables you to authenticate /* Don't typically want VIR_CRED_USERNAME. It enables you to authenticate
* as one user, and act as another. It just results in annoying * as one user, and act as another. It just results in annoying
* prompts for the username twice & is very rarely what you want * prompts for the username twice & is very rarely what you want
...@@ -273,7 +279,8 @@ winsock_init(void) ...@@ -273,7 +279,8 @@ winsock_init(void)
#ifdef WITH_GNUTLS_GCRYPT #ifdef WITH_GNUTLS_GCRYPT
static int virTLSMutexInit(void **priv) static int
virTLSMutexInit(void **priv)
{ {
virMutexPtr lock = NULL; virMutexPtr lock = NULL;
...@@ -289,7 +296,9 @@ static int virTLSMutexInit(void **priv) ...@@ -289,7 +296,9 @@ static int virTLSMutexInit(void **priv)
return 0; return 0;
} }
static int virTLSMutexDestroy(void **priv)
static int
virTLSMutexDestroy(void **priv)
{ {
virMutexPtr lock = *priv; virMutexPtr lock = *priv;
virMutexDestroy(lock); virMutexDestroy(lock);
...@@ -297,20 +306,25 @@ static int virTLSMutexDestroy(void **priv) ...@@ -297,20 +306,25 @@ static int virTLSMutexDestroy(void **priv)
return 0; return 0;
} }
static int virTLSMutexLock(void **priv)
static int
virTLSMutexLock(void **priv)
{ {
virMutexPtr lock = *priv; virMutexPtr lock = *priv;
virMutexLock(lock); virMutexLock(lock);
return 0; return 0;
} }
static int virTLSMutexUnlock(void **priv)
static int
virTLSMutexUnlock(void **priv)
{ {
virMutexPtr lock = *priv; virMutexPtr lock = *priv;
virMutexUnlock(lock); virMutexUnlock(lock);
return 0; return 0;
} }
static struct gcry_thread_cbs virTLSThreadImpl = { static struct gcry_thread_cbs virTLSThreadImpl = {
/* GCRY_THREAD_OPTION_VERSION was added in gcrypt 1.4.2 */ /* GCRY_THREAD_OPTION_VERSION was added in gcrypt 1.4.2 */
# ifdef GCRY_THREAD_OPTION_VERSION # ifdef GCRY_THREAD_OPTION_VERSION
...@@ -506,6 +520,7 @@ error: ...@@ -506,6 +520,7 @@ error:
virGlobalError = true; virGlobalError = true;
} }
/** /**
* virInitialize: * virInitialize:
* *
...@@ -532,6 +547,7 @@ virInitialize(void) ...@@ -532,6 +547,7 @@ virInitialize(void)
return 0; return 0;
} }
#ifdef WIN32 #ifdef WIN32
BOOL WINAPI BOOL WINAPI
DllMain(HINSTANCE instance, DWORD reason, LPVOID ignore); DllMain(HINSTANCE instance, DWORD reason, LPVOID ignore);
...@@ -566,6 +582,7 @@ DllMain(HINSTANCE instance ATTRIBUTE_UNUSED, ...@@ -566,6 +582,7 @@ DllMain(HINSTANCE instance ATTRIBUTE_UNUSED,
} }
#endif #endif
#define virLibConnError(code, ...) \ #define virLibConnError(code, ...) \
virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \ virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \
__FUNCTION__, __LINE__, __VA_ARGS__) __FUNCTION__, __LINE__, __VA_ARGS__)
...@@ -628,6 +645,7 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) ...@@ -628,6 +645,7 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver)
return virNetworkDriverTabCount++; return virNetworkDriverTabCount++;
} }
/** /**
* virRegisterInterfaceDriver: * virRegisterInterfaceDriver:
* @driver: pointer to an interface driver block * @driver: pointer to an interface driver block
...@@ -655,6 +673,7 @@ virRegisterInterfaceDriver(virInterfaceDriverPtr driver) ...@@ -655,6 +673,7 @@ virRegisterInterfaceDriver(virInterfaceDriverPtr driver)
return virInterfaceDriverTabCount++; return virInterfaceDriverTabCount++;
} }
/** /**
* virRegisterStorageDriver: * virRegisterStorageDriver:
* @driver: pointer to a storage driver block * @driver: pointer to a storage driver block
...@@ -682,6 +701,7 @@ virRegisterStorageDriver(virStorageDriverPtr driver) ...@@ -682,6 +701,7 @@ virRegisterStorageDriver(virStorageDriverPtr driver)
return virStorageDriverTabCount++; return virStorageDriverTabCount++;
} }
/** /**
* virRegisterNodeDeviceDriver: * virRegisterNodeDeviceDriver:
* @driver: pointer to a device monitor block * @driver: pointer to a device monitor block
...@@ -709,6 +729,7 @@ virRegisterNodeDeviceDriver(virNodeDeviceDriverPtr driver) ...@@ -709,6 +729,7 @@ virRegisterNodeDeviceDriver(virNodeDeviceDriverPtr driver)
return virNodeDeviceDriverTabCount++; return virNodeDeviceDriverTabCount++;
} }
/** /**
* virRegisterSecretDriver: * virRegisterSecretDriver:
* @driver: pointer to a secret driver block * @driver: pointer to a secret driver block
...@@ -736,6 +757,7 @@ virRegisterSecretDriver(virSecretDriverPtr driver) ...@@ -736,6 +757,7 @@ virRegisterSecretDriver(virSecretDriverPtr driver)
return virSecretDriverTabCount++; return virSecretDriverTabCount++;
} }
/** /**
* virRegisterNWFilterDriver: * virRegisterNWFilterDriver:
* @driver: pointer to a network filter driver block * @driver: pointer to a network filter driver block
...@@ -793,6 +815,7 @@ virRegisterDriver(virDriverPtr driver) ...@@ -793,6 +815,7 @@ virRegisterDriver(virDriverPtr driver)
return virDriverTabCount++; return virDriverTabCount++;
} }
#ifdef WITH_LIBVIRTD #ifdef WITH_LIBVIRTD
/** /**
* virRegisterStateDriver: * virRegisterStateDriver:
...@@ -818,6 +841,7 @@ virRegisterStateDriver(virStateDriverPtr driver) ...@@ -818,6 +841,7 @@ virRegisterStateDriver(virStateDriverPtr driver)
return virStateDriverTabCount++; return virStateDriverTabCount++;
} }
/** /**
* virStateInitialize: * virStateInitialize:
* @privileged: set to true if running with root privilege, false otherwise * @privileged: set to true if running with root privilege, false otherwise
...@@ -832,7 +856,8 @@ virRegisterStateDriver(virStateDriverPtr driver) ...@@ -832,7 +856,8 @@ virRegisterStateDriver(virStateDriverPtr driver)
* *
* Returns 0 if all succeed, -1 upon any failure. * Returns 0 if all succeed, -1 upon any failure.
*/ */
int virStateInitialize(bool privileged, int
virStateInitialize(bool privileged,
virStateInhibitCallback callback, virStateInhibitCallback callback,
void *opaque) void *opaque)
{ {
...@@ -867,6 +892,7 @@ int virStateInitialize(bool privileged, ...@@ -867,6 +892,7 @@ int virStateInitialize(bool privileged,
return 0; return 0;
} }
/** /**
* virStateCleanup: * virStateCleanup:
* *
...@@ -874,7 +900,9 @@ int virStateInitialize(bool privileged, ...@@ -874,7 +900,9 @@ int virStateInitialize(bool privileged,
* *
* Returns 0 if all succeed, -1 upon any failure. * Returns 0 if all succeed, -1 upon any failure.
*/ */
int virStateCleanup(void) { int
virStateCleanup(void)
{
size_t i; size_t i;
int ret = 0; int ret = 0;
...@@ -886,6 +914,7 @@ int virStateCleanup(void) { ...@@ -886,6 +914,7 @@ int virStateCleanup(void) {
return ret; return ret;
} }
/** /**
* virStateReload: * virStateReload:
* *
...@@ -893,7 +922,9 @@ int virStateCleanup(void) { ...@@ -893,7 +922,9 @@ int virStateCleanup(void) {
* *
* Returns 0 if all succeed, -1 upon any failure. * Returns 0 if all succeed, -1 upon any failure.
*/ */
int virStateReload(void) { int
virStateReload(void)
{
size_t i; size_t i;
int ret = 0; int ret = 0;
...@@ -905,6 +936,7 @@ int virStateReload(void) { ...@@ -905,6 +936,7 @@ int virStateReload(void) {
return ret; return ret;
} }
/** /**
* virStateStop: * virStateStop:
* *
...@@ -912,7 +944,9 @@ int virStateReload(void) { ...@@ -912,7 +944,9 @@ int virStateReload(void) {
* *
* Returns 0 if successful, -1 on failure * Returns 0 if successful, -1 on failure
*/ */
int virStateStop(void) { int
virStateStop(void)
{
size_t i; size_t i;
int ret = 0; int ret = 0;
...@@ -923,9 +957,7 @@ int virStateStop(void) { ...@@ -923,9 +957,7 @@ int virStateStop(void) {
} }
return ret; return ret;
} }
#endif /* WITH_LIBVIRTD */
#endif
/** /**
...@@ -971,6 +1003,7 @@ error: ...@@ -971,6 +1003,7 @@ error:
return -1; return -1;
} }
static char * static char *
virConnectGetConfigFilePath(void) virConnectGetConfigFilePath(void)
{ {
...@@ -995,6 +1028,7 @@ virConnectGetConfigFilePath(void) ...@@ -995,6 +1028,7 @@ virConnectGetConfigFilePath(void)
return path; return path;
} }
static int static int
virConnectGetConfigFile(virConfPtr *conf) virConnectGetConfigFile(virConfPtr *conf)
{ {
...@@ -1024,8 +1058,10 @@ cleanup: ...@@ -1024,8 +1058,10 @@ cleanup:
#define URI_ALIAS_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-" #define URI_ALIAS_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-"
static int static int
virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char **uri) virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias,
char **uri)
{ {
virConfValuePtr entry; virConfValuePtr entry;
size_t alias_len; size_t alias_len;
...@@ -1078,6 +1114,7 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char * ...@@ -1078,6 +1114,7 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char *
return 0; return 0;
} }
static int static int
virConnectOpenResolveURIAlias(virConfPtr conf, virConnectOpenResolveURIAlias(virConfPtr conf,
const char *alias, char **uri) const char *alias, char **uri)
...@@ -1121,6 +1158,7 @@ cleanup: ...@@ -1121,6 +1158,7 @@ cleanup:
return ret; return ret;
} }
static virConnectPtr static virConnectPtr
do_open(const char *name, do_open(const char *name,
virConnectAuthPtr auth, virConnectAuthPtr auth,
...@@ -1372,6 +1410,7 @@ failed: ...@@ -1372,6 +1410,7 @@ failed:
return NULL; return NULL;
} }
/** /**
* virConnectOpen: * virConnectOpen:
* @name: (optional) URI of the hypervisor * @name: (optional) URI of the hypervisor
...@@ -1414,6 +1453,7 @@ error: ...@@ -1414,6 +1453,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virConnectOpenReadOnly: * virConnectOpenReadOnly:
* @name: (optional) URI of the hypervisor * @name: (optional) URI of the hypervisor
...@@ -1449,6 +1489,7 @@ error: ...@@ -1449,6 +1489,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virConnectOpenAuth: * virConnectOpenAuth:
* @name: (optional) URI of the hypervisor * @name: (optional) URI of the hypervisor
...@@ -1488,6 +1529,7 @@ error: ...@@ -1488,6 +1529,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virConnectClose: * virConnectClose:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -1538,6 +1580,7 @@ error: ...@@ -1538,6 +1580,7 @@ error:
return ret; return ret;
} }
/** /**
* virConnectRef: * virConnectRef:
* @conn: the connection to hold a reference on * @conn: the connection to hold a reference on
...@@ -1568,6 +1611,7 @@ virConnectRef(virConnectPtr conn) ...@@ -1568,6 +1611,7 @@ virConnectRef(virConnectPtr conn)
return 0; return 0;
} }
/* /*
* Not for public use. This function is part of the internal * Not for public use. This function is part of the internal
* implementation of driver features in the remote case. * implementation of driver features in the remote case.
...@@ -1597,6 +1641,7 @@ virConnectSupportsFeature(virConnectPtr conn, int feature) ...@@ -1597,6 +1641,7 @@ virConnectSupportsFeature(virConnectPtr conn, int feature)
return ret; return ret;
} }
/** /**
* virConnectGetType: * virConnectGetType:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -1633,6 +1678,7 @@ virConnectGetType(virConnectPtr conn) ...@@ -1633,6 +1678,7 @@ virConnectGetType(virConnectPtr conn)
return conn->driver->name; return conn->driver->name;
} }
/** /**
* virConnectGetVersion: * virConnectGetVersion:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -1675,6 +1721,7 @@ error: ...@@ -1675,6 +1721,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectGetLibVersion: * virConnectGetLibVersion:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -1717,6 +1764,7 @@ error: ...@@ -1717,6 +1764,7 @@ error:
return ret; return ret;
} }
/** /**
* virConnectGetHostname: * virConnectGetHostname:
* @conn: pointer to a hypervisor connection * @conn: pointer to a hypervisor connection
...@@ -1757,6 +1805,7 @@ error: ...@@ -1757,6 +1805,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virConnectGetURI: * virConnectGetURI:
* @conn: pointer to a hypervisor connection * @conn: pointer to a hypervisor connection
...@@ -1796,6 +1845,7 @@ error: ...@@ -1796,6 +1845,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virConnectGetSysinfo: * virConnectGetSysinfo:
* @conn: pointer to a hypervisor connection * @conn: pointer to a hypervisor connection
...@@ -1836,6 +1886,7 @@ error: ...@@ -1836,6 +1886,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virConnectGetMaxVcpus: * virConnectGetMaxVcpus:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -1874,6 +1925,7 @@ error: ...@@ -1874,6 +1925,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListDomains: * virConnectListDomains:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -1920,6 +1972,7 @@ error: ...@@ -1920,6 +1972,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectNumOfDomains: * virConnectNumOfDomains:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -1954,6 +2007,7 @@ error: ...@@ -1954,6 +2007,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetConnect: * virDomainGetConnect:
* @dom: pointer to a domain * @dom: pointer to a domain
...@@ -1983,6 +2037,7 @@ virDomainGetConnect(virDomainPtr dom) ...@@ -1983,6 +2037,7 @@ virDomainGetConnect(virDomainPtr dom)
return dom->conn; return dom->conn;
} }
/** /**
* virDomainCreateXML: * virDomainCreateXML:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -2042,6 +2097,7 @@ error: ...@@ -2042,6 +2097,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainCreateXMLWithFiles: * virDomainCreateXMLWithFiles:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -2115,6 +2171,7 @@ error: ...@@ -2115,6 +2171,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainCreateLinux: * virDomainCreateLinux:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -2134,6 +2191,7 @@ virDomainCreateLinux(virConnectPtr conn, const char *xmlDesc, ...@@ -2134,6 +2191,7 @@ virDomainCreateLinux(virConnectPtr conn, const char *xmlDesc,
return virDomainCreateXML(conn, xmlDesc, flags); return virDomainCreateXML(conn, xmlDesc, flags);
} }
/** /**
* virDomainLookupByID: * virDomainLookupByID:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -2175,6 +2233,7 @@ error: ...@@ -2175,6 +2233,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainLookupByUUID: * virDomainLookupByUUID:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -2214,6 +2273,7 @@ error: ...@@ -2214,6 +2273,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainLookupByUUIDString: * virDomainLookupByUUIDString:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -2253,6 +2313,7 @@ error: ...@@ -2253,6 +2313,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainLookupByName: * virDomainLookupByName:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -2292,6 +2353,7 @@ error: ...@@ -2292,6 +2353,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainDestroy: * virDomainDestroy:
* @domain: a domain object * @domain: a domain object
...@@ -2352,6 +2414,7 @@ error: ...@@ -2352,6 +2414,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainDestroyFlags: * virDomainDestroyFlags:
* @domain: a domain object * @domain: a domain object
...@@ -2418,6 +2481,7 @@ error: ...@@ -2418,6 +2481,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainFree: * virDomainFree:
* @domain: a domain object * @domain: a domain object
...@@ -2443,6 +2507,7 @@ virDomainFree(virDomainPtr domain) ...@@ -2443,6 +2507,7 @@ virDomainFree(virDomainPtr domain)
return 0; return 0;
} }
/** /**
* virDomainRef: * virDomainRef:
* @domain: the domain to hold a reference on * @domain: the domain to hold a reference on
...@@ -2525,6 +2590,7 @@ error: ...@@ -2525,6 +2590,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainResume: * virDomainResume:
* @domain: a domain object * @domain: a domain object
...@@ -2573,6 +2639,7 @@ error: ...@@ -2573,6 +2639,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainPMSuspendForDuration: * virDomainPMSuspendForDuration:
* @dom: a domain object * @dom: a domain object
...@@ -2641,6 +2708,7 @@ error: ...@@ -2641,6 +2708,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainPMWakeup: * virDomainPMWakeup:
* @dom: a domain object * @dom: a domain object
...@@ -2691,6 +2759,7 @@ error: ...@@ -2691,6 +2759,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSave: * virDomainSave:
* @domain: a domain object * @domain: a domain object
...@@ -2755,6 +2824,7 @@ error: ...@@ -2755,6 +2824,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSaveFlags: * virDomainSaveFlags:
* @domain: a domain object * @domain: a domain object
...@@ -2850,6 +2920,7 @@ error: ...@@ -2850,6 +2920,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainRestore: * virDomainRestore:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -2906,6 +2977,7 @@ error: ...@@ -2906,6 +2977,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainRestoreFlags: * virDomainRestoreFlags:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -2989,6 +3061,7 @@ error: ...@@ -2989,6 +3061,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSaveImageGetXMLDesc: * virDomainSaveImageGetXMLDesc:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -3057,6 +3130,7 @@ error: ...@@ -3057,6 +3130,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainSaveImageDefineXML: * virDomainSaveImageDefineXML:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -3138,6 +3212,7 @@ error: ...@@ -3138,6 +3212,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainCoreDump: * virDomainCoreDump:
* @domain: a domain object * @domain: a domain object
...@@ -3229,6 +3304,7 @@ error: ...@@ -3229,6 +3304,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainScreenshot: * virDomainScreenshot:
* @domain: a domain object * @domain: a domain object
...@@ -3294,6 +3370,7 @@ error: ...@@ -3294,6 +3370,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainShutdown: * virDomainShutdown:
* @domain: a domain object * @domain: a domain object
...@@ -3350,6 +3427,7 @@ error: ...@@ -3350,6 +3427,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainShutdownFlags: * virDomainShutdownFlags:
* @domain: a domain object * @domain: a domain object
...@@ -3413,6 +3491,7 @@ error: ...@@ -3413,6 +3491,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainReboot: * virDomainReboot:
* @domain: a domain object * @domain: a domain object
...@@ -3477,6 +3556,7 @@ error: ...@@ -3477,6 +3556,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainReset: * virDomainReset:
* @domain: a domain object * @domain: a domain object
...@@ -3527,6 +3607,7 @@ error: ...@@ -3527,6 +3607,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetName: * virDomainGetName:
* @domain: a domain object * @domain: a domain object
...@@ -3551,6 +3632,7 @@ virDomainGetName(virDomainPtr domain) ...@@ -3551,6 +3632,7 @@ virDomainGetName(virDomainPtr domain)
return domain->name; return domain->name;
} }
/** /**
* virDomainGetUUID: * virDomainGetUUID:
* @domain: a domain object * @domain: a domain object
...@@ -3579,6 +3661,7 @@ virDomainGetUUID(virDomainPtr domain, unsigned char *uuid) ...@@ -3579,6 +3661,7 @@ virDomainGetUUID(virDomainPtr domain, unsigned char *uuid)
return 0; return 0;
} }
/** /**
* virDomainGetUUIDString: * virDomainGetUUIDString:
* @domain: a domain object * @domain: a domain object
...@@ -3616,6 +3699,7 @@ error: ...@@ -3616,6 +3699,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetID: * virDomainGetID:
* @domain: a domain object * @domain: a domain object
...@@ -3639,6 +3723,7 @@ virDomainGetID(virDomainPtr domain) ...@@ -3639,6 +3723,7 @@ virDomainGetID(virDomainPtr domain)
return domain->id; return domain->id;
} }
/** /**
* virDomainGetOSType: * virDomainGetOSType:
* @domain: a domain object * @domain: a domain object
...@@ -3680,6 +3765,7 @@ error: ...@@ -3680,6 +3765,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainGetMaxMemory: * virDomainGetMaxMemory:
* @domain: a domain object or NULL * @domain: a domain object or NULL
...@@ -3728,6 +3814,7 @@ error: ...@@ -3728,6 +3814,7 @@ error:
return 0; return 0;
} }
/** /**
* virDomainSetMaxMemory: * virDomainSetMaxMemory:
* @domain: a domain object or NULL * @domain: a domain object or NULL
...@@ -3781,6 +3868,7 @@ error: ...@@ -3781,6 +3868,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSetMemory: * virDomainSetMemory:
* @domain: a domain object or NULL * @domain: a domain object or NULL
...@@ -3833,6 +3921,7 @@ error: ...@@ -3833,6 +3921,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSetMemoryFlags: * virDomainSetMemoryFlags:
* @domain: a domain object or NULL * @domain: a domain object or NULL
...@@ -3858,7 +3947,6 @@ error: ...@@ -3858,7 +3947,6 @@ error:
* *
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
int int
virDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, virDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory,
unsigned int flags) unsigned int flags)
...@@ -3898,6 +3986,7 @@ error: ...@@ -3898,6 +3986,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSetMemoryStatsPeriod: * virDomainSetMemoryStatsPeriod:
* @domain: a domain object or NULL * @domain: a domain object or NULL
...@@ -3920,7 +4009,6 @@ error: ...@@ -3920,7 +4009,6 @@ error:
* *
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
int int
virDomainSetMemoryStatsPeriod(virDomainPtr domain, int period, virDomainSetMemoryStatsPeriod(virDomainPtr domain, int period,
unsigned int flags) unsigned int flags)
...@@ -3962,6 +4050,7 @@ error: ...@@ -3962,6 +4050,7 @@ error:
return -1; return -1;
} }
/* Helper function called to validate incoming client array on any /* Helper function called to validate incoming client array on any
* interface that sets typed parameters in the hypervisor. */ * interface that sets typed parameters in the hypervisor. */
static int static int
...@@ -4003,6 +4092,7 @@ virTypedParameterValidateSet(virConnectPtr conn, ...@@ -4003,6 +4092,7 @@ virTypedParameterValidateSet(virConnectPtr conn,
return 0; return 0;
} }
/** /**
* virDomainSetMemoryParameters: * virDomainSetMemoryParameters:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -4061,6 +4151,7 @@ error: ...@@ -4061,6 +4151,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetMemoryParameters: * virDomainGetMemoryParameters:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -4082,8 +4173,8 @@ error: ...@@ -4082,8 +4173,8 @@ error:
* *
* Here is a sample code snippet: * Here is a sample code snippet:
* *
* if ((virDomainGetMemoryParameters(dom, NULL, &nparams, 0) == 0) && * if (virDomainGetMemoryParameters(dom, NULL, &nparams, 0) == 0 &&
* (nparams != 0)) { * nparams != 0) {
* if ((params = malloc(sizeof(*params) * nparams)) == NULL) * if ((params = malloc(sizeof(*params) * nparams)) == NULL)
* goto error; * goto error;
* memset(params, 0, sizeof(*params) * nparams); * memset(params, 0, sizeof(*params) * nparams);
...@@ -4146,6 +4237,7 @@ error: ...@@ -4146,6 +4237,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSetNumaParameters: * virDomainSetNumaParameters:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -4204,6 +4296,7 @@ error: ...@@ -4204,6 +4296,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetNumaParameters: * virDomainGetNumaParameters:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -4230,7 +4323,6 @@ error: ...@@ -4230,7 +4323,6 @@ error:
* *
* Returns -1 in case of error, 0 in case of success. * Returns -1 in case of error, 0 in case of success.
*/ */
int int
virDomainGetNumaParameters(virDomainPtr domain, virDomainGetNumaParameters(virDomainPtr domain,
virTypedParameterPtr params, virTypedParameterPtr params,
...@@ -4274,6 +4366,7 @@ error: ...@@ -4274,6 +4366,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSetBlkioParameters: * virDomainSetBlkioParameters:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -4332,6 +4425,7 @@ error: ...@@ -4332,6 +4425,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetBlkioParameters: * virDomainGetBlkioParameters:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -4408,6 +4502,7 @@ error: ...@@ -4408,6 +4502,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetInfo: * virDomainGetInfo:
* @domain: a domain object * @domain: a domain object
...@@ -4454,6 +4549,7 @@ error: ...@@ -4454,6 +4549,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetState: * virDomainGetState:
* @domain: a domain object * @domain: a domain object
...@@ -4503,6 +4599,7 @@ error: ...@@ -4503,6 +4599,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetControlInfo: * virDomainGetControlInfo:
* @domain: a domain object * @domain: a domain object
...@@ -4548,6 +4645,7 @@ error: ...@@ -4548,6 +4645,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetXMLDesc: * virDomainGetXMLDesc:
* @domain: a domain object * @domain: a domain object
...@@ -4607,6 +4705,7 @@ error: ...@@ -4607,6 +4705,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virConnectDomainXMLFromNative: * virConnectDomainXMLFromNative:
* @conn: a connection object * @conn: a connection object
...@@ -4621,7 +4720,8 @@ error: ...@@ -4621,7 +4720,8 @@ error:
* Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error.
* the caller must free() the returned value. * the caller must free() the returned value.
*/ */
char *virConnectDomainXMLFromNative(virConnectPtr conn, char *
virConnectDomainXMLFromNative(virConnectPtr conn,
const char *nativeFormat, const char *nativeFormat,
const char *nativeConfig, const char *nativeConfig,
unsigned int flags) unsigned int flags)
...@@ -4662,6 +4762,7 @@ error: ...@@ -4662,6 +4762,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virConnectDomainXMLToNative: * virConnectDomainXMLToNative:
* @conn: a connection object * @conn: a connection object
...@@ -4676,7 +4777,8 @@ error: ...@@ -4676,7 +4777,8 @@ error:
* Returns a 0 terminated UTF-8 encoded native config datafile, or NULL in case of error. * Returns a 0 terminated UTF-8 encoded native config datafile, or NULL in case of error.
* the caller must free() the returned value. * the caller must free() the returned value.
*/ */
char *virConnectDomainXMLToNative(virConnectPtr conn, char *
virConnectDomainXMLToNative(virConnectPtr conn,
const char *nativeFormat, const char *nativeFormat,
const char *domainXml, const char *domainXml,
unsigned int flags) unsigned int flags)
...@@ -4802,12 +4904,13 @@ virDomainMigrateVersion1(virDomainPtr domain, ...@@ -4802,12 +4904,13 @@ virDomainMigrateVersion1(virDomainPtr domain,
else else
ddomain = virDomainLookupByName(dconn, dname); ddomain = virDomainLookupByName(dconn, dname);
done: done:
VIR_FREE(uri_out); VIR_FREE(uri_out);
VIR_FREE(cookie); VIR_FREE(cookie);
return ddomain; return ddomain;
} }
/* /*
* Sequence v2: * Sequence v2:
* *
...@@ -4933,7 +5036,7 @@ finish: ...@@ -4933,7 +5036,7 @@ finish:
ddomain = dconn->driver->domainMigrateFinish2 ddomain = dconn->driver->domainMigrateFinish2
(dconn, dname, cookie, cookielen, uri, destflags, cancelled); (dconn, dname, cookie, cookielen, uri, destflags, cancelled);
done: done:
if (orig_err) { if (orig_err) {
virSetError(orig_err); virSetError(orig_err);
virFreeError(orig_err); virFreeError(orig_err);
...@@ -5228,7 +5331,7 @@ confirm: ...@@ -5228,7 +5331,7 @@ confirm:
} }
} }
done: done:
if (orig_err) { if (orig_err) {
virSetError(orig_err); virSetError(orig_err);
virFreeError(orig_err); virFreeError(orig_err);
...@@ -5241,6 +5344,7 @@ confirm: ...@@ -5241,6 +5344,7 @@ confirm:
return ddomain; return ddomain;
} }
static virDomainPtr static virDomainPtr
virDomainMigrateVersion3(virDomainPtr domain, virDomainMigrateVersion3(virDomainPtr domain,
virConnectPtr dconn, virConnectPtr dconn,
...@@ -5254,6 +5358,7 @@ virDomainMigrateVersion3(virDomainPtr domain, ...@@ -5254,6 +5358,7 @@ virDomainMigrateVersion3(virDomainPtr domain,
bandwidth, NULL, 0, false, flags); bandwidth, NULL, 0, false, flags);
} }
static virDomainPtr static virDomainPtr
virDomainMigrateVersion3Params(virDomainPtr domain, virDomainMigrateVersion3Params(virDomainPtr domain,
virConnectPtr dconn, virConnectPtr dconn,
...@@ -5266,7 +5371,7 @@ virDomainMigrateVersion3Params(virDomainPtr domain, ...@@ -5266,7 +5371,7 @@ virDomainMigrateVersion3Params(virDomainPtr domain,
} }
/* /*
* In normal migration, the libvirt client co-ordinates communication * In normal migration, the libvirt client co-ordinates communication
* between the 2 libvirtd instances on source & dest hosts. * between the 2 libvirtd instances on source & dest hosts.
* *
...@@ -5349,6 +5454,7 @@ virDomainMigratePeer2PeerFull(virDomainPtr domain, ...@@ -5349,6 +5454,7 @@ virDomainMigratePeer2PeerFull(virDomainPtr domain,
} }
} }
static int static int
virDomainMigratePeer2Peer(virDomainPtr domain, virDomainMigratePeer2Peer(virDomainPtr domain,
const char *xmlin, const char *xmlin,
...@@ -5362,6 +5468,7 @@ virDomainMigratePeer2Peer(virDomainPtr domain, ...@@ -5362,6 +5468,7 @@ virDomainMigratePeer2Peer(virDomainPtr domain,
bandwidth, NULL, 0, false, flags); bandwidth, NULL, 0, false, flags);
} }
static int static int
virDomainMigratePeer2PeerParams(virDomainPtr domain, virDomainMigratePeer2PeerParams(virDomainPtr domain,
const char *dconnuri, const char *dconnuri,
...@@ -6621,6 +6728,7 @@ error: ...@@ -6621,6 +6728,7 @@ error:
return -1; return -1;
} }
/* /*
* Not for public use. This function is part of the internal * Not for public use. This function is part of the internal
* implementation of migration in the remote case. * implementation of migration in the remote case.
...@@ -6671,6 +6779,7 @@ error: ...@@ -6671,6 +6779,7 @@ error:
return -1; return -1;
} }
/* /*
* Not for public use. This function is part of the internal * Not for public use. This function is part of the internal
* implementation of migration in the remote case. * implementation of migration in the remote case.
...@@ -6769,6 +6878,7 @@ error: ...@@ -6769,6 +6878,7 @@ error:
return -1; return -1;
} }
/* /*
* Not for public use. This function is part of the internal * Not for public use. This function is part of the internal
* implementation of migration in the remote case. * implementation of migration in the remote case.
...@@ -6870,6 +6980,7 @@ error: ...@@ -6870,6 +6980,7 @@ error:
return -1; return -1;
} }
/* /*
* Not for public use. This function is part of the internal * Not for public use. This function is part of the internal
* implementation of migration in the remote case. * implementation of migration in the remote case.
...@@ -6979,6 +7090,7 @@ error: ...@@ -6979,6 +7090,7 @@ error:
return -1; return -1;
} }
/* /*
* Not for public use. This function is part of the internal * Not for public use. This function is part of the internal
* implementation of migration in the remote case. * implementation of migration in the remote case.
...@@ -6994,7 +7106,6 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, ...@@ -6994,7 +7106,6 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn,
const char *dname, const char *dname,
unsigned long bandwidth, unsigned long bandwidth,
const char *dom_xml) const char *dom_xml)
{ {
VIR_DEBUG("conn=%p, stream=%p, cookiein=%p, cookieinlen=%d, cookieout=%p, " VIR_DEBUG("conn=%p, stream=%p, cookiein=%p, cookieinlen=%d, cookieout=%p, "
"cookieoutlen=%p, flags=%lx, dname=%s, bandwidth=%lu, " "cookieoutlen=%p, flags=%lx, dname=%s, bandwidth=%lu, "
...@@ -7323,7 +7434,6 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn, ...@@ -7323,7 +7434,6 @@ virDomainMigratePrepareTunnel3Params(virConnectPtr conn,
char **cookieout, char **cookieout,
int *cookieoutlen, int *cookieoutlen,
unsigned int flags) unsigned int flags)
{ {
VIR_DEBUG("conn=%p, stream=%p, params=%p, nparams=%d, cookiein=%p, " VIR_DEBUG("conn=%p, stream=%p, params=%p, nparams=%d, cookiein=%p, "
"cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=%x", "cookieinlen=%d, cookieout=%p, cookieoutlen=%p, flags=%x",
...@@ -7566,6 +7676,7 @@ error: ...@@ -7566,6 +7676,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectGetCapabilities: * virConnectGetCapabilities:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -7605,6 +7716,7 @@ error: ...@@ -7605,6 +7716,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNodeGetCPUStats: * virNodeGetCPUStats:
* @conn: pointer to the hypervisor connection. * @conn: pointer to the hypervisor connection.
...@@ -7659,7 +7771,8 @@ error: ...@@ -7659,7 +7771,8 @@ error:
* *
* Returns -1 in case of error, 0 in case of success. * Returns -1 in case of error, 0 in case of success.
*/ */
int virNodeGetCPUStats(virConnectPtr conn, int
virNodeGetCPUStats(virConnectPtr conn,
int cpuNum, int cpuNum,
virNodeCPUStatsPtr params, virNodeCPUStatsPtr params,
int *nparams, unsigned int flags) int *nparams, unsigned int flags)
...@@ -7677,7 +7790,7 @@ int virNodeGetCPUStats(virConnectPtr conn, ...@@ -7677,7 +7790,7 @@ int virNodeGetCPUStats(virConnectPtr conn,
virCheckNonNullArgGoto(nparams, error); virCheckNonNullArgGoto(nparams, error);
virCheckNonNegativeArgGoto(*nparams, error); virCheckNonNegativeArgGoto(*nparams, error);
if (((cpuNum < 0) && (cpuNum != VIR_NODE_CPU_STATS_ALL_CPUS))) { if (cpuNum < 0 && cpuNum != VIR_NODE_CPU_STATS_ALL_CPUS) {
virReportInvalidArg(cpuNum, virReportInvalidArg(cpuNum,
_("cpuNum in %s only accepts %d as a negative value"), _("cpuNum in %s only accepts %d as a negative value"),
__FUNCTION__, VIR_NODE_CPU_STATS_ALL_CPUS); __FUNCTION__, VIR_NODE_CPU_STATS_ALL_CPUS);
...@@ -7698,6 +7811,7 @@ error: ...@@ -7698,6 +7811,7 @@ error:
return -1; return -1;
} }
/** /**
* virNodeGetMemoryStats: * virNodeGetMemoryStats:
* @conn: pointer to the hypervisor connection. * @conn: pointer to the hypervisor connection.
...@@ -7748,7 +7862,8 @@ error: ...@@ -7748,7 +7862,8 @@ error:
* *
* Returns -1 in case of error, 0 in case of success. * Returns -1 in case of error, 0 in case of success.
*/ */
int virNodeGetMemoryStats(virConnectPtr conn, int
virNodeGetMemoryStats(virConnectPtr conn,
int cellNum, int cellNum,
virNodeMemoryStatsPtr params, virNodeMemoryStatsPtr params,
int *nparams, unsigned int flags) int *nparams, unsigned int flags)
...@@ -7766,7 +7881,7 @@ int virNodeGetMemoryStats(virConnectPtr conn, ...@@ -7766,7 +7881,7 @@ int virNodeGetMemoryStats(virConnectPtr conn,
virCheckNonNullArgGoto(nparams, error); virCheckNonNullArgGoto(nparams, error);
virCheckNonNegativeArgGoto(*nparams, error); virCheckNonNegativeArgGoto(*nparams, error);
if (((cellNum < 0) && (cellNum != VIR_NODE_MEMORY_STATS_ALL_CELLS))) { if (cellNum < 0 && cellNum != VIR_NODE_MEMORY_STATS_ALL_CELLS) {
virReportInvalidArg(cpuNum, virReportInvalidArg(cpuNum,
_("cellNum in %s only accepts %d as a negative value"), _("cellNum in %s only accepts %d as a negative value"),
__FUNCTION__, VIR_NODE_MEMORY_STATS_ALL_CELLS); __FUNCTION__, VIR_NODE_MEMORY_STATS_ALL_CELLS);
...@@ -7787,6 +7902,7 @@ error: ...@@ -7787,6 +7902,7 @@ error:
return -1; return -1;
} }
/** /**
* virNodeGetFreeMemory: * virNodeGetFreeMemory:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -7825,6 +7941,7 @@ error: ...@@ -7825,6 +7941,7 @@ error:
return 0; return 0;
} }
/** /**
* virNodeSuspendForDuration: * virNodeSuspendForDuration:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -7852,7 +7969,6 @@ virNodeSuspendForDuration(virConnectPtr conn, ...@@ -7852,7 +7969,6 @@ virNodeSuspendForDuration(virConnectPtr conn,
unsigned long long duration, unsigned long long duration,
unsigned int flags) unsigned int flags)
{ {
VIR_DEBUG("conn=%p, target=%d, duration=%lld, flags=%x", VIR_DEBUG("conn=%p, target=%d, duration=%lld, flags=%x",
conn, target, duration, flags); conn, target, duration, flags);
...@@ -7885,6 +8001,7 @@ error: ...@@ -7885,6 +8001,7 @@ error:
return -1; return -1;
} }
/* /*
* virNodeGetMemoryParameters: * virNodeGetMemoryParameters:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -7949,6 +8066,7 @@ error: ...@@ -7949,6 +8066,7 @@ error:
return -1; return -1;
} }
/* /*
* virNodeSetMemoryParameters: * virNodeSetMemoryParameters:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -8015,6 +8133,7 @@ error: ...@@ -8015,6 +8133,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetSchedulerType: * virDomainGetSchedulerType:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -8114,6 +8233,7 @@ error: ...@@ -8114,6 +8233,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetSchedulerParametersFlags: * virDomainGetSchedulerParametersFlags:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -8197,6 +8317,7 @@ error: ...@@ -8197,6 +8317,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSetSchedulerParameters: * virDomainSetSchedulerParameters:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -8392,6 +8513,7 @@ error: ...@@ -8392,6 +8513,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainBlockStatsFlags: * virDomainBlockStatsFlags:
* @dom: pointer to domain object * @dom: pointer to domain object
...@@ -8429,7 +8551,8 @@ error: ...@@ -8429,7 +8551,8 @@ error:
* *
* Returns -1 in case of error, 0 in case of success. * Returns -1 in case of error, 0 in case of success.
*/ */
int virDomainBlockStatsFlags(virDomainPtr dom, int
virDomainBlockStatsFlags(virDomainPtr dom,
const char *disk, const char *disk,
virTypedParameterPtr params, virTypedParameterPtr params,
int *nparams, int *nparams,
...@@ -8538,7 +8661,8 @@ error: ...@@ -8538,7 +8661,8 @@ error:
return -1; return -1;
} }
/**
/**
* virDomainSetInterfaceParameters: * virDomainSetInterfaceParameters:
* @domain: pointer to domain object * @domain: pointer to domain object
* @device: the interface name or mac address * @device: the interface name or mac address
...@@ -8605,7 +8729,8 @@ error: ...@@ -8605,7 +8729,8 @@ error:
return -1; return -1;
} }
/**
/**
* virDomainGetInterfaceParameters: * virDomainGetInterfaceParameters:
* @domain: pointer to domain object * @domain: pointer to domain object
* @device: the interface name or mac address * @device: the interface name or mac address
...@@ -8631,7 +8756,6 @@ error: ...@@ -8631,7 +8756,6 @@ error:
* *
* Returns -1 in case of error, 0 in case of success. * Returns -1 in case of error, 0 in case of success.
*/ */
int int
virDomainGetInterfaceParameters(virDomainPtr domain, virDomainGetInterfaceParameters(virDomainPtr domain,
const char *device, const char *device,
...@@ -8677,6 +8801,7 @@ error: ...@@ -8677,6 +8801,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainMemoryStats: * virDomainMemoryStats:
* @dom: pointer to the domain object * @dom: pointer to the domain object
...@@ -8709,7 +8834,8 @@ error: ...@@ -8709,7 +8834,8 @@ error:
* *
* Returns: The number of stats provided or -1 in case of failure. * Returns: The number of stats provided or -1 in case of failure.
*/ */
int virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats, int
virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats,
unsigned int nr_stats, unsigned int flags) unsigned int nr_stats, unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
...@@ -8748,6 +8874,7 @@ error: ...@@ -8748,6 +8874,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainBlockPeek: * virDomainBlockPeek:
* @dom: pointer to the domain object * @dom: pointer to the domain object
...@@ -8841,6 +8968,7 @@ error: ...@@ -8841,6 +8968,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainBlockResize: * virDomainBlockResize:
* @dom: pointer to the domain object * @dom: pointer to the domain object
...@@ -8868,7 +8996,6 @@ error: ...@@ -8868,7 +8996,6 @@ error:
* *
* Returns: 0 in case of success or -1 in case of failure. * Returns: 0 in case of success or -1 in case of failure.
*/ */
int int
virDomainBlockResize(virDomainPtr dom, virDomainBlockResize(virDomainPtr dom,
const char *disk, const char *disk,
...@@ -8910,6 +9037,7 @@ error: ...@@ -8910,6 +9037,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainMemoryPeek: * virDomainMemoryPeek:
* @dom: pointer to the domain object * @dom: pointer to the domain object
...@@ -9102,7 +9230,8 @@ error: ...@@ -9102,7 +9230,8 @@ error:
* Returns NULL in case of error, a pointer to the domain otherwise * Returns NULL in case of error, a pointer to the domain otherwise
*/ */
virDomainPtr virDomainPtr
virDomainDefineXML(virConnectPtr conn, const char *xml) { virDomainDefineXML(virConnectPtr conn, const char *xml)
{
VIR_DEBUG("conn=%p, xml=%s", conn, xml); VIR_DEBUG("conn=%p, xml=%s", conn, xml);
virResetLastError(); virResetLastError();
...@@ -9133,6 +9262,7 @@ error: ...@@ -9133,6 +9262,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainUndefine: * virDomainUndefine:
* @domain: pointer to a defined domain * @domain: pointer to a defined domain
...@@ -9149,7 +9279,8 @@ error: ...@@ -9149,7 +9279,8 @@ error:
* Returns 0 in case of success, -1 in case of error * Returns 0 in case of success, -1 in case of error
*/ */
int int
virDomainUndefine(virDomainPtr domain) { virDomainUndefine(virDomainPtr domain)
{
virConnectPtr conn; virConnectPtr conn;
VIR_DOMAIN_DEBUG(domain); VIR_DOMAIN_DEBUG(domain);
...@@ -9182,6 +9313,7 @@ error: ...@@ -9182,6 +9313,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainUndefineFlags: * virDomainUndefineFlags:
* @domain: pointer to a defined domain * @domain: pointer to a defined domain
...@@ -9279,6 +9411,7 @@ error: ...@@ -9279,6 +9411,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListDefinedDomains: * virConnectListDefinedDomains:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -9299,7 +9432,8 @@ error: ...@@ -9299,7 +9432,8 @@ error:
*/ */
int int
virConnectListDefinedDomains(virConnectPtr conn, char **const names, virConnectListDefinedDomains(virConnectPtr conn, char **const names,
int maxnames) { int maxnames)
{
VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames); VIR_DEBUG("conn=%p, names=%p, maxnames=%d", conn, names, maxnames);
virResetLastError(); virResetLastError();
...@@ -9328,6 +9462,7 @@ error: ...@@ -9328,6 +9462,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListAllDomains: * virConnectListAllDomains:
* @conn: Pointer to the hypervisor connection. * @conn: Pointer to the hypervisor connection.
...@@ -9430,6 +9565,7 @@ error: ...@@ -9430,6 +9565,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainCreate: * virDomainCreate:
* @domain: pointer to a defined domain * @domain: pointer to a defined domain
...@@ -9442,7 +9578,8 @@ error: ...@@ -9442,7 +9578,8 @@ error:
* Returns 0 in case of success, -1 in case of error * Returns 0 in case of success, -1 in case of error
*/ */
int int
virDomainCreate(virDomainPtr domain) { virDomainCreate(virDomainPtr domain)
{
virConnectPtr conn; virConnectPtr conn;
VIR_DOMAIN_DEBUG(domain); VIR_DOMAIN_DEBUG(domain);
...@@ -9475,6 +9612,7 @@ error: ...@@ -9475,6 +9612,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainCreateWithFlags: * virDomainCreateWithFlags:
* @domain: pointer to a defined domain * @domain: pointer to a defined domain
...@@ -9509,7 +9647,8 @@ error: ...@@ -9509,7 +9647,8 @@ error:
* Returns 0 in case of success, -1 in case of error * Returns 0 in case of success, -1 in case of error
*/ */
int int
virDomainCreateWithFlags(virDomainPtr domain, unsigned int flags) { virDomainCreateWithFlags(virDomainPtr domain, unsigned int flags)
{
virConnectPtr conn; virConnectPtr conn;
VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); VIR_DOMAIN_DEBUG(domain, "flags=%x", flags);
...@@ -9542,6 +9681,7 @@ error: ...@@ -9542,6 +9681,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainCreateWithFiles: * virDomainCreateWithFiles:
* @domain: pointer to a defined domain * @domain: pointer to a defined domain
...@@ -9623,6 +9763,7 @@ error: ...@@ -9623,6 +9763,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetAutostart: * virDomainGetAutostart:
* @domain: a domain object * @domain: a domain object
...@@ -9668,6 +9809,7 @@ error: ...@@ -9668,6 +9809,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSetAutostart: * virDomainSetAutostart:
* @domain: a domain object * @domain: a domain object
...@@ -9716,6 +9858,7 @@ error: ...@@ -9716,6 +9858,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainInjectNMI: * virDomainInjectNMI:
* @domain: pointer to domain object, or NULL for Domain0 * @domain: pointer to domain object, or NULL for Domain0
...@@ -9725,8 +9868,8 @@ error: ...@@ -9725,8 +9868,8 @@ error:
* *
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
int
int virDomainInjectNMI(virDomainPtr domain, unsigned int flags) virDomainInjectNMI(virDomainPtr domain, unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
VIR_DOMAIN_DEBUG(domain, "flags=%x", flags); VIR_DOMAIN_DEBUG(domain, "flags=%x", flags);
...@@ -9760,6 +9903,7 @@ error: ...@@ -9760,6 +9903,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSendKey: * virDomainSendKey:
* @domain: pointer to domain object, or NULL for Domain0 * @domain: pointer to domain object, or NULL for Domain0
...@@ -9773,8 +9917,8 @@ error: ...@@ -9773,8 +9917,8 @@ error:
* *
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
int
int virDomainSendKey(virDomainPtr domain, virDomainSendKey(virDomainPtr domain,
unsigned int codeset, unsigned int codeset,
unsigned int holdtime, unsigned int holdtime,
unsigned int *keycodes, unsigned int *keycodes,
...@@ -9856,7 +10000,8 @@ error: ...@@ -9856,7 +10000,8 @@ error:
* *
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
int virDomainSendProcessSignal(virDomainPtr domain, int
virDomainSendProcessSignal(virDomainPtr domain,
long long pid_value, long long pid_value,
unsigned int signum, unsigned int signum,
unsigned int flags) unsigned int flags)
...@@ -9918,7 +10063,6 @@ error: ...@@ -9918,7 +10063,6 @@ error:
* *
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
int int
virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) virDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus)
{ {
...@@ -9957,6 +10101,7 @@ error: ...@@ -9957,6 +10101,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSetVcpusFlags: * virDomainSetVcpusFlags:
* @domain: pointer to domain object, or NULL for Domain0 * @domain: pointer to domain object, or NULL for Domain0
...@@ -9993,7 +10138,6 @@ error: ...@@ -9993,7 +10138,6 @@ error:
* *
* Returns 0 in case of success, -1 in case of failure. * Returns 0 in case of success, -1 in case of failure.
*/ */
int int
virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus,
unsigned int flags) unsigned int flags)
...@@ -10046,6 +10190,7 @@ error: ...@@ -10046,6 +10190,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetVcpusFlags: * virDomainGetVcpusFlags:
* @domain: pointer to domain object, or NULL for Domain0 * @domain: pointer to domain object, or NULL for Domain0
...@@ -10074,7 +10219,6 @@ error: ...@@ -10074,7 +10219,6 @@ error:
* *
* Returns the number of vCPUs in case of success, -1 in case of failure. * Returns the number of vCPUs in case of success, -1 in case of failure.
*/ */
int int
virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
{ {
...@@ -10116,6 +10260,7 @@ error: ...@@ -10116,6 +10260,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainPinVcpu: * virDomainPinVcpu:
* @domain: pointer to domain object, or NULL for Domain0 * @domain: pointer to domain object, or NULL for Domain0
...@@ -10183,6 +10328,7 @@ error: ...@@ -10183,6 +10328,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainPinVcpuFlags: * virDomainPinVcpuFlags:
* @domain: pointer to domain object, or NULL for Domain0 * @domain: pointer to domain object, or NULL for Domain0
...@@ -10261,9 +10407,9 @@ virDomainPinVcpuFlags(virDomainPtr domain, unsigned int vcpu, ...@@ -10261,9 +10407,9 @@ virDomainPinVcpuFlags(virDomainPtr domain, unsigned int vcpu,
error: error:
virDispatchError(domain->conn); virDispatchError(domain->conn);
return -1; return -1;
} }
/** /**
* virDomainGetVcpuPinInfo: * virDomainGetVcpuPinInfo:
* @domain: pointer to domain object, or NULL for Domain0 * @domain: pointer to domain object, or NULL for Domain0
...@@ -10341,6 +10487,7 @@ error: ...@@ -10341,6 +10487,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainPinEmulator: * virDomainPinEmulator:
* @domain: pointer to domain object, or NULL for Domain0 * @domain: pointer to domain object, or NULL for Domain0
...@@ -10417,6 +10564,7 @@ error: ...@@ -10417,6 +10564,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetEmulatorPinInfo: * virDomainGetEmulatorPinInfo:
* @domain: pointer to domain object, or NULL for Domain0 * @domain: pointer to domain object, or NULL for Domain0
...@@ -10483,6 +10631,7 @@ error: ...@@ -10483,6 +10631,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetVcpus: * virDomainGetVcpus:
* @domain: pointer to domain object, or NULL for Domain0 * @domain: pointer to domain object, or NULL for Domain0
...@@ -10559,6 +10708,7 @@ error: ...@@ -10559,6 +10708,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetMaxVcpus: * virDomainGetMaxVcpus:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -10603,6 +10753,7 @@ error: ...@@ -10603,6 +10753,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetSecurityLabel: * virDomainGetSecurityLabel:
* @domain: a domain object * @domain: a domain object
...@@ -10646,6 +10797,7 @@ error: ...@@ -10646,6 +10797,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetSecurityLabelList: * virDomainGetSecurityLabelList:
* @domain: a domain object * @domain: a domain object
...@@ -10789,6 +10941,7 @@ error: ...@@ -10789,6 +10941,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetMetadata: * virDomainGetMetadata:
* @domain: a domain object * @domain: a domain object
...@@ -10865,6 +11018,7 @@ error: ...@@ -10865,6 +11018,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNodeGetSecurityModel: * virNodeGetSecurityModel:
* @conn: a connection object * @conn: a connection object
...@@ -10904,6 +11058,7 @@ error: ...@@ -10904,6 +11058,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainAttachDevice: * virDomainAttachDevice:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -10956,6 +11111,7 @@ error: ...@@ -10956,6 +11111,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainAttachDeviceFlags: * virDomainAttachDeviceFlags:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -11019,6 +11175,7 @@ error: ...@@ -11019,6 +11175,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainDetachDevice: * virDomainDetachDevice:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -11067,6 +11224,7 @@ error: ...@@ -11067,6 +11224,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainDetachDeviceFlags: * virDomainDetachDeviceFlags:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -11146,6 +11304,7 @@ error: ...@@ -11146,6 +11304,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainUpdateDeviceFlags: * virDomainUpdateDeviceFlags:
* @domain: pointer to domain object * @domain: pointer to domain object
...@@ -11209,6 +11368,7 @@ error: ...@@ -11209,6 +11368,7 @@ error:
return -1; return -1;
} }
/** /**
* virNodeGetCellsFreeMemory: * virNodeGetCellsFreeMemory:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -11226,7 +11386,6 @@ error: ...@@ -11226,7 +11386,6 @@ error:
* *
* Returns the number of entries filled in freeMems, or -1 in case of error. * Returns the number of entries filled in freeMems, or -1 in case of error.
*/ */
int int
virNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems, virNodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems,
int startCell, int maxCells) int startCell, int maxCells)
...@@ -11261,6 +11420,7 @@ error: ...@@ -11261,6 +11420,7 @@ error:
return -1; return -1;
} }
/** /**
* virNetworkGetConnect: * virNetworkGetConnect:
* @net: pointer to a network * @net: pointer to a network
...@@ -11290,6 +11450,7 @@ virNetworkGetConnect(virNetworkPtr net) ...@@ -11290,6 +11450,7 @@ virNetworkGetConnect(virNetworkPtr net)
return net->conn; return net->conn;
} }
/** /**
* virConnectListAllNetworks: * virConnectListAllNetworks:
* @conn: Pointer to the hypervisor connection. * @conn: Pointer to the hypervisor connection.
...@@ -11396,6 +11557,7 @@ error: ...@@ -11396,6 +11557,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListNetworks: * virConnectListNetworks:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -11443,6 +11605,7 @@ error: ...@@ -11443,6 +11605,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectNumOfDefinedNetworks: * virConnectNumOfDefinedNetworks:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -11479,6 +11642,7 @@ error: ...@@ -11479,6 +11642,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListDefinedNetworks: * virConnectListDefinedNetworks:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -11527,6 +11691,7 @@ error: ...@@ -11527,6 +11691,7 @@ error:
return -1; return -1;
} }
/** /**
* virNetworkLookupByName: * virNetworkLookupByName:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -11566,6 +11731,7 @@ error: ...@@ -11566,6 +11731,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNetworkLookupByUUID: * virNetworkLookupByUUID:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -11606,6 +11772,7 @@ error: ...@@ -11606,6 +11772,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNetworkLookupByUUIDString: * virNetworkLookupByUUIDString:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -11646,6 +11813,7 @@ error: ...@@ -11646,6 +11813,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNetworkCreateXML: * virNetworkCreateXML:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -11690,6 +11858,7 @@ error: ...@@ -11690,6 +11858,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNetworkDefineXML: * virNetworkDefineXML:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -11732,6 +11901,7 @@ error: ...@@ -11732,6 +11901,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNetworkUndefine: * virNetworkUndefine:
* @network: pointer to a defined network * @network: pointer to a defined network
...@@ -11741,7 +11911,8 @@ error: ...@@ -11741,7 +11911,8 @@ error:
* Returns 0 in case of success, -1 in case of error * Returns 0 in case of success, -1 in case of error
*/ */
int int
virNetworkUndefine(virNetworkPtr network) { virNetworkUndefine(virNetworkPtr network)
{
virConnectPtr conn; virConnectPtr conn;
VIR_DEBUG("network=%p", network); VIR_DEBUG("network=%p", network);
...@@ -11773,6 +11944,7 @@ error: ...@@ -11773,6 +11944,7 @@ error:
return -1; return -1;
} }
/** /**
* virNetworkUpdate: * virNetworkUpdate:
* @network: pointer to a defined network * @network: pointer to a defined network
...@@ -11835,6 +12007,7 @@ error: ...@@ -11835,6 +12007,7 @@ error:
return -1; return -1;
} }
/** /**
* virNetworkCreate: * virNetworkCreate:
* @network: pointer to a defined network * @network: pointer to a defined network
...@@ -11878,6 +12051,7 @@ error: ...@@ -11878,6 +12051,7 @@ error:
return -1; return -1;
} }
/** /**
* virNetworkDestroy: * virNetworkDestroy:
* @network: a network object * @network: a network object
...@@ -11924,6 +12098,7 @@ error: ...@@ -11924,6 +12098,7 @@ error:
return -1; return -1;
} }
/** /**
* virNetworkFree: * virNetworkFree:
* @network: a network object * @network: a network object
...@@ -11949,6 +12124,7 @@ virNetworkFree(virNetworkPtr network) ...@@ -11949,6 +12124,7 @@ virNetworkFree(virNetworkPtr network)
return 0; return 0;
} }
/** /**
* virNetworkRef: * virNetworkRef:
* @network: the network to hold a reference on * @network: the network to hold a reference on
...@@ -11979,6 +12155,7 @@ virNetworkRef(virNetworkPtr network) ...@@ -11979,6 +12155,7 @@ virNetworkRef(virNetworkPtr network)
return 0; return 0;
} }
/** /**
* virNetworkGetName: * virNetworkGetName:
* @network: a network object * @network: a network object
...@@ -12003,6 +12180,7 @@ virNetworkGetName(virNetworkPtr network) ...@@ -12003,6 +12180,7 @@ virNetworkGetName(virNetworkPtr network)
return network->name; return network->name;
} }
/** /**
* virNetworkGetUUID: * virNetworkGetUUID:
* @network: a network object * @network: a network object
...@@ -12035,6 +12213,7 @@ error: ...@@ -12035,6 +12213,7 @@ error:
return -1; return -1;
} }
/** /**
* virNetworkGetUUIDString: * virNetworkGetUUIDString:
* @network: a network object * @network: a network object
...@@ -12071,6 +12250,7 @@ error: ...@@ -12071,6 +12250,7 @@ error:
return -1; return -1;
} }
/** /**
* virNetworkGetXMLDesc: * virNetworkGetXMLDesc:
* @network: a network object * @network: a network object
...@@ -12118,6 +12298,7 @@ error: ...@@ -12118,6 +12298,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNetworkGetBridgeName: * virNetworkGetBridgeName:
* @network: a network object * @network: a network object
...@@ -12159,6 +12340,7 @@ error: ...@@ -12159,6 +12340,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNetworkGetAutostart: * virNetworkGetAutostart:
* @network: a network object * @network: a network object
...@@ -12203,6 +12385,7 @@ error: ...@@ -12203,6 +12385,7 @@ error:
return -1; return -1;
} }
/** /**
* virNetworkSetAutostart: * virNetworkSetAutostart:
* @network: a network object * @network: a network object
...@@ -12250,6 +12433,7 @@ error: ...@@ -12250,6 +12433,7 @@ error:
return -1; return -1;
} }
/** /**
* virInterfaceGetConnect: * virInterfaceGetConnect:
* @iface: pointer to an interface * @iface: pointer to an interface
...@@ -12279,6 +12463,7 @@ virInterfaceGetConnect(virInterfacePtr iface) ...@@ -12279,6 +12463,7 @@ virInterfaceGetConnect(virInterfacePtr iface)
return iface->conn; return iface->conn;
} }
/** /**
* virConnectListAllInterfaces: * virConnectListAllInterfaces:
* @conn: Pointer to the hypervisor connection. * @conn: Pointer to the hypervisor connection.
...@@ -12340,6 +12525,7 @@ error: ...@@ -12340,6 +12525,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectNumOfInterfaces: * virConnectNumOfInterfaces:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -12376,6 +12562,7 @@ error: ...@@ -12376,6 +12562,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListInterfaces: * virConnectListInterfaces:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -12424,6 +12611,7 @@ error: ...@@ -12424,6 +12611,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectNumOfDefinedInterfaces: * virConnectNumOfDefinedInterfaces:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -12460,6 +12648,7 @@ error: ...@@ -12460,6 +12648,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListDefinedInterfaces: * virConnectListDefinedInterfaces:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -12510,6 +12699,7 @@ error: ...@@ -12510,6 +12699,7 @@ error:
return -1; return -1;
} }
/** /**
* virInterfaceLookupByName: * virInterfaceLookupByName:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -12549,6 +12739,7 @@ error: ...@@ -12549,6 +12739,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virInterfaceLookupByMACString: * virInterfaceLookupByMACString:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -12588,6 +12779,7 @@ error: ...@@ -12588,6 +12779,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virInterfaceGetName: * virInterfaceGetName:
* @iface: an interface object * @iface: an interface object
...@@ -12612,6 +12804,7 @@ virInterfaceGetName(virInterfacePtr iface) ...@@ -12612,6 +12804,7 @@ virInterfaceGetName(virInterfacePtr iface)
return iface->name; return iface->name;
} }
/** /**
* virInterfaceGetMACString: * virInterfaceGetMACString:
* @iface: an interface object * @iface: an interface object
...@@ -12638,6 +12831,7 @@ virInterfaceGetMACString(virInterfacePtr iface) ...@@ -12638,6 +12831,7 @@ virInterfaceGetMACString(virInterfacePtr iface)
return iface->mac; return iface->mac;
} }
/** /**
* virInterfaceGetXMLDesc: * virInterfaceGetXMLDesc:
* @iface: an interface object * @iface: an interface object
...@@ -12687,6 +12881,7 @@ error: ...@@ -12687,6 +12881,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virInterfaceDefineXML: * virInterfaceDefineXML:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -12740,6 +12935,7 @@ error: ...@@ -12740,6 +12935,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virInterfaceUndefine: * virInterfaceUndefine:
* @iface: pointer to a defined interface * @iface: pointer to a defined interface
...@@ -12760,7 +12956,8 @@ error: ...@@ -12760,7 +12956,8 @@ error:
* Returns 0 in case of success, -1 in case of error * Returns 0 in case of success, -1 in case of error
*/ */
int int
virInterfaceUndefine(virInterfacePtr iface) { virInterfaceUndefine(virInterfacePtr iface)
{
virConnectPtr conn; virConnectPtr conn;
VIR_DEBUG("iface=%p", iface); VIR_DEBUG("iface=%p", iface);
...@@ -12792,6 +12989,7 @@ error: ...@@ -12792,6 +12989,7 @@ error:
return -1; return -1;
} }
/** /**
* virInterfaceCreate: * virInterfaceCreate:
* @iface: pointer to a defined interface * @iface: pointer to a defined interface
...@@ -12840,6 +13038,7 @@ error: ...@@ -12840,6 +13038,7 @@ error:
return -1; return -1;
} }
/** /**
* virInterfaceDestroy: * virInterfaceDestroy:
* @iface: an interface object * @iface: an interface object
...@@ -12893,6 +13092,7 @@ error: ...@@ -12893,6 +13092,7 @@ error:
return -1; return -1;
} }
/** /**
* virInterfaceRef: * virInterfaceRef:
* @iface: the interface to hold a reference on * @iface: the interface to hold a reference on
...@@ -12923,6 +13123,7 @@ virInterfaceRef(virInterfacePtr iface) ...@@ -12923,6 +13123,7 @@ virInterfaceRef(virInterfacePtr iface)
return 0; return 0;
} }
/** /**
* virInterfaceFree: * virInterfaceFree:
* @iface: an interface object * @iface: an interface object
...@@ -12948,6 +13149,7 @@ virInterfaceFree(virInterfacePtr iface) ...@@ -12948,6 +13149,7 @@ virInterfaceFree(virInterfacePtr iface)
return 0; return 0;
} }
/** /**
* virInterfaceChangeBegin: * virInterfaceChangeBegin:
* @conn: pointer to hypervisor connection * @conn: pointer to hypervisor connection
...@@ -12998,6 +13200,7 @@ error: ...@@ -12998,6 +13200,7 @@ error:
return -1; return -1;
} }
/** /**
* virInterfaceChangeCommit: * virInterfaceChangeCommit:
* @conn: pointer to hypervisor connection * @conn: pointer to hypervisor connection
...@@ -13045,6 +13248,7 @@ error: ...@@ -13045,6 +13248,7 @@ error:
return -1; return -1;
} }
/** /**
* virInterfaceChangeRollback: * virInterfaceChangeRollback:
* @conn: pointer to hypervisor connection * @conn: pointer to hypervisor connection
...@@ -13123,6 +13327,7 @@ virStoragePoolGetConnect(virStoragePoolPtr pool) ...@@ -13123,6 +13327,7 @@ virStoragePoolGetConnect(virStoragePoolPtr pool)
return pool->conn; return pool->conn;
} }
/** /**
* virConnectListAllStoragePools: * virConnectListAllStoragePools:
* @conn: Pointer to the hypervisor connection. * @conn: Pointer to the hypervisor connection.
...@@ -13207,6 +13412,7 @@ error: ...@@ -13207,6 +13412,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectNumOfStoragePools: * virConnectNumOfStoragePools:
* @conn: pointer to hypervisor connection * @conn: pointer to hypervisor connection
...@@ -13243,6 +13449,7 @@ error: ...@@ -13243,6 +13449,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListStoragePools: * virConnectListStoragePools:
* @conn: pointer to hypervisor connection * @conn: pointer to hypervisor connection
...@@ -13600,6 +13807,7 @@ error: ...@@ -13600,6 +13807,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virStoragePoolCreateXML: * virStoragePoolCreateXML:
* @conn: pointer to hypervisor connection * @conn: pointer to hypervisor connection
...@@ -13648,6 +13856,7 @@ error: ...@@ -13648,6 +13856,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virStoragePoolDefineXML: * virStoragePoolDefineXML:
* @conn: pointer to hypervisor connection * @conn: pointer to hypervisor connection
...@@ -13694,6 +13903,7 @@ error: ...@@ -13694,6 +13903,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virStoragePoolBuild: * virStoragePoolBuild:
* @pool: pointer to storage pool * @pool: pointer to storage pool
...@@ -13877,6 +14087,7 @@ error: ...@@ -13877,6 +14087,7 @@ error:
return -1; return -1;
} }
/** /**
* virStoragePoolDelete: * virStoragePoolDelete:
* @pool: pointer to storage pool * @pool: pointer to storage pool
...@@ -13982,6 +14193,7 @@ virStoragePoolRef(virStoragePoolPtr pool) ...@@ -13982,6 +14193,7 @@ virStoragePoolRef(virStoragePoolPtr pool)
return 0; return 0;
} }
/** /**
* virStoragePoolRefresh: * virStoragePoolRefresh:
* @pool: pointer to storage pool * @pool: pointer to storage pool
...@@ -14087,6 +14299,7 @@ error: ...@@ -14087,6 +14299,7 @@ error:
return -1; return -1;
} }
/** /**
* virStoragePoolGetUUIDString: * virStoragePoolGetUUIDString:
* @pool: pointer to storage pool * @pool: pointer to storage pool
...@@ -14304,6 +14517,7 @@ error: ...@@ -14304,6 +14517,7 @@ error:
return -1; return -1;
} }
/** /**
* virStoragePoolListAllVolumes: * virStoragePoolListAllVolumes:
* @pool: Pointer to storage pool * @pool: Pointer to storage pool
...@@ -14353,6 +14567,7 @@ error: ...@@ -14353,6 +14567,7 @@ error:
return -1; return -1;
} }
/** /**
* virStoragePoolNumOfVolumes: * virStoragePoolNumOfVolumes:
* @pool: pointer to storage pool * @pool: pointer to storage pool
...@@ -14509,7 +14724,6 @@ error: ...@@ -14509,7 +14724,6 @@ error:
} }
/** /**
* virStorageVolLookupByKey: * virStorageVolLookupByKey:
* @conn: pointer to hypervisor connection * @conn: pointer to hypervisor connection
...@@ -14551,6 +14765,7 @@ error: ...@@ -14551,6 +14765,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virStorageVolLookupByPath: * virStorageVolLookupByPath:
* @conn: pointer to hypervisor connection * @conn: pointer to hypervisor connection
...@@ -15047,6 +15262,7 @@ error: ...@@ -15047,6 +15262,7 @@ error:
return -1; return -1;
} }
/** /**
* virStorageVolFree: * virStorageVolFree:
* @vol: pointer to storage volume * @vol: pointer to storage volume
...@@ -15103,6 +15319,7 @@ virStorageVolRef(virStorageVolPtr vol) ...@@ -15103,6 +15319,7 @@ virStorageVolRef(virStorageVolPtr vol)
return 0; return 0;
} }
/** /**
* virStorageVolGetInfo: * virStorageVolGetInfo:
* @vol: pointer to storage volume * @vol: pointer to storage volume
...@@ -15236,6 +15453,7 @@ error: ...@@ -15236,6 +15453,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virStorageVolResize: * virStorageVolResize:
* @vol: pointer to storage volume * @vol: pointer to storage volume
...@@ -15317,6 +15535,7 @@ error: ...@@ -15317,6 +15535,7 @@ error:
return -1; return -1;
} }
/** /**
* virNodeNumOfDevices: * virNodeNumOfDevices:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -15358,6 +15577,7 @@ error: ...@@ -15358,6 +15577,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListAllNodeDevices: * virConnectListAllNodeDevices:
* @conn: Pointer to the hypervisor connection. * @conn: Pointer to the hypervisor connection.
...@@ -15431,6 +15651,7 @@ error: ...@@ -15431,6 +15651,7 @@ error:
return -1; return -1;
} }
/** /**
* virNodeListDevices: * virNodeListDevices:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -15492,7 +15713,8 @@ error: ...@@ -15492,7 +15713,8 @@ error:
* *
* Returns a virNodeDevicePtr if found, NULL otherwise. * 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); VIR_DEBUG("conn=%p, name=%p", conn, name);
...@@ -15521,6 +15743,7 @@ error: ...@@ -15521,6 +15743,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNodeDeviceLookupSCSIHostByWWN: * virNodeDeviceLookupSCSIHostByWWN:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -15568,6 +15791,7 @@ error: ...@@ -15568,6 +15791,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNodeDeviceGetXMLDesc: * virNodeDeviceGetXMLDesc:
* @dev: pointer to the node device * @dev: pointer to the node device
...@@ -15578,7 +15802,8 @@ error: ...@@ -15578,7 +15802,8 @@ error:
* *
* Returns the XML document, or NULL on error * Returns the XML document, or NULL on error
*/ */
char *virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) char *
virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags)
{ {
VIR_DEBUG("dev=%p, conn=%p, flags=%x", dev, dev ? dev->conn : NULL, flags); VIR_DEBUG("dev=%p, conn=%p, flags=%x", dev, dev ? dev->conn : NULL, flags);
...@@ -15614,7 +15839,8 @@ error: ...@@ -15614,7 +15839,8 @@ error:
* *
* Returns the device name or NULL in case of error * Returns the device name or NULL in case of error
*/ */
const char *virNodeDeviceGetName(virNodeDevicePtr dev) const char *
virNodeDeviceGetName(virNodeDevicePtr dev)
{ {
VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL);
...@@ -15627,6 +15853,7 @@ const char *virNodeDeviceGetName(virNodeDevicePtr dev) ...@@ -15627,6 +15853,7 @@ const char *virNodeDeviceGetName(virNodeDevicePtr dev)
return dev->name; return dev->name;
} }
/** /**
* virNodeDeviceGetParent: * virNodeDeviceGetParent:
* @dev: the device * @dev: the device
...@@ -15636,7 +15863,8 @@ const char *virNodeDeviceGetName(virNodeDevicePtr dev) ...@@ -15636,7 +15863,8 @@ const char *virNodeDeviceGetName(virNodeDevicePtr dev)
* Returns the name of the device's parent, or NULL if the * Returns the name of the device's parent, or NULL if the
* device has no parent. * device has no parent.
*/ */
const char *virNodeDeviceGetParent(virNodeDevicePtr dev) const char *
virNodeDeviceGetParent(virNodeDevicePtr dev)
{ {
VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL); VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL);
...@@ -15660,6 +15888,7 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev) ...@@ -15660,6 +15888,7 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev)
return dev->parent; return dev->parent;
} }
/** /**
* virNodeDeviceNumOfCaps: * virNodeDeviceNumOfCaps:
* @dev: the device * @dev: the device
...@@ -15668,7 +15897,8 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev) ...@@ -15668,7 +15897,8 @@ const char *virNodeDeviceGetParent(virNodeDevicePtr dev)
* *
* Returns the number of capabilities supported by the device. * 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); VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL);
...@@ -15695,6 +15925,7 @@ error: ...@@ -15695,6 +15925,7 @@ error:
return -1; return -1;
} }
/** /**
* virNodeDeviceListCaps: * virNodeDeviceListCaps:
* @dev: the device * @dev: the device
...@@ -15705,7 +15936,8 @@ error: ...@@ -15705,7 +15936,8 @@ error:
* *
* Returns the number of capability names listed in @names. * Returns the number of capability names listed in @names.
*/ */
int virNodeDeviceListCaps(virNodeDevicePtr dev, int
virNodeDeviceListCaps(virNodeDevicePtr dev,
char **const names, char **const names,
int maxnames) int maxnames)
{ {
...@@ -15748,7 +15980,8 @@ error: ...@@ -15748,7 +15980,8 @@ error:
* *
* Returns the 0 for success, -1 for 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); VIR_DEBUG("dev=%p, conn=%p", dev, dev ? dev->conn : NULL);
...@@ -15794,6 +16027,7 @@ virNodeDeviceRef(virNodeDevicePtr dev) ...@@ -15794,6 +16027,7 @@ virNodeDeviceRef(virNodeDevicePtr dev)
return 0; return 0;
} }
/** /**
* virNodeDeviceDettach: * virNodeDeviceDettach:
* @dev: pointer to the node device * @dev: pointer to the node device
...@@ -15851,6 +16085,7 @@ error: ...@@ -15851,6 +16085,7 @@ error:
return -1; return -1;
} }
/** /**
* virNodeDeviceDetachFlags: * virNodeDeviceDetachFlags:
* @dev: pointer to the node device * @dev: pointer to the node device
...@@ -15915,6 +16150,7 @@ error: ...@@ -15915,6 +16150,7 @@ error:
return -1; return -1;
} }
/** /**
* virNodeDeviceReAttach: * virNodeDeviceReAttach:
* @dev: pointer to the node device * @dev: pointer to the node device
...@@ -15963,6 +16199,7 @@ error: ...@@ -15963,6 +16199,7 @@ error:
return -1; return -1;
} }
/** /**
* virNodeDeviceReset: * virNodeDeviceReset:
* @dev: pointer to the node device * @dev: pointer to the node device
...@@ -16154,7 +16391,7 @@ virConnectDomainEventRegister(virConnectPtr conn, ...@@ -16154,7 +16391,7 @@ virConnectDomainEventRegister(virConnectPtr conn,
} }
virCheckNonNullArgGoto(cb, error); virCheckNonNullArgGoto(cb, error);
if ((conn->driver) && (conn->driver->connectDomainEventRegister)) { if (conn->driver && conn->driver->connectDomainEventRegister) {
int ret; int ret;
ret = conn->driver->connectDomainEventRegister(conn, cb, opaque, freecb); ret = conn->driver->connectDomainEventRegister(conn, cb, opaque, freecb);
if (ret < 0) if (ret < 0)
...@@ -16168,6 +16405,7 @@ error: ...@@ -16168,6 +16405,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectDomainEventDeregister: * virConnectDomainEventDeregister:
* @conn: pointer to the connection * @conn: pointer to the connection
...@@ -16197,7 +16435,7 @@ virConnectDomainEventDeregister(virConnectPtr conn, ...@@ -16197,7 +16435,7 @@ virConnectDomainEventDeregister(virConnectPtr conn,
} }
virCheckNonNullArgGoto(cb, error); virCheckNonNullArgGoto(cb, error);
if ((conn->driver) && (conn->driver->connectDomainEventDeregister)) { if (conn->driver && conn->driver->connectDomainEventDeregister) {
int ret; int ret;
ret = conn->driver->connectDomainEventDeregister(conn, cb); ret = conn->driver->connectDomainEventDeregister(conn, cb);
if (ret < 0) if (ret < 0)
...@@ -16211,6 +16449,7 @@ error: ...@@ -16211,6 +16449,7 @@ error:
return -1; return -1;
} }
/** /**
* virSecretGetConnect: * virSecretGetConnect:
* @secret: A virSecret secret * @secret: A virSecret secret
...@@ -16238,6 +16477,7 @@ virSecretGetConnect(virSecretPtr secret) ...@@ -16238,6 +16477,7 @@ virSecretGetConnect(virSecretPtr secret)
return secret->conn; return secret->conn;
} }
/** /**
* virConnectNumOfSecrets: * virConnectNumOfSecrets:
* @conn: virConnect connection * @conn: virConnect connection
...@@ -16276,6 +16516,7 @@ error: ...@@ -16276,6 +16516,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListAllSecrets: * virConnectListAllSecrets:
* @conn: Pointer to the hypervisor connection. * @conn: Pointer to the hypervisor connection.
...@@ -16343,6 +16584,7 @@ error: ...@@ -16343,6 +16584,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListSecrets: * virConnectListSecrets:
* @conn: virConnect connection * @conn: virConnect connection
...@@ -16384,6 +16626,7 @@ error: ...@@ -16384,6 +16626,7 @@ error:
return -1; return -1;
} }
/** /**
* virSecretLookupByUUID: * virSecretLookupByUUID:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -16425,6 +16668,7 @@ error: ...@@ -16425,6 +16668,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virSecretLookupByUUIDString: * virSecretLookupByUUIDString:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -16561,6 +16805,7 @@ error: ...@@ -16561,6 +16805,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virSecretGetUUID: * virSecretGetUUID:
* @secret: A virSecret secret * @secret: A virSecret secret
...@@ -16594,6 +16839,7 @@ error: ...@@ -16594,6 +16839,7 @@ error:
return -1; return -1;
} }
/** /**
* virSecretGetUUIDString: * virSecretGetUUIDString:
* @secret: a secret object * @secret: a secret object
...@@ -16630,6 +16876,7 @@ error: ...@@ -16630,6 +16876,7 @@ error:
return -1; return -1;
} }
/** /**
* virSecretGetUsageType: * virSecretGetUsageType:
* @secret: a secret object * @secret: a secret object
...@@ -16658,6 +16905,7 @@ virSecretGetUsageType(virSecretPtr secret) ...@@ -16658,6 +16905,7 @@ virSecretGetUsageType(virSecretPtr secret)
return secret->usageType; return secret->usageType;
} }
/** /**
* virSecretGetUsageID: * virSecretGetUsageID:
* @secret: a secret object * @secret: a secret object
...@@ -16732,6 +16980,7 @@ error: ...@@ -16732,6 +16980,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virSecretSetValue: * virSecretSetValue:
* @secret: A virSecret secret * @secret: A virSecret secret
...@@ -16782,6 +17031,7 @@ error: ...@@ -16782,6 +17031,7 @@ error:
return -1; return -1;
} }
/** /**
* virSecretGetValue: * virSecretGetValue:
* @secret: A virSecret connection * @secret: A virSecret connection
...@@ -16830,6 +17080,7 @@ error: ...@@ -16830,6 +17080,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virSecretUndefine: * virSecretUndefine:
* @secret: A virSecret secret * @secret: A virSecret secret
...@@ -16875,6 +17126,7 @@ error: ...@@ -16875,6 +17126,7 @@ error:
return -1; return -1;
} }
/** /**
* virSecretRef: * virSecretRef:
* @secret: the secret to hold a reference on * @secret: the secret to hold a reference on
...@@ -16904,6 +17156,7 @@ virSecretRef(virSecretPtr secret) ...@@ -16904,6 +17156,7 @@ virSecretRef(virSecretPtr secret)
return 0; return 0;
} }
/** /**
* virSecretFree: * virSecretFree:
* @secret: pointer to a secret * @secret: pointer to a secret
...@@ -17063,7 +17316,8 @@ virStreamRef(virStreamPtr stream) ...@@ -17063,7 +17316,8 @@ virStreamRef(virStreamPtr stream)
* Returns -2 if the outgoing transmit buffers are full & * Returns -2 if the outgoing transmit buffers are full &
* the stream is marked as non-blocking. * the stream is marked as non-blocking.
*/ */
int virStreamSend(virStreamPtr stream, int
virStreamSend(virStreamPtr stream,
const char *data, const char *data,
size_t nbytes) size_t nbytes)
{ {
...@@ -17160,7 +17414,8 @@ error: ...@@ -17160,7 +17414,8 @@ error:
* Returns -2 if there is no data pending to be read & the * Returns -2 if there is no data pending to be read & the
* stream is marked as non-blocking. * stream is marked as non-blocking.
*/ */
int virStreamRecv(virStreamPtr stream, int
virStreamRecv(virStreamPtr stream,
char *data, char *data,
size_t nbytes) size_t nbytes)
{ {
...@@ -17235,7 +17490,8 @@ error: ...@@ -17235,7 +17490,8 @@ error:
* having been called, so the caller need only call * having been called, so the caller need only call
* virStreamFree() * virStreamFree()
*/ */
int virStreamSendAll(virStreamPtr stream, int
virStreamSendAll(virStreamPtr stream,
virStreamSourceFunc handler, virStreamSourceFunc handler,
void *opaque) void *opaque)
{ {
...@@ -17332,7 +17588,8 @@ cleanup: ...@@ -17332,7 +17588,8 @@ cleanup:
* having been called, so the caller need only call * having been called, so the caller need only call
* virStreamFree() * virStreamFree()
*/ */
int virStreamRecvAll(virStreamPtr stream, int
virStreamRecvAll(virStreamPtr stream,
virStreamSinkFunc handler, virStreamSinkFunc handler,
void *opaque) void *opaque)
{ {
...@@ -17405,7 +17662,8 @@ cleanup: ...@@ -17405,7 +17662,8 @@ cleanup:
* *
* Returns 0 on success, -1 upon error * Returns 0 on success, -1 upon error
*/ */
int virStreamEventAddCallback(virStreamPtr stream, int
virStreamEventAddCallback(virStreamPtr stream,
int events, int events,
virStreamEventCallback cb, virStreamEventCallback cb,
void *opaque, void *opaque,
...@@ -17450,7 +17708,8 @@ error: ...@@ -17450,7 +17708,8 @@ error:
* *
* Returns 0 on success, -1 if no callback is registered * Returns 0 on success, -1 if no callback is registered
*/ */
int virStreamEventUpdateCallback(virStreamPtr stream, int
virStreamEventUpdateCallback(virStreamPtr stream,
int events) int events)
{ {
VIR_DEBUG("stream=%p, events=%d", stream, events); VIR_DEBUG("stream=%p, events=%d", stream, events);
...@@ -17479,6 +17738,7 @@ error: ...@@ -17479,6 +17738,7 @@ error:
return -1; return -1;
} }
/** /**
* virStreamEventRemoveCallback: * virStreamEventRemoveCallback:
* @stream: pointer to the stream object * @stream: pointer to the stream object
...@@ -17487,7 +17747,8 @@ error: ...@@ -17487,7 +17747,8 @@ error:
* *
* Returns 0 on success, -1 on error * Returns 0 on success, -1 on error
*/ */
int virStreamEventRemoveCallback(virStreamPtr stream) int
virStreamEventRemoveCallback(virStreamPtr stream)
{ {
VIR_DEBUG("stream=%p", stream); VIR_DEBUG("stream=%p", stream);
...@@ -17515,6 +17776,7 @@ error: ...@@ -17515,6 +17776,7 @@ error:
return -1; return -1;
} }
/** /**
* virStreamFinish: * virStreamFinish:
* @stream: pointer to the stream object * @stream: pointer to the stream object
...@@ -17530,7 +17792,8 @@ error: ...@@ -17530,7 +17792,8 @@ error:
* *
* Returns 0 on success, -1 upon error * Returns 0 on success, -1 upon error
*/ */
int virStreamFinish(virStreamPtr stream) int
virStreamFinish(virStreamPtr stream)
{ {
VIR_DEBUG("stream=%p", stream); VIR_DEBUG("stream=%p", stream);
...@@ -17558,6 +17821,7 @@ error: ...@@ -17558,6 +17821,7 @@ error:
return -1; return -1;
} }
/** /**
* virStreamAbort: * virStreamAbort:
* @stream: pointer to the stream object * @stream: pointer to the stream object
...@@ -17571,7 +17835,8 @@ error: ...@@ -17571,7 +17835,8 @@ error:
* *
* Returns 0 on success, -1 upon error * Returns 0 on success, -1 upon error
*/ */
int virStreamAbort(virStreamPtr stream) int
virStreamAbort(virStreamPtr stream)
{ {
VIR_DEBUG("stream=%p", stream); VIR_DEBUG("stream=%p", stream);
...@@ -17603,6 +17868,7 @@ error: ...@@ -17603,6 +17868,7 @@ error:
return -1; return -1;
} }
/** /**
* virStreamFree: * virStreamFree:
* @stream: pointer to the stream object * @stream: pointer to the stream object
...@@ -17617,7 +17883,8 @@ error: ...@@ -17617,7 +17883,8 @@ error:
* *
* Returns 0 upon success, or -1 on error * Returns 0 upon success, or -1 on error
*/ */
int virStreamFree(virStreamPtr stream) int
virStreamFree(virStreamPtr stream)
{ {
VIR_DEBUG("stream=%p", stream); VIR_DEBUG("stream=%p", stream);
...@@ -17644,7 +17911,8 @@ int virStreamFree(virStreamPtr stream) ...@@ -17644,7 +17911,8 @@ int virStreamFree(virStreamPtr stream)
* *
* Returns 1 if running, 0 if inactive, -1 on error * Returns 1 if running, 0 if inactive, -1 on error
*/ */
int virDomainIsActive(virDomainPtr dom) int
virDomainIsActive(virDomainPtr dom)
{ {
VIR_DEBUG("dom=%p", dom); VIR_DEBUG("dom=%p", dom);
...@@ -17669,6 +17937,7 @@ error: ...@@ -17669,6 +17937,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainIsPersistent: * virDomainIsPersistent:
* @dom: pointer to the domain object * @dom: pointer to the domain object
...@@ -17678,7 +17947,8 @@ error: ...@@ -17678,7 +17947,8 @@ error:
* *
* Returns 1 if persistent, 0 if transient, -1 on error * Returns 1 if persistent, 0 if transient, -1 on error
*/ */
int virDomainIsPersistent(virDomainPtr dom) int
virDomainIsPersistent(virDomainPtr dom)
{ {
VIR_DOMAIN_DEBUG(dom); VIR_DOMAIN_DEBUG(dom);
...@@ -17703,6 +17973,7 @@ error: ...@@ -17703,6 +17973,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainIsUpdated: * virDomainIsUpdated:
* @dom: pointer to the domain object * @dom: pointer to the domain object
...@@ -17711,7 +17982,8 @@ error: ...@@ -17711,7 +17982,8 @@ error:
* *
* Returns 1 if updated, 0 if not, -1 on error * Returns 1 if updated, 0 if not, -1 on error
*/ */
int virDomainIsUpdated(virDomainPtr dom) int
virDomainIsUpdated(virDomainPtr dom)
{ {
VIR_DOMAIN_DEBUG(dom); VIR_DOMAIN_DEBUG(dom);
...@@ -17736,6 +18008,7 @@ error: ...@@ -17736,6 +18008,7 @@ error:
return -1; return -1;
} }
/** /**
* virNetworkIsActive: * virNetworkIsActive:
* @net: pointer to the network object * @net: pointer to the network object
...@@ -17744,7 +18017,8 @@ error: ...@@ -17744,7 +18017,8 @@ error:
* *
* Returns 1 if running, 0 if inactive, -1 on error * Returns 1 if running, 0 if inactive, -1 on error
*/ */
int virNetworkIsActive(virNetworkPtr net) int
virNetworkIsActive(virNetworkPtr net)
{ {
VIR_DEBUG("net=%p", net); VIR_DEBUG("net=%p", net);
...@@ -17779,7 +18053,8 @@ error: ...@@ -17779,7 +18053,8 @@ error:
* *
* Returns 1 if persistent, 0 if transient, -1 on error * Returns 1 if persistent, 0 if transient, -1 on error
*/ */
int virNetworkIsPersistent(virNetworkPtr net) int
virNetworkIsPersistent(virNetworkPtr net)
{ {
VIR_DEBUG("net=%p", net); VIR_DEBUG("net=%p", net);
...@@ -17813,7 +18088,8 @@ error: ...@@ -17813,7 +18088,8 @@ error:
* *
* Returns 1 if running, 0 if inactive, -1 on error * Returns 1 if running, 0 if inactive, -1 on error
*/ */
int virStoragePoolIsActive(virStoragePoolPtr pool) int
virStoragePoolIsActive(virStoragePoolPtr pool)
{ {
VIR_DEBUG("pool=%p", pool); VIR_DEBUG("pool=%p", pool);
...@@ -17848,7 +18124,8 @@ error: ...@@ -17848,7 +18124,8 @@ error:
* *
* Returns 1 if persistent, 0 if transient, -1 on error * Returns 1 if persistent, 0 if transient, -1 on error
*/ */
int virStoragePoolIsPersistent(virStoragePoolPtr pool) int
virStoragePoolIsPersistent(virStoragePoolPtr pool)
{ {
VIR_DEBUG("pool=%p", pool); VIR_DEBUG("pool=%p", pool);
...@@ -17874,7 +18151,6 @@ error: ...@@ -17874,7 +18151,6 @@ error:
} }
/** /**
* virConnectNumOfNWFilters: * virConnectNumOfNWFilters:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -17911,6 +18187,7 @@ error: ...@@ -17911,6 +18187,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListAllNWFilters: * virConnectListAllNWFilters:
* @conn: Pointer to the hypervisor connection. * @conn: Pointer to the hypervisor connection.
...@@ -17962,6 +18239,7 @@ error: ...@@ -17962,6 +18239,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectListNWFilters: * virConnectListNWFilters:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -18043,6 +18321,7 @@ error: ...@@ -18043,6 +18321,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNWFilterLookupByUUID: * virNWFilterLookupByUUID:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -18082,6 +18361,7 @@ error: ...@@ -18082,6 +18361,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNWFilterLookupByUUIDString: * virNWFilterLookupByUUIDString:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -18121,6 +18401,7 @@ error: ...@@ -18121,6 +18401,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNWFilterFree: * virNWFilterFree:
* @nwfilter: a nwfilter object * @nwfilter: a nwfilter object
...@@ -18147,6 +18428,7 @@ virNWFilterFree(virNWFilterPtr nwfilter) ...@@ -18147,6 +18428,7 @@ virNWFilterFree(virNWFilterPtr nwfilter)
return 0; return 0;
} }
/** /**
* virNWFilterGetName: * virNWFilterGetName:
* @nwfilter: a nwfilter object * @nwfilter: a nwfilter object
...@@ -18171,6 +18453,7 @@ virNWFilterGetName(virNWFilterPtr nwfilter) ...@@ -18171,6 +18453,7 @@ virNWFilterGetName(virNWFilterPtr nwfilter)
return nwfilter->name; return nwfilter->name;
} }
/** /**
* virNWFilterGetUUID: * virNWFilterGetUUID:
* @nwfilter: a nwfilter object * @nwfilter: a nwfilter object
...@@ -18203,6 +18486,7 @@ error: ...@@ -18203,6 +18486,7 @@ error:
return -1; return -1;
} }
/** /**
* virNWFilterGetUUIDString: * virNWFilterGetUUIDString:
* @nwfilter: a nwfilter object * @nwfilter: a nwfilter object
...@@ -18413,7 +18697,8 @@ virNWFilterRef(virNWFilterPtr nwfilter) ...@@ -18413,7 +18697,8 @@ virNWFilterRef(virNWFilterPtr nwfilter)
* *
* Returns 1 if running, 0 if inactive, -1 on error * Returns 1 if running, 0 if inactive, -1 on error
*/ */
int virInterfaceIsActive(virInterfacePtr iface) int
virInterfaceIsActive(virInterfacePtr iface)
{ {
VIR_DEBUG("iface=%p", iface); VIR_DEBUG("iface=%p", iface);
...@@ -18447,7 +18732,8 @@ error: ...@@ -18447,7 +18732,8 @@ error:
* *
* Returns 1 if encrypted, 0 if not encrypted, -1 on 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); VIR_DEBUG("conn=%p", conn);
...@@ -18472,6 +18758,7 @@ error: ...@@ -18472,6 +18758,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectIsSecure: * virConnectIsSecure:
* @conn: pointer to the connection object * @conn: pointer to the connection object
...@@ -18484,7 +18771,8 @@ error: ...@@ -18484,7 +18771,8 @@ error:
* *
* Returns 1 if secure, 0 if not secure, -1 on 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); VIR_DEBUG("conn=%p", conn);
...@@ -18865,6 +19153,7 @@ error: ...@@ -18865,6 +19153,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainMigrateGetCompressionCache: * virDomainMigrateGetCompressionCache:
* @domain: a domain object * @domain: a domain object
...@@ -18910,6 +19199,7 @@ error: ...@@ -18910,6 +19199,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainMigrateSetCompressionCache: * virDomainMigrateSetCompressionCache:
* @domain: a domain object * @domain: a domain object
...@@ -18960,6 +19250,7 @@ error: ...@@ -18960,6 +19250,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainMigrateSetMaxSpeed: * virDomainMigrateSetMaxSpeed:
* @domain: a domain object * @domain: a domain object
...@@ -19007,6 +19298,7 @@ error: ...@@ -19007,6 +19298,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainMigrateGetMaxSpeed: * virDomainMigrateGetMaxSpeed:
* @domain: a domain object * @domain: a domain object
...@@ -19056,6 +19348,7 @@ error: ...@@ -19056,6 +19348,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectDomainEventRegisterAny: * virConnectDomainEventRegisterAny:
* @conn: pointer to the connection * @conn: pointer to the connection
...@@ -19124,7 +19417,7 @@ virConnectDomainEventRegisterAny(virConnectPtr conn, ...@@ -19124,7 +19417,7 @@ virConnectDomainEventRegisterAny(virConnectPtr conn,
goto error; goto error;
} }
if ((conn->driver) && (conn->driver->connectDomainEventRegisterAny)) { if (conn->driver && conn->driver->connectDomainEventRegisterAny) {
int ret; int ret;
ret = conn->driver->connectDomainEventRegisterAny(conn, dom, eventID, cb, opaque, freecb); ret = conn->driver->connectDomainEventRegisterAny(conn, dom, eventID, cb, opaque, freecb);
if (ret < 0) if (ret < 0)
...@@ -19138,6 +19431,7 @@ error: ...@@ -19138,6 +19431,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectDomainEventDeregisterAny: * virConnectDomainEventDeregisterAny:
* @conn: pointer to the connection * @conn: pointer to the connection
...@@ -19163,7 +19457,7 @@ virConnectDomainEventDeregisterAny(virConnectPtr conn, ...@@ -19163,7 +19457,7 @@ virConnectDomainEventDeregisterAny(virConnectPtr conn,
} }
virCheckNonNegativeArgGoto(callbackID, error); virCheckNonNegativeArgGoto(callbackID, error);
if ((conn->driver) && (conn->driver->connectDomainEventDeregisterAny)) { if (conn->driver && conn->driver->connectDomainEventDeregisterAny) {
int ret; int ret;
ret = conn->driver->connectDomainEventDeregisterAny(conn, callbackID); ret = conn->driver->connectDomainEventDeregisterAny(conn, callbackID);
if (ret < 0) if (ret < 0)
...@@ -19177,6 +19471,7 @@ error: ...@@ -19177,6 +19471,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectNetworkEventRegisterAny: * virConnectNetworkEventRegisterAny:
* @conn: pointer to the connection * @conn: pointer to the connection
...@@ -19246,7 +19541,7 @@ virConnectNetworkEventRegisterAny(virConnectPtr conn, ...@@ -19246,7 +19541,7 @@ virConnectNetworkEventRegisterAny(virConnectPtr conn,
goto error; goto error;
} }
if ((conn->networkDriver) && (conn->networkDriver->connectNetworkEventRegisterAny)) { if (conn->networkDriver && conn->networkDriver->connectNetworkEventRegisterAny) {
int ret; int ret;
ret = conn->networkDriver->connectNetworkEventRegisterAny(conn, net, ret = conn->networkDriver->connectNetworkEventRegisterAny(conn, net,
eventID, eventID,
...@@ -19263,6 +19558,7 @@ error: ...@@ -19263,6 +19558,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectNetworkEventDeregisterAny: * virConnectNetworkEventDeregisterAny:
* @conn: pointer to the connection * @conn: pointer to the connection
...@@ -19288,8 +19584,8 @@ virConnectNetworkEventDeregisterAny(virConnectPtr conn, ...@@ -19288,8 +19584,8 @@ virConnectNetworkEventDeregisterAny(virConnectPtr conn,
} }
virCheckNonNegativeArgGoto(callbackID, error); virCheckNonNegativeArgGoto(callbackID, error);
if ((conn->networkDriver) && if (conn->networkDriver &&
(conn->networkDriver->connectNetworkEventDeregisterAny)) { conn->networkDriver->connectNetworkEventDeregisterAny) {
int ret; int ret;
ret = conn->networkDriver->connectNetworkEventDeregisterAny(conn, ret = conn->networkDriver->connectNetworkEventDeregisterAny(conn,
callbackID); callbackID);
...@@ -19304,6 +19600,7 @@ error: ...@@ -19304,6 +19600,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainManagedSave: * virDomainManagedSave:
* @dom: pointer to the domain * @dom: pointer to the domain
...@@ -19333,7 +19630,8 @@ error: ...@@ -19333,7 +19630,8 @@ error:
* *
* Returns 0 in case of success or -1 in case of failure * 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; virConnectPtr conn;
...@@ -19376,6 +19674,7 @@ error: ...@@ -19376,6 +19674,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainHasManagedSaveImage: * virDomainHasManagedSaveImage:
* @dom: pointer to the domain * @dom: pointer to the domain
...@@ -19388,7 +19687,8 @@ error: ...@@ -19388,7 +19687,8 @@ error:
* Returns 0 if no image is present, 1 if an image is present, and * Returns 0 if no image is present, 1 if an image is present, and
* -1 in case of error * -1 in case of error
*/ */
int virDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags) int
virDomainHasManagedSaveImage(virDomainPtr dom, unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
...@@ -19420,6 +19720,7 @@ error: ...@@ -19420,6 +19720,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainManagedSaveRemove: * virDomainManagedSaveRemove:
* @dom: pointer to the domain * @dom: pointer to the domain
...@@ -19429,7 +19730,8 @@ error: ...@@ -19429,7 +19730,8 @@ error:
* *
* Returns 0 in case of success, and -1 in case of 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; virConnectPtr conn;
...@@ -19465,6 +19767,7 @@ error: ...@@ -19465,6 +19767,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSnapshotGetName: * virDomainSnapshotGetName:
* @snapshot: a snapshot object * @snapshot: a snapshot object
...@@ -19490,6 +19793,7 @@ virDomainSnapshotGetName(virDomainSnapshotPtr snapshot) ...@@ -19490,6 +19793,7 @@ virDomainSnapshotGetName(virDomainSnapshotPtr snapshot)
return snapshot->name; return snapshot->name;
} }
/** /**
* virDomainSnapshotGetDomain: * virDomainSnapshotGetDomain:
* @snapshot: a snapshot object * @snapshot: a snapshot object
...@@ -19519,6 +19823,7 @@ virDomainSnapshotGetDomain(virDomainSnapshotPtr snapshot) ...@@ -19519,6 +19823,7 @@ virDomainSnapshotGetDomain(virDomainSnapshotPtr snapshot)
return snapshot->domain; return snapshot->domain;
} }
/** /**
* virDomainSnapshotGetConnect: * virDomainSnapshotGetConnect:
* @snapshot: a snapshot object * @snapshot: a snapshot object
...@@ -19548,6 +19853,7 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot) ...@@ -19548,6 +19853,7 @@ virDomainSnapshotGetConnect(virDomainSnapshotPtr snapshot)
return snapshot->domain->conn; return snapshot->domain->conn;
} }
/** /**
* virDomainSnapshotCreateXML: * virDomainSnapshotCreateXML:
* @domain: a domain object * @domain: a domain object
...@@ -19707,6 +20013,7 @@ error: ...@@ -19707,6 +20013,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainSnapshotGetXMLDesc: * virDomainSnapshotGetXMLDesc:
* @snapshot: a domain snapshot object * @snapshot: a domain snapshot object
...@@ -19760,6 +20067,7 @@ error: ...@@ -19760,6 +20067,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainSnapshotNum: * virDomainSnapshotNum:
* @domain: a domain object * @domain: a domain object
...@@ -19830,6 +20138,7 @@ error: ...@@ -19830,6 +20138,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSnapshotListNames: * virDomainSnapshotListNames:
* @domain: a domain object * @domain: a domain object
...@@ -19921,6 +20230,7 @@ error: ...@@ -19921,6 +20230,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainListAllSnapshots: * virDomainListAllSnapshots:
* @domain: a domain object * @domain: a domain object
...@@ -20006,6 +20316,7 @@ error: ...@@ -20006,6 +20316,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSnapshotNumChildren: * virDomainSnapshotNumChildren:
* @snapshot: a domain snapshot object * @snapshot: a domain snapshot object
...@@ -20077,6 +20388,7 @@ error: ...@@ -20077,6 +20388,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSnapshotListChildrenNames: * virDomainSnapshotListChildrenNames:
* @snapshot: a domain snapshot object * @snapshot: a domain snapshot object
...@@ -20174,6 +20486,7 @@ error: ...@@ -20174,6 +20486,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSnapshotListAllChildren: * virDomainSnapshotListAllChildren:
* @snapshot: a domain snapshot object * @snapshot: a domain snapshot object
...@@ -20262,6 +20575,7 @@ error: ...@@ -20262,6 +20575,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSnapshotLookupByName: * virDomainSnapshotLookupByName:
* @domain: a domain object * @domain: a domain object
...@@ -20309,6 +20623,7 @@ error: ...@@ -20309,6 +20623,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainHasCurrentSnapshot: * virDomainHasCurrentSnapshot:
* @domain: pointer to the domain object * @domain: pointer to the domain object
...@@ -20348,6 +20663,7 @@ error: ...@@ -20348,6 +20663,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSnapshotCurrent: * virDomainSnapshotCurrent:
* @domain: a domain object * @domain: a domain object
...@@ -20391,6 +20707,7 @@ error: ...@@ -20391,6 +20707,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainSnapshotGetParent: * virDomainSnapshotGetParent:
* @snapshot: a snapshot object * @snapshot: a snapshot object
...@@ -20435,6 +20752,7 @@ error: ...@@ -20435,6 +20752,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virDomainSnapshotIsCurrent: * virDomainSnapshotIsCurrent:
* @snapshot: a snapshot object * @snapshot: a snapshot object
...@@ -20445,7 +20763,8 @@ error: ...@@ -20445,7 +20763,8 @@ error:
* *
* Returns 1 if current, 0 if not current, or -1 on error. * Returns 1 if current, 0 if not current, or -1 on error.
*/ */
int virDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, int
virDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot,
unsigned int flags) unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
...@@ -20477,6 +20796,7 @@ error: ...@@ -20477,6 +20796,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSnapshotHasMetadata: * virDomainSnapshotHasMetadata:
* @snapshot: a snapshot object * @snapshot: a snapshot object
...@@ -20488,7 +20808,8 @@ error: ...@@ -20488,7 +20808,8 @@ error:
* Returns 1 if the snapshot has metadata, 0 if the snapshot exists without * Returns 1 if the snapshot has metadata, 0 if the snapshot exists without
* help from libvirt, or -1 on error. * help from libvirt, or -1 on error.
*/ */
int virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, int
virDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot,
unsigned int flags) unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
...@@ -20520,6 +20841,7 @@ error: ...@@ -20520,6 +20841,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainRevertToSnapshot: * virDomainRevertToSnapshot:
* @snapshot: a domain snapshot object * @snapshot: a domain snapshot object
...@@ -20607,6 +20929,7 @@ error: ...@@ -20607,6 +20929,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSnapshotDelete: * virDomainSnapshotDelete:
* @snapshot: a domain snapshot object * @snapshot: a domain snapshot object
...@@ -20676,6 +20999,7 @@ error: ...@@ -20676,6 +20999,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSnapshotRef: * virDomainSnapshotRef:
* @snapshot: the snapshot to hold a reference on * @snapshot: the snapshot to hold a reference on
...@@ -20707,6 +21031,7 @@ virDomainSnapshotRef(virDomainSnapshotPtr snapshot) ...@@ -20707,6 +21031,7 @@ virDomainSnapshotRef(virDomainSnapshotPtr snapshot)
return 0; return 0;
} }
/** /**
* virDomainSnapshotFree: * virDomainSnapshotFree:
* @snapshot: a domain snapshot object * @snapshot: a domain snapshot object
...@@ -20733,6 +21058,7 @@ virDomainSnapshotFree(virDomainSnapshotPtr snapshot) ...@@ -20733,6 +21058,7 @@ virDomainSnapshotFree(virDomainSnapshotPtr snapshot)
return 0; return 0;
} }
/** /**
* virDomainOpenConsole: * virDomainOpenConsole:
* @dom: a domain object * @dom: a domain object
...@@ -20763,7 +21089,8 @@ virDomainSnapshotFree(virDomainSnapshotPtr snapshot) ...@@ -20763,7 +21089,8 @@ virDomainSnapshotFree(virDomainSnapshotPtr snapshot)
* *
* Returns 0 if the console was opened, -1 on error * Returns 0 if the console was opened, -1 on error
*/ */
int virDomainOpenConsole(virDomainPtr dom, int
virDomainOpenConsole(virDomainPtr dom,
const char *dev_name, const char *dev_name,
virStreamPtr st, virStreamPtr st,
unsigned int flags) unsigned int flags)
...@@ -20802,6 +21129,7 @@ error: ...@@ -20802,6 +21129,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainOpenChannel: * virDomainOpenChannel:
* @dom: a domain object * @dom: a domain object
...@@ -20824,7 +21152,8 @@ error: ...@@ -20824,7 +21152,8 @@ error:
* *
* Returns 0 if the channel was opened, -1 on error * Returns 0 if the channel was opened, -1 on error
*/ */
int virDomainOpenChannel(virDomainPtr dom, int
virDomainOpenChannel(virDomainPtr dom,
const char *name, const char *name,
virStreamPtr st, virStreamPtr st,
unsigned int flags) unsigned int flags)
...@@ -20863,6 +21192,7 @@ error: ...@@ -20863,6 +21192,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainBlockJobAbort: * virDomainBlockJobAbort:
* @dom: pointer to domain object * @dom: pointer to domain object
...@@ -20903,7 +21233,8 @@ error: ...@@ -20903,7 +21233,8 @@ error:
* *
* Returns -1 in case of failure, 0 when successful. * Returns -1 in case of failure, 0 when successful.
*/ */
int virDomainBlockJobAbort(virDomainPtr dom, const char *disk, int
virDomainBlockJobAbort(virDomainPtr dom, const char *disk,
unsigned int flags) unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
...@@ -20941,6 +21272,7 @@ error: ...@@ -20941,6 +21272,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetBlockJobInfo: * virDomainGetBlockJobInfo:
* @dom: pointer to domain object * @dom: pointer to domain object
...@@ -20960,7 +21292,8 @@ error: ...@@ -20960,7 +21292,8 @@ error:
* *
* Returns -1 in case of failure, 0 when nothing found, 1 when info was found. * Returns -1 in case of failure, 0 when nothing found, 1 when info was found.
*/ */
int virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, int
virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk,
virDomainBlockJobInfoPtr info, unsigned int flags) virDomainBlockJobInfoPtr info, unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
...@@ -20996,6 +21329,7 @@ error: ...@@ -20996,6 +21329,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainBlockJobSetSpeed: * virDomainBlockJobSetSpeed:
* @dom: pointer to domain object * @dom: pointer to domain object
...@@ -21015,7 +21349,8 @@ error: ...@@ -21015,7 +21349,8 @@ error:
* *
* Returns -1 in case of failure, 0 when successful. * Returns -1 in case of failure, 0 when successful.
*/ */
int virDomainBlockJobSetSpeed(virDomainPtr dom, const char *disk, int
virDomainBlockJobSetSpeed(virDomainPtr dom, const char *disk,
unsigned long bandwidth, unsigned int flags) unsigned long bandwidth, unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
...@@ -21054,6 +21389,7 @@ error: ...@@ -21054,6 +21389,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainBlockPull: * virDomainBlockPull:
* @dom: pointer to domain object * @dom: pointer to domain object
...@@ -21087,7 +21423,8 @@ error: ...@@ -21087,7 +21423,8 @@ error:
* *
* Returns 0 if the operation has started, -1 on failure. * Returns 0 if the operation has started, -1 on failure.
*/ */
int virDomainBlockPull(virDomainPtr dom, const char *disk, int
virDomainBlockPull(virDomainPtr dom, const char *disk,
unsigned long bandwidth, unsigned int flags) unsigned long bandwidth, unsigned int flags)
{ {
virConnectPtr conn; virConnectPtr conn;
...@@ -21205,7 +21542,8 @@ error: ...@@ -21205,7 +21542,8 @@ error:
* *
* Returns 0 if the operation has started, -1 on failure. * Returns 0 if the operation has started, -1 on failure.
*/ */
int virDomainBlockRebase(virDomainPtr dom, const char *disk, int
virDomainBlockRebase(virDomainPtr dom, const char *disk,
const char *base, unsigned long bandwidth, const char *base, unsigned long bandwidth,
unsigned int flags) unsigned int flags)
{ {
...@@ -21323,7 +21661,8 @@ error: ...@@ -21323,7 +21661,8 @@ error:
* *
* Returns 0 if the operation has started, -1 on failure. * Returns 0 if the operation has started, -1 on failure.
*/ */
int virDomainBlockCommit(virDomainPtr dom, const char *disk, int
virDomainBlockCommit(virDomainPtr dom, const char *disk,
const char *base, const char *top, const char *base, const char *top,
unsigned long bandwidth, unsigned int flags) unsigned long bandwidth, unsigned int flags)
{ {
...@@ -21389,7 +21728,8 @@ error: ...@@ -21389,7 +21728,8 @@ error:
* *
* Returns 0 on success, -1 on failure * Returns 0 on success, -1 on failure
*/ */
int virDomainOpenGraphics(virDomainPtr dom, int
virDomainOpenGraphics(virDomainPtr dom,
unsigned int idx, unsigned int idx,
int fd, int fd,
unsigned int flags) unsigned int flags)
...@@ -21474,7 +21814,8 @@ error: ...@@ -21474,7 +21814,8 @@ error:
* Returns -1 on error, 0 on success, 1 when remote party doesn't support * Returns -1 on error, 0 on success, 1 when remote party doesn't support
* keepalive messages. * keepalive messages.
*/ */
int virConnectSetKeepAlive(virConnectPtr conn, int
virConnectSetKeepAlive(virConnectPtr conn,
int interval, int interval,
unsigned int count) unsigned int count)
{ {
...@@ -21504,6 +21845,7 @@ error: ...@@ -21504,6 +21845,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectIsAlive: * virConnectIsAlive:
* @conn: pointer to the connection object * @conn: pointer to the connection object
...@@ -21515,7 +21857,8 @@ error: ...@@ -21515,7 +21857,8 @@ error:
* *
* Returns 1 if alive, 0 if dead, -1 on error * Returns 1 if alive, 0 if dead, -1 on error
*/ */
int virConnectIsAlive(virConnectPtr conn) int
virConnectIsAlive(virConnectPtr conn)
{ {
VIR_DEBUG("conn=%p", conn); VIR_DEBUG("conn=%p", conn);
...@@ -21564,7 +21907,8 @@ error: ...@@ -21564,7 +21907,8 @@ error:
* *
* Returns 0 on success, -1 on error * Returns 0 on success, -1 on error
*/ */
int virConnectRegisterCloseCallback(virConnectPtr conn, int
virConnectRegisterCloseCallback(virConnectPtr conn,
virConnectCloseFunc cb, virConnectCloseFunc cb,
void *opaque, void *opaque,
virFreeCallback freecb) virFreeCallback freecb)
...@@ -21610,6 +21954,7 @@ error: ...@@ -21610,6 +21954,7 @@ error:
return -1; return -1;
} }
/** /**
* virConnectUnregisterCloseCallback: * virConnectUnregisterCloseCallback:
* @conn: pointer to connection object * @conn: pointer to connection object
...@@ -21623,7 +21968,8 @@ error: ...@@ -21623,7 +21968,8 @@ error:
* *
* Returns 0 on success, -1 on error * Returns 0 on success, -1 on error
*/ */
int virConnectUnregisterCloseCallback(virConnectPtr conn, int
virConnectUnregisterCloseCallback(virConnectPtr conn,
virConnectCloseFunc cb) virConnectCloseFunc cb)
{ {
VIR_DEBUG("conn=%p", conn); VIR_DEBUG("conn=%p", conn);
...@@ -21665,6 +22011,7 @@ error: ...@@ -21665,6 +22011,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainSetBlockIoTune: * virDomainSetBlockIoTune:
* @dom: pointer to domain object * @dom: pointer to domain object
...@@ -21685,7 +22032,8 @@ error: ...@@ -21685,7 +22032,8 @@ error:
* *
* Returns -1 in case of error, 0 in case of success. * Returns -1 in case of error, 0 in case of success.
*/ */
int virDomainSetBlockIoTune(virDomainPtr dom, int
virDomainSetBlockIoTune(virDomainPtr dom,
const char *disk, const char *disk,
virTypedParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
...@@ -21734,6 +22082,7 @@ error: ...@@ -21734,6 +22082,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetBlockIoTune: * virDomainGetBlockIoTune:
* @dom: pointer to domain object * @dom: pointer to domain object
...@@ -21767,7 +22116,8 @@ error: ...@@ -21767,7 +22116,8 @@ error:
* *
* Returns -1 in case of error, 0 in case of success. * Returns -1 in case of error, 0 in case of success.
*/ */
int virDomainGetBlockIoTune(virDomainPtr dom, int
virDomainGetBlockIoTune(virDomainPtr dom,
const char *disk, const char *disk,
virTypedParameterPtr params, virTypedParameterPtr params,
int *nparams, int *nparams,
...@@ -21822,6 +22172,7 @@ error: ...@@ -21822,6 +22172,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetCPUStats: * virDomainGetCPUStats:
* @domain: domain to query * @domain: domain to query
...@@ -21896,7 +22247,8 @@ error: ...@@ -21896,7 +22247,8 @@ error:
* @ncpus is too large). The caller is responsible for freeing any * @ncpus is too large). The caller is responsible for freeing any
* returned string parameters. * returned string parameters.
*/ */
int virDomainGetCPUStats(virDomainPtr domain, int
virDomainGetCPUStats(virDomainPtr domain,
virTypedParameterPtr params, virTypedParameterPtr params,
unsigned int nparams, unsigned int nparams,
int start_cpu, int start_cpu,
...@@ -21967,6 +22319,7 @@ error: ...@@ -21967,6 +22319,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetDiskErrors: * virDomainGetDiskErrors:
* @dom: a domain object * @dom: a domain object
...@@ -22032,6 +22385,7 @@ error: ...@@ -22032,6 +22385,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainGetHostname: * virDomainGetHostname:
* @domain: a domain object * @domain: a domain object
...@@ -22077,6 +22431,7 @@ error: ...@@ -22077,6 +22431,7 @@ error:
return NULL; return NULL;
} }
/** /**
* virNodeGetCPUMap: * virNodeGetCPUMap:
* @conn: pointer to the hypervisor connection * @conn: pointer to the hypervisor connection
...@@ -22128,6 +22483,7 @@ error: ...@@ -22128,6 +22483,7 @@ error:
return -1; return -1;
} }
/** /**
* virDomainFSTrim: * virDomainFSTrim:
* @dom: a domain object * @dom: a domain object
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册