- Devel - libvirt List Archives

[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 27 Jan '10

27 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 27 Jan '10

27 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 27 Jan '10

27 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 27 Jan '10

27 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 27 Jan '10

27 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 27 Jan '10

27 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 27 Jan '10

27 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 27 Jan '10

27 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> - Psuedo-driver simulating APIs in memory for test suites + Pseudo-driver simulating APIs in memory for test suites </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 26 Jan '10

26 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 26 Jan '10

26 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 26 Jan '10

26 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 26 Jan '10

26 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 26 Jan '10

26 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 26 Jan '10

26 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 26 Jan '10

26 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 26 Jan '10

26 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 26 Jan '10

26 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 23 Jan '10

23 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 23 Jan '10

23 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 23 Jan '10

23 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 23 Jan '10

23 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 23 Jan '10

23 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 23 Jan '10

23 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 23 Jan '10

23 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 22 Jan '10

22 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 22 Jan '10

22 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 22 Jan '10

22 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 22 Jan '10

22 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> - 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: + + + <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 development 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 users. 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> + + + Both mailing lists require that you subscribe before posting to the list, + otherwise your posting will be blocked by mailman. You can subscribe at the linked webpages + above. + + + 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. -- 1.6.2.5

3 2

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

22 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 22 Jan '10

22 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 22 Jan '10

22 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

[libvirt] [PATCH] fix "make distcheck" failure
by Jim Meyering 22 Jan '10

22 Jan '10

Yet another. While testing the preceding patch, I saw a new test failure: ....../w/co/libvirt/libvirt-0.7.5/tests/qemuhelpdata/qemu-0.12.1: \ failed to open: No such file or directory ! 7 FAIL FAIL: qemuhelptest >From 2c8eb68969737a90998244abfae1a286c92f47e0 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 21 Jan 2010 15:24:15 +0100 Subject: [PATCH] fix "make distcheck" failure * tests/Makefile.am (qemuhelpdata): Add qemu-0.12.1. --- tests/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 584bdb3..090b320 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,8 +42,9 @@ LDADDS = \ qemuhelpdata = \ kvm-74 \ kvm-86 \ - qemu-0.10.5 \ qemu-0.9.1 \ + qemu-0.10.5 \ + qemu-0.12.1 \ qemu-kvm-0.10.5 \ qemu-kvm-0.11.0-rc2 -- 1.6.6.513.g63f4c

1 0

[libvirt] another FYI [PATCH] avoid more format-related warnings
by Jim Meyering 22 Jan '10

22 Jan '10

>From d47b6e54fd2be922eaa168f149083b7c8588b218 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 21 Jan 2010 15:12:12 +0100 Subject: [PATCH] avoid more format-related warnings * src/qemu/qemu_conf.c (qemuBuildDriveStr): Use "%s". * src/qemu/qemu_monitor_json.c (qemuMonitorJSONGetGuestPCIAddress): (qemuMonitorJSONGetGuestDriveAddress): Likewise. --- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_monitor_json.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 3cdb0df..c843c6a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1896,7 +1896,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, * to have > 1 bus on a SCSI controller (yet). */ if (disk->info.addr.drive.bus != 0) { qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("SCSI controller only supports 1 bus")); + "%s", _("SCSI controller only supports 1 bus")); goto error; } busid = disk->info.addr.drive.controller; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index cfea376..57e2ad9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1,7 +1,7 @@ /* * qemu_monitor_json.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 @@ -1235,7 +1235,7 @@ qemuMonitorJSONGetGuestPCIAddress(virJSONValuePtr reply, } if (virJSONValueObjectGetNumberUint(addr, "function", &guestAddr->function) < 0) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("pci_add reply was missing device function number")); return -1; } @@ -1531,19 +1531,19 @@ qemuMonitorJSONGetGuestDriveAddress(virJSONValuePtr reply, addr = virJSONValueObjectGet(reply, "return"); if (!addr || addr->type != VIR_JSON_TYPE_OBJECT) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("drive_add reply was missing device address")); return -1; } if (virJSONValueObjectGetNumberUint(addr, "bus", &driveAddr->bus) < 0) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("drive_add reply was missing device bus number")); return -1; } if (virJSONValueObjectGetNumberUint(addr, "unit", &driveAddr->unit) < 0) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("drive_add reply was missing device unit number")); return -1; } -- 1.6.6.513.g63f4c

1 0

[libvirt] FYI, [PATCH] avoid format-related warnings
by Jim Meyering 21 Jan '10

21 Jan '10

Testing something unrelated, I saw these warnings: ../../src/conf/domain_conf.c: In function 'virDomainDeviceInfoParseXML': ../../src/conf/domain_conf.c:1120:9: warning: format not a string literal and no format arguments ../../src/conf/domain_conf.c:1138:9: warning: format not a string literal and no format arguments Here's the patch I'll push shortly. No ACK required. >From 885f88c513d7d5004efca4899bfbced78536f371 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 21 Jan 2010 14:39:42 +0100 Subject: [PATCH] avoid format-related warnings * src/conf/domain_conf.c (virDomainDeviceInfoParseXML): Use "%s". --- src/conf/domain_conf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 27f6f84..74c2337 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1118,7 +1118,7 @@ virDomainDeviceInfoParseXML(virConnectPtr conn, } } else { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("No type specified for device address")); + "%s", _("No type specified for device address")); goto cleanup; } @@ -1136,7 +1136,7 @@ virDomainDeviceInfoParseXML(virConnectPtr conn, default: /* Should not happen */ virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("Unknown device address type")); + "%s", _("Unknown device address type")); goto cleanup; } -- 1.6.6.513.g63f4c

1 0

[libvirt] [PATCH] Let make fail when XHTML validation fails
by Jiri Denemark 21 Jan '10

21 Jan '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index eaac627..4df5154 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -108,7 +108,7 @@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl @(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \ if $(XMLCATALOG) /etc/xml/catalog "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ echo "Validating $@" ; \ - $(XMLLINT) --nonet --format --valid $< > $@ || : ; \ + $(XMLLINT) --nonet --format --valid $< > $@ || (rm $@ && exit 1) ; \ else echo "missing XHTML1 DTD" ; fi ; fi ); -- 1.6.6

3 5

[libvirt] [PATCH] Fix uses of virFileMakePath.
by Laine Stump 21 Jan '10

21 Jan '10

