- Devel - libvirt List Archives

[libvirt] How to differentiate creation from migration?
by Richard Maciel 16 Mar '10

16 Mar '10

Hi, I work on a project that makes use of libvirt (called libvirt-cim) and we created an algorithm to detect when a new machine is created. However, I need to filter the ones created by the migration operation. Does libvirt provides a way to distinguish a machine created by 'migrate' command from a machine created by the 'define' command (virDomainDefineXML API call)? Thanks in advance, Richard Maciel

3 2

[libvirt] libvirt regression in managing qemu-system-arm
by Chris Tyler 16 Mar '10

16 Mar '10

I've been experimenting with using libvirt to manage qemu-system-arm VMs, and it's working fine in F12. However, in F13Alpha, the wrong arguments are passed to the emulator -- I suspect that the x86 platform versions of qemu accept new argument formats, and qemu-system-arm hasn't been updated. The versions in F13alpha are qemu-system-arm 0.12.3 and libvirt 0.7.6. Could this be reverted, or the old code conditionally invoked? Sample ARM root filesystem, domain XML, and kernel are located at http://cdot.senecac.on.ca/arm -- as well as a wrapper script for /usr/bin/qemu-system-arm that edits the command-line arguments. Thanks for considering this-- -Chris

2 1

[libvirt] [PATCH] esx: Improve documentation about remote URIs
by Matthias Bolte 16 Mar '10

16 Mar '10

--- docs/drvesx.html.in | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 9b413ab..6855298 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -32,6 +32,14 @@ gsx://example.com (GSX over HTTPS) esx://example.com/?transport=http (ESX over HTTP) esx://example.com/?no_verify=1 (ESX over HTTPS, but doesn't verify the server's SSL certificate) </pre> + <p> + <strong>Note</strong>: In contrast to other drivers, the ESX driver is + a client-side-only driver. That means you cannot use the + <a href="remote.html">remote transport mechanism</a> provided by the + remote driver and libvirtd. Instead the ESX driver communicates to the + ESX server using HTTP(S). Therefore, you cannot use URIs like + <code>esx+ssh://example.com</code>. + </p> <h3><a name="uriformat">URI Format</a></h3> -- 1.6.3.3

3 3

[libvirt] [PATCH] phyp: Use virRequestUsername and virRequestPassword
by Matthias Bolte 16 Mar '10

16 Mar '10

