- Devel - libvirt List Archives

[libvirt] [PATCH 0/7] Update hotplug code to use device_add
by Daniel P. Berrange 27 Jan '10

27 Jan '10

I previously changed the command line syntax to use -device for starting guests. The key reason for this was to allow unique names and PCI addresses to be assigned to all devices. I forgot todo the same for hotplug :-( This series is not yet complete, but it goes some of the way towards fixing the hotplug code to use 'device_add' for creating devices. The main remaining problem is that I'm nt assigning aliases to devices, to they all get the name of '(null)'. Obviously I'll fix that before submitting again... Daniel

1 7

[libvirt] [PATCH] support XEN_SYSCTL_INTERFACE_VERSION
by Jim Fehlig 27 Jan '10

27 Jan '10

xen-unstable c/s 20762 bumped XEN_SYSCTL_INTERFACE_VERSION to 7. I don't see how the interface change affects libvirt, other than failing xenHypervisorInit() since version 7 is not tried. The attached patch accommodates the upcoming Xen 4.0 release by checking for XEN_SYSCTL_INTERFACE_VERSION 7. If found, it sets XEN_DOMCTL_INTERFACE_VERSION to 6, which is also new to Xen 4.0. Regards, Jim

2 2

[libvirt] [PATCH 0/1] Clean up udev init
by David Allan 27 Jan '10

27 Jan '10

Matthias' patch made me realize that I didn't write the udev init code as cleanly as I'd like, and the error handling was starting to get a little messy. The attached patch cleans it up. There should be no functional change. Dave

3 3

[libvirt] [PATCH] Add missing sata controller type to domain.rng
by Matthew Booth 27 Jan '10

27 Jan '10

* docs/schemas/domain.rng: Add sata controller type --- docs/schemas/domain.rng | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 49b57eb..827ff6f 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -529,6 +529,7 @@ <value>fdc</value> <value>ide</value> <value>scsi</value> + <value>sata</value> </choice> </attribute> </optional> -- 1.6.6

2 1

[libvirt] [PATCH] portability to non-glibc: don't use realpath(..., NULL)
by Jim Meyering 27 Jan '10

27 Jan '10

Using realpath like that is not portable, and providing a buffer instead of NULL is wasteful and harder to code properly. Instead, use gnulib's canonicalize_file_name, which does the same job portably: >From 4afea6b59e2be6c28b45ef59a6a2f896eed44dba Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 26 Jan 2010 17:13:45 +0100 Subject: [PATCH] portability to non-glibc: don't use realpath(..., NULL) it causes a NULL-dereference on some systems like Solaris 10. * src/node_device/node_device_linux_sysfs.c. Include <stdlib.h>. (get_sriov_function): Use canonicalize_filen_name, not realpath. * bootstrap (modules): Add canonicalize-lgpl. --- bootstrap | 1 + src/node_device/node_device_linux_sysfs.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bootstrap b/bootstrap index aec5d05..cc3c6ef 100755 --- a/bootstrap +++ b/bootstrap @@ -68,6 +68,7 @@ modules=' areadlink base64 c-ctype +canonicalize-lgpl close connect getaddrinfo diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 33e658d..c1fce5d 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -24,6 +24,7 @@ #include <fcntl.h> #include <sys/stat.h> +#include <stdlib.h> #include "node_device_driver.h" #include "node_device_hal.h" @@ -242,7 +243,8 @@ out: static int get_sriov_function(const char *device_link, struct pci_config_address **bdf) { - char *device_path = NULL, *config_address = NULL; + char *config_address = NULL; + char *device_path = NULL; char errbuf[64]; int ret = SRIOV_ERROR; @@ -259,7 +261,7 @@ static int get_sriov_function(const char *device_link, } - device_path = realpath(device_link, device_path); + device_path = canonicalize_file_name (device_link); if (device_path == NULL) { memset(errbuf, '\0', sizeof(errbuf)); VIR_ERROR("Failed to resolve device link '%s': '%s'", device_link, -- 1.7.0.rc0.140.gfbe7

2 2

[libvirt] [RFC] [Patch] Support for Linux macvtap device
by Stefan Berger 27 Jan '10

27 Jan '10

Hello! The attached patch provides support for the Linux macvtap device for Qemu by passing a file descriptor to Qemu command line similar to how it is done with a regular tap device. I have modified the network XML code to understand a definition as the following one here: <network> <name>vepanet</name> <uuid>4ebd5168-6321-4757-8397-f6e83484f402</uuid> <extbridge mode='vepa' dev='eth0'/> </network> This XML indicates the device that links to the external bridge, here eth0, and the mode this device is supposed to be set into, here 'vepa'. If 'extbridge' is found in the XML, all other XML elements that have been used so far, i.e., bridge, ip, dhcp, etc., are ignored. The above network description can then be referenced from the virtual machine definition using the typical interface description of type 'network': <interface type='network'> <source network='vepanet'/> <model type='virtio'/> </interface> The above network XML holds the necessary parameters to open a macvtap device. Using command line, one would issue the following command to achieve the same what now libvirt does internally, using a patched version of the 'ip' command: ip link add link eth0 <optional name of if> type macvtap mode vepa This then creates the network interface, i.e., macvtap12, along with entries in /sys/class/net/macvtap12/ where the content of the ifindex file returns the integer necessary to build the /dev/tap%d device to open the file descriptor of and pass to qemu via command line argument. Some details: In libvirt I am first searching for an unused interface name following the template macvtap%d unless the user has provided a name explicitly or the previous macvtap%d is now taken by another VM. Once that has succeeded, I follow the path through the filesystem to open the corresponding /dev/tap%d. Unlike the regular tap device, where the network interface disappears once the corresponding file descriptor is closed, the macvtap device needs explicit tear-down. So, when a VM terminates, I am deleting all macvtap type interface with the MAC address as the interface of the terminating VM. Some further background on this device was recently given here: https://www.redhat.com/archives/libvir-list/2010-January/msg00721.html The macvtap patch for Linux was posted here: http://lkml.org/lkml/2009/12/3/239 I'd be curious about comments on the code. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

2 3

[libvirt] [PATCH] qemu_monitor_json.c: avoid an unconditional leak
by Jim Meyering 27 Jan '10

27 Jan '10

Calling virJSONValueFree does not free the memory allocated via this: cmd = qemuMonitorJSONMakeCommand("drive_add", "s:pci_addr", dev, "s:opts", drivestr, NULL); so I added the VIR_FREE: >From 1d272e070b66fc16e2fcc23002879ee268a58a5f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 27 Jan 2010 09:58:12 +0100 Subject: [PATCH] qemu_monitor_json.c: avoid an unconditional leak * src/qemu/qemu_monitor_json.c (qemuMonitorJSONAttachDrive): Don't leak the buffer behind a virJSONValuePtr. --- src/qemu/qemu_monitor_json.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8e88c7e..0f970bb 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1773,6 +1773,7 @@ int qemuMonitorJSONAttachDrive(qemuMonitorPtr mon, ret = -1; virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } -- 1.7.0.rc0.140.gfbe7

1 0

[libvirt] [PATCH] pci.c: correct erroneous expression
by Jim Meyering 27 Jan '10

27 Jan '10

An expression like this, can never be true, since the RHS is nonzero: ... !pciRead16(dev, PCI_CLASS_DEVICE) == PCI_CLASS_BRIDGE_PCI) This appears to be what was intended: pciRead16(dev, PCI_CLASS_DEVICE) != PCI_CLASS_BRIDGE_PCI) >From a86de65c1da4f2cc9408465f6bc9ded481def47d Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 26 Jan 2010 20:36:58 +0100 Subject: [PATCH] pci.c: correct erroneous expression * src/util/pci.c (pciDeviceDownstreamLacksACS): Fix a typo that rendered a subexpression always false. --- src/util/pci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 09535bd..0274806 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009-2010 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1266,7 +1266,7 @@ pciDeviceDownstreamLacksACS(virConnectPtr conn, return -1; pos = dev->pcie_cap_pos; - if (!pos || !pciRead16(dev, PCI_CLASS_DEVICE) == PCI_CLASS_BRIDGE_PCI) + if (!pos || pciRead16(dev, PCI_CLASS_DEVICE) != PCI_CLASS_BRIDGE_PCI) return 0; flags = pciRead16(dev, pos + PCI_EXP_FLAGS); -- 1.7.0.rc0.140.gfbe7

2 2

[libvirt] [PATCH] Don't call disabled timer callbacks in event-test.c
by Matthias Bolte 26 Jan '10

26 Jan '10

This fixes a segfault in the remote driver that occurs for example when the event-test is run inside a domain-0 and libvirtd is also running. --- examples/domain-events/events-c/event-test.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index b506687..b2eb1d5 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -335,9 +335,10 @@ int main(int argc, char **argv) sts = poll(&pfd, 1, TIMEOUT_MS); - /* We are assuming timeout of 0 here - so execute every time */ - if(t_cb && t_active) + /* if t_timeout < 0 then t_cb must not be called */ + if (t_cb && t_active && t_timeout >= 0) { t_cb(t_timeout,t_opaque); + } if (sts == 0) { /* DEBUG0("Poll timeout"); */ -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Output error details from libcurl
by Matthias Bolte 26 Jan '10

26 Jan '10

--- src/esx/esx_vi.c | 14 ++++++++------ src/esx/esx_vi.h | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 0fe9535..bc94326 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -251,8 +251,8 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) if (errorCode != CURLE_OK) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); + "curl_easy_perform() returned an error: %s (%d) : %s", + curl_easy_strerror(errorCode), errorCode, ctx->curl_error); return -1; } @@ -262,8 +262,8 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) if (errorCode != CURLE_OK) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an " - "error: %s (%d)", curl_easy_strerror(errorCode), - errorCode); + "error: %s (%d) : %s", curl_easy_strerror(errorCode), + errorCode, ctx->curl_error); return -1; } @@ -282,8 +282,8 @@ esxVI_CURL_Perform(esxVI_Context *ctx, const char *url) if (errorCode != CURLE_OK) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "curl_easy_getinfo(CURLINFO_REDIRECT_URL) returned " - "an error: %s (%d)", curl_easy_strerror(errorCode), - errorCode); + "an error: %s (%d) : %s", curl_easy_strerror(errorCode), + errorCode, ctx->curl_error); } else { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "The server redirects from '%s' to '%s'", url, @@ -360,6 +360,8 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, esxVI_CURL_ReadString); curl_easy_setopt(ctx->curl_handle, CURLOPT_WRITEFUNCTION, esxVI_CURL_WriteBuffer); + curl_easy_setopt(ctx->curl_handle, CURLOPT_ERRORBUFFER, + ctx->curl_error); #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT curl_easy_setopt(ctx->curl_handle, CURLOPT_DEBUGFUNCTION, esxVI_CURL_Debug); curl_easy_setopt(ctx->curl_handle, CURLOPT_VERBOSE, 1); diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 608dcbd..4e8b675 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -77,6 +77,7 @@ struct _esxVI_Context { char *ipAddress; CURL *curl_handle; struct curl_slist *curl_headers; + char curl_error[CURL_ERROR_SIZE]; virMutex curl_lock; char *username; char *password; -- 1.6.3.3