When I modified the use of virFileMakePath in my own code, I noticed that it was checking for a return < 0 to indicate error, but I had seen in virFileMakePath that it returns 0 for success, or the value of errno on failure, and errno is usually (always?) >=0. Seeing incorrect usage in one place, I investigated and found several others. --- src/lxc/lxc_container.c | 10 +++++----- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 4 ++-- src/qemu/qemu_driver.c | 8 ++++---- src/uml/uml_driver.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 023d553..539a1f4 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -317,7 +317,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - if ((rc = virFileMakePath(oldroot)) < 0) { + if ((rc = virFileMakePath(oldroot)) != 0) { virReportSystemError(NULL, rc, _("Failed to create %s"), oldroot); @@ -339,7 +339,7 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) goto err; } - if ((rc = virFileMakePath(newroot)) < 0) { + if ((rc = virFileMakePath(newroot)) != 0) { virReportSystemError(NULL, rc, _("Failed to create %s"), newroot); @@ -407,7 +407,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } for (i = 0 ; i < ARRAY_CARDINALITY(mnts) ; i++) { - if (virFileMakePath(mnts[i].dst) < 0) { + if (virFileMakePath(mnts[i].dst) != 0) { virReportSystemError(NULL, errno, _("Failed to mkdir %s"), mnts[i].src); @@ -421,7 +421,7 @@ static int lxcContainerMountBasicFS(virDomainFSDefPtr root) } } - if ((rc = virFileMakePath("/dev/pts") < 0)) { + if ((rc = virFileMakePath("/dev/pts") != 0)) { virReportSystemError(NULL, rc, "%s", _("Cannot create /dev/pts")); goto cleanup; @@ -510,7 +510,7 @@ static int lxcContainerMountNewFS(virDomainDefPtr vmDef) return -1; } - if (virFileMakePath(vmDef->fss[i]->dst) < 0) { + if (virFileMakePath(vmDef->fss[i]->dst) != 0) { virReportSystemError(NULL, errno, _("Failed to create %s"), vmDef->fss[i]->dst); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 3cecdce..6304815 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -556,7 +556,7 @@ lxcControllerRun(virDomainDefPtr def, goto cleanup; } - if (virFileMakePath(devpts) < 0) { + if (virFileMakePath(devpts) != 0) { virReportSystemError(NULL, errno, _("Failed to make path %s"), devpts); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ec5ee6b..d78f7f7 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1193,7 +1193,7 @@ static int lxcVmStart(virConnectPtr conn, char **veths = NULL; lxcDomainObjPrivatePtr priv = vm->privateData; - if ((r = virFileMakePath(driver->logDir)) < 0) { + if ((r = virFileMakePath(driver->logDir)) != 0) { virReportSystemError(conn, r, _("Cannot create log directory '%s'"), driver->logDir); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4385215..08e5ee6 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -539,13 +539,13 @@ dhcpStartDhcpDaemon(virConnectPtr conn, return -1; } - if ((err = virFileMakePath(NETWORK_PID_DIR)) < 0) { + if ((err = virFileMakePath(NETWORK_PID_DIR)) != 0) { virReportSystemError(conn, err, _("cannot create directory %s"), NETWORK_PID_DIR); return -1; } - if ((err = virFileMakePath(NETWORK_STATE_DIR)) < 0) { + if ((err = virFileMakePath(NETWORK_STATE_DIR)) != 0) { virReportSystemError(conn, err, _("cannot create directory %s"), NETWORK_STATE_DIR); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 951e033..fa2e5d3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1033,19 +1033,19 @@ qemudStartup(int privileged) { goto out_of_memory; } - if (virFileMakePath(qemu_driver->stateDir) < 0) { + if (virFileMakePath(qemu_driver->stateDir) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create state dir '%s': %s"), qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->libDir) < 0) { + if (virFileMakePath(qemu_driver->libDir) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create lib dir '%s': %s"), qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } - if (virFileMakePath(qemu_driver->cacheDir) < 0) { + if (virFileMakePath(qemu_driver->cacheDir) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create cache dir '%s': %s"), qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf)); @@ -2782,7 +2782,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, vm->def->graphics[0]->data.vnc.port = port; } - if (virFileMakePath(driver->logDir) < 0) { + if (virFileMakePath(driver->logDir) != 0) { virReportSystemError(conn, errno, _("cannot create log directory %s"), driver->logDir); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index b808090..31cea5c 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -419,7 +419,7 @@ umlStartup(int privileged) { goto error; } - if (virFileMakePath(uml_driver->monitorDir) < 0) { + if (virFileMakePath(uml_driver->monitorDir) != 0) { char ebuf[1024]; VIR_ERROR(_("Failed to create monitor directory %s: %s"), uml_driver->monitorDir, virStrerror(errno, ebuf, sizeof ebuf)); @@ -840,7 +840,7 @@ static int umlStartVMDaemon(virConnectPtr conn, return -1; } - if (virFileMakePath(driver->logDir) < 0) { + if (virFileMakePath(driver->logDir) != 0) { virReportSystemError(conn, errno, _("cannot create log directory %s"), driver->logDir); -- 1.6.6

2 2

[libvirt] [PATCH 0/4] Take 3 - Patchset to avoid uid problems in volume creation
by Laine Stump 21 Jan '10

21 Jan '10

The last iteration of this work (which is now completely obsoleted) is at https://www.redhat.com/archives/libvir-list/2010-January/msg00302.html These patches are intended in particular to deal with problems creating storage volumes on pools that are located on root-squashing NFS servers, but hopefully they are overall just "a good thing" and will solve other as-yet-unencountered/unreported problems. Differences from previous version of the patches: 1) For completeness, chmod is done inside virFileCreate and virDirCreate as well as setting uid and gid. 2) Both of those functions now take an additional flag - VIR_FILE_CREATE_ALLOW_EXIST, which does exactly what you'd think. 3) I now always attempt to set uid/gid correctly, even if not running as root (per Serge Hallyn's suggestions during the last go around) 4) I've added a patch that uses similar logic to get the uid/gid/mode of the directories for newly created pools correct as well. (Previously, we'd been ignoring the permission bits of pool definition xml).

2 13

[libvirt] [PATCH 1/3] Make sure that the vmx2xml test data files are shipped in the distribution.
by Diego Elio Pettenò 21 Jan '10

21 Jan '10

Without these files the tests will fail when ESX support is enabled. --- tests/Makefile.am | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 1 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 335b0e5..cf51162 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -47,6 +47,67 @@ qemuhelpdata = \ qemu-kvm-0.10.5 \ qemu-kvm-0.11.0-rc2 +vmx2xmldata = \ + vmx2xml-cdrom-ide-device.vmx \ + vmx2xml-cdrom-ide-device.xml \ + vmx2xml-cdrom-ide-file.vmx \ + vmx2xml-cdrom-ide-file.xml \ + vmx2xml-cdrom-scsi-device.vmx \ + vmx2xml-cdrom-scsi-device.xml \ + vmx2xml-cdrom-scsi-file.vmx \ + vmx2xml-cdrom-scsi-file.xml \ + vmx2xml-esx-in-the-wild-1.vmx \ + vmx2xml-esx-in-the-wild-1.xml \ + vmx2xml-esx-in-the-wild-2.vmx \ + vmx2xml-esx-in-the-wild-2.xml \ + vmx2xml-esx-in-the-wild-3.vmx \ + vmx2xml-esx-in-the-wild-3.xml \ + vmx2xml-esx-in-the-wild-4.vmx \ + vmx2xml-esx-in-the-wild-4.xml \ + vmx2xml-ethernet-bridged.vmx \ + vmx2xml-ethernet-bridged.xml \ + vmx2xml-ethernet-custom.vmx \ + vmx2xml-ethernet-custom.xml \ + vmx2xml-ethernet-e1000.vmx \ + vmx2xml-ethernet-e1000.xml \ + vmx2xml-floppy-device.vmx \ + vmx2xml-floppy-device.xml \ + vmx2xml-floppy-file.vmx \ + vmx2xml-floppy-file.xml \ + vmx2xml-gsx-in-the-wild-1.vmx \ + vmx2xml-gsx-in-the-wild-1.xml \ + vmx2xml-gsx-in-the-wild-2.vmx \ + vmx2xml-gsx-in-the-wild-2.xml \ + vmx2xml-gsx-in-the-wild-3.vmx \ + vmx2xml-gsx-in-the-wild-3.xml \ + vmx2xml-gsx-in-the-wild-4.vmx \ + vmx2xml-gsx-in-the-wild-4.xml \ + vmx2xml-harddisk-ide-file.vmx \ + vmx2xml-harddisk-ide-file.xml \ + vmx2xml-harddisk-scsi-file.vmx \ + vmx2xml-harddisk-scsi-file.xml \ + vmx2xml-minimal-64bit.vmx \ + vmx2xml-minimal-64bit.xml \ + vmx2xml-minimal.vmx \ + vmx2xml-minimal.xml \ + vmx2xml-parallel-device.vmx \ + vmx2xml-parallel-device.xml \ + vmx2xml-parallel-file.vmx \ + vmx2xml-parallel-file.xml \ + vmx2xml-scsi-buslogic.vmx \ + vmx2xml-scsi-buslogic.xml \ + vmx2xml-scsi-writethrough.vmx \ + vmx2xml-scsi-writethrough.xml \ + vmx2xml-serial-device.vmx \ + vmx2xml-serial-device.xml \ + vmx2xml-serial-file.vmx \ + vmx2xml-serial-file.xml \ + vmx2xml-serial-pipe-client-app.vmx \ + vmx2xml-serial-pipe-client-vm.vmx \ + vmx2xml-serial-pipe-server-app.vmx \ + vmx2xml-serial-pipe-server-vm.vmx \ + vmx2xml-serial-pipe.xml + EXTRA_DIST = \ oomtrace.pl \ test-lib.sh \ @@ -69,7 +130,8 @@ EXTRA_DIST = \ storagevolxml2xmlin \ nodedevschematest \ nodedevschemadata \ - $(patsubst %,qemuhelpdata/%,$(qemuhelpdata)) + $(patsubst %,qemuhelpdata/%,$(qemuhelpdata)) \ + $(patsubst %,vmx2xmldata/%,$(vmx2xmldata)) noinst_PROGRAMS = virshtest conftest \ nodeinfotest statstest qparamtest -- 1.6.6.rc4

3 8

[libvirt] [PATCH] qemu: Don't allocate zero bytes
by Matthias Bolte 21 Jan '10

21 Jan '10

--- 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 38eb3fd..92a9348 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -836,7 +836,7 @@ qemudCapsInitGuest(virCapsPtr caps, return -1; } - if (VIR_ALLOC_N(machines, nmachines) < 0) { + if (VIR_ALLOC_N(machines, 1) < 0) { virReportOOMError(NULL); VIR_FREE(machine->name); VIR_FREE(machine); -- 1.6.3.3

2 2

[libvirt] [PATCH] node_device_linux_sysfs.c: avoid opendir/fd leak on error path
by Jim Meyering 21 Jan '10

21 Jan '10

This looks pretty clear. It calls closedir upon successful return, but not in the error case. >From 526a2bc2d87f0bf7a0c16a2a96316e5c1d5dae2e Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 20 Jan 2010 17:49:35 +0100 Subject: [PATCH] node_device_linux_sysfs.c: avoid opendir/fd leak on error path * src/node_device/node_device_linux_sysfs.c(get_virtual_functions_linux): Don't leak a DIR buffer and file descriptor on error path. --- src/node_device/node_device_linux_sysfs.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index ff7aaf0..e611e1a 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -2,7 +2,7 @@ * node_device_hal_linuc.c: Linux specific code to gather device data * not available through HAL. * - * 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 @@ -371,6 +371,8 @@ int get_virtual_functions_linux(const char *sysfs_path, ret = 0; out: + if (dir) + closedir(dir); VIR_FREE(device_link); return 0; } -- 1.6.6.516.gb72f

2 4

[libvirt] [PATCH] domain_conf.c: avoid a leak and the need for "cleanup:" block
by Jim Meyering 21 Jan '10

21 Jan '10

This avoids a leak and the need for a "cleanup:" block, along with its three goto statements. While often I prefer to write functions with a single return point, this one no longer has the need, now that "addr" is freed immediately after allocation. Adding the semicolon in the "case..." stmt may look odd. It's there because the first stmt is the declaration of "port". If you'd prefer, an alternative is to put the contents of that case inside a {...} block. >From dc879b00ccf6cc451b95ca3712e647605579ee0b Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 20 Jan 2010 19:27:43 +0100 Subject: [PATCH] domain_conf.c: avoid a leak and the need for "cleanup:" block * src/conf/domain_conf.c (virDomainChrDefFormat): Plug a leak on an error path, and at the same time, eliminate the need for a "cleanup:" block. Before, the "return -1" after the switch would leak an "addr" string. Now, by reversing the port,addr- getting blocks we can free "addr" immediately and skip the goto. --- src/conf/domain_conf.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6254dc8..7815805 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1,7 +1,7 @@ /* * domain_conf.c: domain XML processing * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -4831,7 +4831,6 @@ virDomainChrDefFormat(virConnectPtr conn, const char *targetName = virDomainChrTargetTypeToString(def->targetType); const char *elementName; - const char *addr = NULL; int ret = 0; switch (def->targetType) { @@ -4847,8 +4846,7 @@ virDomainChrDefFormat(virConnectPtr conn, if (!type) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, _("unexpected char type %d"), def->type); - ret = -1; - goto cleanup; + return -1; } /* Compat with legacy <console tty='/dev/pts/5'/> syntax */ @@ -4931,22 +4929,23 @@ virDomainChrDefFormat(virConnectPtr conn, switch (def->targetType) { case VIR_DOMAIN_CHR_TARGET_TYPE_GUESTFWD: - addr = virSocketFormatAddr(def->target.addr); - if (addr == NULL) { - virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to format guestfwd address")); - ret = -1; - goto cleanup; - } + ; /* dummy stmt, for following declaration */ int port = virSocketGetPort(def->target.addr); if (port < 0) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to format guestfwd port")); - ret = -1; - goto cleanup; + return -1; + } + const char *addr = virSocketFormatAddr(def->target.addr); + if (addr == NULL) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to format guestfwd address")); + return -1; } - virBufferVSprintf(buf, " <target type='guestfwd' address='%s' port='%d'/>\n", + virBufferVSprintf(buf, + " <target type='guestfwd' address='%s' port='%d'/>\n", addr, port); + VIR_FREE(addr); break; case VIR_DOMAIN_CHR_TARGET_TYPE_PARALLEL: @@ -4969,9 +4968,6 @@ virDomainChrDefFormat(virConnectPtr conn, virBufferVSprintf(buf, " </%s>\n", elementName); -cleanup: - VIR_FREE(addr); - return ret; } -- 1.6.6.516.gb72f

2 3

Re: [libvirt] [PATCH] Document cpu-compare command in virsh man page
by Jiri Denemark 21 Jan '10

21 Jan '10

On Wed, Jan 20, 2010 at 16:17:32 +0100, Daniel Veillard wrote: > On Wed, Jan 20, 2010 at 03:16:29PM +0100, Jiri Denemark wrote: > > Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> > > --- > > tools/virsh.pod | 9 +++++++++ > > 1 files changed, 9 insertions(+), 0 deletions(-) > > > > diff --git a/tools/virsh.pod b/tools/virsh.pod > > index 84a8564..10f622f 100644 > > --- a/tools/virsh.pod > > +++ b/tools/virsh.pod > > @@ -213,6 +213,15 @@ crashed. > > Prints the available amount of memory on the machine or within a > > NUMA cell if I<cellno> is provided. > > > > +=item B<cpu-compare> I<FILE> > > + > > +Compare CPU definition from XML <file> with host CPU. The XML <file> may > > +contain either host or guest CPU definition. The host CPU definition is the > > +<cpu> element and its contents as printed by B<capabilities> command. The > > +guest CPU definition is the <cpu> element and its contents from domain XML > > +definition. For more information on guest CPU definition see: > > +L<http://libvirt.org/formatdomain.html#elementsCPU> > > + > > =back > > > > =head1 DOMAIN COMMANDS > > ACK, Thanks, pushed. Jirka

1 0

[libvirt] [PATCH] Document cpu-compare command in virsh man page
by Jiri Denemark 21 Jan '10

21 Jan '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh.pod | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 84a8564..10f622f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -213,6 +213,15 @@ crashed. Prints the available amount of memory on the machine or within a NUMA cell if I<cellno> is provided. +=item B<cpu-compare> I<FILE> + +Compare CPU definition from XML <file> with host CPU. The XML <file> may +contain either host or guest CPU definition. The host CPU definition is the +<cpu> element and its contents as printed by B<capabilities> command. The +guest CPU definition is the <cpu> element and its contents from domain XML +definition. For more information on guest CPU definition see: +L<http://libvirt.org/formatdomain.html#elementsCPU> + =back =head1 DOMAIN COMMANDS -- 1.6.6

1 0

[libvirt] [PATCH] Libvirt Snapshot API
by Philip Jameson 20 Jan '10

20 Jan '10

A little while ago I submitted a patch to add a snapshot API, but I was informed that it got somewhat lost in the list. I have attached a patch that implements this API at least for the qemu driver, and it also added another function for screenshots, just because it usually is nice to get a view of the screen with the snapshot. The snapshot functions just take names, as I figure it should be up to libvirt to figure out where the snapshots go. e.g. for qemu, they just get stored with the drive using qemu's built in facilities. If someone were using LVM, then that could be managed by libvirt, just like it does for qemu monitors and such. The 'list snapshots' just returns a list of names for now, as that's all I needed, but I think it would probably be best to add a struct that would be name/time. I don't know if it's of any use at the moment, but I needed these functions implemented, so I figured I'd at least submit my changes Philip Jameson

2 3

[libvirt] XML for the "boot=on" option
by Shi Jin 20 Jan '10

20 Jan '10

Hi, there, In order to install windows 2008 using the virtio driver, I had to modify the KVM command to include the boot=on option like: -drive file=<path>/virtioWin08.raw,if=virtio,index=0,boot=on However, I haven't been able to find a corresponding libvirt XML element that can enable this "boot=on" option. Is there a way to do this? Thanks a lot. -- Shi Jin, PhD

2 1

[libvirt] [PATCH] Fix QEMU driver custom domain status XML extensions
by Daniel P. Berrange 20 Jan '10

20 Jan '10

Invoking the virConnectGetCapabilities() method causes the QEMU driver to rebuild its internal capabilities object. Unfortunately it was forgetting to register the custom domain status XML hooks again. To avoid this kind of error in the future, the code which builds capabilities is refactored into one single method, which can be called from all locations, ensuring reliable rebuilds. * src/qemu/qemu_driver.c: Fix rebuilding of capabilities XML and guarentee it is always consistent --- src/qemu/qemu_driver.c | 110 +++++++++++++++++++++++------------------------- 1 files changed, 53 insertions(+), 57 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d80774..9a3ddfb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -892,34 +892,6 @@ qemuReconnectDomains(struct qemud_driver *driver) static int -qemudSecurityCapsInit(virSecurityDriverPtr secdrv, - virCapsPtr caps) -{ - const char *doi, *model; - - doi = virSecurityDriverGetDOI(secdrv); - model = virSecurityDriverGetModel(secdrv); - - caps->host.secModel.model = strdup(model); - if (!caps->host.secModel.model) { - virReportOOMError(NULL); - return -1; - } - - caps->host.secModel.doi = strdup(doi); - if (!caps->host.secModel.doi) { - virReportOOMError(NULL); - return -1; - } - - VIR_DEBUG("Initialized caps for security driver \"%s\" with " - "DOI \"%s\"", model, doi); - - return 0; -} - - -static int qemudSecurityInit(struct qemud_driver *qemud_drv) { int ret; @@ -940,15 +912,52 @@ qemudSecurityInit(struct qemud_driver *qemud_drv) qemud_drv->securityDriver = security_drv; VIR_INFO("Initialized security driver %s", security_drv->name); - - /* - * Add security policy host caps now that the security driver is - * initialized. - */ - return qemudSecurityCapsInit(security_drv, qemud_drv->caps); + return 0; } +static virCapsPtr +qemuCreateCapabilities(virCapsPtr oldcaps, + virSecurityDriverPtr secDriver) +{ + virCapsPtr caps; + + /* Basic host arch / guest machine capabilities */ + if (!(caps = qemudCapsInit(oldcaps))) { + virReportOOMError(NULL); + return NULL; + } + + /* Domain XML parser hooks */ + caps->privateDataAllocFunc = qemuDomainObjPrivateAlloc; + caps->privateDataFreeFunc = qemuDomainObjPrivateFree; + caps->privateDataXMLFormat = qemuDomainObjPrivateXMLFormat; + caps->privateDataXMLParse = qemuDomainObjPrivateXMLParse; + + + /* Security driver data */ + if (secDriver) { + const char *doi, *model; + + doi = virSecurityDriverGetDOI(secDriver); + model = virSecurityDriverGetModel(secDriver); + + if (!(caps->host.secModel.model = strdup(model))) + goto no_memory; + if (!(caps->host.secModel.doi = strdup(doi))) + goto no_memory; + + VIR_DEBUG("Initialized caps for security driver \"%s\" with " + "DOI \"%s\"", model, doi); + } + + return caps; + +no_memory: + virReportOOMError(NULL); + virCapabilitiesFree(caps); + return NULL; +} /** * qemudStartup: @@ -1074,13 +1083,12 @@ qemudStartup(int privileged) { virStrerror(-rc, buf, sizeof(buf))); } - if ((qemu_driver->caps = qemudCapsInit(NULL)) == NULL) - goto out_of_memory; + if (qemudSecurityInit(qemu_driver) < 0) + goto error; - qemu_driver->caps->privateDataAllocFunc = qemuDomainObjPrivateAlloc; - qemu_driver->caps->privateDataFreeFunc = qemuDomainObjPrivateFree; - qemu_driver->caps->privateDataXMLFormat = qemuDomainObjPrivateXMLFormat; - qemu_driver->caps->privateDataXMLParse = qemuDomainObjPrivateXMLParse; + if ((qemu_driver->caps = qemuCreateCapabilities(NULL, + qemu_driver->securityDriver)) == NULL) + goto error; if ((qemu_driver->activePciHostdevs = pciDeviceListNew(NULL)) == NULL) goto error; @@ -1104,10 +1112,6 @@ qemudStartup(int privileged) { } } - if (qemudSecurityInit(qemu_driver) < 0) { - goto error; - } - /* If hugetlbfs is present, then we need to create a sub-directory within * it, since we can't assume the root mount point has permissions that * will let our spawned QEMU instances use it. @@ -3255,15 +3259,12 @@ static char *qemudGetCapabilities(virConnectPtr conn) { char *xml = NULL; qemuDriverLock(driver); - if ((caps = qemudCapsInit(qemu_driver->caps)) == NULL) - goto no_memory; - caps->privateDataAllocFunc = qemuDomainObjPrivateAlloc; - caps->privateDataFreeFunc = qemuDomainObjPrivateFree; - - if (qemu_driver->securityDriver && - qemudSecurityCapsInit(qemu_driver->securityDriver, caps) < 0) - goto no_memory; + if ((caps = qemuCreateCapabilities(qemu_driver->caps, + qemu_driver->securityDriver)) == NULL) { + virCapabilitiesFree(caps); + goto cleanup; + } virCapabilitiesFree(qemu_driver->caps); qemu_driver->caps = caps; @@ -3275,11 +3276,6 @@ cleanup: qemuDriverUnlock(driver); return xml; - -no_memory: - virCapabilitiesFree(caps); - virReportOOMError(conn); - goto cleanup; } -- 1.6.5.2

2 1

[libvirt] [PATCH] Document <cpu> elements in capabilities and domain XML
by Jiri Denemark 20 Jan '10

20 Jan '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/formatcaps.html.in | 13 +++++- docs/formatdomain.html.in | 93 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 3 deletions(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index 36718d9..525a331 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -21,6 +21,11 @@ BIOS you will see <features> <vmx/> </features> + <model>core2duo</model> + <topology sockets="1" cores="2" threads="1"/> + <feature name="lahf_lm"/> + <feature name='xtpr'/> + ... </cpu> </host> @@ -48,15 +53,17 @@ BIOS you will see <loader>/usr/lib/xen/boot/hvmloader</loader> </arch> <features> + <cpuselection/> </features> </guest> ... </capabilities></pre> The first block (in red) indicates the host hardware capabilities, currently it is limited to the CPU properties but other information may be available, -it shows the CPU architecture, and the features of the chip (the feature -block is similar to what you will find in a Xen fully virtualized domain -description). +it shows the CPU architecture, topology, model name, and additional features +which are not included in the model but the CPU provides them. Features of the +chip are shown within the feature block (the block is similar to what you will +find in a Xen fully virtualized domain description). The second block (in blue) indicates the paravirtualization support of the Xen support, you will see the os_type of xen to indicate a paravirtual kernel, then architecture information and potential features. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index af31699..5030b6c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -201,6 +201,99 @@ CPUs allocated for the guest OS.</dd> </dl> + <h3><a name="elementsCPU">CPU model and topology</a></h3> + + + Requirements for CPU model, its features and topology can be specified + using the following collection of elements. + <snap class="since">Since 0.7.5 + + + <pre> + ... + <cpu match='exact'> + <model>core2duo</model> + <topology sockets='1' cores='2' threads='1'/> + <feature policy='disable' name='lahf_lm'/> + </cpu> + ...</pre> + + + In case no restrictions need to be put on CPU model and its features, a + simpler <code>cpu</code> element can be used. + Since 0.7.6 + + + <pre> + ... + <cpu> + <topology sockets='1' cores='2' threads='1'/> + </cpu> + ...</pre> + + <dl> + <dt><code>cpu</code><dt> + <dd>The <code>cpu</code> element is the main container for describing + guest CPU requirements. Its <code>match</code> attribute specified how + strictly has the virtual CPU provided to the guest match these + requirements. Since 0.7.6 the + <code>match</code> attribute can be omitted if <code>topology</code> + is the only element within <code>cpu</code>. Possible values for the + <code>match</code> attribute are: + + <dl> + <dt><code>minimum</code></dt> + <dd>The specified CPU model and features describes the minimum + requested CPU.</dd> + <dt><code>exact</code></dt> + <dd>The virtual CPU provided to the guest will exactly match the + specification</dd> + <dt><code>strict</code></dt> + <dd>The guest will not be created unless the host CPU does exactly + match the specification.</dd> + </dl> + </dd> + + <dt><code>model</code></dt> + <dd>The content of the <code>model</code> element specifies CPU model + requested by the guest. The list of available CPU models and their + definition can be found in <code>cpu_map.xml</code> file installed + in libvirt's data directory.</dd> + + <dt><code>topology</code></dt> + <dd>The <code>topology</code> element specifies requested topology of + virtual CPU provided to the guest. Three non-zero values have to be + given for <code>sockets</code>, <code>cores</code>, and + <code>threads</code>: total number of CPU sockets, number of cores per + socket, and number of threads per core, respectively.</dd> + + <dt><code>feature</code></dt> + <dd>The <code>cpu</code> element can contain zero or more + <code>elements</code> used to fine-tune features provided by the + selected CPU model. The list of known feature names can be found in + the same file as CPU models. The meaning of each <code>feature</code> + element depends on its <code>policy</code> attribute, which has to be + set to one of the following values: + + <dl> + <dt><code>force</code></dt> + <dd>The virtual CPU will claim the feature is supported regardless + of it being supported by host CPU.</dd> + <dt><code>require</code></dt> + <dd>Guest creation will fail unless the feature is supported by host + CPU.</dd> + <dt><code>optional</code></dt> + <dd>The feature will be supported by virtual CPU if and only if it + is supported by host CPU.</dd> + <dt><code>disable</code></dt> + <dd>The feature will not be supported by virtual CPU.</dd> + <dt><code>forbid</code></dt> + <dd>Guest creation will fail if the feature is supported by host + CPU.</dd> + </dl> + </dd> + </dl> + <h3><a name="elementsLifecycle">Lifecycle control</a></h3> -- 1.6.6

2 2

[libvirt] Website contains outdated information about remote limitations
by Matthias Bolte 20 Jan '10

20 Jan '10

http://www.libvirt.org/remote.html#Remote_limitations says: Limitations * Remote storage: To be fully useful, particularly for creating new domains, it should be possible to enumerate and provision storage on the remote machine. This is currently in the design phase. * Migration: We expect libvirt will support migration, and obviously remote support is what makes migration worthwhile. This is also in the design phase. Issues to discuss include which path the migration data should follow (eg. client to client direct, or client to server to client) and security. IMHO this is outdated information, because libvirt supports both features now. So both should be removed from the website as they could misinform newbies. Matthias

3 4

[libvirt] [PATCH 0/4] Update interface xml to match netcf 0.1.5
by Laine Stump 20 Jan '10

20 Jan '10

The first two patches make minor additions to the parsing/formatting. The 3rd is a bit more intrusive, as it switches from using virInterfaceBareDef for subordinate interfaces to recursively using a full virInterfaceDef (but with guaranteed closure due to limiting the type of subordinate interface allowed based on parent interface). The final patch updates the RNG and test files accordingly.

4 18

[libvirt] hvm/x86_64 combination not allowed
by Steve Brown 20 Jan '10

20 Jan '10

I have a VM that I am able to run using qemu form a command prompt with no problems. I want to run it from within libvirt, so I converted my qemu command to XML using 'virsh domxml-from-native ...' My problem is that my libvirt does not seem to support the x86_64 architecture, so when I try to launch the VM, the kernel won't built since it was installed on x86_64. My os container is as follows (as imported by virsh): <os> <type arch='i686' machine='pc-0.11'>hvm</type> <boot dev='hd'/> </os> However, when I try to change it to this: <os> <type arch='x86_64'>hvm</type> <boot dev='hd'/> </os> I get the following message: error: internal error os type 'hvm' & arch 'x86_64' combination is not supported I've searched for a proper command line switch to build this option into libvirt, but I have not had any success. So how do I get libvirt to support the x86_64 arch? Thanks, Steve PS: $ sudo virsh capabilities <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> <migration_features> <live/> <uri_transports> <uri_transport>tcp</uri_transport> </uri_transports> </migration_features> </host> <guest> <os_type>hvm</os_type> <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu</emulator> <machine>pc-0.11</machine> <machine canonical='pc-0.11'>pc</machine> <machine>pc-0.10</machine> <machine>isapc</machine> <domain type='qemu'> </domain> </arch> <features> <pae/> <nonpae/> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> </capabilities>

4 7

[libvirt] [PATCH] logging: confirm that we want to ignore a write error
by Jim Meyering 20 Jan '10

20 Jan '10

Ignoring a write failure is a big deal, so when you do that deliberately, it's worth marking in such a way that code analyzers don't report a false positive. Until a year or so ago, people thought using (void) would be enough. But newer gcc warns in spite of that (for functions marked with the warn_unused_result attribute), so now we use the ignore_value function from gnulib. A coverity warning prompted the change below, but if we declare saferead with the warn_unused_result attribute, gcc would, too. >From 62d2c7f69608407afa9a4bf38f0d29ea3eec88f5 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 18 Jan 2010 11:51:01 +0100 Subject: [PATCH] logging: confirm that we want to ignore a write error * src/util/logging.c (virLogMessage): Include "ignore-value.h". Use it to ignore the return value of safewrite. Use STDERR_FILENO, rather than "2". * bootstrap (modules): Add ignore-value. * gnulib: Update to latest, for ignore-value that is now LGPLv2+. --- .gnulib | 2 +- bootstrap | 1 + src/util/logging.c | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index 4c52807..146d914 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 4c52807f41f238cf0e352317b2dc54f9ba0f0c4f +Subproject commit 146d9145073e62a2096a2d6b33f75e93908fedf3 diff --git a/bootstrap b/bootstrap index c07d851..aec5d05 100755 --- a/bootstrap +++ b/bootstrap @@ -76,6 +76,7 @@ getpass gettext gitlog-to-changelog gnumakefile +ignore-value inet_pton ioctl maintainer-makefile diff --git a/src/util/logging.c b/src/util/logging.c index 6bd8469..3b3c309 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -1,7 +1,7 @@ /* * logging.c: internal logging and debugging * - * Copyright (C) 2008 Red Hat, Inc. + * Copyright (C) 2008, 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 @@ -34,6 +34,7 @@ #include <syslog.h> #endif +#include "ignore-value.h" #include "logging.h" #include "memory.h" #include "util.h" @@ -579,7 +580,7 @@ void virLogMessage(const char *category, int priority, const char *funcname, msg, len, virLogOutputs[i].data); } if ((virLogNbOutputs == 0) && (flags != 1)) - safewrite(2, msg, len); + ignore_value (safewrite(STDERR_FILENO, msg, len)); virLogUnlock(); VIR_FREE(msg); -- 1.6.6.638.g2bc54

2 2

[libvirt] [PATCH v2 0/2] Block assignment of PCI devices below non-ACS capable switch
by Jiri Denemark 20 Jan '10

20 Jan '10

This is a patchset for blocking assignment of PCI devices below non-ACS capable switch. In case user still wants to assign such device even though it might not be safe, she can specify 'relaxed_acs_check = 1' in qemu.conf Special thanks to Chris L. who created a standalone program the PCI check. This code is a port of that check to libvirt. Changes in version 2: - permissive attribute for <hostdev> was removed - new 'relaxed_acs_check' config option in qemu.conf for relaxing the check Jiri Denemark (2): Tests for ACS in PCIe switches Use pciDeviceIsAssignable in qemu driver src/libvirt_private.syms | 1 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 ++ src/qemu/qemu_conf.c | 4 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_driver.c | 6 ++- src/qemu/test_libvirtd_qemu.aug | 6 ++- src/util/pci.c | 151 +++++++++++++++++++++++++++++++++++++++ src/util/pci.h | 4 + 9 files changed, 179 insertions(+), 2 deletions(-)

2 6

[libvirt] [PATCH] Remove superfluous new lines from messages
by Jiri Denemark 20 Jan '10

20 Jan '10

I noticed some debug messages are printed with an empty lines after them. This patch removes these empty lines from all invocations of the following macros: VIR_DEBUG VIR_DEBUG0 VIR_ERROR VIR_ERROR0 VIR_INFO VIR_WARN VIR_WARN0 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- daemon/libvirtd.c | 10 +++--- daemon/remote.c | 8 ++-- src/lxc/lxc_driver.c | 2 +- src/network/bridge_driver.c | 10 +++--- src/node_device/node_device_hal.c | 16 ++++---- src/node_device/node_device_linux_sysfs.c | 16 ++++---- src/node_device/node_device_udev.c | 54 ++++++++++++++-------------- src/qemu/qemu_driver.c | 36 +++++++++--------- src/qemu/qemu_monitor_text.c | 14 ++++---- src/secret/secret_driver.c | 2 +- src/util/pci.c | 2 +- src/xen/proxy_internal.c | 22 ++++++------ tools/console.c | 12 +++--- 13 files changed, 102 insertions(+), 102 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index c53ef0a..551c69c 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -600,7 +600,7 @@ remoteMakeSockets (int *fds, int max_fds, int *nfds_r, const char *node, const c int e = getaddrinfo (node, service, &hints, &ai); if (e != 0) { - VIR_ERROR(_("getaddrinfo: %s\n"), gai_strerror (e)); + VIR_ERROR(_("getaddrinfo: %s"), gai_strerror (e)); return -1; } @@ -2511,7 +2511,7 @@ checkType (virConfValuePtr p, const char *filename, (var_name) = strdup (p->str); \ if ((var_name) == NULL) { \ char ebuf[1024]; \ - VIR_ERROR(_("remoteReadConfigFile: %s\n"), \ + VIR_ERROR(_("remoteReadConfigFile: %s"), \ virStrerror(errno, ebuf, sizeof ebuf)); \ goto free_and_fail; \ } \ @@ -2554,7 +2554,7 @@ static int remoteConfigGetAuth(virConfPtr conf, const char *key, int *auth, cons *auth = REMOTE_AUTH_POLKIT; #endif } else { - VIR_ERROR(_("remoteReadConfigFile: %s: %s: unsupported auth %s\n"), + VIR_ERROR(_("remoteReadConfigFile: %s: %s: unsupported auth %s"), filename, key, p->str); return -1; } @@ -2839,13 +2839,13 @@ qemudSetupPrivs (void) if (__init_daemon_priv (PU_RESETGROUPS | PU_CLEARLIMITSET, SYSTEM_UID, SYSTEM_UID, PRIV_XVM_CONTROL, NULL)) { - VIR_ERROR0(_("additional privileges are required\n")); + VIR_ERROR0(_("additional privileges are required")); return -1; } if (priv_set (PRIV_OFF, PRIV_ALLSETS, PRIV_FILE_LINK_ANY, PRIV_PROC_INFO, PRIV_PROC_SESSION, PRIV_PROC_EXEC, PRIV_PROC_FORK, NULL)) { - VIR_ERROR0(_("failed to set reduced privileges\n")); + VIR_ERROR0(_("failed to set reduced privileges")); return -1; } diff --git a/daemon/remote.c b/daemon/remote.c index 0b30131..8f8adba 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -3375,7 +3375,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, goto authfail; } if (status != 0) { - VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %d\n"), + VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %d"), action, callerPid, callerUid, status); goto authfail; } @@ -3442,7 +3442,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, if (!(pkaction = polkit_action_new())) { char ebuf[1024]; - VIR_ERROR(_("Failed to create polkit action %s\n"), + VIR_ERROR(_("Failed to create polkit action %s"), virStrerror(errno, ebuf, sizeof ebuf)); polkit_caller_unref(pkcaller); goto authfail; @@ -3452,7 +3452,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, if (!(pkcontext = polkit_context_new()) || !polkit_context_init(pkcontext, &pkerr)) { char ebuf[1024]; - VIR_ERROR(_("Failed to create polkit context %s\n"), + VIR_ERROR(_("Failed to create polkit context %s"), (pkerr ? polkit_error_get_error_message(pkerr) : virStrerror(errno, ebuf, sizeof ebuf))); if (pkerr) @@ -3484,7 +3484,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, polkit_caller_unref(pkcaller); polkit_action_unref(pkaction); if (pkresult != POLKIT_RESULT_YES) { - VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %s\n"), + VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %s"), action, callerPid, callerUid, polkit_result_to_string_representation(pkresult)); goto authfail; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 86606c7..556359e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1603,7 +1603,7 @@ lxcAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaqu int ret = lxcVmStart(data->conn, data->driver, vm); if (ret < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to autostart VM '%s': %s\n"), + VIR_ERROR(_("Failed to autostart VM '%s': %s"), vm->def->name, err ? err->message : ""); } else { diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 69809b3..4385215 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -977,14 +977,14 @@ static int networkStartNetworkDaemon(virConnectPtr conn, err_delbr1: if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { char ebuf[1024]; - VIR_WARN(_("Failed to bring down bridge '%s' : %s\n"), + VIR_WARN(_("Failed to bring down bridge '%s' : %s"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } err_delbr: if ((err = brDeleteBridge(driver->brctl, network->def->bridge))) { char ebuf[1024]; - VIR_WARN(_("Failed to delete bridge '%s' : %s\n"), + VIR_WARN(_("Failed to delete bridge '%s' : %s"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } @@ -998,7 +998,7 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn, int err; char *stateFile; - VIR_INFO(_("Shutting down network '%s'\n"), network->def->name); + VIR_INFO(_("Shutting down network '%s'"), network->def->name); if (!virNetworkObjIsActive(network)) return 0; @@ -1017,12 +1017,12 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn, char ebuf[1024]; if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) { - VIR_WARN(_("Failed to bring down bridge '%s' : %s\n"), + VIR_WARN(_("Failed to bring down bridge '%s' : %s"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } if ((err = brDeleteBridge(driver->brctl, network->def->bridge))) { - VIR_WARN(_("Failed to delete bridge '%s' : %s\n"), + VIR_WARN(_("Failed to delete bridge '%s' : %s"), network->def->bridge, virStrerror(err, ebuf, sizeof ebuf)); } diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 7cb931e..02fcbf6 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -720,22 +720,22 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) dbus_error_init(&err); hal_ctx = libhal_ctx_new(); if (hal_ctx == NULL) { - VIR_ERROR0("libhal_ctx_new returned NULL\n"); + VIR_ERROR0("libhal_ctx_new returned NULL"); goto failure; } dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err); if (dbus_conn == NULL) { - VIR_ERROR0("dbus_bus_get failed\n"); + VIR_ERROR0("dbus_bus_get failed"); goto failure; } dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE); if (!libhal_ctx_set_dbus_connection(hal_ctx, dbus_conn)) { - VIR_ERROR0("libhal_ctx_set_dbus_connection failed\n"); + VIR_ERROR0("libhal_ctx_set_dbus_connection failed"); goto failure; } if (!libhal_ctx_init(hal_ctx, &err)) { - VIR_ERROR0("libhal_ctx_init failed, haldaemon is probably not running\n"); + VIR_ERROR0("libhal_ctx_init failed, haldaemon is probably not running"); /* We don't want to show a fatal error here, otherwise entire libvirtd shuts down when hald isn't running */ @@ -749,7 +749,7 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) remove_dbus_watch, toggle_dbus_watch, NULL, NULL)) { - VIR_ERROR0("dbus_connection_set_watch_functions failed\n"); + VIR_ERROR0("dbus_connection_set_watch_functions failed"); goto failure; } @@ -770,13 +770,13 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) !libhal_ctx_set_device_lost_capability(hal_ctx, device_cap_lost) || !libhal_ctx_set_device_property_modified(hal_ctx, device_prop_modified) || !libhal_device_property_watch_all(hal_ctx, &err)) { - VIR_ERROR0("setting up HAL callbacks failed\n"); + VIR_ERROR0("setting up HAL callbacks failed"); goto failure; } udi = libhal_get_all_devices(hal_ctx, &num_devs, &err); if (udi == NULL) { - VIR_ERROR0("libhal_get_all_devices failed\n"); + VIR_ERROR0("libhal_get_all_devices failed"); goto failure; } for (i = 0; i < num_devs; i++) { @@ -789,7 +789,7 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) failure: if (dbus_error_is_set(&err)) { - VIR_ERROR("%s: %s\n", err.name, err.message); + VIR_ERROR("%s: %s", err.name, err.message); dbus_error_free(&err); } virNodeDeviceObjListFree(&driverState->devs); diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index b1dff10..ff7aaf0 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -245,12 +245,12 @@ static int get_sriov_function(const char *device_link, char errbuf[64]; int ret = SRIOV_ERROR; - VIR_DEBUG("Attempting to resolve device path from device link '%s'\n", + VIR_DEBUG("Attempting to resolve device path from device link '%s'", device_link); if (!virFileExists(device_link)) { - VIR_DEBUG("SR IOV function link '%s' does not exist\n", device_link); + VIR_DEBUG("SR IOV function link '%s' does not exist", device_link); /* Not an SR IOV device, not an error, either. */ ret = SRIOV_NOT_FOUND; @@ -261,24 +261,24 @@ static int get_sriov_function(const char *device_link, device_path = realpath(device_link, device_path); if (device_path == NULL) { memset(errbuf, '\0', sizeof(errbuf)); - VIR_ERROR("Failed to resolve device link '%s': '%s'\n", device_link, + VIR_ERROR("Failed to resolve device link '%s': '%s'", device_link, virStrerror(errno, errbuf, sizeof(errbuf))); goto out; } - VIR_DEBUG("SR IOV device path is '%s'\n", device_path); + VIR_DEBUG("SR IOV device path is '%s'", device_path); config_address = basename(device_path); if (VIR_ALLOC(*bdf) != 0) { - VIR_ERROR0("Failed to allocate memory for PCI device name\n"); + VIR_ERROR0("Failed to allocate memory for PCI device name"); goto out; } if (parse_pci_config_address(config_address, *bdf) != 0) { - VIR_ERROR("Failed to parse PCI config address '%s'\n", config_address); + VIR_ERROR("Failed to parse PCI config address '%s'", config_address); goto out; } - VIR_DEBUG("SR IOV function %.4x:%.2x:%.2x.%.1x/>\n", + VIR_DEBUG("SR IOV function %.4x:%.2x:%.2x.%.1x", (*bdf)->domain, (*bdf)->bus, (*bdf)->slot, @@ -341,7 +341,7 @@ int get_virtual_functions_linux(const char *sysfs_path, goto out; } - VIR_DEBUG("Number of virtual functions: %d\n", *num_funcs); + VIR_DEBUG("Number of virtual functions: %d", *num_funcs); if (VIR_REALLOC_N(d->pci_dev.virtual_functions, (*num_funcs) + 1) != 0) { virReportOOMError(NULL); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 7a9c1e5..d0ba88e 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -52,9 +52,9 @@ static int udevStrToLong_ull(char const *s, ret = virStrToLong_ull(s, end_ptr, base, result); if (ret != 0) { - VIR_ERROR("Failed to convert '%s' to unsigned long long\n", s); + VIR_ERROR("Failed to convert '%s' to unsigned long long", s); } else { - VIR_DEBUG("Converted '%s' to unsigned long %llu\n", s, *result); + VIR_DEBUG("Converted '%s' to unsigned long %llu", s, *result); } return ret; @@ -70,9 +70,9 @@ static int udevStrToLong_ui(char const *s, ret = virStrToLong_ui(s, end_ptr, base, result); if (ret != 0) { - VIR_ERROR("Failed to convert '%s' to unsigned int\n", s); + VIR_ERROR("Failed to convert '%s' to unsigned int", s); } else { - VIR_DEBUG("Converted '%s' to unsigned int %u\n", s, *result); + VIR_DEBUG("Converted '%s' to unsigned int %u", s, *result); } return ret; @@ -87,9 +87,9 @@ static int udevStrToLong_i(char const *s, ret = virStrToLong_i(s, end_ptr, base, result); if (ret != 0) { - VIR_ERROR("Failed to convert '%s' to int\n", s); + VIR_ERROR("Failed to convert '%s' to int", s); } else { - VIR_DEBUG("Converted '%s' to int %u\n", s, *result); + VIR_DEBUG("Converted '%s' to int %u", s, *result); } return ret; @@ -363,7 +363,7 @@ static int udevTranslatePCIIds(unsigned int vendor, const char *vendor_name = NULL, *device_name = NULL; if (pci_system_init() != 0) { - VIR_ERROR0("Failed to initialize libpciaccess\n"); + VIR_ERROR0("Failed to initialize libpciaccess"); goto out; } @@ -734,7 +734,7 @@ static int udevGetSCSIType(unsigned int type, char **typestring) ret = -1; virReportOOMError(NULL); } else { - VIR_ERROR("Failed to find SCSI device type %d\n", type); + VIR_ERROR("Failed to find SCSI device type %d", type); } } @@ -799,7 +799,7 @@ static int udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, out: if (ret != 0) { - VIR_ERROR("Failed to process SCSI device with sysfs path '%s'\n", + VIR_ERROR("Failed to process SCSI device with sysfs path '%s'", def->sysfs_path); } return ret; @@ -957,7 +957,7 @@ static int udevProcessStorage(struct udev_device *device, devnode = udev_device_get_devnode(device); if(!devnode) { - VIR_DEBUG("No devnode for '%s'\n", udev_device_get_devpath(device)); + VIR_DEBUG("No devnode for '%s'", udev_device_get_devpath(device)); goto out; } data->storage.block = strdup(devnode); @@ -1007,7 +1007,7 @@ static int udevProcessStorage(struct udev_device *device, } else if (STREQ(def->caps->data.storage.drive_type, "disk")) { ret = udevProcessDisk(device, def); } else { - VIR_INFO("Unsupported storage type '%s'\n", + VIR_INFO("Unsupported storage type '%s'", def->caps->data.storage.drive_type); goto out; } @@ -1121,7 +1121,7 @@ static int udevGetDeviceDetails(struct udev_device *device, ret = udevProcessStorage(device, def); break; default: - VIR_ERROR("Unknown device type %d\n", def->caps->type); + VIR_ERROR("Unknown device type %d", def->caps->type); ret = -1; break; } @@ -1139,11 +1139,11 @@ static int udevRemoveOneDevice(struct udev_device *device) name = udev_device_get_syspath(device); dev = virNodeDeviceFindBySysfsPath(&driverState->devs, name); if (dev != NULL) { - VIR_DEBUG("Removing device '%s' with sysfs path '%s'\n", + VIR_DEBUG("Removing device '%s' with sysfs path '%s'", dev->def->name, name); virNodeDeviceObjRemove(&driverState->devs, dev); } else { - VIR_INFO("Failed to find device to remove that has udev name '%s'\n", + VIR_INFO("Failed to find device to remove that has udev name '%s'", name); ret = -1; } @@ -1162,14 +1162,14 @@ static int udevSetParent(struct udev_device *device, parent_device = udev_device_get_parent(device); if (parent_device == NULL) { - VIR_INFO("Could not find udev parent for device with sysfs path '%s'\n", + VIR_INFO("Could not find udev parent for device with sysfs path '%s'", udev_device_get_syspath(device)); goto out; } parent_sysfs_path = udev_device_get_syspath(parent_device); if (parent_sysfs_path == NULL) { - VIR_INFO("Could not get syspath for parent of '%s'\n", + VIR_INFO("Could not get syspath for parent of '%s'", udev_device_get_syspath(device)); goto out; } @@ -1237,7 +1237,7 @@ static int udevAddOneDevice(struct udev_device *device) dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); if (dev == NULL) { - VIR_ERROR("Failed to create device for '%s'\n", def->name); + VIR_ERROR("Failed to create device for '%s'", def->name); virNodeDeviceDefFree(def); goto out; } @@ -1263,7 +1263,7 @@ static int udevProcessDeviceListEntry(struct udev *udev, device = udev_device_new_from_syspath(udev, name); if (device != NULL) { if (udevAddOneDevice(device) != 0) { - VIR_INFO("Failed to create node device for udev device '%s'\n", + VIR_INFO("Failed to create node device for udev device '%s'", name); } udev_device_unref(device); @@ -1285,7 +1285,7 @@ static int udevEnumerateDevices(struct udev *udev) ret = udev_enumerate_scan_devices(udev_enumerate); if (0 != ret) { - VIR_ERROR("udev scan devices returned %d\n", ret); + VIR_ERROR("udev scan devices returned %d", ret); goto out; } @@ -1355,12 +1355,12 @@ static void udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, device = udev_monitor_receive_device(udev_monitor); if (device == NULL) { - VIR_ERROR0("udev_monitor_receive_device returned NULL\n"); + VIR_ERROR0("udev_monitor_receive_device returned NULL"); goto out; } action = udev_device_get_action(device); - VIR_DEBUG("udev action: '%s'\n", action); + VIR_DEBUG("udev action: '%s'", action); if (STREQ(action, "add") || STREQ(action, "change")) { udevAddOneDevice(device); @@ -1406,11 +1406,11 @@ static int udevSetupSystemDev(void) udev = udev_monitor_get_udev(DRV_STATE_UDEV_MONITOR(driverState)); device = udev_device_new_from_syspath(udev, DMI_DEVPATH); if (device == NULL) { - VIR_ERROR("Failed to get udev device for syspath '%s'\n", DMI_DEVPATH); + VIR_ERROR("Failed to get udev device for syspath '%s'", DMI_DEVPATH); device = udev_device_new_from_syspath(udev, DMI_DEVPATH_FALLBACK); if (device == NULL) { - VIR_ERROR("Failed to get udev device for syspath '%s'\n", DMI_DEVPATH_FALLBACK); + VIR_ERROR("Failed to get udev device for syspath '%s'", DMI_DEVPATH_FALLBACK); goto out; } } @@ -1472,7 +1472,7 @@ static int udevSetupSystemDev(void) dev = virNodeDeviceAssignDef(NULL, &driverState->devs, def); if (dev == NULL) { - VIR_ERROR("Failed to create device for '%s'\n", def->name); + VIR_ERROR("Failed to create device for '%s'", def->name); virNodeDeviceDefFree(def); goto out; } @@ -1498,7 +1498,7 @@ static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) } if (virMutexInit(&driverState->lock) < 0) { - VIR_ERROR0("Failed to initialize mutex for driverState\n"); + VIR_ERROR0("Failed to initialize mutex for driverState"); VIR_FREE(driverState); ret = -1; goto out; @@ -1517,7 +1517,7 @@ static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); if (udev_monitor == NULL) { - VIR_ERROR0("udev_monitor_new_from_netlink returned NULL\n"); + VIR_ERROR0("udev_monitor_new_from_netlink returned NULL"); ret = -1; goto out; } @@ -1612,7 +1612,7 @@ static virStateDriver udevStateDriver = { int udevNodeRegister(void) { - VIR_DEBUG0("Registering udev node device backend\n"); + VIR_DEBUG0("Registering udev node device backend"); registerCommonNodeFuncs(&udevDeviceMonitor); if (virRegisterDeviceMonitor(&udevDeviceMonitor) < 0) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8817565..c7732f7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -579,7 +579,7 @@ qemuAutostartDomain(void *payload, const char *name ATTRIBUTE_UNUSED, void *opaq ret = qemudStartVMDaemon(data->conn, data->driver, vm, NULL, -1); if (ret < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to autostart VM '%s': %s\n"), + VIR_ERROR(_("Failed to autostart VM '%s': %s"), vm->def->name, err ? err->message : ""); } else { @@ -819,7 +819,7 @@ qemuConnectMonitor(virDomainObjPtr vm) priv->monConfig, priv->monJSON, &monitorCallbacks)) == NULL) { - VIR_ERROR(_("Failed to connect monitor for %s\n"), vm->def->name); + VIR_ERROR(_("Failed to connect monitor for %s"), vm->def->name); return -1; } @@ -1028,19 +1028,19 @@ qemudStartup(int privileged) { if (virFileMakePath(qemu_driver->stateDir) < 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create state dir '%s': %s\n"), + VIR_ERROR(_("Failed to create state dir '%s': %s"), qemu_driver->stateDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } if (virFileMakePath(qemu_driver->libDir) < 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create lib dir '%s': %s\n"), + VIR_ERROR(_("Failed to create lib dir '%s': %s"), qemu_driver->libDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } if (virFileMakePath(qemu_driver->cacheDir) < 0) { char ebuf[1024]; - VIR_ERROR(_("Failed to create cache dir '%s': %s\n"), + VIR_ERROR(_("Failed to create cache dir '%s': %s"), qemu_driver->cacheDir, virStrerror(errno, ebuf, sizeof ebuf)); goto error; } @@ -1520,7 +1520,7 @@ qemudWaitForMonitor(virConnectPtr conn, "console", 3); if (close(logfd) < 0) { char ebuf[4096]; - VIR_WARN(_("Unable to close logfile: %s\n"), + VIR_WARN(_("Unable to close logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); } @@ -1865,7 +1865,7 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, if (!(pcidevs = qemuGetPciHostDeviceList(conn, def))) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to allocate pciDeviceList: %s\n"), + VIR_ERROR(_("Failed to allocate pciDeviceList: %s"), err ? err->message : ""); virResetError(err); return; @@ -1884,7 +1884,7 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, if (pciResetDevice(conn, dev, driver->activePciHostdevs) < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to reset PCI device: %s\n"), + VIR_ERROR(_("Failed to reset PCI device: %s"), err ? err->message : ""); virResetError(err); } @@ -1895,7 +1895,7 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, if (pciDeviceGetManaged(dev) && pciReAttachDevice(NULL, dev) < 0) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Failed to re-attach PCI device: %s\n"), + VIR_ERROR(_("Failed to re-attach PCI device: %s"), err ? err->message : ""); virResetError(err); } @@ -2475,29 +2475,29 @@ static int qemudStartVMDaemon(virConnectPtr conn, tmp = progenv; while (*tmp) { if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) - VIR_WARN(_("Unable to write envv to logfile: %s\n"), + VIR_WARN(_("Unable to write envv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); if (safewrite(logfile, " ", 1) < 0) - VIR_WARN(_("Unable to write envv to logfile: %s\n"), + VIR_WARN(_("Unable to write envv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } tmp = argv; while (*tmp) { if (safewrite(logfile, *tmp, strlen(*tmp)) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s\n"), + VIR_WARN(_("Unable to write argv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); if (safewrite(logfile, " ", 1) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s\n"), + VIR_WARN(_("Unable to write argv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); tmp++; } if (safewrite(logfile, "\n", 1) < 0) - VIR_WARN(_("Unable to write argv to logfile: %s\n"), + VIR_WARN(_("Unable to write argv to logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); if ((pos = lseek(logfile, 0, SEEK_END)) < 0) - VIR_WARN(_("Unable to seek to end of logfile: %s\n"), + VIR_WARN(_("Unable to seek to end of logfile: %s"), virStrerror(errno, ebuf, sizeof ebuf)); for (i = 0 ; i < ntapfds ; i++) @@ -5256,7 +5256,7 @@ cleanup: try_remove: if (!net->hostnet_name || net->vlan == 0) - VIR_WARN0(_("Unable to remove network backend\n")); + VIR_WARN0(_("Unable to remove network backend")); else { qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorRemoveHostNetwork(priv->mon, net->vlan, net->hostnet_name) < 0) @@ -5270,7 +5270,7 @@ try_tapfd_close: if (tapfd_name) { qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuMonitorCloseFileHandle(priv->mon, tapfd_name) < 0) - VIR_WARN(_("Failed to close tapfd with '%s'\n"), tapfd_name); + VIR_WARN(_("Failed to close tapfd with '%s'"), tapfd_name); qemuDomainObjExitMonitorWithDriver(driver, vm); } @@ -7639,7 +7639,7 @@ endjob: * overwrite the previous error, though, so we just throw something * to the logs and hope for the best */ - VIR_ERROR(_("Failed to resume guest %s after failure\n"), + VIR_ERROR(_("Failed to resume guest %s after failure"), vm->def->name); } qemuDomainObjExitMonitorWithDriver(driver, vm); diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 5b9ced2..aae026e 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1301,42 +1301,42 @@ qemuMonitorTextParsePciAddReply(qemuMonitorPtr mon ATTRIBUTE_UNUSED, s += strlen("domain "); if (virStrToLong_ui(s, &e, 10, domain) == -1) { - VIR_WARN(_("Unable to parse domain number '%s'\n"), s); + VIR_WARN(_("Unable to parse domain number '%s'"), s); return -1; } if (!STRPREFIX(e, ", ")) { - VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'\n"), s); + VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'"), s); return -1; } s = e + 2; } if (!STRPREFIX(s, "bus ")) { - VIR_WARN(_("Expected 'bus ' parsing pci_add reply '%s'\n"), s); + VIR_WARN(_("Expected 'bus ' parsing pci_add reply '%s'"), s); return -1; } s += strlen("bus "); if (virStrToLong_ui(s, &e, 10, bus) == -1) { - VIR_WARN(_("Unable to parse bus number '%s'\n"), s); + VIR_WARN(_("Unable to parse bus number '%s'"), s); return -1; } if (!STRPREFIX(e, ", ")) { - VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'\n"), s); + VIR_WARN(_("Expected ', ' parsing pci_add reply '%s'"), s); return -1; } s = e + 2; if (!STRPREFIX(s, "slot ")) { - VIR_WARN(_("Expected 'slot ' parsing pci_add reply '%s'\n"), s); + VIR_WARN(_("Expected 'slot ' parsing pci_add reply '%s'"), s); return -1; } s += strlen("slot "); if (virStrToLong_ui(s, &e, 10, slot) == -1) { - VIR_WARN(_("Unable to parse slot number '%s'\n"), s); + VIR_WARN(_("Unable to parse slot number '%s'"), s); return -1; } diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 1eef468..4478296 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -498,7 +498,7 @@ loadSecrets(virConnectPtr conn, virSecretDriverStatePtr driver, if (secret == NULL) { virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Error reading secret: %s\n"), + VIR_ERROR(_("Error reading secret: %s"), err != NULL ? err->message: ""); virResetError(err); continue; diff --git a/src/util/pci.c b/src/util/pci.c index 1e003c2..109d435 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -440,7 +440,7 @@ pciIsParent(pciDevice *dev, pciDevice *check, void *data ATTRIBUTE_UNUSED) secondary = pciRead8(check, PCI_SECONDARY_BUS); subordinate = pciRead8(check, PCI_SUBORDINATE_BUS); - VIR_DEBUG("%s %s: found parent device %s\n", dev->id, dev->name, check->name); + VIR_DEBUG("%s %s: found parent device %s", dev->id, dev->name, check->name); /* No, it's superman! */ return (dev->bus >= secondary && dev->bus <= subordinate); diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c index 73a0469..bde3eda 100644 --- a/src/xen/proxy_internal.c +++ b/src/xen/proxy_internal.c @@ -146,11 +146,11 @@ virProxyForkServer(void) const char *proxyarg[2]; if (!proxyPath) { - VIR_WARN0("failed to find libvirt_proxy\n"); + VIR_WARN0("failed to find libvirt_proxy"); return(-1); } - VIR_DEBUG("Asking to launch %s\n", proxyPath); + VIR_DEBUG("Asking to launch %s", proxyPath); proxyarg[0] = proxyPath; proxyarg[1] = NULL; @@ -158,7 +158,7 @@ virProxyForkServer(void) if (virExecDaemonize(NULL, proxyarg, NULL, NULL, &pid, -1, NULL, NULL, 0, NULL, NULL, NULL) < 0) - VIR_ERROR0("Failed to fork libvirt_proxy\n"); + VIR_ERROR0("Failed to fork libvirt_proxy"); return (0); } @@ -239,9 +239,9 @@ virProxyCloseSocket(xenUnifiedPrivatePtr priv) { ret = close(priv->proxy); if (ret != 0) - VIR_WARN(_("Failed to close socket %d\n"), priv->proxy); + VIR_WARN(_("Failed to close socket %d"), priv->proxy); else - VIR_DEBUG("Closed socket %d\n", priv->proxy); + VIR_DEBUG("Closed socket %d", priv->proxy); priv->proxy = -1; return(ret); } @@ -267,14 +267,14 @@ retry: ret = read(fd, buffer, len); if (ret < 0) { if (errno == EINTR) { - VIR_DEBUG("read socket %d interrupted\n", fd); + VIR_DEBUG("read socket %d interrupted", fd); goto retry; } - VIR_WARN("Failed to read socket %d\n", fd); + VIR_WARN("Failed to read socket %d", fd); return(-1); } - VIR_DEBUG("read %d bytes from socket %d\n", + VIR_DEBUG("read %d bytes from socket %d", ret, fd); return(ret); } @@ -296,10 +296,10 @@ virProxyWriteClientSocket(int fd, const char *data, int len) { ret = safewrite(fd, data, len); if (ret < 0) { - VIR_WARN(_("Failed to write to socket %d\n"), fd); + VIR_WARN(_("Failed to write to socket %d"), fd); return(-1); } - VIR_DEBUG("wrote %d bytes to socket %d\n", + VIR_DEBUG("wrote %d bytes to socket %d", len, fd); return(0); @@ -451,7 +451,7 @@ retry: goto error; } if (res->serial != serial) { - VIR_WARN(_("got asynchronous packet number %d\n"), res->serial); + VIR_WARN(_("got asynchronous packet number %d"), res->serial); goto retry; } diff --git a/tools/console.c b/tools/console.c index 4a1a80b..3bb97ec 100644 --- a/tools/console.c +++ b/tools/console.c @@ -73,7 +73,7 @@ int vshRunConsole(const char *tty) { /* We do not want this to become the controlling TTY */ if ((ttyfd = open(tty, O_NOCTTY | O_RDWR)) < 0) { - VIR_ERROR(_("unable to open tty %s: %s\n"), + VIR_ERROR(_("unable to open tty %s: %s"), tty, strerror(errno)); return -1; } @@ -84,7 +84,7 @@ int vshRunConsole(const char *tty) { also ensure Ctrl-C, etc is blocked, and misc other bits */ if (tcgetattr(STDIN_FILENO, &ttyattr) < 0) { - VIR_ERROR(_("unable to get tty attributes: %s\n"), + VIR_ERROR(_("unable to get tty attributes: %s"), strerror(errno)); goto closetty; } @@ -93,7 +93,7 @@ int vshRunConsole(const char *tty) { cfmakeraw(&rawattr); if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) { - VIR_ERROR(_("unable to set tty attributes: %s\n"), + VIR_ERROR(_("unable to set tty attributes: %s"), strerror(errno)); goto closetty; } @@ -128,7 +128,7 @@ int vshRunConsole(const char *tty) { if (errno == EINTR || errno == EAGAIN) continue; - VIR_ERROR(_("failure waiting for I/O: %s\n"), strerror(errno)); + VIR_ERROR(_("failure waiting for I/O: %s"), strerror(errno)); goto cleanup; } @@ -142,7 +142,7 @@ int vshRunConsole(const char *tty) { int got, sent = 0, destfd; if ((got = read(fds[i].fd, buf, sizeof(buf))) < 0) { - VIR_ERROR(_("failure reading input: %s\n"), + VIR_ERROR(_("failure reading input: %s"), strerror(errno)); goto cleanup; } @@ -164,7 +164,7 @@ int vshRunConsole(const char *tty) { int done; if ((done = safewrite(destfd, buf + sent, got - sent)) <= 0) { - VIR_ERROR(_("failure writing output: %s\n"), + VIR_ERROR(_("failure writing output: %s"), strerror(errno)); goto cleanup; } -- 1.6.6

5 8

[libvirt] [PATCH] Make all bitfields unsigned ints to avoid unexpected values in casts
by Daniel P. Berrange 19 Jan '10

19 Jan '10

The 'int virInterfaceIsActive()' method was directly returning the value of the 'int active:1' bitfield in virIntefaceDefPtr. A bitfield with a signed integer, will hold the values 0 and -1, not 0 and +1 as might be expected. This meant that virInterfaceIsActive() was always returning -1 when the interface was active, not +1 & thus all callers thought an error had occurred. To protect against this kind of mistake again, change all bitfields to be unsigned ints * daemon/libvirtd.h, src/conf/domain_conf.h, src/conf/interface_conf.h, src/conf/network_conf.h: Change bitfields to unsigned int. --- daemon/libvirtd.h | 14 +++++++------- src/conf/domain_conf.h | 14 +++++++------- src/conf/interface_conf.h | 2 +- src/conf/network_conf.h | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index 2f647f3..a7591fc 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -175,9 +175,9 @@ struct qemud_client { int fd; int watch; - int readonly:1; - int closing:1; - int domain_events_registered:1; + unsigned int readonly :1; + unsigned int closing :1; + unsigned int domain_events_registered :1; struct sockaddr_storage addr; socklen_t addrlen; @@ -185,7 +185,7 @@ struct qemud_client { int type; /* qemud_sock_type */ gnutls_session_t tlssession; int auth; - int handshake : 1; /* If we're in progress for TLS handshake */ + unsigned int handshake :1; /* If we're in progress for TLS handshake */ #if HAVE_SASL sasl_conn_t *saslconn; int saslSSF; @@ -244,9 +244,9 @@ struct qemud_socket { struct qemud_worker { pthread_t thread; - int hasThread :1; - int processingCall :1; - int quitRequest : 1; + unsigned int hasThread :1; + unsigned int processingCall :1; + unsigned int quitRequest :1; /* back-pointer to our server */ struct qemud_server *server; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1413273..7be090d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -400,8 +400,8 @@ enum virDomainVideoType { typedef struct _virDomainVideoAccelDef virDomainVideoAccelDef; typedef virDomainVideoAccelDef *virDomainVideoAccelDefPtr; struct _virDomainVideoAccelDef { - int support3d : 1; - int support2d : 1; + unsigned int support3d :1; + unsigned int support2d :1; }; @@ -432,7 +432,7 @@ struct _virDomainGraphicsDef { union { struct { int port; - int autoport : 1; + unsigned int autoport :1; char *listenAddr; char *keymap; char *passwd; @@ -445,13 +445,13 @@ struct _virDomainGraphicsDef { struct { int port; char *listenAddr; - int autoport : 1; - int replaceUser : 1; - int multiUser : 1; + unsigned int autoport :1; + unsigned int replaceUser :1; + unsigned int multiUser :1; } rdp; struct { char *display; - int fullscreen : 1; + unsigned int fullscreen :1; } desktop; } data; }; diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index 2683eee..5b201d3 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -170,7 +170,7 @@ typedef virInterfaceObj *virInterfaceObjPtr; struct _virInterfaceObj { virMutex lock; - int active:1; /* 1 if interface is active (up) */ + unsigned int active:1; /* 1 if interface is active (up) */ virInterfaceDefPtr def; /* The interface definition */ }; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 0214d1a..9e50659 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -65,7 +65,7 @@ struct _virNetworkDef { char *bridge; /* Name of bridge device */ char *domain; unsigned long delay; /* Bridge forward delay (ms) */ - int stp : 1; /* Spanning tree protocol */ + unsigned int stp :1; /* Spanning tree protocol */ int forwardType; /* One of virNetworkForwardType constants */ char *forwardDev; /* Destination device for forwarding */ -- 1.6.5.2

2 1

[libvirt] [PATCH] Take disabled/forced CPU features into account
by Jiri Denemark 19 Jan '10

19 Jan '10

When comparing x86 CPUs, features with 'disabled' policy were mistakenly required to be supported by the host CPU. Likewise, features with 'force' policy which were supported by host CPU would make CPUs incompatible if 'strict' match was used by guest CPU. This patch fixes both issues. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 50c03ad..298b632 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -782,11 +782,14 @@ x86Compute(virCPUDefPtr host, if (!(cpu_forbid = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_FORBID))) goto error; + x86ModelSubtract(cpu_require, cpu_disable); + if ((diff = x86ModelCopy(host_model)) == NULL) goto no_memory; x86ModelSubtract(diff, cpu_require); x86ModelSubtract(diff, cpu_optional); + x86ModelSubtract(diff, cpu_force); for (i = 0; i < cpu_forbid->ncpuid; i++) { const struct cpuX86cpuid *cpuid1; -- 1.6.6

3 3

[libvirt] [PATCH] Add debug messages for CPU incompatibility
by Jiri Denemark 19 Jan '10

19 Jan '10

When comparing incompatible CPUs, the reason for this incompatibility is logged as a debug message. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 7c50261..50c03ad 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -755,8 +755,10 @@ x86Compute(virCPUDefPtr host, } } - if (!found) + if (!found) { + VIR_DEBUG("CPU arch %s does not match host arch", cpu->arch); return VIR_CPU_COMPARE_INCOMPATIBLE; + } } if ((map = x86LoadMap()) == NULL) @@ -796,6 +798,8 @@ x86Compute(virCPUDefPtr host, cpuid1->function); if (cpuid2 != NULL && x86cpuidMatchAny(cpuid2, cpuid1)) { + VIR_DEBUG("Host CPU provides forbidden features in CPUID function 0x%x", + cpuid1->function); ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto out; } @@ -803,6 +807,7 @@ x86Compute(virCPUDefPtr host, result = x86ModelCompare(host_model, cpu_require); if (result == SUBSET || result == UNRELATED) { + VIR_DEBUG0("Host CPU does not provide all required features"); ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto out; } @@ -819,6 +824,7 @@ x86Compute(virCPUDefPtr host, if (ret == VIR_CPU_COMPARE_SUPERSET && cpu->type == VIR_CPU_TYPE_GUEST && cpu->match == VIR_CPU_MATCH_STRICT) { + VIR_DEBUG0("Host CPU does not strictly match guest CPU"); ret = VIR_CPU_COMPARE_INCOMPATIBLE; goto out; } -- 1.6.6

3 3

[libvirt] [PATCH] Allow for CPU topology specification without model
by Jiri Denemark 19 Jan '10

19 Jan '10

Currently CPU topology may only be specified together with CPU model: <cpu match='exact'> <model>name</model> <topology sockets='1' cores='2' threads='3'/> </cpu> This patch allows for CPU topology specification without the need for also specifying CPU model: <cpu> <topology sockets='1' cores='2' threads='3'/> </cpu> 'match' attribute and 'model' element are made optional with the restriction that 'match' attribute has to be set when 'model' is present. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/schemas/domain.rng | 24 ++++++++++++-------- src/conf/cpu_conf.c | 55 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 52 insertions(+), 27 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 566b117..137bbc6 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1242,17 +1242,21 @@ --> <define name="cpu"> <element name="cpu"> - <attribute name="match"> - <choice> - <value>minimum</value> - <value>exact</value> - <value>strict</value> - </choice> - </attribute> + <optional> + <attribute name="match"> + <choice> + <value>minimum</value> + <value>exact</value> + <value>strict</value> + </choice> + </attribute> + </optional> <interleave> - <element name="model"> - <text/> - </element> + <optional> + <element name="model"> + <text/> + </element> + </optional> <optional> <element name="topology"> <attribute name="sockets"> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index bbe2cc2..e7924c1 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -1,7 +1,7 @@ /* * cpu_conf.h: CPU XML handling * - * 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 @@ -76,7 +76,6 @@ virCPUDefParseXML(virConnectPtr conn, { virCPUDefPtr def; xmlNodePtr *nodes = NULL; - char *match; int n; unsigned int i; @@ -85,18 +84,33 @@ virCPUDefParseXML(virConnectPtr conn, return NULL; } - match = virXMLPropString(node, "match"); - - if (mode == VIR_CPU_TYPE_AUTO) - def->type = (match == NULL) ? VIR_CPU_TYPE_HOST : VIR_CPU_TYPE_GUEST; - else + if (mode == VIR_CPU_TYPE_AUTO) { + if (virXPathBoolean(conn, "boolean(./arch)", ctxt)) + def->type = VIR_CPU_TYPE_HOST; + else + def->type = VIR_CPU_TYPE_GUEST; + } else def->type = mode; if (def->type == VIR_CPU_TYPE_GUEST) { - if ((def->match = virCPUMatchTypeFromString(match)) < 0) { - virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("Invalid match attribute for CPU specification")); - goto error; + char *match = virXMLPropString(node, "match"); + + if (!match) { + if (virXPathBoolean(conn, "boolean(./model)", ctxt)) { + virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Missing match attribute for CPU specification")); + goto error; + } + def->match = -1; + } else { + def->match = virCPUMatchTypeFromString(match); + VIR_FREE(match); + + if (def->match < 0) { + virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Invalid match attribute for CPU specification")); + goto error; + } } } @@ -109,7 +123,8 @@ virCPUDefParseXML(virConnectPtr conn, } } - if (!(def->model = virXPathString(conn, "string(./model[1])", ctxt))) { + if (!(def->model = virXPathString(conn, "string(./model[1])", ctxt)) && + def->type == VIR_CPU_TYPE_HOST) { virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Missing CPU model name")); goto error; @@ -158,6 +173,12 @@ virCPUDefParseXML(virConnectPtr conn, goto error; if (n > 0) { + if (!def->model) { + virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Non-empty feature list specified without CPU model")); + goto error; + } + if (VIR_ALLOC_N(def->features, n) < 0) goto no_memory; def->nfeatures = n; @@ -206,7 +227,6 @@ virCPUDefParseXML(virConnectPtr conn, } cleanup: - VIR_FREE(match); VIR_FREE(nodes); return def; @@ -263,14 +283,14 @@ virCPUDefFormatBuf(virConnectPtr conn, if (indent == NULL) indent = ""; - if (!def->model) { + if (!def->model && def->nfeatures) { virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("Missing CPU model")); + "%s", _("Non-empty feature list specified without CPU model")); return -1; } if (!(flags & VIR_CPU_FORMAT_EMBEDED)) { - if (def->type == VIR_CPU_TYPE_GUEST) { + if (def->type == VIR_CPU_TYPE_GUEST && def->model) { const char *match; if (!(match = virCPUMatchTypeToString(def->match))) { virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, @@ -287,7 +307,8 @@ virCPUDefFormatBuf(virConnectPtr conn, virBufferVSprintf(buf, "%s <arch>%s</arch>\n", indent, def->arch); } - virBufferVSprintf(buf, "%s <model>%s</model>\n", indent, def->model); + if (def->model) + virBufferVSprintf(buf, "%s <model>%s</model>\n", indent, def->model); if (def->sockets && def->cores && def->threads) { virBufferVSprintf(buf, "%s <topology", indent); -- 1.6.6

3 3

[libvirt] [PATCH v2] Implement CPU topology support for QEMU driver
by Jiri Denemark 19 Jan '10

19 Jan '10

QEMU's command line equivalent for the following domain XML fragment <vcpus>2</vcpus> <cpu ...> ... <topology sockets='1' cores='2', threads='1'/> </cpu> is -smp 2,sockets=1,cores=2,threads=1 This syntax was introduced in QEMU-0.12. Version 2 changes: - -smp argument build split into a separate function - always add ",sockets=S,cores=C,threads=T" to -smp if qemu supports it - use qemuParseCommandLineKeywords for command line parsing Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_conf.c | 159 +++++++++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_conf.h | 3 +- 2 files changed, 145 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 9f35217..09bbf7a 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1,7 +1,7 @@ /* * qemu_conf.c: QEMU configuration management * - * Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008, 2009, 2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1115,6 +1115,10 @@ static unsigned int qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_CHARDEV; if (strstr(help, "-balloon")) flags |= QEMUD_CMD_FLAG_BALLOON; + if (strstr(help, "cores=") && + strstr(help, "threads=") && + strstr(help, "sockets=")) + flags |= QEMUD_CMD_FLAG_SMP_TOPOLOGY; if (version >= 9000) flags |= QEMUD_CMD_FLAG_VNC_COLON; @@ -1865,6 +1869,39 @@ no_memory: goto cleanup; } +static char * +qemudBuildCommandLineSmp(virConnectPtr conn, + const virDomainDefPtr def, + int qemuCmdFlags) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferVSprintf(&buf, "%lu", def->vcpus); + + if ((qemuCmdFlags & QEMUD_CMD_FLAG_SMP_TOPOLOGY)) { + /* sockets, cores, and threads are either all zero + * or all non-zero, thus checking one of them is enough */ + if (def->cpu && def->cpu->sockets) { + virBufferVSprintf(&buf, ",sockets=%u", def->cpu->sockets); + virBufferVSprintf(&buf, ",cores=%u", def->cpu->cores); + virBufferVSprintf(&buf, ",threads=%u", def->cpu->threads); + } + else { + virBufferVSprintf(&buf, ",sockets=%lu", def->vcpus); + virBufferVSprintf(&buf, ",cores=%u", 1); + virBufferVSprintf(&buf, ",threads=%u", 1); + } + } + + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + virReportOOMError(conn); + return NULL; + } + + return virBufferContentAndReset(&buf); +} + #define QEMU_SERIAL_PARAM_ACCEPTED_CHARS \ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_" @@ -1900,7 +1937,6 @@ int qemudBuildCommandLine(virConnectPtr conn, const char *migrateFrom) { int i; char memory[50]; - char vcpus[50]; char boot[VIR_DOMAIN_BOOT_LAST]; struct utsname ut; int disableKQEMU = 0; @@ -1914,6 +1950,7 @@ int qemudBuildCommandLine(virConnectPtr conn, char uuid[VIR_UUID_STRING_BUFLEN]; char domid[50]; char *cpu; + char *smp; uname_normalize(&ut); @@ -2049,7 +2086,6 @@ int qemudBuildCommandLine(virConnectPtr conn, * is not supported, then they're out of luck anyway */ snprintf(memory, sizeof(memory), "%lu", def->maxmem/1024); - snprintf(vcpus, sizeof(vcpus), "%lu", def->vcpus); snprintf(domid, sizeof(domid), "%d", def->id); ADD_ENV_LIT("LC_ALL=C"); @@ -2112,8 +2148,13 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-mem-path"); ADD_ARG_LIT(driver->hugepage_path); } + + if (!(smp = qemudBuildCommandLineSmp(conn, def, qemuCmdFlags))) + goto error; + ADD_ARG_LIT("-smp"); - ADD_ARG_LIT(vcpus); + ADD_ARG_LIT(smp); + VIR_FREE(smp); if (qemuCmdFlags & QEMUD_CMD_FLAG_NAME) { ADD_ARG_LIT("-name"); @@ -3740,6 +3781,27 @@ error: } +static virCPUDefPtr +qemuInitGuestCPU(virConnectPtr conn, + virDomainDefPtr dom) +{ + if (!dom->cpu) { + virCPUDefPtr cpu; + + if (VIR_ALLOC(cpu) < 0) { + virReportOOMError(conn); + return NULL; + } + + cpu->type = VIR_CPU_TYPE_GUEST; + cpu->match = VIR_CPU_MATCH_EXACT; + dom->cpu = cpu; + } + + return dom->cpu; +} + + static int qemuParseCommandLineCPU(virConnectPtr conn, virDomainDefPtr dom, @@ -3749,10 +3811,8 @@ qemuParseCommandLineCPU(virConnectPtr conn, const char *p = val; const char *next; - if (VIR_ALLOC(cpu) < 0) - goto no_memory; - - cpu->type = VIR_CPU_TYPE_GUEST; + if (!(cpu = qemuInitGuestCPU(conn, dom))) + goto error; do { if (*p == '\0' || *p == ',') @@ -3796,7 +3856,6 @@ qemuParseCommandLineCPU(virConnectPtr conn, } } while ((p = next)); - dom->cpu = cpu; return 0; syntax: @@ -3807,11 +3866,84 @@ syntax: no_memory: virReportOOMError(conn); error: - virCPUDefFree(cpu); return -1; } +static int +qemuParseCommandLineSmp(virConnectPtr conn, + virDomainDefPtr dom, + const char *val) +{ + unsigned int sockets = 0; + unsigned int cores = 0; + unsigned int threads = 0; + int i; + int nkws; + char **kws; + char **vals; + int n; + char *end; + int ret; + + nkws = qemuParseCommandLineKeywords(conn, val, &kws, &vals, 1); + if (nkws < 0) + return -1; + + for (i = 0; i < nkws; i++) { + if (vals[i] == NULL) { + if (i > 0 || + virStrToLong_i(kws[i], &end, 10, &n) < 0 || + !end || *end != '\0') + goto syntax; + dom->vcpus = n; + } else { + if (virStrToLong_i(vals[i], &end, 10, &n) < 0 || + !end || *end != '\0') + goto syntax; + if (STREQ(kws[i], "sockets")) + sockets = n; + else if (STREQ(kws[i], "cores")) + cores = n; + else if (STREQ(kws[i], "threads")) + threads = n; + else + goto syntax; + } + } + + if (sockets && cores && threads) { + virCPUDefPtr cpu; + + if (!(cpu = qemuInitGuestCPU(conn, dom))) + goto error; + cpu->sockets = sockets; + cpu->cores = cores; + cpu->threads = threads; + } else if (sockets || cores || threads) + goto syntax; + + ret = 0; + +cleanup: + for (i = 0; i < nkws; i++) { + VIR_FREE(kws[i]); + VIR_FREE(vals[i]); + } + VIR_FREE(kws); + VIR_FREE(vals); + + return ret; + +syntax: + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot parse CPU topology '%s'"), val); +error: + ret = -1; + goto cleanup; +} + + /* * Analyse the env and argv settings and reconstruct a * virDomainDefPtr representing these settings as closely @@ -3959,14 +4091,9 @@ virDomainDefPtr qemuParseCommandLine(virConnectPtr conn, } def->memory = def->maxmem = mem * 1024; } else if (STREQ(arg, "-smp")) { - int vcpus; WANT_VALUE(); - if (virStrToLong_i(val, NULL, 10, &vcpus) < 0) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, \ - _("cannot parse CPU count '%s'"), val); + if (qemuParseCommandLineSmp(conn, def, val) < 0) goto error; - } - def->vcpus = vcpus; } else if (STREQ(arg, "-uuid")) { WANT_VALUE(); if (virUUIDParse(val, def->uuid) < 0) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 82254ca..3f74cc9 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -1,7 +1,7 @@ /* * qemu_conf.h: QEMU configuration management * - * Copyright (C) 2006, 2007, 2009 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2009, 2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -78,6 +78,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_ENABLE_KVM = (1 << 23), /* Is the -enable-kvm flag available to "enable KVM full virtualization support" */ QEMUD_CMD_FLAG_MONITOR_JSON = (1 << 24), /* JSON mode for monitor */ QEMUD_CMD_FLAG_BALLOON = (1 << 25), /* -balloon available */ + QEMUD_CMD_FLAG_SMP_TOPOLOGY = (1 << 26), /* Is sockets=s,cores=c,threads=t available for -smp? */ }; /* Main driver state */ -- 1.6.6

3 6

[libvirt] [PATCH] Enhance qemuParseCommandLineKeywords
by Jiri Denemark 19 Jan '10

19 Jan '10

Current version expects name=value,... list and when an incorrect string such as "a,b,c=d" would be parsed as "a,b,c" keyword with "d" value without reporting any error, which is probably not the expected behavior. This patch adds an extra argument called allowEmptyValue, which if non-zero will permit keywords with no value; "a,b=c,,d=" will be parsed as follows: keyword value "a" NULL "b" "c" "" NULL "d" "" In case allowEmptyValue is zero, the string is required to contain name=value pairs only; retvalues is guaranteed to contain non-NULL pointers. Now, "a,b,c=d" will result in an error. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_conf.c | 51 ++++++++++++++++++++++++++++++------------------- 1 files changed, 31 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index d3da776..9f35217 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -3066,47 +3066,58 @@ static const char *qemuFindEnv(const char **progenv, /* * Takes a string containing a set of key=value,key=value,key... * parameters and splits them up, returning two arrays with - * the individual keys and values + * the individual keys and values. If allowEmptyValue is nonzero, + * the "=value" part is optional and if a key with no value is found, + * NULL is be placed into corresponding place in retvalues. */ static int qemuParseCommandLineKeywords(virConnectPtr conn, const char *str, char ***retkeywords, - char ***retvalues) + char ***retvalues, + int allowEmptyValue) { int keywordCount = 0; int keywordAlloc = 0; char **keywords = NULL; char **values = NULL; const char *start = str; + const char *end; int i; *retkeywords = NULL; *retvalues = NULL; + end = start + strlen(str); while (start) { const char *separator; const char *endmark; char *keyword; - char *value; + char *value = NULL; - if (!(separator = strchr(start, '='))) { - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("malformed keyword arguments in '%s'"), str); - goto error; + if (!(endmark = strchr(start, ','))) + endmark = end; + if (!(separator = strchr(start, '='))) + separator = end; + + if (separator >= endmark) { + if (!allowEmptyValue) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("malformed keyword arguments in '%s'"), str); + goto error; + } + separator = endmark; } + if (!(keyword = strndup(start, separator - start))) goto no_memory; - separator++; - endmark = strchr(separator, ','); - - value = endmark ? - strndup(separator, endmark - separator) : - strdup(separator); - if (!value) { - VIR_FREE(keyword); - goto no_memory; + if (separator < endmark) { + separator++; + if (!(value = strndup(separator, endmark - separator))) { + VIR_FREE(keyword); + goto no_memory; + } } if (keywordAlloc == keywordCount) { @@ -3123,7 +3134,7 @@ qemuParseCommandLineKeywords(virConnectPtr conn, values[keywordCount] = value; keywordCount++; - start = endmark ? endmark + 1 : NULL; + start = endmark < end ? endmark + 1 : NULL; } *retkeywords = keywords; @@ -3163,7 +3174,7 @@ qemuParseCommandLineDisk(virConnectPtr conn, if ((nkeywords = qemuParseCommandLineKeywords(conn, val, &keywords, - &values)) < 0) + &values, 0)) < 0) return NULL; if (VIR_ALLOC(def) < 0) { @@ -3347,7 +3358,7 @@ qemuParseCommandLineNet(virConnectPtr conn, if ((nkeywords = qemuParseCommandLineKeywords(conn, tmp+1, &keywords, - &values)) < 0) + &values, 0)) < 0) return NULL; } else { nkeywords = 0; @@ -3420,7 +3431,7 @@ qemuParseCommandLineNet(virConnectPtr conn, if ((nkeywords = qemuParseCommandLineKeywords(conn, nic + strlen("nic,"), &keywords, - &values)) < 0) { + &values, 0)) < 0) { virDomainNetDefFree(def); def = NULL; goto cleanup; -- 1.6.6

3 2

[libvirt] [PATCH] storage_conf: plug a leak on OOM error path
by Jim Meyering 19 Jan '10

19 Jan '10

Obvious, for a change... >From 964f24e0724eda6bf12d115318ea9576bbd91f10 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 18 Jan 2010 18:40:13 +0100 Subject: [PATCH] storage_conf: plug a leak on OOM error path * src/conf/storage_conf.c (virStoragePoolSourceListNewSource): Free just-allocated "source" upon VIR_REALLOC_N failure. --- src/conf/storage_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 0aefa06..ea49531 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1,7 +1,7 @@ /* * storage_conf.c: config handling for storage driver * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1695,6 +1695,7 @@ virStoragePoolSourceListNewSource(virConnectPtr conn, } if (VIR_REALLOC_N(list->sources, list->nsources+1) < 0) { + VIR_FREE(source); virReportOOMError(conn); return NULL; } -- 1.6.6.638.g2bc54

2 1

[libvirt] Cannot use console with 0.7.5, error: internal error no assigned pty for device serial0
by Marc Haber 19 Jan '10

19 Jan '10

[my apologies for this re-post. I stupidly managed to hide the first instance of this mail away in an unrelated patch-thread and am thus afraid that the people who could have answered didn't see it] Hi, I have one test host running Debian unstable (kernel 2.6.32.3), and I would like to virtualize on it using KVM and virsh. Debian unstable has libvirt 0.7.5. On this host, I cannot start any KVM domain using console with these XML parts: <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> When I try virsh start $domain, I get the error message: error: internal error no assigned pty for device serial0 When I remove the serial and console stanza, the machine starts up. This is the configuration documented everywhere. At first, I suspected a change in the configuration syntax and filed Debian bug #565145, But on the #virt IRC channel, people suggested that there was a change in libvirt parsing KVM's output, which may be a genuine bug breaking the console. Is this already a known issue? Can I do anything to help debugging? Greetings Marc -- ----------------------------------------------------------------------------- Marc Haber | "I don't trust Computers. They | Mailadresse im Header Mannheim, Germany | lose things." Winona Ryder | Fon: *49 621 72739834 Nordisch by Nature | How to make an American Quilt | Fax: *49 3221 2323190

5 10

[libvirt] Current cpu and memory usage for Host and Domains
by anuj rampal 19 Jan '10

19 Jan '10

Hi, Is there a way to get the Current CPU and Memory usage of the Host machine and the Guest Domains..?? Regards Anuj

4 5

[libvirt] virsh list after libvirt restart "forgets" existing guests (0.7.5)
by Thomas Sjolshagen 19 Jan '10

19 Jan '10

After the upgrade to 0.7.5 from the preview repository, I've noticed that a restart of libvirt does not appear to "re-acquire" any guests already running on the system. # virsh list Compiled against library: libvir 0.7.5 Using library: libvir 0.7.5 Using API: QEMU 0.7.5 Running hypervisor: QEMU 0.12.1 # ps -ef | grep qemu-kvm qemu 1445 1 0 Jan17 ? 00:03:32 /usr/bin/qemu-kvm -S -M pc-0.11 -enable-kvm -m 512 -smp 1 -name imap [SNIP] qemu 1516 1 0 Jan17 ? 00:04:11 /usr/bin/qemu-kvm -S -M pc-0.11 -cpu qemu32 -enable-kvm -m 512 -smp 1 -name mail [SNIP] qemu 21409 1 16 Jan16 ? 07:29:32 /usr/bin/qemu-kvm -S -M pc-0.11 -enable-kvm -m 1640 -smp 1 -name imap2-cluster [SNIP] # virsh list Id Name State ---------------------------------- 1 imap running 2 mail running Additionally, something doesn't appear to be getting either parsed right or set correctly when the guest is started as the /var/log/libvirt/qemu/<guestname>.log file contains: "Option 'ipv4: Use 'on' or 'off'" "Failed to parse "yes" for "dummy.ipv4"

2 1

[libvirt] [PATCH] xen_driver: don't leak a parsed-config buffer
by Jim Meyering 19 Jan '10

19 Jan '10

Another leak: >From 10a428a2ed1ddbe4da2b4fbd7690da5a0fe0420b Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 18 Jan 2010 18:02:17 +0100 Subject: [PATCH] xen_driver: don't leak a parsed-config buffer * src/xen/xen_driver.c (xenUnifiedDomainXMLFromNative): Also free "conf" before returning. --- src/xen/xen_driver.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 4911c9e..72f56ae 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1,7 +1,7 @@ /* * xen_driver.c: Unified Xen driver. * - * Copyright (C) 2007, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2007-2010 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -1199,6 +1199,8 @@ xenUnifiedDomainXMLFromNative(virConnectPtr conn, cleanup: virDomainDefFree(def); + if (conf) + virConfFree(conf); return ret; } -- 1.6.6.638.g2bc54

2 1

[libvirt] [PATCH] qemu_driver: don't leak a virDomainDeviceDef buffer
by Jim Meyering 19 Jan '10

19 Jan '10

At first I was going to call virDomainDeviceDefFree only "if (dev)", but saw that it handles a NULL "dev" just fine, so it's better to skip the test altogether, just as we do for many other free-like functions. >From ea8511d709492f5cdc152a1eaccbccd05f036648 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 18 Jan 2010 16:55:36 +0100 Subject: [PATCH] qemu_driver: don't leak a virDomainDeviceDef buffer * src/qemu/qemu_driver.c (qemudDomainAttachDevice): Don't leak "dev". --- src/qemu/qemu_driver.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 365921f..1aa8af6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6062,11 +6062,11 @@ cleanup: if (cgroup) virCgroupFree(&cgroup); - if (ret < 0 && dev != NULL) { + if (ret < 0 && dev != NULL) if (qemuDomainSetDeviceOwnership(dom->conn, driver, dev, 1) < 0) VIR_WARN0("Fail to restore disk device ownership"); - virDomainDeviceDefFree(dev); - } + virDomainDeviceDefFree(dev); + if (vm) virDomainObjUnlock(vm); qemuDriverUnlock(driver); -- 1.6.6.638.g2bc54

3 4

[libvirt] 0.7.5 errors in configure script
by Avi Weit 19 Jan '10

19 Jan '10

Hi, I am using Ubuntu 9.10 and downloaded and extracted libvirt.0.7.5. I have issued: ./configure --prefix=$HOME/usr --without-xen but I get: You must install device-mapper-devel/libdevmapper >= 1.0.0 to compile libvirt Below is a snippet of the final configure output: checking for showmount... no checking for pvcreate... no checking for vgcreate... no checking for lvcreate... no checking for pvremove... no checking for vgremove... no checking for lvremove... no checking for vgchange... no checking for vgscan... no checking for pvs... no checking for vgs... no checking for lvs... no checking for iscsiadm... no checking for DEVMAPPER... no checking libdevmapper.h usability... no checking libdevmapper.h presence... no checking for libdevmapper.h... no checking for dm_task_run in -ldevmapper... no configure: error: You must install device-mapper-devel/libdevmapper >= 1.0.0 to compile libvirt /dev/mapper exists on the system. Any help is appreciated. Thanks, - Avi

4 4

[libvirt] [PATCH 00/34] Add device addressing and disk controller support
by Daniel P. Berrange 18 Jan '10

18 Jan '10

This series is a merge of two previous series I posted http://www.redhat.com/archives/libvir-list/2009-December/msg00232.html http://www.redhat.com/archives/libvir-list/2009-December/msg00392.html It accomplishes quite a lot of things, having major impact on the QEMU driver, hopefully all in a postive way :-) In particular it does * Add standard XML syntax for addressing of PCI devices, and disk drives * Add support for disk controllers as a managed device in XML * Add support for disk controller hotplug/unplug * Convert everything over to use QEMU's -device flag where available * Add PCI addressing when using -device * Introduce a way to give every device a unique 'alias' name in the XML format I can't promise it works perfectly, but i've done quite alot of positive testing with it now & believe all the back comptability stuff is working right.

4 85

[libvirt] [PATCH] storage_backend_fs.c: do not ignore probe failure
by Jim Meyering 18 Jan '10

18 Jan '10

When virStorageBackendProbeTarget fails, it returns -1 or -2. The two uses below obviously intended to handle those cases differently, but due to a wrong comparison, they always treated a "real" (e.g., open) failure (-1) just like an ignorable "wrong file type" failure (-2). FYI, coverity reported that the "goto cleanup" statement was unreachable, which was true in each case, but hardly the real problem. >From c9ba79daf124afbab351741192bbaf7110a199dd Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 18 Jan 2010 10:34:53 +0100 Subject: [PATCH] storage_backend_fs.c: do not ignore probe failure * src/storage/storage_backend_fs.c (virStorageBackendFileSystemRefresh): Correct two error-handling bugs. The documented intent is to ignore non-regular files, yet due to a comparison "< 0" (rather than "!= 0") all errors were handled that way. (vboxStorageVolDelete): Likewise. (vboxDomainDefineXML): Likewise. --- src/storage/storage_backend_fs.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 4fe40b3..fa72f9c 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1,7 +1,7 @@ /* * storage_backend_fs.c: storage backend for FS and directory handling * - * Copyright (C) 2007-2009 Red Hat, Inc. + * Copyright (C) 2007-2010 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -562,7 +562,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, &backingStore, &vol->allocation, &vol->capacity, - &vol->target.encryption) < 0)) { + &vol->target.encryption) != 0)) { if (ret == -1) goto cleanup; else { @@ -603,7 +603,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, if ((ret = virStorageBackendProbeTarget(conn, &vol->backingStore, NULL, NULL, NULL, - NULL)) < 0) { + NULL)) != 0) { if (ret == -1) goto cleanup; else { -- 1.6.6.638.g2bc54

2 3

[libvirt] [PATCH] remove useless comparisons in lxc_driver, vbox_tmpl.c
by Jim Meyering 18 Jan '10

18 Jan '10

Here are two change sets. They remove useless comparisons of the style - if (def->nets[i]->mac) { where the mac member is declared as an array. >From d22b04d2684d5a16f797d8df0c2ef036b5b1b2ce Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 18 Jan 2010 09:49:57 +0100 Subject: [PATCH 1/2] lxc_driver: remove useless comparison * src/lxc/lxc_driver.c (lxcSetupInterfaces): Remove always-true array-is-non-NULL test. git grep 'mac\[.*\];'|grep -F .h src/conf/domain_conf.h: unsigned char mac[VIR_MAC_BUFLEN]; --- src/lxc/lxc_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 86606c7..94ec874 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -834,7 +834,7 @@ 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))) { -- 1.6.6.638.g2bc54 >From c751c0cf3352b08d674bb59efd987f106fc1fffb Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 18 Jan 2010 09:58:57 +0100 Subject: [PATCH 2/2] vbox_tmpl.c: remove useless array-is-non-NULL comparisons * src/vbox/vbox_tmpl.c (vboxStorageVolDelete): Remove always-true array-is-non-NULL test. git grep 'key\[.*\];'|grep -F .h src/datatypes.h: char key[PATH_MAX]; (vboxStorageVolGetInfo): Likewise. (vboxStorageVolGetXMLDesc): Likewise. (vboxStorageVolGetPath): Likewise. (vboxDomainDefineXML): Likewise. (but now with "mac[]") --- src/vbox/vbox_tmpl.c | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 07696c0..e40c848 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -4084,9 +4084,7 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) { } VBOX_UTF8_TO_UTF16(macaddrvbox, &MACAddress); - if (def->nets[i]->mac) { - adapter->vtbl->SetMACAddress(adapter, MACAddress); - } + adapter->vtbl->SetMACAddress(adapter, MACAddress); VBOX_UTF16_FREE(MACAddress); } } @@ -6645,9 +6643,6 @@ static int vboxStorageVolDelete(virStorageVolPtr vol, int i = 0; int j = 0; - if (!vol->key) - return ret; - vboxUtf8toIID(vol->conn, vol->key, &hddIID); if (!hddIID) return ret; @@ -6774,8 +6769,7 @@ static int vboxStorageVolGetInfo(virStorageVolPtr vol, virStorageVolInfoPtr info vboxIID *hddIID = NULL; nsresult rc; - if ( !vol->key - || !info) + if (!info) return ret; vboxUtf8toIID(vol->conn, vol->key, &hddIID); @@ -6824,9 +6818,6 @@ static char *vboxStorageVolGetXMLDesc(virStorageVolPtr vol, unsigned int flags A int defOk = 0; nsresult rc; - if (!vol->key) - return ret; - memset(&pool, 0, sizeof(pool)); memset(&def, 0, sizeof(def)); @@ -6919,9 +6910,6 @@ static char *vboxStorageVolGetPath(virStorageVolPtr vol) { vboxIID *hddIID = NULL; nsresult rc; - if (!vol->key) - return ret; - vboxUtf8toIID(vol->conn, vol->key, &hddIID); if (!hddIID) return ret; -- 1.6.6.638.g2bc54

2 1

[libvirt] [PATCH] secret_driver.c: remove dead cleanup code
by Jim Meyering 18 Jan '10

18 Jan '10

Here's another example of appropriate use of assert. The while loop removed below is currently guaranteed never to be executed, since "list" is always NULL at that point. However, you can argue that simply removing the loop is a little risky: what if someone changes things to "goto cleanup" before "list" reaches the final NULL? That's why I added the assertion: to catch the potential (albeit unlikely) future coding error. It would be a shame to include "real" run-time code to detect a situation like that that will probably never arise. And if you do, technically you'd have to document that the function would return some sort of error code if a developer changes its guts in a way that violates this invariant. That would be nonsensical. >From 6baa2b0b8f9963fa60ff0946afcefd57586e2720 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 18 Jan 2010 10:46:57 +0100 Subject: [PATCH] secret_driver.c: remove dead cleanup code * src/secret/secret_driver.c (loadSecrets): Remove dead code after "cleanup:". At that point, "list" is known to be NULL. Instead, add an assertion. Include <assert.h>. --- src/secret/secret_driver.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 1eef468..b4b4f8a 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1,7 +1,7 @@ /* * secret_driver.c: local driver for secret manipulation API * - * 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 @@ -28,6 +28,7 @@ #include <string.h> #include <sys/stat.h> #include <unistd.h> +#include <assert.h> #include "internal.h" #include "base64.h" @@ -518,12 +519,7 @@ loadSecrets(virConnectPtr conn, virSecretDriverStatePtr driver, ret = 0; cleanup: - while (list != NULL) { - virSecretEntryPtr s; - - s = listUnlink(&list); - secretFree(s); - } + assert (list == NULL); if (dir != NULL) closedir(dir); return ret; -- 1.6.6.638.g2bc54

2 1

[libvirt] [PATCH] Use closest CPU model when decoding from CPUID
by Jiri Denemark 18 Jan '10

18 Jan '10

Current implementation of x86Decode() used for CPUID -> model+features translation does not always select the closest CPU model. When walking through all models from cpu_map.xml the function considers a new candidate as a better choice than a previously selected candidate only if the new one is a superset of the old one. In case the new candidate is closer to host CPU but lacks some feature comparing to the old candidate, the function does not choose well. This patch changes the algorithm so that the closest model is always selected. That is, the model which requires the lowest number of additional features to describe host CPU. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 122 ++++++++++++++++++++++++++++++++++------------------- 1 files changed, 78 insertions(+), 44 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 298b632..dae7c90 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -238,6 +238,55 @@ x86DataFromModel(const struct x86_model *model) } +static virCPUDefPtr +x86DataToCPU(const union cpuData *data, + const struct x86_model *model, + const struct x86_map *map) +{ + virCPUDefPtr cpu; + union cpuData *tmp = NULL; + struct cpuX86cpuid *cpuid; + const struct x86_feature *feature; + int i; + + if (VIR_ALLOC(cpu) < 0 || + (cpu->model = strdup(model->name)) == NULL || + (tmp = x86DataCopy(data)) == NULL) + goto no_memory; + + for (i = 0; i < model->ncpuid; i++) { + x86cpuidClearBits(x86DataCpuid(tmp, model->cpuid[i].function), + model->cpuid + i); + } + + feature = map->features; + while (feature != NULL) { + for (i = 0; i < feature->ncpuid; i++) { + if ((cpuid = x86DataCpuid(tmp, feature->cpuid[i].function)) + && x86cpuidMatchMasked(cpuid, feature->cpuid + i)) { + x86cpuidClearBits(cpuid, feature->cpuid + i); + if (virCPUDefAddFeature(NULL, cpu, feature->name, + VIR_CPU_FEATURE_REQUIRE) < 0) + goto error; + } + } + + feature = feature->next; + } + +cleanup: + x86DataFree(tmp); + return cpu; + +no_memory: + virReportOOMError(NULL); +error: + virCPUDefFree(cpu); + cpu = NULL; + goto cleanup; +} + + static void x86FeatureFree(struct x86_feature *feature) { @@ -896,10 +945,9 @@ x86Decode(virCPUDefPtr cpu, { int ret = -1; struct x86_map *map; - const struct x86_feature *feature; - const struct x86_model *model = NULL; const struct x86_model *candidate; - union cpuData *tmp = NULL; + virCPUDefPtr cpuCandidate; + virCPUDefPtr cpuModel = NULL; struct cpuX86cpuid *cpuid; int i; @@ -908,6 +956,8 @@ x86Decode(virCPUDefPtr cpu, candidate = map->models; while (candidate != NULL) { + bool allowed = (models == NULL); + for (i = 0; i < candidate->ncpuid; i++) { cpuid = x86DataCpuid(data, candidate->cpuid[i].function); if (cpuid == NULL @@ -915,65 +965,49 @@ x86Decode(virCPUDefPtr cpu, goto next; } - if (model == NULL - || x86ModelCompare(model, candidate) == SUBSET) { - bool found = false; - for (i = 0; i < nmodels; i++) { - if (STREQ(models[i], candidate->name)) { - found = true; - break; - } + for (i = 0; i < nmodels; i++) { + if (STREQ(models[i], candidate->name)) { + allowed = true; + break; } + } - if (nmodels > 0 && !found) { - VIR_DEBUG("CPU model %s not allowed by hypervisor; ignoring", - candidate->name); - } - else - model = candidate; + if (!allowed) { + VIR_DEBUG("CPU model %s not allowed by hypervisor; ignoring", + candidate->name); + goto next; } + if (!(cpuCandidate = x86DataToCPU(data, candidate, map))) + goto out; + + if (cpuModel == NULL + || cpuModel->nfeatures > cpuCandidate->nfeatures) { + virCPUDefFree(cpuModel); + cpuModel = cpuCandidate; + } else + virCPUDefFree(cpuCandidate); + next: candidate = candidate->next; } - if (model == NULL) { + if (cpuModel == NULL) { virCPUReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot find suitable CPU model for given data")); goto out; } - if ((cpu->model = strdup(model->name)) == NULL - || (tmp = x86DataCopy(data)) == NULL) { - virReportOOMError(NULL); - goto out; - } - - for (i = 0; i < model->ncpuid; i++) { - x86cpuidClearBits(x86DataCpuid(tmp, model->cpuid[i].function), - model->cpuid + i); - } - - feature = map->features; - while (feature != NULL) { - for (i = 0; i < feature->ncpuid; i++) { - if ((cpuid = x86DataCpuid(tmp, feature->cpuid[i].function)) - && x86cpuidMatchMasked(cpuid, feature->cpuid + i)) { - x86cpuidClearBits(cpuid, feature->cpuid + i); - if (virCPUDefAddFeature(NULL, cpu, feature->name, - VIR_CPU_FEATURE_REQUIRE) < 0) - goto out; - } - } - - feature = feature->next; - } + cpu->model = cpuModel->model; + cpu->nfeatures = cpuModel->nfeatures; + cpu->features = cpuModel->features; + VIR_FREE(cpuModel); ret = 0; out: - x86DataFree(tmp); x86MapFree(map); + virCPUDefFree(cpuModel); return ret; } -- 1.6.6

3 2

[libvirt] [PATCH 1/2] Standardise ./configure --help options reporting.
by Diego Elio Pettenò 18 Jan '10

18 Jan '10

Always use AC_HELP_STRING for the help text for options at ./configure, so that the output is properly aligned. Use proper quadrigraphs for outputting the brackets. Always use autoconf-style [default=$foo] output to state the default, both where it was stated before and where it wasn't. This time, include Matthias Bolte notes regarding defaults, and removing PFX specification from phyp. --- configure.in | 100 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 50 insertions(+), 50 deletions(-) diff --git a/configure.in b/configure.in index 012a96f..447d57e 100644 --- a/configure.in +++ b/configure.in @@ -205,33 +205,33 @@ fi dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], -[ --with-xen add XEN support (on)],[],[with_xen=yes]) + AC_HELP_STRING([--with-xen], [add XEN support @<:@default=yes@:>@]),[],[with_xen=yes]) AC_ARG_WITH([xen-inotify], -[ --with-xen-inotify add XEN inotify support (on)],[],[with_xen_inotify=check]) + AC_HELP_STRING([--with-xen-inotify], [add XEN inotify support @<:@default=check@:>@]),[],[with_xen_inotify=check]) AC_ARG_WITH([qemu], -[ --with-qemu add QEMU/KVM support (on)],[],[with_qemu=yes]) + AC_HELP_STRING([--with-qemu], [add QEMU/KVM support @<:@default=yes@:>@]),[],[with_qemu=yes]) AC_ARG_WITH([uml], -[ --with-uml add UML support (on)],[],[with_uml=check]) + AC_HELP_STRING([--with-uml], [add UML support @<:@default=check@:>@]),[],[with_uml=check]) AC_ARG_WITH([openvz], -[ --with-openvz add OpenVZ support (on)],[],[with_openvz=yes]) + AC_HELP_STRING([--with-openvz], [add OpenVZ support @<:@default=yes@:>@]),[],[with_openvz=yes]) AC_ARG_WITH([libssh2], -[ --with-libssh2=[PFX] libssh2 location],[],[with_libssh2=yes]) + AC_HELP_STRING([--with-libssh2=@<:@PFX@:>@], [libssh2 location @<:@default=/usr/local/lib@:>@]),[],[with_libssh2=yes]) AC_ARG_WITH([phyp], -[ --with-phyp=[PFX] add PHYP support (on)],[],[with_phyp=check]) + AC_HELP_STRING([--with-phyp], [add PHYP support @<:@default=check@:>@]),[],[with_phyp=check]) AC_ARG_WITH([vbox], -[ --with-vbox add VirtualBox support (on)],[],[with_vbox=yes]) + AC_HELP_STRING([--with-vbox], [add VirtualBox support @<:@default=yes@:>@]),[],[with_vbox=yes]) AC_ARG_WITH([lxc], -[ --with-lxc add Linux Container support (on)],[],[with_lxc=check]) + AC_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=check@:>@]),[],[with_lxc=check]) AC_ARG_WITH([one], -[ --with-one add ONE support (on)],[],[with_one=check]) + AC_HELP_STRING([--with-one], [add ONE support @<:@default=check@:>@]),[],[with_one=check]) AC_ARG_WITH([esx], -[ --with-esx add ESX support (on)],[],[with_esx=check]) + AC_HELP_STRING([--with-esx], [add ESX support @<:@default=check@:>@]),[],[with_esx=check]) AC_ARG_WITH([test], -[ --with-test add test driver support (on)],[],[with_test=yes]) + AC_HELP_STRING([--with-test], [add test driver support @<:@default=yes@:>@]),[],[with_test=yes]) AC_ARG_WITH([remote], -[ --with-remote add remote driver support (on)],[],[with_remote=yes]) + AC_HELP_STRING([--with-remote], [add remote driver support @<:@default=yes@:>@]),[],[with_remote=yes]) AC_ARG_WITH([libvirtd], -[ --with-libvirtd add libvirtd support (on)],[],[with_libvirtd=yes]) + AC_HELP_STRING([--with-libvirtd], [add libvirtd support @<:@default=yes@:>@]),[],[with_libvirtd=yes]) dnl dnl specific tests to setup DV devel environments with debug etc ... @@ -245,8 +245,8 @@ AC_SUBST([STATIC_BINARIES]) dnl --enable-debug=(yes|no) AC_ARG_ENABLE([debug], - [AC_HELP_STRING([--enable-debug=no/yes], - [enable debugging output])],[],[enable_debug=yes]) + [AC_HELP_STRING([--enable-debug=@<:@no|yes@:>@], + [enable debugging output @<:@default=yes@:>@])],[],[enable_debug=yes]) AM_CONDITIONAL([ENABLE_DEBUG], test x"$enable_debug" = x"yes") if test x"$enable_debug" = x"yes"; then AC_DEFINE([ENABLE_DEBUG], [], [whether debugging is enabled]) @@ -254,7 +254,7 @@ fi AC_MSG_CHECKING([where to write libvirtd PID file]) -AC_ARG_WITH([remote-pid-file], [AC_HELP_STRING([--with-remote-pid-file=[pidfile|none]], [PID file for libvirtd])]) +AC_ARG_WITH([remote-pid-file], [AC_HELP_STRING([--with-remote-pid-file=@<:@pidfile|none@:>@], [PID file for libvirtd])]) if test "x$with_remote_pid_file" == "x" ; then REMOTE_PID_FILE="$localstatedir/run/libvirtd.pid" elif test "x$with_remote_pid_file" == "xnone" ; then @@ -270,8 +270,8 @@ dnl init script flavor dnl AC_MSG_CHECKING([for init script flavor]) AC_ARG_WITH([init-script], - [AC_HELP_STRING([--with-init-script=[redhat|auto|none]], - [Style of init script to install (defaults to auto)])]) + [AC_HELP_STRING([--with-init-script=@<:@redhat|auto|none@:>@], + [Style of init script to install @<:@default=auto@:>@])]) if test "x$with_init_script" = "x" -o "x$with_init_script" = "xauto"; then if test -f /etc/redhat-release ; then with_init_script=redhat @@ -284,8 +284,8 @@ 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], - [AC_HELP_STRING([--with-rhel5-api=[ARG]], - [build for the RHEL-5 API [default=no]])]) + [AC_HELP_STRING([--with-rhel5-api=@<:@ARG@:>@], + [build for the RHEL-5 API @<:@default=no@:>@])]) if test x"$with_rhel5_api" = x"yes"; then AC_DEFINE([WITH_RHEL5_API], [1], [whether building for the RHEL-5 API]) fi @@ -509,7 +509,7 @@ LIBXML_CFLAGS="" LIBXML_LIBS="" LIBXML_FOUND="no" -AC_ARG_WITH([libxml], [ --with-libxml=[PFX] libxml2 location]) +AC_ARG_WITH([libxml], AC_HELP_STRING([--with-libxml=@<:@PFX@:>@], [libxml2 location])) if test "x$with_libxml" = "xno" ; then AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt]) @@ -596,7 +596,7 @@ LIBS="$old_libs" dnl Cyrus SASL AC_ARG_WITH([sasl], - [ --with-sasl use cyrus SASL for authentication], + AC_HELP_STRING([--with-sasl], [use cyrus SASL for authentication @<:@default=check@:>@]), [], [with_sasl=check]) @@ -651,7 +651,7 @@ AC_SUBST([SASL_LIBS]) dnl YAJL JSON library http://lloyd.github.com/yajl/ AC_ARG_WITH([yajl], - [ --with-yajl use YAJL for JSON parsing/formatting], + AC_HELP_STRING([--with-yajl], [use YAJL for JSON parsing/formatting @<:@default=check@:>@]), [], [with_yajl=check]) @@ -704,7 +704,7 @@ POLKIT_CFLAGS= POLKIT_LIBS= PKCHECK_PATH= AC_ARG_WITH([polkit], - [ --with-polkit use PolicyKit for UNIX socket access checks], + AC_HELP_STRING([--with-polkit], [use PolicyKit for UNIX socket access checks @<:@default=check@:>@]), [], [with_polkit=check]) @@ -762,7 +762,7 @@ AC_SUBST([POLKIT_LIBS]) dnl Avahi library AC_ARG_WITH([avahi], - [ --with-avahi use avahi to advertise remote daemon], + AC_HELP_STRING([--with-avahi], [use avahi to advertise remote daemon @<:@default=check@:>@]), [], [with_avahi=check]) @@ -789,7 +789,7 @@ AC_SUBST([AVAHI_LIBS]) dnl SELinux AC_ARG_WITH([selinux], - [ --with-selinux use SELinux to manage security], + AC_HELP_STRING([--with-selinux], [use SELinux to manage security @<:@default=check@:>@]), [], [with_selinux=check]) @@ -824,7 +824,7 @@ AC_SUBST([SELINUX_LIBS]) AC_ARG_WITH([secdriver-selinux], - [ --with-secdriver-selinux use SELinux security driver], + AC_HELP_STRING([--with-secdriver-selinux], [use SELinux security driver @<:@default=check@:>@]), [], [with_secdriver_selinux=check]) @@ -862,7 +862,7 @@ AM_CONDITIONAL([WITH_SECDRIVER_SELINUX], [test "$with_secdriver_selinux" != "no" dnl AppArmor AC_ARG_WITH([apparmor], - [ --with-apparmor use AppArmor to manage security], + AC_HELP_STRING([--with-apparmor], [use AppArmor to manage security @<:@default=check@:>@]), [], [with_apparmor=check]) @@ -901,7 +901,7 @@ AC_SUBST([APPARMOR_LIBS]) AC_ARG_WITH([secdriver-apparmor], - [ --with-secdriver-apparmor use AppArmor security driver], + AC_HELP_STRING([--with-secdriver-apparmor], [use AppArmor security driver @<:@default=check@:>@]), [], [with_secdriver_apparmor=check]) @@ -940,7 +940,7 @@ AM_CONDITIONAL([WITH_SECDRIVER_APPARMOR], [test "$with_secdriver_apparmor" != "n dnl NUMA lib AC_ARG_WITH([numactl], - [ --with-numactl use numactl for host topology info], + AC_HELP_STRING([--with-numactl], [use numactl for host topology info @<:@default=check@:>@]), [], [with_numactl=check]) @@ -1075,7 +1075,7 @@ AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) dnl libcap-ng AC_ARG_WITH([capng], - [ --with-capng use libcap-ng to reduce libvirtd privileges], + AC_HELP_STRING([--with-capng], [use libcap-ng to reduce libvirtd privileges @<:@default=check@:>@]), [], [with_capng=check]) @@ -1158,7 +1158,7 @@ AC_SUBST([VIRSH_LIBS]) AC_ARG_WITH([network], -[ --with-network with virtual network driver (on)],[],[with_network=yes]) + AC_HELP_STRING([--with-network], [with virtual network driver @<:@default=yes@:>@]),[],[with_network=yes]) if test "$with_libvirtd" = "no" ; then with_network=no fi @@ -1176,7 +1176,7 @@ AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"]) dnl netcf library AC_ARG_WITH([netcf], -[ --with-netcf libnetcf support to configure physical host network interfaces], + AC_HELP_STRING([--with-netcf], [libnetcf support to configure physical host network interfaces @<:@default=check@:>@]), [], [with_netcf=check]) NETCF_CFLAGS= @@ -1212,17 +1212,17 @@ AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"]) AC_ARG_WITH([storage-fs], -[ --with-storage-fs with FileSystem backend for the storage driver (on)],[],[with_storage_fs=check]) + AC_HELP_STRING([--with-storage-fs], [with FileSystem backend for the storage driver @<:@default=check@:>@]),[],[with_storage_fs=check]) AC_ARG_WITH([storage-lvm], -[ --with-storage-lvm with LVM backend for the storage driver (on)],[],[with_storage_lvm=check]) + AC_HELP_STRING([--with-storage-lvm], [with LVM backend for the storage driver @<:@default=check@:>@]),[],[with_storage_lvm=check]) AC_ARG_WITH([storage-iscsi], -[ --with-storage-iscsi with iSCSI backend for the storage driver (on)],[],[with_storage_iscsi=check]) + AC_HELP_STRING([--with-storage-iscsi], [with iSCSI backend for the storage driver @<:@default=check@:>@]),[],[with_storage_iscsi=check]) AC_ARG_WITH([storage-scsi], -[ --with-storage-scsi with SCSI backend for the storage driver (on)],[],[with_storage_scsi=check]) + AC_HELP_STRING([--with-storage-scsi], [with SCSI backend for the storage driver @<:@default=check@:>@]),[],[with_storage_scsi=check]) AC_ARG_WITH([storage-mpath], -[ --with-storage-mpath with mpath backend for the storage driver (on)],[],[with_storage_mpath=check]) + AC_HELP_STRING([--with-storage-mpath], [with mpath backend for the storage driver @<:@default=check@:>@]),[],[with_storage_mpath=check]) AC_ARG_WITH([storage-disk], -[ --with-storage-disk with GPartd Disk backend for the storage driver (on)],[],[with_storage_disk=check]) + AC_HELP_STRING([--with-storage-disk], [with GPartd Disk backend for the storage driver @<:@default=check@:>@]),[],[with_storage_disk=check]) with_storage_dir=yes if test "$with_libvirtd" = "no"; then @@ -1464,7 +1464,7 @@ dnl check for python dnl AC_ARG_WITH([python], -[ --with-python Build python bindings (on)],[],[with_python=yes]) + AC_HELP_STRING([--with-python], [Build python bindings @<:@default=yes@:>@]),[],[with_python=yes]) if test "$enable_shared:$with_python" = no:yes; then AC_MSG_WARN([Disabling shared libraries is incompatible with building Python extensions.]) @@ -1561,7 +1561,7 @@ AC_MSG_RESULT($RUNNING_XEND) AM_CONDITIONAL([ENABLE_XEN_TESTS], [test "$RUNNING_XEN" != "no" -a "$RUNNING_XEND" != "no"]) AC_ARG_ENABLE([test-coverage], -[ --enable-test-coverage turn on code coverage instrumentation], + AC_HELP_STRING([--enable-test-coverage], [turn on code coverage instrumentation @<:@default=no@:>@]), [case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-coverage option]) ;; @@ -1578,7 +1578,7 @@ if test "${enable_coverage}" = yes; then fi AC_ARG_ENABLE([test-oom], -[ --enable-test-oom memory allocation failure checking], + AC_HELP_STRING([--enable-test-oom], [memory allocation failure checking @<:@default=no@:>@]), [case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-oom option]) ;; @@ -1598,7 +1598,7 @@ fi AC_ARG_ENABLE([test-locking], -[ --enable-test-locking thread locking tests using CIL], + AC_HELP_STRING([--enable-test-locking], [thread locking tests using CIL @<:@default=no@:>@]), [case "${enableval}" in yes|no) ;; *) AC_MSG_ERROR([bad value ${enableval} for test-locking option]) ;; @@ -1615,7 +1615,7 @@ AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"]) dnl Enable building the proxy? AC_ARG_WITH([xen-proxy], -[ --with-xen-proxy add XEN setuid proxy support (on)],[],[with_xen_proxy=auto]) + AC_HELP_STRING([--with-xen-proxy], [add XEN setuid proxy support @<:@default=auto@:>@]),[],[with_xen_proxy=auto]) AC_MSG_CHECKING([if Xen setuid proxy is needed]) if test "$with_xen_proxy" = "auto"; then @@ -1675,7 +1675,7 @@ AM_CONDITIONAL([WITH_WIN_ICON], [test "$WINDRES" != "no"]) dnl Driver-Modules library AC_ARG_WITH([driver-modules], - [ --with-driver-modules build drivers as loadable modules], + AC_HELP_STRING([--with-driver-modules], [build drivers as loadable modules @<:@default=no@:>@]), [], [with_driver_modules=no]) @@ -1714,7 +1714,7 @@ dnl HAL library check for host device enumeration HAL_CFLAGS= HAL_LIBS= AC_ARG_WITH([hal], - [ --with-hal use HAL for host device enumeration], + AC_HELP_STRING([--with-hal], [use HAL for host device enumeration @<:@default=check@:>@]), [], [with_hal=check]) @@ -1757,7 +1757,7 @@ UDEV_LIBS= PCIACCESS_CFLAGS= PCIACCESS_LIBS= AC_ARG_WITH([udev], - [ --with-udev use libudev for host device enumeration], + AC_HELP_STRING([--with-udev], [use libudev for host device enumeration @<:@default=check@:>@]), [], [with_udev=check]) @@ -1809,11 +1809,11 @@ AM_CONDITIONAL([WITH_LINUX], [test `uname -s` = "Linux"]) AC_ARG_WITH([qemu-user], - [ --with-qemu-user username to run QEMU system instance as], + AC_HELP_STRING([--with-qemu-user], [username to run QEMU system instance as @<:@default=root@:>@]), [QEMU_USER=${withval}], [QEMU_USER=root]) AC_ARG_WITH([qemu-group], - [ --with-qemu-group groupname to run QEMU system instance as], + AC_HELP_STRING([--with-qemu-group], [groupname to run QEMU system instance as @<:@default=root@:>@]), [QEMU_GROUP=${withval}], [QEMU_GROUP=root]) AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) -- 1.6.6

3 5

[libvirt] [PATCH 0/4] A bit of configure clear-up
by Diego Elio Pettenò 18 Jan '10

18 Jan '10

Since on the whole it seems like the configure could see some cleanup, as it seem to use lots of older constructs and repeated code, I tried doing some basic cleaning. My changes also require autoconf-2.63… it could be something older as well, but 2.63 is new enough I'd say. If nobody has reasons for 2.59 compatibility to stick around, it would probably improve a lot. HTH! -- Diego

4 14

[libvirt] [PATCH] qemu: Use log output for pty assignment if 'info chardev' is unavailable
by Matthias Bolte 18 Jan '10

18 Jan '10

qemudFindCharDevicePTYsMonitor reports an error if 'info chardev' didn't provide information for a requested device, even if the log output parsing had found the pty path for that device. This makes pty assignment fail for older QEMU/KVM versions. For example KVM 72 on Debian doesn't support 'info chardev', so qemuMonitorTextGetPtyPaths cannot parse any useful information and the hash for device-id-to-pty-path mapping stays empty. Make qemudFindCharDevicePTYsMonitor report an error only if the log output parsing and the 'info chardev' parsing failed to provide the pty path. --- src/qemu/qemu_driver.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d13119f..783d9fc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1428,9 +1428,17 @@ qemudFindCharDevicePTYsMonitor(virConnectPtr conn, \ const char *path = (const char *) virHashLookup(paths, id); \ if (path == NULL) { \ - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,\ - _("no assigned pty for device %s"), id); \ - return -1; \ + if (chr->data.file.path == NULL) { \ + /* neither the log output nor 'info chardev' had a */ \ + /* pty path for this chardev, report an error */ \ + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, \ + _("no assigned pty for device %s"), id); \ + return -1; \ + } else { \ + /* 'info chardev' had no pty path for this chardev, */\ + /* but the log output had, so we're fine */ \ + continue; \ + } \ } \ \ VIR_FREE(chr->data.file.path); \ -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Add VNC support
by Matthias Bolte 18 Jan '10

18 Jan '10

* src/conf/domain_conf.c: add defaults for the video device * src/esx/esx_vmx.[ch]: add VNC support to the VMX handling * tests/vmx2xmltest.c, tests/xml2vmxtest.c: add tests for the VNC support --- src/conf/domain_conf.c | 5 + src/esx/esx_vmx.c | 146 +++++++++++++++++++++++++++- src/esx/esx_vmx.h | 6 + tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx | 6 + tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 17 +++ tests/vmx2xmltest.c | 4 +- tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx | 11 ++ tests/xml2vmxdata/xml2vmx-graphics-vnc.xml | 11 ++ tests/xml2vmxtest.c | 2 + 9 files changed, 203 insertions(+), 5 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-graphics-vnc.xml create mode 100644 tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-graphics-vnc.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 126e7e1..5c427fb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2490,6 +2490,8 @@ virDomainVideoDefaultRAM(virDomainDefPtr def, case VIR_DOMAIN_VIDEO_TYPE_VMVGA: if (def->virtType == VIR_DOMAIN_VIRT_VBOX) return 8 * 1024; + else if (def->virtType == VIR_DOMAIN_VIRT_VMWARE) + return 4 * 1024; else return 9 * 1024; break; @@ -2523,6 +2525,9 @@ virDomainVideoDefaultType(virDomainDefPtr def) case VIR_DOMAIN_VIRT_VBOX: return VIR_DOMAIN_VIDEO_TYPE_VBOX; + case VIR_DOMAIN_VIRT_VMWARE: + return VIR_DOMAIN_VIDEO_TYPE_VMVGA; + default: return -1; } diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 8e016df..777a60a 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -731,7 +731,7 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, char *guestOS = NULL; int controller; int port; - int present; + int present; // boolean char *scsi_virtualDev = NULL; int id; @@ -967,7 +967,20 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, def->localtime*/ /* def:graphics */ - /* FIXME */ + if (VIR_ALLOC_N(def->graphics, 1) < 0) { + virReportOOMError(NULL); + goto failure; + } + + def->ngraphics = 0; + + if (esxVMX_ParseVNC(conf, &def->graphics[def->ngraphics]) < 0) { + goto failure; + } + + if (def->graphics[def->ngraphics] != NULL) { + ++def->ngraphics; + } /* def:disks: 4 * 15 scsi + 2 * 2 ide + 2 floppy = 66 */ if (VIR_ALLOC_N(def->disks, 66) < 0) { @@ -1155,6 +1168,70 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, int +esxVMX_ParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def) +{ + int enabled = 0; // boolean + long long port = 0; + + if (def == NULL || *def != NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + return -1; + } + + if (esxUtil_GetConfigBoolean(conf, "RemoteDisplay.vnc.enabled", + &enabled, 0, 1) < 0) { + return -1; + } + + if (! enabled) { + return 0; + } + + if (VIR_ALLOC(*def) < 0) { + virReportOOMError(NULL); + goto failure; + } + + (*def)->type = VIR_DOMAIN_GRAPHICS_TYPE_VNC; + + if (esxUtil_GetConfigLong(conf, "RemoteDisplay.vnc.port", + &port, -1, 1) < 0 || + esxUtil_GetConfigString(conf, "RemoteDisplay.vnc.ip", + &(*def)->data.vnc.listenAddr, 1) < 0 || + esxUtil_GetConfigString(conf, "RemoteDisplay.vnc.keymap", + &(*def)->data.vnc.keymap, 1) < 0 || + esxUtil_GetConfigString(conf, "RemoteDisplay.vnc.password", + &(*def)->data.vnc.passwd, 1) < 0) { + goto failure; + } + + if (port < 0) { + VIR_WARN0("VNC is enabled but VMX entry 'RemoteDisplay.vnc.port' " + "is missing, the VNC port is unknown"); + + (*def)->data.vnc.port = 0; + (*def)->data.vnc.autoport = 1; + } else { + if (port < 5900 || port > 5964) { + VIR_WARN("VNC port %lld it out of [5900..5964] range", port); + } + + (*def)->data.vnc.port = port; + (*def)->data.vnc.autoport = 0; + } + + return 0; + + failure: + virDomainGraphicsDefFree(*def); + *def = NULL; + + return -1; +} + + + +int esxVMX_ParseSCSIController(virConfPtr conf, int controller, int *present, char **virtualDev) { @@ -2195,7 +2272,7 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, (int)(def->memory / 1024)); } - /* vmx:numvcpus -> def:vcpus */ + /* def:vcpus -> vmx:numvcpus */ if (def->vcpus <= 0 || (def->vcpus % 2 != 0 && def->vcpus != 1)) { ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Expecting domain XML entry 'vcpu' to be an unsigned " @@ -2241,6 +2318,24 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, virBufferAddLit(&buffer, "\"\n"); } + /* def:graphics */ + for (i = 0; i < def->ngraphics; ++i) { + switch (def->graphics[i]->type) { + case VIR_DOMAIN_GRAPHICS_TYPE_VNC: + if (esxVMX_FormatVNC(def->graphics[i], &buffer) < 0) { + goto failure; + } + + break; + + default: + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, + "Unsupported graphics type '%s'", + virDomainGraphicsTypeToString(def->graphics[i]->type)); + goto failure; + } + } + /* def:disks */ int scsi_present[4] = { 0, 0, 0, 0 }; char *scsi_virtualDev[4] = { NULL, NULL, NULL, NULL }; @@ -2285,7 +2380,7 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, default: ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Unsuppotred disk device type '%s'", + "Unsupported disk device type '%s'", virDomainDiskDeviceTypeToString(def->disks[i]->device)); goto failure; } @@ -2341,6 +2436,49 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, int +esxVMX_FormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer) +{ + if (def->type != VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid argument"); + return -1; + } + + virBufferVSprintf(buffer, "RemoteDisplay.vnc.enabled = \"true\"\n"); + + if (def->data.vnc.autoport) { + VIR_WARN0("VNC autoport is enabled, but the automatically assigned " + "VNC port cannot be read back"); + } else { + if (def->data.vnc.port < 5900 || def->data.vnc.port > 5964) { + VIR_WARN("VNC port %d it out of [5900..5964] range", + def->data.vnc.port); + } + + virBufferVSprintf(buffer, "RemoteDisplay.vnc.port = \"%d\"\n", + def->data.vnc.port); + } + + if (def->data.vnc.listenAddr != NULL) { + virBufferVSprintf(buffer, "RemoteDisplay.vnc.ip = \"%s\"\n", + def->data.vnc.listenAddr); + } + + if (def->data.vnc.keymap != NULL) { + virBufferVSprintf(buffer, "RemoteDisplay.vnc.keymap = \"%s\"\n", + def->data.vnc.keymap); + } + + if (def->data.vnc.passwd != NULL) { + virBufferVSprintf(buffer, "RemoteDisplay.vnc.password = \"%s\"\n", + def->data.vnc.passwd); + } + + return 0; +} + + + +int esxVMX_FormatHardDisk(esxVI_Context *ctx, virDomainDiskDefPtr def, virBufferPtr buffer) { diff --git a/src/esx/esx_vmx.h b/src/esx/esx_vmx.h index 325005e..6193409 100644 --- a/src/esx/esx_vmx.h +++ b/src/esx/esx_vmx.h @@ -61,6 +61,9 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, esxVI_APIVersion apiVersion); int +esxVMX_ParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def); + +int esxVMX_ParseSCSIController(virConfPtr conf, int controller, int *present, char **virtualDev); @@ -96,6 +99,9 @@ esxVMX_FormatConfig(esxVI_Context *ctx, virDomainDefPtr def, esxVI_APIVersion apiVersion); int +esxVMX_FormatVNC(virDomainGraphicsDefPtr def, virBufferPtr buffer); + +int esxVMX_FormatHardDisk(esxVI_Context *ctx, virDomainDiskDefPtr def, virBufferPtr buffer); diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx b/tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx new file mode 100644 index 0000000..bd3e55f --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-graphics-vnc.vmx @@ -0,0 +1,6 @@ +config.version = "8" +virtualHW.version = "4" +RemoteDisplay.vnc.enabled = "true" +RemoteDisplay.vnc.port = "5903" +RemoteDisplay.vnc.keymap = "de" +RemoteDisplay.vnc.password = "password" diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml new file mode 100644 index 0000000..159324d --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml @@ -0,0 +1,17 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='5903' autoport='no' keymap='de' passwd='password'/> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index b83f23f..8ea0b12 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -42,7 +42,7 @@ testCompareFiles(const char *vmx, const char *xml, esxVI_APIVersion apiVersion) goto failure; } - formatted = virDomainDefFormat(NULL, def, 0); + formatted = virDomainDefFormat(NULL, def, VIR_DOMAIN_XML_SECURE); if (formatted == NULL) { goto failure; @@ -120,6 +120,8 @@ mymain(int argc, char **argv) DO_TEST("minimal", "minimal", esxVI_APIVersion_25); DO_TEST("minimal-64bit", "minimal-64bit", esxVI_APIVersion_25); + DO_TEST("graphics-vnc", "graphics-vnc", esxVI_APIVersion_25); + DO_TEST("scsi-buslogic", "scsi-buslogic", esxVI_APIVersion_25); DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_APIVersion_25); diff --git a/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx b/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx new file mode 100644 index 0000000..b4966b5 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx @@ -0,0 +1,11 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "minimal" +memsize = "4" +numvcpus = "1" +RemoteDisplay.vnc.enabled = "true" +RemoteDisplay.vnc.port = "5903" +RemoteDisplay.vnc.keymap = "de" +RemoteDisplay.vnc.password = "password" diff --git a/tests/xml2vmxdata/xml2vmx-graphics-vnc.xml b/tests/xml2vmxdata/xml2vmx-graphics-vnc.xml new file mode 100644 index 0000000..400dcdd --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-graphics-vnc.xml @@ -0,0 +1,11 @@ +<domain type='vmware'> + <name>minimal</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <graphics type='vnc' port='5903' autoport='no' keymap='de' passwd='password'/> + </devices> +</domain> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index dfaca02..530dd2a 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -173,6 +173,8 @@ mymain(int argc, char **argv) DO_TEST("minimal", "minimal", esxVI_APIVersion_25); DO_TEST("minimal-64bit", "minimal-64bit", esxVI_APIVersion_25); + DO_TEST("graphics-vnc", "graphics-vnc", esxVI_APIVersion_25); + DO_TEST("scsi-buslogic", "scsi-buslogic", esxVI_APIVersion_25); DO_TEST("scsi-writethrough", "scsi-writethrough", esxVI_APIVersion_25); -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Make the domain part of the hostname optional
by Matthias Bolte 18 Jan '10

18 Jan '10

Before the driver assumed that there is always a domain part. That's not true. Now the domain part is handled as optional. --- src/esx/esx_driver.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 4ed4533..aeb3d07 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -773,14 +773,17 @@ esxGetHostname(virConnectPtr conn) } if (domainName == NULL || strlen(domainName) < 1) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - "Missing or empty 'domainName' property"); - goto failure; - } + complete = strdup(hostName); - if (virAsprintf(&complete, "%s.%s", hostName, domainName) < 0) { - virReportOOMError(NULL); - goto failure; + if (complete == NULL) { + virReportOOMError(NULL); + goto failure; + } + } else { + if (virAsprintf(&complete, "%s.%s", hostName, domainName) < 0) { + virReportOOMError(NULL); + goto failure; + } } cleanup: -- 1.6.3.3

2 2

[libvirt] [PATCH] esx: Add stubs for secondary driver types
by Matthias Bolte 18 Jan '10

18 Jan '10

This stops libvirt from probing for a libvirtd on the ESX server and sets the base for the implementation of the secondary drivers. --- src/Makefile.am | 5 ++ src/esx/esx_device_monitor.c | 93 +++++++++++++++++++++++++++++++ src/esx/esx_device_monitor.h | 29 ++++++++++ src/esx/esx_driver.c | 28 +++++----- src/esx/esx_driver.h | 20 +++++++- src/esx/esx_interface_driver.c | 96 ++++++++++++++++++++++++++++++++ src/esx/esx_interface_driver.h | 29 ++++++++++ src/esx/esx_network_driver.c | 101 ++++++++++++++++++++++++++++++++++ src/esx/esx_network_driver.h | 29 ++++++++++ src/esx/esx_secret_driver.c | 91 +++++++++++++++++++++++++++++++ src/esx/esx_secret_driver.h | 28 ++++++++++ src/esx/esx_storage_driver.c | 117 ++++++++++++++++++++++++++++++++++++++++ src/esx/esx_storage_driver.h | 29 ++++++++++ 13 files changed, 680 insertions(+), 15 deletions(-) create mode 100644 src/esx/esx_device_monitor.c create mode 100644 src/esx/esx_device_monitor.h create mode 100644 src/esx/esx_interface_driver.c create mode 100644 src/esx/esx_interface_driver.h create mode 100644 src/esx/esx_network_driver.c create mode 100644 src/esx/esx_network_driver.h create mode 100644 src/esx/esx_secret_driver.c create mode 100644 src/esx/esx_secret_driver.h create mode 100644 src/esx/esx_storage_driver.c create mode 100644 src/esx/esx_storage_driver.h diff --git a/src/Makefile.am b/src/Makefile.am index 324030b..7d426ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -214,6 +214,11 @@ ONE_DRIVER_SOURCES = \ ESX_DRIVER_SOURCES = \ esx/esx_driver.c esx/esx_driver.h \ + esx/esx_interface_driver.c esx/esx_interface_driver.h \ + esx/esx_network_driver.c esx/esx_network_driver.h \ + esx/esx_storage_driver.c esx/esx_storage_driver.h \ + esx/esx_device_monitor.c esx/esx_device_monitor.h \ + esx/esx_secret_driver.c esx/esx_secret_driver.h \ esx/esx_util.c esx/esx_util.h \ esx/esx_vi.c esx/esx_vi.h \ esx/esx_vi_methods.c esx/esx_vi_methods.h \ diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c new file mode 100644 index 0000000..c813adf --- /dev/null +++ b/src/esx/esx_device_monitor.c @@ -0,0 +1,93 @@ + +/* + * esx_device_monitor.c: device monitor methods for managing VMware ESX + * host devices + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#include <config.h> + +#include "internal.h" +#include "virterror_internal.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" +#include "esx_driver.h" +#include "esx_device_monitor.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_ESX + +#define ESX_ERROR(conn, code, fmt...) \ + virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + __LINE__, fmt) + + + +static virDrvOpenStatus +esxDeviceOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (STRNEQ(conn->driver->name, "ESX")) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->devMonPrivateData = conn->privateData; + + return VIR_DRV_OPEN_SUCCESS; +} + + + +static int +esxDeviceClose(virConnectPtr conn) +{ + conn->devMonPrivateData = NULL; + + return 0; +} + + + +static virDeviceMonitor esxDeviceMonitor = { + "ESX", /* name */ + esxDeviceOpen, /* open */ + esxDeviceClose, /* close */ + NULL, /* numOfDevices */ + NULL, /* listDevices */ + NULL, /* deviceLookupByName */ + NULL, /* deviceDumpXML */ + NULL, /* deviceGetParent */ + NULL, /* deviceNumOfCaps */ + NULL, /* deviceListCaps */ + NULL, /* deviceCreateXML */ + NULL, /* deviceDestroy */ +}; + + + +int +esxDeviceRegister(void) +{ + return virRegisterDeviceMonitor(&esxDeviceMonitor); +} diff --git a/src/esx/esx_device_monitor.h b/src/esx/esx_device_monitor.h new file mode 100644 index 0000000..e72a5b6 --- /dev/null +++ b/src/esx/esx_device_monitor.h @@ -0,0 +1,29 @@ + +/* + * esx_device_monitor.h: device monitor methods for managing VMware ESX + * host devices + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#ifndef __ESX_DEVICE_MONITOR_H__ +#define __ESX_DEVICE_MONITOR_H__ + +int esxDeviceRegister(void); + +#endif /* __ESX_DEVICE_MONITOR_H__ */ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index ddda66e..5aa3237 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2,7 +2,7 @@ /* * esx_driver.c: core driver methods for managing VMware ESX hosts * - * Copyright (C) 2009 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2009, 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * * This library is free software; you can redistribute it and/or @@ -33,6 +33,11 @@ #include "logging.h" #include "uuid.h" #include "esx_driver.h" +#include "esx_interface_driver.h" +#include "esx_network_driver.h" +#include "esx_storage_driver.h" +#include "esx_device_monitor.h" +#include "esx_secret_driver.h" #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" @@ -46,18 +51,6 @@ static int esxDomainGetMaxVcpus(virDomainPtr domain); -typedef struct _esxPrivate { - esxVI_Context *host; - esxVI_Context *vCenter; - virCapsPtr caps; - char *transport; - int32_t maxVcpus; - esxVI_Boolean supportsVMotion; - esxVI_Boolean supportsLongMode; /* aka x86_64 */ - esxVI_Boolean autoAnswer; - int32_t usedCpuTimeCounterId; -} esxPrivate; - static esxVI_Boolean @@ -3479,7 +3472,14 @@ static virDriver esxDriver = { int esxRegister(void) { - virRegisterDriver(&esxDriver); + if (virRegisterDriver(&esxDriver) < 0 || + esxInterfaceRegister() < 0 || + esxNetworkRegister() < 0 || + esxStorageRegister() < 0 || + esxDeviceRegister() < 0 || + esxSecretRegister() < 0) { + return -1; + } return 0; } diff --git a/src/esx/esx_driver.h b/src/esx/esx_driver.h index 85f4b32..18e821b 100644 --- a/src/esx/esx_driver.h +++ b/src/esx/esx_driver.h @@ -2,7 +2,7 @@ /* * esx_driver.h: core driver methods for managing VMware ESX hosts * - * Copyright (C) 2009 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2009, 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> * Copyright (C) 2009 Maximilian Wilhelm <max(a)rfc2324.org> * * This library is free software; you can redistribute it and/or @@ -24,6 +24,24 @@ #ifndef __ESX_DRIVER_H__ #define __ESX_DRIVER_H__ +#include "internal.h" +#include "capabilities.h" +#include "esx_vi.h" + +typedef struct _esxPrivate { + esxVI_Context *host; + esxVI_Context *vCenter; + virCapsPtr caps; + char *transport; + int32_t maxVcpus; + esxVI_Boolean supportsVMotion; + esxVI_Boolean supportsLongMode; /* aka x86_64 */ + esxVI_Boolean autoAnswer; + int32_t usedCpuTimeCounterId; +} esxPrivate; + + + int esxRegister(void); #endif /* __ESX_DRIVER_H__ */ diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c new file mode 100644 index 0000000..7664e4a --- /dev/null +++ b/src/esx/esx_interface_driver.c @@ -0,0 +1,96 @@ + +/* + * esx_interface_driver.h: interface driver methods for managing VMware ESX + * host interfaces + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#include <config.h> + +#include "internal.h" +#include "virterror_internal.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" +#include "esx_driver.h" +#include "esx_interface_driver.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_ESX + +#define ESX_ERROR(conn, code, fmt...) \ + virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + __LINE__, fmt) + + + +static virDrvOpenStatus +esxInterfaceOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (STRNEQ(conn->driver->name, "ESX")) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->interfacePrivateData = conn->privateData; + + return VIR_DRV_OPEN_SUCCESS; +} + + + +static int +esxInterfaceClose(virConnectPtr conn) +{ + conn->interfacePrivateData = NULL; + + return 0; +} + + + +static virInterfaceDriver esxInterfaceDriver = { + "ESX", /* name */ + esxInterfaceOpen, /* open */ + esxInterfaceClose, /* close */ + NULL, /* numOfInterfaces */ + NULL, /* listInterfaces */ + NULL, /* numOfDefinedInterfaces */ + NULL, /* listDefinedInterfaces */ + NULL, /* interfaceLookupByName */ + NULL, /* interfaceLookupByMACString */ + NULL, /* interfaceGetXMLDesc */ + NULL, /* interfaceDefineXML */ + NULL, /* interfaceUndefine */ + NULL, /* interfaceCreate */ + NULL, /* interfaceDestroy */ + NULL, /* interfaceIsActive */ +}; + + + +int +esxInterfaceRegister(void) +{ + return virRegisterInterfaceDriver(&esxInterfaceDriver); +} diff --git a/src/esx/esx_interface_driver.h b/src/esx/esx_interface_driver.h new file mode 100644 index 0000000..d30641a --- /dev/null +++ b/src/esx/esx_interface_driver.h @@ -0,0 +1,29 @@ + +/* + * esx_interface_driver.h: interface driver methods for managing VMware ESX + * host interfaces + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#ifndef __ESX_INTERFACE_DRIVER_H__ +#define __ESX_INTERFACE_DRIVER_H__ + +int esxInterfaceRegister(void); + +#endif /* __ESX_INTERFACE_DRIVER_H__ */ diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c new file mode 100644 index 0000000..9532352 --- /dev/null +++ b/src/esx/esx_network_driver.c @@ -0,0 +1,101 @@ + +/* + * esx_network_driver.c: network driver methods for managing VMware ESX + * host networks + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#include <config.h> + +#include "internal.h" +#include "virterror_internal.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" +#include "esx_driver.h" +#include "esx_network_driver.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_ESX + +#define ESX_ERROR(conn, code, fmt...) \ + virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + __LINE__, fmt) + + + +static virDrvOpenStatus +esxNetworkOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (STRNEQ(conn->driver->name, "ESX")) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->networkPrivateData = conn->privateData; + + return VIR_DRV_OPEN_SUCCESS; +} + + + +static int +esxNetworkClose(virConnectPtr conn) +{ + conn->networkPrivateData = NULL; + + return 0; +} + + + +static virNetworkDriver esxNetworkDriver = { + "ESX", /* name */ + esxNetworkOpen, /* open */ + esxNetworkClose, /* close */ + NULL, /* numOfNetworks */ + NULL, /* listNetworks */ + NULL, /* numOfDefinedNetworks */ + NULL, /* listDefinedNetworks */ + NULL, /* networkLookupByUUID */ + NULL, /* networkLookupByName */ + NULL, /* networkCreateXML */ + NULL, /* networkDefineXML */ + NULL, /* networkUndefine */ + NULL, /* networkCreate */ + NULL, /* networkDestroy */ + NULL, /* networkDumpXML */ + NULL, /* networkGetBridgeName */ + NULL, /* networkGetAutostart */ + NULL, /* networkSetAutostart */ + NULL, /* networkIsActive */ + NULL, /* networkIsPersistent */ +}; + + + +int +esxNetworkRegister(void) +{ + return virRegisterNetworkDriver(&esxNetworkDriver); +} diff --git a/src/esx/esx_network_driver.h b/src/esx/esx_network_driver.h new file mode 100644 index 0000000..f117e03 --- /dev/null +++ b/src/esx/esx_network_driver.h @@ -0,0 +1,29 @@ + +/* + * esx_network_driver.h: network driver methods for managing VMware ESX + * host networks + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#ifndef __ESX_NETWORK_DRIVER_H__ +#define __ESX_NETWORK_DRIVER_H__ + +int esxNetworkRegister(void); + +#endif /* __ESX_NETWORK_DRIVER_H__ */ diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c new file mode 100644 index 0000000..e451b13 --- /dev/null +++ b/src/esx/esx_secret_driver.c @@ -0,0 +1,91 @@ + +/* + * esx_secret_driver.c: secret driver methods for VMware ESX secret manipulation + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#include <config.h> + +#include "internal.h" +#include "virterror_internal.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" +#include "esx_driver.h" +#include "esx_secret_driver.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_ESX + +#define ESX_ERROR(conn, code, fmt...) \ + virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + __LINE__, fmt) + + + +static virDrvOpenStatus +esxSecretOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (STRNEQ(conn->driver->name, "ESX")) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->secretPrivateData = conn->privateData; + + return VIR_DRV_OPEN_SUCCESS; +} + + + +static int +esxSecretClose(virConnectPtr conn) +{ + conn->secretPrivateData = NULL; + + return 0; +} + + + +static virSecretDriver esxSecretDriver = { + "ESX", /* name */ + esxSecretOpen, /* open */ + esxSecretClose, /* close */ + NULL, /* numOfSecrets */ + NULL, /* listSecrets */ + NULL, /* lookupByUUID */ + NULL, /* lookupByUsage */ + NULL, /* defineXML */ + NULL, /* getXMLDesc */ + NULL, /* setValue */ + NULL, /* getValue */ + NULL, /* undefine */ +}; + + + +int +esxSecretRegister(void) +{ + return virRegisterSecretDriver(&esxSecretDriver); +} diff --git a/src/esx/esx_secret_driver.h b/src/esx/esx_secret_driver.h new file mode 100644 index 0000000..c0d4a48 --- /dev/null +++ b/src/esx/esx_secret_driver.h @@ -0,0 +1,28 @@ + +/* + * esx_secret_driver.h: secret driver methods for VMware ESX secret manipulation + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#ifndef __ESX_SECRET_DRIVER_H__ +#define __ESX_SECRET_DRIVER_H__ + +int esxSecretRegister(void); + +#endif /* __ESX_SECRET_DRIVER_H__ */ diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c new file mode 100644 index 0000000..7e9b98d --- /dev/null +++ b/src/esx/esx_storage_driver.c @@ -0,0 +1,117 @@ + +/* + * esx_storage_driver.c: storage driver methods for managing VMware ESX + * host storage + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#include <config.h> + +#include "internal.h" +#include "virterror_internal.h" +#include "util.h" +#include "memory.h" +#include "logging.h" +#include "uuid.h" +#include "esx_driver.h" +#include "esx_storage_driver.h" +#include "esx_vi.h" +#include "esx_vi_methods.h" +#include "esx_util.h" + +#define VIR_FROM_THIS VIR_FROM_ESX + +#define ESX_ERROR(conn, code, fmt...) \ + virReportErrorHelper(conn, VIR_FROM_ESX, code, __FILE__, __FUNCTION__, \ + __LINE__, fmt) + + + +static virDrvOpenStatus +esxStorageOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) +{ + if (STRNEQ(conn->driver->name, "ESX")) { + return VIR_DRV_OPEN_DECLINED; + } + + conn->storagePrivateData = conn->privateData; + + return VIR_DRV_OPEN_SUCCESS; +} + + + +static int +esxStorageClose(virConnectPtr conn) +{ + conn->storagePrivateData = NULL; + + return 0; +} + + + +static virStorageDriver esxStorageDriver = { + "ESX", /* name */ + esxStorageOpen, /* open */ + esxStorageClose, /* close */ + NULL, /* numOfPools */ + NULL, /* listPools */ + NULL, /* numOfDefinedPools */ + NULL, /* listDefinedPools */ + NULL, /* findPoolSources */ + NULL, /* poolLookupByName */ + NULL, /* poolLookupByUUID */ + NULL, /* poolLookupByVolume */ + NULL, /* poolCreateXML */ + NULL, /* poolDefineXML */ + NULL, /* poolBuild */ + NULL, /* poolUndefine */ + NULL, /* poolCreate */ + NULL, /* poolDestroy */ + NULL, /* poolDelete */ + NULL, /* poolRefresh */ + NULL, /* poolGetInfo */ + NULL, /* poolGetXMLDesc */ + NULL, /* poolGetAutostart */ + NULL, /* poolSetAutostart */ + NULL, /* poolNumOfVolumes */ + NULL, /* poolListVolumes */ + NULL, /* volLookupByName */ + NULL, /* volLookupByKey */ + NULL, /* volLookupByPath */ + NULL, /* volCreateXML */ + NULL, /* volCreateXMLFrom */ + NULL, /* volDelete */ + NULL, /* volGetInfo */ + NULL, /* volGetXMLDesc */ + NULL, /* volGetPath */ + NULL, /* poolIsActive */ + NULL, /* poolIsPersistent */ +}; + + + +int +esxStorageRegister(void) +{ + return virRegisterStorageDriver(&esxStorageDriver); +} diff --git a/src/esx/esx_storage_driver.h b/src/esx/esx_storage_driver.h new file mode 100644 index 0000000..91a5d03 --- /dev/null +++ b/src/esx/esx_storage_driver.h @@ -0,0 +1,29 @@ + +/* + * esx_storage_driver.h: storage driver methods for managing VMware ESX + * host storage + * + * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * + * 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 + * + */ + +#ifndef __ESX_STORAGE_DRIVER_H__ +#define __ESX_STORAGE_DRIVER_H__ + +int esxStorageRegister(void); + +#endif /* __ESX_STORAGE_DRIVER_H__ */ -- 1.6.3.3

2 2

[libvirt] LVM storage pool with existing mirrored volumes
by Ben Roberts 18 Jan '10

18 Jan '10

Hi, I tried to setup a lvm-backed storage pool, reusing an existing volume group which already contains a handful of mirrored logical volumes. For reference, I am using lvm 2.02.56-r3, qemu-kvm 0.12.1.2 and libvirt 0.7.5 on an up-to-date ~amd64 gentoo system. The first issue I encountered is when trying to activate the storage pool, the process fails with "internal error lvs command failed". This appears to be because the output of lvs is slightly different when using mirrored lvs, and is breaking the parser: /sbin/lvs --separator , --noheadings --units b --unbuffered --nosuffix --options lv_name,origin,uuid,devices,seg_size,vg_extent_size bigpool vms,,0PzrRS-8Ljs-SUq0-ywFH-BI3d-RI0V-aibupu,vms_mimage_0(0),vms_mimage_1(0),107374182400,4194304 backups,,Snk2NL-oJe3-GpTL-Qihs-ZjjG-xPyj-ufmwCp,backups_mimage_0(0),backups_mimage_1(0),214748364800,4194304 The device column of output would normally contain something like "/dev/sda(1234)", but here contains "vms_mimage_0(0),vms_mimage_1(0). This is causing the parser to misinterpret the output, and it believes the lv name to be suffixed with a trailing comma, eg "vms,". When trying to access "/dev/bigpool/vms,", the command errors with File or Directory not Found. When adding the --all parameter to lvs, the hidden mirroring lvs are visible, and these have the expected structure: vms,,0PzrRS-8Ljs-SUq0-ywFH-BI3d-RI0V-aibupu,vms_mimage_0(0),vms_mimage_1(0),107374182400,4194304 [vms_mlog],,vnOzg8-ynKc-kM8F-RKdM-xXC0-PJlG-qcgmFh,/dev/sda2(0),4194304,4194304 [vms_mimage_0],,2pXjHt-aARa-FOO7-ZL6N-ahpu-ebdr-P6Qxj3,/dev/sdb1(0),107374182400,4194304 [vms_mimage_1],,ITd8CT-JpKi-Y2a6-a4jc-2yDa-9VmG-gWgRd8,/dev/sdc1(51200),107374182400,4194304 Presumably, without the --all parameter and listing the internal mirroring volumes, libvirt will miscalculate sizes of LVs in the VG. This bug appears to prevent the use of any volume group which contains one or more mirrored logical volumes as a backend storage pool. -- Ben Roberts Computer Science MEng, Part IV Electronics and Computer Science, University of Southampton

3 2

[libvirt] [PATCH] Man page for LXC BZ 528709
by David Jorm 17 Jan '10

17 Jan '10

--- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -114,6 +114,10 @@ allow to connect locally as root to the daemon supervising QEmu and KVM domains allow to connect locally as a normal user to his own set of QEmu and KVM domains +=item lxc:/// + +connect to a local linux container + =back For remote access see the documentation page on how to make URIs.

2 1

[libvirt] [PATCH] Man page BZ 548485
by David Jorm 17 Jan '10

17 Jan '10

--- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -342,7 +342,15 @@ severed upon restore, as TCP timeouts may have expired. =item B<schedinfo> optional I<--weight> B<number> optional I<--cap> B<number> I<domain-id> -Allows to show (and set) the domain scheduler parameters. +Allows you to show (and set) the domain scheduler parameters. The parameters available for each hypervisor are: + +LXC, QEMU/KVM (posix scheduler): cpu_shares + +Xen (credit scheduler): weight, cap + +ESX (allocation scheduler): reservation, limit, shares + +B<Note>: The cpu_shares parameter has a valid value range of 0-262144. B<Note>: The weight and cap parameters are defined only for the XEN_CREDIT scheduler and are now I<DEPRECATED>.

2 1

[libvirt] [PATCH] Minor fixes for API extension doc
by Jim Fehlig 17 Jan '10

17 Jan '10

Update the API Extensions doc to reflect new source directory layout. --- docs/api_extension.html.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/api_extension.html.in b/docs/api_extension.html.in index 59d3414..de6eedc 100644 --- a/docs/api_extension.html.in +++ b/docs/api_extension.html.in @@ -178,7 +178,7 @@ involves making two additions to: - <code>qemud/remote_protocol.x</code> + <code>src/remote/remote_protocol.x</code> First, create two new structs for each new function that you're adding @@ -198,7 +198,7 @@ Once these changes are in place, it's necessary to run 'make rpcgen' - in the qemud directory to create the .c and .h files required by the + in the src directory to create the .c and .h files required by the remote protocol code. This must be done on a Linux host using the GLibC rpcgen program. Other rpcgen versions may generate code which results in bogus compile time warnings @@ -213,7 +213,7 @@ the rpcgen generated .h files. The remote method calls go in: - <code>src/remote_internal.c</code> + <code>src/remote/remote_internal.c</code> Each remote method invocation does the following: @@ -243,7 +243,7 @@ The server side dispatchers are implemented in: - <code>qemud/remote.c</code> + <code>daemon/remote.c</code> Again, this step uses the .h files generated by make rpcgen. -- 1.6.0.2

3 2

[libvirt] Visualizing the first four years of libvirt development
by Daniel P. Berrange 17 Jan '10

17 Jan '10

>From the 'just a bit of fun' category, I've published a couple of videos visualizing the first four years of libvirt development The first, created using 'gource' [1]: http://www.youtube.com/watch?v=sEN4gxmCOuw The second, creating using 'code_swarm' [2]: http://www.youtube.com/watch?v=ptvATk1xPIw In both of these you can clearly tell when we started using GIT, since the improved patch author attribution results in an explosion of participants in the visualizations :-) Of course some of that is also due to the expanding libvirt development from the introduction of new drivers like VMWare and VirtualBox... Regards, Daniel [1] http://code.google.com/p/gource/ [2] http://code.google.com/p/codeswarm/ -- |: 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 :|

1 0

[libvirt] Supressing error messages
by Bryan Kearney 16 Jan '10

16 Jan '10

When using the java library, we are seeing libvirt error messages spit out.. such as: libvir: Remote error : unable to connect to '/var/run/libvirt/libvirt-sock': No such file or directory Is there a means of supressing that logging via the api? -- bk

2 1

[libvirt] [PATCH] Fix validation of news.html
by Matthias Bolte 16 Jan '10

16 Jan '10

FYI, I pushed this simple fix. Matthias --- docs/news.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/news.html.in b/docs/news.html.in index 7e06096..83b394f 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -26,7 +26,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress. esx: Extend documentation about 'vcenter' and add some about 'auto_answer' (Matthias Bolte), Fix and improve domain xml video element description (Matthias Bolte), Fix owner and group in example volume XML (Matthew Booth), - add missing doc for device <shareable/> option (Daniel Veillard), + add missing doc for device <shareable/> option (Daniel Veillard), add AppArmor test and examples to dist (Jamie Strandboge), Update location of C# bindings. (Richard Jones), Fix typo in QEMU driver webpage (Daniel P. Berrange), -- 1.6.3.3

1 0

[libvirt] [PATCH] gnulib added a new syntax-check test: use $(VAR), not @VAR@
by Jim Meyering 16 Jan '10

16 Jan '10

Updating to newer gnulib also pulled in a new sytnax-check test that evoked new warnings. No big deal, but I addressed them. The only trick was to see that the warnings about @SCHEMADIR@ and @SYSCONFDIR@ were false positives. To allow them, I defined the variable in cfg.mk. See below. >From 6e76cfe38ba0ccafa7c4e81dcc0af04e31f8f447 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 15 Jan 2010 11:09:01 +0100 Subject: [PATCH] gnulib added a new syntax-check test: use $(VAR), not @VAR@ The latter is not officially "wrong", but *is* terribly anachronistic. I think automake documentation or comments call that syntax obsolescent. * cfg.mk (_makefile_at_at_check_exceptions): Exempt @SCHEMADIR@ and @SYSCONFDIR@ uses -- there are no Makefile variables for those. * docs/Makefile.am: Use $(INSTALL), not @INSTALL@. * examples/dominfo/Makefile.am: Similar. * examples/domsuspend/Makefile.am: Similar. * proxy/Makefile.am: Similar. * python/Makefile.am: Similar. * python/tests/Makefile.am: Similar. * src/Makefile.am: Similar. * tests/Makefile.am: Similar. --- cfg.mk | 5 ++++- docs/Makefile.am | 4 ++-- examples/dominfo/Makefile.am | 2 +- examples/domsuspend/Makefile.am | 2 +- proxy/Makefile.am | 2 +- python/Makefile.am | 10 +++++----- python/tests/Makefile.am | 2 +- src/Makefile.am | 10 +++++----- tests/Makefile.am | 2 +- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/cfg.mk b/cfg.mk index 45d6531..0f2d2a6 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,5 +1,5 @@ # Customize Makefile.maint. -*- makefile -*- -# Copyright (C) 2003-2009 Free Software Foundation, Inc. +# Copyright (C) 2003-2010 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -265,3 +265,6 @@ ifeq (0,$(MAKELEVEL)) $(error gnulib update required; run ./autogen.sh first) endif endif + +# Exempt @...@ uses of these symbols. +_makefile_at_at_check_exceptions = ' && !/(SCHEMA|SYSCONF)DIR/' diff --git a/docs/Makefile.am b/docs/Makefile.am index c19e963..eaac627 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -143,7 +143,7 @@ rebuild: api all install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) - -@INSTALL@ -m 0644 $(srcdir)/FAQ.html \ + -$(INSTALL) -m 0644 $(srcdir)/FAQ.html \ $(srcdir)/Libxml2-Logo-90x34.gif $(DESTDIR)$(HTML_DIR) $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/html for h in $(apihtml); do \ @@ -152,7 +152,7 @@ install-data-local: $(INSTALL) -m 0644 $(srcdir)/$$p $(DESTDIR)$(HTML_DIR)/html; done $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR) for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ - @INSTALL@ -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ + $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ done uninstall-local: diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am index a1694b8..2913e5b 100644 --- a/examples/dominfo/Makefile.am +++ b/examples/dominfo/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) +LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) noinst_PROGRAMS=info1 diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am index 41e9fdb..14b4205 100644 --- a/examples/domsuspend/Makefile.am +++ b/examples/domsuspend/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) +LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) noinst_PROGRAMS=suspend diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 97d6e5a..aef11ca 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I@top_srcdir@/src/util \ -I@top_srcdir@/src/conf \ -I@top_srcdir@/src/xen \ - @LIBXML_CFLAGS@ \ + $(LIBXML_CFLAGS) \ -DPROXY -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" $(WARN_CFLAGS) $(XEN_CFLAGS) diff --git a/python/Makefile.am b/python/Makefile.am index 58c6729..6b67e38 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -37,12 +37,12 @@ pyexec_LTLIBRARIES = libvirtmod.la libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h # Python <= 2.4 header files contain a redundant decl, hence we # need extra flags here -libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@ +libvirtmod_la_CFLAGS = $(WARN_PYTHON_CFLAGS) libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ - @CYGWIN_EXTRA_LDFLAGS@ + $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_la_LIBADD = $(mylibs) \ - @CYGWIN_EXTRA_LIBADD@ @CYGWIN_EXTRA_PYTHON_LIBADD@ + $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) GENERATE = generator.py API_DESC = $(top_srcdir)/docs/libvirt-api.xml $(srcdir)/libvirt-override-api.xml @@ -61,10 +61,10 @@ $(libvirtmod_la_OBJECTS): $(GENERATED) install-data-local: $(mkinstalldirs) $(DESTDIR)$(pyexecdir) - @INSTALL@ -m 0644 libvirt.py $(DESTDIR)$(pyexecdir) + $(INSTALL) -m 0644 libvirt.py $(DESTDIR)$(pyexecdir) $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR) @(for doc in $(DOCS) ; \ - do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) + do $(INSTALL) -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) uninstall-local: rm -f $(DESTDIR)$(pyexecdir)/libvirt.py diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 6011fef..28e24ba 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -30,7 +30,7 @@ clean: install-data-local: $(mkinstalldirs) $(DESTDIR)$(EXAMPLE_DIR) -(for test in $(PYTESTS); \ - do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done) + do $(INSTALL) -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done) uninstall-local: for test in $(PYTESTS); do rm -f $(DESTDIR)$(EXAMPLE_DIR)/$$test; done diff --git a/src/Makefile.am b/src/Makefile.am index 324030b..af97938 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -800,13 +800,13 @@ libvirt.syms: libvirt_public.syms $(USED_SYM_FILES) # Empty source list - it merely links a bunch of convenience libs together libvirt_la_SOURCES = libvirt_la_LIBADD += \ - @CYGWIN_EXTRA_LIBADD@ ../gnulib/lib/libgnu.la + $(CYGWIN_EXTRA_LIBADD) ../gnulib/lib/libgnu.la libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)libvirt.syms \ - -version-info @LIBVIRT_VERSION_INFO@ \ + -version-info $(LIBVIRT_VERSION_INFO) \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ $(LIBXML_LIBS) \ $(DRIVER_MODULE_LIBS) \ - @CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@ + $(CYGWIN_EXTRA_LDFLAGS) $(MINGW_EXTRA_LDFLAGS) libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT libvirt_la_DEPENDENCIES = $(libvirt_la_LIBADD) libvirt.syms @@ -818,8 +818,8 @@ noinst_LTLIBRARIES += libvirt_test.la # Remove version script from convenience library test_LDFLAGS = \ $$(echo '$(libvirt_la_LDFLAGS)' \ - |sed 's!@VERSION_SCRIPT_FLAGS@libvirt.syms!!' \ - |sed 's!-version-info @LIBVIRT_VERSION_INFO@!!') + |sed 's!$(VERSION_SCRIPT_FLAGS)libvirt.syms!!' \ + |sed 's!-version-info $(LIBVIRT_VERSION_INFO)!!') # Just like the above, but with a slightly different set of public symbols. libvirt_test_la_SOURCES = $(libvirt_la_SOURCES) diff --git a/tests/Makefile.am b/tests/Makefile.am index a20d7ce..584bdb3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,7 +27,7 @@ INCLUDES += \ endif LDADDS = \ - @STATIC_BINARIES@ \ + $(STATIC_BINARIES) \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ -- 1.6.6.556.gd6679

2 1