- Devel - libvirt List Archives

[libvirt] [PATCH] qemudDomainAttachSCSIDisk: handle empty controller list
by Jim Meyering 15 Mar '10

15 Mar '10

Clang found something that might be a real bug. I suspect that ...drive.controller will always be at least one, but we should not have to dive into the code trying to figure that out. It's easier/better here just to handle the potential trouble: clang saw that if it *was* zero, then the following "for" loop would not be entered, and "cont" would not be initialized. On the very next statement "cont" (uninitialized) would be dereferenced. >From 21ec1a8ae0218a5e8d789410318a973518ffec6c Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 2 Mar 2010 17:45:10 +0100 Subject: [PATCH] qemudDomainAttachSCSIDisk: handle empty controller list * src/qemu/qemu_driver.c (qemudDomainAttachSCSIDisk): Handle the (theoretical) case of an empty controller list, so that clang does not think the subsequent dereference of "cont" would dereference an undefined variable (due to preceding loop not iterating even once). --- src/qemu/qemu_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7f7c459..efb1857 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5671,18 +5671,24 @@ static int qemudDomainAttachSCSIDisk(struct qemud_driver *driver, if (qemuAssignDeviceDiskAlias(disk, qemuCmdFlags) < 0) goto error; if (!(devstr = qemuBuildDriveDevStr(disk))) goto error; } if (!(drivestr = qemuBuildDriveStr(disk, 0, qemuCmdFlags))) goto error; + if (disk->info.addr.drive.controller <= 0) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("no drive controller for %s"), disk->dst); + goto error; + } + for (i = 0 ; i <= disk->info.addr.drive.controller ; i++) { cont = qemuDomainFindOrCreateSCSIDiskController(driver, vm, i, qemuCmdFlags); if (!cont) goto error; } if (cont->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("SCSI controller %d was missing its PCI address"), cont->idx); -- 1.7.0.1.414.g89213d

4 6

[libvirt] eject ISO from cdrom
by Shi Jin 15 Mar '10

15 Mar '10

Hi there, I am using libvirt+qemu/kvm. For a guest VM that is running, I could change its cdrom media by running the following virsh command: virsh attach-disk <vm-id> <path-to-iso-file> hdc --driver file --type cdrom --mode readonly This will change the media in the cdrom for the guest VM. Once I am done, I can use virt-manager to disconnect the iso file to the cdrom. The resulting xml file looks like (only showing the relevant part) <disk type='file' device='cdrom'> <target dev='hdc' bus='ide'/> <readonly/> </disk> However, I am having trouble to do the same task (eject cd media) using virsh command. I am successful in running the "virsh attach-device 1 emptyCD.xml" command where the emptyCD.xml is an xml without the source file path, just like the one above. However, I want to do it by a single command without the need to create xml files. It should be something like > virsh attach-disk 1 "" hdc --driver file --type cdrom --mode readonly However, virsh does not like the empty string "". I also looked at the virt-manager source code, in this case, the python script is 912 if curpath: 913 # Disconnect cdrom 914 self.change_cdrom_media(dev_id_info, None, _type=None) Basically a None parameter is pass to the API. All I need to find out is how to do the same thing in the "virsh attach-disk" command. Do you have any suggestions/comments? Thanks a lot. Shi -- Shi Jin, PhD

2 1

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

15 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 15 Mar '10

15 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 15 Mar '10

15 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 15 Mar '10

15 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 15 Mar '10

15 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 15 Mar '10

15 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 15 Mar '10

15 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 15 Mar '10

15 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