- Devel - libvirt List Archives

[libvirt] [Patch]Sheepdog storage driver ignore refreshVol func's return value
by harryxiyou 06 Feb '13

06 Feb '13

Hi all, In libvirt/src/storage/storage_backend_sheepdog.c file, func virStorageBackendSheepdogCreateVol calls func virStorageBackendSheepdogRefreshVol to refresh Sheepdog volume infos. But we do not check func virStorageBackendSheepdogRefreshVol's return value. Following patch can fix this bug. Signed-off-by: Harry Wei <harryxiyou(a)gmail.com> Subject: [PATCH] sheepdog driver ignore return value for refresh volume --- src/storage/storage_backend_sheepdog.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 66d8fb4..e72c944 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -168,9 +168,12 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandAddArgFormat(cmd, "%llu", vol->capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); ret = virCommandRun(cmd, NULL); + if (0 > ret) + goto cleanup; - virStorageBackendSheepdogRefreshVol(conn, pool, vol); + ret = virStorageBackendSheepdogRefreshVol(conn, pool, vol); +cleanup: virCommandFree(cmd); return ret; } -- 1.7.0.4 -- Thanks Harry Wei

2 2

[libvirt] [PATCH] build: fix build of HAL node backend
by Eric Blake 06 Feb '13

06 Feb '13

