- Devel - libvirt List Archives

[libvirt] [PATCH] Make monitor type (miimon/arpmon) optional in bond xml.
by Laine Stump 04 Nov '09

04 Nov '09

Lack of one of these in the live xml output was causing the parse to fail. --- src/conf/interface_conf.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 31af957..31abf12 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -631,13 +631,17 @@ static int virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def, xmlXPathContextPtr ctxt) { xmlNodePtr node; - int ret = 0; + int ret = -1; unsigned long tmp; def->data.bond.mode = virInterfaceDefParseBondMode(conn, ctxt); if (def->data.bond.mode < 0) goto error; + ret = virInterfaceDefParseBondItfs(conn, def, ctxt); + if (ret != 0) + goto error; + node = virXPathNode(conn, "./miimon[1]", ctxt); if (node != NULL) { def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_MII; @@ -669,15 +673,13 @@ virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def, } def->data.bond.carrier = virInterfaceDefParseBondMiiCarrier(conn, ctxt); - if (def->data.bond.carrier < 0) + if (def->data.bond.carrier < 0) { + ret = -1; goto error; + } - ret = virInterfaceDefParseBondItfs(conn, def, ctxt); + } else if ((node = virXPathNode(conn, "./arpmon[1]", ctxt)) != NULL) { - goto done; - } - node = virXPathNode(conn, "./arpmon[1]", ctxt); - if (node != NULL) { def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_ARP; ret = virXPathULong(conn, "string(./arpmon/@interval)", ctxt, &tmp); @@ -693,23 +695,17 @@ virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def, if (def->data.bond.target == NULL) { virInterfaceReportError(conn, VIR_ERR_XML_ERROR, "%s", _("bond interface arpmon target missing")); + ret = -1; goto error; } def->data.bond.validate = virInterfaceDefParseBondArpValid(conn, ctxt); - if (def->data.bond.validate < 0) + if (def->data.bond.validate < 0) { + ret = -1; goto error; - - ret = virInterfaceDefParseBondItfs(conn, def, ctxt); - - goto done; + } } - - virInterfaceReportError(conn, VIR_ERR_XML_ERROR, - "%s", _("bond interface need miimon or arpmon element")); error: - ret = -1; -done: return(ret); } @@ -1109,11 +1105,6 @@ virInterfaceBondDefFormat(virConnectPtr conn, virBufferPtr buf, else if (def->data.bond.validate == VIR_INTERFACE_BOND_ARP_ALL) virBufferAddLit(buf, " validate='all'"); virBufferAddLit(buf, "/>\n"); - } else { - virInterfaceReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("bond monitoring type %d unknown"), - def->data.bond.monit); - return(-1); } for (i = 0;i < def->data.bond.nbItf;i++) { if (virInterfaceBareDevDefFormat(conn, buf, def->data.bond.itf[i]) < 0) -- 1.6.5.15.gc274d

2 1

[libvirt] [PATCH 0/3] IPv6 / multi address / report live config in virInterface
by laine＠laine.org 04 Nov '09

04 Nov '09

This is the 2nd iteration of this patchset incorporating danpb's suggestions. Along with a couple other minor things, the type attribute is again a required attribute, and netcf support will be omitted in the build unless you have netcf-devel-0.1.3 or greater. Since there is no netcf-devel-0.1.3 yet, I tested this by changing the appropriate strings to 0.1.2. 0.1.3 will be released "soon" (I want to try and get IPv6 address reporting in before lutter cuts another release). I just wanted to get the patches to the list early to get some visual review in case I screwed up anything new ;-) Note that (unless you're building/installing netcf from the head of git) if you try to fake out the version of netcf yourself you'll get runtime errors from virInterfaceGetXMLDesc (iface-dumpxml) due to there being no "type" attribute in the interface xml.

4 21

[libvirt] [PATCH] give up python interpreter lock before calling cb
by Dan Kenigsberg 04 Nov '09

04 Nov '09

suggested by danpb on irc --- python/libvirt-override.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 5d24fd2..53e36c0 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2355,7 +2355,9 @@ libvirt_virEventInvokeHandleCallback(PyObject *self ATTRIBUTE_UNUSED, opaque = (void *) PyvirVoidPtr_Get(py_opaque); if(cb) + LIBVIRT_BEGIN_ALLOW_THREADS cb (watch, fd, event, opaque); + LIBVIRT_END_ALLOW_THREADS return VIR_PY_INT_SUCCESS; } @@ -2379,7 +2381,9 @@ libvirt_virEventInvokeTimeoutCallback(PyObject *self ATTRIBUTE_UNUSED, cb = (virEventTimeoutCallback) PyvirEventTimeoutCallback_Get(py_f); opaque = (void *) PyvirVoidPtr_Get(py_opaque); if(cb) + LIBVIRT_BEGIN_ALLOW_THREADS cb (timer, opaque); + LIBVIRT_END_ALLOW_THREADS return VIR_PY_INT_SUCCESS; } -- 1.6.2.5

3 3

[libvirt] The 0.7.3 release schedule
by Daniel Veillard 04 Nov '09

04 Nov '09

Well, clearly we can't keep up with the current plan, we should be in freeze right now and there is an awful lot of patches on the list waiting for review and push. Let's try to push everything by this week-end and have next week as the testing and freeze time. Maybe we can squeeze everything in time, that would allow the release by the Friday 13th (unless we want to avoid that ;-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] Allow NULL mac address in virGetInterface.
by Laine Stump 04 Nov '09

04 Nov '09

There are places where an interface will not have a mac address, and netcf returns this as a NULL pointer rather than a pointer to an empty string. Rather than checking for this all over the place in libvirt, just save it in the virInterface object as an empty string. --- src/datatypes.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 89ad309..ecefc59 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -588,10 +588,15 @@ virInterfacePtr virGetInterface(virConnectPtr conn, const char *name, const char *mac) { virInterfacePtr ret = NULL; - if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (mac == NULL)) { + if ((!VIR_IS_CONNECT(conn)) || (name == NULL)) { virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } + + /* a NULL mac from caller is okay. Treat it as blank */ + if (mac == NULL) + mac = ""; + virMutexLock(&conn->lock); ret = (virInterfacePtr) virHashLookup(conn->interfaces, name); -- 1.6.5.15.gc274d

2 3

[libvirt] [PATCH] Remove redundant virFileDeletePID() call
by Chris Lalancette 04 Nov '09

04 Nov '09

qemudShutdownVMDaemon() calls qemudRemoveDomainStatus(), which then calls virFileDeletePID(). qemudShutdownVMDaemon() then unnecessarily calls virFileDeletePID() again. Remove this second usage of it, and also slightly refactor qemudRemoveDomainStatus() to VIR_WARN appropriate error messages. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fd064af..38fe19e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -269,7 +269,7 @@ qemudRemoveDomainStatus(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm) { - int rc = -1; + char ebuf[1024]; char *file = NULL; if (virAsprintf(&file, "%s/%s.xml", driver->stateDir, vm->def->name) < 0) { @@ -277,19 +277,14 @@ qemudRemoveDomainStatus(virConnectPtr conn, goto cleanup; } - if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) { - qemudReportError(conn, vm, NULL, VIR_ERR_INTERNAL_ERROR, - _("Failed to unlink status file %s"), file); - goto cleanup; - } - - if(virFileDeletePid(driver->stateDir, vm->def->name)) - goto cleanup; + if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) + VIR_WARN(_("Failed to remove domain XML for %s: %s"), + vm->def->name, virStrerror(errno, buf, sizeof(ebuf))); + if (virFileDeletePid(driver->stateDir, vm->def->name) != 0) + VIR_WARN(_("Failed to remove PID file for %s: %s"), + vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); - rc = 0; -cleanup: - VIR_FREE(file); - return rc; + return 0; } @@ -2224,15 +2219,7 @@ retry: vm->def->name); } - if (qemudRemoveDomainStatus(conn, driver, vm) < 0) { - VIR_WARN(_("Failed to remove domain status for %s"), - vm->def->name); - } - if ((ret = virFileDeletePid(driver->stateDir, vm->def->name)) != 0) { - char ebuf[1024]; - VIR_WARN(_("Failed to remove PID file for %s: %s"), - vm->def->name, virStrerror(errno, ebuf, sizeof ebuf)); - } + qemudRemoveDomainStatus(conn, driver, vm); vm->pid = -1; vm->def->id = -1; -- 1.6.0.6

2 2

[libvirt] [PATCH 00/21] Rewrite the QEMU monitor handling
by Daniel P. Berrange 03 Nov '09

03 Nov '09

This patch series rewrites the QEMU monitor handling almost completely. The key theme here is to move from a totally synchronous way of interacting with the monitor, to a totally asynchronous way. This allows us to handle receipt & dispatch of asychronous events from QEMU. For example a notification of a disk-full error, or VM state change. In the process of doing this re-factoring I have also dropped in basic support/infrastructure for the JSON based monitor. The basic JSON parsing/formatting is working, but this needs to wait until QEMU community finalize their monitor syntax for the new commands & what args they accept. Daniel

5 45

[libvirt] cannot get virt-manager to see VM
by Gerry Reno 03 Nov '09

03 Nov '09

I used qemu-img to create a raw image. I then create an xml file with no uuid but a new name and new mac address. Then I did a 'virsh define NEW.img'. When I do a 'virsh list --all' the new VM is there but shut_off. But this new machine does not appear in virt-manager. What do I need to do to get the new machine to appear in the list of machines in virt-manager? I want to start this machine using virt-manager. This is on F11 with libvirt 0.6.2. -Gerry

1 0

[libvirt] [REPOST] Fix --with-init-script configure option
by Matthew Booth 03 Nov '09

03 Nov '09

Looks like this one might have dropped off the radar.

3 3

[libvirt] [PATCH] ESX: Don't automatically follow redirects.
by Matthias Bolte 03 Nov '09

03 Nov '09

The default transport for the VI API is HTTPS. If the server redirects from HTTPS to HTTP the driver would silently follow that redirection. The user assumes to communicate with the server over a secure transport but isn't. This patch disables automatical redirection following. The driver reports an error if the server tries to redirect. * src/esx/esx_vi.c: refactor the call to curl_easy_perform() into a function and do error handling there, disable automatical redirection following for curl * src/esx/esx_vi.h: change the type of responseCode to int --- src/esx/esx_vi.c | 166 +++++++++++++++++++++++++++--------------------------- src/esx/esx_vi.h | 2 +- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index dc51e20..bcf110f 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -216,6 +216,68 @@ esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, } #endif +static int +esxVI_CURL_Perform(virConnectPtr conn, esxVI_Context *ctx, const char *url) +{ + CURLcode errorCode; + long responseCode = 0; +#if LIBCURL_VERSION_NUM >= 0x071202 /* 7.18.2 */ + const char *redirectUrl = NULL; +#endif + + errorCode = curl_easy_perform(ctx->curl_handle); + + if (errorCode != CURLE_OK) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_perform() returned an error: %s (%d)", + curl_easy_strerror(errorCode), errorCode); + return -1; + } + + errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, + &responseCode); + + if (errorCode != CURLE_OK) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an " + "error: %s (%d)", curl_easy_strerror(errorCode), + errorCode); + return -1; + } + + if (responseCode < 0) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned a " + "negative response code"); + return -1; + } + + if (responseCode == 301) { +#if LIBCURL_VERSION_NUM >= 0x071202 /* 7.18.2 */ + errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_REDIRECT_URL, + &redirectUrl); + + if (errorCode != CURLE_OK) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_getinfo(CURLINFO_REDIRECT_URL) returned " + "an error: %s (%d)", curl_easy_strerror(errorCode), + errorCode); + } else { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "The server redirects from '%s' to '%s'", url, + redirectUrl); + } +#else + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "The server redirects from '%s'", url); +#endif + + return -1; + } + + return responseCode; +} + int esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, @@ -269,7 +331,7 @@ esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_URL, ctx->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, 1); + 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_COOKIEFILE, ""); @@ -433,8 +495,7 @@ esxVI_Context_DownloadFile(virConnectPtr conn, esxVI_Context *ctx, const char *url, char **content) { virBuffer buffer = VIR_BUFFER_INITIALIZER; - CURLcode errorCode; - long responseCode; + int responseCode = 0; if (content == NULL || *content != NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); @@ -448,27 +509,19 @@ esxVI_Context_DownloadFile(virConnectPtr conn, esxVI_Context *ctx, curl_easy_setopt(ctx->curl_handle, CURLOPT_UPLOAD, 0); curl_easy_setopt(ctx->curl_handle, CURLOPT_HTTPGET, 1); - errorCode = curl_easy_perform(ctx->curl_handle); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } + responseCode = esxVI_CURL_Perform(conn, ctx, url); - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, - &responseCode); + virMutexUnlock(&ctx->curl_lock); - if (errorCode != CURLE_OK) { + if (responseCode < 0) { + goto failure; + } else if (responseCode != 200) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; + "HTTP response code %d while trying to download '%s'", + responseCode, url); + goto failure; } - virMutexUnlock(&ctx->curl_lock); - if (virBufferError(&buffer)) { virReportOOMError(conn); goto failure; @@ -476,32 +529,19 @@ esxVI_Context_DownloadFile(virConnectPtr conn, esxVI_Context *ctx, *content = virBufferContentAndReset(&buffer); - if (responseCode != 200) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d while trying to download '%s'", - (int)responseCode, url); - goto failure; - } - return 0; failure: free(virBufferContentAndReset(&buffer)); return -1; - - unlock: - virMutexUnlock(&ctx->curl_lock); - - goto failure; } int esxVI_Context_UploadFile(virConnectPtr conn, esxVI_Context *ctx, const char *url, const char *content) { - CURLcode errorCode; - long responseCode; + int responseCode = 0; if (content == NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); @@ -515,40 +555,20 @@ esxVI_Context_UploadFile(virConnectPtr conn, esxVI_Context *ctx, curl_easy_setopt(ctx->curl_handle, CURLOPT_UPLOAD, 1); curl_easy_setopt(ctx->curl_handle, CURLOPT_INFILESIZE, strlen(content)); - errorCode = curl_easy_perform(ctx->curl_handle); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } - - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, - &responseCode); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } + responseCode = esxVI_CURL_Perform(conn, ctx, url); virMutexUnlock(&ctx->curl_lock); - if (responseCode != 200 && responseCode != 201) { + if (responseCode < 0) { + return -1; + } else if (responseCode != 200 && responseCode != 201) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "HTTP response code %d while trying to upload to '%s'", - (int)responseCode, url); + responseCode, url); return -1; } return 0; - - unlock: - virMutexUnlock(&ctx->curl_lock); - - return -1; } int @@ -558,7 +578,6 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, { virBuffer buffer = VIR_BUFFER_INITIALIZER; esxVI_Fault *fault = NULL; - CURLcode errorCode; if (request == NULL || response == NULL || *response != NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); @@ -577,27 +596,14 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, curl_easy_setopt(ctx->curl_handle, CURLOPT_POSTFIELDS, request); curl_easy_setopt(ctx->curl_handle, CURLOPT_POSTFIELDSIZE, strlen(request)); - errorCode = curl_easy_perform(ctx->curl_handle); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } + (*response)->responseCode = esxVI_CURL_Perform(conn, ctx, ctx->url); - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, - &(*response)->responseCode); + virMutexUnlock(&ctx->curl_lock); - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; + if ((*response)->responseCode < 0) { + goto failure; } - virMutexUnlock(&ctx->curl_lock); - if (virBufferError(&buffer)) { virReportOOMError(conn); goto failure; @@ -695,8 +701,7 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, } } else if ((*response)->responseCode != 200) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d", (int)(*response)->responseCode); - + "HTTP response code %d", (*response)->responseCode); goto failure; } @@ -708,11 +713,6 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, esxVI_Fault_Free(&fault); return -1; - - unlock: - virMutexUnlock(&ctx->curl_lock); - - goto failure; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 4892fde..4b3005e 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -110,7 +110,7 @@ int esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, */ struct _esxVI_Response { - long responseCode; /* required */ + int responseCode; /* required */ char *content; /* required */ xmlDocPtr document; /* optional */ xmlXPathContextPtr xpathContext; /* optional */ -- 1.6.0.4

3 5

[libvirt] [patch] Add openvzDomainSetMemoryInternal
by Yuji NISHIDA 03 Nov '09

03 Nov '09

Hi all, This patch is to set KMEMSIZE for OpenVZ. This function is used for initializing the parameter of KMEMSIZE to start container. openvzDomainSetMemory should be left for another purpose so I added new one. I think users should specify memory as kbyte ( or bigger ). --- src/openvz/openvz_driver.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index f64ad1e..5c1fefa 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -69,6 +69,7 @@ static int openvzGetMaxVCPUs(virConnectPtr conn, const char *type); static int openvzDomainGetMaxVcpus(virDomainPtr dom); static int openvzDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus); static int openvzDomainSetVcpusInternal(virConnectPtr conn, virDomainObjPtr vm, unsigned int nvcpus); +static int openvzDomainSetMemoryInternal(virConnectPtr conn, virDomainObjPtr vm, unsigned long memory); static void openvzDriverLock(struct openvz_driver *driver) { @@ -803,6 +804,14 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml) } } + if (vm->def->memory > 0) { + if (openvzDomainSetMemoryInternal(conn, vm, vm->def->memory) < 0) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Could not set memory size")); + goto cleanup; + } + } + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = -1; @@ -1364,6 +1373,29 @@ static int openvzNumDefinedDomains (virConnectPtr conn) { return ninactive; } +static int openvzDomainSetMemoryInternal(virConnectPtr conn, virDomainObjPtr vm, + unsigned long mem) { + struct openvz_driver *driver = conn->privateData; + char str_mem[16]; + const char *prog[] = { VZCTL, "--quiet", "set", PROGRAM_SENTINAL, + "--kmemsize", str_mem, "--save", NULL }; + + /* memory has to be changed its format from kbyte to byte */ + snprintf( str_mem, sizeof(str_mem), "%lu", mem * 1024 ); + + openvzSetProgramSentinal(prog, vm->def->name); + if (virRun(conn, prog, NULL) < 0) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + _("Could not exec %s"), VZCTL); + goto cleanup; + } + + return 0; + +cleanup: + return -1; +} + static virDriver openvzDriver = { VIR_DRV_OPENVZ, "OPENVZ", -- 1.5.3.4 ----- Yuji Nishida nishidy(a)nict.go.jp

2 1

[libvirt] Don't use private struct member names of in6_addr
by Matthias Bolte 03 Nov '09

03 Nov '09

__in6_u.__u6_addr16 is the private name for this struct member, s6_addr16 is the public one. Our buildserver revealed this problem, because for some reason the internal names are missing the __ prefix there. Matthias

2 2

[libvirt] Remaining interface state reporting issue - bond options
by Laine Stump 03 Nov '09

03 Nov '09

With the patches I sent to netcf-devel last night, along with lutter's (or DV's, take your pick ;-) netcf patch to eliminate the segfault, my patches for reporting interface info now pass make check with no errors. I believe lutter will be making a netcf release tomorrow or so, after he gets back on solid ground. There is one issue left that I'm unsure what to do about - while the xml returned from netcf for bond interfaces does list all the slave interfaces of the bond and their types (and any required info for that type), the parser for bond info in libvirt requires either an miimon or arpmode node inside the bond, eg: <interface type="bond" name="bond0"> <bond> <miimon freq="100" updelay="10" carrier="ioctl"/> <interface type="ethernet" name="eth1"/> <interface type="ethernet" name="eth0"/> </bond> </interface> I haven't been able to find a source of this information yet and, while it may be useful, I don't see it as necessary. Once again I'm proposing that we make these optional in the XML, such that this would be acceptable: <interface type="bond" name="bond0"> <bond> <interface type="ethernet" name="eth1"/> <interface type="ethernet" name="eth0"/> </bond> </interface> Once we do that, the netcf-reported state of all 4 supported interface types (ethernet, bridge, vlan, bond) will pass libvirt's parsing test.

2 2

[libvirt] Add support for qemu's guestfwd
by Matthew Booth 02 Nov '09

02 Nov '09

This series adds support for a vmchannel using qemu's guestfwd. I'll be following up with support for virtio-serial and RHEL5's vmchannel. A vmchannel is specified as: <vmchannel type='pipe'> <source path='/tmp/vmchannel'/> <target type='guestfwd' address='10.0.2.1' port='4600'/> </vmchannel> There are a couple of minor complications. Firstly, the existing chrdev structure assumes that all front-ends take only a port. There's a bit of code churn adding a second union to this struct to allow for different data for different backends. Secondly, it turns out that the existing syntax for character devices doesn't really work for guestfwd. Specifically it won't allow common options to be added. This is fixed in qemu git with the new -chardev syntax. Consequently, this patch only adds support for guestfwd using -chardev. We add detection for -chardev, and a new internal utility function to output -chardev command lines for all existing character device backends. Matt

1 4

[libvirt] [PATCH] drop the -logrotate.conf from /etc/logrotate.d/ovirt-logrotate.conf
by Dan Kenigsberg 02 Nov '09

02 Nov '09

No Fedora package uses .conf in that directory; furthermore, rpmlint protests about it: the file name should match the name of the containing rpm. Let us conform. --- logrotate/ovirt-logrotate | 2 +- ovirt-node.spec.in | 4 ++-- scripts/ovirt-config-logging | 2 +- scripts/ovirt-functions | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/logrotate/ovirt-logrotate b/logrotate/ovirt-logrotate index a61af6f..ad32951 100644 --- a/logrotate/ovirt-logrotate +++ b/logrotate/ovirt-logrotate @@ -1,3 +1,3 @@ # Run each log rotation every 10 minutes -*/10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/ovirt-logrotate.conf +*/10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/ovirt-node-stateless */10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/syslog diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 3a8266e..20fea25 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -180,7 +180,7 @@ cd - %{__install} -p -m0755 kinit/ovirt-kinit %{buildroot}%{_sysconfdir}/cron.hourly %{__install} -p -m0644 logrotate/ovirt-logrotate %{buildroot}%{_sysconfdir}/cron.d -%{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d +%{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ovirt-node-stateless echo "oVirt Node release %{version}-%{release}" > %{buildroot}%{_sysconfdir}/ovirt-release mkdir -p %{buildroot}/%{_sysconfdir}/default @@ -310,7 +310,7 @@ fi %{_initrddir}/ovirt %{_initrddir}/ovirt-post %config %{_sysconfdir}/cron.hourly/ovirt-kinit -%config %{_sysconfdir}/logrotate.d/ovirt-logrotate.conf +%config %{_sysconfdir}/logrotate.d/ovirt-node-stateless %config %{_sysconfdir}/cron.d/ovirt-logrotate %{_sysconfdir}/ovirt-config-boot.d %{_sysconfdir}/ovirt-config-setup.d diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging index 464dfcb..de238b7 100755 --- a/scripts/ovirt-config-logging +++ b/scripts/ovirt-config-logging @@ -158,7 +158,7 @@ function prompt_user { $syslog_server_protocol fi sed -c -i -e "s/^size=.*/size=${max_log_size}k/" \ - /etc/logrotate.d/ovirt-logrotate.conf + /etc/logrotate.d/ovirt-node-stateless return ;; 1) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 98e88e7..7e84415 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -28,7 +28,7 @@ OVIRT_CONFIG_FILES="\ /etc/default/ovirt \ /etc/sysconfig/network \ /etc/collectd.conf \ - /etc/logrotate.d/ovirt-logrotate.conf + /etc/logrotate.d/ovirt-node-stateless " # Save stdout to fd 6 and stderr to fd 7. Redirect normal stdout/stderr -- 1.6.2.5

2 2

Re: [libvirt] [PATCH 10/21] Don't let parent of daemon exit until basic initialization is done
by Laurent Léonard 01 Nov '09

01 Nov '09

Hi, I'm not a C expert, but I see there is a use of an unitialized variable: default: { int got, exitstatus = 0; int ret; char status; close(statuspipe[1]); /* We wait to make sure the first child forked successfully */ if ((got = waitpid(pid, &exitstatus, 0)) < 0 || got != pid || status != 0) { <<< here return -1; } That explains the issue described by Guido, because he uses an i386 system. It was impossible for me to reproduce the issue because I use an amd64 system. char test; if (test == 0) puts("ok"); else puts("ko"); produces: - "ok" on amd64 system - "ko" on i386 system If I use the exitstatus variable in the test it seems to work great on both architectures. -- Laurent Léonard

2 1

[libvirt] [PATCH] network utilities
by Daniel Veillard 31 Oct '09

31 Oct '09

Revamping my previous patches to parse IPv4/6 numeric addresses, adding range computation and netmask checking entries too. As suggested I used an union for the socket address type: typedef union { struct sockaddr_storage stor; struct sockaddr_in inet4; struct sockaddr_in6 inet6; } virSocketAddr; typedef virSocketAddr *virSocketAddrPtr; But I wonder if it's not better to make it a struct and add the lenght of the address as this is usually needed when passing one of the struct sockaddr_* and that lenght is returned as part of parsing, keeping both together is probably more useful. A macro to get the type AF_INET/AF_INET6 out of a virSocketAddr might be useful instead of having the users manually guess that ->stor.ss_family is teh filed to look at. Also I wonder how useful the Ipv6 code for netmask and ranges really is, it seems that IPv6 mostly go with prefix and never use netmasks, maybe that's just dead code, maybe that's just wrong, anyway here it is. I named the header and file network.[ch] as I think other network related utilities like validation or generation of MAC addresses could well be moved in that file too. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 8