--- src/phyp/phyp_driver.c | 73 ++++++++++++++++++++--------------------------- src/phyp/phyp_driver.h | 1 - 2 files changed, 31 insertions(+), 43 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 32c0a7a..9598162 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -102,12 +102,6 @@ phypOpen(virConnectPtr conn, return VIR_DRV_OPEN_ERROR; } - if (conn->uri->user == NULL) { - PHYP_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("Missing username in phyp:// URI")); - return VIR_DRV_OPEN_ERROR; - } - if (VIR_ALLOC(phyp_driver) < 0) { virReportOOMError(); goto failure; @@ -160,9 +154,8 @@ phypOpen(virConnectPtr conn, "%s", _("Error while opening SSH session.")); goto failure; } - //conn->uri->path = string; + connection_data->session = session; - connection_data->auth = auth; uuid_table->nlpars = 0; uuid_table->lpars = NULL; @@ -245,8 +238,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, { LIBSSH2_SESSION *session; const char *hostname = conn->uri->server; - const char *username = conn->uri->user; - const char *password = NULL; + char *username = NULL; + char *password = NULL; int sock; int rc; struct addrinfo *ai = NULL, *cur; @@ -270,6 +263,28 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, goto err; } + if (conn->uri->user != NULL) { + username = strdup(conn->uri->user); + + if (username == NULL) { + virReportOOMError(); + goto err; + } + } else { + if (auth == NULL || auth->cb == NULL) { + PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, + "%s", _("No authentication callback provided.")); + goto err; + } + + username = virRequestUsername(auth, NULL, conn->uri->server); + + if (username == NULL) { + PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, "Username request failed"); + goto err; + } + } + memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_ADDRCONFIG | AI_NUMERICSERV; hints.ai_socktype = SOCK_STREAM; @@ -336,44 +351,16 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, if (rc == LIBSSH2_ERROR_SOCKET_NONE || rc == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED || rc == LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED) { - int i; - int hasPassphrase = 0; - - virConnectCredential creds[] = { - {VIR_CRED_PASSPHRASE, "password", "Password", NULL, NULL, 0}, - }; - - if (!auth || !auth->cb) { + if (auth == NULL || auth->cb == NULL) { PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, "%s", _("No authentication callback provided.")); goto disconnect; } - for (i = 0; i < auth->ncredtype; i++) { - if (auth->credtype[i] == VIR_CRED_PASSPHRASE) - hasPassphrase = 1; - } + password = virRequestPassword(auth, username, conn->uri->server); - if (!hasPassphrase) { - PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - "%s", _("Required credentials are not supported.")); - goto disconnect; - } - - int res = - (auth->cb) (creds, ARRAY_CARDINALITY(creds), auth->cbdata); - - if (res < 0) { - PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - "%s", _("Unable to fetch credentials.")); - goto disconnect; - } - - if (creds[0].result) { - password = creds[0].result; - } else { - PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, - "%s", _("Unable to get password certificates")); + if (password == NULL) { + PHYP_ERROR(conn, VIR_ERR_AUTH_FAILED, "Password request failed"); goto disconnect; } @@ -404,6 +391,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, VIR_FREE(userhome); VIR_FREE(pubkey); VIR_FREE(pvtkey); + VIR_FREE(username); VIR_FREE(password); return NULL; @@ -411,6 +399,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, VIR_FREE(userhome); VIR_FREE(pubkey); VIR_FREE(pvtkey); + VIR_FREE(username); VIR_FREE(password); return session; } diff --git a/src/phyp/phyp_driver.h b/src/phyp/phyp_driver.h index d05f184..f680994 100644 --- a/src/phyp/phyp_driver.h +++ b/src/phyp/phyp_driver.h @@ -35,7 +35,6 @@ typedef struct _ConnectionData ConnectionData; typedef ConnectionData *ConnectionDataPtr; struct _ConnectionData { LIBSSH2_SESSION *session; - virConnectAuthPtr auth; int sock; }; -- 1.6.3.3

2 1

[libvirt] [PATCH] xenapi: Don't leak url and caps in case of error
by Matthias Bolte 16 Mar '10

16 Mar '10

--- src/xenapi/xenapi_driver.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 9a38e3f..7d0b748 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -172,9 +172,12 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUS VIR_FREE(password); if (privP != NULL) { + virCapabilitiesFree(privP->caps); + if (privP->session != NULL) xenSessionFree(privP->session); + VIR_FREE(privP->url); VIR_FREE(privP); } -- 1.6.3.3

2 1

[libvirt] [PATCH] xenapi: Check for NULL before accessing the scheme
by Matthias Bolte 16 Mar '10

16 Mar '10

