- Devel - libvirt List Archives

[libvirt] Fix wrong nodeinfo->mhz when cpufreq is enabled
by Thomas Treutner 04 Feb '10

04 Feb '10

Hi, I've written a little patch to fix wrong nodeinfo->mhz when the Linux kernel module cpufreq and a typical governor like ondemand are loaded. nodeinfo->mhz is then too low as libvirt just reads /proc/cpuinfo, entry "cpu MHz". This patch reads /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq if existing and corrects nodeinfo->mhz if the value found is higher. Using cpu0 is a crude hack but as discussed on IRC, considering different governors/maximum frequencies per cpu/core would require changing the nodeinfo struct, which would break the API. Some more info: https://bugzilla.redhat.com/show_bug.cgi?id=559762 Please have a careful look at my patch, my last C is quite some time ago. I tried to stick to linuxNodeInfoCPUPopulate, but f.e., checking for "&& *p == '\0'" after virStrToLong_ui doesn't work and I'm wondering why scaling_max_freq may not be terminated with by NUL? I also hope the file handling is correct, but please have a look. There is still some todo: Some logging would be helpful, maybe one of you could point out which function best to use? This is my first patch, so hopefully it follows in the next mail ;-) kr, tom

2 2

[libvirt] [PATCH] virt-pki-validate contains unexpanded SYSCONFDIR variable
by Doug Goldstein 04 Feb '10

04 Feb '10

virt-pki-validate contains an unexpanded SYSCONFDIR variable which causes it not to function at all. --- tools/virt-pki-validate.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index a428a96..3e8c642 100755 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -25,7 +25,7 @@ echo Found $CERTOOL # # Check the directory structure # -PKI="$(SYSCONFDIR)/pki" +PKI="@SYSCONFDIR@/pki" if [ ! -d $PKI ] then echo the $PKI directory is missing, it is usually -- 1.6.6.1

3 2

[libvirt] [PATCH] esx: Remove unnecessary casts
by Matthias Bolte 04 Feb '10

04 Feb '10