[libvirt] [PATCH] Fix up a bogus TLS message.
by Chris Lalancette 31 Oct '09

31 Oct '09

When working with the TLS transport, I noticed that every single time a remote stream was closed, I would get a message like: 09:09:40.793: error : remoteIOReadBuffer:7328 : failed to read from TLS socket A TLS packet with unexpected length was received. libvir: QEMU error : failed to read from TLS socket A TLS packet with unexpected length was received. in the logs. This happens because of a race in libvirtd; one thread handles the doRemoteClose(), which calls gnutls_bye() followed by close() while another thread is poll()'ing on the same fd. Once the close() happens, the poll returns with revents set to POLLIN, and we would poll one more time for data from the now-closed fd. Fix this situation by setting poll->session to NULL when we clean up, and check for that in remoteIOHandleInput(). Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/remote/remote_driver.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index bf001eb..335f44b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1389,6 +1389,7 @@ doRemoteClose (virConnectPtr conn, struct private_data *priv) if (priv->uses_tls && priv->session) { gnutls_bye (priv->session, GNUTLS_SHUT_RDWR); gnutls_deinit (priv->session); + priv->session = NULL; } #if HAVE_SASL if (priv->saslconn) @@ -7223,6 +7224,12 @@ remoteIOReadBuffer(virConnectPtr conn, int ret; if (priv->uses_tls) { + if (!priv->session) { + /* we may have reached here one more time after gnutls_bye() + * was called, so just return here + */ + return 0; + } tls_resend: ret = gnutls_record_recv (priv->session, bytes, len); if (ret == GNUTLS_E_INTERRUPTED) -- 1.6.0.6

3 3

[libvirt] Restore after restart libvirtd
by Diego Woitasen 30 Oct '09

30 Oct '09

Hi, I 'm playing with save/restore domains. It's working, but if I restart libvirtd after 'save domain file' and then try to restore it I get: error: Failed to restore domain from /tmp/domain.out error: operation failed: domain 'domainname' is already defined with uuid 17c77406-b6e3-621a-1fae-420affce8f48 If I move domainname.xml out of libvirt config. directory it works, but I think this should not be necessary. Regards, Diego -- Diego Woitasen

2 3

[libvirt] 0.7.1 compile fails on opensuse 11.1
by Dominik Klein 30 Oct '09

30 Oct '09

Hi it seems openSuSE 11.1 does not come with a pkgconfig for the device-mapper-devel package. I created a bug [1] for opensuse but was also told to mention it here so configure.in could be patched once the bug was fixed. Regards Dominik 1 https://bugzilla.novell.com/show_bug.cgi?id=54094

4 9

[libvirt] [PATCH] Priority of vzctl create should be lower
by Yuji NISHIDA 30 Oct '09

30 Oct '09

Hi all About OpenVZ, it uses vzctl command that produces tar/gzip commands. I think we should lower these commands for running other procedures prior to them. This is the patch to achieve it with nice/ionice commands. From ff3cf022995ef541136bd40579af2eeb20aeafdb Mon Sep 17 00:00:00 2001 From: root <root(a)node13.nvlab.org> Date: Mon, 26 Oct 2009 02:44:43 +0000 Subject: [PATCH] lower priority for running tar and gzip during vzctl create --- src/openvz/openvz_driver.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index f64ad1e..59d38ae 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -130,6 +130,14 @@ openvzDomainDefineCmd(virConnectPtr conn, } while (0) narg = 0; + + /* lower priority for running tar and gzip */ + ADD_ARG_LIT("nice"); + ADD_ARG_LIT("-n"); + ADD_ARG_LIT("19"); + ADD_ARG_LIT("ionice"); + ADD_ARG_LIT("-c3"); + ADD_ARG_LIT(VZCTL); ADD_ARG_LIT("--quiet"); ADD_ARG_LIT("create"); -- 1.5.3.4 ----- Yuji Nishida nishidy(a)nict.go.jp

3 3

[libvirt] QEMU driver thread safety rules
by Daniel P. Berrange 30 Oct '09

30 Oct '09