2 2

[libvirt] [PATCH] Add missing function parameter documentation
by Matthias Bolte 26 Jan '10

26 Jan '10

--- src/libvirt.c | 5 ++++- src/util/virterror.c | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index d973907..32f9fc4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -10939,7 +10939,10 @@ error: /** * virConnectCompareCPU: * @conn: virConnect connection - * @xml: XML describing the CPU to compare with host CPU + * @xmlDesc: XML describing the CPU to compare with host CPU + * @flags: currently unused, pass 0 + * + * Compares the given CPU description with the host CPU * * Returns comparison result according to enum virCPUCompareResult */ diff --git a/src/util/virterror.c b/src/util/virterror.c index e2128b9..d72b307 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -291,6 +291,7 @@ virGetLastError(void) /** * virSetError: + * @newerr: previously saved error object * * Set the current error from a previously saved error object * -- 1.6.3.3

2 2

[libvirt] Potential segfault in udev driver
by Matthias Bolte 26 Jan '10

26 Jan '10

udevDeviceMonitorStartup registers udevEventHandleCallback as event handle, but doesn't store the returned watch id to remove it later on. Also it's not clear to me whether the event handle should be register for the whole lifetime of the udev driver instance or just for the udevEnumerateDevices call. If for example the call to udevSetupSystemDev [1] fails udevDeviceMonitorShutdown is called to cleanup, but udevEventHandleCallback is still registered and may be called when driverState is NULL again, resulting in a segfault in udevEventHandleCallback. So to solve this the udevEventHandleCallback event handle must be removed at the appropriate place. Maximilian Wilhelm found this problem. [1] 22:42:20.960: error : udevSetupSystemDev:1460 : Failed to get udev device for syspath '/sys/devices/virtual/dmi/id' or '/sys/class/dmi/id' Matthias

3 7

[libvirt] [PATCH] Remove undefined symbols from libvirt_private.syms
by Matthias Bolte 26 Jan '10

26 Jan '10

--- src/libvirt_private.syms | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e42c090..d56fb7d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -177,12 +177,10 @@ virDomainObjListInit; virDomainObjListDeinit; virDomainObjRef; virDomainObjUnref; -virDomainDeviceAddressEqual; virDomainDevicePCIAddressEqual; virDomainDeviceAddressIsValid; virDomainDevicePCIAddressIsValid; virDomainDeviceInfoIsSet; -virDomainDeviceAddressClear; virDomainControllerTypeToString; virDomainControllerDefFree; virDomainDeviceAddressTypeToString; -- 1.6.3.3

2 2

[libvirt] [PATCH] udev: Set the state driver name
by Matthias Bolte 26 Jan '10

26 Jan '10

--- src/node_device/node_device_udev.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index a625d76..dcd889d 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1676,6 +1676,7 @@ static virDeviceMonitor udevDeviceMonitor = { }; static virStateDriver udevStateDriver = { + .name = "udev", .initialize = udevDeviceMonitorStartup, .cleanup = udevDeviceMonitorShutdown, .reload = udevDeviceMonitorReload, -- 1.6.3.3

2 2

[libvirt] [Request]Backport live migration flags from 0.7.3 to 0.6.3?
by edison 26 Jan '10

26 Jan '10

Hi, libvirt 0.7.3 adds the VIR_MIGRATE_PERSIST_DEST, VIR_MIGRATE_UNDEFINE_SOURCE flags in migration, which are very useful in our product. Unfortunately, we use libvirt 0.6.3.20, which is the default in RHEL 5.4. No such advanced migration feature in this version. I backported it for 0.6.3.20, in the attached patch. Do you think it's possible to be merged into 0.6.3.20?:)

2 1

[libvirt] [PATCH] usbFindBusByVendor: don't leak a DIR buffer and FD
by Jim Meyering 26 Jan '10

26 Jan '10

I know better than to say this is so simple/obvious that it doesn't need review, but I'm tempted... >From 02c7dfa830544bbafd62867fc70b3aba7cc07385 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 25 Jan 2010 16:36:07 +0100 Subject: [PATCH] usbFindBusByVendor: don't leak a DIR buffer and FD * src/util/hostusb.c (usbFindBusByVendor): Don't leak a DIR buffer and file descriptor. --- src/util/hostusb.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/util/hostusb.c b/src/util/hostusb.c index 8fbb486..9a37103 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Red Hat, Inc. + * Copyright (C) 2009-2010 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -151,6 +151,7 @@ static int usbFindBusByVendor(virConnectPtr conn, ret = 0; error: + closedir (dir); return ret; } -- 1.7.0.rc0.127.gab8271

5 9

[libvirt] [PATCH] Eliminate use of large buffer on stack in virFileMakePath.
by Laine Stump 26 Jan '10

26 Jan '10

virFileMakePath is a recursive function that was creates a buffer PATH_MAX bytes long for each recursion (one recursion for each element in the path). This changes it to have no buffers on the stack, and to allocate just one buffer total, no matter how many elements are in the path. Because the modified algorithm requires a char* to be passed in rather than const char *, it is now 2 functions - a toplevel API function that remains identical in function, and a 2nd helper function called for the recursions, which 1) doesn't allocate anything, and 2) takes a char* arg, so it can modify the contents. src/util/util.c: rewrite virFileMakePath --- src/util/util.c | 58 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 12 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 08d74a3..0ce5026 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1443,34 +1443,68 @@ int virDirCreate(const char *path, mode_t mode, } #endif -int virFileMakePath(const char *path) -{ +static int virFileMakePathHelper(char *path) { struct stat st; - char parent[PATH_MAX]; - char *p; + char *p = NULL; int err; if (stat(path, &st) >= 0) return 0; - if (virStrcpyStatic(parent, path) == NULL) - return EINVAL; - - if (!(p = strrchr(parent, '/'))) + if ((p = strrchr(path, '/')) == NULL) return EINVAL; - if (p != parent) { + if (p != path) { *p = '\0'; - if ((err = virFileMakePath(parent))) + err = virFileMakePathHelper(path); + *p = '/'; + if (err != 0) return err; } - if (mkdir(path, 0777) < 0 && errno != EEXIST) + if (mkdir(path, 0777) < 0 && errno != EEXIST) { return errno; - + } return 0; } +int virFileMakePath(const char *path) +{ + struct stat st; + char *parent = NULL; + char *p; + int err = 0; + + if (stat(path, &st) >= 0) + goto cleanup; + + if ((parent = strdup(path)) == NULL) { + err = ENOMEM; + goto cleanup; + } + + if ((p = strrchr(parent, '/')) == NULL) { + err = EINVAL; + goto cleanup; + } + + if (p != parent) { + *p = '\0'; + if ((err = virFileMakePathHelper(parent)) != 0) { + goto cleanup; + } + } + + if (mkdir(path, 0777) < 0 && errno != EEXIST) { + err = errno; + goto cleanup; + } + +cleanup: + VIR_FREE(parent); + return err; +} + /* Build up a fully qualfiied path for a config file to be * associated with a persistent guest or network */ int virFileBuildPath(const char *dir, -- 1.6.6

2 2

[libvirt] [PATCH] Fix two instances of misspelled 'pseudo'
by Chris Lalancette 26 Jan '10

26 Jan '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- docs/sitemap.html.in | 2 +- src/xen/xs_internal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 424897f..76d8faa 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -134,7 +134,7 @@ </li> <li> <a href="drvtest.html">Test</a> - <span>Psuedo-driver simulating APIs in memory for test suites</span> + <span>Pseudo-driver simulating APIs in memory for test suites</span> </li> <li> <a href="drvremote.html">Remote</a> diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 8a64d4e..1ca3da0 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -853,7 +853,7 @@ int xenStoreDomainGetVNCPort(virConnectPtr conn, int domid) { * @conn: the hypervisor connection * @domid: id of the domain * - * Return the path to the psuedo TTY on which the guest domain's + * Return the path to the pseudo TTY on which the guest domain's * serial console is attached. * * Returns the path to the serial console. It is the callers -- 1.6.6

2 1

[libvirt] Live Migration with non-shared storage for kvm
by Kenneth Nagin 26 Jan '10

26 Jan '10

On January 5 I asked for comments on adding libvirt support for live migration with non-shared storage on kvm. I did not get any comments so I am repeating my request: Support for live migration between hosts that do not share storage was added to qemu-kvm release 0.12.1. It supports two flags: -b migration without shared storage with full disk copy -i migration without shared storage with incremental copy (same base image shared between source and destination). I suggest adding these flags to virDomainMigrate. If I'm not mistaken qemuMonitorTextMigrate is the function that actually invokes the kvm monitor. Thus, it would be necessary to pass the flags to qemuMonitorTextMigrate.. But qemuMonitorTextMigrate does not have a flag input parameter. I think the least disruptive way to support the new flags is use the existing "background" parameter to pass the flags. Of course this would require some changes to the upstream functions that are invoked for migration. What do you think? Kenneth Nagin

2 1

[libvirt] [PATCH 0/3] esx: Stop passing around virConnectPtr for error reporting
by Matthias Bolte 26 Jan '10

26 Jan '10

This is actually a single huge patch, but I had to split it in 3 parts, otherwise it's too big for the list. The parts won't compile on their own. The patch removes the virConnectPtr argument from internal functions of the ESX driver, no other functional change is included. Matthias

2 7

[libvirt] [PATCH] Fix a crash when restarting libvirtd.
by Chris Lalancette 25 Jan '10

25 Jan '10

If you shutdown libvirtd while a domain with PCI devices is running, then try to restart libvirtd, libvirtd will crash. This happens because qemuUpdateActivePciHostdevs() is calling pciDeviceListSteal() with a dev of 0x0 (NULL), and then trying to dereference it. This patch fixes it up so that qemuUpdateActivePciHostdevs() steals the devices after first Get()'ting them, avoiding the crash. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 55550ef..bbdbe33 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2147,6 +2147,7 @@ qemuUpdateActivePciHostdevs(struct qemud_driver *driver, virDomainDefPtr def) { pciDeviceList *pcidevs; + int i; int ret = -1; if (!def->nhostdevs) @@ -2155,8 +2156,9 @@ qemuUpdateActivePciHostdevs(struct qemud_driver *driver, if (!(pcidevs = qemuGetPciHostDeviceList(NULL, def))) return -1; - while (pciDeviceListCount(pcidevs) > 0) { - pciDevice *dev = pciDeviceListSteal(NULL, pcidevs, 0); + for (i = 0; i < pciDeviceListCount(pcidevs); i++) { + pciDevice *dev = pciDeviceListGet(pcidevs, i); + pciDeviceListSteal(NULL, pcidevs, dev); if (pciDeviceListAdd(NULL, driver->activePciHostdevs, dev) < 0) { -- 1.6.6

2 2

[libvirt] [PATCH] Revert "Fix libvirtd restart for domains with PCI passthrough devices"
by Chris Lalancette 25 Jan '10

25 Jan '10

This reverts commit cdc42d0a4865199a941d330dbb6ca1ef426323ae. As DanB pointed out, this patch is actually wrong. The real bug that was causing me to see this problem is a bug introduced in a RHEL-5 libvirt snapshot, and I'm going to fix the real bug there. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/conf/domain_conf.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6d0e2dc..e548d1d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2876,7 +2876,7 @@ static int virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn, const xmlNodePtr node, virDomainHostdevDefPtr def, - int flags ATTRIBUTE_UNUSED) { + int flags) { int ret = -1; xmlNodePtr cur; @@ -2890,7 +2890,8 @@ virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn, if (virDomainDevicePCIAddressParseXML(conn, cur, addr) < 0) goto out; - } else if (xmlStrEqual(cur->name, BAD_CAST "state")) { + } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) && + xmlStrEqual(cur->name, BAD_CAST "state")) { /* Legacy back-compat. Don't add any more attributes here */ char *devaddr = virXMLPropString(cur, "devaddr"); if (devaddr && -- 1.6.6

2 2

[libvirt] [PATCH] qemuMonitorTextAttachDrive: avoid two leaks
by Jim Meyering 25 Jan '10

25 Jan '10

Coverity reported the first leak: return-(-1)-would-leak-"safe_str". I spotted the 2nd. >From 6326ab7b52f3550f24015c27407c1d3c2a1fd64d Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 25 Jan 2010 20:19:01 +0100 Subject: [PATCH] qemuMonitorTextAttachDrive: avoid two leaks * src/qemu/qemu_monitor_text.c (qemuMonitorTextAttachDrive): Most other failures in this function would "goto cleanup", but one mistakenly returned directly, skipping the cleanup and resulting in a leak. In addition, iterating the "try_command" loop would clobber, and thus leak, the "cmd" allocated on the first iteration, so be careful to free it in addition to "reply" beforehand. --- src/qemu/qemu_monitor_text.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index ce5349b..380bcdc 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1881,13 +1881,13 @@ try_command: if (qemudParseDriveAddReply(reply, driveAddr) < 0) { if (!tryOldSyntax && strstr(reply, "invalid char in expression")) { VIR_FREE(reply); + VIR_FREE(cmd); tryOldSyntax = 1; goto try_command; } qemudReportError (NULL, NULL, NULL, VIR_ERR_OPERATION_FAILED, _("adding %s disk failed: %s"), drivestr, reply); - VIR_FREE(reply); - return -1; + goto cleanup; } ret = 0; -- 1.7.0.rc0.127.gab8271

2 2

[libvirt] [PATCH] qemu: Search binaries in PATH instead of hardcoding /usr/bin
by Matthias Bolte 25 Jan '10

25 Jan '10

--- src/qemu/qemu_conf.c | 137 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 82 insertions(+), 55 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 92a9348..6141ec6 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -379,20 +379,20 @@ static const struct qemu_feature_flags const arch_info_x86_64_flags [] = { /* The archicture tables for supported QEMU archs */ static const struct qemu_arch_info const arch_info_hvm[] = { - { "i686", 32, NULL, "/usr/bin/qemu", - "/usr/bin/qemu-system-x86_64", arch_info_i686_flags, 4 }, - { "x86_64", 64, NULL, "/usr/bin/qemu-system-x86_64", + { "i686", 32, NULL, "qemu", + "qemu-system-x86_64", arch_info_i686_flags, 4 }, + { "x86_64", 64, NULL, "qemu-system-x86_64", NULL, arch_info_x86_64_flags, 2 }, - { "arm", 32, NULL, "/usr/bin/qemu-system-arm", NULL, NULL, 0 }, - { "mips", 32, NULL, "/usr/bin/qemu-system-mips", NULL, NULL, 0 }, - { "mipsel", 32, NULL, "/usr/bin/qemu-system-mipsel", NULL, NULL, 0 }, - { "sparc", 32, NULL, "/usr/bin/qemu-system-sparc", NULL, NULL, 0 }, - { "ppc", 32, NULL, "/usr/bin/qemu-system-ppc", NULL, NULL, 0 }, + { "arm", 32, NULL, "qemu-system-arm", NULL, NULL, 0 }, + { "mips", 32, NULL, "qemu-system-mips", NULL, NULL, 0 }, + { "mipsel", 32, NULL, "qemu-system-mipsel", NULL, NULL, 0 }, + { "sparc", 32, NULL, "qemu-system-sparc", NULL, NULL, 0 }, + { "ppc", 32, NULL, "qemu-system-ppc", NULL, NULL, 0 }, }; static const struct qemu_arch_info const arch_info_xen[] = { - { "i686", 32, "xenner", "/usr/bin/xenner", NULL, arch_info_i686_flags, 4 }, - { "x86_64", 64, "xenner", "/usr/bin/xenner", NULL, arch_info_x86_64_flags, 2 }, + { "i686", 32, "xenner", "xenner", NULL, arch_info_i686_flags, 4 }, + { "x86_64", 64, "xenner", "xenner", NULL, arch_info_x86_64_flags, 2 }, }; @@ -768,8 +768,8 @@ qemudCapsInitGuest(virCapsPtr caps, int i; int haskvm = 0; int haskqemu = 0; - const char *kvmbin = NULL; - const char *binary = NULL; + char *kvmbin = NULL; + char *binary = NULL; time_t binary_mtime; virCapsGuestMachinePtr *machines = NULL; int nmachines = 0; @@ -779,10 +779,15 @@ qemudCapsInitGuest(virCapsPtr caps, /* Check for existance of base emulator, or alternate base * which can be used with magic cpu choice */ - if (access(info->binary, X_OK) == 0) - binary = info->binary; - else if (info->altbinary && access(info->altbinary, X_OK) == 0) - binary = info->altbinary; + binary = virFindFileInPath(info->binary); + + if (binary == NULL || access(binary, X_OK) != 0) { + VIR_FREE(binary); + binary = virFindFileInPath(info->altbinary); + + if (binary != NULL && access(binary, X_OK) != 0) + VIR_FREE(binary); + } /* Can use acceleration for KVM/KQEMU if * - host & guest arches match @@ -792,16 +797,30 @@ qemudCapsInitGuest(virCapsPtr caps, */ if (STREQ(info->arch, hostmachine) || (STREQ(hostmachine, "x86_64") && STREQ(info->arch, "i686"))) { - const char *const kvmbins[] = { "/usr/bin/qemu-kvm", /* Fedora */ - "/usr/bin/kvm" }; /* Upstream .spec */ + if (access("/dev/kvm", F_OK) == 0) { + const char *const kvmbins[] = { "qemu-kvm", /* Fedora */ + "kvm" }; /* Upstream .spec */ + + for (i = 0; i < ARRAY_CARDINALITY(kvmbins); ++i) { + kvmbin = virFindFileInPath(kvmbins[i]); + + if (kvmbin == NULL || access(kvmbin, X_OK) != 0) { + VIR_FREE(kvmbin); + continue; + } - for (i = 0; i < ARRAY_CARDINALITY(kvmbins); ++i) { - if (access(kvmbins[i], X_OK) == 0 && - access("/dev/kvm", F_OK) == 0) { haskvm = 1; - kvmbin = kvmbins[i]; - if (!binary) - binary = kvmbin; + + if (binary == NULL) { + binary = strdup(kvmbin); + + if (binary == NULL) { + virReportOOMError(NULL); + VIR_FREE(kvmbin); + return -1; + } + } + break; } } @@ -826,21 +845,18 @@ qemudCapsInitGuest(virCapsPtr caps, virCapsGuestMachinePtr machine; if (VIR_ALLOC(machine) < 0) { - virReportOOMError(NULL); - return -1; + goto no_memory; } if (!(machine->name = strdup(info->machine))) { - virReportOOMError(NULL); VIR_FREE(machine); - return -1; + goto no_memory; } if (VIR_ALLOC_N(machines, 1) < 0) { - virReportOOMError(NULL); VIR_FREE(machine->name); VIR_FREE(machine); - return -1; + goto no_memory; } machines[0] = machine; @@ -853,7 +869,7 @@ qemudCapsInitGuest(virCapsPtr caps, old_caps, &machines, &nmachines); if (probe && qemudProbeMachineTypes(binary, &machines, &nmachines) < 0) - return -1; + goto error; } /* We register kvm as the base emulator too, since we can @@ -865,21 +881,18 @@ qemudCapsInitGuest(virCapsPtr caps, binary, NULL, nmachines, - machines)) == NULL) { - for (i = 0; i < nmachines; i++) { - VIR_FREE(machines[i]->name); - VIR_FREE(machines[i]); - } - VIR_FREE(machines); - return -1; - } + machines)) == NULL) + goto error; + + machines = NULL; + nmachines = 0; guest->arch.defaultInfo.emulator_mtime = binary_mtime; if (qemudProbeCPUModels(binary, info->arch, &ncpus, NULL) == 0 && ncpus > 0 && !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)) - return -1; + goto error; if (hvm) { if (virCapabilitiesAddGuestDomain(guest, @@ -888,7 +901,7 @@ qemudCapsInitGuest(virCapsPtr caps, NULL, 0, NULL) == NULL) - return -1; + goto error; if (haskqemu && virCapabilitiesAddGuestDomain(guest, @@ -897,7 +910,7 @@ qemudCapsInitGuest(virCapsPtr caps, NULL, 0, NULL) == NULL) - return -1; + goto error; if (haskvm) { virCapsGuestDomainPtr dom; @@ -911,9 +924,6 @@ qemudCapsInitGuest(virCapsPtr caps, binary_mtime = 0; } - machines = NULL; - nmachines = 0; - if (!STREQ(binary, kvmbin)) { int probe = 1; if (old_caps && binary_mtime) @@ -922,7 +932,7 @@ qemudCapsInitGuest(virCapsPtr caps, old_caps, &machines, &nmachines); if (probe && qemudProbeMachineTypes(kvmbin, &machines, &nmachines) < 0) - return -1; + goto error; } if ((dom = virCapabilitiesAddGuestDomain(guest, @@ -931,14 +941,12 @@ qemudCapsInitGuest(virCapsPtr caps, NULL, nmachines, machines)) == NULL) { - for (i = 0; i < nmachines; i++) { - VIR_FREE(machines[i]->name); - VIR_FREE(machines[i]); - } - VIR_FREE(machines); - return -1; + goto error; } + machines = NULL; + nmachines = 0; + dom->info.emulator_mtime = binary_mtime; } } else { @@ -948,7 +956,7 @@ qemudCapsInitGuest(virCapsPtr caps, NULL, 0, NULL) == NULL) - return -1; + goto error; } if (info->nflags) { @@ -957,11 +965,24 @@ qemudCapsInitGuest(virCapsPtr caps, info->flags[i].name, info->flags[i].default_on, info->flags[i].toggle) == NULL) - return -1; + goto error; } } + VIR_FREE(binary); + VIR_FREE(kvmbin); + return 0; + +no_memory: + virReportOOMError(NULL); + +error: + VIR_FREE(binary); + VIR_FREE(kvmbin); + virCapabilitiesFreeMachines(machines, nmachines); + + return -1; } @@ -1011,6 +1032,7 @@ virCapsPtr qemudCapsInit(virCapsPtr old_caps) { struct utsname utsname; virCapsPtr caps; int i; + char *xenner = NULL; /* Really, this never fails - look at the man-page. */ uname (&utsname); @@ -1051,7 +1073,9 @@ virCapsPtr qemudCapsInit(virCapsPtr old_caps) { goto no_memory; /* Then possibly the Xen paravirt guests (ie Xenner */ - if (access("/usr/bin/xenner", X_OK) == 0 && + xenner = virFindFileInPath("xenner"); + + if (xenner != NULL && access(xenner, X_OK) == 0 && access("/dev/kvm", F_OK) == 0) { for (i = 0 ; i < ARRAY_CARDINALITY(arch_info_xen) ; i++) /* Allow Xen 32-on-32, 32-on-64 and 64-on-64 */ @@ -1065,12 +1089,15 @@ virCapsPtr qemudCapsInit(virCapsPtr old_caps) { } } + VIR_FREE(xenner); + /* QEMU Requires an emulator in the XML */ virCapabilitiesSetEmulatorRequired(caps); return caps; no_memory: + VIR_FREE(xenner); virCapabilitiesFree(caps); return NULL; } -- 1.6.3.3

3 6

[libvirt] [PATCH] Look in /usr/libexec for the qemu-kvm binary.
by Chris Lalancette 25 Jan '10

25 Jan '10

On RHEL-5 the qemu-kvm binary is located in /usr/libexec. To reduce confusion for people trying to run upstream libvirt on RHEL-5 machines, make the qemu driver look in /usr/libexec for the qemu-kvm binary. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c227fe1..2ba8366 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -797,7 +797,8 @@ qemudCapsInitGuest(virCapsPtr caps, */ if (STREQ(info->arch, hostmachine) || (STREQ(hostmachine, "x86_64") && STREQ(info->arch, "i686"))) { - const char *const kvmbins[] = { "/usr/bin/qemu-kvm", /* Fedora */ + const char *const kvmbins[] = { "/usr/libexec/qemu-kvm", /* RHEL */ + "/usr/bin/qemu-kvm", /* Fedora */ "/usr/bin/kvm" }; /* Upstream .spec */ for (i = 0; i < ARRAY_CARDINALITY(kvmbins); ++i) { -- 1.6.6

3 4

[libvirt] [PATCH] usbGetDevice: don't leak a "usbDevice" buffer on failure path
by Jim Meyering 25 Jan '10

25 Jan '10

Here's another leak fix, although this one is only on a failure path: >From a89551ecfcebfc3d45eff38923824a9590fe9f76 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 25 Jan 2010 16:44:13 +0100 Subject: [PATCH] usbGetDevice: don't leak a "usbDevice" buffer on failure path * src/util/hostusb.c (usbGetDevice): Free "dev" when returning NULL. --- src/util/hostusb.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/util/hostusb.c b/src/util/hostusb.c index 9a37103..f635ce5 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -171,8 +171,10 @@ usbGetDevice(virConnectPtr conn, if (vendor) { /* Look up bus.dev by vendor:product */ - if (usbFindBusByVendor(conn, vendor, product, &bus, &devno) < 0) + if (usbFindBusByVendor(conn, vendor, product, &bus, &devno) < 0) { + VIR_FREE(dev); return NULL; + } } dev->bus = bus; -- 1.7.0.rc0.127.gab8271

2 2

[libvirt] [PATCH] qemuMonitorTextGetMemoryStats: plug a leak on an error path
by Jim Meyering 25 Jan '10

25 Jan '10

Coverity complained about a leak via this return -1 in qemu_monitor_text.c: int qemuMonitorTextGetMemoryStats(qemuMonitorPtr mon, virDomainMemoryStatPtr stats, unsigned int nr_stats) { char *reply = NULL; int ret = 0; char *offset; if (qemuMonitorCommand(mon, "info balloon", &reply) < 0) { qemudReportError(NULL, NULL, NULL, VIR_ERR_OPERATION_FAILED, "%s", _("could not query memory balloon statistics")); return -1; } That can happen because qemuMonitorCommand calls qemuMonitorCommandWithFd which calls qemuMonitorCommandWithHandler, which does this: 218 ret = qemuMonitorSend(mon, &msg); ... 228 if (msg.rxBuffer) { 229 *reply = msg.rxBuffer; 230 } else { 231 *reply = strdup(""); 232 if (!*reply) { 233 virReportOOMError(NULL); 234 return -1; 235 } 236 } 237 238 if (ret < 0) 239 virReportSystemError(NULL, msg.lastErrno, 240 _("cannot send monitor command '%s'"), cmd); 241 242 return ret; 243 } That function breaks contract by failing to free *reply when it returns a negative value. Here's the fix: >From 3b44df075f9d4330ec27d59eddaa0a32c20d7ac1 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 20 Jan 2010 18:24:47 +0100 Subject: [PATCH] qemuMonitorTextGetMemoryStats: plug a leak on an error path * src/qemu/qemu_monitor_text.c (qemuMonitorCommandWithHandler): Always free *reply, upon failure. --- src/qemu/qemu_monitor_text.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index c3848b5..d921c7e 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1,7 +1,7 @@ /* * qemu_monitor_text.c: interaction with QEMU monitor console * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -235,9 +235,11 @@ qemuMonitorCommandWithHandler(qemuMonitorPtr mon, } } - if (ret < 0) + if (ret < 0) { virReportSystemError(NULL, msg.lastErrno, _("cannot send monitor command '%s'"), cmd); + VIR_FREE(*reply); + } return ret; } -- 1.6.6.516.gb72f

2 2

[libvirt] [PATCH 1/n] modernizing configure
by Eric Blake 25 Jan '10

25 Jan '10

I just built libvirt for the first time today, and noticed that configure fails on the first missing dependency, rather than trying harder to make it through and list all missing dependencies at the end. I ended up restarting configure multiple times. In the process, I also noticed that configure is somewhat out of date. So, what is the oldest version of autoconf and automake that libvirt will insist on supporting? For example, is it time to require automake 1.11.1 (the latest stable release) because of its security patch to avoid potential problems in 'make dist'? Or is it too soon to expect all distros to have an automake that new pre-installed, and more effort be put into supporting automake 1.9.6 and autoconf 2.59 (those being the implicit minimum requirements due to the use of gnulib)? Or somewhere in between? Meanwhile, how about this patch, for me getting my feet wet in helping to modernize the autotools usage, and hopefully leading up to future patches to make configure list all missing dependencies at once, rather than requiring multiple restarts.

4 10

[libvirt] [PATCH 0/4] Misc fixes to JSON/QMP mode for latest upstream QEMU
by Daniel P. Berrange 25 Jan '10

25 Jan '10

Just some misc fixes to make QMP mode work again for latest upstreqam QEMU GIT. NB this is OK because QMP isn't declared stable yet & isn't enabled in libvirt

2 10

[libvirt] [PATCH] Fix libvirtd restart for domains with PCI passthrough devices
by Chris Lalancette 25 Jan '10

25 Jan '10

When libvirtd shuts down, it places a <state/> tag in the XML state file it writes out for guests with PCI passthrough devices. For devices that are attached at bootup time, the state tag is empty. However, at libvirtd startup time, it ignores anything with a <state/> tag in the XML, effectively hiding the guest. I can think of at least 3 ways to fix this: 1) Don't throw an error on "unknown" tags in virDomainHostdevSubsysPciDefParseXML(). 2) Have virDomainLoadAllConfigs() pass the VIR_DOMAIN_XML_INTERNAL_STATUS flag when parsing the domain XML. 3) Remove the check for VIR_DOMAIN_XML_INTERNAL_STATUS when parsing the XML. I chose approach 3). My reasoning for this is that the <state> tag is a legitimate part of the XML, so we should always offer to parse it. This fixes the problem with reconnecting to domains that have PCI passthrough devices. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/conf/domain_conf.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 74c2337..595c46c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2876,7 +2876,7 @@ static int virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn, const xmlNodePtr node, virDomainHostdevDefPtr def, - int flags) { + int flags ATTRIBUTE_UNUSED) { int ret = -1; xmlNodePtr cur; @@ -2890,8 +2890,7 @@ virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn, if (virDomainDevicePCIAddressParseXML(conn, cur, addr) < 0) goto out; - } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) && - xmlStrEqual(cur->name, BAD_CAST "state")) { + } else if (xmlStrEqual(cur->name, BAD_CAST "state")) { /* Legacy back-compat. Don't add any more attributes here */ char *devaddr = virXMLPropString(cur, "devaddr"); if (devaddr && -- 1.6.6

3 3

[libvirt] [PATCH] allow (only) surrounding whitespace in uuid
by Dan Kenigsberg 25 Jan '10

25 Jan '10

Please consider something along these lines. Without it, pretty-printed domxml is rejected due to the whitespace before uuid, and long long string of hexadecimal digits is accepted. --- src/util/uuid.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/util/uuid.c b/src/util/uuid.c index 002a64d..0f2ca96 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -145,9 +145,13 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) { /* * do a liberal scan allowing '-' and ' ' anywhere between character - * pairs as long as there is 32 of them in the end. + * pairs, and surrounding whitespace, as long as there are exactly + * 32 hexadecimal digits the end. */ cur = uuidstr; + while (c_isspace(*cur)) + cur++; + for (i = 0;i < VIR_UUID_BUFLEN;) { uuid[i] = 0; if (*cur == 0) @@ -170,6 +174,12 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) { cur++; } + while (*cur) { + if (!c_isspace(*cur)) + goto error; + cur++; + } + return 0; error: -- 1.6.5.2

3 4

[libvirt] [PATCH] libvirt-publican copyright tags
by David Jorm 25 Jan '10

25 Jan '10

I don't have commiter access on this. Can someone else please push it or give me access? --- a/en-US/Legal_Notice.xml +++ b/en-US/Legal_Notice.xml @@ -3,10 +3,10 @@ ]> <legalnotice> <para> - Copyright <trademark class="copyright"></trademark> &YEAR; &HOLDER; + Copyright <trademark class="copyright"></trademark> &YEAR; &HOLDER; </para> <para> - Copyright © 2009 Red Hat, Inc. and others. + Copyright © 2010 Red Hat, Inc. and others. </para> <para> The text of and illustrations in this document are licensed by Red Hat

3 3

[libvirt] esx: networkPtr not initialized
by Nimal I 24 Jan '10

24 Jan '10

hy, I'm tring to add a new API for getting the network info from ESX. I found out that I dont get a valid pointer for the networkPtr while initializing.(whereas DomainPtr is initialozed and gettting a valid pointer on a successfull connect itself). Can somebody let me know, what to do to initialize this pointer and further add a API for a netconfig. Thanks in Advance, -- Nimal.I

2 1

[libvirt] PCI Passthrough
by Aaron Clausen 22 Jan '10

22 Jan '10

I'm trying once again to get PCI passthrough working (KVM 84 on Ubuntu 9.10), and I'm getting this error : LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin /usr/bin/kvm -S -M pc-0.11 -m 4096 -smp 4 -name mailserver -uuid 76a83471-e94a-3658-fa61-8eceaa74ffc2 -monitor unix:/var/run/libvirt/qemu/mailserver.monitor,server,nowait -localtime -boot c -drive file=,if=ide,media=cdrom,index=2 -drive file=/var/lib/libvirt/images/mailserver.img,if=virtio,index=0,boot=on -drive file=/var/lib/libvirt/images/mailserver-2.img,if=virtio,index=1 -net nic,macaddr=54:52:00:1b:b2:56,vlan=0,model=virtio,name=virtio.0 -net tap,fd=17,vlan=0,name=tap.0 -serial pty -parallel none -usb -usbdevice tablet -vnc 127.0.0.1:0 -k en-us -vga cirrus -pcidevice host=0a:01.0 char device redirected to /dev/pts/0 get_real_device: /sys/bus/pci/devices/0000:0a:01.0/config: Permission denied init_assigned_device: Error: Couldn't get real device (0a:01.0)! Failed to initialize assigned device host=0a:01.0 Any thoughts? -- Aaron Clausen mightymartianca(a)gmail.com

1 0

[libvirt] [PATCH] qemu: Fix race between device rebind and kvm cleanup
by Chris Lalancette 22 Jan '10

22 Jan '10

Certain hypervisors (like qemu/kvm) map the PCI bar(s) on the host when doing device passthrough. This can lead to a race condition where the hypervisor is still cleaning up the device while libvirt is trying to re-attach it to the host device driver. To avoid this situation, we look through /proc/iomem, and if the hypervisor is still holding onto the bar (denoted by the string in the matcher variable), then we can wait around a bit for that to clear up. v2: Thanks to review by DV, make sure we wait the full timeout per-device Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 19 ++++++--- src/util/pci.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/pci.h | 1 + 4 files changed, 112 insertions(+), 6 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c912d81..e42c090 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -439,6 +439,7 @@ pciGetDevice; pciFreeDevice; pciDettachDevice; pciReAttachDevice; +pciWaitForDeviceCleanup; pciResetDevice; pciDeviceSetManaged; pciDeviceGetManaged; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e14ed8f..55550ef 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2277,12 +2277,19 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - if (pciDeviceGetManaged(dev) && - pciReAttachDevice(NULL, dev) < 0) { - virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to re-attach PCI device: %s"), - err ? err->message : ""); - virResetError(err); + int retries = 100; + if (pciDeviceGetManaged(dev)) { + while (pciWaitForDeviceCleanup(dev, "kvm_assigned_device") + && retries) { + usleep(100*1000); + retries--; + } + if (pciReAttachDevice(NULL, dev) < 0) { + virErrorPtr err = virGetLastError(); + VIR_ERROR(_("Failed to re-attach PCI device: %s"), + err ? err->message : ""); + virResetError(err); + } } } diff --git a/src/util/pci.c b/src/util/pci.c index 0defbfe..09535bd 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -883,6 +883,103 @@ pciReAttachDevice(virConnectPtr conn, pciDevice *dev) return pciUnBindDeviceFromStub(conn, dev, driver); } +/* Certain hypervisors (like qemu/kvm) map the PCI bar(s) on + * the host when doing device passthrough. This can lead to a race + * condition where the hypervisor is still cleaning up the device while + * libvirt is trying to re-attach it to the host device driver. To avoid + * this situation, we look through /proc/iomem, and if the hypervisor is + * still holding onto the bar (denoted by the string in the matcher variable), + * then we can wait around a bit for that to clear up. + * + * A typical /proc/iomem looks like this (snipped for brevity): + * 00010000-0008efff : System RAM + * 0008f000-0008ffff : reserved + * ... + * 00100000-cc9fcfff : System RAM + * 00200000-00483d3b : Kernel code + * 00483d3c-005c88df : Kernel data + * cc9fd000-ccc71fff : ACPI Non-volatile Storage + * ... + * d0200000-d02fffff : PCI Bus #05 + * d0200000-d021ffff : 0000:05:00.0 + * d0200000-d021ffff : e1000e + * d0220000-d023ffff : 0000:05:00.0 + * d0220000-d023ffff : e1000e + * ... + * f0000000-f0003fff : 0000:00:1b.0 + * f0000000-f0003fff : kvm_assigned_device + * + * Returns 0 if we are clear to continue, and 1 if the hypervisor is still + * holding onto the resource. + */ +int +pciWaitForDeviceCleanup(pciDevice *dev, const char *matcher) +{ + FILE *fp; + char line[160]; + unsigned long long start, end; + int consumed; + char *rest; + unsigned long long domain; + int bus, slot, function; + int in_matching_device; + int ret; + size_t match_depth; + + fp = fopen("/proc/iomem", "r"); + if (!fp) { + /* If we failed to open iomem, we just basically ignore the error. The + * unbind might succeed anyway, and besides, it's very likely we have + * no way to report the error + */ + VIR_DEBUG0("Failed to open /proc/iomem, trying to continue anyway"); + return 0; + } + + ret = 0; + in_matching_device = 0; + match_depth = 0; + while (fgets(line, sizeof(line), fp) != 0) { + /* the logic here is a bit confusing. For each line, we look to + * see if it matches the domain:bus:slot.function we were given. + * If this line matches the DBSF, then any subsequent lines indented + * by 2 spaces are the PCI regions for this device. It's also + * possible that none of the PCI regions are currently mapped, in + * which case we have no indented regions. This code handles all + * of these situations + */ + if (in_matching_device && (strspn(line, " ") == (match_depth + 2))) { + if (sscanf(line, "%Lx-%Lx : %n", &start, &end, &consumed) != 2) + continue; + + rest = line + consumed; + if (STRPREFIX(rest, matcher)) { + ret = 1; + break; + } + } + else { + in_matching_device = 0; + if (sscanf(line, "%Lx-%Lx : %n", &start, &end, &consumed) != 2) + continue; + + rest = line + consumed; + if (sscanf(rest, "%Lx:%x:%x.%x", &domain, &bus, &slot, &function) != 4) + continue; + + if (domain != dev->domain || bus != dev->bus || slot != dev->slot || + function != dev->function) + continue; + in_matching_device = 1; + match_depth = strspn(line, " "); + } + } + + fclose(fp); + + return ret; +} + static char * pciReadDeviceID(pciDevice *dev, const char *id_name) { diff --git a/src/util/pci.h b/src/util/pci.h index a1a19e7..e6ab137 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -81,5 +81,6 @@ int pciDeviceFileIterate(virConnectPtr conn, int pciDeviceIsAssignable(virConnectPtr conn, pciDevice *dev, int strict_acs_check); +int pciWaitForDeviceCleanup(pciDevice *dev, const char *matcher); #endif /* __VIR_PCI_H__ */ -- 1.6.6

2 2

[libvirt] [PATCH] qemu: Fix race between device rebind and kvm cleanup
by Chris Lalancette 22 Jan '10

22 Jan '10

Certain hypervisors (like qemu/kvm) map the PCI bar(s) on the host when doing device passthrough. This can lead to a race condition where the hypervisor is still cleaning up the device while libvirt is trying to re-attach it to the host device driver. To avoid this situation, we look through /proc/iomem, and if the hypervisor is still holding onto the bar (denoted by the string in the matcher variable), then we can wait around a bit for that to clear up. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 19 ++++++--- src/util/pci.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/pci.h | 1 + 4 files changed, 112 insertions(+), 6 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c912d81..e42c090 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -439,6 +439,7 @@ pciGetDevice; pciFreeDevice; pciDettachDevice; pciReAttachDevice; +pciWaitForDeviceCleanup; pciResetDevice; pciDeviceSetManaged; pciDeviceGetManaged; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e14ed8f..cde0034 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2244,6 +2244,7 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, { pciDeviceList *pcidevs; int i; + int retries = 100; if (!def->nhostdevs) return; @@ -2277,12 +2278,18 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - if (pciDeviceGetManaged(dev) && - pciReAttachDevice(NULL, dev) < 0) { - virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to re-attach PCI device: %s"), - err ? err->message : ""); - virResetError(err); + if (pciDeviceGetManaged(dev)) { + while (pciWaitForDeviceCleanup(dev, "kvm_assigned_device") + && retries) { + usleep(100*1000); + retries--; + } + if (pciReAttachDevice(NULL, dev) < 0) { + virErrorPtr err = virGetLastError(); + VIR_ERROR(_("Failed to re-attach PCI device: %s"), + err ? err->message : ""); + virResetError(err); + } } } diff --git a/src/util/pci.c b/src/util/pci.c index 0defbfe..09535bd 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -883,6 +883,103 @@ pciReAttachDevice(virConnectPtr conn, pciDevice *dev) return pciUnBindDeviceFromStub(conn, dev, driver); } +/* Certain hypervisors (like qemu/kvm) map the PCI bar(s) on + * the host when doing device passthrough. This can lead to a race + * condition where the hypervisor is still cleaning up the device while + * libvirt is trying to re-attach it to the host device driver. To avoid + * this situation, we look through /proc/iomem, and if the hypervisor is + * still holding onto the bar (denoted by the string in the matcher variable), + * then we can wait around a bit for that to clear up. + * + * A typical /proc/iomem looks like this (snipped for brevity): + * 00010000-0008efff : System RAM + * 0008f000-0008ffff : reserved + * ... + * 00100000-cc9fcfff : System RAM + * 00200000-00483d3b : Kernel code + * 00483d3c-005c88df : Kernel data + * cc9fd000-ccc71fff : ACPI Non-volatile Storage + * ... + * d0200000-d02fffff : PCI Bus #05 + * d0200000-d021ffff : 0000:05:00.0 + * d0200000-d021ffff : e1000e + * d0220000-d023ffff : 0000:05:00.0 + * d0220000-d023ffff : e1000e + * ... + * f0000000-f0003fff : 0000:00:1b.0 + * f0000000-f0003fff : kvm_assigned_device + * + * Returns 0 if we are clear to continue, and 1 if the hypervisor is still + * holding onto the resource. + */ +int +pciWaitForDeviceCleanup(pciDevice *dev, const char *matcher) +{ + FILE *fp; + char line[160]; + unsigned long long start, end; + int consumed; + char *rest; + unsigned long long domain; + int bus, slot, function; + int in_matching_device; + int ret; + size_t match_depth; + + fp = fopen("/proc/iomem", "r"); + if (!fp) { + /* If we failed to open iomem, we just basically ignore the error. The + * unbind might succeed anyway, and besides, it's very likely we have + * no way to report the error + */ + VIR_DEBUG0("Failed to open /proc/iomem, trying to continue anyway"); + return 0; + } + + ret = 0; + in_matching_device = 0; + match_depth = 0; + while (fgets(line, sizeof(line), fp) != 0) { + /* the logic here is a bit confusing. For each line, we look to + * see if it matches the domain:bus:slot.function we were given. + * If this line matches the DBSF, then any subsequent lines indented + * by 2 spaces are the PCI regions for this device. It's also + * possible that none of the PCI regions are currently mapped, in + * which case we have no indented regions. This code handles all + * of these situations + */ + if (in_matching_device && (strspn(line, " ") == (match_depth + 2))) { + if (sscanf(line, "%Lx-%Lx : %n", &start, &end, &consumed) != 2) + continue; + + rest = line + consumed; + if (STRPREFIX(rest, matcher)) { + ret = 1; + break; + } + } + else { + in_matching_device = 0; + if (sscanf(line, "%Lx-%Lx : %n", &start, &end, &consumed) != 2) + continue; + + rest = line + consumed; + if (sscanf(rest, "%Lx:%x:%x.%x", &domain, &bus, &slot, &function) != 4) + continue; + + if (domain != dev->domain || bus != dev->bus || slot != dev->slot || + function != dev->function) + continue; + in_matching_device = 1; + match_depth = strspn(line, " "); + } + } + + fclose(fp); + + return ret; +} + static char * pciReadDeviceID(pciDevice *dev, const char *id_name) { diff --git a/src/util/pci.h b/src/util/pci.h index a1a19e7..e6ab137 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -81,5 +81,6 @@ int pciDeviceFileIterate(virConnectPtr conn, int pciDeviceIsAssignable(virConnectPtr conn, pciDevice *dev, int strict_acs_check); +int pciWaitForDeviceCleanup(pciDevice *dev, const char *matcher); #endif /* __VIR_PCI_H__ */ -- 1.6.6

2 2

[libvirt] [PATCH] Add a rule to check for uses of readlink.
by Chris Lalancette 22 Jan '10

22 Jan '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- .x-sc_prohibit_readlink | 2 ++ cfg.mk | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) create mode 100644 .x-sc_prohibit_readlink diff --git a/.x-sc_prohibit_readlink b/.x-sc_prohibit_readlink new file mode 100644 index 0000000..e7acb03 --- /dev/null +++ b/.x-sc_prohibit_readlink @@ -0,0 +1,2 @@ +^src/util/util\.c$ +^ChangeLog-old$ diff --git a/cfg.mk b/cfg.mk index 0f2d2a6..5013e4b 100644 --- a/cfg.mk +++ b/cfg.mk @@ -94,6 +94,11 @@ sc_prohibit_strncpy: msg='use virStrncpy, not strncpy' \ $(_prohibit_regexp) +sc_prohibit_readlink: + @re='readlink *\(' \ + msg='use virFileResolveLink, not readlink' \ + $(_prohibit_regexp) + sc_prohibit_gethostname: @re='gethostname *\(' \ msg='use virGetHostname, not gethostname' \ -- 1.6.6

3 3

[libvirt] [PATCH] Use virFileResolveLink instead of readlink in AppArmor
by Chris Lalancette 22 Jan '10

22 Jan '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/security/security_apparmor.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index f288645..0857d58 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -258,22 +258,23 @@ get_profile_name(virConnectPtr conn, virDomainObjPtr vm) static int use_apparmor(void) { - char libvirt_daemon[PATH_MAX]; int rc = -1; - ssize_t len = 0; + char *libvirt_daemon = NULL; - if ((len = readlink("/proc/self/exe", libvirt_daemon, - PATH_MAX - 1)) < 0) { + if (virFileResolveLink("/proc/self/exe", &libvirt_daemon) < 0) { virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("could not find libvirtd")); - return rc; + return -1; } - libvirt_daemon[len] = '\0'; if (access(APPARMOR_PROFILES_PATH, R_OK) != 0) - return rc; + goto cleanup; - return profile_status(libvirt_daemon, 1); + rc = profile_status(libvirt_daemon, 1); + +cleanup: + VIR_FREE(libvirt_daemon); + return rc; } /* Called on libvirtd startup to see if AppArmor is available */ -- 1.6.6

3 7

Re: [libvirt] [PATCH] Fix a compile warning in parthelper.c
by Chris Lalancette 22 Jan '10

22 Jan '10

On 01/22/2010 04:07 AM, Daniel Veillard wrote: > On Thu, Jan 21, 2010 at 11:33:18AM -0500, Chris Lalancette wrote: >> Signed-off-by: Chris Lalancette <clalance(a)redhat.com> >> --- >> src/storage/parthelper.c | 1 + >> 1 files changed, 1 insertions(+), 0 deletions(-) >> >> diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c >> index 5df46e8..ab04842 100644 >> --- a/src/storage/parthelper.c >> +++ b/src/storage/parthelper.c >> @@ -34,6 +34,7 @@ >> >> #include <parted/parted.h> >> #include <stdio.h> >> +#include <string.h> >> >> /* we don't need to include the full internal.h just for this */ >> #define STREQ(a,b) (strcmp((a),(b)) == 0) > > ACK, Thanks, pushed. -- Chris Lalancette

1 0

[libvirt] [PATCH] Fix device assignment with root devices
by Chris Lalancette 22 Jan '10

22 Jan '10

The patches to add ACS checking to PCI device passthrough introduced a bug. With the current code, if you try to passthrough a device on the root bus (i.e. bus 0), then it denies the passthrough. This is because the code in pciDeviceIsBehindSwitchLackingACS() to check for a parent device doesn't take into account the possibility of the root bus. If we are on the root bus, it means we legitimately can't find a parent, and it also means that we don't have to worry about whether ACS is enabled. Therefore return 0 (indicating we don't lack ACS) from pciDeviceIsBehindSwitchLackingACS(). Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/util/pci.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/util/pci.c b/src/util/pci.c index 086b751..0defbfe 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -1198,11 +1198,20 @@ pciDeviceIsBehindSwitchLackingACS(virConnectPtr conn, { pciDevice *parent; - if (!(parent = pciGetParentDevice(conn, dev))) { - pciReportError(conn, VIR_ERR_NO_SUPPORT, - _("Failed to find parent device for %s"), - dev->name); - return -1; + parent = pciGetParentDevice(conn, dev); + if (!parent) { + /* if we have no parent, and this is the root bus, ACS doesn't come + * into play since devices on the root bus can't P2P without going + * through the root IOMMU. + */ + if (dev->bus == 0) + return 0; + else { + pciReportError(conn, VIR_ERR_NO_SUPPORT, + _("Failed to find parent device for %s"), + dev->name); + return -1; + } } /* XXX we should rather fail when we can't find device's parent and -- 1.6.6

2 2

[libvirt] [PATCH] Add virConnectGetVersion Python API
by Taizo ITO 22 Jan '10

22 Jan '10

Hi all, The attached patch adds a new python API call for retrieving the running hypervisor version used by a connection: virConnectGetVersion. -- Taizo ITO

2 1

[libvirt] [PATCH] fix AppArmo build errors that crept in recently
by Jamie Strandboge 22 Jan '10

22 Jan '10

Not sure when these crept in, but here is a patch so that the build won't fail when compiling with --enable-compile-warnings=error. Fixes the following errors: cc1: warnings being treated as errors security/security_apparmor.c: In function 'AppArmorSetSecurityAllLabel': security/security_apparmor.c:381: error: unused variable 'rc' security/security_apparmor.c: In function 'AppArmorReleaseSecurityLabel': security/security_apparmor.c:436: error: unused parameter 'conn' -- Jamie Strandboge | http://www.canonical.com

2 1

[libvirt] [PATCH] Remove unused PROC_MOUNT_BUF_LEN #define
by Chris Lalancette 22 Jan '10

22 Jan '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_conf.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index c843c6a..c227fe1 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -92,8 +92,6 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "", /* no arg needed for xen */ "" /* don't support vbox */); -#define PROC_MOUNT_BUF_LEN 255 - int qemudLoadDriverConfig(struct qemud_driver *driver, const char *filename) { virConfPtr conf; -- 1.6.6

2 1

[libvirt] [PATCH 0/2] Make filesystems during fs pool build
by David Allan 21 Jan '10

21 Jan '10

This patch implements the formatting of block devices in the pool build operation of filesystem pools. The existing implementation would only make the directory on which to mount the filesystem, but required the user to make the filesystem manually. My only concern with this approach is that it changes the build behavior in a way that's potentially destructive, so I wonder whether it would be worth adding a flag to enable this behavior. Dave

3 4

[libvirt] [PATCH 0/2] MultiIQN support
by David Allan 21 Jan '10

21 Jan '10

This patch implements multiIQN support for iSCSI pools, allowing the user to specify the initiator IQN that should be used when creating the pool.

3 7

[libvirt] [PATCH] Fix a compile warning in parthelper.c
by Chris Lalancette 21 Jan '10

21 Jan '10

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/storage/parthelper.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index 5df46e8..ab04842 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -34,6 +34,7 @@ #include <parted/parted.h> #include <stdio.h> +#include <string.h> /* we don't need to include the full internal.h just for this */ #define STREQ(a,b) (strcmp((a),(b)) == 0) -- 1.6.6

1 0

[libvirt] [PATCH] Add docs about new mailing list
by Daniel P. Berrange 21 Jan '10

21 Jan '10

* docs/contact.html.in: Document new users mailing list --- docs/contact.html.in | 43 ++++++++++++++++++++++++++++++++++++------- 1 files changed, 36 insertions(+), 7 deletions(-) diff --git a/docs/contact.html.in b/docs/contact.html.in index 5d055b1..3a0d439 100644 --- a/docs/contact.html.in +++ b/docs/contact.html.in @@ -3,15 +3,44 @@ <body> <h1>Contacting the development team</h1> - <h2>Mailing list</h2> + <h2>Mailing lists</h2> <p> - There is a mailing-list <a href="mailto:libvir-list@redhat.com">libvir-list(a)redhat.com</a> for libvirt, - with an <a href="https://www.redhat.com/archives/libvir-list/">on-line archive</a>. - Please subscribe to this list before posting by visiting the - <a href="https://www.redhat.com/mailman/listinfo/libvir-list">associated Web</a> - page and follow the instructions. Patches with explanations and provided as - attachments are really appreciated and will be discussed on the mailing list. + There are two mailing-lists: + </p> + + <dl> + <dt><a href="https://www.redhat.com/archives/libvir-list/">libvir-list(a)redhat.com</a></dt> + <dd>This list a place for discussions about the <strong>development</strong> of libvirt. Topics for discussion include + <ul> + <li>New features for libvirt</li> + <li>Bug fixing of libvirt</li> + <li>New hypervisor drivers</li> + <li>Development of language bindings for libvirt API</li> + <li>Testing and documentation of libvirt</li> + </ul> + </dd> + + <dt><a href="">libvirt-users(a)redhat.com</a></dt> + <dd>This list a place for discussions involving libvirt <strong>users</strong>. Topics for discussion include + <ul> + <li>Usage of libvirt / virsh</li> + <li>Administration of libvirtd</li> + <li>Deployment of libvirt with hypervisors</li> + <li>Development of applications on top of / using the libvirt API(s)</li> + <li>Any other topics along these lines</li> + </ul> + </dd> + </dl> + + <p> + Both mailing lists require that you <strong>subscribe before posting to the list</strong>, + otherwise your posting will be blocked by mailman. You can subscribe at the linked webpages + above. + </p> + <p> + Patches with explanations and provided as attachments are really appreciated and should + be directed to the development mailing list will be discussed on the mailing list. If possible generate the patches by using <code>git diff</code> in a GIT clone. </p> -- 1.6.2.5

3 2

[libvirt] [PATCH] domMemoryStats / qemu: Fix parsing of unknown stats
by Adam Litke 21 Jan '10

21 Jan '10

Fix a small problem with the qemu memory stats parsing algorithm. If qemu reports a stat that libvirt does not recognize, skip past it so parsing can continue. This corrects a potential infinite loop in the parsing code that can only be triggered if new statistics are added to qemu. Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- src/qemu/qemu_monitor_text.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 5b9ced2..87cf972 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -507,7 +507,11 @@ static int qemuMonitorParseExtraBalloonInfo(char *text, ",total_mem=", &stats[nr_stats_found])) nr_stats_found++; - /* Skip to the next label */ + /* Skip to the next label. When *p is ',' the last match attempt + * failed so try to match the next ','. + */ + if (*p == ',') + p++; p = strchr (p, ','); if (!p) break; } -- 1.6.5

3 2

[libvirt] [PATCH 0/1] Fix log level message
by David Allan 21 Jan '10

21 Jan '10

This oneliner corrects a debug message that was incorrectly being logged as an error.

3 3

[libvirt] [PATCH] look for DMI information in /sys/class too
by Guido Günther 21 Jan '10

21 Jan '10

Hi, attached patch looks for the DMI information in /sys/class since older kernels (e.g. 2.6.26) have it there. Cheers, -- Guido

3 5