- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: fixed trivial comment and debug message in vshCommandOptVolBy function
by Justin Clift 09 Jun '10

09 Jun '10

--- tools/virsh.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index e444501..2e8cbec 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -9411,17 +9411,19 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, if (name) *name = n; - /* try it by PATH */ + /* try it by name */ if (pool && (flag & VSH_BYNAME)) { - vshDebug(ctl, 5, "%s: <%s> trying as vol UUID\n", + vshDebug(ctl, 5, "%s: <%s> trying as vol name\n", cmd->def->name, optname); vol = virStorageVolLookupByName(pool, n); } + /* try it by key */ if (vol == NULL && (flag & VSH_BYUUID)) { vshDebug(ctl, 5, "%s: <%s> trying as vol key\n", cmd->def->name, optname); vol = virStorageVolLookupByKey(ctl->conn, n); } + /* try it by path */ if (vol == NULL && (flag & VSH_BYUUID)) { vshDebug(ctl, 5, "%s: <%s> trying as vol path\n", cmd->def->name, optname); -- 1.7.0.1

2 1

[libvirt] [PATCH] virsh: remove xen reference in header comment v2
by Justin Clift 09 Jun '10

09 Jun '10

With libvirt and virsh now being used for much more than Xen, this patch removes the outdated reference to Xen in the file header. --- Also changed the commit message to be all lower case, as previously mentioned by Eric. ;) tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1279f41..e444501 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1,5 +1,5 @@ /* - * virsh.c: a Xen shell used to exercise the libvirt API + * virsh.c: a shell to exercise the libvirt API * * Copyright (C) 2005, 2007-2010 Red Hat, Inc. * -- 1.7.0.1

2 1

[libvirt] [PATCH] esx: Add proxy query parameter
by Matthias Bolte 09 Jun '10

09 Jun '10

Allow to specify a proxy to be used by libcurl. --- docs/drvesx.html.in | 20 ++++++++++++++++- src/esx/esx_driver.c | 12 +++++++--- src/esx/esx_util.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/esx/esx_util.h | 4 +++ src/esx/esx_vi.c | 17 ++++++++++++-- src/esx/esx_vi.h | 4 ++- 6 files changed, 105 insertions(+), 9 deletions(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index d454904..3c48c77 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -116,7 +116,25 @@ type://[username@]hostname[:port]/[?extraparameters] If set to 1, the driver answers all <a href="#questions">questions</a> with the default answer. If set to 0, questions are reported as errors. The default - value it 0. + value it 0. <span class="since">Since 0.7.5</span>. + </td> + </tr> + <tr> + <td> + <code>proxy</code> + </td> + <td> + <code>[type://]hostname[:port]</code> + </td> + <td> + Allows to specify a proxy for HTTP and HTTPS communication. + <span class="since">Since 0.8.2</span>. + The optional <code>type</code> part may be one of: + <code>http</code>, <code>socks</code>, <code>socks4</code>, + <code>socks4a</code> or <code>socks5</code>. The default is + <code>http</code> and <code>socks</code> is synonymous for + <code>socks5</code>. The optional <code>port</code> allows to + override the default port 1080. </td> </tr> </table> diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 0c12a31..3854f85 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -279,7 +279,7 @@ esxCapsInit(esxPrivate *priv) /* - * URI format: {esx|gsx}://[<user>@]<server>[:<port>]/[<query parameter> ...] + * URI format: {esx|gsx}://[<username>@]<hostname>[:<port>]/[<query parameter> ...] * * If no port is specified the default port is set dependent on the scheme and * transport parameter: @@ -293,6 +293,7 @@ esxCapsInit(esxPrivate *priv) * - vcenter={<vcenter>|*} * - no_verify={0|1} * - auto_answer={0|1} + * - proxy=[{http|socks|socks4|socks4a|socks5}://]<hostname>[:<port>] * * If no transport parameter is specified https is used. * @@ -308,6 +309,10 @@ esxCapsInit(esxPrivate *priv) * If the auto_answer parameter is set to 1, the driver will respond to all * virtual machine questions with the default answer, otherwise virtual machine * questions will be reported as errors. The default value it 0. + * + * The proxy parameter allows to specify a proxy for to be used by libcurl. + * The default for the optional <type> part is http and socks is synonymous for + * socks5. The optional <port> part allows to override the default port 1080. */ static virDrvOpenStatus esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) @@ -421,7 +426,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) if (esxVI_Context_Alloc(&priv->host) < 0 || esxVI_Context_Connect(priv->host, url, hostIpAddress, username, - password, parsedQuery->noVerify) < 0) { + password, parsedQuery) < 0) { goto cleanup; } @@ -554,8 +559,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } if (esxVI_Context_Connect(priv->vCenter, url, vCenterIpAddress, - username, password, - parsedQuery->noVerify) < 0) { + username, password, parsedQuery) < 0) { goto cleanup; } diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index dba9bc3..27c3a12 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -49,6 +49,7 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) int i; int noVerify; int autoAnswer; + char *tmp; if (parsedQuery == NULL || *parsedQuery != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); @@ -120,6 +121,61 @@ esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) } (*parsedQuery)->autoAnswer = autoAnswer != 0; + } else if (STRCASEEQ(queryParam->name, "proxy")) { + /* Expected format: [<type>://]<hostname>[:<port>] */ + (*parsedQuery)->proxy = true; + (*parsedQuery)->proxy_type = CURLPROXY_HTTP; + VIR_FREE((*parsedQuery)->proxy_hostname); + (*parsedQuery)->proxy_port = 1080; + + if ((tmp = STRSKIP(queryParam->value, "http://")) != NULL) { + (*parsedQuery)->proxy_type = CURLPROXY_HTTP; + } else if ((tmp = STRSKIP(queryParam->value, "socks://")) != NULL || + (tmp = STRSKIP(queryParam->value, "socks5://")) != NULL) { + (*parsedQuery)->proxy_type = CURLPROXY_SOCKS5; + } else if ((tmp = STRSKIP(queryParam->value, "socks4://")) != NULL) { + (*parsedQuery)->proxy_type = CURLPROXY_SOCKS4; + } else if ((tmp = STRSKIP(queryParam->value, "socks4a://")) != NULL) { + (*parsedQuery)->proxy_type = CURLPROXY_SOCKS4A; + } else if ((tmp = strstr(queryParam->value, "://")) != NULL) { + *tmp = '\0'; + + ESX_ERROR(VIR_ERR_INVALID_ARG, + _("Query parameter 'proxy' contains unexpected " + "type '%s' (should be (http|socks(|4|4a|5))"), + queryParam->value); + goto cleanup; + } else { + tmp = queryParam->value; + } + + (*parsedQuery)->proxy_hostname = strdup(tmp); + + if ((*parsedQuery)->proxy_hostname == NULL) { + virReportOOMError(); + goto cleanup; + } + + if ((tmp = strchr((*parsedQuery)->proxy_hostname, ':')) != NULL) { + if (tmp == (*parsedQuery)->proxy_hostname) { + ESX_ERROR(VIR_ERR_INVALID_ARG, "%s", + _("Query parameter 'proxy' doesn't contain a " + "hostname")); + goto cleanup; + } + + *tmp++ = '\0'; + + if (virStrToLong_i(tmp, NULL, 10, + &(*parsedQuery)->proxy_port) < 0 || + (*parsedQuery)->proxy_port < 1 || + (*parsedQuery)->proxy_port > 65535) { + ESX_ERROR(VIR_ERR_INVALID_ARG, + _("Query parameter 'proxy' has unexpected port" + "value '%s' (should be [1..65535])"), tmp); + goto cleanup; + } + } } else { VIR_WARN("Ignoring unexpected query parameter '%s'", queryParam->name); @@ -161,6 +217,7 @@ esxUtil_FreeParsedQuery(esxUtil_ParsedQuery **parsedQuery) VIR_FREE((*parsedQuery)->transport); VIR_FREE((*parsedQuery)->vCenter); + VIR_FREE((*parsedQuery)->proxy_hostname); VIR_FREE(*parsedQuery); } diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index ae6e38b..26c456d 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -36,6 +36,10 @@ struct _esxUtil_ParsedQuery { char *vCenter; bool noVerify; bool autoAnswer; + bool proxy; + int proxy_type; + char *proxy_hostname; + int proxy_port; }; int esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 4332f2b..8c43d67 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -277,7 +277,7 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) int esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, - const char *password, bool noVerify) + const char *password, esxUtil_ParsedQuery *parsedQuery) { int result = -1; esxVI_String *propertyNameList = NULL; @@ -328,8 +328,10 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_USERAGENT, "libvirt-esx"); curl_easy_setopt(ctx->curl_handle, CURLOPT_HEADER, 0); curl_easy_setopt(ctx->curl_handle, CURLOPT_FOLLOWLOCATION, 0); - curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYPEER, noVerify ? 0 : 1); - curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYHOST, noVerify ? 0 : 2); + curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYPEER, + parsedQuery->noVerify ? 0 : 1); + curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYHOST, + parsedQuery->noVerify ? 0 : 2); curl_easy_setopt(ctx->curl_handle, CURLOPT_COOKIEFILE, ""); curl_easy_setopt(ctx->curl_handle, CURLOPT_HTTPHEADER, ctx->curl_headers); curl_easy_setopt(ctx->curl_handle, CURLOPT_READFUNCTION, @@ -343,6 +345,15 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_VERBOSE, 1); #endif + if (parsedQuery->proxy) { + curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXY, + parsedQuery->proxy_hostname); + curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXYTYPE, + parsedQuery->proxy_type); + curl_easy_setopt(ctx->curl_handle, CURLOPT_PROXYPORT, + parsedQuery->proxy_port); + } + if (virMutexInit(&ctx->curl_lock) < 0) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not initialize CURL mutex")); diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 521be0c..f5e89e9 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -31,6 +31,7 @@ # include "virterror_internal.h" # include "datatypes.h" # include "esx_vi_types.h" +# include "esx_util.h" @@ -161,7 +162,8 @@ int esxVI_Context_Alloc(esxVI_Context **ctx); void esxVI_Context_Free(esxVI_Context **ctx); int esxVI_Context_Connect(esxVI_Context *ctx, const char *ipAddress, const char *url, const char *username, - const char *password, bool noVerify); + const char *password, + esxUtil_ParsedQuery *parsedQuery); int esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url, char **content); int esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url, -- 1.7.0.4