The current QEMU driver makes use of 2 locks - The driver lock - The virDomainObjPtr lock The idea is the driver lock is not held for long periods of time. Unfortunately we don't always deal with this very well - some code needs todo quite alot with the driver - particularly starting and stopping of guests. The bigger problem is that the virDomainObjPtr lock is often held for long periods, specifically whenever we invoke a monitor command. Some of these commands can take a very long time (even infinite if someone has send SIGSTOP to QEMU). This very quickly blocks the whole driver. I've realized that even with the series of monitor patches I sent out, changing the driver mutex to a RWLock, and adding a separate lock on the qemuMonitorPtr object iself, there's still a major concurrency problem: the virDomainObjPtr lock is held for too long. I propose to drop the RWLock patch, and do something totally different instead.... We fundamentally need to drop the virDomainObjPtr lock whenever we invoke a monitor command. Unfortunately, merely dropping the virDomainObjPtr and acquiring the qemuMonitorPtr is not safe. An API call which changes the VM state typically has 3 phases 1. Check what state/config the VM is in 2. Invoke the monitor command 3. Update the state/config of the VM If we release the virDomainObjPtr, and acquire qemuMonitorPtr at step 2, then other APIs calls will be able to complete their own step 1 checks, and get blocked at step 2. This is not safe, because when the original call moves onto step 3 and changes the state, this will have invalidated the checks the other sleeping API calls made in step 1. We need to prevent any API call starting step 1, for as long as there is a monitor command being run, even if the lock on virDomainObjPtr is not held. The only way I see todo this, is to introduce a condition variable indicating that a state change is to be made. Any API call which intends to make a state change must acquire this condition prior to step 1. They can thus safely do their checks, and move onto step 2, releasing the virDomainObj lock whle the monitor command is running, and reacquiring it after. All other API calls making changes get safely queued up at step 1, but API calls which simply wish to query information can run without being blocked at all. This fixes the major concurrency problem with running monitor commands. The use of a condition variable at the start of step 1, also allows us to time out API calls, if some other thread get stuck in the monitor for too long. I think this also makes the use of a RWLock on the QEMU driver unneccessary, since no code will ever be holding a mutex in any place that sleeps/wait. Only the condition variable will be held during sleeps/waits. Since we'll now effectively have 3 locks, and 1 condition variable this is getting kind of complex. So the rest of this mail is a file I propose to put in src/qemu/THREADS.txt describing what is going on, and showing the recommended design patterns to use. Daniel QEMU Driver Threading: The Rules ================================= This document describes how thread safety is ensured throughout the QEMU driver. The criteria for this model are: - Objects must never be exclusively locked for any pro-longed time - Code which sleeps must be able to time out after suitable period - Must be safe against dispatch asynchronous events from monitor Basic locking primitives ------------------------ There are a number of locks on various objects * struct qemud_driver: RWLock This is the top level lock on the entire driver. Every API call in the QEMU driver is blocked while this is held, though some internal callbacks may still run asynchronously. This lock must never be held for anything which sleeps/waits (ie monitor commands) When obtaining the driver lock, under *NO* circumstances must any lock be held on a virDomainObjPtr. This *WILL* result in deadlock. * virDomainObjPtr: Mutex Will be locked after calling any of the virDomainFindBy{ID,Name,UUID} methods. Lock must be held when changing/reading any variable in the virDomainObjPtr Once the lock is held, you must *NOT* try to lock the driver. You must release all virDomainObjPtr locks before locking the driver, or deadlock *WILL* occurr. If the lock needs to be dropped & then re-acquired for a short period of time, the reference count must be incremented first using virDomainObjRef(). If the reference count is incremented in this way, it is not neccessary to have the driver locked when re-acquiring the dropped locked, since the reference count prevents it being freed by another thread. This lock must not be held for anything which sleeps/waits (ie monitor commands). * qemuMonitorPrivatePtr: Job condition Since virDomainObjPtr lock must not be held during sleeps, the job condition provides additional protection for code making updates. Immediately after acquiring the virDomainObjPtr lock, any method which intends to update state, must acquire the job condition. The virDomainObjPtr lock is released while blocking on this condition variable. Once the job condition is acquired a method can safely release the virDomainObjPtr lock whenever it hits a piece of code which may sleep/wait, and re-acquire it after the sleep/ wait. * qemuMonitorPtr: Mutex Lock to be used when invoking any monitor command to ensure safety wrt any asynchronous events that may be dispatched from the monitor. It should be acquired before running a command. The job condition *MUST* be held before acquiring the monitor lock The virDomainObjPtr lock *MUST* be held before acquiring the monitor lock. The virDomainObjPtr lock *MUST* then be released when invoking the monitor command. The driver lock *MUST* be released when invoking the monitor commands. This ensures that the virDomainObjPtr & driver are both unlocked while sleeping/waiting for the monitor response. Helper methods -------------- To lock the driver qemuDriverLock() - Acquires the driver lock qemuDriverUnlock() - Releases the driver lock To lock the virDomainObjPtr virDomainObjLock() - Acquires the virDomainObjPtr lock virDomainObjUnlock() - Releases the virDomainObjPtr lock To acquire the job condition variable (int jobActive) qemuDomainObjBeginJob() (if driver is unlocked) - Increments ref count on virDomainObjPtr - Wait qemuDomainObjPrivate condition 'jobActive != 0' using virDomainObjPtr mutex - Sets jobActive to 1 qemuDomainObjBeginJobWithDriver() (if driver needs to be locked) - Unlocks driver - Increments ref count on virDomainObjPtr - Wait qemuDomainObjPrivate condition 'jobActive != 0' using virDomainObjPtr mutex - Sets jobActive to 1 - Unlocks virDomainObjPtr - Locks driver - Locks virDomainObjPtr NB: this variant is required in order to comply with lock ordering rules for virDomainObjPtr vs driver qemuDomainObjEndJob() - Set jobActive to 0 - Signal on qemuDomainObjPrivate condition - Decrements ref count on virDomainObjPtr To acquire the QEMU monitor lock qemuDomainObjEnterMonitor() - Acquires the qemuMonitorObjPtr lock - Releases the virDomainObjPtr lock qemuDomainObjExitMonitor() - Acquires the virDomainObjPtr lock - Releases the qemuMonitorObjPtr lock NB: caller must take care to drop the driver lock if neccessary Design patterns --------------- All driver methods must follow one of these design patterns to ensure thread safety and lock correctness. * Accessing or updating something with just the driver qemuDriverLock(driver); ...do work... qemuDriverUnlock(driver); * Accessing something directly todo with a virDomainObjPtr virDomainObjPtr obj; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDriverUnlock(driver); ...do work... virDomainObjUnlock(obj); * Accessing something directly todo with a virDomainObjPtr and driver virDomainObjPtr obj; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); ...do work... virDomainObjUnlock(obj); qemuDriverUnlock(driver); * Updating something directly todo with a virDomainObjPtr virDomainObjPtr obj; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDriverUnlock(driver); qemuDomainObjBeginJob(obj); ...do work... qemuDomainObjEndJob(obj); virDomainObjUnlock(obj); * Invoking a monitor command on a virDomainObjPtr virDomainObjPtr obj; qemuDomainObjPrivatePtr priv; qemuDriverLockRO(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDriverUnlock(driver); qemuDomainObjBeginJob(obj); ...do prep work... qemuDomainObjEnterMonitor(obj); qemuMonitorXXXX(priv->mon); qemuDomainObjExitMonitor(obj); ...do final work... qemuDomainObjEndJob(obj); virDomainObjUnlock(obj); * Invoking a monitor command on a virDomainObjPtr with driver locked too virDomainObjPtr obj; qemuDomainObjPrivatePtr priv; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDomainObjBeginJobWithDriver(obj); ...do prep work... qemuDomainObjEnterMonitor(obj); qemuDriverUnlock(driver); qemuMonitorXXXX(priv->mon); qemuDriverLock(driver); qemuDomainObjExitMonitor(obj); ...do final work... qemuDomainObjEndJob(obj); virDomainObjUnlock(obj); qemuDriverUnlock(driver); Summary ------- * Respect lock ordering rules: never lock driver if anything else is already locked * Don't hold locks in code which sleeps: unlock driver & virDomainObjPtr when using monitor -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 4

[libvirt] remote clients are non-interruptible
by John Levon 30 Oct '09

30 Oct '09

remoteIOEventLoop() has this: 6974 repoll: 6975 ret = poll(fds, ARRAY_CARDINALITY(fds), -1); 6976 if (ret < 0 && errno == EINTR) 6977 goto repoll; with the result that all clients using the remote driver cannot be control-C'd. Dan, you added this code it seems, why? regards john

4 3

[libvirt] Re: [virt-tools-list] Remote management over SSH fails to connect
by Cole Robinson 30 Oct '09

30 Oct '09

On 10/25/2009 10:25 AM, Jon Nordby wrote: > I get the following errors (skipping "system" yields the same): > [root@jon-laptop ~]# virsh -c qemu+ssh://10.0.0.2/system list > error: server closed connection > error: failed to connect to the hypervisor > > However, SSH and libvirtd both work on their own: > [root@jon-laptop ~]# ssh 10.0.0.2 > Last login: Sun Oct 25 14:06:07 2009 from 10.0.0.143 > [root@server0 ~]# virsh list > Id Name State > ---------------------------------- > 21 family-server running > > The connection is allowed in hosts.allow > libvirt 0.7.2 in both ends, kvm backend, Arch Linux > > What could be the source of this problem? And how can I find it? > ccing libvirt-list This could be an issue of 'nc' incompatibility. Does the 'nc' command on the remote system support the -U option? If you run the virsh command with LIBVIRT_DEBUG=1 virsh ... you should see the ssh command being run. See if running the command by hand produces an error. - Cole

3 2

[libvirt] Release 0.3.1 of libvirt-java
by Bryan Kearney 30 Oct '09

30 Oct '09

I have released version 0.3.1 of libvirt-java. Thanks to Thomas Treutner for his debugging help. You can get the latest from: Latest source tarball, rpm, and srpm: http://libvirt.org/sources/java/ Latest source code: git://libvirt.org/git/libvirt-java.git Maven: http://www.libvirt.org/maven2/ Latest rpms were submitted to Fedora Rawhide and F-11. iBiblio should update soon. -- bk

1 0

[libvirt] Got Windows guests?
by Richard W.M. Jones 30 Oct '09

30 Oct '09

Hello fellow Fedora, libvirt and libguestfs users, If you have any Windows guests, then you can help Fedora to support Windows guests better by spending a few minutes testing the Windows Registry feature we just added to libguestfs 1.0.75. You will need: - A Windows NT/200x/XP/Vista/7/... guest - Fedora 12 or Fedora Rawhide host - libguestfs-tools >= 1.0.75 (from updates or http://koji.fedoraproject.org/koji/packageinfo?packageID=8391 ) - a few minutes of your time The tests: (1) Run the virt-win-reg commands shown in the following web page, where "MyWinGuest" should be replaced with the name of the Windows guest as known to libvirt: http://libguestfs.org/virt-win-reg.1.html#examples Do the commands run without any errors? Does the output look sensible? If you have several Windows guests, please try as many different sorts as possible! (2) Download the registry binary files and try to convert them to XML: guestfish -i MyWinGuest --ro <<'EOF' download win:\windows\system32\config\software software download win:\windows\system32\config\system system download win:\windows\system32\config\sam sam download win:\windows\system32\config\security security EOF hivexml software > software.xml hivexml system > system.xml hivexml sam > sam.xml hivexml security > security.xml Do those commands run without error? If there's an error, try adding the hivexml -k option. Does the XML look complete? (Try running the XML through tidy -xml -indent -quiet < foo.xml | less ) I hope you don't find any bugs, but if you do: Send a reply to this message, or report a bug in Bugzilla: https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virt… It's useful to include the following details: HIVEX_DEBUG=1 hivexml regfile 2>&1 > log.out The Registry file itself that is failing (but note that Registry files can contain sensitive data). It's also useful to have positive feedback ("it worked!"). Thanks for any testing you can give, and if you have any other suggestions for handling Windows guests from Fedora, please let me know. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

1 0

[libvirt] Application using libvirt crashes when having concurrent TLS connections (gnutls problem)
by Thomas Treutner 30 Oct '09

30 Oct '09

Hi list, I was wondering about the status of this bug: https://bugzilla.redhat.com/show_bug.cgi?id=512367 Is it correct that this is a bug in the libvirt client? I ran into this today, as I've written a kind of a VM scheduler (ressource requirements, placement etc.) in Java (libvirt-java 0.3.0, libvirt 0.6.5) and this is a show-stopper for me right now. I had some troubles with the newest version of libvirt (it couldn't connect to Xen IIRC), so I don't want to mess my setup again for nothing. What is actually causing this problem resp. in which situation is libvirt broken? When a client uses more than one connection at the same time? Or when a client uses more than one connection to the same server at the same time? Are there any recommeded workarounds? TIA & kr, thomas

3 8

[libvirt] [PATCH] ESX: Change disk selection for datastore detection.
by Matthias Bolte 29 Oct '09

29 Oct '09

In order to register a new virtual machine the ESX driver needs to upload a VMX file to a datastore. Try to put this file beside the main VMDK file of the virtual machine. Change the disk selection for datastore detection to choose the first file-based harddisk instead of just the first disk. The first disk may be a CDROM disk and ISO images are normaly not located in the virtual machine's directory. * src/esx/esx_driver.c: change disk selection for datastore detection --- src/esx/esx_driver.c | 44 +++++++++++++++++++++++++++++++++----------- 1 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index e063b46..a0efa5d 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2410,6 +2410,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) esxPrivate *priv = (esxPrivate *)conn->privateData; virDomainDefPtr def = NULL; char *vmx = NULL; + int i; + virDomainDiskDefPtr disk = NULL; esxVI_ObjectContent *virtualMachine = NULL; char *datastoreName = NULL; char *directoryName = NULL; @@ -2458,31 +2460,51 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) goto failure; } - /* Build VMX datastore URL */ + /* + * Build VMX datastore URL. Use the source of the first file-based harddisk + * to deduce the datastore and path for the VMX file. Don't just use the + * first disk, because it may be CDROM disk and ISO images are normaly not + * located in the virtual machine's directory. This approach to deduce the + * datastore isn't perfect but should work in the majority of cases. + */ if (def->ndisks < 1) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Domain XML doesn't contain a disk, cannot deduce datastore " - "and path for VMX file"); + "Domain XML doesn't contain any disks, cannot deduce " + "datastore and path for VMX file"); goto failure; } - if (def->disks[0]->src == NULL) { + for (i = 0; i < def->ndisks; ++i) { + if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK && + def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_FILE) { + disk = def->disks[i]; + break; + } + } + + if (disk == NULL) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "First disk has no source, cannot deduce datastore and path " - "for VMX file"); + "Domain XML doesn't contain any file-based harddisks, " + "cannot deduce datastore and path for VMX file"); goto failure; } - if (esxUtil_ParseDatastoreRelatedPath(conn, def->disks[0]->src, - &datastoreName, &directoryName, - &fileName) < 0) { + if (disk->src == NULL) { + ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "First file-based harddisk has no source, cannot deduce " + "datastore and path for VMX file"); + goto failure; + } + + if (esxUtil_ParseDatastoreRelatedPath(conn, disk->src, &datastoreName, + &directoryName, &fileName) < 0) { goto failure; } if (! virFileHasSuffix(fileName, ".vmdk")) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Expecting source of first disk '%s' to be a VMDK image", - def->disks[0]->src); + "Expecting source '%s' of first file-based harddisk to be a " + "VMDK image", disk->src); goto failure; } -- 1.6.0.4

2 2

[libvirt] [PATCH] ESX: Fallback to the preliminary name if the datastore cannot be found.
by Matthias Bolte 29 Oct '09

29 Oct '09

This allows to use domain-xml-from-native with VMX files that reference unavailable datastores. * src/esx/esx_vmx.c: fallback to the preliminary name if the datastore cannot be found --- src/esx/esx_vmx.c | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 8e2bdec..a9ff1b4 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -606,34 +606,37 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(virConnectPtr conn, if (ctx != NULL) { if (esxVI_LookupDatastoreByName(conn, ctx, preliminaryDatastoreName, NULL, &datastore, - esxVI_Occurence_RequiredItem) < 0) { + esxVI_Occurence_OptionalItem) < 0) { goto failure; } - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.accessible")) { - /* Ignore it */ - } else if (STREQ(dynamicProperty->name, "summary.name")) { - if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val, - esxVI_Type_String) < 0) { - goto failure; + if (datastore != NULL) { + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "summary.accessible")) { + /* Ignore it */ + } else if (STREQ(dynamicProperty->name, "summary.name")) { + if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val, + esxVI_Type_String) < 0) { + goto failure; + } + + datastoreName = dynamicProperty->val->string; + break; + } else if (STREQ(dynamicProperty->name, "summary.url")) { + /* Ignore it */ + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); } - - datastoreName = dynamicProperty->val->string; - break; - } else if (STREQ(dynamicProperty->name, "summary.url")) { - /* Ignore it */ - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); } } if (datastoreName == NULL) { - ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Could not retrieve datastore name for absolute path '%s'", - absolutePath); - goto failure; + VIR_WARN("Could not retrieve datastore name for absolute " + "path '%s', falling back to preliminary name '%s'", + absolutePath, preliminaryDatastoreName); + + datastoreName = preliminaryDatastoreName; } } else { datastoreName = preliminaryDatastoreName; -- 1.6.0.4

2 1

[libvirt] [PATCH] ESX: Unify naming of VI API utility and convenience functions.
by Matthias Bolte 29 Oct '09

29 Oct '09

Unified function naming scheme: - 'lookup' functions query the ESX or vCenter for information - 'get' functions return information from a local object * src/esx/esx_driver.c, src/esx/esx_vi.[ch]: unify function naming --- src/esx/esx_driver.c | 95 ++++++++++++++++++++++++++++---------------------- src/esx/esx_vi.c | 77 +++++++++++++++++++++++----------------- src/esx/esx_vi.h | 32 +++++++++------- 3 files changed, 116 insertions(+), 88 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index a0efa5d..93fb5a9 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -90,9 +90,10 @@ esxSupportsLongMode(virConnectPtr conn) if (esxVI_String_AppendValueToList(conn, &propertyNameList, "hardware.cpuFeature") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -522,9 +523,10 @@ esxSupportsVMotion(virConnectPtr conn) if (esxVI_String_AppendValueToList(conn, &propertyNameList, "capability.vmotionSupported") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -653,9 +655,10 @@ esxGetHostname(virConnectPtr conn) (conn, &propertyNameList, "config.network.dnsConfig.hostName\0" "config.network.dnsConfig.domainName\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -750,9 +753,10 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) "hardware.memorySize\0" "hardware.numaInfo.numNodes\0" "summary.hardware.cpuModel\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -914,9 +918,10 @@ esxListDomains(virConnectPtr conn, int *ids, int maxids) if (esxVI_String_AppendValueToList(conn, &propertyNameList, "runtime.powerState") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -970,7 +975,7 @@ esxNumberOfDomains(virConnectPtr conn) return -1; } - return esxVI_GetNumberOfDomainsByPowerState + return esxVI_LookupNumberOfDomainsByPowerState (conn, priv->host, esxVI_VirtualMachinePowerState_PoweredOn, esxVI_Boolean_False); } @@ -999,9 +1004,10 @@ esxDomainLookupByID(virConnectPtr conn, int id) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -1082,9 +1088,10 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -1168,9 +1175,10 @@ esxDomainLookupByName(virConnectPtr conn, const char *name) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -2042,10 +2050,10 @@ esxDomainGetMaxVcpus(virDomainPtr domain) if (esxVI_String_AppendValueToList(domain->conn, &propertyNameList, "capability.maxSupportedVcpus") < 0 || - esxVI_GetObjectContent(domain->conn, priv->host, - priv->host->hostFolder, "HostSystem", - propertyNameList, esxVI_Boolean_True, - &hostSystem) < 0) { + esxVI_LookupObjectContentByType(domain->conn, priv->host, + priv->host->hostFolder, "HostSystem", + propertyNameList, esxVI_Boolean_True, + &hostSystem) < 0) { goto failure; } @@ -2270,9 +2278,10 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) if (esxVI_String_AppendValueListToList(conn, &propertyNameList, "name\0" "runtime.powerState\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -2337,7 +2346,7 @@ esxNumberOfDefinedDomains(virConnectPtr conn) return -1; } - return esxVI_GetNumberOfDomainsByPowerState + return esxVI_LookupNumberOfDomainsByPowerState (conn, priv->host, esxVI_VirtualMachinePowerState_PoweredOn, esxVI_Boolean_True); } @@ -2550,8 +2559,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) goto failure; } - if (esxVI_GetResourcePool(conn, priv->host, hostSystem, - &resourcePool) < 0) { + if (esxVI_LookupResourcePoolByHostSystem(conn, priv->host, hostSystem, + &resourcePool) < 0) { goto failure; } @@ -3071,8 +3080,8 @@ esxDomainMigratePerform(virDomainPtr domain, goto failure; } - if (esxVI_GetResourcePool(domain->conn, priv->vCenter, hostSystem, - &resourcePool) < 0) { + if (esxVI_LookupResourcePoolByHostSystem(domain->conn, priv->vCenter, + hostSystem, &resourcePool) < 0) { goto failure; } @@ -3172,8 +3181,8 @@ esxNodeGetFreeMemory(virConnectPtr conn) goto failure; } - if (esxVI_GetResourcePool(conn, priv->host, hostSystem, - &managedObjectReference) < 0) { + if (esxVI_LookupResourcePoolByHostSystem(conn, priv->host, hostSystem, + &managedObjectReference) < 0) { goto failure; } @@ -3182,9 +3191,11 @@ esxNodeGetFreeMemory(virConnectPtr conn) /* Get memory usage of resource pool */ if (esxVI_String_AppendValueToList(conn, &propertyNameList, "runtime.memory") < 0 || - esxVI_GetObjectContent(conn, priv->host, managedObjectReference, - "ResourcePool", propertyNameList, - esxVI_Boolean_False, &resourcePool) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + managedObjectReference, + "ResourcePool", propertyNameList, + esxVI_Boolean_False, + &resourcePool) < 0) { goto failure; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index fa971d8..dc51e20 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -374,9 +374,10 @@ esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, } /* Get pointer to Datacenter for later use */ - if (esxVI_GetObjectContent(conn, ctx, ctx->service->rootFolder, - "Datacenter", propertyNameList, - esxVI_Boolean_True, &datacenterList) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, ctx->service->rootFolder, + "Datacenter", propertyNameList, + esxVI_Boolean_True, + &datacenterList) < 0) { goto failure; } @@ -1061,6 +1062,10 @@ esxVI_List_Deserialize(virConnectPtr conn, xmlNodePtr node, esxVI_List **list, /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Utility and Convenience Functions + * + * Function naming scheme: + * - 'lookup' functions query the ESX or vCenter for information + * - 'get' functions get information from a local object */ int @@ -1301,9 +1306,11 @@ esxVI_EnsureSession(virConnectPtr conn, esxVI_Context *ctx) #else if (esxVI_String_AppendValueToList(conn, &propertyNameList, "currentSession") < 0 || - esxVI_GetObjectContent(conn, ctx, ctx->service->sessionManager, - "SessionManager", propertyNameList, - esxVI_Boolean_False, &sessionManager) < 0) { + esxVI_LookupObjectContentByType(conn, ctx, + ctx->service->sessionManager, + "SessionManager", propertyNameList, + esxVI_Boolean_False, + &sessionManager) < 0) { goto failure; } @@ -1358,11 +1365,12 @@ esxVI_EnsureSession(virConnectPtr conn, esxVI_Context *ctx) int -esxVI_GetObjectContent(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ManagedObjectReference *root, - const char *type, esxVI_String *propertyNameList, - esxVI_Boolean recurse, - esxVI_ObjectContent **objectContentList) +esxVI_LookupObjectContentByType(virConnectPtr conn, esxVI_Context *ctx, + esxVI_ManagedObjectReference *root, + const char *type, + esxVI_String *propertyNameList, + esxVI_Boolean recurse, + esxVI_ObjectContent **objectContentList) { int result = 0; esxVI_ObjectSpec *objectSpec = NULL; @@ -1479,9 +1487,9 @@ esxVI_GetVirtualMachinePowerState(virConnectPtr conn, int -esxVI_GetNumberOfDomainsByPowerState(virConnectPtr conn, esxVI_Context *ctx, - esxVI_VirtualMachinePowerState powerState, - esxVI_Boolean inverse) +esxVI_LookupNumberOfDomainsByPowerState(virConnectPtr conn, esxVI_Context *ctx, + esxVI_VirtualMachinePowerState powerState, + esxVI_Boolean inverse) { esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachineList = NULL; @@ -1492,9 +1500,10 @@ esxVI_GetNumberOfDomainsByPowerState(virConnectPtr conn, esxVI_Context *ctx, if (esxVI_String_AppendValueToList(conn, &propertyNameList, "runtime.powerState") < 0 || - esxVI_GetObjectContent(conn, ctx, ctx->vmFolder, "VirtualMachine", - propertyNameList, esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, ctx, ctx->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -1646,9 +1655,10 @@ esxVI_GetVirtualMachineIdentity(virConnectPtr conn, -int esxVI_GetResourcePool(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ObjectContent *hostSystem, - esxVI_ManagedObjectReference **resourcePool) +int +esxVI_LookupResourcePoolByHostSystem + (virConnectPtr conn, esxVI_Context *ctx, esxVI_ObjectContent *hostSystem, + esxVI_ManagedObjectReference **resourcePool) { int result = 0; esxVI_String *propertyNameList = NULL; @@ -1684,9 +1694,10 @@ int esxVI_GetResourcePool(virConnectPtr conn, esxVI_Context *ctx, if (esxVI_String_AppendValueToList(conn, &propertyNameList, "resourcePool") < 0 || - esxVI_GetObjectContent(conn, ctx, managedObjectReference, - "ComputeResource", propertyNameList, - esxVI_Boolean_False, &computeResource) < 0) { + esxVI_LookupObjectContentByType(conn, ctx, managedObjectReference, + "ComputeResource", propertyNameList, + esxVI_Boolean_False, + &computeResource) < 0) { goto failure; } @@ -1751,9 +1762,9 @@ esxVI_LookupHostSystemByIp(virConnectPtr conn, esxVI_Context *ctx, goto failure; } - if (esxVI_GetObjectContent(conn, ctx, managedObjectReference, - "HostSystem", propertyNameList, - esxVI_Boolean_False, hostSystem) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, managedObjectReference, + "HostSystem", propertyNameList, + esxVI_Boolean_False, hostSystem) < 0) { goto failure; } @@ -1803,9 +1814,10 @@ esxVI_LookupVirtualMachineByUuid(virConnectPtr conn, esxVI_Context *ctx, } } - if (esxVI_GetObjectContent(conn, ctx, managedObjectReference, - "VirtualMachine", propertyNameList, - esxVI_Boolean_False, virtualMachine) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, managedObjectReference, + "VirtualMachine", propertyNameList, + esxVI_Boolean_False, + virtualMachine) < 0) { goto failure; } @@ -1852,9 +1864,10 @@ esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx, goto failure; } - if (esxVI_GetObjectContent(conn, ctx, ctx->datacenter, - "Datastore", completePropertyNameList, - esxVI_Boolean_True, &datastoreList) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, ctx->datacenter, + "Datastore", completePropertyNameList, + esxVI_Boolean_True, + &datastoreList) < 0) { goto failure; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 6ba6bed..4892fde 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -192,29 +192,33 @@ int esxVI_List_Deserialize(virConnectPtr conn, xmlNodePtr node, /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Utility and Convenience Functions + * + * Function naming scheme: + * - 'lookup' functions query the ESX or vCenter for information + * - 'get' functions get information from a local object */ -int -esxVI_Alloc(virConnectPtr conn, void **ptrptr, size_t size); +int esxVI_Alloc(virConnectPtr conn, void **ptrptr, size_t size); -int -esxVI_CheckSerializationNecessity(virConnectPtr conn, const char *element, - esxVI_Boolean required); +int esxVI_CheckSerializationNecessity(virConnectPtr conn, const char *element, + esxVI_Boolean required); int esxVI_BuildFullTraversalSpecItem (virConnectPtr conn, esxVI_SelectionSpec **fullTraversalSpecList, const char *name, const char *type, const char *path, const char *selectSetNames); + int esxVI_BuildFullTraversalSpecList (virConnectPtr conn, esxVI_SelectionSpec **fullTraversalSpecList); int esxVI_EnsureSession(virConnectPtr conn, esxVI_Context *ctx); -int esxVI_GetObjectContent(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ManagedObjectReference *root, - const char *type, esxVI_String *propertyNameList, - esxVI_Boolean recurse, - esxVI_ObjectContent **objectContentList); +int esxVI_LookupObjectContentByType(virConnectPtr conn, esxVI_Context *ctx, + esxVI_ManagedObjectReference *root, + const char *type, + esxVI_String *propertyNameList, + esxVI_Boolean recurse, + esxVI_ObjectContent **objectContentList); int esxVI_GetManagedEntityStatus (virConnectPtr conn, esxVI_ObjectContent *objectContent, @@ -225,7 +229,7 @@ int esxVI_GetVirtualMachinePowerState (virConnectPtr conn, esxVI_ObjectContent *virtualMachine, esxVI_VirtualMachinePowerState *powerState); -int esxVI_GetNumberOfDomainsByPowerState +int esxVI_LookupNumberOfDomainsByPowerState (virConnectPtr conn, esxVI_Context *ctx, esxVI_VirtualMachinePowerState powerState, esxVI_Boolean inverse); @@ -233,9 +237,9 @@ int esxVI_GetVirtualMachineIdentity(virConnectPtr conn, esxVI_ObjectContent *virtualMachine, int *id, char **name, unsigned char *uuid); -int esxVI_GetResourcePool(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ObjectContent *hostSystem, - esxVI_ManagedObjectReference **resourcePool); +int esxVI_LookupResourcePoolByHostSystem + (virConnectPtr conn, esxVI_Context *ctx, esxVI_ObjectContent *hostSystem, + esxVI_ManagedObjectReference **resourcePool); int esxVI_LookupHostSystemByIp(virConnectPtr conn, esxVI_Context *ctx, const char *ipAddress, -- 1.6.0.4

2 1

[libvirt] [PATCH] ESX: Fix memory leak in list handling functions.
by Matthias Bolte 29 Oct '09

29 Oct '09

If an error occurs between the allocation of an item and appending it to the list, the item leaks. Free such orphaned items in error cases. * src/esx/esx_vi.c: free orphaned items in error cases --- src/esx/esx_vi.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bcf110f..04860e2 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -959,28 +959,22 @@ esxVI_List_CastFromAnyType(virConnectPtr conn, esxVI_AnyType *anyType, esxVI_AnyType_Free(&childAnyType); - if (esxVI_AnyType_Deserialize(conn, childNode, &childAnyType) < 0) { + if (esxVI_AnyType_Deserialize(conn, childNode, &childAnyType) < 0 || + castFromAnyTypeFunc(conn, childAnyType, &item) < 0 || + esxVI_List_Append(conn, list, item) < 0) { goto failure; } item = NULL; - - if (castFromAnyTypeFunc(conn, childAnyType, &item) < 0) { - goto failure; - } - - if (esxVI_List_Append(conn, list, item) < 0) { - goto failure; - } } - cleanup: esxVI_AnyType_Free(&childAnyType); return result; failure: + freeFunc(&item); freeFunc(list); result = -1; @@ -1039,20 +1033,18 @@ esxVI_List_Deserialize(virConnectPtr conn, xmlNodePtr node, esxVI_List **list, goto failure; } - item = NULL; - - if (deserializeFunc(conn, node, &item) < 0) { + if (deserializeFunc(conn, node, &item) < 0 || + esxVI_List_Append(conn, list, item) < 0) { goto failure; } - if (esxVI_List_Append(conn, list, item) < 0) { - goto failure; - } + item = NULL; } return 0; failure: + freeFunc(&item); freeFunc(list); return -1; -- 1.6.0.4

2 1

[libvirt] [PATCH 0/4] Support for SPICE graphics
by Daniel P. Berrange 29 Oct '09

29 Oct '09

This series of patches adds minimal support for SPICE graphics which is newly introduced in RHEL-5.4's fork of KVM. Since this is not yet merged in upstream QEMU/KVM, I'm not proposing to merge all these patches. The two XML schema patches are straightforward to merge. The two implementation ones are RHEL5 specific and I want to avoid declaring them supported until we have a sign of what the upstream merge will look like, since previous attempst to support KVM args prior to QEMU acceptance have been very painful long term. Daniel

3 14

[libvirt] [PATCH] libvirt-devel should only require libvirt-client
by Mark McLoughlin 29 Oct '09

29 Oct '09

There's a long known issue where if you install libvirt in a guest, the default virtual network will conflict with the default virtual network in the host. That's one of the reasons we have the libvirt-client RPM - it allows you to install the client library without having the host side installed. Rich Jones points out that if you install libvirt-devel in a guest, then you get libvirtd installed and the network conflict: https://bugzilla.redhat.com/531200 libvirt-devel should only require libvirt-client - e.g. nothing in the devel package pertains to anything in the libvirt RPM. The Fedora packaging guidelines say: https://fedoraproject.org/wiki/Packaging/Guidelines#Devel_Packages Devel packages must require the base package using a fully versioned dependency ... But for all intents and purposes, libvirt-client is our base RPM. * libvirt.spec.in: make libvirt-devel require libvirt-client --- libvirt.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6cd0888..7e1550e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -341,7 +341,7 @@ virtualization capabilities of recent versions of Linux (and other OSes). %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries -Requires: libvirt = %{version}-%{release} +Requires: libvirt-client = %{version}-%{release} Requires: pkgconfig %if %{with_xen} Requires: xen-devel -- 1.6.2.5

2 1

[libvirt] [PATCH] qemu: Fix an error message in GetVcpus
by Cole Robinson 29 Oct '09

29 Oct '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 082cb04..a3beedb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3481,7 +3481,8 @@ qemudDomainGetVcpus(virDomainPtr dom, if (!virDomainIsActive(vm)) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, - "%s",_("cannot pin vcpus on an inactive domain")); + "%s", + _("cannot list vcpu pinning for an inactive domain")); goto cleanup; } -- 1.6.5.rc2

2 2

[libvirt] [PATCH] Fix p2p migration without a passed uri.
by Cole Robinson 29 Oct '09

29 Oct '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 926c539..126675e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3217,7 +3217,7 @@ virDomainMigrate (virDomainPtr domain, char *dstURI = NULL; if (uri == NULL) { dstURI = virConnectGetURI(dconn); - if (!uri) + if (!dstURI) return NULL; } -- 1.6.5.rc2

2 2

[libvirt] [PATCH] virterror: Add a missing 'break' for VIR_ERR_INVALID_SECRET
by Cole Robinson 29 Oct '09

29 Oct '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/util/virterror.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index 657cb3f..10f979c 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1082,6 +1082,7 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg = _("Invalid secret"); else errmsg = _("Invalid secret: %s"); + break; case VIR_ERR_NO_SECRET: if (info == NULL) errmsg = _("Secret not found"); -- 1.6.5.rc2

2 2

[libvirt] [PATCH] qemu: migrate: Don't require manual URI to specify a port
by Cole Robinson 29 Oct '09

29 Oct '09

The xen driver will generate a migration port if only a hostname is passed in the optional migrate URI, so let's do the same in qemu. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fb952d8..3ef29a6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6304,15 +6304,32 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, /* Get the port number. */ p = strrchr (uri_in, ':'); - p++; /* definitely has a ':' in it, see above */ - this_port = virParseNumber (&p); - if (this_port == -1 || p-uri_in != strlen (uri_in)) { - qemudReportError (dconn, NULL, NULL, VIR_ERR_INVALID_ARG, - "%s", _("URI did not have ':port' at the end")); - goto cleanup; + if (p == strchr(uri_in, ':')) { + /* Generate a port */ + this_port = QEMUD_MIGRATION_FIRST_PORT + port++; + if (port == QEMUD_MIGRATION_NUM_PORTS) + port = 0; + + /* Caller frees */ + if (virAsprintf(uri_out, "%s:%d", uri_in, this_port) < 0) { + virReportOOMError (dconn); + goto cleanup; + } + + } else { + p++; /* definitely has a ':' in it, see above */ + this_port = virParseNumber (&p); + if (this_port == -1 || p-uri_in != strlen (uri_in)) { + qemudReportError (dconn, NULL, NULL, VIR_ERR_INVALID_ARG, + "%s", _("URI ended with incorrect ':port'")); + goto cleanup; + } } } + if (uri_out && *uri_out) + VIR_DEBUG("Generated uri_out=%s", *uri_out); + /* Parse the domain XML. */ if (!(def = virDomainDefParseString(dconn, driver->caps, dom_xml, VIR_DOMAIN_XML_INACTIVE))) { -- 1.6.5.rc2

2 2

[libvirt] [PATCH 0/4] test: Support virStorageFindPoolSources
by Cole Robinson 29 Oct '09

29 Oct '09

The following series refactors the storage pool parsing code to better facilitate FindPoolSources (both for the test driver, and future pool backend implementations). The last patch implements a FindPoolSources for the test driver, with hardcoded results for test:///default. Thanks, Cole Cole Robinson (4): storage: Break out pool source parsing to a separate function. storage: Break out function to add pool source to a SourceList. storage: Add ParseSourceString function for use with FindPoolSources. test: Support virStorageFindPoolSources src/conf/storage_conf.c | 259 +++++++++++++++++++++++---------- src/conf/storage_conf.h | 7 + src/libvirt_private.syms | 2 + src/storage/storage_backend_fs.c | 65 ++++----- src/storage/storage_backend_logical.c | 9 +- src/test/test_driver.c | 75 +++++++++- 6 files changed, 291 insertions(+), 126 deletions(-)

2 9

[libvirt] [PATCH] Update the documentation for virDomainMigrateToURI
by Chris Lalancette 29 Oct '09

29 Oct '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/libvirt.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 9e87900..5787f22 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3154,7 +3154,7 @@ virDomainMigrateDirect (virDomainPtr domain, * XML includes details of the support URI schemes. If omitted * the dconn will be asked for a default URI. * - * In either case it is typically only neccessary to specify a + * In either case it is typically only necessary to specify a * URI if the destination host has multiple interfaces and a * specific interface is required to transmit migration data. * @@ -3273,7 +3273,7 @@ error: /** * virDomainMigrateToURI: * @domain: a domain object - * @duri: mandatory URI for the destination host + * @duri: mandatory URI for the destination host (see below) * @flags: flags * @dname: (optional) rename domain to this at destination * @bandwidth: (optional) specify migration bandwidth limit in Mbps @@ -3285,28 +3285,31 @@ error: * VIR_MIGRATE_LIVE Do not pause the VM during migration * VIR_MIGRATE_PEER2PEER Direct connection between source & destination hosts * VIR_MIGRATE_TUNNELLED Tunnel migration data over the libvirt RPC channel + * VIR_MIGRATE_PERSIST_DEST If the migration is successful, persist the domain + * on the destination host. + * VIR_MIGRATE_UNDEFINE_SOURCE If the migration is successful, undefine the + * domain on the source host. * - * VIR_MIGRATE_TUNNELLED requires that VIR_MIGRATE_PEER2PEER be set. - * Applications using the VIR_MIGRATE_PEER2PEER flag will probably - * prefer to invoke virDomainMigrateToURI, avoiding the need to - * open connection to the destination host themselves. - * - * If a hypervisor supports renaming domains during migration, - * then you may set the dname parameter to the new name (otherwise - * it keeps the same name). If this is not supported by the - * hypervisor, dname must be NULL or else you will get an error. - * - * If the VIR_MIGRATE_PEER2PEER flag is set, the duri parameter - * must be a valid libvirt connection URI, by which the source - * libvirt driver can connect to the destination libvirt. - * + * The operation of this API hinges on the VIR_MIGRATE_PEER2PEER flag. * If the VIR_MIGRATE_PEER2PEER flag is NOT set, the duri parameter * takes a hypervisor specific format. The hypervisor capabilities - * XML includes details of the support URI schemes. Not all hypervisors + * XML includes details of the supported URI schemes. Not all hypervisors * will support this mode of migration, so if the VIR_MIGRATE_PEER2PEER - * flag is not set, then it may be neccessary to use the alternative + * flag is not set, then it may be necessary to use the alternative * virDomainMigrate API providing an explicit virConnectPtr for the - * destination host + * destination host. + * + * If the VIR_MIGRATE_PEER2PEER flag IS set, the duri parameter + * must be a valid libvirt connection URI, by which the source + * libvirt driver can connect to the destination libvirt. + * + * VIR_MIGRATE_TUNNELLED requires that VIR_MIGRATE_PEER2PEER be set. + * + * If a hypervisor supports renaming domains during migration, + * the dname parameter specifies the new name for the domain. + * Setting dname to NULL keeps the domain name the same. If domain + * renaming is not supported by the hypervisor, dname must be NULL or + * else an error will be returned. * * The maximum bandwidth (in Mbps) that will be used to do migration * can be specified with the bandwidth parameter. If set to 0, -- 1.6.0.6

3 3

[libvirt] [PATCH] Better error message when libvirtd fails to start.
by Chris Lalancette 29 Oct '09

29 Oct '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/libvirtd.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 78dfb2d..03bc1b4 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -2972,7 +2972,9 @@ int main(int argc, char **argv) { if (mkdir (rundir, 0755)) { if (errno != EEXIST) { - VIR_ERROR0 (_("unable to create rundir")); + char ebuf[1024]; + VIR_ERROR(_("unable to create rundir %s: %s"), rundir, + virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } } -- 1.6.0.6

3 3

[libvirt] [PATCH] add <bootp server="...">
by Paolo Bonzini 29 Oct '09

29 Oct '09

This patch adds an optional attribute to the <bootp> tag, that allows to specify a TFTP server address other than the address of the DHCP server itself. This can be used to forward the BOOTP settings of the host down to the guest. This is something that configurations such as Xen's default network achieve naturally, but must be done manually for NAT. 2009-10-22 Paolo Bonzini <pbonzini(a)redhat.com> * docs/formatnetwork.html.in: Document new attribute. * docs/schemas/network.rng: Add it to schema. * src/conf/network_conf.h: Add it to struct. * src/conf/network_conf.c: Add it to parser and pretty printer. * src/network/bridge_driver.c: Put it in the dnsmasq command line. * tests/networkxml2xmlin/netboot-proxy-network.xml: New. * tests/networkxml2xmlout/netboot-proxy-network.xml: New. * tests/networkxml2xmltest.c: Add the new test. --- docs/formatnetwork.html.in | 15 ++++++++++----- docs/schemas/network.rng | 3 +++ src/conf/network_conf.c | 9 ++++++++- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 9 +++++++-- tests/networkxml2xmlin/netboot-proxy-network.xml | 13 +++++++++++++ tests/networkxml2xmlout/netboot-proxy-network.xml | 13 +++++++++++++ tests/networkxml2xmltest.c | 1 + 8 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 tests/networkxml2xmlin/netboot-proxy-network.xml create mode 100644 tests/networkxml2xmlout/netboot-proxy-network.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index e471385..eb61f15 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -142,11 +142,16 @@ name to be given that host by the DHCP server (via the <code>name</code> attribute). <span class="since">Since 0.4.5</span> </dd><dt><code>bootp</code></dt><dd>The optional <code>bootp</code> - element specifies BOOTP options to be provided by the DHCP server. - Only one attribute is supported, <code>file</code>, giving the file - to be used for the boot image). The BOOTP options currently have to - be the same for all address ranges and statically assigned addresses.<span - class="since">Since 0.7.1.</span> + element specifies BOOTP options to be provided by the DHCP server. + Two attributes are supported: <code>file</code> is mandatory and + gives the file to be used for the boot image; <code>server</code> is + optional and gives the address of the TFTP server from which the boot + image will be fetched. <code>server</code> defaults to the same host + that runs the DHCP server, as is the case when the <code>tftp</code> + element is used. The BOOTP options currently have to be the same + for all address ranges and statically assigned addresses.<span + class="since">Since 0.7.1 (<code>server</code> since 0.7.3).</span> + </dd> </dl> <h2><a name="examples">Example configuration</a></h2> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 7a2d7d4..adef792 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -109,6 +109,9 @@ <optional> <element name="bootp"> <attribute name="file"><text/></attribute> + <optional> + <attribute name="server"><text/></attribute> + </optional> </element> </optional> </element> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 40f5fdd..fd8efb0 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -117,6 +117,7 @@ void virNetworkDefFree(virNetworkDefPtr def) VIR_FREE(def->tftproot); VIR_FREE(def->bootfile); + VIR_FREE(def->bootserver); VIR_FREE(def); } @@ -313,6 +314,7 @@ virNetworkDHCPRangeDefParseXML(virConnectPtr conn, } def->bootfile = (char *)file; + def->bootserver = (char *) xmlGetProp(cur, BAD_CAST "server"); } cur = cur->next; @@ -671,8 +673,13 @@ char *virNetworkDefFormat(virConnectPtr conn, virBufferAddLit(&buf, "/>\n"); } if (def->bootfile) { - virBufferEscapeString(&buf, " <bootp file='%s' />\n", + virBufferEscapeString(&buf, " <bootp file='%s' ", def->bootfile); + if (def->bootserver) { + virBufferEscapeString(&buf, "server='%s' ", + def->bootserver); + } + virBufferAddLit(&buf, "/>\n"); } virBufferAddLit(&buf, " </dhcp>\n"); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index e983a01..6175b0f 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -81,6 +81,7 @@ struct _virNetworkDef { char *tftproot; char *bootfile; + char *bootserver; }; typedef struct _virNetworkObj virNetworkObj; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 95bc810..bc241ef 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -402,7 +402,7 @@ networkBuildDnsmasqArgv(virConnectPtr conn, (2 * network->def->nhosts) + /* --enable-tftp --tftp-root /srv/tftp */ (network->def->tftproot ? 3 : 0) + - /* --dhcp-boot pxeboot.img */ + /* --dhcp-boot pxeboot.img[,,12.34.56.78] */ (network->def->bootfile ? 2 : 0) + 1; /* NULL */ @@ -488,8 +488,13 @@ networkBuildDnsmasqArgv(virConnectPtr conn, APPEND_ARG(*argv, i++, network->def->tftproot); } if (network->def->bootfile) { + snprintf(buf, sizeof(buf), "%s%s%s", + network->def->bootfile, + network->def->bootserver ? ",," : "", + network->def->bootserver ? network->def->bootserver : ""); + APPEND_ARG(*argv, i++, "--dhcp-boot"); - APPEND_ARG(*argv, i++, network->def->bootfile); + APPEND_ARG(*argv, i++, buf); } #undef APPEND_ARG diff --git a/tests/networkxml2xmlin/netboot-proxy-network.xml b/tests/networkxml2xmlin/netboot-proxy-network.xml new file mode 100644 index 0000000..ecb6738 --- /dev/null +++ b/tests/networkxml2xmlin/netboot-proxy-network.xml @@ -0,0 +1,13 @@ +<network> + <name>netboot</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <bridge name="virbr1" stp='off' delay='1'/> + <domain name="example.com"/> + <forward/> + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.2" end="192.168.122.254" /> + <bootp file="pxeboot.img" server="10.20.30.40" /> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2xmlout/netboot-proxy-network.xml b/tests/networkxml2xmlout/netboot-proxy-network.xml new file mode 100644 index 0000000..e11c50b --- /dev/null +++ b/tests/networkxml2xmlout/netboot-proxy-network.xml @@ -0,0 +1,13 @@ +<network> + <name>netboot</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward mode='nat'/> + <bridge name='virbr1' stp='off' delay='1' /> + <domain name='example.com'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254' /> + <bootp file='pxeboot.img' server='10.20.30.40' /> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index b02d735..957e64b 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -89,6 +89,7 @@ mymain(int argc, char **argv) DO_TEST("routed-network"); DO_TEST("nat-network"); DO_TEST("netboot-network"); + DO_TEST("netboot-proxy-network"); return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } -- 1.6.2.5

4 5

[libvirt] [PATCH] Improve error reporting for virConnectGetHostname calls
by Cole Robinson 29 Oct '09

29 Oct '09

All drivers have copy + pasted inadequate error reporting which wraps util.c:virGetHostname. Move all error reporting to this function, and improve what we report. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/libvirtd.c | 3 +-- src/lxc/lxc_driver.c | 10 +--------- src/qemu/qemu_driver.c | 14 ++------------ src/test/test_driver.c | 10 +--------- src/uml/uml_driver.c | 10 +--------- src/util/util.c | 18 +++++++++++++++--- src/util/util.h | 2 +- src/vbox/vbox_tmpl.c | 11 +---------- src/xen/xen_driver.c | 10 +--------- src/xen/xend_internal.c | 3 +-- tools/virsh.c | 2 +- 11 files changed, 26 insertions(+), 67 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 03d091a..058e684 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -939,9 +939,8 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) { if (!mdns_name) { char groupname[64], *localhost, *tmp; /* Extract the host part of the potentially FQDN */ - localhost = virGetHostname(); + localhost = virGetHostname(NULL); if (localhost == NULL) { - virReportOOMError(NULL); goto cleanup; } if ((tmp = strchr(localhost, '.'))) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ef97364..73f1c8e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2058,16 +2058,8 @@ cleanup: static char *lxcGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int lxcFreezeContainer(lxc_driver_t *driver, virDomainObjPtr vm) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a3beedb..86546e5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2623,16 +2623,8 @@ cleanup: static char * qemudGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int qemudListDomains(virConnectPtr conn, int *ids, int nids) { @@ -6283,9 +6275,7 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; /* Get hostname */ - if ((hostname = virGetHostname()) == NULL) { - virReportSystemError (dconn, errno, - "%s", _("failed to determine host name")); + if ((hostname = virGetHostname(dconn)) == NULL) { goto cleanup; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 36f8158..4a081be 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -994,16 +994,8 @@ static int testGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, static char *testGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int testGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 9a7fe42..cd92a6b 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1131,16 +1131,8 @@ cleanup: static char * umlGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int umlListDomains(virConnectPtr conn, int *ids, int nids) { diff --git a/src/util/util.c b/src/util/util.c index 98f8a14..49eac6d 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1804,30 +1804,42 @@ int virDiskNameToIndex(const char *name) { #define AI_CANONIDN 0 #endif -char *virGetHostname(void) +char *virGetHostname(virConnectPtr conn) { int r; char hostname[HOST_NAME_MAX+1], *result; struct addrinfo hints, *info; r = gethostname (hostname, sizeof(hostname)); - if (r == -1) + if (r == -1) { + virReportSystemError (conn, errno, + "%s", _("failed to determine host name")); return NULL; + } NUL_TERMINATE(hostname); memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME|AI_CANONIDN; hints.ai_family = AF_UNSPEC; r = getaddrinfo(hostname, NULL, &hints, &info); - if (r != 0) + if (r != 0) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("getaddrinfo failed for '%s': %s"), + hostname, gai_strerror(r)); return NULL; + } if (info->ai_canonname == NULL) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("could not determine canonical host name")); freeaddrinfo(info); return NULL; } /* Caller frees this string. */ result = strdup (info->ai_canonname); + if (!result) + virReportOOMError(conn); + freeaddrinfo(info); return result; } diff --git a/src/util/util.h b/src/util/util.h index 8679636..85d5488 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -222,7 +222,7 @@ static inline int getuid (void) { return 0; } static inline int getgid (void) { return 0; } #endif -char *virGetHostname(void); +char *virGetHostname(virConnectPtr conn); int virKillProcess(pid_t pid, int sig); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 4f43901..2a17946 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -594,17 +594,8 @@ static int vboxGetVersion(virConnectPtr conn, unsigned long *version) { } static char *vboxGetHostname(virConnectPtr conn) { - char *hostname; - /* the return string should be freed by caller */ - hostname = virGetHostname(); - if (hostname == NULL) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s", - "failed to determine host name"); - return NULL; - } - - return hostname; + return virGetHostname(conn); } static int vboxGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) { diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index f2744b0..0818cd3 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -484,16 +484,8 @@ xenUnifiedGetVersion (virConnectPtr conn, unsigned long *hvVer) static char * xenUnifiedGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index d3ab019..6d1d851 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -4347,9 +4347,8 @@ xenDaemonDomainMigratePrepare (virConnectPtr dconn, * deallocates this string. */ if (uri_in == NULL) { - *uri_out = virGetHostname(); + *uri_out = virGetHostname(dconn); if (*uri_out == NULL) { - virReportOOMError(dconn); return -1; } } diff --git a/tools/virsh.c b/tools/virsh.c index 6b93405..3c668da 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -524,7 +524,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) char *thatHost = NULL; char *thisHost = NULL; - if (!(thisHost = virGetHostname())) { + if (!(thisHost = virGetHostname(ctl->conn))) { vshError(ctl, "%s", _("Failed to get local hostname")); goto cleanup; } -- 1.6.5.rc2

3 3

[libvirt] [PATCH] qemu: migrate: Error if we collide with an inactive domain
by Cole Robinson 29 Oct '09

29 Oct '09

Currently the check for a VM name/uuid collision on the migrate destination only errors for active domains. Not sure why this wouldn't apply for non running VMs as well, so drop the check. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 86546e5..fb952d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6341,13 +6341,10 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (!vm) vm = virDomainFindByName(&driver->domains, dname); if (vm) { - if (virDomainIsActive(vm)) { - qemudReportError (dconn, NULL, NULL, VIR_ERR_OPERATION_FAILED, - _("domain with the same name or UUID already exists as '%s'"), - vm->def->name); - goto cleanup; - } - virDomainObjUnlock(vm); + qemudReportError (dconn, NULL, NULL, VIR_ERR_OPERATION_FAILED, + _("domain with the same name or UUID already exists as '%s'"), + vm->def->name); + goto cleanup; } if (!(vm = virDomainAssignDef(dconn, -- 1.6.5.rc2

3 2

[libvirt] New APIs for checking some object properties (v2)
by Daniel P. Berrange 28 Oct '09

28 Oct '09

This is a second posting of the proposal from earlier today http://www.redhat.com/archives/libvir-list/2009-October/msg00556.html The changes since last time - Renamed some existing internal APIs which had bad names which clashed with our new public APis. - Fix the comment bugs Daniel mentioned - Change the return status from '> 0' to '1', so we can explicitly add other positive integer return codes if ever required - Implement the new APIs for (nearly) all drivers Daniel

3 12

[libvirt] [PATCH 0/2] Fix a couple problems encountered during virInterface testing
by Laine Stump 28 Oct '09

28 Oct '09

When testing all the different possibilities of interfaces with the new netcf release + my latest libvirt patches (ACKed, but not yet committed), I came across some problems, addressed by the following two patches. The first patch is for a bug that crept in due to a last minute change suggested in danpb's review - I missed changing a couple places to account for changing the initial value of "ret". It could alternately be squashed into this patch, which hasn't yet been committed: https://www.redhat.com/archives/libvir-list/2009-October/msg00689.html The second patch loosens up the parsing of vlan, bond, and bridge interface XML because the live config XML doesn't know how to get those items yet. I believe the necessary items can be learned and included by the time for the *next* libvirt release, but think that the new functionality there already is too useful (and too needy of more hands to test) to delay the entire set for that long.

2 4

[libvirt] Trouble starting a QEMU guest with IPv6 VNC address
by Kaitlin Rupert 28 Oct '09

28 Oct '09

Hello, I am trying to start a QEMU guest with an IPv6 VNC address. I can specify the address and start the guest, but the VNC port shows up under the IPv4 list: # virsh dumpxml domU1 | grep graphics <graphics type='vnc' port='5900' autoport='no' listen='::1' keymap='en-us'/> # cat /proc/net/tcp | grep 170C 2: 00000000:170C 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 621103 1 ffff88007a043a80 299 0 0 2 -1 # cat /proc/net/tcp6 | grep 170C # # ps -ef | grep qemu root 16451 1 43 04:17 ? 00:00:18 /usr/bin/qemu-system-x86_64 -S -M pc -m 128 -smp 1 -name domU1 -uuid 2aebe290-d1ed-11dd-90eb-001a64bc024c -monitor pty -pidfile /var/run/libvirt/qemu//domU1.pid -no-acpi -boot c -drive file=/tmp/default-kvm-dimage,if=ide,index=0,boot=on -net nic,macaddr=11:22:33:aa:bb:cc,vlan=0 -net tap,fd=17,vlan=0 -serial none -parallel none -usb -vnc ::1:0 -k en-us I started the same guest manually, but I appended an ",ipv6' flag to the vnc option (see below). With this change, the port shows up in the IPv6 list. # /usr/bin/qemu-system-x86_64 -M pc -m 128 -smp 1 -name domU1 -uuid 2aebe290-d1ed-11dd-90eb-001a64bc024c -monitor pty -pidfile /var/run/libvirt/qemu//domU1.pid -no-acpi -boot c -drive file=/tmp/default-kvm-dimage,if=ide,index=0,boot=on -net nic,macaddr=11:22:33:aa:bb:cc,vlan=0 -net tap,fd=17,vlan=0 -serial none -parallel none -usb -vnc ::1:0,ipv6 -k en-us # cat /proc/net/tcp6 | grep 170C 2: 00000000000000000000000000000000:170C 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 621485 1 ffff88007a30ad00 299 0 0 2 -1 # cat /proc/net/tcp | grep 170C # I'd like to fix the qemu driver so that it specifies this flag, but I am unsure whether a guest XML change or some other change is appropriate here. Would it be better to have the qemu driver code do some detection on the address that is passed in? Thanks! -- Kaitlin Rupert IBM Linux Technology Center kaitlin(a)linux.vnet.ibm.com

3 3

[libvirt] virsh: error: failed to disconnect from the hypervisor in F12/rawhide with Xen
by Pasi Kärkkäinen 28 Oct '09

28 Oct '09

Hello, I have a testbox running current Fedora 12 (rawhide), with custom 2.6.31.4 Xen pv_ops dom0 kernel. [root@f12test ~]# xm list Name ID Mem VCPUs State Time(s) Domain-0 0 1020 4 r----- 33.8 c54test 1024 1 0.0 [root@f12test ~]# virsh list Id Name State ---------------------------------- 0 Domain-0 running virsh: error: failed to disconnect from the hypervisor [root@f12test ~]# virsh --connect xen:/// version Compiled against library: libvir 0.7.1 Using library: libvir 0.7.1 Using API: Xen 3.0.1 Running hypervisor: Xen 3.4.0 virsh: error: failed to disconnect from the hypervisor *** glibc detected *** virsh: double free or corruption (fasttop): 0x0000000000936250 *** ======= Backtrace: ========= /lib64/libc.so.6[0x3d9ec75dc6] virsh[0x406d91] virsh[0x406f29] virsh[0x406de3] virsh[0x414582] /lib64/libc.so.6(__libc_start_main+0xfd)[0x3d9ec1eb4d] virsh[0x405b59] ======= Memory map: ======== <snip, memory map removed> [root@f12test ~]# rpm -qa | grep -i libvirt libvirt-python-0.7.1-13.fc12.x86_64 libvirt-0.7.1-13.fc12.x86_64 libvirt-client-0.7.1-13.fc12.x86_64 [root@f12test ~]# rpm -qa | grep -i xen kernel-2.6.31.4-1.2.73.xendom0.fc12.x86_64 xen-3.4.1-5.fc12.x86_64 xen-runtime-3.4.1-5.fc12.x86_64 kernel-devel-2.6.31.4-1.2.73.xendom0.fc12.x86_64 xen-libs-3.4.1-5.fc12.x86_64 xen-hypervisor-3.4.1-5.fc12.x86_64 Any ideas? -- Pasi

2 3

[libvirt] [PATCH] Avoid segv if ncf_init fails
by Laine Stump 28 Oct '09

28 Oct '09

If ncf_init() fails, it takes responsibility to call ncf_close() when appropriate. Having libvirt call it results in a double close, which ends up segv'ing. --- src/interface/netcf_driver.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index b5c3664..c44ba62 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -142,10 +142,6 @@ static virDrvOpenStatus interfaceOpenInterface(virConnectPtr conn, return 0; netcf_error: - if (driverState->netcf) - { - ncf_close(driverState->netcf); - } virMutexDestroy (&driverState->lock); mutex_error: VIR_FREE(driverState); -- 1.6.5.15.gc274d

3 4

[libvirt] [PATCH 0/3] test: Support NodeDeviceCreate/Destroy
by Cole Robinson 28 Oct '09

28 Oct '09

The following small series provides the refactoring and implementation needed to support NodeDeviceCreate/Destroy in the test driver, particularly with respect to NPIV emulation. Cole Robinson (3): node device: Fix locking issue in virNodeDeviceDestroy node device: Break out get_wwns and get_parent_node helpers test: Support virNodeDeviceCreate and virNodeDeviceDestroy src/conf/node_device_conf.c | 89 +++++++++++++++++++++++ src/conf/node_device_conf.h | 11 +++ src/libvirt_private.syms | 2 + src/node_device/node_device_driver.c | 114 ++++-------------------------- src/test/test_driver.c | 129 +++++++++++++++++++++++++++++++++- 5 files changed, 244 insertions(+), 101 deletions(-)

3 13

[libvirt] [PATCH] Fix --with-init-script configure option
by Matthew Booth 28 Oct '09

28 Oct '09

The --with-init-script configure option was broken, and always defaulted based on the existence of /etc/redhat-release. This was a systematic typo based on mixed use of init-script and init-scripts. --- configure.in | 14 +++++++------- daemon/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index 2f9db72..42ed29b 100644 --- a/configure.in +++ b/configure.in @@ -243,17 +243,17 @@ dnl init script flavor dnl AC_MSG_CHECKING([for init script flavor]) AC_ARG_WITH([init-script], - [AC_HELP_STRING([--with-init-scripts=[redhat|auto|none]], - [Style of init scripts to install (defaults to auto)])]) -if test "x$with_init_scripts" = "x" -o "x$with_init_scripts" = "xauto"; then + [AC_HELP_STRING([--with-init-script=[redhat|auto|none]], + [Style of init script to install (defaults to auto)])]) +if test "x$with_init_script" = "x" -o "x$with_init_script" = "xauto"; then if test -f /etc/redhat-release ; then - with_init_scripts=redhat + with_init_script=redhat else - with_init_scripts=none + with_init_script=none fi fi -AM_CONDITIONAL([LIBVIRT_INIT_SCRIPTS_RED_HAT], test x$with_init_scripts = xredhat) -AC_MSG_RESULT($with_init_scripts) +AM_CONDITIONAL([LIBVIRT_INIT_SCRIPT_RED_HAT], test x$with_init_script = xredhat) +AC_MSG_RESULT($with_init_script) dnl RHEL-5 has a peculiar version of Xen, which requires some special casing AC_ARG_WITH([rhel5-api], diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 84aab04..ab3f238 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -188,7 +188,7 @@ install-logrotate: libvirtd.logrotate mkdir -p $(DESTDIR)$(sysconfdir)/logrotate.d/ $(INSTALL_DATA) $< $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd -if LIBVIRT_INIT_SCRIPTS_RED_HAT +if LIBVIRT_INIT_SCRIPT_RED_HAT install-init: libvirtd.init mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d $(INSTALL_SCRIPT) libvirtd.init \ @@ -222,7 +222,7 @@ install-init: uninstall-init: libvirtd.init: -endif # DBUS_INIT_SCRIPTS_RED_HAT +endif # LIBVIRT_INIT_SCRIPT_RED_HAT # This must be added last, since functions it provides/replaces # are used by nearly every other library. -- 1.6.2.5

1 0

[libvirt] [PATCH] doc nits
by Dan Kenigsberg 27 Oct '09

27 Oct '09

(sorry, these ones annoy me when they are online) --- src/datatypes.c | 4 ++-- src/libvirt.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 89ad309..0601a79 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -71,7 +71,7 @@ virNetworkFreeName(virNetworkPtr network, const char *name ATTRIBUTE_UNUSED) /** * virInterfaceFreeName: - * @interface: a interface object + * @interface: an interface object * * Destroy the interface object, this is just used by the interface hash callback. * @@ -674,7 +674,7 @@ _("Failed to change interface mac address from %s to %s due to differing lengths * virReleaseInterface: * @interface: the interface to release * - * Unconditionally release all memory associated with a interface. + * Unconditionally release all memory associated with an interface. * The conn.lock mutex must be held prior to calling this, and will * be released prior to this returning. The interface obj must not * be used once this method returns. diff --git a/src/libvirt.c b/src/libvirt.c index 9e87900..f7a0761 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -291,7 +291,7 @@ virInitialize(void) #ifdef WITH_DRIVER_MODULES /* We don't care if any of these fail, because the whole point * is to allow users to only install modules they want to use. - * If they try to use a open a connection for a module that + * If they try to use an open a connection for a module that * is not loaded they'll get a suitable error at that point */ virDriverLoadModule("test"); @@ -2050,7 +2050,7 @@ error: * virDomainResume: * @domain: a domain object * - * Resume an suspended domain, the process is restarted from the state where + * Resume a suspended domain, the process is restarted from the state where * it was frozen by calling virSuspendDomain(). * This function may requires privileged access * @@ -3999,7 +3999,7 @@ error: * * The path parameter is the name of the network interface. * - * Domains may have more than network interface. To get stats for + * Domains may have more than one network interface. To get stats for * each you should make multiple calls to this function. * * Individual fields within the stats structure may be returned @@ -4680,7 +4680,7 @@ error: * @domain: pointer to domain object, or NULL for Domain0 * @info: pointer to an array of virVcpuInfo structures (OUT) * @maxinfo: number of structures in info array - * @cpumaps: pointer to an bit map of real CPUs for all vcpus of this + * @cpumaps: pointer to a bit map of real CPUs for all vcpus of this * domain (in 8-bit bytes) (OUT) * If cpumaps is NULL, then no cpumap information is returned by the API. * It's assumed there is <maxinfo> cpumap in cpumaps array. @@ -9202,7 +9202,7 @@ error: * @xml: XML describing the secret. * @flags: flags, use 0 for now * - * If XML specifies an UUID, locates the specified secret and replaces all + * If XML specifies a UUID, locates the specified secret and replaces all * attributes of the secret specified by UUID by attributes specified in xml * (any attributes not specified in xml are discarded). * @@ -9713,7 +9713,7 @@ virStreamRef(virStreamPtr stream) * with the call, but may instead be delayed until a * subsequent call. * - * A example using this with a hypothetical file upload + * An example using this with a hypothetical file upload * API looks like * * virStreamPtr st = virStreamNew(conn, 0); @@ -9805,7 +9805,7 @@ error: * with the call, but may instead be delayed until a * subsequent call. * - * A example using this with a hypothetical file download + * An example using this with a hypothetical file download * API looks like * * virStreamPtr st = virStreamNew(conn, 0); @@ -9896,7 +9896,7 @@ error: * requested data source. This is simply a convenient alternative * to virStreamSend, for apps that do blocking-I/o. * - * A example using this with a hypothetical file upload + * An example using this with a hypothetical file upload * API looks like * * int mysource(virStreamPtr st, char *buf, int nbytes, void *opaque) { @@ -9993,7 +9993,7 @@ cleanup: * requested data sink. This is simply a convenient alternative * to virStreamRecv, for apps that do blocking-I/o. * - * A example using this with a hypothetical file download + * An example using this with a hypothetical file download * API looks like * * int mysink(virStreamPtr st, const char *buf, int nbytes, void *opaque) { @@ -10174,7 +10174,7 @@ error: * virStreamEventRemoveCallback: * @stream: pointer to the stream object * - * Remove a event callback from the stream + * Remove an event callback from the stream * * Returns 0 on success, -1 on error */ @@ -10297,7 +10297,7 @@ error: * Decrement the reference count on a stream, releasing * the stream object if the reference count has hit zero. * - * There must not be a active data transfer in progress + * There must not be an active data transfer in progress * when releasing the stream. If a stream needs to be * disposed of prior to end of stream being reached, then * the virStreamAbort function should be called first. -- 1.6.2.5

2 2

[libvirt] RestrictedVersion Error trying to shutdown an ESX VM
by Shahar Klein 27 Oct '09

27 Oct '09

I could swear it worked before: virsh # list Id Name State ---------------------------------- 352 ubuntu904 running 368 rh53 running virsh # shutdown 352 error: Failed to shutdown domain 352 error: internal error HTTP response code 500. VI Fault: ServerFaultCode - fault.RestrictedVersion.summary with LIBVIRT_DEBUG=1: virsh # shutdown 352 10:34:50.665: debug : virDomainLookupByID:1746 : conn=0x626440, id=352 10:34:50.687: debug : virGetDomain:344 : New hash entry 0x7104d0 10:34:50.687: debug : virDomainShutdown:2331 : domain=0x7104d0 error: Failed to shutdown domain 352 10:34:50.722: debug : virDomainFree:1958 : domain=0x7104d0 10:34:50.722: debug : virUnrefDomain:421 : unref domain 0x7104d0 ubuntu904 1 10:34:50.722: debug : virReleaseDomain:375 : release domain 0x7104d0 ubuntu904 10:34:50.722: debug : virReleaseDomain:391 : unref connection 0x626440 2 error: internal error HTTP response code 500. VI Fault: ServerFaultCode - fault.RestrictedVersion.summary

2 1

[libvirt] [PATCH] Fix problems in the Xen inotify driver.
by Matthias Bolte 27 Oct '09

27 Oct '09

In xenInotifyXendDomainsDirLookup() the wrong UUID variable is used to search in the config info list. In xenInotifyEvent() the event is dispatched if it's NULL. Both were introduced in bc898df2c74fe3c8efedfbbd430737bac950e65e. --- src/xen/xen_inotify.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index 9e0407f..aa3893a 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -142,7 +142,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, search for, and create a domain from the stored list info */ for (i = 0 ; i < priv->configInfoList->count ; i++) { - if (!memcmp(uuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) { + if (!memcmp(rawuuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) { *name = strdup(priv->configInfoList->doms[i]->name); if (!*name) { virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, @@ -332,7 +332,7 @@ reread: xenInotifyDomainEventFromFile(conn, fname, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_REMOVED); - if (!event) + if (event) xenUnifiedDomainEventDispatch(conn->privateData, event); else virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, -- 1.6.0.4

3 2

[libvirt] [PATCH] Fix error message in qemudLoadDriverConfig()
by Matthias Bolte 27 Oct '09

27 Oct '09

* src/qemu/qemu_conf.c: change the error message to refer to 'cgroup_controllers' instead of 'cgroup_device_acl' --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 158e9a3..a095cb7 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -243,7 +243,7 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, for (i = 0, pp = p->list; pp; ++i, pp = pp->next) { int ctl; if (pp->type != VIR_CONF_STRING) { - VIR_ERROR("%s", _("cgroup_device_acl must be a list of strings")); + VIR_ERROR("%s", _("cgroup_controllers must be a list of strings")); virConfFree(conf); return -1; } -- 1.6.0.4

2 1

[libvirt] [PATCH] Various syntax-check fixes.
by Chris Lalancette 26 Oct '09

26 Oct '09

Make a pass over the syntax-check files, tightening up regex's, un-ignoring certain files, and cleaning things up. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- .x-sc_prohibit_VIR_ERR_NO_MEMORY | 13 +++++-------- .x-sc_prohibit_gethostby | 5 ++--- .x-sc_prohibit_strcmp_and_strncmp | 7 +++++++ .x-sc_prohibit_strncpy | 2 +- .x-sc_require_config_h | 1 - Makefile.am | 14 ++++++++++++-- cfg.mk | 8 +++----- 7 files changed, 30 insertions(+), 20 deletions(-) diff --git a/.x-sc_prohibit_VIR_ERR_NO_MEMORY b/.x-sc_prohibit_VIR_ERR_NO_MEMORY index fbefbeb..5c96e83 100644 --- a/.x-sc_prohibit_VIR_ERR_NO_MEMORY +++ b/.x-sc_prohibit_VIR_ERR_NO_MEMORY @@ -1,8 +1,5 @@ -ChangeLog -docs/devhelp/libvirt-virterror.html -docs/html/libvirt-virterror.html -docs/libvirt-api.xml -docs/libvirt-refs.xml -include/libvirt/virterror.h -daemon/dispatch.c -src/util/virterror.c +^ChangeLog$ +^ChangeLog-old$ +^include/libvirt/virterror\.h$ +^daemon/dispatch\.c$ +^src/util/virterror\.c$ diff --git a/.x-sc_prohibit_gethostby b/.x-sc_prohibit_gethostby index c771142..7c052f4 100644 --- a/.x-sc_prohibit_gethostby +++ b/.x-sc_prohibit_gethostby @@ -1,3 +1,2 @@ -gnulib/lib/getaddrinfo.c -gnulib/m4/ -src/xend_internal.c +^gnulib/lib/getaddrinfo\.c$ +^gnulib/m4/ diff --git a/.x-sc_prohibit_strcmp_and_strncmp b/.x-sc_prohibit_strcmp_and_strncmp index b7c456e..c0d8793 100644 --- a/.x-sc_prohibit_strcmp_and_strncmp +++ b/.x-sc_prohibit_strcmp_and_strncmp @@ -1 +1,8 @@ ^gnulib/ +^ChangeLog-old$ +^examples/domain-events/events-c/event-test\.c$ +^src/internal\.h$ +^src/lxc/lxc_container\.c$ +^src/node_device/node_device_devkit\.c$ +^src/node_device/node_device_hal\.c$ +^src/storage/parthelper\.c$ diff --git a/.x-sc_prohibit_strncpy b/.x-sc_prohibit_strncpy index 10bc29c..70e2300 100644 --- a/.x-sc_prohibit_strncpy +++ b/.x-sc_prohibit_strncpy @@ -1 +1 @@ -src/util/util.c +^src/util/util\.c$ diff --git a/.x-sc_require_config_h b/.x-sc_require_config_h index e1f6e10..a530ae0 100644 --- a/.x-sc_require_config_h +++ b/.x-sc_require_config_h @@ -1,5 +1,4 @@ ^examples/ ^gnulib/lib/dummy\.c$ ^gnulib/tests/dummy\.c$ -^daemon/remote_protocol\.c$ ^ChangeLog$ diff --git a/Makefile.am b/Makefile.am index 977ad0c..14fc593 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,12 +17,22 @@ EXTRA_DIST = \ mingw32-libvirt.spec.in \ libvirt.pc libvirt.pc.in \ autobuild.sh \ + .x-sc_avoid_ctype_macros \ .x-sc_avoid_if_before_free \ - .x-sc_require_config_h_first \ + .x-sc_avoid_write \ + .x-sc_m4_quote_check \ + .x-sc_prohibit_asprintf \ + .x-sc_prohibit_gethostby \ + .x-sc_prohibit_have_config_h \ + .x-sc_prohibit_HAVE_MBRTOWC \ + .x-sc_prohibit_nonreentrant \ .x-sc_prohibit_strcmp \ .x-sc_prohibit_strcmp_and_strncmp \ + .x-sc_prohibit_strncpy \ + .x-sc_prohibit_VIR_ERR_NO_MEMORY \ .x-sc_require_config_h \ - .x-sc_prohibit_nonreentrant \ + .x-sc_require_config_h_first \ + .x-sc_trailing_blank \ Makefile.nonreentrant \ autogen.sh \ examples/domain-events/events-python \ diff --git a/cfg.mk b/cfg.mk index 44cfd17..c1d3864 100644 --- a/cfg.mk +++ b/cfg.mk @@ -79,11 +79,9 @@ sc_avoid_write: # Use STREQ rather than comparing strcmp == 0, or != 0. # Similarly, use STREQLEN or STRPREFIX rather than strncmp. sc_prohibit_strcmp_and_strncmp: - @grep -nE '! *strn?cmp *$|\<strn?cmp *\([^)]+$ *==' \ - $$($(VC_LIST_EXCEPT)) \ - | grep -vE ':# *define STREQ(LEN)?\(' && \ - { echo '$(ME): use STREQ(LEN) in place of the above uses of strcmp(strncmp)' \ - 1>&2; exit 1; } || : + @re='strn?cmp *\(' \ + msg='use STREQ() in place of the above uses of str[n]cmp' \ + $(_prohibit_regexp) # Use virAsprintf rather than a'sprintf since *strp is undefined on error. sc_prohibit_asprintf: -- 1.6.0.6

2 2

[libvirt] [PATCH] Tighten up nonreentrant syntax-check.
by Chris Lalancette 26 Oct '09

26 Oct '09

We can slightly tighten up the regex's used to detect the use of nonreentrant functions. We can also check src/util/virterror.c by modifying a comment; I think it's worth it to get the additional coverage. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- .x-sc_prohibit_nonreentrant | 8 ++++---- src/util/virterror.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.x-sc_prohibit_nonreentrant b/.x-sc_prohibit_nonreentrant index ac783c0..0ab2f5d 100644 --- a/.x-sc_prohibit_nonreentrant +++ b/.x-sc_prohibit_nonreentrant @@ -1,10 +1,10 @@ ^gnulib/ ^po/ -ChangeLog +^ChangeLog$ +^ChangeLog-old$ ^Makefile* ^docs/ ^tests/ -^tools/virsh\.c -^tools/console\.c -^src/util/virterror\.c +^tools/virsh\.c$ +^tools/console\.c$ ^build-aux/ diff --git a/src/util/virterror.c b/src/util/virterror.c index e421ab7..657cb3f 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1157,7 +1157,7 @@ const char *virStrerror(int theerrno, char *errBuf, size_t errBufLen) return errBuf; # endif #else - /* Mingw lacks strerror_r() and its strerror() is definitely not + /* Mingw lacks strerror_r and its strerror is definitely not * threadsafe, so safest option is to just print the raw errno * value - we can at least reliably & safely look it up in the * header files for debug purposes -- 1.6.0.6

2 2

[libvirt] [PATCH] Replace two strcmp() by STREQ() in qemu_driver.c
by Chris Lalancette 26 Oct '09

26 Oct '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4cd235d..da7dda7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4142,7 +4142,7 @@ qemudCanonicalizeMachineFromInfo(virDomainDefPtr def, if (!machine->canonical) continue; - if (strcmp(def->os.machine, machine->name) != 0) + if (STRNEQ(def->os.machine, machine->name)) continue; if (!(*canonical = strdup(machine->canonical))) { @@ -4171,7 +4171,7 @@ qemudCanonicalizeMachineDirect(virDomainDefPtr def, char **canonical) if (!machines[i]->canonical) continue; - if (strcmp(def->os.machine, machines[i]->name) != 0) + if (STRNEQ(def->os.machine, machines[i]->name)) continue; *canonical = machines[i]->canonical; -- 1.6.0.6

2 4

[libvirt] [PATCH] Replace gethostname by virGetHostname in xend_internal.c
by Chris Lalancette 26 Oct '09

26 Oct '09

--- src/xen/xend_internal.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 27d215e..d3ab019 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -4342,21 +4342,12 @@ xenDaemonDomainMigratePrepare (virConnectPtr dconn, const char *dname ATTRIBUTE_UNUSED, unsigned long resource ATTRIBUTE_UNUSED) { - int r; - char hostname [HOST_NAME_MAX+1]; - /* If uri_in is NULL, get the current hostname as a best guess * of how the source host should connect to us. Note that caller * deallocates this string. */ if (uri_in == NULL) { - r = gethostname (hostname, HOST_NAME_MAX+1); - if (r == -1) { - virReportSystemError(dconn, errno, - _("unable to resolve name %s"), hostname); - return -1; - } - *uri_out = strdup (hostname); + *uri_out = virGetHostname(); if (*uri_out == NULL) { virReportOOMError(dconn); return -1; -- 1.6.0.6

2 2

[libvirt] [PATCH] Replace a gethostname by virGetHostname in libvirtd.c
by Chris Lalancette 26 Oct '09

26 Oct '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/libvirtd.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 4eb33bc..02bd287 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -937,15 +937,19 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) { server->mdns = libvirtd_mdns_new(); if (!mdns_name) { - char groupname[64], localhost[HOST_NAME_MAX+1], *tmp; + char groupname[64], *localhost, *tmp; /* Extract the host part of the potentially FQDN */ - gethostname(localhost, HOST_NAME_MAX); - localhost[HOST_NAME_MAX] = '\0'; + localhost = virGetHostname(); + if (localhost == NULL) { + virReportOOMError(NULL); + goto cleanup; + } if ((tmp = strchr(localhost, '.'))) *tmp = '\0'; snprintf(groupname, sizeof(groupname)-1, "Virtualization Host %s", localhost); groupname[sizeof(groupname)-1] = '\0'; group = libvirtd_mdns_add_group(server->mdns, groupname); + VIR_FREE(localhost); } else { group = libvirtd_mdns_add_group(server->mdns, mdns_name); } -- 1.6.0.6

2 2

[libvirt] [PATCH] Remove a completely bogus reference increment in the Xen driver.
by Chris Lalancette 26 Oct '09

26 Oct '09

xenUnifiedDomainEventRegister() calls out to virDomainEventCallbackListAdd(), which increments the reference count on the connection. That is fine, but then xenUnifiedDomainEventRegister() increments the usage count again, leading to a usage count leak. Remove the increment in the xen register, and the UnrefConnect in the xen unregister. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/xen/xen_driver.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 5273a11..f2744b0 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1502,9 +1502,6 @@ xenUnifiedDomainEventRegister (virConnectPtr conn, ret = virDomainEventCallbackListAdd(conn, priv->domainEventCallbacks, callback, opaque, freefunc); - if (ret == 0) - conn->refs++; - xenUnifiedUnlock(priv); return (ret); } @@ -1530,9 +1527,6 @@ xenUnifiedDomainEventDeregister (virConnectPtr conn, ret = virDomainEventCallbackListRemove(conn, priv->domainEventCallbacks, callback); - if (ret == 0) - virUnrefConnect(conn); - xenUnifiedUnlock(priv); return ret; } -- 1.6.0.6

2 2

[libvirt] [PATCH] Add a new syntax-check rule for gethostname.
by Chris Lalancette 26 Oct '09

26 Oct '09

We should always be using virGetHostname in place of gethostname; thus add in a new syntax-check rule to make sure no new uses creep in. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- .x-sc_prohibit_gethostname | 2 ++ Makefile.am | 1 + cfg.mk | 5 +++++ src/libvirt.c | 2 +- 4 files changed, 9 insertions(+), 1 deletions(-) create mode 100644 .x-sc_prohibit_gethostname diff --git a/.x-sc_prohibit_gethostname b/.x-sc_prohibit_gethostname new file mode 100644 index 0000000..e7acb03 --- /dev/null +++ b/.x-sc_prohibit_gethostname @@ -0,0 +1,2 @@ +^src/util/util\.c$ +^ChangeLog-old$ diff --git a/Makefile.am b/Makefile.am index 14fc593..32cd96a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST = \ .x-sc_m4_quote_check \ .x-sc_prohibit_asprintf \ .x-sc_prohibit_gethostby \ + .x-sc_prohibit_gethostname \ .x-sc_prohibit_have_config_h \ .x-sc_prohibit_HAVE_MBRTOWC \ .x-sc_prohibit_nonreentrant \ diff --git a/cfg.mk b/cfg.mk index c1d3864..45d6531 100644 --- a/cfg.mk +++ b/cfg.mk @@ -94,6 +94,11 @@ sc_prohibit_strncpy: msg='use virStrncpy, not strncpy' \ $(_prohibit_regexp) +sc_prohibit_gethostname: + @re='gethostname *\(' \ + msg='use virGetHostname, not gethostname' \ + $(_prohibit_regexp) + sc_prohibit_VIR_ERR_NO_MEMORY: @re='\<V''IR_ERR_NO_MEMORY\>' \ msg='use virReportOOMError, not V'IR_ERR_NO_MEMORY \ diff --git a/src/libvirt.c b/src/libvirt.c index 5787f22..4e244bb 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1441,7 +1441,7 @@ error: * @conn: pointer to a hypervisor connection * * This returns the system hostname on which the hypervisor is - * running (the result of the gethostname(2) system call). If + * running (the result of the gethostname system call). If * we are connected to a remote system, then this returns the * hostname of the remote system. * -- 1.6.0.6

2 2

[libvirt] [PATCH] Add a default log_level to qemudSetLogging to remove a build warning.
by Chris Lalancette 26 Oct '09

26 Oct '09

(original patch from Charles Duffy) Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/libvirtd.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 03bc1b4..4eb33bc 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -2509,8 +2509,9 @@ remoteReadSaslAllowedUsernameList (virConfPtr conf ATTRIBUTE_UNUSED, * debugging is asked for then output informations or debug. */ static int -qemudSetLogging(virConfPtr conf, const char *filename) { - int log_level; +qemudSetLogging(virConfPtr conf, const char *filename) +{ + int log_level = 0; char *log_filters = NULL; char *log_outputs = NULL; int ret = -1; @@ -2531,12 +2532,6 @@ qemudSetLogging(virConfPtr conf, const char *filename) { * level has been set, we must process variables in the opposite * order, each one overriding the previous. */ - /* - * GET_CONF_INT returns 0 when there is no log_level setting in - * the config file. The conditional below eliminates a false - * warning in that case, but also has the side effect of missing - * a warning if the user actually does say log_level=0. - */ GET_CONF_INT (conf, filename, log_level); if (log_level != 0) virLogSetDefaultPriority(log_level); -- 1.6.0.6

2 2

[libvirt] virsh edit not saving interface target specification
by Neil Aggarwal 26 Oct '09

26 Oct '09

Hello: I am trying to set a target dev specification for one of my guests so I stopped the guest and the did virst edit, added the target specification, and saved the file. If I go back into virsh edit, the target specification is not being saved. I am using libvirt 0.6.3-20.el5 installed by yum on CentOS 5.4. Here is the XML file after I edited it: <domain type='kvm'> <name>jamm12a</name> <uuid>6452dcff-c20f-908b-d1ee-7dcf1406a3e0</uuid> <memory>1048576</memory> <currentMemory>1048576</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/libexec/qemu-kvm</emulator> <disk type='file' device='disk'> <source file='/var/lib/libvirt/images/jamm12a.img'/> <target dev='hda' bus='ide'/> </disk> <disk type='file' device='cdrom'> <target dev='hdc' bus='ide'/> <readonly/> </disk> <interface type='bridge'> <mac address='54:52:00:4f:83:67'/> <source bridge='br0'/> <target dev='vnet1'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> </devices> </domain> When I save the file and do virsh edit again, the <target dev='vnet1'/> line is not saved. Is this a bug in libvirt? Thanks, Neil -- Neil Aggarwal, (281)846-8957, www.JAMMConsulting.com Will your e-commerce site go offline if you have a DB server failure, fiber cut, flood, fire, or other disaster? If so, ask about our geographically redundant database system.

4 5

[libvirt] Get Virtual Machine Information
by Gandhiraj Natarajan 26 Oct '09

26 Oct '09

Hi 1. We need to know how to get the IP addresses of virtual machines running in Novel Xen Server? 2. We need to know how to get the proper operating system like Windows XP or 2000 or 2003? Thanks in advance Regards, Gandhiraj Natarajan Connect more, do more and share more with Yahoo! India Mail. Learn more. http://in.overview.mail.yahoo.com/

2 3

[libvirt] invalid domain pointer
by Stefan 24 Oct '09

24 Oct '09

Hello, my log files are filled with (5 times per second): error : invalid domain pointer in no domain with matching id -1 My system: libvirt 0.6.1, Ubuntu 9.04, 2.6.28-15-server #52-Ubuntu x86_64 Any ideas ? Thanks Stefan

2 3

[libvirt] [PATCH] Remove redundant virFileDeletePID() call
by Chris Lalancette 24 Oct '09

24 Oct '09

virFileDeletePID() is unnecessarily called in qemudRemoveDomainStatus(). The only caller of qemudRemoveDomainStatus() is qemudShutdownVMDaemon(), and that already calls virFileDeletePID (with a better error message). Remove the redundant call here. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 02bb5cb..4cd235d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -273,9 +273,6 @@ qemudRemoveDomainStatus(virConnectPtr conn, goto cleanup; } - if(virFileDeletePid(driver->stateDir, vm->def->name)) - goto cleanup; - rc = 0; cleanup: VIR_FREE(file); -- 1.6.0.6

2 2

[libvirt] Re: [virt-tools-list] [BUG] mounting of NFSv4 pools fails in virt-manager
by Cole Robinson 23 Oct '09

23 Oct '09

On 10/23/2009 07:22 AM, Jon Nordby wrote: > The problem is due to libvirt using mount.nfs instead of mount.nfs4 for > NFSv4 shares. > > virt-manager tries the following command (see attached file): > [jon@jon-laptop ~]$ sudo /bin/mount 10.0.0.2:/libvirt_install > /var/lib/libvirt/images/server-install > mount.nfs: access denied by server while mounting 10.0.0.2:/libvirt_install > > When it should be something like this instead: > [jon@jon-laptop ~]$ sudo /bin/mount -t nfs4 10.0.0.2:/libvirt_install > /var/lib/libvirt/images/server-install > > Because mount apparently considers NFSv4 to be a different type than > previous NFS versions: > [jon@jon-laptop ~]$ mount.nfs > mount.nfs mount.nfs4 > > OS: Arch Linux Current on both server and client. nfs-utils 1.2.0-4 and > kernel 2.6.31 > > I don't believe there is a good way to programatically check which version a > share is, but one can catch the error and try again with "-t nfs4". > Or perhaps trying nfs4 first is better... > > libvirtError: internal error '/bin/mount 10.0.0.2:/libvirt_install /var/lib/libvirt/images/server-install' exited with non-zero status 32 and signal 0: mount.nfs: access denied by server while mounting 10.0.0.2:/libvirt_insta FYI, libvirt issues should go to libvirt-list(a)redhat.com (cc'ing) - Cole

1 0

[libvirt] libvirt: use existing network bridge
by Sascha Frey 23 Oct '09

23 Oct '09

Hi, I met a problem setting up virt-manager and libvirt: I want to use an existing customized network bridge with libvirt (I need special iptables rules and a custom DHCP setup). So I created a network definition file like this: <network> <name>NAT</name> <bridge name='br-nat' /> </network> Unfortunately, I'm unable to activate this network, because libvirt tries to create the bridge `br-nat' and fails, because it already exists: # virsh net-start NAT error: Failed to start network NAT error: cannot create bridge 'br-nat': File exists I just want libvirt to attach the guest's tap devices to this existing bridge. I don't want libvirt to manage the network. Is there any chance to realize this set-up? It should work with virt-manager using the graphical wizard. Thanks! Regards Sascha

4 4

[libvirt] libvirt update problem
by Gerry Reno 23 Oct '09

23 Oct '09

# yum list 'libvirt' Loaded plugins: dellsysidplugin2, fastestmirror, installonlyn, refresh-packagekit, versionlock Loading mirror speeds from cached hostfile Excluding mirror: mirror.newnanutilities.org * fedora: mirror.hiwaay.net * updates: mirror.hiwaay.net Reading version lock configuration Installed Packages libvirt.i586 0.6.2-8.fc11 installed libvirt.x86_64 0.6.2-8.fc11 installed Available Packages libvirt.i586 0.6.2-18.fc11 updates libvirt.x86_64 0.6.2-18.fc11 updates and when I update libvirt: Transaction Check Error: file /usr/share/libvirt/schemas/domain.rng from install of libvirt-0.6.2-18.fc11.x86_64 conflicts with file from package libvirt-0.6.2-8.fc11.i586 What is wrong here?

1 1

[libvirt] cache=none
by Stefan 23 Oct '09

23 Oct '09

Hello, * Is it possible to add the "kvm -drive"-option "cache=none" to libvirtd.conf ? It's a recommendation of XFS FAQ: http://xfs.org/index.php/XFS_FAQ#Q:_Which_settings_are_best_with_virtualiza… * Is there a generic way to handle kvm options that are not supported in libvirtd.conf ? * Is it generally a bad idea to use XFS with KVM ? Thanks Stefan

2 3

[libvirt] how can dst know that migration is over?
by Dan Kenigsberg 23 Oct '09

23 Oct '09

When migrating a domain from src to dst, it first appears 'suspended' at the dst. When it's 'running', higher-level management can tell that migration is done. However, when bugzilla.redhat.com/519204 is fixed, I can no longer count on that - migrated domain may still be suspended at the destination. So how can I tell, at the destination, that migration is over? I could add higher-level communication from src to dst, but I am reluctant to add another failure mode. I'd rather have libvirt tell me, "hey migration is done". btw, does src libvirt verify with dst libvirt that migration is successful? src qemu can be oblivious of dst qemu not receiving the last packet correctly. Regards, Dan.

2 3

[libvirt] Suggest to postpone 0.7.3 by one week
by Daniel Veillard 23 Oct '09

23 Oct '09

Basically the plan was to enter freeze this week-end and release 0.7.3 on the 30th, but looking at the current logs and status on the list, this may not be appropriate, some of the patches aren't finalized and we would end up with 0.7.3 being mostly 0.7.2 with bug fixes. So I suggest to introduce a one week delay, enter the freeze at teh end of the month instead and push 0.7.3 on Nov 6th. I assume it's not a serious problem to anybody, right ? Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Fix potential false-positive OOM error reporting
by Matthias Bolte 22 Oct '09

22 Oct '09

If no matching device was found (cap == NULL) then no strdup() call was made and *wwnn and *wwpn are untouched. Checking them for NULL in this situation may result in reporting an false-positive OOM error because *wwnn and *wwpn may be initialized to NULL by the caller. Only check *wwnn and *wwpn for NULL if a matching device was found (cap != NULL) and thus strdup() was called. * src/conf/node_device_conf.c: only report an OOM error if there really is one --- src/conf/node_device_conf.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 77f7be3..c2c5a44 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1243,9 +1243,7 @@ virNodeDeviceGetWWNs(virConnectPtr conn, virNodeDeviceReportError(conn, VIR_ERR_NO_SUPPORT, "%s", _("Device is not a fibre channel HBA")); ret = -1; - } - - if (*wwnn == NULL || *wwpn == NULL) { + } else if (*wwnn == NULL || *wwpn == NULL) { /* Free the other one, if allocated... */ VIR_FREE(wwnn); VIR_FREE(wwpn); -- 1.6.0.4

3 2

[libvirt] how to duplicate an vm?
by Dan Bar Dov 22 Oct '09

22 Oct '09

I am trying to duplicate an existing vm. While the VM was down, I copied the image file, copied the xml file and manually fixed the xml file to have a different VM name, and point to the copy. The copy now works, but the original disappraeed from virt-manager. When I try to "restore" it I get: Error restoring domain '/var/lib/libvirt/images/fc11-copy.img': operation failed: image magic is incorrect What am I doing wrong/how should I replicate a VM? Thanks, Dan

2 2

[libvirt] [PATCH] consolidate virXPathNodeSet()
by Daniel Veillard 22 Oct '09

22 Oct '09

While reviewing Rich last patch I was afraid that virXPathNodeSet() could return -1 when doing an evaluation failure. It is based on xmlXPathEval() from libxml2 whose behaviour is to possibly return NULL on XPath evaluation failure independantly of the kind of failure: http://xmlsoft.org/html/libxml-xpath.html#xmlXPathEval I suggest to apply this patch to make sure we always return 0 unless the returned XPath type is of the wrong type (meaning the query passed didn't evaluate to a node set and code must be fixed) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] Possible qemu GetVcpus bug?
by Cole Robinson 22 Oct '09

22 Oct '09

Playing with the GetVcpus API call (and virsh vcpuinfo), there is a slight inconsistency that may be a bug. In qemudDomainGetVcpus, we have: if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; maxcpu = maplen * 8; if (maxcpu > nodeinfo.cpus) maxcpu = nodeinfo.cpus; We clamp the amount of cpus we report affinity against to nodeinfo.cpus. virsh however expects this to be VIR_NODEINFO_MAXCPUS, and makes the cpumap appropriately long (and uses this value when pretty printing): cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); Is there a bug here? Should qemu be using VIR_NODEINFO_MAXCPUS, or is there some explicit reason to use nodeinfo.cpus? Thanks, Cole

1 0

[libvirt] RHEL 5 with Xen - changed IPs and now weirdness
by Denny Snyder 22 Oct '09

22 Oct '09

3 5

[libvirt] Xenner status
by Gerry Reno 22 Oct '09

22 Oct '09

Can someone tell me if RHEL-6 is planned to have support for Xenner? Will this be built into qemu? Otherwise what are options for using Xenner with RHEL-5? We want to run both KVM and Xen guests managed by KVM hypervisor.

2 2

[libvirt] [PATCH] New APIs for checking some object properties
by Daniel P. Berrange 22 Oct '09

22 Oct '09

Introduce a number of new APIs to expose some boolean properties of objects, which cannot otherwise reliably determined, nor are aspects of the XML configuration. * virDomainIsActive: Checking virDomainGetID is not reliable since it is not possible to distinguish between error condition and inactive domain for ID of -1. * virDomainIsPersistent: Check whether a persistent config exists for the domain * virNetworkIsActive: Check whether the network is active * virNetworkIsPersistent: Check whether a persistent config exists for the network * virStoragePoolIsActive: Check whether the storage pool is active * virStoragePoolIsPersistent: Check whether a persistent config exists for the storage pool * virInterfaceIsActive: Check whether the host interface is active * virConnectIsSecure: whether the communication channel to the hypervisor is secure * virConnectIsEncrypted: whether any network based commnunication channels are encrypted NB, a channel can be secure, even if not encrypted, eg if it does not involve the network, like a UNIX socket, or pipe. --- include/libvirt/libvirt.h.in | 16 +++ src/libvirt.c | 298 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 314 insertions(+), 0 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 6186d4e..05a164b 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1649,6 +1649,22 @@ int virStreamAbort(virStreamPtr st); int virStreamFree(virStreamPtr st); +int virDomainIsActive(virDomainPtr dom); +int virDomainIsPersistent(virDomainPtr dom); + +int virNetworkIsActive(virNetworkPtr net); +int virNetworkIsPersistent(virNetworkPtr net); + +int virStoragePoolIsActive(virStoragePoolPtr pool); +int virStoragePoolIsPersistent(virStoragePoolPtr pool); + +int virInterfaceIsActive(virInterfacePtr iface); + +int virConnectIsEncrypted(virConnectPtr conn); +int virConnectIsSecure(virConnectPtr conn); + + + #ifdef __cplusplus } #endif diff --git a/src/libvirt.c b/src/libvirt.c index 9e87900..58ea514 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -10321,3 +10321,301 @@ int virStreamFree(virStreamPtr stream) return (-1); return (0); } + + +/** + * virDomainIsActive: + * + * Determine if the domain is currently running + * + * Returns > 0 if running, 0 if inactive, -1 on error + */ +int virDomainIsActive(virDomainPtr dom) +{ + DEBUG("dom=%p", dom); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(dom)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + if (dom->conn->driver->domainIsActive) { + int ret; + ret = dom->conn->driver->domainIsActive(dom); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virSetConnError(dom->conn); + return -1; +} + +/** + * virDomainIsPersistent: + * + * Determine if the domain has a persistent configuration + * + * Returns > 0 if persistent, 0 if transient, -1 on error + */ +int virDomainIsPersistent(virDomainPtr dom) +{ + DEBUG("dom=%p", dom); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(dom)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + if (dom->conn->driver->domainIsPersistent) { + int ret; + ret = dom->conn->driver->domainIsPersistent(dom); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virSetConnError(dom->conn); + return -1; +} + +/** + * virNetworkIsActive: + * + * Determine if the network is currently running + * + * Returns > 0 if running, 0 if inactive, -1 on error + */ +int virNetworkIsActive(virNetworkPtr net) +{ + DEBUG("net=%p", net); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_NETWORK(net)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + if (net->conn->networkDriver->networkIsActive) { + int ret; + ret = net->conn->networkDriver->networkIsActive(net); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(net->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virSetConnError(net->conn); + return -1; +} + + +/** + * virNetworkIsPersistent: + * + * Determine if the network has a persistent configuration + * + * Returns > 0 if persistent, 0 if transient, -1 on error + */ +int virNetworkIsPersistent(virNetworkPtr net) +{ + DEBUG("net=%p", net); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_NETWORK(net)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + if (net->conn->networkDriver->networkIsPersistent) { + int ret; + ret = net->conn->networkDriver->networkIsPersistent(net); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(net->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virSetConnError(net->conn); + return -1; +} + + +/** + * virStoragepoolIsActive: + * + * Determine if the storagepool is currently running + * + * Returns > 0 if running, 0 if inactive, -1 on error + */ +int virStoragePoolIsActive(virStoragePoolPtr pool) +{ + DEBUG("pool=%p", pool); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + if (pool->conn->storageDriver->poolIsActive) { + int ret; + ret = pool->conn->storageDriver->poolIsActive(pool); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virSetConnError(pool->conn); + return -1; +} + + +/** + * virStoragepoolIsPersistent: + * + * Determine if the storagepool has a persistent configuration + * + * Returns > 0 if persistent, 0 if transient, -1 on error + */ +int virStoragePoolIsPersistent(virStoragePoolPtr pool) +{ + DEBUG("pool=%p", pool); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + if (pool->conn->storageDriver->poolIsPersistent) { + int ret; + ret = pool->conn->storageDriver->poolIsPersistent(pool); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(pool->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virSetConnError(pool->conn); + return -1; +} + + +/** + * virInterfaceIsActive: + * + * Determine if the interface is currently running + * + * Returns > 0 if running, 0 if inactive, -1 on error + */ +int virInterfaceIsActive(virInterfacePtr iface) +{ + DEBUG("iface=%p", iface); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_INTERFACE(iface)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + if (iface->conn->interfaceDriver->interfaceIsActive) { + int ret; + ret = iface->conn->interfaceDriver->interfaceIsActive(iface); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(iface->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virSetConnError(iface->conn); + return -1; +} + + +/** + * virConnectIsEncrypted: + * + * Determine if the connection to the hypervisor is encrypted + * + * Returns > 0 if running, 0 if inactive, -1 on error + */ +int virConnectIsEncrypted(virConnectPtr conn) +{ + DEBUG("conn=%p", conn); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + if (conn->driver->isEncrypted) { + int ret; + ret = conn->driver->isEncrypted(conn); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virSetConnError(conn); + return -1; +} + +/** + * virConnectIsSecure: + * + * Determine if the connection to the hypervisor is secure + * + * A connection will be classed as secure if it is either + * encrypted, or running over a channel which is not exposed + * to eavesdropping (eg a UNIX domain socket, or pipe) + * + * Returns > 0 if running, 0 if inactive, -1 on error + */ +int virConnectIsSecure(virConnectPtr conn) +{ + DEBUG("conn=%p", conn); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(NULL, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + if (conn->driver->isSecure) { + int ret; + ret = conn->driver->isSecure(conn); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); +error: + /* Copy to connection error object for back compatability */ + virSetConnError(conn); + return -1; +} -- 1.6.2.5

2 2

[libvirt] [PATCH] Support QEMU/KVM watchdog device
by Richard W.M. Jones 22 Oct '09

22 Oct '09

Time to brush off this old patch. This adds simple support for the QEMU/KVM emulated hardware watchdog device (qemu commit 9dd986ccf68f142aaafe543d80cf877716d91d4e). Event notification isn't supported. This just lets you configure a domain with a <watchdog.../> device, select the model and action. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

2 4

[libvirt] [PATCH] fix virDomainMigrateToURI doc
by Dan Kenigsberg 21 Oct '09

21 Oct '09

--- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 92a1eaa..d2a0d7a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3279,7 +3279,7 @@ error: * @bandwidth: (optional) specify migration bandwidth limit in Mbps * * Migrate the domain object from its current host to the destination - * host given by dconn (a connection to the destination host). + * host given by duri. * * Flags may be one of more of the following: * VIR_MIGRATE_LIVE Do not pause the VM during migration -- 1.6.2.5

2 2

[libvirt] [PATCH 00/10] tests: More XML 2 XML tests and cleanups
by Cole Robinson 21 Oct '09

21 Oct '09

In attempting to refactor some storage pool XML parsing, I wanted some unit tests to ensure I wasn't causing regressions. So, the following series adds XML 2 XML tests for storage pools (and virtual networks and storage vols). Also included are several cleanups in tests/, and bug fixes needed to make the new tests actually pass. Cole Robinson (10): tests: Fix text output for interface XML 2 XML tests: Document VIR_TEST_DEBUG environment variable. tests: Break out duplicate schema verification functionality. storage: Fix generating iscsi 'auth' xml schema: Update storage pool schema. tests: Add XML 2 XML tests for storage pools. network: Fix reading 'forwardDelay' attribute. schema: Update network schema. tests: Add network XML to XML tests. tests: Add storage volume XML 2 XML tests. HACKING | 10 ++ docs/schemas/network.rng | 41 ++++++- docs/schemas/storagepool.rng | 51 ++++++++- src/conf/network_conf.c | 10 ++- src/conf/storage_conf.c | 2 +- tests/.gitignore | 3 + tests/Makefile.am | 33 +++++- tests/capabilityschematest | 34 +----- tests/domainschematest | 33 +----- tests/interfaceschematest | 31 +----- tests/interfacexml2xmltest.c | 4 +- tests/networkschemadata/netboot-network.xml | 12 -- tests/networkschematest | 33 +----- tests/networkxml2xmlin/forward-delay-network.xml | 13 ++ tests/networkxml2xmlin/isolated-network.xml | 10 ++ tests/networkxml2xmlin/nat-network.xml | 13 ++ tests/networkxml2xmlin/netboot-network.xml | 14 +++ tests/networkxml2xmlin/routed-network.xml | 11 ++ tests/networkxml2xmlout/forward-delay-network.xml | 13 ++ tests/networkxml2xmlout/isolated-network.xml | 10 ++ tests/networkxml2xmlout/nat-network.xml | 13 ++ tests/networkxml2xmlout/netboot-network.xml | 14 +++ tests/networkxml2xmlout/routed-network.xml | 11 ++ tests/networkxml2xmltest.c | 97 +++++++++++++++ tests/nodedevschematest | 31 +----- tests/schematestutils.sh | 39 ++++++ tests/statstest.c | 2 +- tests/storagepoolschemadata/pool-dir.xml | 17 --- tests/storagepoolschemadata/pool-disk.xml | 22 ---- tests/storagepoolschemadata/pool-fs.xml | 19 --- tests/storagepoolschemadata/pool-iscsi.xml | 10 -- tests/storagepoolschemadata/pool-logical.xml | 19 --- tests/storagepoolschemadata/pool-netfs.xml | 20 --- tests/storagepoolschematest | 33 +----- tests/storagepoolxml2xmlin/pool-dir.xml | 18 +++ tests/storagepoolxml2xmlin/pool-disk.xml | 22 ++++ tests/storagepoolxml2xmlin/pool-fs.xml | 19 +++ tests/storagepoolxml2xmlin/pool-iscsi-auth.xml | 17 +++ tests/storagepoolxml2xmlin/pool-iscsi.xml | 16 +++ tests/storagepoolxml2xmlin/pool-logical-create.xml | 20 +++ tests/storagepoolxml2xmlin/pool-logical.xml | 19 +++ tests/storagepoolxml2xmlin/pool-mpath.xml | 12 ++ tests/storagepoolxml2xmlin/pool-netfs.xml | 20 +++ tests/storagepoolxml2xmlin/pool-scsi.xml | 15 +++ tests/storagepoolxml2xmlout/pool-dir.xml | 18 +++ tests/storagepoolxml2xmlout/pool-disk.xml | 19 +++ tests/storagepoolxml2xmlout/pool-fs.xml | 19 +++ tests/storagepoolxml2xmlout/pool-iscsi-auth.xml | 20 +++ tests/storagepoolxml2xmlout/pool-iscsi.xml | 19 +++ .../storagepoolxml2xmlout/pool-logical-create.xml | 22 ++++ tests/storagepoolxml2xmlout/pool-logical.xml | 19 +++ tests/storagepoolxml2xmlout/pool-mpath.xml | 17 +++ tests/storagepoolxml2xmlout/pool-netfs.xml | 20 +++ tests/storagepoolxml2xmlout/pool-scsi.xml | 18 +++ tests/storagepoolxml2xmltest.c | 102 ++++++++++++++++ tests/storagevolschemadata/vol-logical.xml | 20 --- tests/storagevolschemadata/vol-partition.xml | 21 ---- tests/storagevolschemadata/vol-qcow2.xml | 31 ----- tests/storagevolschematest | 33 +----- tests/storagevolxml2xmlin/vol-file-backing.xml | 24 ++++ tests/storagevolxml2xmlin/vol-file.xml | 15 +++ tests/storagevolxml2xmlin/vol-logical-backing.xml | 29 +++++ tests/storagevolxml2xmlin/vol-logical.xml | 20 +++ tests/storagevolxml2xmlin/vol-partition.xml | 21 ++++ tests/storagevolxml2xmlin/vol-qcow2.xml | 31 +++++ tests/storagevolxml2xmlout/vol-file-backing.xml | 27 +++++ tests/storagevolxml2xmlout/vol-file.xml | 18 +++ tests/storagevolxml2xmlout/vol-logical-backing.xml | 26 ++++ tests/storagevolxml2xmlout/vol-logical.xml | 17 +++ tests/storagevolxml2xmlout/vol-partition.xml | 18 +++ tests/storagevolxml2xmlout/vol-qcow2.xml | 31 +++++ tests/storagevolxml2xmltest.c | 123 ++++++++++++++++++++ 72 files changed, 1291 insertions(+), 413 deletions(-) delete mode 100644 tests/networkschemadata/netboot-network.xml create mode 100644 tests/networkxml2xmlin/forward-delay-network.xml create mode 100644 tests/networkxml2xmlin/isolated-network.xml create mode 100644 tests/networkxml2xmlin/nat-network.xml create mode 100644 tests/networkxml2xmlin/netboot-network.xml create mode 100644 tests/networkxml2xmlin/routed-network.xml create mode 100644 tests/networkxml2xmlout/forward-delay-network.xml create mode 100644 tests/networkxml2xmlout/isolated-network.xml create mode 100644 tests/networkxml2xmlout/nat-network.xml create mode 100644 tests/networkxml2xmlout/netboot-network.xml create mode 100644 tests/networkxml2xmlout/routed-network.xml create mode 100644 tests/networkxml2xmltest.c create mode 100644 tests/schematestutils.sh delete mode 100644 tests/storagepoolschemadata/pool-dir.xml delete mode 100644 tests/storagepoolschemadata/pool-disk.xml delete mode 100644 tests/storagepoolschemadata/pool-fs.xml delete mode 100644 tests/storagepoolschemadata/pool-iscsi.xml delete mode 100644 tests/storagepoolschemadata/pool-logical.xml delete mode 100644 tests/storagepoolschemadata/pool-netfs.xml create mode 100644 tests/storagepoolxml2xmlin/pool-dir.xml create mode 100644 tests/storagepoolxml2xmlin/pool-disk.xml create mode 100644 tests/storagepoolxml2xmlin/pool-fs.xml create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth.xml create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi.xml create mode 100644 tests/storagepoolxml2xmlin/pool-logical-create.xml create mode 100644 tests/storagepoolxml2xmlin/pool-logical.xml create mode 100644 tests/storagepoolxml2xmlin/pool-mpath.xml create mode 100644 tests/storagepoolxml2xmlin/pool-netfs.xml create mode 100644 tests/storagepoolxml2xmlin/pool-scsi.xml create mode 100644 tests/storagepoolxml2xmlout/pool-dir.xml create mode 100644 tests/storagepoolxml2xmlout/pool-disk.xml create mode 100644 tests/storagepoolxml2xmlout/pool-fs.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi.xml create mode 100644 tests/storagepoolxml2xmlout/pool-logical-create.xml create mode 100644 tests/storagepoolxml2xmlout/pool-logical.xml create mode 100644 tests/storagepoolxml2xmlout/pool-mpath.xml create mode 100644 tests/storagepoolxml2xmlout/pool-netfs.xml create mode 100644 tests/storagepoolxml2xmlout/pool-scsi.xml create mode 100644 tests/storagepoolxml2xmltest.c delete mode 100644 tests/storagevolschemadata/vol-logical.xml delete mode 100644 tests/storagevolschemadata/vol-partition.xml delete mode 100644 tests/storagevolschemadata/vol-qcow2.xml create mode 100644 tests/storagevolxml2xmlin/vol-file-backing.xml create mode 100644 tests/storagevolxml2xmlin/vol-file.xml create mode 100644 tests/storagevolxml2xmlin/vol-logical-backing.xml create mode 100644 tests/storagevolxml2xmlin/vol-logical.xml create mode 100644 tests/storagevolxml2xmlin/vol-partition.xml create mode 100644 tests/storagevolxml2xmlin/vol-qcow2.xml create mode 100644 tests/storagevolxml2xmlout/vol-file-backing.xml create mode 100644 tests/storagevolxml2xmlout/vol-file.xml create mode 100644 tests/storagevolxml2xmlout/vol-logical-backing.xml create mode 100644 tests/storagevolxml2xmlout/vol-logical.xml create mode 100644 tests/storagevolxml2xmlout/vol-partition.xml create mode 100644 tests/storagevolxml2xmlout/vol-qcow2.xml create mode 100644 tests/storagevolxml2xmltest.c

4 40

[libvirt] [PATCH] do not bother rotating short qemu logs
by Dan Kenigsberg 21 Oct '09

21 Oct '09

without this, after few weeks without use, each defined domain grows a tail of empty gzipped logs, instead of keeping just the last log of interest. --- daemon/libvirtd.logrotate.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.logrotate.in b/daemon/libvirtd.logrotate.in index 093651c..0c51fd3 100644 --- a/daemon/libvirtd.logrotate.in +++ b/daemon/libvirtd.logrotate.in @@ -5,4 +5,5 @@ compress delaycompress copytruncate + minsize 100k } -- 1.6.2.5

3 2

[libvirt] [PATCH] LXC fix virCgroupGetValueStr on handling a string terminated with '\n'
by Ryota Ozaki 21 Oct '09

21 Oct '09

Hi there, A cgroup file returns integer value terminated with '\n' and remaining it has sometimes harmful effects, for example it leads virStrToLong_ull failed. The fix just gets rid of '\n' if included. It first has been in virCgroupGetFreezerState, but now merged in virCgroupGetValueStr to cover every functions using virCgroupGetValueStr. I'm not sure that that behavior is from the beginning or changed in a recent kernel, but the fix should work even though anyway. BTW, by the defect I first got the following error and it made me confused. # virsh -c lxc:/// dominfo 4930 Id: 4930 Name: lxc UUID: 084369a0-956a-3010-fc37-ddeb4d627e69 OS Type: exe Autostart: disable error: this function is not supported by the hypervisor: virNodeGetSecurityModel The really error happens in lxcDomainGetInfo, so I guess something is wrong with internal error propagation. Anyone know this unexpected behavior? Thanks, ozaki-r >From 667efde6ad165479817975c6544f6784e1177a32 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Fri, 16 Oct 2009 00:13:41 +0900 Subject: [PATCH] LXC fix virCgroupGetValueStr on handling a string terminated with '\n' * src/util/cgroup.c: get rid of '\n' from the return value of virCgroupGetValueStr --- src/util/cgroup.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index f728a2f..f0e2960 100644 --- a/src/util/cgroup.c+++ b/src/util/cgroup.c @@ -309,6 +309,10 @@ static int virCgroupGetValueStr(virCgroupPtr group, DEBUG("Failed to read %s: %m\n", keypath); rc = -errno; } else { + /* Terminated with '\n' has sometimes harmful effects to the caller */ + char *p = strchr((const char *)value, '\n'); + if (p) *p = '\0'; + rc = 0; } @@ -969,13 +973,7 @@ int virCgroupSetFreezerState(virCgroupPtr group, const char *state) int virCgroupGetFreezerState(virCgroupPtr group, char **state) { - int ret; - ret = virCgroupGetValueStr(group, + return virCgroupGetValueStr(group, VIR_CGROUP_CONTROLLER_CPU, "freezer.state", state); - if (ret == 0) { - char *p = strchr(*state, '\n'); - if (p) *p = '\0'; - } - return ret; } -- 1.6.2.5

3 4

[libvirt] [PATCH] 528575 avoid libvirtd crash on LCX domain autostart
by Daniel Veillard 21 Oct '09

21 Oct '09

https://bugzilla.redhat.com/show_bug.cgi?id=528575 virsh -c lxc:/// autostart vm1 crash the daemon because the driver autostartDir is never initialized and we do a NULL dereference. The enclosed patch is trivial and avoid the crash, but ... [root@paphio ~]# virsh -c lxc:/// dominfo vm1 Id: - Name: vm1 UUID: d320f760-7541-6633-fd42-4f984fca9f51 OS Type: exe State: shut off CPU(s): 1 Max memory: 500000 kB Used memory: 500000 kB Autostart: enable while the domain is properly flagged as autostarting it doesn't seem to actually autostart, and the driver->autostartDir directory is not created on the fly as I would expect, i.e. /etc/libvirt/lxc/autostart/ still doesn't exist and the domain is marked as off and Autostart: enable I think it would be good to ACK the patch to avoid the crash but we also need to have someone look at the autostart of LXC domains and double check what is going on, maybe I missed something :-) Ozaki, any chance you could look at this ? Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] [PATCH] Fix virsh.c compilation warning
by Jim Fehlig 21 Oct '09

21 Oct '09

A call to vshError() containing 'doexit' parameter sneaked in after I removed said parameter. Regards, Jim

3 2

[libvirt] Re: [virt-tools-list] libvirt 0.7.2 linker issues
by Cole Robinson 21 Oct '09

21 Oct '09

On 10/19/2009 08:54 AM, Laurent Léonard wrote: > Hi, > > I'm trying to package libvirt 0.7.2 for Debian and get some linker issues : > > make[3]: Entering directory `/home/user/debian/libvirt/libvirt-0.7.2/tools' > CC virsh-console.o > CC virsh-virsh.o > CCLD virsh > ../src/.libs/libvirt.so: undefined reference to `security_getenforce' > ../src/.libs/libvirt.so: undefined reference to `freecon' > ../src/.libs/libvirt.so: undefined reference to `setexeccon' > ../src/.libs/libvirt.so: undefined reference to > `selinux_virtual_domain_context_path' > ../src/.libs/libvirt.so: undefined reference to `context_str' > ../src/.libs/libvirt.so: undefined reference to `context_range_set' > ../src/.libs/libvirt.so: undefined reference to `is_selinux_enabled' > ../src/.libs/libvirt.so: undefined reference to `setfilecon' > ../src/.libs/libvirt.so: undefined reference to `context_new' > ../src/.libs/libvirt.so: undefined reference to `getfilecon' > ../src/.libs/libvirt.so: undefined reference to `getpidcon' > ../src/.libs/libvirt.so: undefined reference to `context_free' > ../src/.libs/libvirt.so: undefined reference to `context_range_get' > ../src/.libs/libvirt.so: undefined reference to `matchpathcon' > ../src/.libs/libvirt.so: undefined reference to > `selinux_virtual_image_context_path' > ../src/.libs/libvirt.so: undefined reference to `security_check_context' > collect2: ld returned 1 exit status > make[3]: *** [virsh] Error 1 > make[3]: Leaving directory `/home/user/debian/libvirt/libvirt-0.7.2/tools' > make[2]: *** [all] Error 2 > make[2]: Leaving directory `/home/user/debian/libvirt/libvirt-0.7.2/tools' > make[1]: *** [all-recursive] Error 1 > make[1]: Leaving directory `/home/user/debian/libvirt/libvirt-0.7.2' > make: *** [all] Error 2 > > Any idea what's wrong ? > > Thank you, Libvirt questions should go to libvirt-list(a)redhat.com (cc'd now). You should pass --with-selinux=no to configure, since those are all libselinux functions. Do you have libselinux installed? If not, there's probably an error in configure.in selinux autodetection. - Cole

5 5

[libvirt] LXC implement missing macaddr assignment feature
by Ryota Ozaki 21 Oct '09

21 Oct '09

Hi, Currently MAC address configuration of container veth is just ignored. This patch implements the missing feature. * src/lxc/veth.c, src/lxc/veth.h: add setMacAddr * src/lxc/lxc_driver.c: set macaddr of container veth if specified ozaki-r >From 38ccccf09526bdd125c717beb13769aa2904e751 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Mon, 19 Oct 2009 22:13:18 +0900 Subject: [PATCH] LXC implement missing macaddr assignment feature Currently MAC address configuration of container veth is just ignored. This patch implements the missing feature. * src/lxc/veth.c, src/lxc/veth.h: add setMacAddr * src/lxc/lxc_driver.c: set macaddr of container veth if specified --- src/lxc/lxc_driver.c | 11 +++++++++++ src/lxc/veth.c | 31 +++++++++++++++++++++++++++++++ src/lxc/veth.h | 1 + 3 files changed, 43 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 783dfcc..ef97364 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -786,6 +786,17 @@ static int lxcSetupInterfaces(virConnectPtr conn, goto error_exit; } + if (def->nets[i]->mac) { + char macaddr[VIR_MAC_STRING_BUFLEN]; + virFormatMacAddr(def->nets[i]->mac, macaddr); + if (0 != (rc = setMacAddr(containerVeth, macaddr))) { + virReportSystemError(conn, rc, + _("failed to set %s to %s"), + macaddr, containerVeth); + goto error_exit; + } + } + if (0 != (rc = brAddInterface(brctl, bridge, parentVeth))) { virReportSystemError(conn, rc, _("failed to add %s device to %s"), diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 71d7de6..b15df8d 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -216,3 +216,34 @@ error_out: VIR_FREE(pid); return rc; } + +/** + * setMacAddr + * @iface: name of device + * @macaddr: MAC address to be assigned + * + * Changes the MAC address of the given device with the + * given address using this command: + * ip link set @iface address @macaddr + * + * Returns 0 on success or -1 in case of error + */ +int setMacAddr(const char* iface, const char* macaddr) +{ + int rc = -1; + const char *argv[] = { + "ip", "link", "set", iface, "address", macaddr, NULL + }; + int cmdResult; + + if (NULL == iface) { + goto error_out; + } + + rc = virRun(NULL, argv, &cmdResult); + if (0 == rc) + rc = cmdResult; + +error_out: + return rc; +} diff --git a/src/lxc/veth.h b/src/lxc/veth.h index 429eb3d..8f2f514 100644 --- a/src/lxc/veth.h +++ b/src/lxc/veth.h @@ -20,5 +20,6 @@ int vethCreate(char* veth1, int veth1MaxLen, char* veth2, int vethDelete(const char* veth); int vethInterfaceUpOrDown(const char* veth, int upOrDown); int moveInterfaceToNetNs(const char *iface, int pidInNs); +int setMacAddr(const char* iface, const char* macaddr); #endif /* VETH_H */ -- 1.6.2.5

2 1

[libvirt] Using libvirt to obtain mac address of virtual domain
by Carlen, Devin C. (ARC-A)[PEROT SYSTEMS] 21 Oct '09

21 Oct '09

Greetings, I am new to libvirt and am looking for the most efficient way to programmatically obtain the mac address from a virtual domain. Libvirt is providing access to xen and kvm in my case. A nudge in the right direction would be appreciated! Best Regards, Devin Carlen

4 3

[libvirt] [PATCH] tests: Centralize VIR_TEST_DEBUG lookup, and document it
by Cole Robinson 21 Oct '09

21 Oct '09

Provide a simple interface for other tests to lookup the testDebug variable. Also remove a redundant error message in interface tests. If anyone feels inclined to change this env variable to match the existing LIBVIRT_* format, it should now be easier to do so. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- HACKING | 10 ++++++++++ tests/interfacexml2xmltest.c | 2 -- tests/statstest.c | 4 ++-- tests/testutils.c | 38 ++++++++++++++++++++++++++------------ tests/testutils.h | 4 ++-- tests/testutilsqemu.c | 2 +- 6 files changed, 41 insertions(+), 19 deletions(-) diff --git a/HACKING b/HACKING index bcff8c6..fba7778 100644 --- a/HACKING +++ b/HACKING @@ -37,6 +37,16 @@ and run the tests: The latter test checks for memory leaks. +If you encounter any failing tests, the VIR_TEST_DEBUG environment variable +may help: + + VIR_TEST_DEBUG=1 make check (or) + VIR_TEST_DEBUG=2 make check + +Also, individual tests can be run from inside the 'tests/' directory, like: + + ./qemuxml2xmltest + (6) Update tests and/or documentation, particularly if you are adding a new feature or changing the output of a program. diff --git a/tests/interfacexml2xmltest.c b/tests/interfacexml2xmltest.c index 5ffebad..ed3093c 100644 --- a/tests/interfacexml2xmltest.c +++ b/tests/interfacexml2xmltest.c @@ -43,8 +43,6 @@ static int testCompareXMLToXMLFiles(const char *xml) { ret = 0; fail: - if (ret != 0) - fprintf(stderr, "expected: -------\n%s", actual); free(actual); virInterfaceDefFree(dev); return ret; diff --git a/tests/statstest.c b/tests/statstest.c index 82c0daa..4c2ea7f 100644 --- a/tests/statstest.c +++ b/tests/statstest.c @@ -25,7 +25,7 @@ static int testDevice(const char *path, int expect) if (actual == expect) { return 0; } else { - if (getenv("DEBUG_TESTS")) + if (virtTestGetDebug()) fprintf(stderr, "Expect %-6d Actual %-6d\n", expect, actual); return -1; } @@ -55,7 +55,7 @@ mymain(int argc ATTRIBUTE_UNUSED, * register a handler to stop error messages cluttering * up display */ - if (!getenv("VIR_TEST_DEBUG")) + if (!virtTestGetDebug()) virSetErrorFunc(NULL, testQuietError); #define DO_TEST(dev, num) \ diff --git a/tests/testutils.c b/tests/testutils.c index e6f5e61..9daec6d 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -45,7 +45,7 @@ ((((int) ((T)->tv_sec - (U)->tv_sec)) * 1000000.0 + \ ((int) ((T)->tv_usec - (U)->tv_usec))) / 1000.0) -unsigned int testDebug = 0; +unsigned int testDebug = -1; static unsigned int testOOM = 0; static unsigned int testCounter = 0; @@ -255,10 +255,10 @@ int virtTestDifference(FILE *stream, const char *actualStart = actual; const char *actualEnd = actual + (strlen(actual)-1); - if (!testDebug) + if (!virtTestGetDebug()) return 0; - if (testDebug < 2) { + if (virtTestGetDebug() < 2) { /* Skip to first character where they differ */ while (*expectStart && *actualStart && *actualStart == *expectStart) { @@ -322,12 +322,30 @@ virtTestErrorHook(int n, void *data ATTRIBUTE_UNUSED) } #endif +unsigned int +virtTestGetDebug() { + char *debugStr; + unsigned int debug; + + if (testDebug != -1) + return testDebug; + + testDebug = 0; + + if ((debugStr = getenv("VIR_TEST_DEBUG")) == NULL) + return 0; + + if (virStrToLong_ui(debugStr, NULL, 10, &debug) < 0) + return 0; + + testDebug = debug; + return testDebug; +} int virtTestMain(int argc, char **argv, int (*func)(int, char **)) { - char *debugStr; int ret; #if TEST_OOM int approxAlloc = 0; @@ -344,10 +362,6 @@ int virtTestMain(int argc, virRandomInitialize(time(NULL) ^ getpid())) return 1; - if ((debugStr = getenv("VIR_TEST_DEBUG")) != NULL) { - if (virStrToLong_ui(debugStr, NULL, 10, &testDebug) < 0) - testDebug = 0; - } #if TEST_OOM if ((oomStr = getenv("VIR_TEST_OOM")) != NULL) { @@ -375,7 +389,7 @@ int virtTestMain(int argc, goto cleanup; #if TEST_OOM_TRACE - if (testDebug) + if (virtTestGetDebug()) virAllocTestHook(virtTestErrorHook, NULL); #endif @@ -393,7 +407,7 @@ int virtTestMain(int argc, approxAlloc = virAllocTestCount(); testCounter++; - if (testDebug) + if (virtTestGetDebug()) fprintf(stderr, "%d) OOM...\n", testCounter); else fprintf(stderr, "%d) OOM of %d allocs ", testCounter, approxAlloc); @@ -415,7 +429,7 @@ int virtTestMain(int argc, if (mp && (n % mp) != (worker - 1)) continue; - if (!testDebug) { + if (!virtTestGetDebug()) { if (mp) fprintf(stderr, "%d", worker); else @@ -444,7 +458,7 @@ int virtTestMain(int argc, } } - if (testDebug) + if (virtTestGetDebug()) fprintf(stderr, " ... OOM of %d allocs", approxAlloc); if (ret == EXIT_SUCCESS) diff --git a/tests/testutils.h b/tests/testutils.h index f036e0f..aef1179 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -34,6 +34,8 @@ int virtTestDifference(FILE *stream, const char *expect, const char *actual); +unsigned int virtTestGetDebug(void); + int virtTestMain(int argc, char **argv, int (*func)(int, char **)); @@ -43,6 +45,4 @@ int virtTestMain(int argc, return virtTestMain(argc,argv, func); \ } -extern unsigned int testDebug; - #endif /* __VIT_TEST_UTILS_H__ */ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 9269f5c..eeeb5ec 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -132,7 +132,7 @@ virCapsPtr testQemuCapsInit(void) { NULL) == NULL) goto cleanup; - if (testDebug) { + if (virtTestGetDebug()) { char *caps_str; caps_str = virCapabilitiesFormatXML(caps); -- 1.6.0.6

2 3

[libvirt] [PATCH] tests: Initialize virRandom in for test suite.
by Cole Robinson 21 Oct '09

21 Oct '09

Otherwise any virRandom calls will result in a segfault. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- tests/testutils.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/testutils.c b/tests/testutils.c index 536441a..e6f5e61 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -340,7 +340,8 @@ int virtTestMain(int argc, #endif if (virThreadInitialize() < 0 || - virErrorInitialize() < 0) + virErrorInitialize() < 0 || + virRandomInitialize(time(NULL) ^ getpid())) return 1; if ((debugStr = getenv("VIR_TEST_DEBUG")) != NULL) { -- 1.6.0.6

2 2

[libvirt] error: unable to connect to '/usr/local/var/run/libvirt/libvirt-sock': Connection refused
by Liu, Zhentao 20 Oct '09

20 Oct '09

Hello, I updated libvirt-bin to version 0.7.0. I still got a error: ------------------------------------------------------------------------------------------- root@forest:/tmp/libvirt-0.7.0# virsh -c qemu:///system list error: unable to connect to '/usr/local/var/run/libvirt/libvirt-sock': Connection refused error: failed to connect to the hypervisor ------------------------------------------------------------------------------------------- Any helps? Regards Zhentao

3 6

[libvirt] Re: [PATCH] also allow use of XZ for Qemu image compression
by Antonio Diaz Diaz 20 Oct '09

20 Oct '09

Daniel Veillard wrote: > xz package dependancy is IMHO a small price to pay: Size: 443012 > to garantee reliability Do you know lzip (http://www.nongnu.org/lzip/lzip.html)? Lzip package size is only 55156 bytes, it is stable (xz is beta), some people consider it better designed than xz (http://lpar.ath0.com/2009/09/25/documentation-as-an-indicator-of-code-quali…) and may very well be the LZMA file format that succeeds. Best regards, Antonio.

1 0

[libvirt] [PATCH] Better error reporting for failed migration.
by Chris Lalancette 19 Oct '09

19 Oct '09

The comment in the code says most of it, but when the destination hostname resolution is screwed up, print a proper error instead of the very unhelpful "unknown error". Note that I'm not overly fond of the wording in the error message, so I'm open to suggestions. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d37b184..02bb5cb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6288,6 +6288,22 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, goto cleanup; } + /* Remember that we are running on the destination. The hostname that + * we resolve here will be used on the source machine in the "migrate" + * monitor command. Because of that, localhost is almost always the + * wrong thing. Adding this check explicitly breaks localhost + * migration, but only for those machines that have improperly + * configured hostname resolution. + */ + if (STREQ(hostname, "localhost")) { + VIR_FREE(hostname); + qemudReportError(dconn, NULL, NULL, VIR_ERR_INVALID_ARG, "%s", + _("Could not resolve destination hostname; " + "either fix destination to resolve hostname, " + "or use the optional URI migration parameter")); + goto cleanup; + } + /* XXX this really should have been a properly well-formed * URI, but we can't add in tcp:// now without breaking * compatability with old targets. We at least make the -- 1.6.0.6

2 2

[libvirt] error: failed to connect to the hypervisor
by Liu, Zhentao 19 Oct '09

19 Oct '09

Hello, I have reinstalled libvirt-bin on ubuntu 9.04. Then I got a error: ------------------------------------------------------------------------ root@forest:/usr/local/etc/logrotate.d# virsh -c qemu:///system list error: failed to connect to the hypervisor ----------------------------------------------------------------------- ps: I have installed kvm on ubuntu. Any ideas? Regards Zhentao

1 0

[libvirt] libvirt and Linux KVM migrate_set_speed
by Monchiero, Matteo 19 Oct '09

19 Oct '09

Does Libvirt has an interface for KVM's migrate_set_speed? Thanks --matteo

2 1

[libvirt] Tyrel Datwyler is out of the office.
by Tyrel Datwyler 19 Oct '09

19 Oct '09

I will be out of the office starting 10/14/2009 and will not return until 10/19/2009. I will respond to your message when I return.

1 0

[libvirt] error: failed to connect to the hypervisor
by Liu, Zhentao 18 Oct '09

18 Oct '09

Hello, I have installed libvirt-bin 0.6.1 on the ubuntu 9.04. When I run "virsh -c qemu:///system list", I get this error: ---------------------------------------------------------------------------- unable to connect to '/var/run/libvirt/libvirt-sock': Permission denied failed to connect to the hypervisor ----------------------------------------------------------------------------- Then I search in the Internet, it may be a bug of version 0.6.1. So I update libvirt-bin to version 0.6.3, but I still get a error: --------------------------------------------------------------------------------- root@forest:/home/zli# virsh -c qemu:///system list error: failed to connect to the hypervisor ---------------------------------------------------------------------------------- I have no idea about the reason. Any helps? Regards Zhentao

2 1

[libvirt] [PATCH] util: Make sure random data is initialized when in virRandom
by Cole Robinson 17 Oct '09

17 Oct '09

When writing some tests, I mistakenly attempted to auto-generate a UUID, which caused a segfault: virRandom was being used without calling virRandomInitialize. Make sure this case can't happen. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/util/util.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index e5135fc..1554097 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1910,6 +1910,7 @@ int virKillProcess(pid_t pid, int sig) } +static int random_initialized = 0; static char randomState[128]; static struct random_data randomData; static virMutex randomLock; @@ -1925,6 +1926,7 @@ int virRandomInitialize(unsigned int seed) &randomData) < 0) return -1; + random_initialized = 1; return 0; } @@ -1932,6 +1934,12 @@ int virRandom(int max) { int32_t ret; + if (!random_initialized) { + /* This can error, but what's worse? Unnoticed bogus random data or + * a segfault? */ + virRandomInitialize(time(NULL) ^ getpid()); + } + virMutexLock(&randomLock); random_r(&randomData, &ret); virMutexUnlock(&randomLock); -- 1.6.5.rc2

2 2

[libvirt] node device libudev backend second look
by Dave Allan 16 Oct '09

16 Oct '09

Attached is a patch against the current head containing an implementation of node device enumeration using libudev. It is complete except for the monitor, but I'm submitting it now as I have a few questions about the implementation that I'd like advice on. They are marked XXX in comments in the patch. The other thing that's not clear to me is how the code generates the tree structure for nodedev-list --tree. I'm setting the parent pointer to what I think is correct, but the tree output is broken. I can dig through it until I understand it, but if anyone is familiar with the implementation and would be willing to take a few minutes to walk me through it, it would save me a bunch of time. I think it's also important that people get the code installed on a variety of systems as soon as possible to shake out the inevitable bugs that will arise from differing device models and code versions, and I'll have the final version with the monitor shortly. Dave >From efedc8fee8127b32fb5b761ce5035902d168a207 Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Fri, 25 Sep 2009 10:59:28 -0400 Subject: [PATCH 1/1] A second look at the libudev node device backend. This patch is a very much cleaned up version of the libudev based node device backend with all the device types implemented, although I need some guidance on the USB interface code as I am not especially familiar with the terminology and HAL and udev display the details quite differently. This version of the code uses libudev to retrieve all the device information, so there's no manual mucking about in sysfs except for a little bit of existing code for fibre channel adapters. There is a lot of detail work in this code, so we should try to get people running it on a wide variety of hardware so we can shake out the differences in implementation between the HAL and libudev backends. --- configure.in | 47 ++- daemon/libvirtd.c | 3 +- src/Makefile.am | 16 +- src/conf/node_device_conf.c | 15 +- src/conf/node_device_conf.h | 5 + src/node_device/node_device_driver.c | 12 +- src/node_device/node_device_driver.h | 22 + src/node_device/node_device_hal.h | 19 - ...evice_hal_linux.c => node_device_linux_sysfs.c} | 0 src/node_device/node_device_udev.c | 800 ++++++++++++++++++++ src/node_device/node_device_udev.h | 27 + src/util/util.c | 28 + src/util/util.h | 3 + 13 files changed, 967 insertions(+), 30 deletions(-) rename src/node_device/{node_device_hal_linux.c => node_device_linux_sysfs.c} (100%) create mode 100644 src/node_device/node_device_udev.c create mode 100644 src/node_device/node_device_udev.h diff --git a/configure.in b/configure.in index 2f9db72..25ed55f 100644 --- a/configure.in +++ b/configure.in @@ -1640,7 +1640,7 @@ test "$enable_shared" = no && lt_cv_objdir=. LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.} AC_SUBST([LV_LIBTOOL_OBJDIR]) -dnl HAL or DeviceKit library for host device enumeration +dnl HAL, DeviceKit, or libudev library for host device enumeration HAL_REQUIRED=0.0 HAL_CFLAGS= HAL_LIBS= @@ -1734,8 +1734,46 @@ AM_CONDITIONAL([HAVE_DEVKIT], [test "x$with_devkit" = "xyes"]) AC_SUBST([DEVKIT_CFLAGS]) AC_SUBST([DEVKIT_LIBS]) +UDEV_REQUIRED=143 +UDEV_CFLAGS= +UDEV_LIBS= +AC_ARG_WITH([udev], + [ --with-udev use libudev for host device enumeration], + [], + [with_udev=check]) + +if test "$with_libvirtd" = "no" ; then + with_udev=no +fi +if test "x$with_udev" = "xyes" -o "x$with_udev" = "xcheck"; then + PKG_CHECK_MODULES(UDEV, libudev >= $UDEV_REQUIRED, + [with_udev=yes], [ + if test "x$with_udev" = "xcheck" ; then + with_udev=no + else + AC_MSG_ERROR( + [You must install udev-devel >= $UDEV_REQUIRED to compile libvirt]) + fi + ]) + if test "x$with_udev" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_UDEV], 1, + [use UDEV for host device enumeration]) + + old_CFLAGS=$CFLAGS + old_LDFLAGS=$LDFLAGS + CFLAGS="$CFLAGS $UDEV_CFLAGS" + LDFLAGS="$LDFLAGS $UDEV_LIBS" + AC_CHECK_FUNCS([udev_new],,[with_udev=no]) + CFLAGS="$old_CFLAGS" + LDFLAGS="$old_LDFLAGS" + fi +fi +AM_CONDITIONAL([HAVE_UDEV], [test "x$with_udev" = "xyes"]) +AC_SUBST([UDEV_CFLAGS]) +AC_SUBST([UDEV_LIBS]) + with_nodedev=no; -if test "$with_devkit" = "yes" -o "$with_hal" = "yes"; +if test "$with_devkit" = "yes" -o "$with_hal" = "yes" -o "$with_udev" = "yes"; then with_nodedev=yes AC_DEFINE_UNQUOTED([WITH_NODE_DEVICES], 1, [with node device driver]) @@ -1900,6 +1938,11 @@ AC_MSG_NOTICE([ devkit: $DEVKIT_CFLAGS $DEVKIT_LIBS]) else AC_MSG_NOTICE([ devkit: no]) fi +if test "$with_udev" = "yes" ; then +AC_MSG_NOTICE([ udev: $UDEV_CFLAGS $UDEV_LIBS]) +else +AC_MSG_NOTICE([ udev: no]) +fi if test "$with_netcf" = "yes" ; then AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $NETCF_LIBS]) else diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 78dfb2d..0c03aae 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -833,8 +833,7 @@ static struct qemud_server *qemudInitialize(int sigread) { #ifdef WITH_STORAGE_DIR storageRegister(); #endif -#if defined(WITH_NODE_DEVICES) && \ - (defined(HAVE_HAL) || defined(HAVE_DEVKIT)) +#if defined(WITH_NODE_DEVICES) nodedevRegister(); #endif secretRegister(); diff --git a/src/Makefile.am b/src/Makefile.am index d0ef7d1..f6f63a2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -254,16 +254,20 @@ SECURITY_DRIVER_APPARMOR_SOURCES = \ NODE_DEVICE_DRIVER_SOURCES = \ - node_device/node_device_driver.c node_device/node_device_driver.h + node_device/node_device_driver.c \ + node_device/node_device_driver.h \ + node_device/node_device_linux_sysfs.c NODE_DEVICE_DRIVER_HAL_SOURCES = \ node_device/node_device_hal.c \ - node_device/node_device_hal.h \ - node_device/node_device_hal_linux.c + node_device/node_device_hal.h NODE_DEVICE_DRIVER_DEVKIT_SOURCES = \ node_device/node_device_devkit.c +NODE_DEVICE_DRIVER_UDEV_SOURCES = \ + node_device/node_device_udev.c + ######################### # @@ -642,6 +646,11 @@ libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) libvirt_driver_nodedev_la_CFLAGS += $(DEVKIT_CFLAGS) libvirt_driver_nodedev_la_LDFLAGS += $(DEVKIT_LIBS) endif +if HAVE_UDEV +libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES) +libvirt_driver_nodedev_la_CFLAGS += $(UDEV_CFLAGS) +libvirt_driver_nodedev_la_LDFLAGS += $(UDEV_LIBS) +endif if WITH_DRIVER_MODULES libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version @@ -689,6 +698,7 @@ EXTRA_DIST += \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) \ + $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index f09f814..2322819 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -325,6 +325,9 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, data->usb_if.subclass); virBufferVSprintf(&buf, " <protocol>%d</protocol>\n", data->usb_if.protocol); + if (data->usb_if.interface_name) + virBufferVSprintf(&buf, " <interface_name>%s</interface_name>\n", + data->usb_if.interface_name); if (data->usb_if.description) virBufferVSprintf(&buf, " <description>%s</description>\n", data->usb_if.description); @@ -394,10 +397,19 @@ char *virNodeDeviceDefFormat(virConnectPtr conn, "</media_available>\n", avl ? 1 : 0); virBufferVSprintf(&buf, " <media_size>%llu</media_size>\n", data->storage.removable_media_size); - virBufferAddLit(&buf, " </capability>\n"); + virBufferVSprintf(&buf, " <logical_block_size>%llu" + "</logical_block_size>\n", + data->storage.logical_block_size); + virBufferVSprintf(&buf, " <num_blocks>%llu</num_blocks>\n", + data->storage.num_blocks); } else { virBufferVSprintf(&buf, " <size>%llu</size>\n", data->storage.size); + virBufferVSprintf(&buf, " <logical_block_size>%llu" + "</logical_block_size>\n", + data->storage.logical_block_size); + virBufferVSprintf(&buf, " <num_blocks>%llu</num_blocks>\n", + data->storage.num_blocks); } if (data->storage.flags & VIR_NODE_DEV_CAP_STORAGE_HOTPLUGGABLE) virBufferAddLit(&buf, @@ -1239,6 +1251,7 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) VIR_FREE(data->usb_dev.vendor_name); break; case VIR_NODE_DEV_CAP_USB_INTERFACE: + VIR_FREE(data->usb_if.interface_name); VIR_FREE(data->usb_if.description); break; case VIR_NODE_DEV_CAP_NET: diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 29a4d43..95910c5 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -101,6 +101,7 @@ struct _virNodeDevCapsDef { unsigned function; unsigned product; unsigned vendor; + unsigned class; char *product_name; char *vendor_name; } pci_dev; @@ -117,10 +118,12 @@ struct _virNodeDevCapsDef { unsigned _class; /* "class" is reserved in C */ unsigned subclass; unsigned protocol; + char *interface_name; char *description; } usb_if; struct { char *address; + unsigned address_len; char *ifname; enum virNodeDevNetCapType subtype; /* LAST -> no subtype */ } net; @@ -139,6 +142,8 @@ struct _virNodeDevCapsDef { } scsi; struct { unsigned long long size; + unsigned long long num_blocks; + unsigned long long logical_block_size; unsigned long long removable_media_size; char *block; char *bus; diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 14b3098..f3bd45d 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -70,9 +70,12 @@ static int update_caps(virNodeDeviceObjPtr dev) } -#ifdef __linux__ -static int update_driver_name(virConnectPtr conn, - virNodeDeviceObjPtr dev) +#if defined (__linux__) && defined (HAVE_HAL) +/* XXX Why does this function exist? Are there devices that change + * their drivers while running? Under libudev, most devices seem to + * provide their driver name as a property "DRIVER" */ +static int update_driver_name_hal_linux(virConnectPtr conn, + virNodeDeviceObjPtr dev) { char *driver_link = NULL; char devpath[PATH_MAX]; @@ -754,5 +757,8 @@ int nodedevRegister(void) { #ifdef HAVE_DEVKIT return devkitNodeRegister(); #endif +#ifdef HAVE_UDEV + return udevNodeRegister(); +#endif #endif } diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index db01624..5be0781 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -45,6 +45,9 @@ int halNodeRegister(void); #ifdef HAVE_DEVKIT int devkitNodeRegister(void); #endif +#ifdef HAVE_UDEV +int udevNodeRegister(void); +#endif void nodeDeviceLock(virDeviceMonitorStatePtr driver); void nodeDeviceUnlock(virDeviceMonitorStatePtr driver); @@ -53,4 +56,23 @@ void registerCommonNodeFuncs(virDeviceMonitorPtr mon); int nodedevRegister(void); +#ifdef __linux__ + +#define check_fc_host(d) check_fc_host_linux(d) +int check_fc_host_linux(union _virNodeDevCapData *d); + +#define check_vport_capable(d) check_vport_capable_linux(d) +int check_vport_capable_linux(union _virNodeDevCapData *d); + +#define read_wwn(host, file, wwn) read_wwn_linux(host, file, wwn) +int read_wwn_linux(int host, const char *file, char **wwn); + +#else /* __linux__ */ + +#define check_fc_host(d) +#define check_vport_capable(d) +#define read_wwn(host, file, wwn) + +#endif /* __linux__ */ + #endif /* __VIR_NODE_DEVICE_H__ */ diff --git a/src/node_device/node_device_hal.h b/src/node_device/node_device_hal.h index c859fe3..8ac8a35 100644 --- a/src/node_device/node_device_hal.h +++ b/src/node_device/node_device_hal.h @@ -22,23 +22,4 @@ #ifndef __VIR_NODE_DEVICE_HAL_H__ #define __VIR_NODE_DEVICE_HAL_H__ -#ifdef __linux__ - -#define check_fc_host(d) check_fc_host_linux(d) -int check_fc_host_linux(union _virNodeDevCapData *d); - -#define check_vport_capable(d) check_vport_capable_linux(d) -int check_vport_capable_linux(union _virNodeDevCapData *d); - -#define read_wwn(host, file, wwn) read_wwn_linux(host, file, wwn) -int read_wwn_linux(int host, const char *file, char **wwn); - -#else /* __linux__ */ - -#define check_fc_host(d) -#define check_vport_capable(d) -#define read_wwn(host, file, wwn) - -#endif /* __linux__ */ - #endif /* __VIR_NODE_DEVICE_HAL_H__ */ diff --git a/src/node_device/node_device_hal_linux.c b/src/node_device/node_device_linux_sysfs.c similarity index 100% rename from src/node_device/node_device_hal_linux.c rename to src/node_device/node_device_linux_sysfs.c diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c new file mode 100644 index 0000000..32fde52 --- /dev/null +++ b/src/node_device/node_device_udev.c @@ -0,0 +1,800 @@ +/* + * node_device_udev.c: node device enumeration - libudev implementation + * + * Copyright (C) 2009 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Dave Allan <dallan(a)redhat.com> + */ + +#include <config.h> +#include <libudev.h> + +#include "node_device_udev.h" +#include "virterror_internal.h" +#include "node_device_conf.h" +#include "node_device_driver.h" +#include "driver.h" +#include "datatypes.h" +#include "logging.h" +#include "memory.h" +#include "util.h" +#include "buf.h" + +#define VIR_FROM_THIS VIR_FROM_NODEDEV + +static virDeviceMonitorStatePtr driverState = NULL; + +/* This function allocates memory from the heap for the property + * value. That memory must be later freed by some other code. */ +static int udevGetDeviceProperty(struct udev_device *udev_device, + const char *property_key, + char **property_value) +{ + const char *udev_value = NULL; + int ret = -1; + + udev_value = udev_device_get_property_value(udev_device, property_key); + if (udev_value == NULL) { + VIR_ERROR(_("udev reports property '%s' does not exist"), + property_key); + goto out; + } + + /* If this allocation is changed, the comment at the beginning + * of the function must also be changed. */ + *property_value = strdup(udev_value); + if (*property_value == NULL) { + VIR_ERROR(_("Failed to allocate memory for " + "property '%s' on device '%s'"), + property_key, udev_device_get_sysname(udev_device)); + goto out; + } + + ret = 0; + +out: + if (ret != 0) { + VIR_ERROR(_("Failed to get udev property '%s' for device '%s'"), + property_key, udev_device_get_sysname(udev_device)); + } + + return ret; +} + + +static int udevGetStringProperty(struct udev_device *udev_device, + const char *property_key, + char **value) +{ + return udevGetDeviceProperty(udev_device, property_key, value); +} + + +static int udevGetIntProperty(struct udev_device *udev_device, + const char *property_key, + int *value, + int base) +{ + char *udev_value = NULL; + int ret = 0; + + ret = udevGetDeviceProperty(udev_device, property_key, &udev_value); + + if (ret == 0) { + ret = virStrToLong_i(udev_value, NULL, base, value); + } + + VIR_FREE(udev_value); + return ret; +} + + +static int udevGetUintProperty(struct udev_device *udev_device, + const char *property_key, + unsigned int *value, + int base) +{ + char *udev_value = NULL; + int ret = 0; + + ret = udevGetDeviceProperty(udev_device, property_key, &udev_value); + + if (ret == 0) { + ret = virStrToLong_ui(udev_value, NULL, base, value); + } + + VIR_FREE(udev_value); + return ret; +} + + +static int udevGetStringSysfsAttr(struct udev_device *udev_device, + const char *attr_name, + char **value) +{ + const char *udev_value = NULL; + int ret = -1; + + udev_value = udev_device_get_sysattr_value(udev_device, attr_name); + + if (udev_value != NULL) { + *value = strdup(udev_value); + if (*value != NULL) { + ret = 0; + } + } + + return ret; +} + + +static int udevGetIntSysfsAttr(struct udev_device *udev_device, + const char *attr_name, + int *value, + int base) +{ + const char *udev_value = NULL; + int ret = -1; + + udev_value = udev_device_get_sysattr_value(udev_device, attr_name); + + if (udev_value != NULL) { + ret = virStrToLong_i(udev_value, NULL, base, value); + } + + return ret; +} + + +static int udevGetUintSysfsAttr(struct udev_device *udev_device, + const char *attr_name, + unsigned int *value, + int base) +{ + const char *udev_value = NULL; + int ret = -1; + + udev_value = udev_device_get_sysattr_value(udev_device, attr_name); + + if (udev_value != NULL) { + ret = virStrToLong_ui(udev_value, NULL, base, value); + } + + return ret; +} + + +static int udevGetUint64SysfsAttr(struct udev_device *udev_device, + const char *attr_name, + uint64_t *value) +{ + const char *udev_value = NULL; + int ret = -1; + + udev_value = udev_device_get_sysattr_value(udev_device, attr_name); + + if (udev_value != NULL) { + ret = virStrToLong_ull(udev_value, NULL, 0, value); + } + + return ret; +} + + +static void udevLogFunction(struct udev *udev ATTRIBUTE_UNUSED, + int priority ATTRIBUTE_UNUSED, + const char *file, + int line, + const char *fn, + const char *fmt, + va_list args) +{ + VIR_ERROR_INT(file, fn, line, fmt, args); +} + + +static int udevProcessPCI(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + const char *devpath = NULL; + int ret = -1; + + devpath = udev_device_get_devpath(device); + + char *p = strrchr(devpath, '/'); + if (p) { + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.domain); + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.bus); + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.slot); + virStrToLong_ui(p+1, &p, 16, &def->caps->data.pci_dev.function); + } + + udevGetUintSysfsAttr(device, "vendor", &def->caps->data.pci_dev.vendor, 0); + udevGetUintSysfsAttr(device, "product", &def->caps->data.pci_dev.product, 0); + + /* FIXME: to do the vendor name and product name, we have to + * parse /usr/share/hwdata/pci.ids. Look in hal/hald/ids.c + */ + + ret = 0; + + return ret; +} + + +static int udevProcessUSBDevice(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int ret = 0; + udevGetUintProperty(device, "BUSNUM", &def->caps->data.usb_dev.bus, 0); + udevGetUintProperty(device, "DEVNUM", &def->caps->data.usb_dev.device, 0); + udevGetUintProperty(device, "ID_VENDOR_ID", &def->caps->data.usb_dev.vendor, 16); + udevGetStringProperty(device, "ID_VENDOR", &def->caps->data.usb_dev.vendor_name); + udevGetUintProperty(device, "ID_MODEL_ID", &def->caps->data.usb_dev.product, 0); + udevGetStringProperty(device, "ID_MODEL", &def->caps->data.usb_dev.product_name); + + return ret; +} + + +/* XXX I don't fully understand the properties here. Advice needed. */ +static int udevProcessUSBInterface(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int ret = 0; + char *tmp = NULL, *p = NULL; + + udevGetStringProperty(device, + "INTERFACE", + &def->caps->data.usb_if.interface_name); + + tmp = strdup(def->caps->data.usb_if.interface_name); + + p = strrchr(tmp, '/'); + if (p) { + *p = '\0'; + virStrToLong_ui(tmp, NULL, 0, &def->caps->data.usb_if.number); + virStrToLong_ui(p+1, &p, 0, &def->caps->data.usb_if._class); + virStrToLong_ui(p+1, &p, 0, &def->caps->data.usb_if.subclass); + } + + VIR_FREE(tmp); + return ret; +} + + +static int udevProcessNetworkInterface(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int ret = 0; + + udevGetStringSysfsAttr(device, "address", &def->caps->data.net.address); + udevGetUintSysfsAttr(device, "addr_len", &def->caps->data.net.address_len, 0); + + return ret; +} + + +static int udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED, + virNodeDeviceDefPtr def) +{ + int ret = 0; + char *filename = NULL; + + filename = basename(def->name); + + if (STRPREFIX(filename, "host")) { + /* XXX There's really no better way to get the host #? */ + ret = virStrToLong_ui(filename + strlen("host"), + NULL, + 0, + &def->caps->data.scsi_host.host); + check_fc_host(&def->caps->data); + check_vport_capable(&def->caps->data); + } + + return ret; +} + + +static int udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, + virNodeDeviceDefPtr def) +{ + int ret = 0; + char *filename = NULL, *p = NULL; + + filename = basename(def->name); + + virStrToLong_ui(filename, &p, 10, &def->caps->data.scsi.host); + virStrToLong_ui(p+1, &p, 10, &def->caps->data.scsi.bus); + virStrToLong_ui(p+1, &p, 10, &def->caps->data.scsi.target); + virStrToLong_ui(p+1, &p, 10, &def->caps->data.scsi.lun); + + return ret; +} + + +static int udevProcessDisk(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int ret = 0; + + def->caps->data.storage.drive_type = strdup("disk"); + if (def->caps->data.storage.drive_type == NULL) { + ret = -1; + goto out; + } + + udevGetUint64SysfsAttr(device, "size", &def->caps->data.storage.num_blocks); + udevGetUint64SysfsAttr(device, "queue/logical_block_size", + &def->caps->data.storage.logical_block_size); + + def->caps->data.storage.size = def->caps->data.storage.num_blocks * + def->caps->data.storage.logical_block_size; + +out: + return ret; +} + + +static int udevProcessCDROM(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int tmp_int = 0, ret = 0; + + if ((udevGetIntSysfsAttr(device, "removable", &tmp_int, 0) == 0) && + (tmp_int == 1)) { + + def->caps->data.storage.flags |= VIR_NODE_DEV_CAP_STORAGE_REMOVABLE; + + if ((udevGetIntProperty(device, "ID_CDROM_MEDIA", &tmp_int, 0) == 0) && + (tmp_int == 1)) { + + def->caps->data.storage.flags |= + VIR_NODE_DEV_CAP_STORAGE_REMOVABLE_MEDIA_AVAILABLE; + + udevGetUint64SysfsAttr(device, "size", &def->caps->data.storage.num_blocks); + udevGetUint64SysfsAttr(device, "queue/logical_block_size", + &def->caps->data.storage.logical_block_size); + + /* XXX This calculation is wrong for the qemu virtual + * cdrom which reports the size in 512 byte blocks, but + * the logical block size as 2048. I don't have a + * physical cdrom on a devel system to see how they + * behave. */ + def->caps->data.storage.removable_media_size = + def->caps->data.storage.num_blocks * + def->caps->data.storage.logical_block_size; + } + } + + return ret; +} + + +/* This function exists to deal with the case in which a driver does + * not provide a device type in the usual place, but udev told us it's + * a storage device, and we can make a good guess at what kind of + * storage device it is from other information that is provided. */ +static int udevKludgeStorageType(virNodeDeviceDefPtr def) +{ + int ret = -1; + + if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) { + /* virtio disk */ + def->caps->data.storage.drive_type = strdup("disk"); + if (def->caps->data.storage.drive_type != NULL) { + ret = 0; + } + } + + return ret; +} + + +static void udevStripSpaces(char *s) +{ + if (s == NULL) { + return; + } + + while (virFileStripSuffix(s, " ")) { + /* do nothing */ + ; + } + + return; +} + + +static int udevProcessStorage(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int ret = -1; + + def->caps->data.storage.block = strdup(udev_device_get_devnode(device)); + udevGetStringProperty(device, "DEVNAME", &def->caps->data.storage.block); + udevGetStringProperty(device, "ID_BUS", &def->caps->data.storage.bus); + udevGetStringProperty(device, "ID_SERIAL", &def->caps->data.storage.serial); + udevGetStringSysfsAttr(device, "device/vendor", &def->caps->data.storage.vendor); + udevStripSpaces(def->caps->data.storage.vendor); + udevGetStringSysfsAttr(device, "device/model", &def->caps->data.storage.model); + udevStripSpaces(def->caps->data.storage.model); + /* XXX Is there an equivalent of the HAL hotpluggable property? + * Is the hotpluggable property still relevant? */ + + if (udevGetStringProperty(device, + "ID_TYPE", + &def->caps->data.storage.drive_type) != 0) { + /* If udev doesn't have it, perhaps we can guess it. */ + if (udevKludgeStorageType(def) != 0) { + goto out; + } + } + + /* NB: drive_type has changed from HAL; now it's "cd" instead of "cdrom" */ + if (STREQ(def->caps->data.storage.drive_type, "cd")) { + ret = udevProcessCDROM(device, def); + } else if (STREQ(def->caps->data.storage.drive_type, "disk")) { + ret = udevProcessDisk(device, def); + } else { + goto out; + } + +out: + return ret; +} + + +static int udevSetDeviceType(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + const char *devtype = NULL; + int ret = 0; + + if (VIR_ALLOC(def->caps) != 0) { + ret = -1; + goto out; + } + + devtype = udev_device_get_devtype(device); + + if (udevGetUintProperty(device, + "PCI_CLASS", + &def->caps->data.pci_dev.class, + 0) == 0) { + def->caps->type = VIR_NODE_DEV_CAP_PCI_DEV; + goto out; + } + + if (devtype != NULL && STREQ(devtype, "usb_device")) { + def->caps->type = VIR_NODE_DEV_CAP_USB_DEV; + goto out; + } + + if (devtype != NULL && STREQ(devtype, "usb_interface")) { + def->caps->type = VIR_NODE_DEV_CAP_USB_INTERFACE; + goto out; + } + + /* XXX Do some network interfaces set the device type property? */ + if (udevGetStringProperty(device, + "INTERFACE", + &def->caps->data.net.ifname) == 0) { + + def->caps->type = VIR_NODE_DEV_CAP_NET; + goto out; + } + + if (devtype != NULL && STREQ(devtype, "scsi_host")) { + def->caps->type = VIR_NODE_DEV_CAP_SCSI_HOST; + goto out; + } + + if (devtype != NULL && STREQ(devtype, "scsi_device")) { + def->caps->type = VIR_NODE_DEV_CAP_SCSI; + goto out; + } + + if (devtype != NULL && STREQ(devtype, "disk")) { + def->caps->type = VIR_NODE_DEV_CAP_STORAGE; + goto out; + } + + ret = -1; + +out: + return ret; +} + + +static int udevGetDeviceDetails(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + int ret = 0; + + switch (def->caps->type) { + case VIR_NODE_DEV_CAP_SYSTEM: + /* What do we want to do with system--there's no libudev equivalent. */ + break; + case VIR_NODE_DEV_CAP_PCI_DEV: + ret = udevProcessPCI(device, def); + break; + case VIR_NODE_DEV_CAP_USB_DEV: + ret = udevProcessUSBDevice(device, def); + break; + case VIR_NODE_DEV_CAP_USB_INTERFACE: + ret = udevProcessUSBInterface(device, def); + break; + case VIR_NODE_DEV_CAP_NET: + ret = udevProcessNetworkInterface(device, def); + break; + case VIR_NODE_DEV_CAP_SCSI_HOST: + ret = udevProcessSCSIHost(device, def); + break; + case VIR_NODE_DEV_CAP_SCSI: + ret = udevProcessSCSIDevice(device, def); + break; + case VIR_NODE_DEV_CAP_STORAGE: + ret = udevProcessStorage(device, def); + break; + default: + ret = -1; + break; + } + + return ret; +} + + +static int udevProcessOneDevice(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + struct udev_device *parent = NULL; + virNodeDeviceObjPtr dev = NULL; + const char *parent_name = NULL; + int ret = -1; + + def->name = strdup(udev_device_get_syspath(device)); + udevGetStringProperty(device, "DRIVER", &def->driver); + + /* How to handle parent devices? Shall we change the meaning of + * the parent pointer for the udev backend? What does client code + * use the parent relationship for? We really want to preserve + * the behavior of the HAL backend, but that may be difficult in + * practice. */ + parent = udev_device_get_parent(device); + if (parent != NULL) { + parent_name = udev_device_get_syspath(parent); + if (parent_name != NULL) { + def->parent = strdup(parent_name); + } + } + + if (udevSetDeviceType(device, def) == 0) { + ret = udevGetDeviceDetails(device, def); + } + + if (ret == 0) { + dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); + dev->devicePath = strdup(udev_device_get_devpath(device)); + virNodeDeviceObjUnlock(dev); + } else { + virNodeDeviceDefFree(def); + } + + return ret; +} + + +static int udevProcessDeviceListEntry(struct udev *udev, + struct udev_list_entry *list_entry) +{ + struct udev_device *device; + virNodeDeviceDefPtr def = NULL; + const char *name = NULL; + int ret = -1; + + name = udev_list_entry_get_name(list_entry); + + if (VIR_ALLOC(def) != 0) { + goto out; + } + + device = udev_device_new_from_syspath(udev, name); + if (device != NULL) { + udevProcessOneDevice(device, def); + udev_device_unref(device); + ret = 0; + } + +out: + return ret; +} + + +static int udevEnumerateDevices(struct udev *udev) +{ + struct udev_enumerate *udev_enumerate = NULL; + struct udev_list_entry *list_entry = NULL; + const char *name = NULL; + int ret = 0; + + udev_enumerate = udev_enumerate_new(udev); + + ret = udev_enumerate_scan_devices(udev_enumerate); + if (0 != ret) { + VIR_ERROR("udev scan devices returned %d\n", ret); + goto out; + } + + udev_list_entry_foreach(list_entry, + udev_enumerate_get_list_entry(udev_enumerate)) { + + udevProcessDeviceListEntry(udev, list_entry); + name = udev_list_entry_get_name(list_entry); + } + +out: + udev_enumerate_unref(udev_enumerate); + return ret; +} + + +static int udevDeviceMonitorShutdown(void) +{ + int ret = 0; + + struct udev_monitor *udev_monitor = NULL; + struct udev *udev = NULL; + + if (driverState) { + + nodeDeviceLock(driverState); + udev_monitor = DRV_STATE_UDEV_MONITOR(driverState); + + if (udev_monitor != NULL) { + udev = udev_monitor_get_udev(udev_monitor); + udev_monitor_unref(udev_monitor); + } + + if (udev != NULL) { + udev_unref(udev); + } + + virNodeDeviceObjListFree(&driverState->devs); + nodeDeviceUnlock(driverState); + virMutexDestroy(&driverState->lock); + VIR_FREE(driverState); + + } else { + ret = -1; + } + + return ret; +} + + +static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) +{ + struct udev *udev = NULL; + struct udev_monitor *udev_monitor = NULL; + int ret = 0; + + if (VIR_ALLOC(driverState) < 0) { + ret = -1; + goto out; + } + + if (virMutexInit(&driverState->lock) < 0) { + VIR_FREE(driverState); + ret = -1; + goto out; + } + + nodeDeviceLock(driverState); + + /* + * http://www.kernel.org/pub/linux/utils/kernel/hotplug/libudev/libudev-udev.h… + * + * indicates no return value other than success, so we don't check + * its return value. + */ + udev = udev_new(); + udev_set_log_fn(udev, udevLogFunction); + + udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); + if (udev_monitor == NULL) { + ret = -1; + goto out; + } + + /* udev can be retrieved from udev_monitor */ + driverState->privateData = udev_monitor; + nodeDeviceUnlock(driverState); + + /* Populate with known devices */ + + if (udevEnumerateDevices(udev) != 0) { + ret = -1; + goto out; + } + +out: + if (ret == -1) { + udevDeviceMonitorShutdown(); + } + return ret; +} + + +static int udevDeviceMonitorReload(void) +{ + return 0; +} + + +static int udevDeviceMonitorActive(void) +{ + /* Always ready to deal with a shutdown */ + return 0; +} + + +static virDrvOpenStatus udevNodeDrvOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (driverState == NULL) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->devMonPrivateData = driverState; + + return VIR_DRV_OPEN_SUCCESS; +} + +static int udevNodeDrvClose(virConnectPtr conn) +{ + conn->devMonPrivateData = NULL; + return 0; +} + +static virDeviceMonitor udevDeviceMonitor = { + .name = "udevDeviceMonitor", + .open = udevNodeDrvOpen, + .close = udevNodeDrvClose, +}; + +static virStateDriver udevStateDriver = { + .initialize = udevDeviceMonitorStartup, + .cleanup = udevDeviceMonitorShutdown, + .reload = udevDeviceMonitorReload, + .active = udevDeviceMonitorActive, +}; + +int udevNodeRegister(void) +{ + VIR_ERROR0("Registering udev node device backend\n"); + + registerCommonNodeFuncs(&udevDeviceMonitor); + if (virRegisterDeviceMonitor(&udevDeviceMonitor) < 0) { + return -1; + } + + return virRegisterStateDriver(&udevStateDriver); +} diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h new file mode 100644 index 0000000..bac628d --- /dev/null +++ b/src/node_device/node_device_udev.h @@ -0,0 +1,27 @@ +/* + * node_device_udev.h: node device enumeration - libudev implementation + * + * Copyright (C) 2009 Red Hat + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Dave Allan <dallan(a)redhat.com> + */ + +#include <libudev.h> +#include <stdint.h> + +#define SYSFS_DATA_SIZE 4096 +#define DRV_STATE_UDEV_MONITOR(ds) ((struct udev_monitor *)((ds)->privateData)) diff --git a/src/util/util.c b/src/util/util.c index 98f8a14..f63bd39 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2114,3 +2114,31 @@ void virFileWaitForDevices(virConnectPtr conn) void virFileWaitForDevices(virConnectPtr conn ATTRIBUTE_UNUSED) {} #endif #endif + +int virBuildPathInternal(char **path, ...) +{ + char *path_component = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + va_list ap; + int ret = 0; + + va_start(ap, *path); + + path_component = va_arg(ap, char *); + virBufferAdd(&buf, path_component, -1); + + while ((path_component = va_arg(ap, char *)) != NULL) + { + virBufferAddChar(&buf, '/'); + virBufferAdd(&buf, path_component, -1); + } + + va_end(ap); + + *path = virBufferContentAndReset(&buf); + if (*path == NULL) { + ret = -1; + } + + return ret; +} diff --git a/src/util/util.h b/src/util/util.h index 8679636..da410e1 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -248,4 +248,7 @@ char *virFileFindMountPoint(const char *type); void virFileWaitForDevices(virConnectPtr conn); +#define virBuildPath(path, ...) virBuildPathInternal(path, __VA_ARGS__, NULL) +int virBuildPathInternal(char **path, ...) __attribute__ ((sentinel)); + #endif /* __VIR_UTIL_H__ */ -- 1.6.4.4

3 3