- Devel - libvirt List Archives

Re: [libvirt] New libvirt API for domain memory statistics reporting (V4)
by Daniel Veillard 20 Dec '09

20 Dec '09

On Fri, Dec 18, 2009 at 01:17:03PM -0500, Adam Litke wrote: > Daniel, this should be ready for you to merge... Okidoc, done ! There was a bit of tweaking since this conflicted with another new API, but this was eay to solve. I double checked the new src/remote/remote_protocol.x description and that looks fine, I think the only thing missing is a description of the new virsh command in tools/virsh.pod and I think this will be complete. Ah and other bindings need to be updated to export the new function, but that's seaparate. thanks ! Daniel > Changes since V3: > * Fixed remote_protocol.x so rpcgen generates the right code > * Updated stat constants and names in python api > * Incorporate flags into the rpc wire format > > Changes since V2: > * Ported to GIT HEAD for easier merging :) > * Amounts of memory are now reported in kilobytes > * Added flags parameter to API (currently unused) > * Moved to less awkward xdr wire format for remote driver > * Stats 'Free' and 'Total' renamed to 'Unused' and 'Available' > * Various small fixups: constant names, data types, etc > > Changes since V1: > * New system for maintaining ABI compatibility and API extensibility: > Rather than passing around a fixed-size stats structure, work with arrays > of stats. An enum of known statistic tags (SWAP_IN, SWAP_OUT, TOTAL_MEM, > etc) is defined. A stat is defined as a tag/value pair. When making a > call to the API, the caller provides an array of stats and the size of the > array. That array is filled with up to the requested number of stats > (depending on hypervisor and guest support). The number of stats provided > is returned. > > * Miscellaneous changes: > Changed the API function from virDomainMemStats to virDomainMemoryStats > Added documentation for each memory stat > > -- > > When using ballooning to manage overcommitted memory on a host, a system for > guests to communicate their memory usage to the host can provide information > that will minimize the impact of ballooning on the guests while maximizing > efficient use of host memory. > > The design of such a communication channel was recently added to version 0.8.2 > of the VirtIO Spec (See Appendix G): > - http://ozlabs.org/~rusty/virtio-spec/virtio-spec-0.8.2.pdf > > Host-side and guest-side implementations have been accepted for inclusion in > their respective projects: > - Guest: http://lkml.org/lkml/2009/11/30/274 > - Host: http://lists.gnu.org/archive/html/qemu-devel/2009-12/msg00380.html > > The following patch series implements a new libvirt interface to expose these > memory statistics. Thank you for your review and comments. > > > [PATCH 1/6] domMemoryStats: Add domainMemoryStats method to struct _virDriver > [PATCH 2/6] domMemoryStats: Add public symbol to libvirt API > [PATCH 3/6] qemu-driver: Enable domainMemStats in the qemu driver > [PATCH 4/6] remote-driver: Add domainMemoryStats support > [PATCH 5/6] virsh: Enable virDomainMemoryStats as a new command > [PATCH 6/6] python: Add python bindings for virDomainMemoryStats -- 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 00/13] esx: Automatic question handling and other improvements
by Matthias Bolte 18 Dec '09

18 Dec '09

Automatic question handling is the most important part of this series, see src/esx/README for more details. Matthias Bolte (13): esx: Add automatic question handling esx: Improve domain lookup by UUID esx: Use more suitable error code in esxVI_LookupVirtualMachineByUuid() esx: Replace libxml1 'xmlChildrenNode' with libxml2 'children' esx: Removed unused inttypes.h include esx: Extend vCenter query parameter esx: Extend documentation about 'vcenter' and add some about 'auto_answer' esx: Fix occurence typo esx: Use occurrence enum to specify expected result of a SOAP call esx: Don't warn about '/' paths esx: Undefine virtual machine on a vCenter if available esx: Destroy virtual machine on a vCenter if available esx: Add more links to external documentation docs/drvesx.html.in | 52 ++++- src/esx/README | 77 +++++++ src/esx/esx_driver.c | 533 +++++++++++++++++++++++--------------------- src/esx/esx_util.c | 22 ++- src/esx/esx_util.h | 2 +- src/esx/esx_vi.c | 546 ++++++++++++++++++++++++++++++++++++++++------ src/esx/esx_vi.h | 53 ++++- src/esx/esx_vi_methods.c | 185 ++++++++++++---- src/esx/esx_vi_methods.h | 7 + src/esx/esx_vi_types.c | 231 +++++++++++++++++++- src/esx/esx_vi_types.h | 106 +++++++++ src/esx/esx_vmx.c | 2 +- 12 files changed, 1420 insertions(+), 396 deletions(-) create mode 100644 src/esx/README

2 25

[libvirt] [PATCH] Fix compilation with gcrypt < 1.4.2
by Matthias Bolte 18 Dec '09

18 Dec '09