--- src/esx/esx_driver.c | 74 +++++++++++++++++++++++++------------------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index fc254c6..fc5a50e 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -558,7 +558,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) static int esxClose(virConnectPtr conn) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; esxVI_EnsureSession(priv->host); @@ -645,7 +645,7 @@ esxSupportsVMotion(esxPrivate *priv) static int esxSupportsFeature(virConnectPtr conn, int feature) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; esxVI_Boolean supportsVMotion = esxVI_Boolean_Undefined; switch (feature) { @@ -678,7 +678,7 @@ esxGetType(virConnectPtr conn ATTRIBUTE_UNUSED) static int esxGetVersion(virConnectPtr conn, unsigned long *version) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; char *temp; unsigned int major, minor, release; @@ -716,7 +716,7 @@ esxGetVersion(virConnectPtr conn, unsigned long *version) static char * esxGetHostname(virConnectPtr conn) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -805,7 +805,7 @@ static int esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) { int result = 0; - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -958,7 +958,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) static char * esxGetCapabilities(virConnectPtr conn) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; char *xml = virCapabilitiesFormatXML(priv->caps); if (xml == NULL) { @@ -974,7 +974,7 @@ esxGetCapabilities(virConnectPtr conn) static int esxListDomains(virConnectPtr conn, int *ids, int maxids) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; esxVI_ObjectContent *virtualMachineList = NULL; esxVI_ObjectContent *virtualMachine = NULL; esxVI_String *propertyNameList = NULL; @@ -1046,7 +1046,7 @@ esxListDomains(virConnectPtr conn, int *ids, int maxids) static int esxNumberOfDomains(virConnectPtr conn) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; if (esxVI_EnsureSession(priv->host) < 0) { return -1; @@ -1062,7 +1062,7 @@ esxNumberOfDomains(virConnectPtr conn) static virDomainPtr esxDomainLookupByID(virConnectPtr conn, int id) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachineList = NULL; esxVI_ObjectContent *virtualMachine = NULL; @@ -1145,7 +1145,7 @@ esxDomainLookupByID(virConnectPtr conn, int id) static virDomainPtr esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachine = NULL; esxVI_VirtualMachinePowerState powerState; @@ -1199,7 +1199,7 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) static virDomainPtr esxDomainLookupByName(virConnectPtr conn, const char *name) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachineList = NULL; esxVI_ObjectContent *virtualMachine = NULL; @@ -1283,7 +1283,7 @@ static int esxDomainSuspend(virDomainPtr domain) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_ObjectContent *virtualMachine = NULL; esxVI_String *propertyNameList = NULL; esxVI_VirtualMachinePowerState powerState; @@ -1338,7 +1338,7 @@ static int esxDomainResume(virDomainPtr domain) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_ObjectContent *virtualMachine = NULL; esxVI_String *propertyNameList = NULL; esxVI_VirtualMachinePowerState powerState; @@ -1393,7 +1393,7 @@ static int esxDomainShutdown(virDomainPtr domain) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_ObjectContent *virtualMachine = NULL; esxVI_String *propertyNameList = NULL; esxVI_VirtualMachinePowerState powerState; @@ -1438,7 +1438,7 @@ static int esxDomainReboot(virDomainPtr domain, unsigned int flags ATTRIBUTE_UNUSED) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_ObjectContent *virtualMachine = NULL; esxVI_String *propertyNameList = NULL; esxVI_VirtualMachinePowerState powerState; @@ -1483,7 +1483,7 @@ static int esxDomainDestroy(virDomainPtr domain) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_Context *ctx = NULL; esxVI_ObjectContent *virtualMachine = NULL; esxVI_String *propertyNameList = NULL; @@ -1559,7 +1559,7 @@ esxDomainGetOSType(virDomainPtr domain ATTRIBUTE_UNUSED) static unsigned long esxDomainGetMaxMemory(virDomainPtr domain) { - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachine = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -1616,7 +1616,7 @@ static int esxDomainSetMaxMemory(virDomainPtr domain, unsigned long memory) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_ObjectContent *virtualMachine = NULL; esxVI_VirtualMachineConfigSpec *spec = NULL; esxVI_ManagedObjectReference *task = NULL; @@ -1669,7 +1669,7 @@ static int esxDomainSetMemory(virDomainPtr domain, unsigned long memory) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_ObjectContent *virtualMachine = NULL; esxVI_VirtualMachineConfigSpec *spec = NULL; esxVI_ManagedObjectReference *task = NULL; @@ -1723,7 +1723,7 @@ static int esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachine = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -1978,7 +1978,7 @@ static int esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; int maxVcpus; esxVI_ObjectContent *virtualMachine = NULL; esxVI_VirtualMachineConfigSpec *spec = NULL; @@ -2050,7 +2050,7 @@ esxDomainSetVcpus(virDomainPtr domain, unsigned int nvcpus) static int esxDomainGetMaxVcpus(virDomainPtr domain) { - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -2109,7 +2109,7 @@ esxDomainGetMaxVcpus(virDomainPtr domain) static char * esxDomainDumpXML(virDomainPtr domain, int flags) { - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachine = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -2211,7 +2211,7 @@ esxDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, const char *nativeConfig, unsigned int flags ATTRIBUTE_UNUSED) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; virDomainDefPtr def = NULL; char *xml = NULL; @@ -2240,7 +2240,7 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, const char *domainXml, unsigned int flags ATTRIBUTE_UNUSED) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; virDomainDefPtr def = NULL; char *vmx = NULL; @@ -2268,7 +2268,7 @@ esxDomainXMLToNative(virConnectPtr conn, const char *nativeFormat, static int esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachineList = NULL; esxVI_ObjectContent *virtualMachine = NULL; @@ -2358,7 +2358,7 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) static int esxNumberOfDefinedDomains(virConnectPtr conn) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; if (esxVI_EnsureSession(priv->host) < 0) { return -1; @@ -2375,7 +2375,7 @@ static int esxDomainCreate(virDomainPtr domain) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_ObjectContent *virtualMachine = NULL; esxVI_String *propertyNameList = NULL; esxVI_VirtualMachinePowerState powerState; @@ -2430,7 +2430,7 @@ esxDomainCreate(virDomainPtr domain) static virDomainPtr esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; virDomainDefPtr def = NULL; char *vmx = NULL; int i; @@ -2638,7 +2638,7 @@ static int esxDomainUndefine(virDomainPtr domain) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_Context *ctx = NULL; esxVI_ObjectContent *virtualMachine = NULL; esxVI_String *propertyNameList = NULL; @@ -2740,7 +2740,7 @@ esxDomainGetSchedulerParameters(virDomainPtr domain, virSchedParameterPtr params, int *nparams) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachine = NULL; esxVI_DynamicProperty *dynamicProperty = NULL; @@ -2869,7 +2869,7 @@ esxDomainSetSchedulerParameters(virDomainPtr domain, virSchedParameterPtr params, int nparams) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_ObjectContent *virtualMachine = NULL; esxVI_VirtualMachineConfigSpec *spec = NULL; esxVI_SharesInfo *sharesInfo = NULL; @@ -3040,7 +3040,7 @@ esxDomainMigratePerform(virDomainPtr domain, unsigned long bandwidth ATTRIBUTE_UNUSED) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; xmlURIPtr xmlUri = NULL; char hostIpAddress[NI_MAXHOST] = ""; esxVI_ObjectContent *virtualMachine = NULL; @@ -3171,7 +3171,7 @@ static unsigned long long esxNodeGetFreeMemory(virConnectPtr conn) { unsigned long long result = 0; - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; esxVI_ManagedObjectReference *managedObjectReference = NULL; @@ -3249,7 +3249,7 @@ esxNodeGetFreeMemory(virConnectPtr conn) static int esxIsEncrypted(virConnectPtr conn) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; if (STRCASEEQ(priv->transport, "https")) { return 1; @@ -3263,7 +3263,7 @@ esxIsEncrypted(virConnectPtr conn) static int esxIsSecure(virConnectPtr conn) { - esxPrivate *priv = (esxPrivate *)conn->privateData; + esxPrivate *priv = conn->privateData; if (STRCASEEQ(priv->transport, "https")) { return 1; @@ -3278,7 +3278,7 @@ static int esxDomainIsActive(virDomainPtr domain) { int result = 0; - esxPrivate *priv = (esxPrivate *)domain->conn->privateData; + esxPrivate *priv = domain->conn->privateData; esxVI_ObjectContent *virtualMachine = NULL; esxVI_String *propertyNameList = NULL; esxVI_VirtualMachinePowerState powerState; -- 1.6.3.3

1 0

[libvirt] [PATCH] cgroup.c: avoid unconditional leaks
by Jim Meyering 04 Feb '10

04 Feb '10

Here's output from "git format-patch -U19 --stdout -1", so you see the context: >From 47ea9beecf93a796e606b4d906424c05e7f6c9bb Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 4 Feb 2010 11:14:03 +0100 Subject: [PATCH] cgroup.c: avoid unconditional leaks * src/util/cgroup.c (virCgroupCpuSetInherit) [HAVE_MNTENT_H]: Don't leak CPU-set inheritance value strings. --- src/util/cgroup.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index c80cf50..e6f0270 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -416,38 +416,39 @@ static int virCgroupCpuSetInherit(virCgroupPtr parent, virCgroupPtr group) VIR_DEBUG("Setting up inheritance %s -> %s", parent->path, group->path); for (i = 0; i < ARRAY_CARDINALITY(inherit_values) ; i++) { char *value; rc = virCgroupGetValueStr(parent, VIR_CGROUP_CONTROLLER_CPUSET, inherit_values[i], &value); if (rc != 0) { VIR_ERROR("Failed to get %s %d", inherit_values[i], rc); break; } VIR_DEBUG("Inherit %s = %s", inherit_values[i], value); rc = virCgroupSetValueStr(group, VIR_CGROUP_CONTROLLER_CPUSET, inherit_values[i], value); + VIR_FREE(value); if (rc != 0) { VIR_ERROR("Failed to set %s %d", inherit_values[i], rc); break; } } return rc; } static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr group, int create) { int i; int rc = 0; VIR_DEBUG("Make group %s", group->path); for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) { char *path = NULL; -- 1.7.0.rc1.193.ge8618

4 5

[libvirt] [PATCH] virDomainChrDefParseXML: don't leak upon invalid input
by Jim Meyering 04 Feb '10

04 Feb '10

>From 6d0e0e571bba7792df9dacb898849708d5d3b425 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 4 Feb 2010 12:49:53 +0100 Subject: [PATCH] virDomainChrDefParseXML: don't leak upon invalid input * src/conf/domain_conf.c (virDomainChrDefParseXML): Don't leak a virDomainChrDef buffer upon "unknown target type for char device" error. --- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 766993c..306776d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1947,6 +1947,7 @@ virDomainChrDefParseXML(virConnectPtr conn, virDomainReportError(conn, VIR_ERR_XML_ERROR, _("unknown target type for character device: %s"), nodeName); + VIR_FREE(def); return NULL; } def->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_NULL; -- 1.7.0.rc1.199.g9253a

2 1

[libvirt] [PATCH] virExecWithHook: avoid leak on OOM error path
by Jim Meyering 04 Feb '10

04 Feb '10

>From ab102cf853e3b46bf10cf0faafa643a352ed8888 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 4 Feb 2010 12:25:34 +0100 Subject: [PATCH] virExecWithHook: avoid leak on OOM error path * src/util/util.c (virExecWithHook): Free argv_str string before returning upon failure to allocate space for environment. --- src/util/util.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 7e0cd50..a01fc45 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -625,18 +625,19 @@ virExecWithHook(virConnectPtr conn, char *envp_str; if ((argv_str = virArgvToString(argv)) == NULL) { virReportOOMError(conn); return -1; } if (envp) { if ((envp_str = virArgvToString(envp)) == NULL) { + VIR_FREE(argv_str); virReportOOMError(conn); return -1; } VIR_DEBUG("%s %s", envp_str, argv_str); VIR_FREE(envp_str); } else { VIR_DEBUG0(argv_str); } VIR_FREE(argv_str); -- 1.7.0.rc1.199.g9253a

2 1

[libvirt] [PATCH] cgroup.c: don't leak mem+FD upon OOM
by Jim Meyering 04 Feb '10

04 Feb '10

Here's the patch: (note, no need to test for mapping == NULL in the no_memory block) >From 91dbe896fff64783df1c68769a57a267441143ae Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 4 Feb 2010 11:22:20 +0100 Subject: [PATCH] cgroup.c: don't leak mem+FD upon OOM * src/util/cgroup.c (virCgroupDetectPlacement): Close the mapping FILE* also upon error. --- src/util/cgroup.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index e6f0270..4446c7f 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -183,6 +183,7 @@ static int virCgroupDetectPlacement(virCgroupPtr group) return 0; no_memory: + fclose(mapping); return -ENOMEM; } -- 1.7.0.rc1.193.ge8618 Here's the (fixed) function: /* * Process /proc/self/cgroup figuring out what cgroup * sub-path the current process is assigned to. ie not * neccessarily in the root */ static int virCgroupDetectPlacement(virCgroupPtr group) { int i; FILE *mapping = NULL; char line[1024]; mapping = fopen("/proc/self/cgroup", "r"); if (mapping == NULL) { VIR_ERROR0("Unable to open /proc/self/cgroup"); return -ENOENT; } while (fgets(line, sizeof(line), mapping) != NULL) { char *controllers = strchr(line, ':'); char *path = controllers ? strchr(controllers+1, ':') : NULL; char *nl = path ? strchr(path, '\n') : NULL; if (!controllers || !path) continue; if (nl) *nl = '\0'; *path = '\0'; controllers++; path++; for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) { const char *typestr = virCgroupControllerTypeToString(i); int typelen = strlen(typestr); char *tmp = controllers; while (tmp) { char *next = strchr(tmp, ','); int len; if (next) { len = next-tmp; next++; } else { len = strlen(tmp); } if (typelen == len && STREQLEN(typestr, tmp, len) && !(group->controllers[i].placement = strdup(STREQ(path, "/") ? "" : path))) goto no_memory; tmp = next; } } } fclose(mapping); return 0; no_memory: fclose(mapping); return -ENOMEM; }

2 1

[libvirt] [PATCH 5/5] macvtap support for libvirt -- schema extensions
by Stefan Berger 04 Feb '10

04 Feb '10

This part extends the domain xml schema to support the new interface type 'direct'. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

1 0

[libvirt] [PATCH 3/5] macvtap support for libvirt -- qemu support
by Stefan Berger 04 Feb '10

04 Feb '10

This part adds support for qemu making a macvtap tap device available via file descriptor passed to qemu command line. This also attempts to tear down the macvtap device when a VM terminates. This includes support for attachment and detachment to/from running VM. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

1 0

[libvirt] [PATCH 1/5] macvtap support for libvirt -- build support
by Stefan Berger 04 Feb '10

04 Feb '10

This patch adds build support for libvirt checking for certain contents of /usr/include/linux/if_link.h to see whether macvtap support is compilable on that system. One can disable macvtap support in libvirt via --without-macvtap passed to configure. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com>

1 0

[libvirt] [PATCH 0/5] macvtap support for Qemu/KVM VMs via libvirt
by Stefan Berger 04 Feb '10

04 Feb '10

Hello! The following patches provide support for making the macvtap networking device type available to Qemu/KVM VMs. The patches rely on the macvtap driver that just became available through the Linux net-next tree (fixes still may be necessary) and make the device available to Qemu/KVM via a tap file descriptor similar to a 'regular' tap device. Following up on previous discussions, the libvirt patches allow using the following XML in the domain description to enable qemu network connectivity via this type of device: <interface type='direct'> <source dev='eth1' mode='vepa'/> <model type='virtio'/> </interface> The above XML indicates that eth1 is the Ethernet interface to link the macvtap device to and communicate to the network. As a consequence, libvirt will create an instance of a macvtap device, assign it the same MAC address as the VM's interface has and open a file descriptor of the associated character device /dev/tap%d and pass it via command line to Qemu/kvm. In the above XML the mode can be chosen as 'vepa', 'private' or 'bridge' and is by default set to 'vepa'(by the driver) if omitted. Attachment and detachment of macvtap to/from a running VM also works. Regards, Stefan

1 0

[libvirt] Release of libvirt-0.7.6
by Daniel Veillard 03 Feb '10

03 Feb '10

Is finally out with the set of last minute fixes :-) Available as usual from: ftp://libvirt.org/libvirt/ The rate of change is really not slowing down, a awful lot of improvements and changes are in. Some things I listed in improvement might be considered full new features like support for latest versions of Xen and ESX. Jim Meyering also went though a lot of automated bug reports to fill up various holes in the code: Features: - Implement support for multi IQN (David Allan) - Implement CPU topology support for QEMU driver (Jiri Denemark) - Use QEmu new device adressing when possible (Daniel P. Berrange) - Implement SCSI controller hotplug/unplug for QEMU (Wolfgang Mauerer) Documentation: - Add missing function parameter documentation (Matthias Bolte) - Add docs about new mailing list (Daniel P. Berrange) - Document cpu-compare command in virsh man page (Jiri Denemark) - Document cpu elements in capabilities and domain XML (Jiri Denemark) - docs: Remove outdated information about remote limitations (Matthias Bolte) - documentation improvements (David Jorm) - Minor fixes for API extension doc (Jim Fehlig) - cpu_shares parameter limit documented (David Jorm) - Document the domain XML cache attribute for disk devices (Matthias Bolte) - Replace old CVS references with GIT (Matthias Bolte) Portability: - portability to non-glibc: don't use realpath(..., NULL) (Jim Meyering) - Add some missing include files which break build in certain platforms (Daniel P. Berrange) - Remove AppArmor compile warnings (Jamie Strandboge) - Fix compilation of virt-aa-helper.c (Matthias Bolte) - Fix linkage of virt-aa-helper to libgnu.a (Matthias Bolte) Bug Fixes: - Fix restore of QEMU guests with PCI device reservation (Daniel P. Berrange) - Another fork() log locking cleanup in file creation (Laine Stump) - Fix log locking problem when using fork() in the library (Cole Robinson) - Fix locking for udev device add/remove (David Allan) - interface_conf.c: don't use a negative value as allocation size (Jim Meyering) - virStoragePoolSourceListNewSource: avoid unconditional leak (Jim Meyering) - xs_internal.c: don't use a negative value as allocation size (Jim Meyering) - Ensure QEMU DAC security driver is activated at all times (Daniel P. Berrange) - udev: Don't let strtoul parse USB busnum and devnum as octal (Matthias Bolte) - json.c: avoid an unconditional leak from most qemuMonitorJSON* functions (Jim Meyering) - Fix PCI host reattach on domain detach. (Chris Lalancette) - Clarify controllers -device string in QEMU driver (Matthew Booth) - util.c (virGetUserEnt): don't use a negative value as allocation size (Jim Meyering) - cpu_x86.c: avoid NULL-deref for invalid arguments (Jim Meyering) - Fix a crash when restarting libvirtd. (Chris Lalancette) - qemuMonitorTextAttachDrive: avoid two leaks (Jim Meyering) - usbGetDevice: don't leak a "usbDevice" buffer on failure path (Jim Meyering) - qemuMonitorTextGetMemoryStats: plug a leak on an error path (Jim Meyering) - usbFindBusByVendor: don't leak a DIR buffer and FD (Jim Meyering) - Fix libvirtd restart for domains with PCI passthrough devices (Chris Lalancette) - qemu: Fix race between device rebind and kvm cleanup (Chris Lalancette) - Fix device assignment with root devices (Chris Lalancette) - Corrected log level of WWN path message (David Allan) - Fix an error when looking for devices in syspath (Daniel Veillard) - Fix off-by-1 in SCSI drive hotplug (Daniel P. Berrange) - Fix leak in hotplug code in QEMU driver (Daniel P. Berrange) - Fix security driver calls in hotplug cleanup paths (Daniel P. Berrange) - Add missing call to re-attach host devices if VM startup fails (Daniel P. Berrange) - Pull initial disk labelling out into libvirtd instead of exec hook (Daniel P. Berrange) - Fix leak of allocated security label (Daniel P. Berrange) - Create storage pool directories with proper uid/gid/mode (Laine Stump) - Create storage volumes directly with desired uid/gid (Laine Stump) - Unset copied environment variables in qemuxml2argvtest (Matthias Bolte) - qemu: Don't allocate zero bytes (Matthias Bolte) - node_device_linux_sysfs.c: avoid opendir/fd leak on error path (Jim Meyering) - domain_conf.c: avoid a leak and the need for "cleanup:" block (Jim Meyering) - Fix QEMU driver custom domain status XML extensions (Daniel P. Berrange) - xen_driver: don't leak a parsed-config buffer (Jim Meyering) - storage_conf: plug a leak on OOM error path (Jim Meyering) - Tests for ACS in PCIe switches (Jiri Denemark) - storage_backend_fs.c: do not ignore probe failure (Jim Meyering) - Avoid free'ing a constant string in chardev lookup code (Daniel P. Berrange) - Fix build of Xen proxy daemon (Daniel P. Berrange) - xen: do not report a write-to-Xen-daemon failure as a read failure (Jim Meyering) - daemon: Don't blindly unregister domain events (Cole Robinson) - node_device: udev: Fix memory leak (Cole Robinson) - Fix migration in xend driver (Jim Fehlig) - Ensure error handling callback functions are called from safe context (Daniel P. Berrange) - qemu: Fix a memory leak in qemudExtractTTYPath (Matthias Bolte) - Fix UUID random generator to use /dev/random (Laine Stump) - let "configure --disable-shared" work once again (Jim Meyering) - Qemu: ask for memory preallocation with large pages (Daniel Veillard) - network/bridge_driver.c: avoid potential NULL-dereference (Jim Meyering) - Don't free an uninitalized pointer in update_driver_name() (Matthias Bolte) - xend_internal: don't let invalid input provoke NULL dereference (Jim Meyering) - Don't update vol details after build (David Allan) - vbox_tmpl.c: don't leak a domain pointer upon failure to create (Jim Meyering) - vbox_tmpl.c: avoid NULL deref upon vboxDomainCreateXML failure (Jim Meyering) - qemu_driver.c: avoid NULL dereference upon disk-op failure (Jim Meyering) - openvz_conf.c: don't dereference NULL upon failure (Jim Meyering) - Distribute vmx2xml and xml2vmx test data files (Matthias Bolte) Improvements: - Tweak USB hostdevice XML handling (Daniel P. Berrange) - Fix QEMU hotplug device alias assignment (Daniel P. Berrange) - Disable QEMU monitor IO debugging by default (Daniel P. Berrange) - Re-arrange QEMU device alias assignment code (Daniel P. Berrange) - Remove direct storage of hostnet_name & vlan (Daniel P. Berrange) - Remove use of -netdev arg with QEMU (Daniel P. Berrange) - Assign PCI addresses before hotplugging devices (Daniel P. Berrange) - Rewrite way QEMU PCI addresses are allocated (Daniel P. Berrange) - Introduce generic virDomainDeviceInfo iterator function (Daniel P. Berrange) - Make hotplug use new device_add where possible (Daniel P. Berrange) - Introduce internal QEMU monitor APIs for drive + device hotadd (Daniel P. Berrange) - Split out QEMU code for building PCI/USB hostdev arg values (Daniel P. Berrange) - Standard internal API syntax for building QEMU command line arguments (Daniel P. Berrange) - Log flags in virConnectCompareCPU (Jiri Denemark) - Look in /usr/libexec for the qemu-kvm binary. (Chris Lalancette) - Support Xen 4.0 sysctl version 7 (Jim Fehlig) - Add missing sata controller type to domain.rng (Matthew Booth) - udev: Set the state driver name (Matthias Bolte) - udev: Remove event handle on shutdown (Matthias Bolte) - esx: Output error details from libcurl (Matthias Bolte) - qemu: Search binaries in PATH instead of hardcoding /usr/bin (Matthias Bolte) - Implement QMP support for extracting CPU thread ID (Daniel P. Berrange) - Misc fixes to QMP monitor support for QEMU (Daniel P. Berrange) - Fix setup of compatability serial devices from console device (Daniel P. Berrange) - Start modernizing configure (Eric Blake) - Add a rule to check for uses of readlink. (Chris Lalancette) - Add virConnectGetVersion Python API (Taizo ITO) - domMemoryStats / qemu: Fix parsing of unknown stats (Adam Litke) - Allow surrounding whitespace in uuid (Dan Kenigsberg) - Add configuration option to turn off dynamic permissions management (Daniel P. Berrange) - Switch QEMU driver over to use the DAC security driver (Daniel P. Berrange) - Introduce a new DAC security driver for QEMU (Daniel P. Berrange) - Introduce a stacked security driver impl for QEMU (Daniel P. Berrange) - Make security drivers responsible for checking dynamic vs static labelling (Daniel P. Berrange) - New utility functions virFileCreate and virDirCreate (Laine Stump) - Add virRunWithHook util function (Laine Stump) - Update interface.rng and xml test files to match netcf 0.1.5 (Laine Stump) - Support bond interfaces attached to bridges in interface xml. (Laine Stump) - Allow empty bridges in interface xml. (Laine Stump) - Support delay property in interface bridge xml. (Laine Stump) - Use pciDeviceIsAssignable in qemu driver (Jiri Denemark) - Allow for CPU topology specification without model (Jiri Denemark) - Add debug messages for CPU incompatibility (Jiri Denemark) - Take disabled/forced CPU features into account (Jiri Denemark) - Enhance qemuParseCommandLineKeywords (Jiri Denemark) - Convert VirtIO balloon over to -device syntax (Daniel P. Berrange) - uto-assign PCI addresses (Daniel P. Berrange) - Pass -vga none if no video card specified (Daniel P. Berrange) - Add support for explicit -sdl flag to QEMU (Daniel P. Berrange) - Assign device aliases for all devices at startup (Daniel P. Berrange) - Add device info to serial, parallel, channel, input & fs devices (Daniel P. Berrange) - Introduce device aliases (Daniel P. Berrange) - Clear assigned PCI devices at shutdown (Daniel P. Berrange) - Auto-add disk controllers based on defined disks (Daniel P. Berrange) - Remove restriction on duplicated sound devices in parser (Daniel P. Berrange) - Detect PCI addresses at QEMU startup (Daniel P. Berrange) - Properly support SCSI drive hotplug (Daniel P. Berrange) - build: update gnulib submodule to latest (Jim Meyering) - Use closest CPU model when decoding from CPUID (Jiri Denemark) - Change detection of xen so that it's actually automatic rather than forced. (Diego Elio Pettenò) - Standardise ./configure --help options reporting. (Diego Elio Pettenò) - qemu: Use log output for pty assignment if 'info chardev' is unavailable (Matthias Bolte) - esx: Add VNC support (Matthias Bolte) - esx: Make the domain part of the hostname optional (Matthias Bolte) - esx: Add stubs for secondary driver types (Matthias Bolte) - Specify bus/unit instead of index for disks with QEMU (Daniel P. Berrange) - Split code for building QEMU -drive arg in separate method (Daniel P. Berrange) - Convert monitor over to use virDomainDeviceAddress (Daniel P. Berrange) - Add new domain device: "controller" (Wolfgang Mauerer) - Set default disk controller/bus/unit props (Daniel P. Berrange) - Add address info to sound, video and watchdog devices (Daniel P. Berrange) - Extend the virDomainDeviceAddress struture to allow disk controller addresses (Daniel P. Berrange) - Introduce a standardized data structure for device addresses (Daniel P. Berrange) - util: Make sure virExec hook failures are raised (Cole Robinson) - Implement path lookup for USB by vendor:product (Cole Robinson) - events: Report errors on failure (Cole Robinson) - node_device: udev: Enumerate floppy devices (Cole Robinson) - node_device: udev: Use base 16 for product/vendor (Cole Robinson) - libvirt.c: Preserve MigratePerform failure (Cole Robinson) - qemu: migrate: Save MigratePerform error in MigrateFinish. (Cole Robinson) - virterror: Add virSetError (Cole Robinson) - Also look for dmi information in /sys/class (Guido Günther) - proxy_internal.c: mark "request" parameter as nonnull (Jim Meyering) - esx: Dump the raw response in case of an SOAP fault (Matthias Bolte) - esx: Warn if the ESX server is in maintenance mode (Matthias Bolte) - xen hypervisor: xen domctl version 6 (Jim Fehlig) - virsh: Add persistent history using libreadline (Matthias Bolte) - esx: Fix 'vpx' MAC address range and allow arbitrary MAC addresses (Matthias Bolte) - esx: Fix deserialization for VI API calls CancelTask and UnregisterVM (Matthias Bolte) - esx: Fix and improve the libcurl debug callback (Matthias Bolte) - esx: Also allow virtualHW version 4 for ESX 4.0 (Matthias Bolte) - qemu: Always enable the virtio balloon driver (Adam Litke) - Disable building of static Python module (Diego Elio Pettenò) - Fix parsing of 'info chardev' line endings (Matthew Booth) Cleanups: - xen_hypervisor.c: remove all "domain == NULL" tests, ... (Jim Meyering) - xen_hypervisor.c: avoid NULL deref for NULL domain argument (Jim Meyering) - libvirtd.c: avoid closing a negative socket file descriptor (Jim Meyering) - storage_backend.c: avoid closing a negative file descriptor (Jim Meyering) - avoid a probable EINVAL from lseek (Jim Meyering) - util.c (two more): don't use a negative value as allocation size (Jim Meyering) - avoid format-related warnings (Jim Meyering) - maint: avoid excess parens in STREQ (Eric Blake) - Move models/nmodels mismatch checking one level up (Jiri Denemark) - Fix up a comment in virHashUpdateEntry (Chris Lalancette) - maint: fix spelling error in hacking (Eric Blake) - pci.c: correct an erroneous expression (Jim Meyering) - Remove undefined symbols from libvirt_private.syms (Matthias Bolte) - Don't call disabled timer callbacks in event-test.c (Matthias Bolte) - hostusb: closedir only if non-NULL; rename labels: s/error/cleanup/ (Jim Meyering) - Cleanup of large buffer on stack in virFileMakePath (Laine Stump) - esx: Stop passing around virConnectPtr for error reporting (Matthias Bolte) - Revert "Fix libvirtd restart for domains with PCI passthrough devices" (Chris Lalancette) - Fix two instances of misspelled 'pseudo' (Chris Lalancette) - Use virFileResolveLink instead of readlink in AppArmor (Chris Lalancette) - Fix a compile warning in parthelper.c (Chris Lalancette) - Remove unused PROC_MOUNT_BUF_LEN #define (Chris Lalancette) - fix "make distcheck" failure (Jim Meyering) - avoid format-related warnings (Jim Meyering) - Refactor setup & cleanup of security labels in security driver (Daniel P. Berrange) - Let make fail when XHTML validation fails (Jiri Denemark) - Fix uses of virFileMakePath (Laine Stump) - remove unnecessary closedir call (Jim Meyering) - Make all bitfields unsigned ints to avoid unexpected values in casts (Daniel P. Berrange) - logging: confirm that we want to ignore a write error (Jim Meyering) - Remove superfluous new lines from messages (Jiri Denemark) - vbox_tmpl.c: remove useless array-is-non-NULL comparisons (Jim Meyering) - lxc_driver: remove useless comparison (Jim Meyering) - gnulib added a new syntax-check test: use $(VAR), not @VAR@ (Jim Meyering) - storage_backend.h: include required headers (Jim Meyering) - esx_vi_types.c: include required headers (Jim Meyering) - vbox: include required headers (Jim Meyering) - cpu_x86_data.h: include required header (Jim Meyering) - util.c: include required header, no longer masked by gnulib (Jim Meyering) - Fix validation of news.html (Matthias Bolte) - Remove obsolete comment in QEMU JSON code (Daniel P. Berrange) - Make test suite output less verbose (Daniel P. Berrange) - daemon: Fix various error reporting issues (Cole Robinson) - util: Remove logging handlers in virExec (Cole Robinson) - Commit bootstrap .gitignore additions (Cole Robinson) - qemu: Disable errors in qemudShutdownVMDaemon (Cole Robinson) - avoid another "make distcheck" failure (Jim Meyering) - avoid newly-introduced test failure (Jim Meyering) - don't test "res == NULL" after we've already dereferenced "res" (Jim Meyering) - fix 7 "make check" test failures in non-srcdir build (Jim Meyering) - virsh: Use VIR_FREE instead of free (Matthias Bolte) - esx: Don't warn about an empty URI path (Matthias Bolte) - qemu_driver.c: remove useless, warning-provoking test (Jim Meyering) So again, thanks everybody for your contributions ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Avoid deadlock on logging mutex due to fork in virFileCreate/virDirCreate.
by Laine Stump 03 Feb '10

03 Feb '10

These functions have the same potential problem that Cole found in virExec - if the log mutex is currently held at the time of the fork, the child process' logging mutex will be locked, but nobody in the process to unlock it. If the child process tries to log anything, it will wait forever for this lock. The solution is to have the parent acquire the lock before fork, then both parent and child release the lock right after. Note that this patch requires Cole's patch to be applied first. --- src/util/util.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 901c0d2..d8a2394 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1263,7 +1263,11 @@ int virFileCreate(const char *path, mode_t mode, * following dance avoids problems caused by root-squashing * NFS servers. */ - if ((pid = fork()) < 0) { + virLogLock(); + pid = fork(); + virLogUnlock(); + + if (pid < 0) { ret = errno; virReportSystemError(NULL, errno, _("cannot fork o create file '%s'"), path); @@ -1369,7 +1373,11 @@ int virDirCreate(const char *path, mode_t mode, return virDirCreateSimple(path, mode, uid, gid, flags); } - if ((pid = fork()) < 0) { + virLogLock(); + pid = fork(); + virLogUnlock(); + + if (pid < 0) { ret = errno; virReportSystemError(NULL, errno, _("cannot fork to create directory '%s'"), -- 1.6.6

2 2

[libvirt] [PATCH] Fix restore of QEMU guests with PCI device reservation
by Daniel P. Berrange 03 Feb '10

03 Feb '10

When restoring from a saved guest image, the XML would already contain the PCI slot ID of the IDE controller & video card. The attempt to explicitly reserve this upfront would thus fail everytime. * src/qemu/qemu_conf.c: Reserve IDE controller / video card slot at time of need, rather than upfront --- src/qemu/qemu_conf.c | 83 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 63 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 389db7b..3d83a8f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1797,6 +1797,13 @@ static char *qemuPCIAddressAsString(virDomainDeviceInfoPtr dev) { char *addr; + if (dev->addr.pci.domain != 0 || + dev->addr.pci.bus != 0) { + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("Only PCI domain 0 and bus 0 are available")); + return NULL; + } + if (virAsprintf(&addr, "%d:%d:%d", dev->addr.pci.domain, dev->addr.pci.bus, @@ -1817,6 +1824,8 @@ static int qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, if (dev->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { char *addr = qemuPCIAddressAsString(dev); + VIR_DEBUG("Remembering PCI addr %s", addr); + if (virHashAddEntry(addrs->used, addr, addr) < 0) { VIR_FREE(addr); return -1; @@ -1858,6 +1867,8 @@ int qemuDomainPCIAddressReserveAddr(qemuDomainPCIAddressSetPtr addrs, if (!addr) return -1; + VIR_DEBUG("Reserving PCI addr %s", addr); + if (virHashLookup(addrs->used, addr)) { qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("unable to reserve PCI address %s"), addr); @@ -1870,6 +1881,9 @@ int qemuDomainPCIAddressReserveAddr(qemuDomainPCIAddressSetPtr addrs, return -1; } + if (dev->addr.pci.slot > addrs->nextslot) + addrs->nextslot = dev->addr.pci.slot + 1; + return 0; } @@ -1947,6 +1961,8 @@ int qemuDomainPCIAddressSetNextAddr(qemuDomainPCIAddressSetPtr addrs, addr = qemuPCIAddressAsString(&maybe); + VIR_DEBUG("Allocating PCI addr %s", addr); + if (virHashLookup(addrs->used, addr)) { VIR_FREE(addr); continue; @@ -1981,12 +1997,13 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) /* Host bridge */ if (qemuDomainPCIAddressReserveSlot(addrs, 0) < 0) goto error; - /* PIIX3 (ISA bridge, IDE controller, something else unknown, USB controller) */ - if (qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) - goto error; - /* VGA */ - if (qemuDomainPCIAddressReserveSlot(addrs, 2) < 0) - goto error; + + /* PIIX3 (ISA bridge, IDE controller, something else unknown, USB controller) + * at slot 1....reserve it later + */ + + /* VGA at slot 2.... reserve it later */ + /* VirtIO Balloon */ if (qemuDomainPCIAddressReserveSlot(addrs, 3) < 0) goto error; @@ -2033,23 +2050,34 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) goto error; } for (i = 0; i < def->nvideos ; i++) { - if (def->videos[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) - continue; /* First VGA is hardcoded slot=2 */ if (i == 0) { - def->videos[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - def->videos[i]->info.addr.pci.domain = 0; - def->videos[i]->info.addr.pci.bus = 0; - def->videos[i]->info.addr.pci.slot = 2; - def->videos[i]->info.addr.pci.function = 0; + if (def->videos[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + if (def->videos[i]->info.addr.pci.domain != 0 || + def->videos[i]->info.addr.pci.bus != 0 || + def->videos[i]->info.addr.pci.slot != 2 || + def->videos[i]->info.addr.pci.function != 0) { + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("Primary video card must have PCI address 0:0:2.0")); + goto error; + } + } else { + def->videos[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + def->videos[i]->info.addr.pci.domain = 0; + def->videos[i]->info.addr.pci.bus = 0; + def->videos[i]->info.addr.pci.slot = 2; + def->videos[i]->info.addr.pci.function = 0; + if (qemuDomainPCIAddressReserveSlot(addrs, 2) < 0) + goto error; + } } else { + if (def->videos[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + continue; if (qemuDomainPCIAddressSetNextAddr(addrs, &def->videos[i]->info) < 0) goto error; } } for (i = 0; i < def->ncontrollers ; i++) { - if (def->controllers[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) - continue; /* FDC lives behind the ISA bridge */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC) continue; @@ -2057,12 +2085,27 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) /* First IDE controller lives on the PIIX3 at slot=1, function=1 */ if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE && def->controllers[i]->idx == 0) { - def->controllers[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - def->controllers[i]->info.addr.pci.domain = 0; - def->controllers[i]->info.addr.pci.bus = 0; - def->controllers[i]->info.addr.pci.slot = 1; - def->controllers[i]->info.addr.pci.function = 1; + if (def->controllers[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + if (def->videos[i]->info.addr.pci.domain != 0 || + def->videos[i]->info.addr.pci.bus != 0 || + def->videos[i]->info.addr.pci.slot != 2 || + def->videos[i]->info.addr.pci.function != 0) { + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", + _("Primary IDE controller must have PCI address 0:0:1.1")); + goto error; + } + } else { + def->controllers[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + def->controllers[i]->info.addr.pci.domain = 0; + def->controllers[i]->info.addr.pci.bus = 0; + def->controllers[i]->info.addr.pci.slot = 1; + def->controllers[i]->info.addr.pci.function = 1; + if (qemuDomainPCIAddressReserveSlot(addrs, 1) < 0) + goto error; + } } else { + if (def->controllers[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) + continue; if (qemuDomainPCIAddressSetNextAddr(addrs, &def->controllers[i]->info) < 0) goto error; } -- 1.6.6

2 1

[libvirt] [PATCH] util: Remove logging handlers in virExec
by Cole Robinson 03 Feb '10

03 Feb '10

This allows debug statements and raised errors in hook functions to actually be logged somewhere (stderr). Users can enable debugging in the daemon and now see more info in /var/log/libvirt/... Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/util/util.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 44a4b2f..23d781d 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -334,6 +334,7 @@ __virExec(virConnectPtr conn, int pipeerr[2] = {-1,-1}; int childout = -1; int childerr = -1; + int logprio; sigset_t oldmask, newmask; struct sigaction sig_action; @@ -452,6 +453,11 @@ __virExec(virConnectPtr conn, of being seen / logged */ virSetErrorFunc(NULL, NULL); + /* Make sure any hook logging is sent to stderr */ + logprio = virLogGetDefaultPriority(); + virLogReset(); + virLogSetDefaultPriority(logprio); + /* Clear out all signal handlers from parent so nothing unexpected can happen in our child once we unblock signals */ -- 1.6.5.2

4 11

[libvirt] PATCH [0/1] Fix locking in udev node device backend
by David Allan 03 Feb '10

03 Feb '10

The initial udev node device backend implementation fails to take the lock on the node device driverState struct when adding and removing devices. The following patch adds the appropriate locking. Dave

2 3

[libvirt] [PATCH] virStoragePoolSourceListNewSource: avoid unconditional leak
by Jim Meyering 03 Feb '10

03 Feb '10

The buffer allocated by VIR_ALLOC here is never used, and the sole pointer to it is overwritten by this stmt: source = &list->sources[list->nsources++]; >From 52cf50def236ab61298ebbba39fcaf89d440f4ec Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 2 Feb 2010 19:59:14 +0100 Subject: [PATCH] virStoragePoolSourceListNewSource: avoid unconditional leak * src/conf/storage_conf.c (virStoragePoolSourceListNewSource): Remove an unused (and leaked) allocation. --- src/conf/storage_conf.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index bd34f5e..62b8394 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1692,17 +1692,11 @@ virStoragePoolSourcePtr virStoragePoolSourceListNewSource(virConnectPtr conn, virStoragePoolSourceListPtr list) { virStoragePoolSourcePtr source; - if (VIR_ALLOC(source) < 0) { - virReportOOMError(conn); - return NULL; - } - if (VIR_REALLOC_N(list->sources, list->nsources+1) < 0) { - VIR_FREE(source); virReportOOMError(conn); return NULL; } source = &list->sources[list->nsources++]; -- 1.7.0.rc1.149.g0b0b7

2 2

[libvirt] [PATCH] xs_internal.c: don't use a negative value as allocation size
by Jim Meyering 03 Feb '10

03 Feb '10

As the log message says... >From 6d7abfb983328fbe34bd4404d8fafda100e8098f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 2 Feb 2010 12:22:17 +0100 Subject: [PATCH] xs_internal.c: don't use a negative value as allocation size * src/xen/xs_internal.c (xenStoreDomainIntroduced): Don't use -1 as an allocation size upon xenStoreNumOfDomains failure. (xenStoreDomainReleased): Likewise. --- src/xen/xs_internal.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 1ca3da0..620c482 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -1,9 +1,9 @@ /* * xs_internal.c: access to Xen Store * - * Copyright (C) 2006, 2009 Red Hat, Inc. + * Copyright (C) 2006, 2009-2010 Red Hat, Inc. * * See COPYING.LIB for the License of this software * * Daniel Veillard <veillard(a)redhat.com> */ @@ -1365,10 +1365,13 @@ int xenStoreDomainIntroduced(virConnectPtr conn, xenUnifiedPrivatePtr priv = opaque; retry: new_domain_cnt = xenStoreNumOfDomains(conn); + if (new_domain_cnt < 0) + return -1; + if( VIR_ALLOC_N(new_domids,new_domain_cnt) < 0 ) { virReportOOMError(NULL); return -1; } nread = xenStoreDoListDomains(conn, priv, new_domids, new_domain_cnt); @@ -1445,10 +1448,12 @@ int xenStoreDomainReleased(virConnectPtr conn, if(!priv->activeDomainList->count) return 0; retry: new_domain_cnt = xenStoreNumOfDomains(conn); + if (new_domain_cnt < 0) + return -1; if( VIR_ALLOC_N(new_domids,new_domain_cnt) < 0 ) { virReportOOMError(NULL); return -1; } -- 1.7.0.rc1.149.g0b0b7

2 1

[libvirt] [PATCH] interface_conf.c: don't use a negative value as allocation size
by Jim Meyering 03 Feb '10

03 Feb '10

Here's one way to solve this. Another would be to change the way virXPathNodeSet works, but there are several other uses of it. >From 75108240911a1ad943e0bde8ba9ade92ea216f60 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 2 Feb 2010 20:54:01 +0100 Subject: [PATCH] interface_conf.c: don't use a negative value as allocation size * src/conf/interface_conf.c (virInterfaceDefParseProtoIPv4): If virXPathNodeSet returns -1, indicate failure by returning -1 right away. (virInterfaceDefParseProtoIPv6): Likewise. --- src/conf/interface_conf.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 8a17ed6..510df81 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -1,9 +1,9 @@ /* * interface_conf.c: interfaces XML handling * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-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 * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. @@ -318,10 +318,12 @@ virInterfaceDefParseProtoIPv4(virConnectPtr conn, virInterfaceProtocolDefPtr def if (ret != 0) return(ret); } nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes); + if (nIpNodes < 0) + return -1; if (ipNodes == NULL) return 0; if (VIR_ALLOC_N(def->ips, nIpNodes) < 0) { virReportOOMError(conn); @@ -375,10 +377,12 @@ virInterfaceDefParseProtoIPv6(virConnectPtr conn, virInterfaceProtocolDefPtr def if (ret != 0) return(ret); } nIpNodes = virXPathNodeSet(conn, "./ip", ctxt, &ipNodes); + if (nIpNodes < 0) + return -1; if (ipNodes == NULL) return 0; if (VIR_ALLOC_N(def->ips, nIpNodes) < 0) { virReportOOMError(conn); -- 1.7.0.rc1.167.gdb08

2 1

[libvirt] JAVA .start() method
by Marc Gonzalez Mateo 02 Feb '10

02 Feb '10

Good morning, Testing the new java version (0.4.1) I've noticed that there's no .start() method to start a defined or shuted down domain. Are you working on it or is it a minor feature not to be considered? Thanks in advance, Marc Gonzalez Mateo marcg(a)ac.upc.edu Dept. Arquitectura de Computadors Universitat Politècnica de Catalunya

3 3

[libvirt] [PATCH 0/6] Add more options for clock sync
by Daniel P. Berrange 02 Feb '10

02 Feb '10

This series adds two new options for clock synchronization The two current options are: <clock offset='utc'/> <clock offset='localtime'/> This introduces a way to set a timezone for localtime <clock offset='localtime' timezone='Europe/Paris'/> And a way to set a completely arbitrary time, by giving the number of seconds offset from UTC. <clock offset='variable' adjustment='123456'/> It is open to debate whether we need to distinguish this last one via the extra string 'variable', or just add 'adjustment' as an optional attribute for the existing term 'utc'. Opinions welcome

1 6

[libvirt] [PATCH] xen_hypervisor.c: avoid NULL deref for NULL domain argument
by Jim Meyering 02 Feb '10

02 Feb '10

When "domain" is NULL, don't deref NULL. Instead, just return -1, as in many other functions in this file, and as this function did up until a month ago. An alternative (taken 3 times in this file) is to do this: virXenErrorFunc (NULL, VIR_ERR_INTERNAL_ERROR, __FUNCTION__, "domain or conn is NULL", 0); return -1; I could go either way. >From 177556167775b806a29bcb1af7ba4294d1909912 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 26 Jan 2010 20:17:07 +0100 Subject: [PATCH] xen_hypervisor.c: avoid NULL deref for NULL domain argument * src/xen/xen_hypervisor.c (xenHypervisorGetVcpus): Don't attempt to diagnose an unlikely NULL-domain or NULL-domain->conn error. --- src/xen/xen_hypervisor.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 6d8accc..0257be2 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1,7 +1,7 @@ /* * xen_internal.c: direct access to Xen hypervisor level * - * Copyright (C) 2005, 2006, 2007, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2005-2010 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -3475,11 +3475,8 @@ xenHypervisorGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, virVcpuInfoPtr ipt; int nbinfo, i; - if (domain == NULL || domain->conn == NULL) { - virXenErrorFunc (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__, - "invalid argument", 0); + if (domain == NULL || domain->conn == NULL) return -1; - } priv = (xenUnifiedPrivatePtr) domain->conn->privateData; if (priv->handle < 0 || (domain->id < 0) || -- 1.7.0.rc0.140.gfbe7

2 4

[libvirt] libvirt: python bindings
by Sharadha Prabhakar (3P) 02 Feb '10

02 Feb '10

Hi, I'm writing XenServer APIs for libvirt and trying to test it on virt-Manager. I need to build the libvirt python bindings for that. I tried this for libvirt. ./configure -with-xenapi -with-python make make install I suppose this is supposed to build a .libs directory with libvirtmod.so in the ~/libvirt/python/ But I don't seem to have this at all after build. It was a clean build with no errors. I need libvirtmod.so to link with virt-manager. I'm using libvirt version 0.7.4 Can anyone help me with this. Am I missing something here Thanks in Advance, -SP

4 4

[libvirt] [PATCH] Ensure QEMU DAC security driver is activated at all times
by Daniel P. Berrange 02 Feb '10

02 Feb '10

If the primary security driver (SELinux/AppArmour) was disabled then the secondary QEMU DAC security driver was also disabled. This is mistaken, because the latter must be active at all times * src/qemu/qemu_driver.c: Ensure DAC driver is always active --- src/qemu/qemu_driver.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 16e9b56..a9313e7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -897,26 +897,28 @@ qemudSecurityInit(struct qemud_driver *qemud_drv) int ret; virSecurityDriverPtr security_drv; + qemuSecurityStackedSetDriver(qemud_drv); + qemuSecurityDACSetDriver(qemud_drv); + ret = virSecurityDriverStartup(&security_drv, qemud_drv->securityDriverName); if (ret == -1) { VIR_ERROR0(_("Failed to start security driver")); return -1; } - /* No security driver wanted to be enabled: just return */ + + /* No primary security driver wanted to be enabled: just setup + * the DAC driver on its own */ if (ret == -2) { + qemud_drv->securityDriver = &qemuDACSecurityDriver; VIR_INFO0(_("No security driver available")); - return 0; + } else { + qemud_drv->securityPrimaryDriver = security_drv; + qemud_drv->securitySecondaryDriver = &qemuDACSecurityDriver; + qemud_drv->securityDriver = &qemuStackedSecurityDriver; + VIR_INFO("Initialized security driver %s", security_drv->name); } - qemuSecurityStackedSetDriver(qemud_drv); - qemuSecurityDACSetDriver(qemud_drv); - - qemud_drv->securityPrimaryDriver = security_drv; - qemud_drv->securitySecondaryDriver = &qemuDACSecurityDriver; - qemud_drv->securityDriver = &qemuStackedSecurityDriver; - - VIR_INFO("Initialized security driver %s", security_drv->name); return 0; } -- 1.6.6

2 1

[libvirt] [PATCH 00/13] Fix device hotplug with QEMU and -device
by Daniel P. Berrange 02 Feb '10

02 Feb '10

The current libvirt code enables use of -device when launching QEMU but forgot to update the equivalent code for hotpluging devices to an already running QEMU. This series implements the latter, doing three core things - Assign a unique PCI slot to the new device - Assign a unique device alias to the new device - Call the device_add function for attaching the device As a minor flaw in the whole plan, it turns out the new -netdev code in QEMU 0.12 does not support hotplugging at all. So this series also switching network setup back to using the old VLAN based syntax. Hopefully we can re-introduce use of -netdev with QEMU 0.13, since it gives important performance benefits.

3 45

[libvirt] [PATCH] udev: Don't let strtoul parse USB busnum and devnum as octal
by Matthias Bolte 02 Feb '10

02 Feb '10

udevGetUintProperty was called with base set to 0 for busnum and devnum. With base 0 strtoul parses the number as octal if it start with a 0. But busnum and devnum are decimal and udev returns them padded with leading zeros. So strtoul parses them as octal. This works for certain decimal values like 001-007, but fails for values like 008. Change udevProcessUSBDevice to use base 10 for busnum and devnum. --- src/node_device/node_device_udev.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 734f3f7..0c0f29a 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -500,14 +500,14 @@ static int udevProcessUSBDevice(struct udev_device *device, if (udevGetUintProperty(device, "BUSNUM", &data->usb_dev.bus, - 0) == PROPERTY_ERROR) { + 10) == PROPERTY_ERROR) { goto out; } if (udevGetUintProperty(device, "DEVNUM", &data->usb_dev.device, - 0) == PROPERTY_ERROR) { + 10) == PROPERTY_ERROR) { goto out; } -- 1.6.3.3

2 3

[libvirt] [PATCH] libvirtd.c: avoid closing a negative socket file descriptor
by Jim Meyering 02 Feb '10

02 Feb '10

A lot like the last one... >From e32826290b960790b0ec4f50b195f424fa42348f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 2 Feb 2010 11:27:25 +0100 Subject: [PATCH] libvirtd.c: avoid closing a negative socket file descriptor * daemon/libvirtd.c (qemudListenUnix): Close socket only if non-negative. --- daemon/libvirtd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 3070dfc..f7df0c6 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1,7 +1,7 @@ /* * libvirtd.c: daemon start of day, guest process & i/o management * - * Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2006-2010, 2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -582,7 +582,7 @@ static int qemudListenUnix(struct qemud_server *server, return 0; cleanup: - if (sock->fd) + if (0 <= sock->fd) close(sock->fd); VIR_FREE(sock); return -1; -- 1.7.0.rc1.149.g0b0b7

3 2

[libvirt] [PATCH] lxc_controller.c: don't ignore failed "accept"
by Jim Meyering 02 Feb '10

02 Feb '10

coverity complained (rightly) about the risk of closing a negative file descriptor. However, the real problem was the missing test for a failed "accept" call. I'm not 100% sure that a failed accept call deserves to provoke a "goto cleanup", but doing that is consistent with what the nearby code does upon epoll_ctl failure. >From 8bfd81f0a8a9cb3fd9b575e9c2f5ab9969a2910f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 2 Feb 2010 11:55:19 +0100 Subject: [PATCH] lxc_controller.c: don't ignore failed "accept" * src/lxc/lxc_controller.c (lxcControllerMain): A failed accept could lead to passing a negative file descriptor to various other functions, which would in turn report EBADF, rather that whatever error prompted the initial failure. --- src/lxc/lxc_controller.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 6304815..682f874 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -349,6 +349,11 @@ static int lxcControllerMain(int monitor, if (numEvents > 0) { if (epollEvent.data.fd == monitor) { int fd = accept(monitor, NULL, 0); + if (fd < 0) { + virReportSystemError(NULL, errno, "%s", + _("accept(monitor,...) failed")); + goto cleanup; + } if (client != -1) { /* Already connected, so kick new one out */ close(fd); continue; -- 1.7.0.rc1.149.g0b0b7

2 2

[libvirt] [PATCH] storage_backend.c: avoid closing a negative file descriptor
by Jim Meyering 02 Feb '10

02 Feb '10

This close(fd) is reachable with an "fd" of -1 via the "goto cleanup" just before &fd is first set. While closing(-1) is not a big problem, it is a failing syscall, and would show up on an strace audit, not to mention the coverity and maybe-clang warnings. >From c69369c445be53f12ec09a176fd477b9ff16bbff Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 2 Feb 2010 11:11:49 +0100 Subject: [PATCH] storage_backend.c: avoid closing a negative file descriptor * src/storage/storage_backend.c (virStorageBackendRunProgRegex): Don't close a negative (read-only) file descriptor. --- src/storage/storage_backend.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index bc656f2..84eb8aa 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1,7 +1,7 @@ /* * storage_backend.c: internal storage driver backend contract * - * 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 @@ -1326,8 +1326,10 @@ virStorageBackendRunProgRegex(virConnectPtr conn, if (list) fclose(list); - else - close(fd); + else { + if (0 <= fd) + close(fd); + } while ((err = waitpid(child, &exitstatus, 0) == -1) && errno == EINTR); -- 1.7.0.rc1.149.g0b0b7

3 3

[libvirt] [PATCH] avoid a probable EINVAL from lseek
by Jim Meyering 02 Feb '10

02 Feb '10

In src/qemu/qemu_driver.c, coverity reports this: Event negative_return_fn: Called negative-returning function "lseek(logfile, 0L, 2)" Event var_assign: NEGATIVE return value of "lseek" assigned to signed variable "pos" At conditional (1): "(pos = lseek(logfile, 0L, 2)) < 0" taking true path 2877 if ((pos = lseek(logfile, 0, SEEK_END)) < 0) 2878 VIR_WARN(_("Unable to seek to end of logfile: %s"), 2879 virStrerror(errno, ebuf, sizeof ebuf)); since later in that same function, a negative "pos" may be used like this: Event negative_returns: Tracked variable "pos" was passed to a negative sink. [details] 2930 if (qemudWaitForMonitor(conn, driver, vm, pos) < 0) 2931 goto abort; 2932 which is a legitimate problem, since qemudWaitForMonitor calls qemudLogReadFD, which calls lseek with that same "pos" value: Event neg_sink_parm_call: Parameter "pos" passed to negative sink "lseek" 560 if (lseek(fd, pos, SEEK_SET) < 0) { 561 virReportSystemError(conn, errno, 562 _("Unable to seek to %lld in %s"), 563 (long long) pos, logfile); 564 close(fd); 565 } One approach is to detect the negative offset in that final bit of code and skip the lseek: >From 0ef617935462c314ed0b44bcaa3dd5bf58ccbc1b Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 1 Feb 2010 22:17:44 +0100 Subject: [PATCH] avoid a probable EINVAL from lseek * src/qemu/qemu_driver.c (qemudLogReadFD): Don't pass a negative offset (from a preceding failed attempt to seek to EOF) to this use of lseek. --- src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 22593bf..676a27b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -558,8 +558,8 @@ qemudLogReadFD(virConnectPtr conn, const char* logDir, const char* name, off_t p close(fd); return -1; } - if (lseek(fd, pos, SEEK_SET) < 0) { - virReportSystemError(conn, errno, + if (pos < 0 || lseek(fd, pos, SEEK_SET) < 0) { + virReportSystemError(conn, pos < 0 ? 0 : errno, _("Unable to seek to %lld in %s"), (long long) pos, logfile); close(fd); -- 1.7.0.rc1.149.g0b0b7

3 7

[libvirt] [PATCH] util.c (two more): don't use a negative value as allocation size
by Jim Meyering 01 Feb '10

01 Feb '10

This change is nearly identical to one I made last week. I inspected all remaining sysconf uses, and they seem to be ok. >From 77add8762c5d00db11bb588b7ea0c9e00975c183 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 1 Feb 2010 21:45:06 +0100 Subject: [PATCH] util.c (two more): don't use a negative value as allocation size * src/util/util.c (virGetUserID, virGetGroupID): In the unlikely event that sysconf(_SC_GETPW_R_SIZE_MAX) fails, don't use -1 as the size in the subsequent allocation. --- src/util/util.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 3c200d3..cf1290d 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2388,11 +2388,17 @@ int virGetUserID(virConnectPtr conn, uid_t *uid) { char *strbuf; struct passwd pwbuf; struct passwd *pw = NULL; - size_t strbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); + long val = sysconf(_SC_GETPW_R_SIZE_MAX); + size_t strbuflen = val; + + if (val < 0) { + virReportSystemError(conn, errno, "%s", _("sysconf failed")); + return -1; + } if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { virReportOOMError(conn); return -1; } @@ -2425,11 +2431,17 @@ int virGetGroupID(virConnectPtr conn, gid_t *gid) { char *strbuf; struct group grbuf; struct group *gr = NULL; - size_t strbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); + long val = sysconf(_SC_GETGR_R_SIZE_MAX); + size_t strbuflen = val; + + if (val < 0) { + virReportSystemError(conn, errno, "%s", _("sysconf failed")); + return -1; + } if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { virReportOOMError(conn); return -1; } -- 1.7.0.rc1.149.g0b0b7

2 2

[libvirt] virt-manager network properties
by C.J. Adams-Collier 01 Feb '10

01 Feb '10

Hey Dan, list, It seems to me that virt-manager could do with more information about the virtual network devices, the DHCP leases on them, maybe a view of the arp table, etc. To this end, I've abused Dan's .glade file a bit and put some stub code in virtManger/host.py Could I get some comments and some recommendations for next steps? It's been a while since I've done any glade'ing... Cheers, C.J.

1 2

[libvirt] [PATCH] qemu_monitor_json.c: avoid many unconditional leaks
by Jim Meyering 01 Feb '10

01 Feb '10

Actually, the preceding patch fixed only the one leak that had been introduced in the last month or so. Looking at the many other functions that do the same sort of thing (call qemuMonitorJSONMakeCommand, and later virJSONValueFree), I saw that they all had exactly the same leak. So this amended patch fixes all of them: >From 28f820354dcae9950cad042ea78a893fd9475830 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 many unconditional leaks * src/qemu/qemu_monitor_json.c (qemuMonitorJSONAttachDrive): Don't leak the buffer behind a virJSONValuePtr. (qemuMonitorJSONStartCPUs): Likewise. (qemuMonitorJSONStopCPUs, qemuMonitorJSONSystemPowerdown): Likewise. (qemuMonitorJSONGetCPUInfo, qemuMonitorJSONGetBalloonInfo): Likewise. (qemuMonitorJSONGetBlockStatsInfo): Likewise. (qemuMonitorJSONSetVNCPassword): Likewise. (qemuMonitorJSONSetBalloon, qemuMonitorJSONEjectMedia): Likewise. (qemuMonitorJSONChangeMedia, qemuMonitorJSONSaveMemory): Likewise. (qemuMonitorJSONSetMigrationSpeed): Likewise. (qemuMonitorJSONGetMigrationStatus, qemuMonitorJSONMigrate): Likewise. (qemuMonitorJSONMigrateCancel, qemuMonitorJSONAddUSB): Likewise. (qemuMonitorJSONAddPCIHostDevice, qemuMonitorJSONAddPCIDisk): Likewise. (qemuMonitorJSONAddPCINetwork, qemuMonitorJSONRemovePCIDevice): Likewise. (qemuMonitorJSONSendFileHandle): Likewise. (qemuMonitorJSONCloseFileHandle): Likewise. (qemuMonitorJSONAddHostNetwork): Likewise. (qemuMonitorJSONRemoveHostNetwork): Likewise. (qemuMonitorJSONGetPtyPaths): Likewise. (qemuMonitorJSONAttachPCIDiskController): Likewise. --- src/qemu/qemu_monitor_json.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8e88c7e..b6c3449 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -492,6 +492,7 @@ qemuMonitorJSONStartCPUs(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -512,6 +513,7 @@ qemuMonitorJSONStopCPUs(qemuMonitorPtr mon) ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -531,6 +533,7 @@ int qemuMonitorJSONSystemPowerdown(qemuMonitorPtr mon) ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -637,6 +640,7 @@ int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon, ret = qemuMonitorJSONExtractCPUInfo(reply, pids); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -696,6 +700,7 @@ int qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, cleanup: virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -800,6 +805,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, cleanup: virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -824,6 +830,7 @@ int qemuMonitorJSONSetVNCPassword(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -861,6 +868,7 @@ int qemuMonitorJSONSetBalloon(qemuMonitorPtr mon, cleanup: virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -884,6 +892,7 @@ int qemuMonitorJSONEjectMedia(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -918,6 +927,7 @@ int qemuMonitorJSONChangeMedia(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -945,6 +955,7 @@ static int qemuMonitorJSONSaveMemory(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -991,6 +1002,7 @@ int qemuMonitorJSONSetMigrationSpeed(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1084,6 +1096,7 @@ int qemuMonitorJSONGetMigrationStatus(qemuMonitorPtr mon, ret = -1; virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1109,6 +1122,7 @@ static int qemuMonitorJSONMigrate(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1206,6 +1220,7 @@ int qemuMonitorJSONMigrateCancel(qemuMonitorPtr mon) ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1229,6 +1244,7 @@ static int qemuMonitorJSONAddUSB(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1369,6 +1385,7 @@ int qemuMonitorJSONAddPCIHostDevice(qemuMonitorPtr mon, ret = -1; virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1410,6 +1427,7 @@ int qemuMonitorJSONAddPCIDisk(qemuMonitorPtr mon, ret = -1; virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1442,6 +1460,7 @@ int qemuMonitorJSONAddPCINetwork(qemuMonitorPtr mon, ret = -1; virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1475,6 +1494,7 @@ int qemuMonitorJSONRemovePCIDevice(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1498,6 +1518,7 @@ int qemuMonitorJSONSendFileHandle(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1520,6 +1541,7 @@ int qemuMonitorJSONCloseFileHandle(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1542,6 +1564,7 @@ int qemuMonitorJSONAddHostNetwork(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1566,6 +1589,7 @@ int qemuMonitorJSONRemoveHostNetwork(qemuMonitorPtr mon, ret = qemuMonitorJSONCheckError(cmd, reply); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1665,6 +1689,7 @@ int qemuMonitorJSONGetPtyPaths(qemuMonitorPtr mon, ret = qemuMonitorJSONExtractPtyPaths(reply, paths); virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1705,6 +1730,7 @@ int qemuMonitorJSONAttachPCIDiskController(qemuMonitorPtr mon, ret = -1; virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } @@ -1773,6 +1799,7 @@ int qemuMonitorJSONAttachDrive(qemuMonitorPtr mon, ret = -1; virJSONValueFree(cmd); + VIR_FREE(cmd); virJSONValueFree(reply); return ret; } -- 1.7.0.rc0.140.gfbe7

3 6

[libvirt] [PATCH] avoid format-related warnings
by Jim Meyering 01 Feb '10

01 Feb '10

FYI, more of these. No need to review. I'll push shortly. >From 4cd188d4d5e4ffebdc026dee9179d2a97c02d3f5 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 1 Feb 2010 18:25:23 +0100 Subject: [PATCH] avoid format-related warnings * src/qemu/qemu_monitor_text.c (qemuMonitorTextGetAllPCIAddresses): Use %s. * src/storage/storage_backend_iscsi.c (virStorageBackendCreateIfaceIQN): Likewise. * tools/virsh.c (cmdSecretSetValue): Likewise. --- src/qemu/qemu_monitor_text.c | 2 +- src/storage/storage_backend_iscsi.c | 4 ++-- tools/virsh.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 380bcdc..44111e1 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1959,7 +1959,7 @@ int qemuMonitorTextGetAllPCIAddresses(qemuMonitorPtr mon, if (qemuMonitorCommand(mon, "info pci", &reply) < 0) { qemudReportError(NULL, NULL, NULL, VIR_ERR_OPERATION_FAILED, - _("cannot query PCI addresses")); + "%s", _("cannot query PCI addresses")); return -1; } diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 5c657b4..0d3c7b1 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -1,7 +1,7 @@ /* * storage_backend_iscsi.c: storage backend for iSCSI handling * - * Copyright (C) 2007-2008 Red Hat, Inc. + * Copyright (C) 2007-2008, 2010 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -259,7 +259,7 @@ virStorageBackendCreateIfaceIQN(virConnectPtr conn, char temp_ifacename[32]; if (virRandomInitialize(time(NULL) ^ getpid()) == -1) { - virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, + virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to initialize random generator " "when creating iscsi interface")); goto out; diff --git a/tools/virsh.c b/tools/virsh.c index 1fae5e6..01d2038 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1,7 +1,7 @@ /* * virsh.c: a Xen shell used to exercise the libvirt API * - * Copyright (C) 2005, 2007-2009 Red Hat, Inc. + * Copyright (C) 2005, 2007-2010 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -5482,7 +5482,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) goto cleanup; if (!base64_decode_alloc(base64, strlen(base64), &value, &value_size)) { - vshError(ctl, _("Invalid base64 data")); + vshError(ctl, "%s", _("Invalid base64 data")); goto cleanup; } if (value == NULL) { -- 1.7.0.rc1.149.g0b0b7

1 0

[libvirt] [PATCH] cpu_x86.c: avoid NULL-deref for invalid arguments
by Jim Meyering 01 Feb '10

01 Feb '10

Passing a NULL "models" pointer along with a contradictory "nmodels >= 1" would cause a NULL-dereference. An alternative to the fix below would be simply to guard the NULL-derferencing strcmp with "if (models ...", but that wouldn't tell the caller that they're passing bogus arguments. >From f57bd1fbe7a41b1b9d8ba1be61790e95b5060ddc Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 26 Jan 2010 19:58:48 +0100 Subject: [PATCH] cpu_x86.c: avoid NULL-deref for invalid arguments * src/cpu/cpu_x86.c (x86Decode): Do not dereference NULL when "models" is NULL and nmodels is 1 or greater. --- src/cpu/cpu_x86.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index dae7c90..47dc400 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1,7 +1,7 @@ /* * cpu_x86.c: CPU driver for CPUs with x86 compatible CPUID instruction * - * 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 @@ -954,6 +954,9 @@ x86Decode(virCPUDefPtr cpu, if (data == NULL || (map = x86LoadMap()) == NULL) return -1; + if (models == NULL && nmodels != 0) + return -1; + candidate = map->models; while (candidate != NULL) { bool allowed = (models == NULL); -- 1.7.0.rc0.140.gfbe7

3 5

[libvirt] [PATCH] maint: avoid excess parens in STREQ
by Eric Blake 01 Feb '10

01 Feb '10

* src/internal.h (STREQ, STRCASEEQ, STRNEQ, STRCASENEQ, STREQLEN) (STRCASEEQLEN, STRNEQLEN, STRCASENEQLEN, STRPREFIX): Avoid redundant parenthesis. * examples/domain-events/events-c/event-test.c (STREQ): Likewise. * src/storage/parthelper.c (STREQ): Likewise. --- These macros were originally inspired by Jim Meyering, who has since made this same cleanup elsewhere. For example: http://lists.gnu.org/archive/html/bug-gnulib/2010-01/msg00293.html examples/domain-events/events-c/event-test.c | 2 +- src/internal.h | 18 +++++++++--------- src/storage/parthelper.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index b2eb1d5..e8f5505 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -14,7 +14,7 @@ __func__, __LINE__) #define DEBUG(fmt, ...) printf("%s:%d: " fmt "\n", \ __func__, __LINE__, __VA_ARGS__) -#define STREQ(a,b) (strcmp((a),(b)) == 0) +#define STREQ(a,b) (strcmp(a,b) == 0) #ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED __attribute__((__unused__)) diff --git a/src/internal.h b/src/internal.h index 5ca1fa3..ec8a49f 100644 --- a/src/internal.h +++ b/src/internal.h @@ -48,15 +48,15 @@ #define N_(str) dgettext(GETTEXT_PACKAGE, (str)) /* String equality tests, suggested by Jim Meyering. */ -#define STREQ(a,b) (strcmp((a),(b)) == 0) -#define STRCASEEQ(a,b) (strcasecmp((a),(b)) == 0) -#define STRNEQ(a,b) (strcmp((a),(b)) != 0) -#define STRCASENEQ(a,b) (strcasecmp((a),(b)) != 0) -#define STREQLEN(a,b,n) (strncmp((a),(b),(n)) == 0) -#define STRCASEEQLEN(a,b,n) (strncasecmp((a),(b),(n)) == 0) -#define STRNEQLEN(a,b,n) (strncmp((a),(b),(n)) != 0) -#define STRCASENEQLEN(a,b,n) (strncasecmp((a),(b),(n)) != 0) -#define STRPREFIX(a,b) (strncmp((a),(b),strlen((b))) == 0) +#define STREQ(a,b) (strcmp(a,b) == 0) +#define STRCASEEQ(a,b) (strcasecmp(a,b) == 0) +#define STRNEQ(a,b) (strcmp(a,b) != 0) +#define STRCASENEQ(a,b) (strcasecmp(a,b) != 0) +#define STREQLEN(a,b,n) (strncmp(a,b,n) == 0) +#define STRCASEEQLEN(a,b,n) (strncasecmp(a,b,n) == 0) +#define STRNEQLEN(a,b,n) (strncmp(a,b,n) != 0) +#define STRCASENEQLEN(a,b,n) (strncasecmp(a,b,n) != 0) +#define STRPREFIX(a,b) (strncmp(a,b,strlen(b)) == 0) #define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] = '\0'; } while (0) #define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array)) diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index ab04842..5626cd2 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -10,7 +10,7 @@ * in a reliable fashion if merely after a list of partitions & sizes, * though it is fine for creating partitions. * - * Copyright (C) 2007-2008 Red Hat, Inc. + * Copyright (C) 2007-2008, 2010 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -37,7 +37,7 @@ #include <string.h> /* we don't need to include the full internal.h just for this */ -#define STREQ(a,b) (strcmp((a),(b)) == 0) +#define STREQ(a,b) (strcmp(a,b) == 0) /* Make the comparisons below fail if your parted headers are so old that they lack the definition. */ -- 1.6.6

3 4

[libvirt] [PATCH] Log flags in virConnectCompareCPU
by Jiri Denemark 01 Feb '10

01 Feb '10

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 32f9fc4..8a9ee20 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -10951,7 +10951,7 @@ virConnectCompareCPU(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%u", conn, xmlDesc, flags); virResetLastError(); -- 1.6.6.1

3 2

[libvirt] [PATCH] Fix PCI host reattach on domain detach.
by Chris Lalancette 01 Feb '10

01 Feb '10

Similar to the race fixed by be34c3c7efbb1ea8999530f98b99c5dde3793f84, make sure to wait around for KVM to release the resources from a hot-detached PCI device before attempting to rebind that device to the host driver. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bbdbe33..5bf6743 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2240,6 +2240,26 @@ cleanup: } static void +qemudReattachManagedDevice(pciDevice *dev) +{ + 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); + } + } +} + +static void qemuDomainReAttachHostDevices(virConnectPtr conn, struct qemud_driver *driver, virDomainDefPtr def) @@ -2279,20 +2299,7 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); - 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); - } - } + qemudReattachManagedDevice(dev); } pciDeviceListFree(conn, pcidevs); @@ -6128,11 +6135,11 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn, if (!pci) ret = -1; else { + pciDeviceSetManaged(pci, detach->managed); pciDeviceListDel(conn, driver->activePciHostdevs, pci); if (pciResetDevice(conn, pci, driver->activePciHostdevs) < 0) ret = -1; - if (detach->managed && pciReAttachDevice(conn, pci) < 0) - ret = -1; + qemudReattachManagedDevice(pci); pciFreeDevice(conn, pci); } -- 1.6.6

2 2

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

01 Feb '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. To make this work, I modified virFindFileInPath to handle an absolute path correctly. I also ran into an issue where NULL was sometimes being passed for the file parameter to virFindFileInPath; it didn't crash prior to this patch since it was building paths like /usr/bin/(null). This is non-standard behavior, though, so I added a NULL check at the beginning. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_conf.c | 3 ++- src/util/util.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index f4a6c08..d5e38c2 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -804,7 +804,8 @@ qemudCapsInitGuest(virCapsPtr caps, if (STREQ(info->arch, hostmachine) || (STREQ(hostmachine, "x86_64") && STREQ(info->arch, "i686"))) { if (access("/dev/kvm", F_OK) == 0) { - const char *const kvmbins[] = { "qemu-kvm", /* Fedora */ + const char *const kvmbins[] = { "/usr/libexec/qemu-kvm", /* RHEL */ + "qemu-kvm", /* Fedora */ "kvm" }; /* Upstream .spec */ for (i = 0; i < ARRAY_CARDINALITY(kvmbins); ++i) { diff --git a/src/util/util.c b/src/util/util.c index 0ce5026..394ef35 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1114,6 +1114,19 @@ char *virFindFileInPath(const char *file) char *pathseg; char fullpath[PATH_MAX]; + if (file == NULL) + return NULL; + + /* if we are passed an absolute path (starting with /), return a + * copy of that path + */ + if (file[0] == '/') { + if (virFileExists(file)) + return strdup(file); + else + return NULL; + } + /* copy PATH env so we can tweak it */ if (virStrcpyStatic(pathenv, getenv("PATH")) == NULL) return NULL; -- 1.6.6

2 2

[libvirt] [PATCH] Clarify lack of generated IDE -device string in QEMU driver
by Matthew Booth 01 Feb '10

01 Feb '10

The QEMU driver contained code to generate a -device string for piix4-ide, but wasn't using it. This was intentional. This change removes the string generation and adds a comment explaining why no -device is necessary. * src/qemu/qemu_conf.c: Remove VIR_DOMAIN_CONTROLLER_TYPE_IDE handler in qemuBuildControllerDevStr(). Add comments. --- src/qemu/qemu_conf.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index f4a6c08..1c4f326 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2121,11 +2121,8 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) virBufferVSprintf(&buf, ",id=scsi%d", def->idx); break; + /* We always get an IDE controller, whether we want it or not. */ case VIR_DOMAIN_CONTROLLER_TYPE_IDE: - virBufferAddLit(&buf, "piix4-ide"); - virBufferVSprintf(&buf, ",id=ide%d", def->idx); - break; - default: goto error; } @@ -3141,16 +3138,19 @@ int qemudBuildCommandLine(virConnectPtr conn, if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { for (i = 0 ; i < def->ncontrollers ; i++) { - char *scsi; - if (def->controllers[i]->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + /* We don't add an explicit IDE controller because the provided + * PIIX4 device already includes one. It isn't possible to remove + * the PIIX4. */ + if (def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) continue; ADD_ARG_LIT("-device"); - if (!(scsi = qemuBuildControllerDevStr(def->controllers[i]))) + char *devstr; + if (!(devstr = qemuBuildControllerDevStr(def->controllers[i]))) goto no_memory; - ADD_ARG(scsi); + ADD_ARG(devstr); } } -- 1.6.6

3 6

[libvirt] Bugfix for RHEL 5.4+ ?? -- Re: Synchronous commands block virsh?
by Andreas Kurz 01 Feb '10

01 Feb '10

Hi list, I found this thread from December: http://www.mail-archive.com/libvir-list@redhat.com/msg18595.htm .... that starting with version 0.7.4 libvirtd will no longer block other API calls, which would be extremely useful in HA clusters in combination with live migration. Will this fix find its way into RHEL 5? Regards, Andreas

4 4

[libvirt] vshRunConsole:77 : unable to open tty
by Ruben Kerkhof 29 Jan '10

29 Jan '10

Hi all, I'm unable to open a serial console to a kvm virtual machine with virsh console: [root@phy003 ~]# virsh console f12 Connected to domain f12 Escape character is ^] 20:43:48.282: error : vshRunConsole:77 : unable to open tty /dev/pts/ 1 : No such file or directory If you look carefully to the message above, there's a space after /dev/ pts/1 I can also see this in the xml: [root@phy003 ~]# virsh dumpxml f12 > f12.xml <console type='pty' tty='/dev/pts/1^M'> <source path='/dev/pts/1^M'/> <target port='0'/> </console> <console type='pty' tty='/dev/pts/1^M'> <source path='/dev/pts/1^M'/> <target port='0'/> </console> I've run gdb over virsh, and this is what virDomainGetXMLDesc returns: <console type='pty' tty='/dev/pts/1\r'> I'm not sure if this has already been fixed, this is libvirt-0.7.5-3.fc12.x86_64 from the rawhide preview repo on F12, with qemu-kvm-0.12.2-4.fc12.x86_64 Any help would be appreciated. Ruben Kerkhof

2 2

[libvirt] [PATCH] maint: fix spelling error in hacking
by Eric Blake 29 Jan '10

29 Jan '10

* HACKING: STRCASEEQ is case insensitive. * docs/hacking.html.in: Likewise. --- HACKING | 4 ++-- docs/hacking.html.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/HACKING b/HACKING index 0c65dad..3844e50 100644 --- a/HACKING +++ b/HACKING @@ -222,7 +222,7 @@ one of the following semantically named macros STREQ(a,b) STRNEQ(a,b) - - For case sensitive equality: + - For case insensitive equality: STRCASEEQ(a,b) STRCASENEQ(a,b) @@ -231,7 +231,7 @@ one of the following semantically named macros STREQLEN(a,b,n) STRNEQLEN(a,b,n) - - For case sensitive equality of a substring: + - For case insensitive equality of a substring: STRCASEEQLEN(a,b,n) STRCASENEQLEN(a,b,n) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 43a79f7..96f6657 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -256,7 +256,7 @@ </pre> </li> - <li><p>For case sensitive equality:</p> + <li><p>For case insensitive equality:</p> <pre> STRCASEEQ(a,b) STRCASENEQ(a,b) @@ -271,7 +271,7 @@ </pre> </li> - <li><p>For case sensitive equality of a substring:</p> + <li><p>For case insensitive equality of a substring:</p> <pre> STRCASEEQLEN(a,b,n) -- 1.6.6

2 1

[libvirt] [PATCH] util.c (virGetUserEnt): don't use a negative value as allocation size
by Jim Meyering 29 Jan '10

29 Jan '10

Not a big deal, but reporting a failed sysconf call will make this far easier to diagnose than reporting an unwarranted OOM. >From 2bf48c9414cac791f03228ff15590414ec617f22 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 28 Jan 2010 13:37:05 +0100 Subject: [PATCH] util.c (virGetUserEnt): don't use a negative value as allocation size * src/util/util.c (virGetUserEnt): In the unlikely event that sysconf(_SC_GETPW_R_SIZE_MAX) fails, don't use -1 as the size in the subsequent allocation. --- src/util/util.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 0ce5026..701581d 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2317,7 +2317,13 @@ static char *virGetUserEnt(virConnectPtr conn, char *ret; struct passwd pwbuf; struct passwd *pw = NULL; - size_t strbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); + long val = sysconf(_SC_GETPW_R_SIZE_MAX); + size_t strbuflen = val; + + if (val < 0) { + virReportSystemError(conn, errno, "%s", _("sysconf failed")); + return NULL; + } if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { virReportOOMError(conn); -- 1.7.0.rc0.170.g7207c

2 2

[libvirt] libvirt: build error
by Sharadha Prabhakar (3P) 29 Jan '10

29 Jan '10

Hi, I'm getting the following error when I make libvirt version 0.7.4 Make all-recursive make[1]: Entering directory `/home/sharadhap/libvirt-0.7.4' Making all in gnulib/lib make[2]: Entering directory `/home/sharadhap/libvirt-0.7.4/gnulib/lib' make all-recursive make[3]: Entering directory `/home/sharadhap/libvirt-0.7.4/gnulib/lib' make[4]: Entering directory `/home/sharadhap/libvirt-0.7.4/gnulib/lib' /bin/sh ../../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I../.. -I../../intl -g -O2 -MT printf-parse.lo -MD -MP -MF .deps/printf-parse.Tpo -c -o printf-parse.lo printf-parse.c libtool: compile: gcc -DHAVE_CONFIG_H -I. -I../.. -I../../intl -g -O2 -MT printf-parse.lo -MD -MP -MF .deps/printf-parse.Tpo -c printf-parse.c -fPIC -DPIC -o .libs/printf-parse.o In file included from printf-parse.c:70: xsize.h: In function 'xsum': xsize.h:59: error: expected expression before ')' token xsize.h:59: error: expected expression before ')' token printf-parse.c: In function 'printf_parse': printf-parse.c:164: error: expected expression before ')' token printf-parse.c:164: error: expected expression before ')' token printf-parse.c:164: error: expected expression before ')' token printf-parse.c:164: error: expected expression before ')' token printf-parse.c:168: error: expected expression before ')' token printf-parse.c:168: error: expected expression before ')' token printf-parse.c:234: error: expected expression before ')' token printf-parse.c:234: error: expected expression before ')' token printf-parse.c:234: error: expected expression before ')' token printf-parse.c:234: error: expected expression before ')' token printf-parse.c:238: error: expected expression before ')' token printf-parse.c:238: error: expected expression before ')' token printf-parse.c:252: error: expected expression before ')' token printf-parse.c:252: error: expected expression before ')' token printf-parse.c:252: error: expected expression before ')' token printf-parse.c:252: error: expected expression before ')' token printf-parse.c:252: error: expected expression before ')' token printf-parse.c:252: error: expected expression before ')' token printf-parse.c:252: error: expected expression before ')' token printf-parse.c:252: error: expected expression before ')' token printf-parse.c:252: error: expected expression before ')' token printf-parse.c:252: error: expected expression before ')' token printf-parse.c:291: error: expected expression before ')' token printf-parse.c:291: error: expected expression before ')' token printf-parse.c:291: error: expected expression before ')' token printf-parse.c:291: error: expected expression before ')' token printf-parse.c:295: error: expected expression before ')' token printf-parse.c:295: error: expected expression before ')' token printf-parse.c:310: error: expected expression before ')' token printf-parse.c:310: error: expected expression before ')' token printf-parse.c:310: error: expected expression before ')' token printf-parse.c:310: error: expected expression before ')' token printf-parse.c:310: error: expected expression before ')' token printf-parse.c:310: error: expected expression before ')' token printf-parse.c:310: error: expected expression before ')' token printf-parse.c:310: error: expected expression before ')' token printf-parse.c:310: error: expected expression before ')' token printf-parse.c:310: error: expected expression before ')' token printf-parse.c:567: error: expected expression before ')' token printf-parse.c:567: error: expected expression before ')' token printf-parse.c:567: error: expected expression before ')' token printf-parse.c:567: error: expected expression before ')' token printf-parse.c:567: error: expected expression before ')' token printf-parse.c:567: error: expected expression before ')' token printf-parse.c:567: error: expected expression before ')' token printf-parse.c:567: error: expected expression before ')' token printf-parse.c:567: error: expected expression before ')' token printf-parse.c:567: error: expected expression before ')' token printf-parse.c:579: error: expected expression before ')' token printf-parse.c:579: error: expected expression before ')' token printf-parse.c:579: error: expected expression before ')' token printf-parse.c:579: error: expected expression before ')' token printf-parse.c:580: error: expected expression before ')' token printf-parse.c:580: error: expected expression before ')' token printf-parse.c:580: error: expected expression before ')' token printf-parse.c:580: error: expected expression before ')' token printf-parse.c:581: error: expected expression before ')' token printf-parse.c:581: error: expected expression before ')' token make[4]: *** [printf-parse.lo] Error 1 make[4]: Leaving directory `/home/sharadhap/libvirt-0.7.4/gnulib/lib' make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory `/home/sharadhap/libvirt-0.7.4/gnulib/lib' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/sharadhap/libvirt-0.7.4/gnulib/lib' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/sharadhap/libvirt-0.7.4' make: *** [all] Error 2ake libvirt version 0.7.4 I'm using gcc version 4.3.2 Distro : Debian lenny 5 Could someone provide some help here? -SP

2 1

[libvirt] Release 0.4.2 of libvirt-java
by Bryan Kearney 29 Jan '10

29 Jan '10

I have just released 0.4.2 of libvirt java. This release fixes the NPE in xen Scheduled Parameters which was reported by Frederic Dangtran. You can access the latest version via the following means: Source Code: http://www.libvirt.org/git/?p=libvirt-java.git;a=summary Bundled Source (tarball and SRPM): http://libvirt.org/sources/java/ Maven: http://libvirt.org/maven2/. They should hit the central repo in a day or two. RPMS are making their way through the F12 and Rawhide build systems Thank you! -- bk

1 0

[libvirt] Release 0.4.1 of libvirt-java
by Bryan Kearney 29 Jan '10

29 Jan '10

I have just released 0.4.1 of libvirt java. There are 2 main items in this release: - Better null checking in for Scheduled Parameters which should fix the issues reported on the list. - Error Callbacks to provide better handling of errors encountered by libvirt (virConnSetErrorFunc and virSetErrorFunc). You can access the latest version via the following means: Source Code: http://www.libvirt.org/git/?p=libvirt-java.git;a=summary Bundled Source (tarball and SRPM): http://libvirt.org/sources/java/ Maven: http://libvirt.org/maven2/ RPMS are making their way through F-11 and F12 build systems Thank you! -- bk

2 5

[libvirt] Schedule for libvirt-0.7.6
by Daniel Veillard 29 Jan '10

29 Jan '10

So the plan is still to start the feature freeze end of next friday the 22 Jan and try to push 0.7.6 on the 29th. This mean there is still one week to push features :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] Allow a per-PCI passthrough device permissive attribute
by Chris Lalancette 28 Jan '10

28 Jan '10

Currently there is a global tag to let the administrator turn off system-wide ACS checking when doing PCI device passthrough. However, this is too coarse-grained of an attribute, since it doesn't allow setups where certain guests are trusted while other ones are untrusted. Allow more complicated setups by making the device checking a per-device setting. The more detailed explanation of why this is necessary delves deep into PCIe internals. Ideally we'd like to be able to probe devices and figure out whether it is safe to assign them. In practice, this isn't possible because PCIe allows devices to have "hidden" bridges that software can't discover. If you were to have two devices assigned to two different domains behind one of these hidden bridges, they could do P2P traffic and bypass all of the VT-d/IOMMU checks. The next thing we could try to do is to have a whitelist of devices that we know to be safe. For instance, instead of a "hidden" bridge, PCI devices can multiplex functions instead, which causes all traffic to head to an upstream bridge before P2P can take place. Additionally, some "hidden" PCI bridges may have ACS on-board. In both of these cases it's safe to passthrough the device(s), since they can't P2P without the IOMMU getting involved. However, even if we did have a whitelist, I think we still need a permissive attribute. For one thing, the whitelist will always be out of date with respect to new hardware, so we'd need to allow administrators to temporarily override the whitelist restriction until a new version of the whitelist came out. Also, we want to support the case where the administrator knows it is safe to assign possibly unsafe devices to a domain he trusts. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- docs/schemas/domain.rng | 6 ++++++ src/conf/domain_conf.c | 14 +++++++++++--- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 2 ++ src/qemu/qemu_driver.c | 1 + src/util/pci.c | 13 ++++++++++++- src/util/pci.h | 3 +++ 7 files changed, 36 insertions(+), 4 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 827ff6f..9f90f4d 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1175,6 +1175,12 @@ <value>no</value> </choice> </attribute> + <attribute name="permissive"> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> </optional> <group> <element name="source"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e548d1d..899967d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2929,7 +2929,7 @@ virDomainHostdevDefParseXML(virConnectPtr conn, xmlNodePtr cur; virDomainHostdevDefPtr def; - char *mode, *type = NULL, *managed = NULL; + char *mode, *type = NULL, *managed = NULL, *permissive = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(conn); @@ -2968,6 +2968,13 @@ virDomainHostdevDefParseXML(virConnectPtr conn, VIR_FREE(managed); } + permissive = virXMLPropString(node, "permissive"); + if (permissive != NULL) { + if (STREQ(permissive, "yes")) + def->permissive = 1; + VIR_FREE(permissive); + } + cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { @@ -5243,8 +5250,9 @@ virDomainHostdevDefFormat(virConnectPtr conn, return -1; } - virBufferVSprintf(buf, " <hostdev mode='%s' type='%s' managed='%s'>\n", - mode, type, def->managed ? "yes" : "no"); + virBufferVSprintf(buf, " <hostdev mode='%s' type='%s' managed='%s' permissive='%s'>\n", + mode, type, def->managed ? "yes" : "no", + def->permissive ? "yes" : "no"); virBufferAddLit(buf, " <source>\n"); if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7be090d..57ab4b4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -475,6 +475,7 @@ typedef virDomainHostdevDef *virDomainHostdevDefPtr; struct _virDomainHostdevDef { int mode; /* enum virDomainHostdevMode */ unsigned int managed : 1; + unsigned int permissive : 1; union { struct { int type; /* enum virDomainHostdevBusType */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d56fb7d..49e222e 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -441,6 +441,8 @@ pciWaitForDeviceCleanup; pciResetDevice; pciDeviceSetManaged; pciDeviceGetManaged; +pciDeviceSetPermissive; +pciDeviceGetPermissive; pciDeviceListNew; pciDeviceListFree; pciDeviceListAdd; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5bf6743..9848f1c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2137,6 +2137,7 @@ qemuGetPciHostDeviceList(virConnectPtr conn, } pciDeviceSetManaged(dev, hostdev->managed); + pciDeviceSetPermissive(dev, hostdev->permissive); } return list; diff --git a/src/util/pci.c b/src/util/pci.c index 0274806..42a0be6 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -64,6 +64,7 @@ struct _pciDevice { unsigned has_flr : 1; unsigned has_pm_reset : 1; unsigned managed : 1; + unsigned permissive : 1; }; struct _pciDeviceList { @@ -1076,6 +1077,16 @@ unsigned pciDeviceGetManaged(pciDevice *dev) return dev->managed; } +void pciDeviceSetPermissive(pciDevice *dev, unsigned permissive) +{ + dev->permissive = !!permissive; +} + +unsigned pciDeviceGetPermissive(pciDevice *dev) +{ + return dev->permissive; +} + pciDeviceList * pciDeviceListNew(virConnectPtr conn) { @@ -1353,7 +1364,7 @@ int pciDeviceIsAssignable(virConnectPtr conn, return 0; if (ret) { - if (!strict_acs_check) { + if (!strict_acs_check || dev->permissive) { VIR_DEBUG("%s %s: strict ACS check disabled; device assignment allowed", dev->id, dev->name); } else { diff --git a/src/util/pci.h b/src/util/pci.h index e6ab137..3f98374 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -44,6 +44,9 @@ int pciResetDevice (virConnectPtr conn, void pciDeviceSetManaged(pciDevice *dev, unsigned managed); unsigned pciDeviceGetManaged(pciDevice *dev); +void pciDeviceSetPermissive(pciDevice *dev, + unsigned permissive); +unsigned pciDeviceGetPermissive(pciDevice *dev); pciDeviceList *pciDeviceListNew (virConnectPtr conn); void pciDeviceListFree (virConnectPtr conn, -- 1.6.6

2 3

[libvirt] [PATCH 1/3] Clarify why some controllers don't generate -device string in QEMU driver
by Matthew Booth 28 Jan '10

28 Jan '10

The QEMU driver contained code to generate a -device string for piix4-ide, but wasn't using it. This change removes this string generation. It also adds a comment explaining why IDE and FDC controllers don't generate -device strings. The change also generates an error if a sata controller is specified for a QEMU domain, as this isn't supported. * src/qemu/qemu_conf.c: Remove VIR_DOMAIN_CONTROLLER_TYPE_IDE handler in qemuBuildControllerDevStr(). Ignore IDE and FDC controllers. Error if SATA controller is discovered. Add comments. --- src/qemu/qemu_conf.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index f4a6c08..3b7793f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2121,11 +2121,8 @@ qemuBuildControllerDevStr(virDomainControllerDefPtr def) virBufferVSprintf(&buf, ",id=scsi%d", def->idx); break; + /* We always get an IDE controller, whether we want it or not. */ case VIR_DOMAIN_CONTROLLER_TYPE_IDE: - virBufferAddLit(&buf, "piix4-ide"); - virBufferVSprintf(&buf, ",id=ide%d", def->idx); - break; - default: goto error; } @@ -3141,16 +3138,29 @@ int qemudBuildCommandLine(virConnectPtr conn, if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) { for (i = 0 ; i < def->ncontrollers ; i++) { - char *scsi; - if (def->controllers[i]->type != VIR_DOMAIN_CONTROLLER_TYPE_SCSI) + virDomainControllerDefPtr cont = def->controllers[i]; + + /* We don't add an explicit IDE or FD controller because the + * provided PIIX4 device already includes one. It isn't possible to + * remove the PIIX4. */ + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE || + cont->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC) continue; + /* QEMU doesn't implement a SATA driver */ + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, + "%s", _("SATA is not supported with this QEMU binary")); + goto error; + } + ADD_ARG_LIT("-device"); - if (!(scsi = qemuBuildControllerDevStr(def->controllers[i]))) + char *devstr; + if (!(devstr = qemuBuildControllerDevStr(def->controllers[i]))) goto no_memory; - ADD_ARG(scsi); + ADD_ARG(devstr); } } -- 1.6.6

1 2

[libvirt] Libvirt guide draft published on libvirt.org
by David Jorm 28 Jan '10

28 Jan '10

I am a tech writer who recently joined the Red Hat team. I have been tasked with assisting in the improvement of libvirt documentation where possible and co-ordinating the development of the libvirt Application Development Guide. The guide was previously in the hands of Dani Coulson, who has since left Red Hat. She got it to a draft stage with a skeletal structure, but as far as I can tell nothing ever reached a publishable state. I've picked up where she left off and re-built the latest guide from the DocBook XML in git. It is now up at: http://libvirt.org/guide/ If you look in the guide, you will notice an awful lot of "TBD" stubs. Contributions to fill these would be greatly appreciated - please email them to me directly. I will chase up with the people who were originally nominated as the responsible parties to try and get some content to flesh out the guide. I don't have a lot of spare temporal bandwidth at the moment, but if there are any docs-related BZs or libvirt issues, feel free to push them my way and i'll do what I can. I think i've made every mistake possible so far in submitting patches, so I know the process by virtue of what-not-to-do. Thanks David

2 3

[libvirt] Libvirt/LXC creation example
by Avi Weit 28 Jan '10

28 Jan '10

Hi, I am looking for a simple example for creating a Linux container (LXC) with a network connection that can be accessed from the outside world. I first tried to set up a bridge and link it with the interface eth0 configured on host via: brctl addif virbr0 eth0 but each time I did that - I lost the connection to the host and could not even ping it. The connection was resumed only when removing the host interface of eth0 from the bridge: brctl delif virbr0 eth0 How can I define the network interfaces to be configured inside the container? How can I setup container IPs? Any full XML example would be appreciated. Thanks - Avi

1 0

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

28 Jan '10

The following patch contains cleanup for the udev init error handling and Matthias' fix for the case in which priv is NULL when shutdown is called. Dave

3 3

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

27 Jan '10

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

1 7

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

27 Jan '10

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

2 2

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

27 Jan '10

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

3 3

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

27 Jan '10

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

2 1

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

27 Jan '10

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

2 2

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

27 Jan '10

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

2 3

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

27 Jan '10

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

1 0

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

27 Jan '10

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

2 2

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

26 Jan '10

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

2 2

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

26 Jan '10

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

2 2

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

26 Jan '10

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

2 2

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

26 Jan '10

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

3 7

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

26 Jan '10

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

2 2

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

26 Jan '10

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

2 2

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

26 Jan '10

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

2 1

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

26 Jan '10

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

5 9

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

26 Jan '10

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

2 2

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

26 Jan '10

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

2 1

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

26 Jan '10

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

2 1

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

26 Jan '10

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

2 7

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

25 Jan '10

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

2 2

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

25 Jan '10

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

2 2

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

25 Jan '10

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

2 2

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

25 Jan '10

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

3 6

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

25 Jan '10

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

3 4

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

25 Jan '10

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

2 2

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

25 Jan '10

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

2 2

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

25 Jan '10

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

4 10

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

25 Jan '10

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

2 10

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

25 Jan '10

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

3 3

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

25 Jan '10

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

3 4

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

25 Jan '10

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

3 3

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

24 Jan '10

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

2 1

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

22 Jan '10

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

1 0

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

22 Jan '10

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

2 2

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

22 Jan '10

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

2 2

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

22 Jan '10

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

3 3

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

22 Jan '10

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

3 7

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

22 Jan '10

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

1 0

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

22 Jan '10

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

2 2

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

22 Jan '10

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

2 1

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

22 Jan '10

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

2 1

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

22 Jan '10

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

2 1

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

21 Jan '10

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

3 4

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

21 Jan '10

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

3 7

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

21 Jan '10

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

1 0

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

21 Jan '10

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

3 2