2 2

[libvirt] [PATCH] esx: Refactor esxUtil_ParseQuery's parameter handling
by Matthias Bolte 09 Jun '10

09 Jun '10

Pass a struct containing the parameters instead of passing each one individually. This make future extensions a bit simpler. --- src/esx/esx_driver.c | 44 ++++++++++----------- src/esx/esx_util.c | 100 +++++++++++++++++++++++++------------------------- src/esx/esx_util.h | 15 ++++++- src/esx/esx_vi.c | 2 +- src/esx/esx_vi.h | 2 +- 5 files changed, 86 insertions(+), 77 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 7257d6a..0c12a31 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -314,12 +314,11 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) { virDrvOpenStatus result = VIR_DRV_OPEN_ERROR; esxPrivate *priv = NULL; + esxUtil_ParsedQuery *parsedQuery = NULL; char hostIpAddress[NI_MAXHOST] = ""; char vCenterIpAddress[NI_MAXHOST] = ""; char *url = NULL; char *vCenter = NULL; - int noVerify = 0; // boolean - int autoAnswer = 0; // boolean char *username = NULL; char *password = NULL; esxVI_String *propertyNameList = NULL; @@ -349,21 +348,20 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) goto cleanup; } + if (esxUtil_ParseQuery(&parsedQuery, conn->uri) < 0) { + goto cleanup; + } + + priv->transport = parsedQuery->transport; + parsedQuery->transport = NULL; + priv->maxVcpus = -1; priv->supportsVMotion = esxVI_Boolean_Undefined; priv->supportsLongMode = esxVI_Boolean_Undefined; - priv->autoAnswer = esxVI_Boolean_False; + priv->autoAnswer = parsedQuery->autoAnswer ? esxVI_Boolean_True + : esxVI_Boolean_False; priv->usedCpuTimeCounterId = -1; - if (esxUtil_ParseQuery(conn->uri, &priv->transport, &vCenter, &noVerify, - &autoAnswer) < 0) { - goto cleanup; - } - - if (autoAnswer) { - priv->autoAnswer = esxVI_Boolean_True; - } - /* * Set the port dependent on the transport protocol if no port is * specified. This allows us to rely on the port parameter being @@ -414,10 +412,6 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } } - if (esxVI_Context_Alloc(&priv->host) < 0) { - goto cleanup; - } - password = virRequestPassword(auth, username, conn->uri->server); if (password == NULL) { @@ -425,8 +419,9 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) goto cleanup; } - if (esxVI_Context_Connect(priv->host, url, hostIpAddress, username, - password, noVerify) < 0) { + if (esxVI_Context_Alloc(&priv->host) < 0 || + esxVI_Context_Connect(priv->host, url, hostIpAddress, username, + password, parsedQuery->noVerify) < 0) { goto cleanup; } @@ -559,7 +554,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } if (esxVI_Context_Connect(priv->vCenter, url, vCenterIpAddress, - username, password, noVerify) < 0) { + username, password, + parsedQuery->noVerify) < 0) { goto cleanup; } @@ -594,6 +590,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) VIR_FREE(priv); } + + esxUtil_FreeParsedQuery(&parsedQuery); VIR_FREE(url); VIR_FREE(vCenter); VIR_FREE(password); @@ -2961,14 +2959,14 @@ esxDomainMigratePrepare(virConnectPtr dconn, unsigned long resource ATTRIBUTE_UNUSED) { int result = -1; - char *transport = NULL; + esxUtil_ParsedQuery *parsedQuery = NULL; if (uri_in == NULL) { - if (esxUtil_ParseQuery(dconn->uri, &transport, NULL, NULL, NULL) < 0) { + if (esxUtil_ParseQuery(&parsedQuery, dconn->uri) < 0) { return -1; } - if (virAsprintf(uri_out, "%s://%s:%d/sdk", transport, + if (virAsprintf(uri_out, "%s://%s:%d/sdk", parsedQuery->transport, dconn->uri->server, dconn->uri->port) < 0) { virReportOOMError(); goto cleanup; @@ -2978,7 +2976,7 @@ esxDomainMigratePrepare(virConnectPtr dconn, result = 0; cleanup: - VIR_FREE(transport); + esxUtil_FreeParsedQuery(&parsedQuery); return result; } diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 1ffcc22..dba9bc3 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -39,29 +39,25 @@ #define VIR_FROM_THIS VIR_FROM_ESX + int -esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, - int *noVerify, int *autoAnswer) +esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri) { int result = -1; - int i; struct qparam_set *queryParamSet = NULL; struct qparam *queryParam = NULL; + int i; + int noVerify; + int autoAnswer; - if (transport != NULL) { - *transport = NULL; - } - - if (vCenter != NULL) { - *vCenter = NULL; - } - - if (noVerify != NULL) { - *noVerify = 0; + if (parsedQuery == NULL || *parsedQuery != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; } - if (autoAnswer != NULL) { - *autoAnswer = 0; + if (VIR_ALLOC(*parsedQuery) < 0) { + virReportOOMError(); + return -1; } #ifdef HAVE_XMLURI_QUERY_RAW @@ -71,75 +67,69 @@ esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, #endif if (queryParamSet == NULL) { - return -1; + goto cleanup; } for (i = 0; i < queryParamSet->n; i++) { queryParam = &queryParamSet->p[i]; if (STRCASEEQ(queryParam->name, "transport")) { - if (transport == NULL) { - continue; - } + VIR_FREE((*parsedQuery)->transport); - *transport = strdup(queryParam->value); + (*parsedQuery)->transport = strdup(queryParam->value); - if (*transport == NULL) { + if ((*parsedQuery)->transport == NULL) { virReportOOMError(); goto cleanup; } - if (STRNEQ(*transport, "http") && STRNEQ(*transport, "https")) { + if (STRNEQ((*parsedQuery)->transport, "http") && + STRNEQ((*parsedQuery)->transport, "https")) { ESX_ERROR(VIR_ERR_INVALID_ARG, _("Query parameter 'transport' has unexpected value " - "'%s' (should be http|https)"), *transport); + "'%s' (should be http|https)"), + (*parsedQuery)->transport); goto cleanup; } } else if (STRCASEEQ(queryParam->name, "vcenter")) { - if (vCenter == NULL) { - continue; - } + VIR_FREE((*parsedQuery)->vCenter); - *vCenter = strdup(queryParam->value); + (*parsedQuery)->vCenter = strdup(queryParam->value); - if (*vCenter == NULL) { + if ((*parsedQuery)->vCenter == NULL) { virReportOOMError(); goto cleanup; } } else if (STRCASEEQ(queryParam->name, "no_verify")) { - if (noVerify == NULL) { - continue; - } - - if (virStrToLong_i(queryParam->value, NULL, 10, noVerify) < 0 || - (*noVerify != 0 && *noVerify != 1)) { + if (virStrToLong_i(queryParam->value, NULL, 10, &noVerify) < 0 || + (noVerify != 0 && noVerify != 1)) { ESX_ERROR(VIR_ERR_INVALID_ARG, _("Query parameter 'no_verify' has unexpected value " "'%s' (should be 0 or 1)"), queryParam->value); goto cleanup; } - } else if (STRCASEEQ(queryParam->name, "auto_answer")) { - if (autoAnswer == NULL) { - continue; - } - if (virStrToLong_i(queryParam->value, NULL, 10, autoAnswer) < 0 || - (*autoAnswer != 0 && *autoAnswer != 1)) { + (*parsedQuery)->noVerify = noVerify != 0; + } else if (STRCASEEQ(queryParam->name, "auto_answer")) { + if (virStrToLong_i(queryParam->value, NULL, 10, &autoAnswer) < 0 || + (autoAnswer != 0 && autoAnswer != 1)) { ESX_ERROR(VIR_ERR_INVALID_ARG, _("Query parameter 'auto_answer' has unexpected " "value '%s' (should be 0 or 1)"), queryParam->value); goto cleanup; } + + (*parsedQuery)->autoAnswer = autoAnswer != 0; } else { VIR_WARN("Ignoring unexpected query parameter '%s'", queryParam->name); } } - if (transport != NULL && *transport == NULL) { - *transport = strdup("https"); + if ((*parsedQuery)->transport == NULL) { + (*parsedQuery)->transport = strdup("https"); - if (*transport == NULL) { + if ((*parsedQuery)->transport == NULL) { virReportOOMError(); goto cleanup; } @@ -149,13 +139,7 @@ esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, cleanup: if (result < 0) { - if (transport != NULL) { - VIR_FREE(*transport); - } - - if (vCenter != NULL) { - VIR_FREE(*vCenter); - } + esxUtil_FreeParsedQuery(parsedQuery); } if (queryParamSet != NULL) { @@ -167,6 +151,22 @@ esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, + +void +esxUtil_FreeParsedQuery(esxUtil_ParsedQuery **parsedQuery) +{ + if (parsedQuery == NULL || *parsedQuery == NULL) { + return; + } + + VIR_FREE((*parsedQuery)->transport); + VIR_FREE((*parsedQuery)->vCenter); + + VIR_FREE(*parsedQuery); +} + + + int esxUtil_ParseVirtualMachineIDString(const char *id_string, int *id) { diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index 5298184..ae6e38b 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -23,13 +23,24 @@ #ifndef __ESX_UTIL_H__ # define __ESX_UTIL_H__ +# include <stdbool.h> # include <libxml/uri.h> # include "internal.h" # include "conf.h" -int esxUtil_ParseQuery(xmlURIPtr uri, char **transport, char **vCenter, - int *noVerify, int *autoAnswer); +typedef struct _esxUtil_ParsedQuery esxUtil_ParsedQuery; + +struct _esxUtil_ParsedQuery { + char *transport; + char *vCenter; + bool noVerify; + bool autoAnswer; +}; + +int esxUtil_ParseQuery(esxUtil_ParsedQuery **parsedQuery, xmlURIPtr uri); + +void esxUtil_FreeParsedQuery(esxUtil_ParsedQuery **parsedQuery); int esxUtil_ParseVirtualMachineIDString(const char *id_string, int *id); diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index c535dbb..4332f2b 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -277,7 +277,7 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) int esxVI_Context_Connect(esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, - const char *password, int noVerify) + const char *password, bool noVerify) { int result = -1; esxVI_String *propertyNameList = NULL; diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index e2687c4..521be0c 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -161,7 +161,7 @@ int esxVI_Context_Alloc(esxVI_Context **ctx); void esxVI_Context_Free(esxVI_Context **ctx); int esxVI_Context_Connect(esxVI_Context *ctx, const char *ipAddress, const char *url, const char *username, - const char *password, int noVerify); + const char *password, bool noVerify); int esxVI_Context_DownloadFile(esxVI_Context *ctx, const char *url, char **content); int esxVI_Context_UploadFile(esxVI_Context *ctx, const char *url, -- 1.7.0.4

2 2

[libvirt] [PATCH] virsh: add pool support to vol-key command v2
by Justin Clift 09 Jun '10

09 Jun '10

Presently the vol-key command only supports being provided with a volume path. This patch adds support for providing it with a pool and volume identifier pair as well. virsh # vol-key --pool <pool-name-or-uuid> <vol-name-or-path> --- This is a clean patch against current git head, plus avoids a potential memory leak in the previous code. Also unlike the previous patch, this one doesn't change the help text for the vol-path nor vol-name commands. A separate patch will be provided to update their help text. tools/virsh.c | 6 +++--- tools/virsh.pod | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 546e247..db8b28d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6032,12 +6032,13 @@ cmdVolPool(vshControl *ctl, const vshCmd *cmd) * "vol-key" command */ static const vshCmdInfo info_vol_key[] = { - {"help", N_("convert a vol UUID to vol key")}, + {"help", N_("returns the volume key for a given volume name or path")}, {"desc", ""}, {NULL, NULL} }; static const vshCmdOptDef opts_vol_key[] = { + {"pool", VSH_OT_STRING, 0, N_("pool name or uuid")}, {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("vol uuid")}, {NULL, 0, 0, NULL} }; @@ -6050,8 +6051,7 @@ cmdVolKey(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(vol = vshCommandOptVolBy(ctl, cmd, "vol", "pool", NULL, - VSH_BYUUID))) + if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", NULL))) return FALSE; vshPrint(ctl, "%s\n", virStorageVolGetKey(vol)); diff --git a/tools/virsh.pod b/tools/virsh.pod index b54003c..f6d7808 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -855,10 +855,11 @@ I<vol-name-or-key> is the name or key of the volume to return the path for. Return the name for a given volume. I<vol-key-or-path> is the key or path of the volume to return the name for. -=item B<vol-key> I<vol-uuid> +=item B<vol-key> [optional I<--pool> I<pool-or-uuid>] I<vol-name-or-path> -Return the volume key for a given volume UUID. -I<vol-uuid> is the UUID of the volume to return the volume key for. +Return the volume key for a given volume. +I<--pool> I<pool-or-uuid> is the name or UUID of the storage pool the volume is in. +I<vol-name-or-path> is the name or path of the volume to return the volume key for. =back -- 1.7.0.1

1 0

[libvirt] [PATCH] virsh: add new vol-pool command
by Justin Clift 09 Jun '10

09 Jun '10

This patch adds a new "vol-pool" command to virsh, to round out the identifier conversion functions for volumes in virsh. Now it is possible to work with volumes when starting from just a volume key or volume path. --- tools/virsh.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1279f41..b45cf38 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5975,6 +5975,53 @@ cmdVolName(vshControl *ctl, const vshCmd *cmd) } +/* + * "vol-pool" command + */ +static const vshCmdInfo info_vol_pool[] = { + {"help", N_("returns the storage pool for a given volume key or path")}, + {"desc", ""}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_vol_pool[] = { + {"vol", VSH_OT_DATA, VSH_OFLAG_REQ, N_("volume key or path")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdVolPool(vshControl *ctl, const vshCmd *cmd) +{ + virStoragePoolPtr pool; + virStorageVolPtr vol; + + /* Check the connection to libvirtd daemon is still working */ + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + /* Use the supplied string to locate the volume */ + if (!(vol = vshCommandOptVolBy(ctl, cmd, "vol", "pool", NULL, + VSH_BYUUID))) { + return FALSE; + } + + /* Look up the parent storage pool for the volume */ + pool = virStoragePoolLookupByVolume(vol); + if (pool == NULL) { + vshError(ctl, "%s", _("failed to get parent pool")); + virStorageVolFree(vol); + return FALSE; + } + + /* Return the name of the parent storage pool */ + vshPrint(ctl, "%s\n", virStoragePoolGetName(pool)); + + /* Cleanup */ + virStorageVolFree(vol); + virStoragePoolFree(pool); + return TRUE; +} + /* * "vol-key" command @@ -8837,6 +8884,7 @@ static const vshCmdDef commands[] = { {"vol-dumpxml", cmdVolDumpXML, opts_vol_dumpxml, info_vol_dumpxml}, {"vol-info", cmdVolInfo, opts_vol_info, info_vol_info}, {"vol-list", cmdVolList, opts_vol_list, info_vol_list}, + {"vol-pool", cmdVolPool, opts_vol_pool, info_vol_pool}, {"vol-path", cmdVolPath, opts_vol_path, info_vol_path}, {"vol-name", cmdVolName, opts_vol_name, info_vol_name}, {"vol-key", cmdVolKey, opts_vol_key, info_vol_key}, -- 1.7.0.1

2 2

[libvirt] [PATCH] Implement support for virtio plan9fs filesystem passthrough in QEMU
by Daniel P. Berrange 09 Jun '10

09 Jun '10

Make use of the existing <filesystem> element to support plan9fs filesystem passthrough in the QEMU driver <filesystem type='mount'> <source dir='/export/to/guest'/> <target dir='/import/from/host'/> </filesystem> NB, the target is not actually a directory, it is merely a arbitrary string tag that is exported to the guest as a hint for where to mount it. --- src/qemu/qemu_conf.c | 96 +++++++++++++++++++++++++ src/qemu/qemu_conf.h | 5 ++ tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 1 + tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml | 28 +++++++ tests/qemuxml2argvtest.c | 1 + 5 files changed, 131 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fs9p.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 16d2f44..511b9de 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1188,6 +1188,8 @@ static unsigned long long qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_NO_KVM_PIT; if (strstr(help, "-tdf")) flags |= QEMUD_CMD_FLAG_TDF; + if (strstr(help, "-fsdev")) + flags |= QEMUD_CMD_FLAG_FSDEV; /* Keep disabled till we're actually ready to turn on netdev mode * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */ @@ -1969,6 +1971,10 @@ qemuAssignDeviceAliases(virDomainDefPtr def, unsigned long long qemuCmdFlags) if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) return 0; + for (i = 0; i < def->nfss ; i++) { + if (virAsprintf(&def->fss[i]->info.alias, "fs%d", i) < 0) + goto no_memory; + } for (i = 0; i < def->nsounds ; i++) { if (virAsprintf(&def->sounds[i]->info.alias, "sound%d", i) < 0) goto no_memory; @@ -2248,6 +2254,15 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) if (qemuDomainPCIAddressSetNextAddr(addrs, &def->disks[i]->info) < 0) goto error; } + for (i = 0; i < def->nfss ; i++) { + if (def->fss[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + continue; + + /* Only support VirtIO-9p-pci so far. If that changes, + * we might need to skip devices here */ + if (qemuDomainPCIAddressSetNextAddr(addrs, &def->fss[i]->info) < 0) + goto error; + } for (i = 0; i < def->nnets ; i++) { if (def->nets[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) @@ -2646,6 +2661,64 @@ error: } +char *qemuBuildFSStr(virDomainFSDefPtr fs, + unsigned long long qemuCmdFlags ATTRIBUTE_UNUSED) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("can only passthrough directories")); + goto error; + } + + virBufferAddLit(&opt, "local"); + virBufferVSprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferVSprintf(&opt, ",path=%s", fs->src); + + if (virBufferError(&opt)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&opt); + +error: + virBufferFreeAndReset(&opt); + return NULL; +} + + +char * +qemuBuildFSDevStr(virDomainFSDefPtr fs) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("can only passthrough directories")); + goto error; + } + + virBufferAddLit(&opt, "virtio-9p-pci"); + virBufferVSprintf(&opt, ",id=%s", fs->info.alias); + virBufferVSprintf(&opt, ",fsdev=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferVSprintf(&opt, ",mount_tag=%s", fs->dst); + qemuBuildDeviceAddressStr(&opt, &fs->info); + + if (virBufferError(&opt)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&opt); + +error: + virBufferFreeAndReset(&opt); + return NULL; +} + + char * qemuBuildControllerDevStr(virDomainControllerDefPtr def) { @@ -4176,6 +4249,29 @@ int qemudBuildCommandLine(virConnectPtr conn, } } + if (qemuCmdFlags & QEMUD_CMD_FLAG_FSDEV) { + for (i = 0 ; i < def->nfss ; i++) { + char *optstr; + virDomainFSDefPtr fs = def->fss[i]; + + ADD_ARG_LIT("-fsdev"); + if (!(optstr = qemuBuildFSStr(fs, qemuCmdFlags))) + goto error; + ADD_ARG(optstr); + + ADD_ARG_LIT("-device"); + if (!(optstr = qemuBuildFSDevStr(fs))) + goto error; + ADD_ARG(optstr); + } + } else { + if (def->nfss) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("filesystem passthrough not supported by this QEMU")); + goto error; + } + } + if (!def->nnets) { /* If we have -device, then we set -nodefault already */ if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 0f8a1b3..81ae3e2 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -90,6 +90,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_NO_KVM_PIT = (1LL << 34), /* -no-kvm-pit-reinjection supported */ QEMUD_CMD_FLAG_TDF = (1LL << 35), /* -tdf flag (user-mode pit catchup) */ QEMUD_CMD_FLAG_PCI_CONFIGFD = (1LL << 36), /* pci-assign.configfd */ + QEMUD_CMD_FLAG_FSDEV = (1LL << 37), /* -fstype filesystem passthrough */ }; /* Main driver state */ @@ -173,6 +174,7 @@ typedef qemuDomainPCIAddressSet *qemuDomainPCIAddressSetPtr; # define QEMU_DRIVE_HOST_PREFIX "drive-" # define QEMU_VIRTIO_SERIAL_PREFIX "virtio-serial" +# define QEMU_FSDEV_HOST_PREFIX "fsdev-" # define qemuReportError(code, ...) \ virReportErrorHelper(NULL, VIR_FROM_QEMU, code, __FILE__, \ @@ -233,9 +235,12 @@ char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, char *qemuBuildDriveStr(virDomainDiskDefPtr disk, int bootable, unsigned long long qemuCmdFlags); +char *qemuBuildFSStr(virDomainFSDefPtr fs, + unsigned long long qemuCmdFlags); /* Current, best practice */ char * qemuBuildDriveDevStr(virDomainDiskDefPtr disk); +char * qemuBuildFSDevStr(virDomainFSDefPtr fs); /* Current, best practice */ char * qemuBuildControllerDevStr(virDomainControllerDefPtr def); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args new file mode 100644 index 0000000..42c26a2 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -fsdev local,id=fsdev-fs0,path=/export/to/guest -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.0,addr=0x4 -usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml new file mode 100644 index 0000000..9072ead --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <filesystem type='mount'> + <source dir='/export/to/guest'/> + <target dir='/import/from/host'/> + </filesystem> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9e4d5bf..4eb7ad8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -335,6 +335,7 @@ mymain(int argc, char **argv) DO_TEST("watchdog-device", QEMUD_CMD_FLAG_DEVICE); DO_TEST("sound", 0); DO_TEST("sound-device", QEMUD_CMD_FLAG_DEVICE); + DO_TEST("fs9p", QEMUD_CMD_FLAG_DEVICE | QEMUD_CMD_FLAG_FSDEV); DO_TEST("hostdev-usb-address", 0); DO_TEST("hostdev-usb-address-device", QEMUD_CMD_FLAG_DEVICE); -- 1.6.6.1

2 1

[libvirt] Fwd: How do you disable hpet in a kvm?
by Richard W.M. Jones 09 Jun '10

09 Jun '10

Forwarding to libvir-list. The KVM developers have been recommending that all guests use -no-hpet flag. Indeed, we've been adding this flag in libguestfs for quite a long time. However I notice that libvirt [in Rawhide] does not include this flag for my guests. Rich. ----- Forwarded message from "Frederick N. Brier" <fnbrier(a)gmail.com> ----- Subject: [fedora-virt] How do you disable hpet in a kvm? Date: Tue, 08 Jun 2010 14:15:06 -0400 To: virt(a)lists.fedoraproject.org I installed PBX In A Flash (PIAF) as a VM on a Fedora 11 64 bit host. PIAF is a 32 bit CentOS 5.2 distro for running Asterisk. I, like many others, am getting the error message "rtc: lost some interrupts at 1024hz" repeating over and over on the console. Some people have apparently gotten rid of this error message by disabling hpet in the BIOS. However, this is a VM (kvm). I tried adding nohpet as a kernel parameter in /boot/grub/menu.lst, but that effects the linux OS, not the BIOS. It did not fix it. I found references to a -no-hpet qemu parameter. However, I cannot find how to set it in a VM created using virt-manager and an ISO image. In the /etc/libvirt of the host I found XML configuration files describing the VMs. These appear to be the same as those created using the virsh dumpxml command. There does not appear to be an XML element as there is for acpi and apic. The man page describing the XML format does not have an HPET related option. I could not find an example or sample of it being disabled in a libvirt XML file. Nor does there appear to be a schema (xsd or dtd) for the libvirt file format, which might have had an hpet element or attribute. Ideally, is there a way to disable HPET in the BIOS for a specific VM, and not all VMs. Thank you. Fred // _______________________________________________ virt mailing list virt(a)lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/virt ----- End forwarded message ----- -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones New in Fedora 11: Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 70 libraries supprt'd http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw

2 1

[libvirt] [PATCH] Correct two memory leaks triggered by udev events
by Nigel Jones 09 Jun '10

09 Jun '10

Hi List, Please find below a patch that should correct two memory leaks within the udev device handling code. The issue is triggered by 'add' udev calls and will slowly cause libvirtd to consume the majority of system memory. The first part of the patch deals with udevAddOneDevice() and frees the memory allocated to 'def' if the function would return -1 (an error condition) due to the inability to look up udev properties (for example, if the udev device is already removed). The second part of the patch deals with a remaining 8kB/cycle memory leak, in which the udev device reference isn't released at the end of running udevEventHandleCallback(). I'm happy to answer any questions about the patch, there is also a bit more background at https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/571093 --- >From 6c8183e83fbfeb031b16cf9ae2d41b16e3145378 Mon Sep 17 00:00:00 2001 From: Nigel Jones <dev(a)nigelj.com> Date: Mon, 24 May 2010 15:05:53 +0000 Subject: [PATCH] Patch 2 memory leaks. 1. Ensure that memory is free'd from udevAddOneDevice() if the return value will be non-zero 2. Release udev device reference in udevEventHandleCallback() similar to the release of the reference in udevProcessDeviceListEntry() --- src/node_device/node_device_udev.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index a1ced87..4d0effa 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1296,6 +1296,9 @@ static int udevAddOneDevice(struct udev_device *device) ret = 0; out: + if (ret != 0) { + virNodeDeviceDefFree(def); /* Free assigned memory to prevent leaks */ + } return ret; } @@ -1426,6 +1429,7 @@ static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, } out: + udev_device_unref(device); return; } -- 1.7.0.4

5 8

[libvirt] [PATCH] virsh: add snapshot backing store support to vol-create-as
by Justin Clift 09 Jun '10

09 Jun '10

This patch adds two new parameters to the vol-create-as command: --snapshot-backing-vol <volume-name-or-key-or-path> --snapshot-backing-vol-format <format-of-backing-vol> virsh # vol-create-as guest_images_lvm snapvol1 5G --snapshot-backing-vol \ rhel6vm1lun1 Vol snapvol1 created virsh # vol-create-as image_dir qcow2snap2 5G --format qcow2 \ --snapshot-backing-vol imagevol1.qcow2 \ --snapshot-backing-vol-format qcow2 Vol qcow2snap2 created Additionally, the virsh man page update fixes incorrect snapshot parameters that were included in my prior bulk volume command patch. --- tools/virsh.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- tools/virsh.pod | 10 ++++---- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1e00114..497c7d4 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5274,6 +5274,8 @@ static const vshCmdOptDef opts_vol_create_as[] = { {"capacity", VSH_OT_DATA, VSH_OFLAG_REQ, N_("size of the vol with optional k,M,G,T suffix")}, {"allocation", VSH_OT_STRING, 0, N_("initial allocation size with optional k,M,G,T suffix")}, {"format", VSH_OT_STRING, 0, N_("file format type raw,bochs,qcow,qcow2,vmdk")}, + {"snapshot-backing-vol", VSH_OT_STRING, 0, N_("the backing volume if taking a snapshot")}, + {"snapshot-backing-vol-format", VSH_OT_STRING, 0, N_("format of backing volume if taking a snapshot")}, {NULL, 0, 0, NULL} }; @@ -5313,6 +5315,7 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) int found; char *xml; char *name, *capacityStr, *allocationStr, *format; + char *snapshotStrVol, *snapshotStrFormat; unsigned long long capacity, allocation = 0; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -5339,6 +5342,8 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("Malformed size %s"), allocationStr); format = vshCommandOptString(cmd, "format", &found); + snapshotStrVol = vshCommandOptString(cmd, "snapshot-backing-vol", &found); + snapshotStrFormat = vshCommandOptString(cmd, "snapshot-backing-vol-format", &found); virBufferAddLit(&buf, "<volume>\n"); virBufferVSprintf(&buf, " <name>%s</name>\n", name); @@ -5351,8 +5356,62 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) virBufferVSprintf(&buf, " <format type='%s'/>\n",format); virBufferAddLit(&buf, " </target>\n"); } - virBufferAddLit(&buf, "</volume>\n"); + /* Convert the snapshot parameters into backingStore XML */ + if (snapshotStrVol) { + /* Lookup snapshot backing volume. Try the snapshot-backing-vol + * parameter as a name */ + vshDebug(ctl, 5, "%s: Look up backing store volume '%s' as name\n", + cmd->def->name, snapshotStrVol); + virStorageVolPtr snapVol = virStorageVolLookupByName(pool, snapshotStrVol); + if (snapVol) + vshDebug(ctl, 5, "%s: Backing store volume found using '%s' as name\n", + cmd->def->name, snapshotStrVol); + + if (snapVol == NULL) { + /* Snapshot backing volume not found by name. Try the + * snapshot-backing-vol parameter as a key */ + vshDebug(ctl, 5, "%s: Look up backing store volume '%s' as key\n", + cmd->def->name, snapshotStrVol); + snapVol = virStorageVolLookupByKey(ctl->conn, snapshotStrVol); + if (snapVol) + vshDebug(ctl, 5, "%s: Backing store volume found using '%s' as key\n", + cmd->def->name, snapshotStrVol); + } + if (snapVol == NULL) { + /* Snapshot backing volume not found by key. Try the + * snapshot-backing-vol parameter as a path */ + vshDebug(ctl, 5, "%s: Look up backing store volume '%s' as path\n", + cmd->def->name, snapshotStrVol); + snapVol = virStorageVolLookupByPath(ctl->conn, snapshotStrVol); + if (snapVol) + vshDebug(ctl, 5, "%s: Backing store volume found using '%s' as path\n", + cmd->def->name, snapshotStrVol); + } + if (snapVol == NULL) { + vshError(ctl, _("failed to get vol '%s'"), snapshotStrVol); + return FALSE; + } + + char *snapshotStrVolPath; + if ((snapshotStrVolPath = virStorageVolGetPath(snapVol)) == NULL) { + virStorageVolFree(snapVol); + return FALSE; + } + + /* Create XML for the backing store */ + virBufferAddLit(&buf, " <backingStore>\n"); + virBufferVSprintf(&buf, " <path>%s</path>\n",snapshotStrVolPath); + if (snapshotStrFormat) + virBufferVSprintf(&buf, " <format type='%s'/>\n",snapshotStrFormat); + virBufferAddLit(&buf, " </backingStore>\n"); + + /* Cleanup snapshot allocations */ + VIR_FREE(snapshotStrVolPath); + virStorageVolFree(snapVol); + } + + virBufferAddLit(&buf, "</volume>\n"); if (virBufferError(&buf)) { vshPrint(ctl, "%s", _("Failed to allocate XML buffer")); diff --git a/tools/virsh.pod b/tools/virsh.pod index 3b0cf16..7039ad2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -782,8 +782,8 @@ source volume is in. I<vol-name-or-key-or-path> is the name or key or path of the source volume. =item B<vol-create-as> I<pool-or-uuid> I<name> I<capacity> optional -I<--allocation> I<size> I<--format> I<string> I<--snapshot-source-vol> -I<vol-name-or-key-or-path> I<--snapshot-source-format> I<string> +I<--allocation> I<size> I<--format> I<string> I<--snapshot-backing-vol> +I<vol-name-or-key-or-path> I<--snapshot-backing-vol-format> I<string> Create a volume from a set of arguments. I<pool-or-uuid> is the name or UUID of the storage pool to create the volume @@ -795,10 +795,10 @@ I<--allocation> I<size> is the initial size to be allocated in the volume, with optional k, M, G, or T suffix. I<--format> I<string> is used in file based storage pools to specify the volume file format to use; raw, bochs, qcow, qcow2, vmdk. -I<--snapshot-source-vol> I<vol-name-or-key-or-path> is the source backing +I<--snapshot-backing-vol> I<vol-name-or-key-or-path> is the source backing volume to be used if taking a snapshot of an existing volume. -I<--snapshot-source-format> I<string> is the format of the snapshot backing volume; -raw, bochs, qcow, qcow2, vmdk. +I<--snapshot-backing-vol-format> I<string> is the format of the snapshot backing volume; +raw, bochs, qcow, qcow2, vmdk, host_device. =item B<vol-clone> [optional I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> I<name> -- 1.7.0.1

2 3