--- src/xenapi/xenapi_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 00b62b3..9a38e3f 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -87,7 +87,8 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUS char *password = NULL; struct _xenapiPrivate *privP = NULL; - if (STRCASENEQ(conn->uri->scheme, "XenAPI")) { + if (conn->uri == NULL || conn->uri->scheme == NULL || + STRCASENEQ(conn->uri->scheme, "XenAPI")) { return VIR_DRV_OPEN_DECLINED; } -- 1.6.3.3

2 1

[libvirt] [PATCH] xenapi: Request a username if there is non in the URI
by Matthias Bolte 16 Mar '10

16 Mar '10

Use virRequestUsername and virRequestPassword. --- src/xenapi/xenapi_driver.c | 119 +++++++++++++++++++++++++++++++------------- 1 files changed, 84 insertions(+), 35 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 8d5c8bb..00b62b3 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -83,62 +83,101 @@ getCapsObject (void) static virDrvOpenStatus xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) { - char *passwd = NULL; - xen_session *session; - struct _xenapiPrivate *privP; + char *username = NULL; + char *password = NULL; + struct _xenapiPrivate *privP = NULL; if (STRCASENEQ(conn->uri->scheme, "XenAPI")) { return VIR_DRV_OPEN_DECLINED; } + if (conn->uri->server == NULL) { - xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, "Server name not in URI"); - return VIR_DRV_OPEN_ERROR; + xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, + "Server name not in URI"); + goto error; + } + + if (auth == NULL) { + xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, + "Authentication Credentials not found"); + goto error; } - if (auth) { - passwd = xenapiUtil_RequestPassword(auth, conn->uri->user, conn->uri->server); + + if (conn->uri->user != NULL) { + username = strdup(conn->uri->user); + + if (username == NULL) { + virReportOOMError(); + goto error; + } } else { - xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, "Authentication Credentials not found"); - return VIR_DRV_OPEN_ERROR; + username = virRequestUsername(auth, NULL, conn->uri->server); + + if (username == NULL) { + xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, + "Username request failed"); + goto error; + } } - if (!passwd || !conn->uri->user) { - xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, "Username/Password not valid"); - if (passwd) VIR_FREE(passwd); - return VIR_DRV_OPEN_ERROR; + + password = virRequestPassword(auth, username, conn->uri->server); + + if (password == NULL) { + xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, + "Password request failed"); + goto error; } + if (VIR_ALLOC(privP) < 0) { virReportOOMError(); - return VIR_DRV_OPEN_ERROR; + goto error; } + if (virAsprintf(&privP->url, "https://%s", conn->uri->server) < 0) { virReportOOMError(); - VIR_FREE(passwd); - return VIR_DRV_OPEN_ERROR; + goto error; } - xenapiUtil_ParseQuery(conn, conn->uri, &privP->noVerify); + + if (xenapiUtil_ParseQuery(conn, conn->uri, &privP->noVerify) < 0) + goto error; + + if (!(privP->caps = getCapsObject())) { + xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, + "Capabilities not found"); + goto error; + } + xmlInitParser(); xmlKeepBlanksDefault(0); xen_init(); curl_global_init(CURL_GLOBAL_ALL); - session = xen_session_login_with_password(call_func, privP, conn->uri->user, passwd, xen_api_latest_version); + privP->session = xen_session_login_with_password(call_func, privP, username, + password, xen_api_latest_version); - if (session && session->ok) { - privP->session = session; - if (!(privP->caps = getCapsObject())) { - xenapiSessionErrorHandler(conn, VIR_ERR_INTERNAL_ERROR, "Capabilities not found"); - VIR_FREE(passwd); - return VIR_DRV_OPEN_ERROR; - } + if (privP->session != NULL && privP->session->ok) { conn->privateData = privP; - VIR_FREE(passwd); + + VIR_FREE(username); + VIR_FREE(password); + return VIR_DRV_OPEN_SUCCESS; - } else { - xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, ""); - if (session) xenSessionFree(session); + } + + xenapiSessionErrorHandler(conn, VIR_ERR_AUTH_FAILED, ""); + + error: + VIR_FREE(username); + VIR_FREE(password); + + if (privP != NULL) { + if (privP->session != NULL) + xenSessionFree(privP->session); + VIR_FREE(privP); - VIR_FREE(passwd); - return VIR_DRV_OPEN_ERROR; } + + return VIR_DRV_OPEN_ERROR; } /* @@ -150,10 +189,20 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUS static int xenapiClose (virConnectPtr conn) { - xen_session_logout(((struct _xenapiPrivate *)(conn->privateData))->session); - virCapabilitiesFree(((struct _xenapiPrivate *)(conn->privateData))->caps); - VIR_FREE(((struct _xenapiPrivate *)(conn->privateData))->url); - VIR_FREE(conn->privateData); + struct _xenapiPrivate *priv = conn->privateData; + + virCapabilitiesFree(priv->caps); + + if (priv->session != NULL) { + xen_session_logout(priv->session); + xenSessionFree(priv->session); + } + + VIR_FREE(priv->url); + VIR_FREE(priv); + + conn->privateData = NULL; + return 0; } -- 1.6.3.3

2 1

[libvirt] [PATCH] xenapi: Check for valid private data in xenapiSessionErrorHandle
by Matthias Bolte 16 Mar '10

16 Mar '10

--- src/xenapi/xenapi_utils.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 4b9a6d8..bfd53ed 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -374,12 +374,12 @@ xenapiSessionErrorHandle(virConnectPtr conn, virErrorNumber errNum, const char *buf, const char *filename, const char *func, size_t lineno) { - xen_session *session = ((struct _xenapiPrivate *)(conn->privateData))->session; + struct _xenapiPrivate *priv = conn->privateData; - if (buf == NULL) { - char *ret = returnErrorFromSession(session); + if (buf == NULL && priv != NULL && priv->session != NULL) { + char *ret = returnErrorFromSession(priv->session); virReportErrorHelper(conn, VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), ret); - xen_session_clear_error(session); + xen_session_clear_error(priv->session); VIR_FREE(ret); } else { virReportErrorHelper(conn, VIR_FROM_XENAPI, errNum, filename, func, lineno, _("%s"), buf); -- 1.6.3.3

2 1

[libvirt] [PATCH] esx: Move username and password helper functions to util.c
by Matthias Bolte 16 Mar '10

16 Mar '10

--- src/esx/esx_driver.c | 8 ++-- src/esx/esx_util.c | 83 ---------------------------------------------- src/esx/esx_util.h | 7 ---- src/util/util.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/util/util.h | 5 +++ 5 files changed, 98 insertions(+), 94 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index c47af1c..3f8b900 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -354,7 +354,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) goto failure; } } else { - username = esxUtil_RequestUsername(auth, "root", conn->uri->server); + username = virRequestUsername(auth, "root", conn->uri->server); if (username == NULL) { ESX_ERROR(VIR_ERR_AUTH_FAILED, "Username request failed"); @@ -366,7 +366,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) goto failure; } - password = esxUtil_RequestPassword(auth, username, conn->uri->server); + password = virRequestPassword(auth, username, conn->uri->server); if (password == NULL) { ESX_ERROR(VIR_ERR_AUTH_FAILED, "Password request failed"); @@ -491,14 +491,14 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) goto failure; } - username = esxUtil_RequestUsername(auth, "administrator", vCenter); + username = virRequestUsername(auth, "administrator", vCenter); if (username == NULL) { ESX_ERROR(VIR_ERR_AUTH_FAILED, "Username request failed"); goto failure; } - password = esxUtil_RequestPassword(auth, username, vCenter); + password = virRequestPassword(auth, username, vCenter); if (password == NULL) { ESX_ERROR(VIR_ERR_AUTH_FAILED, "Password request failed"); diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index dcbd86c..3cbd2b1 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -49,89 +49,6 @@ -char * -esxUtil_RequestUsername(virConnectAuthPtr auth, const char *defaultUsername, - const char *hostname) -{ - unsigned int ncred; - virConnectCredential cred; - char *prompt = NULL; - - memset(&cred, 0, sizeof(virConnectCredential)); - - if (virAsprintf(&prompt, "Enter username for %s [%s]", hostname, - defaultUsername) < 0) { - return NULL; - } - - for (ncred = 0; ncred < auth->ncredtype; ncred++) { - if (auth->credtype[ncred] != VIR_CRED_AUTHNAME) { - continue; - } - - cred.type = VIR_CRED_AUTHNAME; - cred.prompt = prompt; - cred.challenge = hostname; - cred.defresult = defaultUsername; - cred.result = NULL; - cred.resultlen = 0; - - if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) { - VIR_FREE(cred.result); - } - - break; - } - - VIR_FREE(prompt); - - return cred.result; -} - - - -char * -esxUtil_RequestPassword(virConnectAuthPtr auth, const char *username, - const char *hostname) -{ - unsigned int ncred; - virConnectCredential cred; - char *prompt; - - memset(&cred, 0, sizeof(virConnectCredential)); - - if (virAsprintf(&prompt, "Enter %s password for %s", username, - hostname) < 0) { - return NULL; - } - - for (ncred = 0; ncred < auth->ncredtype; ncred++) { - if (auth->credtype[ncred] != VIR_CRED_PASSPHRASE && - auth->credtype[ncred] != VIR_CRED_NOECHOPROMPT) { - continue; - } - - cred.type = auth->credtype[ncred]; - cred.prompt = prompt; - cred.challenge = hostname; - cred.defresult = NULL; - cred.result = NULL; - cred.resultlen = 0; - - if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) { - VIR_FREE(cred.result); - } - - break; - } - - VIR_FREE(prompt); - - return cred.result; -} - - - int esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, int *noVerify, int *autoAnswer) diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index b5cb419..f4f971c 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -28,13 +28,6 @@ # include "internal.h" # include "conf.h" -char *esxUtil_RequestUsername(virConnectAuthPtr auth, - const char *defaultUsername, - const char *hostname); - -char *esxUtil_RequestPassword(virConnectAuthPtr auth, const char *username, - const char *hostname); - int esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, int *noVerify, int *autoAnswer); diff --git a/src/util/util.c b/src/util/util.c index 87b0714..4292f01 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2676,3 +2676,92 @@ int virBuildPathInternal(char **path, ...) return ret; } + + + +char * +virRequestUsername(virConnectAuthPtr auth, const char *defaultUsername, + const char *hostname) +{ + unsigned int ncred; + virConnectCredential cred; + char *prompt; + + memset(&cred, 0, sizeof (virConnectCredential)); + + if (defaultUsername != NULL) { + if (virAsprintf(&prompt, _("Enter username for %s [%s]"), hostname, + defaultUsername) < 0) { + return NULL; + } + } else { + if (virAsprintf(&prompt, _("Enter username for %s"), hostname) < 0) { + return NULL; + } + } + + for (ncred = 0; ncred < auth->ncredtype; ncred++) { + if (auth->credtype[ncred] != VIR_CRED_AUTHNAME) { + continue; + } + + cred.type = VIR_CRED_AUTHNAME; + cred.prompt = prompt; + cred.challenge = hostname; + cred.defresult = defaultUsername; + cred.result = NULL; + cred.resultlen = 0; + + if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) { + VIR_FREE(cred.result); + } + + break; + } + + VIR_FREE(prompt); + + return cred.result; +} + + + +char * +virRequestPassword(virConnectAuthPtr auth, const char *username, + const char *hostname) +{ + unsigned int ncred; + virConnectCredential cred; + char *prompt; + + memset(&cred, 0, sizeof (virConnectCredential)); + + if (virAsprintf(&prompt, _("Enter %s password for %s"), username, + hostname) < 0) { + return NULL; + } + + for (ncred = 0; ncred < auth->ncredtype; ncred++) { + if (auth->credtype[ncred] != VIR_CRED_PASSPHRASE && + auth->credtype[ncred] != VIR_CRED_NOECHOPROMPT) { + continue; + } + + cred.type = auth->credtype[ncred]; + cred.prompt = prompt; + cred.challenge = hostname; + cred.defresult = NULL; + cred.result = NULL; + cred.resultlen = 0; + + if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) { + VIR_FREE(cred.result); + } + + break; + } + + VIR_FREE(prompt); + + return cred.result; +} diff --git a/src/util/util.h b/src/util/util.h index e8fc565..9796e0a 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -268,4 +268,9 @@ void virFileWaitForDevices(void); # define virBuildPath(path, ...) virBuildPathInternal(path, __VA_ARGS__, NULL) int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL; +char *virRequestUsername(virConnectAuthPtr auth, const char *defaultUsername, + const char *hostname); +char *virRequestPassword(virConnectAuthPtr auth, const char *username, + const char *hostname); + #endif /* __VIR_UTIL_H__ */ -- 1.6.3.3