Commit 33a198c1f6a4a1bc7f34d50a31032e03bec10fee increased the gcrypt version requirement to 1.4.2 because the GCRY_THREAD_OPTION_VERSION define was added in this version. The configure script doesn't check for the gcrypt version. To support gcrypt versions < 1.4.2 change the virTLSThreadImpl initialization to use GCRY_THREAD_OPTION_VERSION only if it's defined. --- src/libvirt.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index cad33c2..937cdb4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -291,7 +291,12 @@ static int virTLSMutexUnlock(void **priv) } static struct gcry_thread_cbs virTLSThreadImpl = { + /* GCRY_THREAD_OPTION_VERSION was added in gcrypt 1.4.2 */ +#ifdef GCRY_THREAD_OPTION_VERSION (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)), +#else + GCRY_THREAD_OPTION_PTHREAD, +#endif NULL, virTLSMutexInit, virTLSMutexDestroy, -- 1.6.0.4

2 2

[libvirt] [PATCH 1/2] Don't make it possible to define HAVE_HAL but not enable it in automake.
by Diego Elio 'Flameeyes' Pettenò 18 Dec '09

18 Dec '09

With the previous logic, if libhal_get_all_devices function was not found, HAVE_HAL would be defined for the preprocessor but it wouldn't be enabled in automake conditionals, causing the final link to fail with missing references to HAL entries. --- configure.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index c86ee97..e2a0b00 100644 --- a/configure.in +++ b/configure.in @@ -1703,9 +1703,6 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then fi ]) if test "x$with_hal" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_HAL], 1, - [use HAL for host device enumeration]) - old_CFLAGS=$CFLAGS old_LDFLAGS=$LDFLAGS CFLAGS="$CFLAGS $HAL_CFLAGS" @@ -1715,6 +1712,10 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then CFLAGS="$old_CFLAGS" LDFLAGS="$old_LDFLAGS" fi + if test "x$with_hal" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_HAL], 1, + [use HAL for host device enumeration]) + fi fi AM_CONDITIONAL([HAVE_HAL], [test "x$with_hal" = "xyes"]) AC_SUBST([HAL_CFLAGS]) -- 1.6.6.rc3

3 4

[libvirt] RE: [virt-tools-list] Questions about virt-manager running on Arch of Itanium 64
by Dustin Xiong 18 Dec '09

18 Dec '09

> Date: Mon, 30 Nov 2009 09:43:27 +0000 > From: rjones(a)redhat.com > To: x_k_123(a)hotmail.com > CC: berrange(a)redhat.com; virt-tools-list(a)redhat.com > Subject: Re: [virt-tools-list] Questions about virt-manager running on Arch of Itanium 64 > > On Mon, Nov 30, 2009 at 05:07:00PM +0800, Dustin Xiong wrote: > > But when I run virsh ,it failed as below: > > [root@kvm bin]# ./virsh > > error: unable to connect to '/usr/local/dlibvirt/var/run/libvirt/libvirt-sock': No such file or directory > ^^ > Is there really a 'd' in the path there? > > Anyway you can either change the default path that libvirt uses, > by configuring it with: > > ./configure --prefix=/usr > > or you can change the socket path virsh uses at runtime with: > > ./virsh -c qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock Thank you for your advice. And I compiled the libvirt-0.7.4 again ./configure make make install After reboot the machine, I run the binary virsh, the result is as below: [root@kvm bin]#virsh error: unable to connect to '/usr/local/var/run/libvirt/libvirt-sock': No such file or directory error: failed to connect to the hypervisor Then I run the virsh -c ,the result is as below: [root@kvm bin]#virsh -c qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock error: unable to connect to '/var/run/libvirt/libvirt-sock': No such file or directory error: failed to connect to the hypervisor At the same time, I found the libvird didn't running, I don't know whether this caused the error or not. I don't know why this error occurs. Maybe the reason is the libvirt didn't support the use kvm virtualization on ia64 as berrange said before. But I modify the qemu_conf.c and add ia64 information into the struct arch_info_hvm. Then compiled again. The errors remain. Please forgive my poor program skills, I can't add the ia64 into the libvirt kvm supports. Will you want to do some works on this? Thanks a lot. _________________________________________________________________ Windows Live Hotmail: Your friends can get your Facebook updates, right from Hotmail®. http://www.microsoft.com/middleeast/windows/windowslive/see-it-in-action/so…

1 0

[libvirt] [PATCH] Fix reporting of TLS connection errors
by Daniel P. Berrange 18 Dec '09

18 Dec '09

The code for connecting to a server tries each socket in turn until it finds one that connects. Unfortunately for TLS sockets if it connected, but failed TLS handshake it would treat that as a failure to connect, and try the next socket. This is bad, it should have reported the TLS failure immediately. $ virsh -c qemu://somehost.com/system error: unable to connect to libvirtd at 'somehost.com': Invalid argument error: failed to connect to the hypervisor $ ./tools/virsh -c qemu://somehost.com/system error: server certificate failed validation: The certificate hasn't got a known issuer. error: failed to connect to the hypervisor * src/remote/remote_driver.c: Stop trying to connect if the TLS handshake fails --- src/remote/remote_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 77962fe..584de36 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -632,7 +632,7 @@ doRemoteOpen (virConnectPtr conn, if (!priv->session) { close (priv->sock); priv->sock = -1; - continue; + goto failed; } } goto tcp_connected; -- 1.6.5.2

2 1

Re: [libvirt] getSchedulerParameters() always returning nullpointerexception in JAVA
by Frederic Dang Tran 18 Dec '09

18 Dec '09

Hi, I came across the same problem: Domain.getSchedulerParameters() throws a NullPointerException systematically. getSchedulerParameters The culprit is the org.libvirt.jna.virSchedParameterValue class which should inherit from jna.Union instead of Structure: public class virSchedParameterValue extends Union { ... } Regards, Frederic On 12/14/2009 04:22 AM, Marc Gonzalez Mateo wrote: OK, let's see if Bryan has an idea/solution about this. Thanks guys! MARC El 11/12/2009, a las 14:29, Daniel Veillard escribió: On Fri, Dec 11, 2009 at 02:01:36PM +0100, Marc Gonzalez Mateo wrote: Hi everyvody, I'm developing a new API based on libvirt. I'm currently stucked using getSchedulerParameters, always is returning a nullpointerexception, no matter which Xen Domain I'm passing to the function. Enclosing both the code and the error console: public int getCPUPriority(String name) { int res=-1; try { Domain d = getDomain(name); SchedParameter[] pars = d.getSchedulerParameters(); Hum, it seems Domain.getSchedulerParameters() does SchedParameter[] returnValue = new SchedParameter[0]; and public static SchedParameter create(virSchedParameter vParam) { SchedParameter returnValue = null; switch (vParam.type) { case (1): and the create method getting there gets a null pointer as the initialization argument, which it first dereference ... so not surprizing looking at the code, maybe Bryan has an idea of what is going on there, I'm a bit lost in this initialization process ... Daniel for (SchedParameter pri : pars) { if (pri.field=="weight") res=Integer.parseInt(pri.getValueAsString()); } } catch (LibvirtException e) { log.error(" Error: getting CPU priority of \""+name+"\"." + e.getClass()); e.printStackTrace(); } return res; } Dec 11, 2009 1:04:18 PM net.emotivecloud.virtmonitor.VirtMonitor getCPUCapacity SEVERE: Error: getting CPU capacity of "XenTest". java.lang.NullPointerException at org.libvirt.SchedParameter.create(Unknown Source) at org.libvirt.Domain.getSchedulerParameters(Unknown Source) at net.emotivecloud.virtmonitor.VirtMonitor.getCPUCapacity(VirtMonitor.java:462) at net.emotivecloud.virtmonitor.VirtMonitor.main(VirtMonitor.java:763) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:616) at org.codehaus.mojo.exec.ExecJavaMojo$1.run(ExecJavaMojo.java:283) at java.lang.Thread.run(Thread.java:636) Any ideas? Thanks in advance, Marc Gonzalez Mateo -- Libvir-list mailing list Libvir-list redhat com https://www.redhat.com/mailman/listinfo/libvir-list -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel veillard com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/ Frederic Dang Tran

1 0

[libvirt] [RFC] New libvirt API for domain memory statistics reporting (V2)
by Adam Litke 17 Dec '09

17 Dec '09

Thanks for the review and comments on V1. This series tries to address most of the feedback I received. I did not add any additional memory stats yet (I feel that with my new method of expanding the API, that can be handled separately). I am not convinced that every memory stat that any hypervisor exports should necessarily be included in this API. I tried to focus on statistics that are useful in the context of managing domains at the hypervisor level. Changes since V1: * New system for maintaining ABI compatibility and API extensibility: Rather than passing around a fixed-size stats structure, work with arrays of stats. An enum of known statistic tags (SWAP_IN, SWAP_OUT, TOTAL_MEM, etc) is defined. A stat is defined as a tag/value pair. When making a call to the API, the caller provides an array of stats and the size of the array. That array is filled with up to the requested number of stats (depending on hypervisor and guest support). The number of stats provided is returned. * Miscellaneous changes: Changed the API function from virDomainMemStats to virDomainMemoryStats Added documentation for each memory stat -- When using ballooning to manage overcommitted memory on a host, a system for guests to communicate their memory usage to the host can provide information that will minimize the impact of ballooning on the guests while maximizing efficient use of host memory. The design of such a communication channel was recently added to version 0.8.2 of the VirtIO Spec (See Appendix G): - http://ozlabs.org/~rusty/virtio-spec/virtio-spec-0.8.2.pdf Host-side and guest-side implementations have been accepted for inclusion in their respective projects: - Guest: http://lkml.org/lkml/2009/11/30/274 - Host: http://lists.gnu.org/archive/html/qemu-devel/2009-12/msg00380.html The following patch series implements a new libvirt interface to expose these memory statistics. Thank you for your review and comments. [PATCH 1/6] domMemStats: Add domainMemoryStats method to struct _virDriver [PATCH 2/6] domMemoryStats: Add public symbol to libvirt API [PATCH 3/6] qemu-driver: Enable domainMemStats in the qemu driver [PATCH 4/6] remote-driver: Add domainMemoryStats support [PATCH 5/6] virsh: Enable virDomainMemoryStats as a new command [PATCH 6/6] python: Add python bindings for virDomainMemoryStats

4 18

[libvirt] Licensing of the schemas?
by Diego Elio “Flameeyes” Pettenò 17 Dec '09

17 Dec '09

Hi, I've finally found the time to backport the schema fixes and I'm going to add the nxml-libvirt-schemas package to Portage so that those like me who like to edit the XML files with Emacs can do so with some support. But I didn't pay enough attention before that the .rng files lack a license header. I'd assume that the license of the package (LGPL-2.1) apply to the schema, but it would be nice if somebody could confirm that for me (and eventually somebody, me even, could add the proper headers to them). Thanks, -- Diego Elio Pettenò — “Flameeyes” http://blog.flameeyes.eu/ If you found a .asc file in this mail and know not what it is, it's a GnuPG digital signature: http://www.gnupg.org/

4 6

[libvirt] [PATCH v3 00/13] CPU selection patches
by Jiri Denemark 17 Dec '09

17 Dec '09

Hi, This is a third version of CPU selection patchset. Changes in version 3: - fix build and segfault on i386 Changes in version 2: - virConnectGetHostCPU() API call was completely removed - 'CPU driver implementation' (11/14) patch was dropped - virConnectCompareCPU() API call is implemented directly by hypervisor drivers - new cpuCompareXML() internal function to make virConnectCompareCPU() simpler Jirka Jiri Denemark (13): XML schema for CPU flags XML parsing/formating code for CPU flags Public API Internal driver API Public API implementation Wire protocol format Remote driver Server side dispatcher CPU selection infrastructure CPU map for models and features Set cpuCompare handler in drivers Implement CPU selection in QEMU driver Implement virsh commands configure.in | 20 + daemon/remote.c | 22 + docs/schemas/capability.rng | 46 ++- docs/schemas/domain.rng | 62 +++ include/libvirt/libvirt.h.in | 13 + include/libvirt/virterror.h | 1 + src/Makefile.am | 23 +- src/conf/capabilities.c | 31 ++- src/conf/capabilities.h | 6 + src/conf/cpu_conf.c | 366 +++++++++++++ src/conf/cpu_conf.h | 116 +++++ src/conf/domain_conf.c | 15 + src/conf/domain_conf.h | 2 + src/cpu/cpu.c | 242 +++++++++ src/cpu/cpu.h | 129 +++++ src/cpu/cpu_generic.c | 123 +++++ src/cpu/cpu_generic.h | 32 ++ src/cpu/cpu_map.c | 130 +++++ src/cpu/cpu_map.h | 41 ++ src/cpu/cpu_map.xml | 304 +++++++++++ src/cpu/cpu_x86.c | 1159 ++++++++++++++++++++++++++++++++++++++++++ src/cpu/cpu_x86.h | 31 ++ src/cpu/cpu_x86_data.h | 45 ++ src/driver.h | 5 + src/esx/esx_driver.c | 1 + src/libvirt.c | 41 ++ src/libvirt_private.syms | 19 + src/libvirt_public.syms | 5 + src/lxc/lxc_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/qemu/qemu_conf.c | 401 ++++++++++++++- src/qemu/qemu_conf.h | 7 + src/qemu/qemu_driver.c | 43 ++- src/remote/remote_driver.c | 27 + src/remote/remote_protocol.x | 12 +- src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/util/virterror.c | 3 + src/vbox/vbox_tmpl.c | 1 + tools/virsh.c | 65 +++ 40 files changed, 3558 insertions(+), 35 deletions(-) create mode 100644 src/conf/cpu_conf.c create mode 100644 src/conf/cpu_conf.h create mode 100644 src/cpu/cpu.c create mode 100644 src/cpu/cpu.h create mode 100644 src/cpu/cpu_generic.c create mode 100644 src/cpu/cpu_generic.h create mode 100644 src/cpu/cpu_map.c create mode 100644 src/cpu/cpu_map.h create mode 100644 src/cpu/cpu_map.xml create mode 100644 src/cpu/cpu_x86.c create mode 100644 src/cpu/cpu_x86.h create mode 100644 src/cpu/cpu_x86_data.h

4 33

[libvirt] [PATCH] Initialize gcrypt threading
by Daniel P. Berrange 17 Dec '09

17 Dec '09

GNUTLS uses gcrypt for its crypto functions. gcrypt requires that the app/library initializes threading before using it. We don't want to force apps using libvirt to know about gcrypt, so we make virInitialize init threading on their behalf. This location also ensures libvirtd has initialized it correctly. This initialization is required even if libvirt itself were only using one thread, since another non-libvirt library (eg GTK-VNC) could also be using gcrypt from another thread * src/libvirt.c: Register thread functions for gcrypt * configure.in: Add -lgcrypt to linker flags --- build-aux/.gitignore | 2 + configure.in | 4 ++- src/libvirt.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletions(-) diff --git a/build-aux/.gitignore b/build-aux/.gitignore index 72e8ffc..a1b5d3b 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -1 +1,3 @@ * +/link-warning.h +/mktempd diff --git a/configure.in b/configure.in index 6ed2efd..c86ee97 100644 --- a/configure.in +++ b/configure.in @@ -547,7 +547,9 @@ if test "$GNUTLS_FOUND" = "no"; then test $fail = 1 && AC_MSG_ERROR([You must install the GnuTLS library in order to compile and run libvirt]) - GNUTLS_LIBS=$LIBS + dnl Not all versions of gnutls include -lgcrypt, and so we add + dnl it explicitly for the calls to gcry_control/check_version + GNUTLS_LIBS="$LIBS -lgcrypt" LIBS="$old_libs" fi diff --git a/src/libvirt.c b/src/libvirt.c index 103b331..cad33c2 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -22,6 +22,7 @@ #include <sys/wait.h> #endif #include <time.h> +#include <gcrypt.h> #include <libxml/parser.h> #include <libxml/xpath.h> @@ -251,6 +252,55 @@ winsock_init (void) } #endif +static int virTLSMutexInit (void **priv) +{ \ + virMutexPtr lock = NULL; + + if (VIR_ALLOC(lock) < 0) + return ENOMEM; + + if (virMutexInit(lock) < 0) { + VIR_FREE(lock); + return errno; + } + + *priv = lock; + return 0; +} + +static int virTLSMutexDestroy(void **priv) +{ + virMutexPtr lock = *priv; + virMutexDestroy(lock); + VIR_FREE(lock); + return 0; +} + +static int virTLSMutexLock(void **priv) +{ + virMutexPtr lock = *priv; + virMutexLock(lock); + return 0; +} + +static int virTLSMutexUnlock(void **priv) +{ + virMutexPtr lock = *priv; + virMutexUnlock(lock); + return 0; +} + +static struct gcry_thread_cbs virTLSThreadImpl = { + (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)), + NULL, + virTLSMutexInit, + virTLSMutexDestroy, + virTLSMutexLock, + virTLSMutexUnlock, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL +}; + + /** * virInitialize: * @@ -273,6 +323,9 @@ virInitialize(void) virRandomInitialize(time(NULL) ^ getpid())) return -1; + gcry_control(GCRYCTL_SET_THREAD_CBS, &virTLSThreadImpl); + gcry_check_version(NULL); + virLogSetFromEnv(); DEBUG0("register drivers"); -- 1.6.5.2

2 3

[libvirt] [PATCH 0/10] Convert over to use new -device args everywhere
by Daniel P. Berrange 17 Dec '09

17 Dec '09

QEMU has introduced a new command line arg called -device for specifying the guest device config. This allows separation from the host device config. libvirt needs to use this new syntax so that we can specify static PCI addresses for devices (the old syntax did not allow this). This patch series is the quick conversion I've done so far. The most obvious thing still lacking here is new test cases. I want to wait until this series merges with the device addressing series before adding those, since one set of tests can cover both patch series. In addition the handling of disk drivers is not quite correct. We need the disk controller patches myself/Wolfgang have worked on in order to specify the disk bus/unit instead of index.

2 22

[libvirt] Cannot start domain w/xenner emulator
by Gerry Reno 16 Dec '09

16 Dec '09

# virsh start Ubuntu-domU-x86-1 Connecting to uri: qemu:///system error: Failed to start domain Ubuntu-domU-x86-1 error: internal error unable to start guest: libvir: error : cannot execute binary /usr/bin/xenner: Permission denied # ls -l /usr/bin/xenner -rwxr-xr-x 1 root root 118936 2009-12-14 17:05 /usr/bin/xenner Sure looks executable. And there's no SELinux on the box. libvirt is 0.7.0 What the..? -Gerry

2 10

[libvirt] ANNOUNCE: Starting a libvirt application developer guide effort
by Daniel P. Berrange 16 Dec '09

16 Dec '09

This is a quick mail to announce that we have started an effort to write a libvirt application developer guide. The guide is intended to introduce programmers to the libvirt API and its concepts and demonstrate best practice along the way. The initial focus is on the C API, but once that's matured, further info on language bindings can be added. As is common with all work done in the libvirt project, the guide is being made available under an open license, specifically the Creative Commons AttributionâShare Alike 3.0 Unported license ("CC-BY-SA") The reason for this choice is that it has become the defacto license choice for documentation under Fedora, GNOME, and content from Wikipedia, etc.[1] The application developer guide is written in DocBook and is processed using the Publican toolset to generate the HTML and PDF output. Again this choice was made because it is the same toolset used in Fedora & Red Hat docs NB, this is using Publican 1.x series of releases which is available starting in Fedora 12 or later. The build config/styling is not compatible with the older Public 0.x series from earlier Fedora. There are two new GIT repositories for this work - A repository containing the libvirt brand. This is essentially CSS and graphics required to make the docs use the same style as the libvirt website does http://libvirt.org/git/?p=libvirt-publican.git - A repository containing the application developer doc. This is the actual interesting content. http://libvirt.org/git/?p=libvirt-appdev-guide.git Assuming you have Publican >= 1.0 installed, then the first step is to build and install the libvirt brand. This involves getting a checkout of the libvirt-publican.git repo, typing 'make rpm' and then installing the RPM it generates. Once the brand is installed, then you can get a checkout of the actual docs from 'libvirt-appdev-guide.git'. The content is all under the directory en-US/ in docbook format. To generate html, from the top level directory just type 'make html', likewise pdfs with 'make pdf'. If you just type 'make' you get html and pdfs. I have put up example copies generated from current available content http://berrange.fedorapeople.org/libvirt/appdev-guide/html/ http://berrange.fedorapeople.org/libvirt/appdev-guide/pdf/ If you look at these, you'll notice of course that while there is a nice big table of contents, most of the actual content is missing. We are continuing to write content and will update it periodically. If anyone is interested in contributing content, then simply send patches against the docbook XML in the libvirt-appdev-guide.git to this list as per the normal review & commit process. Regards, Daniel [1] http://iquaid.org/2009/07/06/why-relicense-fedora-documentation-and-wiki-co… -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

[libvirt] [PATCH] esx_util.c: avoid NULL deref for invalid inputs
by Jim Meyering 16 Dec '09

16 Dec '09

The trouble here is that "goto failure" would run this code: failure: VIR_FREE(*datastoreName); VIR_FREE(*directoryName); VIR_FREE(*fileName); result = -1; goto cleanup; And thus if any of those 3 input variables was NULL, that deref would probably provoke a segfault. By the way, that interface should be changed, because it encourages risky behavior: int esxUtil_ParseDatastoreRelatedPath(virConnectPtr conn, const char *datastoreRelatedPath, char **datastoreName, char **directoryName, char **fileName) Note how it takes a buffer, datastoreRelatedPath, but with no length parameter. Then this function writes into the buffer with this code: if (sscanf(datastoreRelatedPath, "[%a[^]%]] %a[^\n]", datastoreName, &directoryAndFileName) != 2) { which cannot even check for buffer overrun because it doesn't know the length. You might want to add a new parameter, buf_len: int esxUtil_ParseDatastoreRelatedPath(virConnectPtr conn, const char *datastoreRelatedPath, size_t buf_len, char **datastoreName, char **directoryName, char **fileName) >From aba304e07835c123bd63f1d5d6777a898916349f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 15 Dec 2009 19:08:49 +0100 Subject: [PATCH] esx_util.c: avoid NULL deref for invalid inputs * src/esx/esx_util.c (esxUtil_ParseDatastoreRelatedPath): Return right away, rather than trying to clean up and dereference NULL pointers, if any input is invalid. --- src/esx/esx_util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 3e53921..8703ac2 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -277,7 +277,7 @@ esxUtil_ParseDatastoreRelatedPath(virConnectPtr conn, directoryName == NULL || *directoryName != NULL || fileName == NULL || *fileName != NULL) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); - goto failure; + return -1; } /* @@ -299,7 +299,7 @@ esxUtil_ParseDatastoreRelatedPath(virConnectPtr conn, ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Datastore related path '%s' doesn't have expected format " "'[<datastore>] <path>'", datastoreRelatedPath); - goto failure; + return -1; } /* Split <path> into <directory>/<file>, where <directory> is optional */ -- 1.6.6.rc2.275.g51e2d

2 5

[libvirt] [PATCH] esx_vmx.c: don't dereference a NULL virtualDev
by Jim Meyering 16 Dec '09

16 Dec '09

The offending code starts here: int esxVMX_ParseSCSIController(virConnectPtr conn, virConfPtr conf, int controller, int *present, char **virtualDev) { char present_name[32]; char virtualDev_name[32]; if (virtualDev == NULL || *virtualDev != NULL) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); goto failure; } If the virtualDev parameter is NULL, then we'd issue the diagnostic and take the "goto", and (below), dereference NULL. >From 79283ba1d667534175d4c48079e6b500feba6480 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 15 Dec 2009 16:07:10 +0100 Subject: [PATCH] esx_vmx.c: don't dereference NULL for a NULL virtualDev * src/esx/esx_vmx.c (esxVMX_ParseSCSIController): Don't deref "virtualDev" when it is NULL. --- src/esx/esx_vmx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index f5b4544..404617e 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -1204,7 +1204,8 @@ esxVMX_ParseSCSIController(virConnectPtr conn, virConfPtr conf, int controller, return 0; failure: - VIR_FREE(*virtualDev); + if (virtualDev) + VIR_FREE(*virtualDev); return -1; } -- 1.6.6.rc2.275.g51e2d

4 5

[libvirt] [PATCH] Fix memory leak in qemudBuildCommandLine
by Matthias Bolte 15 Dec '09

15 Dec '09

--- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 86172c6..2ee2042 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1893,7 +1893,7 @@ int qemudBuildCommandLine(virConnectPtr conn, } ADD_ARG_LIT("-monitor"); - ADD_ARG_LIT(virBufferContentAndReset(&buf)); + ADD_ARG(virBufferContentAndReset(&buf)); } if (def->localtime) -- 1.6.0.4

2 2

[libvirt] the <filesystem> tag (WAS: simple LXC/libvirt busybox container (Unable to get cgroup))
by Tony Risinger 15 Dec '09

15 Dec '09

wow! i was starting to think i would never get past this problem! [root@PHS-001 ~]# echo $VIRSH_DEFAULT_CONNECT_URI lxc:/// [root@PHS-001 ~]# virsh create /vps/def/exec/sys/arch-nano.xml Domain arch-nano created from /vps/def/exec/sys/arch-nano.xml [root@PHS-001 ~]# virsh console arch-nano Connected to domain arch-nano Escape character is ^] # [root@PHS-001 ~]# grep cgroup /proc/mounts none /cgroup cgroup rw,relatime,devices,memory,cpuacct,cpu 0 0 everything seems to be working fine now after disabling "ns" from cgroup mount; thank you very much Ryota and Daniel for you time and assistance. i must have sunk 40+ hours into this, but i learned a tremendous amount, so nothing is lost. :-) this is somewhat of a digression, and i can submit a new thread if need be, but my last remaining question is about the <filesystem> tag/root mounting. i have not found any mention of the <filesystem> tag in the docs or how to work with it... i want to have libvirt mount a specified device (a btrfs subvolume) and use it for the root filesystem of the created LXC container. is there a way to do this? perhaps <source dev="/dev/sdb" options="subvol....."/>, or do i need to use the storage XML? i didnt see a way to use a storage/device definition as the rootfs. im eager to get working with python bindings, just trying to see it all work with XML first. thanks++ On Thu, Dec 10, 2009 at 6:45 AM, Ryota Ozaki <ozaki.ryota(a)gmail.com> wrote: > On Thu, Dec 10, 2009 at 9:36 PM, Daniel P. Berrange <berrange(a)redhat.com> wrote: >> On Thu, Dec 10, 2009 at 09:26:39PM +0900, Ryota Ozaki wrote: >>> On Thu, Dec 10, 2009 at 9:03 PM, Daniel P. Berrange <berrange(a)redhat.com> wrote: >>> > On Thu, Dec 10, 2009 at 02:22:37AM -0600, Tony Risinger wrote: >>> >> i'm trying to get even the simplest busybox container with libvirt+LXC >>> >> with very limited success. I feel l am missing something supremely >>> >> simple for me to be hung on this for weeks. >>> >> >>> >> i dont see anything interesting in domain log, but getting this error >>> >> from "LIBVIRT_DEBUG=1 libvirtd": >>> >> >>> >> 05:27:56.113: error : lxcDomainGetInfo:462 : internal error Unable to >>> >> get cgroup for arch-nano >>> >> 05:27:56.113: debug : virDomainFree:2004 : domain=0x81d8e68 >>> >> 05:27:56.113: debug : virUnrefDomain:422 : unref domain 0x81d8e68 arch-nano 1 >>> >> 05:27:56.113: debug : virReleaseDomain:376 : release domain 0x81d8e68 arch-nano >>> >> 05:27:56.113: debug : virReleaseDomain:392 : unref connection 0x81dc0f0 2 >>> >> 05:27:56.113: debug : remoteSerializeError:141 : prog=536903814 ver=1 >>> >> proc=16 type=1 serial=4, msg=internal error Unable to get cgroup for >>> >> arch-nano >>> >> >>> >> i've been using this root filesystem layout: >>> >> >>> >> [root@PHS-001 arch-nano]# tree >>> >> . >>> >> |-- bin >>> >> | |-- cat -> ../sbin/busybox >>> >> | |-- chdir -> ../sbin/busybox >>> >> | |-- chmod -> ../sbin/busybox >>> >> | |-- ls -> ../sbin/busybox >>> >> | |-- rm -> ../sbin/busybox >>> >> | |-- sh -> ../sbin/busybox >>> >> | `-- vi -> ../sbin/busybox >>> >> |-- dev >>> >> | `-- pts >>> >> |-- etc >>> >> |-- proc >>> >> |-- sbin >>> >> | |-- busybox >>> >> | `-- init -> busybox >>> >> `-- sys >>> >> >>> >> all folders besides /bin and /sbin were created by libvirt. i tried >>> >> using the /sbin/init script previously suggested: >>> >> >>> >> #!/sbin/busybox >>> >> sh >>> > >>> > >>> > Sorry, my suggestion was wrong. I forgot that if you have #!/sbin/busybox >>> > it will attempt to execute the command matching the name of the script. >>> > So it will in fact try to run 'init', rather than 'sh'. >>> > >>> > Just make the libvirt XML point directly to /bin/sh instead and it >>> > should work. I even tested it this time :-) >>> >>> Hem, I still have a problem with ns subsystem enabled. Yes, I can launch >>> a container however the cgroup hierarchy is wrong from libvirtd expecting >>> like: >>> >>> /: libvirtd --daemon >>> /5345: /usr/libexec/libvirt_lxc --name >>> >>> Daniel, could you confirm how about your cgroup hierarchy? >> >> What you do mean by 'ns' subsystem ? > > 'ns' is one of functions of cgroups like such as devices, memory, > cpu, etc. and it is enabled if you mount cgroup without any options > that Tony is doing. > >> >> >> # grep cgroup /proc/mounts >> cgroup /dev/cgroups/cpu cgroup rw,relatime,cpuacct,cpu 0 0 >> cgroup /dev/cgroups/memory cgroup rw,relatime,memory 0 0 >> cgroup /dev/cgroups/devices cgroup rw,relatime,devices 0 0 > > Oh, you don't enable 'ns', so yes, things go fine in your environment. > > >> >> # cat /proc/`pgrep libvirtd`/cgroup >> 32:devices:/sysdefault >> 16:memory:/sysdefault >> 12:cpuacct,cpu:/sysdefault >> >> # cat /proc/`pgrep libvirt_lxc`/cgroup >> 32:devices:/sysdefault/libvirt/lxc/vm1 >> 16:memory:/sysdefault/libvirt/lxc/vm1 >> 12:cpuacct,cpu:/sysdefault/libvirt/lxc/vm1 >> >> >> And the process inside the contanier is PID 12309 >> >> # cat /proc/12309/cgroup >> 32:devices:/sysdefault/libvirt/lxc/vm1 >> 16:memory:/sysdefault/libvirt/lxc/vm1 >> 12:cpuacct,cpu:/sysdefault/libvirt/lxc/vm1 >> >> >> Which all appears to be correct to me >> >> This is on a Fedora 12 host 2.6.31.6-145.fc12.i686.PAE with >> >> CONFIG_UTS_NS=y >> CONFIG_IPC_NS=y >> CONFIG_USER_NS=y >> CONFIG_PID_NS=y >> CONFIG_NET_NS=y >> CONFIG_CGROUP_SCHED=y >> CONFIG_CGROUPS=y >> # CONFIG_CGROUP_DEBUG is not set >> CONFIG_CGROUP_NS=y > > This is the function I'm mentioning. > > ozaki-r > >> CONFIG_CGROUP_FREEZER=y >> CONFIG_CGROUP_DEVICE=y >> CONFIG_CGROUP_CPUACCT=y >> CONFIG_CGROUP_MEM_RES_CTLR=y >> CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y >> CONFIG_NET_CLS_CGROUP=y >> >> >> Regards, >> Daniel >> -- >> |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| >> |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| >> |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| >> |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :| >> >

2 2

[libvirt] [PATCH] esx_vi.c: avoid NULL deref for invalid inputs
by Jim Meyering 15 Dec '09

15 Dec '09

The first statement in this function tests for freeFunc == NULL, and if that's true, it does "goto failure" where it proceeds to call through that NULL function pointer: if (list == NULL || *list != NULL || castFromAnyTypeFunc == NULL || freeFunc == NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); return -1; } ... failure: freeFunc(&item); freeFunc(list); >From 97c5e9c87eb99d881ee84c4f09bb943f3410d3b1 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 15 Dec 2009 19:22:31 +0100 Subject: [PATCH] esx_vi.c: avoid NULL deref for invalid inputs * src/esx/esx_vi.c (esxVI_List_CastFromAnyType): For invalid inputs, fail right away. Do not "goto failure" where a NULL input pointer would be dereferenced. --- src/esx/esx_vi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 5725b2f..1138e8c 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -935,7 +935,7 @@ esxVI_List_CastFromAnyType(virConnectPtr conn, esxVI_AnyType *anyType, if (list == NULL || *list != NULL || castFromAnyTypeFunc == NULL || freeFunc == NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); - goto failure; + return -1; } if (anyType == NULL) { @@ -946,7 +946,7 @@ esxVI_List_CastFromAnyType(virConnectPtr conn, esxVI_AnyType *anyType, ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Expecting type to begin with 'ArrayOf' but found '%s'", anyType->other); - goto failure; + return -1; } for (childNode = anyType->_node->xmlChildrenNode; childNode != NULL; -- 1.6.6.rc2.275.g51e2d

2 1

[libvirt] [PATCH] libvirt.c: don't let a NULL "cpumaps" argument provoke a NULL-deref
by Jim Meyering 15 Dec '09

15 Dec '09

>From 94923b161a9d066146271bb533b78ab7877e4501 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 17:17:53 +0100 Subject: [PATCH] libvirt.c: don't let a NULL "cpumaps" argument provoke a NULL-deref * src/libvirt.c (virDomainGetVcpus): Update spec to say that maplen is ignored when "cpumaps" is NULL. Set maplen to 0 in that case. --- src/libvirt.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 008e322..4325aa4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4753,6 +4753,7 @@ error: * virDomainPinVcpu() API. * @maplen: number of bytes in one cpumap, from 1 up to size of CPU map in * underlying virtualization system (Xen...). + * Ignored when cpumaps is NULL. * * Extract information about virtual CPUs of domain, store it in info array * and also in cpumaps if this pointer isn't NULL. @@ -4776,6 +4777,12 @@ virDomainGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo, virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } + + /* Ensure that domainGetVcpus (aka remoteDomainGetVcpus) does not + try to memcpy anything into a NULL pointer. */ + if (cpumaps == NULL) + maplen = 0; + if (cpumaps != NULL && maplen < 1) { virLibDomainError(domain, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; -- 1.6.6.rc2.275.g51e2d

3 4

[libvirt] [PATCH] xm_internal.c: remove misleading dead code
by Jim Meyering 15 Dec '09

15 Dec '09

This code triggered a warning about possible NULL-dereference. Actually it's more about being self-contradictory, since the NULL-dereference is not possible. >From 796e3a3254cb08fc20bce790997b5787dab51902 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 21:37:54 +0100 Subject: [PATCH] xm_internal.c: remove misleading dead code * src/xen/xm_internal.c (xenXMConfigGetULong): Remove useless and misleading test (always false) for val->str == NULL before code that always dereferences val->str. "val" comes from virConfGetValue, and at that point, val->str is guaranteed to be non-NULL. (xenXMConfigGetBool): Likewise. --- src/xen/xm_internal.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 3dc655b..944d5d5 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -152,9 +152,6 @@ static int xenXMConfigGetBool(virConnectPtr conn, if (val->type == VIR_CONF_LONG) { *value = val->l ? 1 : 0; } else if (val->type == VIR_CONF_STRING) { - if (!val->str) { - *value = def; - } *value = STREQ(val->str, "1") ? 1 : 0; } else { xenXMError(conn, VIR_ERR_INTERNAL_ERROR, @@ -183,9 +180,6 @@ static int xenXMConfigGetULong(virConnectPtr conn, *value = val->l; } else if (val->type == VIR_CONF_STRING) { char *ret; - if (!val->str) { - *value = def; - } *value = strtol(val->str, &ret, 10); if (ret == val->str) { xenXMError(conn, VIR_ERR_INTERNAL_ERROR, -- 1.6.6.rc2.275.g51e2d

3 4

[libvirt] [PATCH] avoid calling exit with a constant; use EXIT_* instead
by Jim Meyering 15 Dec '09

15 Dec '09

Without this, and with updated gnulib, "make syntax-check" would fail, complaining about exit(1), exit(0), exit(77). It's no big deal, but slightly better for readability to use EXIT_SUCCESS, EXIT_FAILURE, and the new, made-up/defined EXIT_AM_SKIP. The only semantic change was to convert the "exit(2)" and "exit(3)" in tests/conftest.c to "exit(EXIT_FAILURE);". That seems ok, since the sole invoker of that test program cares only about success/failure, and not about the precise exit code. >From 8dba638f597b50f295f3f9b5628002f39b16d776 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 15 Dec 2009 09:43:29 +0100 Subject: [PATCH] avoid calling exit with a constant; use EXIT_* instead This appeases a new gnulib-provided "syntax-check". * daemon/libvirtd.c (main): Use EXIT_FAILURE, not 1. * proxy/libvirt_proxy.c (main): Likewise, and EXIT_SUCCESS, not 0. * tests/conftest.c (main): Likewise. * tests/reconnect.c (main): Likewise. * tests/testutils.h (EXIT_AM_SKIP): Define. * tests/nodeinfotest.c (mymain): Use EXIT_AM_SKIP, not 77. * tests/qemuargv2xmltest.c: Likewise. * tests/qemuxml2xmltest.c: Likewise. * tests/virshtest.c (mymain): Likewise. --- daemon/libvirtd.c | 2 +- proxy/libvirt_proxy.c | 10 +++++----- tests/conftest.c | 10 +++++----- tests/nodeinfotest.c | 2 +- tests/qemuargv2xmltest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- tests/reconnect.c | 10 +++++----- tests/testutils.h | 4 +++- tests/virshtest.c | 2 +- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index de6fc27..281a46a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -3036,7 +3036,7 @@ int main(int argc, char **argv) { default: fprintf (stderr, "libvirtd: internal error: unknown flag: %c\n", c); - exit (1); + exit (EXIT_FAILURE); } } diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index e5298fd..375966c 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -816,14 +816,14 @@ int main(int argc, char **argv) { persist = 1; } else { usage(argv[0]); - exit(1); + exit(EXIT_FAILURE); } } if (geteuid() != 0) { fprintf(stderr, "%s must be run as root or suid\n", argv[0]); - /* exit(1); */ + /* exit(EXIT_FAILURE); */ } /* @@ -838,19 +838,19 @@ int main(int argc, char **argv) { * failure. */ if (proxyListenUnixSocket(PROXY_SOCKET_PATH) < 0) - exit(0); + exit(EXIT_SUCCESS); if (proxyInitXen() == 0) proxyMainLoop(); sleep(1); proxyCloseUnixSocket(); - exit(0); + exit(EXIT_SUCCESS); } #else /* WITHOUT_XEN */ int main(void) { fprintf(stderr, "libvirt was compiled without Xen support\n"); - exit(1); + exit(EXIT_FAILURE); } #endif /* WITH_XEN */ diff --git a/tests/conftest.c b/tests/conftest.c index d265de2..a7977bb 100644 --- a/tests/conftest.c +++ b/tests/conftest.c @@ -15,23 +15,23 @@ int main(int argc, char **argv) { if (argc != 2) { fprintf(stderr, "Usage: %s conf_file\n", argv[0]); - exit(1); + exit(EXIT_FAILURE); } conf = virConfReadFile(argv[1], 0); if (conf == NULL) { fprintf(stderr, "Failed to process %s\n", argv[1]); - exit(2); + exit(EXIT_FAILURE); } ret = virConfWriteMem(&buffer[0], &len, conf); if (ret < 0) { fprintf(stderr, "Failed to serialize %s back\n", argv[1]); - exit(3); + exit(EXIT_FAILURE); } virConfFree(conf); if (fwrite(buffer, 1, len, stdout) != len) { fprintf(stderr, "Write failed: %s\n", strerror (errno)); - exit(1); + exit(EXIT_FAILURE); } - exit(0); + exit(EXIT_SUCCESS); } diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 608a056..4cb248a 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -15,7 +15,7 @@ static int mymain(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { - exit (77); /* means 'test skipped' for automake */ + exit (EXIT_AM_SKIP); } #else diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 5602df0..7f62bac 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -232,6 +232,6 @@ VIRT_TEST_MAIN(mymain) #else -int main (void) { return (77); /* means 'test skipped' for automake */ } +int main (void) { return (EXIT_AM_SKIP); } #endif /* WITH_QEMU */ diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 793900c..e5900a2 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -146,6 +146,6 @@ VIRT_TEST_MAIN(mymain) #else -int main (void) { exit (77); /* means 'test skipped' to automake */ } +int main (void) { exit (EXIT_AM_SKIP); } #endif /* WITH_QEMU */ diff --git a/tests/reconnect.c b/tests/reconnect.c index 33af2cc..63877fc 100644 --- a/tests/reconnect.c +++ b/tests/reconnect.c @@ -24,12 +24,12 @@ int main(void) { } if (conn == NULL) { fprintf(stderr, "First virConnectOpen() failed\n"); - exit(1); + exit(EXIT_FAILURE); } dom = virDomainLookupByID(conn, id); if (dom == NULL) { fprintf(stderr, "First lookup for domain %d failed\n", id); - exit(1); + exit(EXIT_FAILURE); } virDomainFree(dom); virConnectClose(conn); @@ -39,16 +39,16 @@ int main(void) { conn = virConnectOpen(NULL); if (conn == NULL) { fprintf(stderr, "Second virConnectOpen() failed\n"); - exit(1); + exit(EXIT_FAILURE); } dom = virDomainLookupByID(conn, id); if (dom == NULL) { fprintf(stderr, "Second lookup for domain %d failed\n", id); - exit(1); + exit(EXIT_FAILURE); } virDomainFree(dom); virConnectClose(conn); printf("OK\n"); - exit(0); + exit(EXIT_SUCCESS); } diff --git a/tests/testutils.h b/tests/testutils.h index aef1179..e5d5750 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -1,7 +1,7 @@ /* * utils.c: test utils * - * Copyright (C) 2005, 2008 Red Hat, Inc. + * Copyright (C) 2005, 2008-2009 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -13,6 +13,8 @@ #include <stdio.h> +#define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */ + double virtTestCountAverage(double *items, int nitems); diff --git a/tests/virshtest.c b/tests/virshtest.c index ef760e2..ad3e2fc 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -231,7 +231,7 @@ mymain(int argc, char **argv) abs_srcdir = getcwd(cwd, sizeof(cwd)); #ifdef WIN32 - exit (77); /* means 'test skipped' for automake */ + exit (EXIT_AM_SKIP); #endif snprintf(buffer, PATH_MAX-1, "test://%s/../examples/xml/test/testnode.xml", abs_srcdir); -- 1.6.6.rc2.275.g51e2d

3 2

[libvirt] [PATCH] avoid malfunction when virFileResolveLink is applied to non-POSIX FS
by Jim Meyering 15 Dec '09

15 Dec '09

Without this patch, virFileResolveLink could misbehave when applied to a file on a POSIX-nonconforming file system. The fix is to use gnulib's areadlink module, but it's GPL'd. I'm ready to relax it to LGPLv2+, and have asked the other author for his rubber stamp. Once that's fixed, this change will depend on having an up-to-date gnulib submodule. That will be the subject of my next message. >From a3133b2e8b1453578b30e4b9c83c7473feb7c65b Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 15 Dec 2009 08:27:53 +0100 Subject: [PATCH] avoid malfunction when virFileResolveLink is applied to non-POSIX FS The virFileResolveLink utility function relied on the POSIX guarantee that stat.st_size of a symlink is the length of the value. However, on some types of file systems, it is invalid, so do not rely on it. Use gnulib's areadlink module instead. * bootstrap (modules): Add areadlink. * src/util/util.c: Include "areadlink.h". Let areadlink perform the readlink and malloc. * configure.in (AC_CHECK_FUNCS): Remove readlink. No need, since it's presence is guaranteed by gnulib. --- bootstrap | 1 + configure.in | 2 +- src/util/util.c | 27 +++------------------------ 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/bootstrap b/bootstrap index 667af4f..c07d851 100755 --- a/bootstrap +++ b/bootstrap @@ -65,6 +65,7 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool <$gnulib_tool || exit modules=' +areadlink base64 c-ctype close diff --git a/configure.in b/configure.in index 6135932..6ed2efd 100644 --- a/configure.in +++ b/configure.in @@ -83,7 +83,7 @@ dnl Use --disable-largefile if you don't want this. AC_SYS_LARGEFILE dnl Availability of various common functions (non-fatal if missing). -AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity getuid getgid posix_fallocate mmap readlink]) +AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity getuid getgid posix_fallocate mmap]) dnl Availability of various not common threadsafe functions AC_CHECK_FUNCS([strerror_r strtok_r getmntent_r getgrnam_r getpwuid_r]) diff --git a/src/util/util.c b/src/util/util.c index 694838a..44a4b2f 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -64,6 +64,7 @@ #include <mntent.h> #endif +#include "areadlink.h" #include "virterror_internal.h" #include "logging.h" #include "event.h" @@ -1059,10 +1060,7 @@ int virFileLinkPointsTo(const char *checkLink, int virFileResolveLink(const char *linkpath, char **resultpath) { -#ifdef HAVE_READLINK struct stat st; - char *buf; - int n; *resultpath = NULL; @@ -1075,28 +1073,9 @@ int virFileResolveLink(const char *linkpath, return 0; } - /* Posix says that 'st_size' field from - * result of an lstat() call is filled with - * number of bytes in the destination - * filename. - */ - if (VIR_ALLOC_N(buf, st.st_size + 1) < 0) - return -ENOMEM; - - if ((n = readlink(linkpath, buf, st.st_size)) < 0) { - VIR_FREE(buf); - return -errno; - } - - buf[n] = '\0'; + *resultpath = areadlink (linkpath); - *resultpath = buf; - return 0; -#else - if (!(*resultpath = strdup(linkpath))) - return -ENOMEM; - return 0; -#endif + return *resultpath == NULL ? -1 : 0; } /* -- 1.6.6.rc2.275.g51e2d

3 3

[libvirt] [PATCH] qemu migration: avoid NULL-deref given an invalid input
by Jim Meyering 15 Dec '09

15 Dec '09

The fix here is to add the missing "goto". Nearly every other use of qemudReportError is followed closely by a goto or a return statement. >From 898033ec5bb0399f7cc6a22ffd9f351552ced85b Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 17:02:56 +0100 Subject: [PATCH] qemu migration: avoid NULL-deref given an invalid input * src/qemu/qemu_driver.c (doNonTunnelMigrate): Don't let a NULL "uri_out" provoke a NULL-dereference in doNativeMigrate: supply omitted goto-after-qemudReportError. --- src/qemu/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c782f0d..9ef6c35 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7430,6 +7430,7 @@ static int doNonTunnelMigrate(virDomainPtr dom, if (uri_out == NULL) { qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare2 did not set uri")); + goto cleanup; } if (doNativeMigrate(dom, driver, vm, uri_out, flags, dname, resource) < 0) -- 1.6.6.rc2.275.g51e2d

3 2

[libvirt] [PATCH] qemu_driver.c: don't unlink(NULL) on OOM error path
by Jim Meyering 15 Dec '09

15 Dec '09

Not terribly likely, but not impossible, either: >From dc8fe76ed209d04b1e962b94b20da17a077e102f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 14 Dec 2009 16:41:11 +0100 Subject: [PATCH] qemu_driver.c: don't unlink(NULL) on OOM error path * src/qemu/qemu_driver.c (qemudDomainMigratePrepareTunnel): Upon an out of memory error, we would end up with unixfile==NULL and attempt to unlink(NULL). Skip the unlink when it's NULL. --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 56bcec5..04b2511 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6903,7 +6903,8 @@ endjob: cleanup: virDomainDefFree(def); - unlink(unixfile); + if (unixfile) + unlink(unixfile); VIR_FREE(unixfile); if (vm) virDomainObjUnlock(vm); -- 1.6.6.rc2.275.g51e2d

3 3