Commit 2025356 missed uses of PCI functions in the older HAL-related code, probably because hal-devel is no longer available in latest Fedora. * src/node_device/node_device_hal.c (gather_pci_cap): Reflect function rename. --- Pushing under the build-breaker rule. src/node_device/node_device_hal.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 610df8d..2ecb1de 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -1,7 +1,7 @@ /* * node_device_hal.c: node device enumeration - HAL-based implementation * - * Copyright (C) 2011 Red Hat, Inc. + * Copyright (C) 2011, 2013 Red Hat, Inc. * Copyright (C) 2008 Virtual Iron Software, Inc. * Copyright (C) 2008 David F. Lively * @@ -148,10 +148,12 @@ static int gather_pci_cap(LibHalContext *ctx, const char *udi, (void)virStrToLong_ui(p+1, &p, 16, &d->pci_dev.function); } - if (!pciGetPhysicalFunction(sysfs_path, &d->pci_dev.physical_function)) + if (!virPCIGetPhysicalFunction(sysfs_path, + &d->pci_dev.physical_function)) d->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION; - if (!pciGetVirtualFunctions(sysfs_path, &d->pci_dev.virtual_functions, + if (!virPCIGetVirtualFunctions(sysfs_path, + &d->pci_dev.virtual_functions, &d->pci_dev.num_virtual_functions) || d->pci_dev.num_virtual_functions > 0) d->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; -- 1.7.1

2 1

[libvirt] virsh nodeinfo CPU detection questions
by Scott Sullivan 06 Feb '13

06 Feb '13

I have a machine with four AMD Opteron(TM) 6272 processors: http://www.amd.com/us/products/server/processors/6000-series-platform/6200/… I use 'virsh nodeinfo' to determine the amount of physical CPUs, and CPU cores. What values should I be looking at in the output of nodeinfo to determine this? With 1.X libvirts the output values have changed from 0.9.4: 0.9.4: [root@host ~]# virsh nodeinfo CPU model: x86_64 CPU(s): 64 CPU frequency: 2099 MHz CPU socket(s): 4 Core(s) per socket: 8 Thread(s) per core: 2 NUMA cell(s): 1 Memory size: 24713980 kB [root@host28 ~]# 1.0.1: [root@host ~]# virsh nodeinfo CPU model: x86_64 CPU(s): 64 CPU frequency: 2099 MHz CPU socket(s): 1 Core(s) per socket: 8 Thread(s) per core: 2 NUMA cell(s): 4 Memory size: 24713980 KiB [root@host28 ~]# As you can see, the CPU socket and NUMA cells values have changed in these two versions, on the same machine. To get the physical CPU count, is it safe to assume this? Numa cell(s) X CPU Socket(s) == physical CPUs present However, I am not positive what formula I should use to determine the CPU core count. On this processor, it has 16 cores. Would that mean I can do this? Core(s) per socket X Thread(s) per core: == CPU cores Thanks in advance for clarifying.

4 7

[libvirt] [PATCH V2 0/3] Add support for QEMU file descriptor sets
by Stefan Berger 06 Feb '13

06 Feb '13

The following patch series adds initial support for QEMU file descriptor sets implementing support for creating the proper command line. Some devices are using the sets now. Regards, Stefan

2 10

[libvirt] [PATCH 00/11] Resolution to various Coverity warnings
by John Ferlan 05 Feb '13

05 Feb '13

I upgraded to a new version of Coverity last night (6.5.1) since I was informed it resolved the BAD_SIZEOF errors from the TRACE macros. A majority were resolved, except for 3 which just required a couple of changes to avoid. Since I was down to only a few warnings I tried ratcheting up the analysis "aggressiveness-level" from the default of low to medium and high. There many false positives out of those, but I did manage to find a few more leaks and a missing error check in openvz_driver.c. After this series only a couple of warnings exist in the tests area; however, I've seen IRC chatter on vircommand.c and commandtest.c, so I'll patiently wait on that. There are some warnings in a couple of gnulib modules as well as /usr/include/bits/stdio2.h. John Ferlan (11): tlscontext: Make sure to get proper pointer to name keepalive: Resolve Coverity complaint storage: Resolve resource leaks with cmd processing network: Remove conditional settings to resolve resource leak parallels: Need to free memory on error path openvz: Need to error check openvzDomainSetVcpusFlagsInternal() uml: If need to requery, then VIR_FREE(res) rpc: Need to virCommandFree on error path lxc: Need to call usbFreeDevice() qemu_cgroup: Need to call usbFreeDevice() qemu_hotplug: Need to call usbFreeDevice() src/lxc/lxc_cgroup.c | 8 +++++--- src/network/bridge_driver.c | 9 +++------ src/openvz/openvz_driver.c | 9 +++++++-- src/parallels/parallels_utils.c | 4 +++- src/qemu/qemu_cgroup.c | 6 ++++-- src/qemu/qemu_hotplug.c | 7 +++++-- src/rpc/virkeepalive.c | 14 +++++++------- src/rpc/virnetsocket.c | 1 + src/rpc/virnettlscontext.c | 8 +++++--- src/storage/storage_backend_disk.c | 28 +++++++++++++++------------- src/uml/uml_driver.c | 3 ++- 11 files changed, 57 insertions(+), 40 deletions(-) -- 1.7.11.7

3 31

[libvirt] [PATCH] sanitytest.py: Do not rely on system libvirt
by Jiri Denemark 05 Feb '13

05 Feb '13

When running sanitytest.py we should not rely on libvirt library installed on the system. And since we generate a nice wrapper called "run" that sets both PYTHON_PATH and LD_LIBRARY_PATH, we should just use it rather than trying to duplicate it in the Makefile. --- python/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/Makefile.am b/python/Makefile.am index ef3c3eb..55c5e41 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -122,7 +122,7 @@ $(libvirtmod_lxc_la_OBJECTS): $(LXC_GENERATED) EXTRA_DIST += sanitytest.py check-local: - $(AM_V_GEN)PYTHONPATH=$(abs_topbuilddir):$(abs_topbuilddir)/.libs $(PYTHON) $(srcdir)/sanitytest.py + $(AM_V_GEN)../run $(PYTHON) $(srcdir)/sanitytest.py install-data-local: $(mkinstalldirs) $(DESTDIR)$(pyexecdir) -- 1.8.1.2

2 2

[libvirt] [PATCH] Fix typo in configure.ac causing $LIBS to gain a copy of $CFLAGS
by Daniel P. Berrange 05 Feb '13

05 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virt-dbus.m4 check for DBus was preserving $LIBS before modifying it. Except it wasn't. It was preserving another copy of $CFLAGS. The result was that after the check completed, $LIBS got polluted with $CFLAGS Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- m4/virt-dbus.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-dbus.m4 b/m4/virt-dbus.m4 index 16cb864..4ef0c82 100644 --- a/m4/virt-dbus.m4 +++ b/m4/virt-dbus.m4 @@ -22,7 +22,7 @@ AC_DEFUN([LIBVIRT_CHECK_DBUS],[ if test "$with_dbus" = "yes" ; then old_CFLAGS="$CFLAGS" - old_LIBS="$CFLAGS" + old_LIBS="$LIBS" CFLAGS="$CFLAGS $DBUS_CFLAGS" LIBS="$LIBS $DBUS_LIBS" AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) -- 1.7.11.7

3 2

[libvirt] [PATCH] tests: reserve more fds for commandtest
by Eric Blake 05 Feb '13

05 Feb '13

Commit 39c77fe triggered random failures, depending on the platform and what other fds leak into the testsuite (for me, it passed on RHEL 6 but failed on Fedora 18). The reason was that we were expecting an fd that fell outside of our reserved range. By reserving a larger range, the test once again passes on all platforms. * tests/commandtest.c (mymain): Reserve enough fds. --- I'll wait a bit for a review, but if I don't get one, I'll push this under the build-breaker rule. tests/commanddata/test3.log | 2 +- tests/commandtest.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/commanddata/test3.log b/tests/commanddata/test3.log index bd06371..c6da253 100644 --- a/tests/commanddata/test3.log +++ b/tests/commanddata/test3.log @@ -9,6 +9,6 @@ FD:0 FD:1 FD:2 FD:5 -FD:8 +FD:7 DAEMON:no CWD:/tmp diff --git a/tests/commandtest.c b/tests/commandtest.c index f4e335f..93c6333 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1,7 +1,7 @@ /* * commandtest.c: Test the libCommand API * - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 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 @@ -960,7 +960,10 @@ mymain(void) dup2(fd, 3) < 0 || dup2(fd, 4) < 0 || dup2(fd, 5) < 0 || - (fd > 5 && VIR_CLOSE(fd) < 0)) + dup2(fd, 6) < 0 || + dup2(fd, 7) < 0 || + dup2(fd, 8) < 0 || + (fd > 8 && VIR_CLOSE(fd) < 0)) return EXIT_FAILURE; /* Prime the debug/verbose settings from the env vars, @@ -978,6 +981,12 @@ mymain(void) VIR_FORCE_CLOSE(fd); fd = 5; VIR_FORCE_CLOSE(fd); + fd = 6; + VIR_FORCE_CLOSE(fd); + fd = 7; + VIR_FORCE_CLOSE(fd); + fd = 8; + VIR_FORCE_CLOSE(fd); virEventRegisterDefaultImpl(); if (VIR_ALLOC(test) < 0) { -- 1.8.1

3 3

[libvirt] [PATCH] Fix missing error constants in libvirt python module
by Daniel P. Berrange 05 Feb '13

05 Feb '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The previous change to the generator, changed too much - only the functions are in 'virerror.c', the constants remained in 'virerror.h' which could not be renamed for API compat reasons. Add a test case to sanity check the generated python bindings Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- python/Makefile.am | 5 +++++ python/generator.py | 4 +++- python/sanitytest.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 python/sanitytest.py diff --git a/python/Makefile.am b/python/Makefile.am index dd69600..ef3c3eb 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -119,6 +119,11 @@ $(libvirtmod_la_OBJECTS): $(GENERATED) $(libvirtmod_qemu_la_OBJECTS): $(QEMU_GENERATED) $(libvirtmod_lxc_la_OBJECTS): $(LXC_GENERATED) +EXTRA_DIST += sanitytest.py + +check-local: + $(AM_V_GEN)PYTHONPATH=$(abs_topbuilddir):$(abs_topbuilddir)/.libs $(PYTHON) $(srcdir)/sanitytest.py + install-data-local: $(mkinstalldirs) $(DESTDIR)$(pyexecdir) $(INSTALL) -m 0644 libvirt.py $(DESTDIR)$(pyexecdir) diff --git a/python/generator.py b/python/generator.py index 71ca883..ceade6b 100755 --- a/python/generator.py +++ b/python/generator.py @@ -122,8 +122,9 @@ class docParser(xml.sax.handler.ContentHandler): if attrs.has_key('field'): self.function_return_field = attrs['field'] elif tag == 'enum': + # enums come from header files, hence virterror.h if (attrs['file'] == "libvirt" or - attrs['file'] == "virerror"): + attrs['file'] == "virterror"): enum(attrs['type'],attrs['name'],attrs['value']) elif attrs['file'] == "libvirt-lxc": lxc_enum(attrs['type'],attrs['name'],attrs['value']) @@ -134,6 +135,7 @@ class docParser(xml.sax.handler.ContentHandler): if debug: print "end %s" % tag if tag == 'function': + # fuctions come from source files, hence 'virerror.c' if self.function != None: if (self.function_module == "libvirt" or self.function_module == "virevent" or diff --git a/python/sanitytest.py b/python/sanitytest.py new file mode 100644 index 0000000..047450b --- /dev/null +++ b/python/sanitytest.py @@ -0,0 +1,31 @@ +#!/usr/bin/python + +import libvirt + +globals = dir(libvirt) + +# Sanity test that the generator hasn't gone wrong + +# Look for core classes +assert("virConnect" in globals) +assert("virDomain" in globals) +assert("virDomainSnapshot" in globals) +assert("virInterface" in globals) +assert("virNWFilter" in globals) +assert("virNodeDevice" in globals) +assert("virNetwork" in globals) +assert("virSecret" in globals) +assert("virStoragePool" in globals) +assert("virStorageVol" in globals) +assert("virStream" in globals) +assert("VIR_CONNECT_RO" in globals) + +# Error related bits +assert("libvirtError" in globals) +assert("VIR_ERR_AUTH_FAILED" in globals) +assert("virGetLastError" in globals) + +# Some misc methods +assert("virInitialize" in globals) +assert("virEventAddHandle" in globals) +assert("virEventRegisterDefaultImpl" in globals) -- 1.7.11.7

3 2

[libvirt] [PATCH] virDomainSaveXML: Reject domains which name contain '/'
by Christophe Fergeau 05 Feb '13

05 Feb '13

Similarly to 790f912b4 which rejects snapshots names containing, this commit changes virDomainSaveXML to reject domains with a '/' in their name. The domain name is used as a filename, so this leads to unexpected results when used in combination with '..' --- If someone is using domains with '/' in their name, this will cause a regression for them as libvirt will no longer be able to re-write the domain XML and will just fail. However, if someone is (ab)using this, the domain must end up in an already existing directory as libvirt will not create it so this is hopefully unconvenient enough that noone is doing that. If we only want to error out on new domain creation, this may be doable by introducing a virDomainSaveXMLFlags, but will be more invasive. Christophe src/conf/domain_conf.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 85a798d..86641d6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14728,6 +14728,14 @@ int virDomainSaveXML(const char *configDir, char *configFile = NULL; int ret = -1; + if (strchr(def->name, '/')) { + virReportError(VIR_ERR_XML_DETAIL, + _("invalid domain name '%s': name can't contain '/'"), + def->name); + goto cleanup; + + } + if ((configFile = virDomainConfigFile(configDir, def->name)) == NULL) goto cleanup; -- 1.8.1

4 4