2 4

[libvirt] [PATCH] Fix syntax-check errors
by Jiri Denemark 15 Mar '10

15 Mar '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/nodeinfo.c | 4 ++-- src/xenapi/xenapi_driver.c | 27 ++++++++++++++--------------- src/xenapi/xenapi_utils.c | 4 ++-- 3 files changed, 17 insertions(+), 18 deletions(-) Actually, one more error is reported by syntax-check, but it's already fixed in "xenapi: Request a username if there is non in the URI" patch sent by Matthias yesterday: src/xenapi/xenapi_driver.c: if (passwd) VIR_FREE(passwd) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index bf57517..4858e71 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -162,10 +162,10 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo, nodeinfo->cores = 1; nodeinfo->nodes = 1; -#if HAVE_NUMACTL +# if HAVE_NUMACTL if (numa_available() >= 0) nodeinfo->nodes = numa_max_node() + 1; -#endif +# endif /* NB: It is impossible to fill our nodes, since cpuinfo * has no knowledge of NUMA nodes */ diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 8d5c8bb..ad77068 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -1716,11 +1716,11 @@ write_func(void *ptr, size_t size, size_t nmemb, void *comms_) { xen_comms *comms = comms_; size_t n = size * nmemb; - #ifdef PRINT_XML - printf("\n\n---Result from server -----------------------\n"); - printf("%s\n",((char*) ptr)); - fflush(stdout); - #endif +#ifdef PRINT_XML + printf("\n\n---Result from server -----------------------\n"); + printf("%s\n",((char*) ptr)); + fflush(stdout); +#endif return (size_t) (comms->func(ptr, n, comms->handle) ? n : 0); } @@ -1734,12 +1734,11 @@ call_func(const void *data, size_t len, void *user_handle, { //(void)user_handle; struct _xenapiPrivate *priv = (struct _xenapiPrivate *)user_handle; - #ifdef PRINT_XML - - printf("\n\n---Data to server: -----------------------\n"); - printf("%s\n",((char*) data)); - fflush(stdout); - #endif +#ifdef PRINT_XML + printf("\n\n---Data to server: -----------------------\n"); + printf("%s\n",((char*) data)); + fflush(stdout); +#endif CURL *curl = curl_easy_init(); if (!curl) { return -1; @@ -1750,9 +1749,9 @@ call_func(const void *data, size_t len, void *user_handle, }; curl_easy_setopt(curl, CURLOPT_URL, priv->url); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1); - #ifdef CURLOPT_MUTE - curl_easy_setopt(curl, CURLOPT_MUTE, 1); - #endif +#ifdef CURLOPT_MUTE + curl_easy_setopt(curl, CURLOPT_MUTE, 1); +#endif curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, &write_func); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &comms); curl_easy_setopt(curl, CURLOPT_POST, 1); diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 4b9a6d8..59edbf3 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -548,7 +548,7 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr def, char macStr[VIR_MAC_STRING_BUFLEN]; virFormatMacAddr(def->nets[i]->mac, macStr); if (!(mac = strdup(macStr))) { - if (bridge) VIR_FREE(bridge); + VIR_FREE(bridge); goto error_cleanup; } } @@ -559,7 +559,7 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr def, VIR_FREE(bridge); device_number++; } - if (bridge) VIR_FREE(bridge); + VIR_FREE(bridge); } } return 0; -- 1.7.0.2

2 2