- Devel - libvirt List Archives

Re: [libvirt] VMware support and Server 2.0.1
by Matthias Bolte 30 Jul '09

30 Jul '09

2009/7/29 Timo Makinen <tmakinen(a)ee.oulu.fi>: > On Wed, Jul 29, 2009 at 06:12:59PM +0200, Matthias Bolte wrote: >> 2009/7/27 Timo Makinen <tmakinen(a)ee.oulu.fi>: [...] > The dumpxml seems to be failing with this config option: > > ethernet0.connectionType = "custom" > > without this it works correctly. Ah, I found the cause. ethernet0.connectionType = "custom" was a good hint. I missed to initialize one variable correctly that is only used in the ethernet0.connectionType = "custom" case. >> Could you do some basic testing beside listing and dumpxml, as I have >> currently no VMware GSX installation at hand? Just test if the >> following commands work as expected in virsh: >> >> - start >> - shutdown >> - reboot >> - suspend >> - resume >> - nodeinfo >> - dominfo >> >> Regards, >> Matthias > > All these worked out of the box. Nice! Could you test the attached patch? It adds handling for the port in the URI, extends the version checking for GSX 2.0 and fixes the bug in VMX parsing. Matthias

2 1

[libvirt] [PATCH] Modify the java bindings html page to reflect the new repositories, JNA, and maven access
by Bryan Kearney 30 Jul '09

30 Jul '09

--- docs/java.html.in | 109 +++++++++++++++++++++++++++-------------------------- 1 files changed, 55 insertions(+), 54 deletions(-) diff --git a/docs/java.html.in b/docs/java.html.in index 2d9a24f..b0db2e2 100644 --- a/docs/java.html.in +++ b/docs/java.html.in @@ -4,10 +4,9 @@ <h1>Java API bindings</h1> <h2>Presentation</h2> - <p>The Java bindings are currently a work in progress based mostly -on the work of Toth Istvan. The first usable release is 0.2.0, where -most of the naming conventions were defined. Further release will try -as much as possible to stay compatible</p> + <p>The Java bindings make use of <a href="https://jna.dev.java.net/">JNA</a> + to expose the C API in a Java friendly way. The bindings are are based on + work initiated by Toth Istvan.</p> <h2>Getting it</h2> <p> @@ -19,82 +18,84 @@ as much as possible to stay compatible</p> <li><a href="http://libvirt.org/sources/java/">libvirt.org HTTP server</a></li> </ul> -<h2>Hourly development snapshots</h2> -<p> Once an hour, an automated snapshot is made from the latest CVS server - source tree. These snapshots should be usable, but we make no guarantees - about their stability: </p> +<h3>Maven</h3> +<p>A maven repository is located at <a href="http://www.libvirt.org/maven2/">http://www.libvirt.org/maven2/</a> +which you can use to include this in your maven projects.</p> -<ul> - <li><a href="ftp://libvirt.org/libvirt/java/libvirt-java-snapshot.tar.gz">libvirt.org FTP server</a></li> - <li><a href="http://libvirt.org/sources/java/libvirt-java-snapshot.tar.gz">libvirt.org HTTP server</a></li> -</ul> +<h2>GIT source repository</h2> +<p> The Java bindings code source is now maintained in a <a +href="http://git-scm.com/">git</a> repository available on +<a href="http://libvirt.org/git/">libvirt.org</a>: +</p> +<pre> +git clone git://libvirt.org/libvirt-java.git +</pre> +<p> +It can also be browsed at +</p> +<pre> -<h2>CVS repository access</h2> +<a href="http://libvirt.org/git/?p=libvirt-java.git;a=summary">http://libvirt.org/git/?p=libvirt-java.git;a=summary</a> +</pre> -<p> The master source repository uses <a -href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a> and anonymous access -is provided. Prior to accessing the server is it necessary to authenticate -using the password <code>anoncvs</code>. This can be accomplished with -the <code>cvs login</code> command: +<p></p> +<h2>GIT repository mirror</h2> + +<p> + The source code is also mirrored on <a href="http://www.gitorious.org">gitorious</a> + to aid in public development. You clone the repo with </p> -<pre> - # cvs -d :pserver:anoncvs@libvirt.org:2401/data/cvs login +<pre> + git clone git://gitorious.org/libvirt/libvirt-java.git </pre> <p> - Once authenticated, a checkout can be obtained using + It can also be browsed at </p> <pre> - # cvs -d :pserver:anoncvs@libvirt.org:2401/data/cvs co libvirt-java + <a href="http://gitorious.org/libvirt/libvirt-java">http://gitorious.org/libvirt/libvirt-java</a> </pre> -<p> -The libvirt-java build process uses GNU autotools, so after obtaining a checkout -it is necessary to generate the configure script and Makefile.in templates -using the <code>autogen.sh</code> command. As an example, to do a complete -build and install it into your home directory run: +<p></p> +<h2>CVS repository access (Deprecated)</h2> + +<p> The old source repository uses <a +href="http://ximbiot.com/cvs/cvshome/docs/">CVS</a> and anonymous access +is provided. Prior to accessing the server is it necessary to authenticate +using the password <code>anoncvs</code>. This can be accomplished with +the <code>cvs login</code> command: </p> + <pre> - ./autogen.sh --prefix=$HOME/usr - make - make install + # cvs -d :pserver:anoncvs@libvirt.org:2401/data/cvs login </pre> -<p>Other build system are not currently available but as usual we take patches -(Eclipse/ant/...) would be welcome !</p> -<p> currently libvirt-java requires a version of libvirt >= 0.4.0 to be -installed as well as the associated libvirt development files/package. It -should compile with any java implementation >= 1.5, the bindings uses -the enum construct which appeared only in that version.</p> -<p>Libvirt-java bindings development occurs on the same mailing-list as -the normal libvirt work see <a href="contact.html">the associated contact -page</a></p> - -<h2>GIT repository mirror</h2> <p> - The CVS source repository is also mirrored using GIT, and is available - for anonymous access via: + Once authenticated, a checkout can be obtained using </p> -<pre> - git clone git://git.et.redhat.com/libvirt-java +<pre> + # cvs -d :pserver:anoncvs@libvirt.org:2401/data/cvs co libvirt-java </pre> -<p> - It can also be browsed at -</p> +<p></p> +<h2>Building</h2> +<p>The code is built using ant, and assumes that you have the jna jar installed. Once you have downloaded +the code you can build the code with</p> <pre> - <a href="http://git.et.redhat.com/?p=libvirt-java.git;a=summary">http://git.et.redhat.com/?p=libvirt-java.git;a=summary</a> +% cd libvirt-java +% ant build </pre> + <h2>Content</h2> <p>The bindings are articulated around a few -classes in the <code>org/libvirt</code> namespace, notably the +classes in the <code>org/libvirt</code> package, notably the <code>Connect</code>, <code>Domain</code> and <code>Network</code> ones. Functions in the <a href="html/libvirt-libvirt.html">C API</a> taking <code>virConnectPtr</code>, <code>virDomainPtr</code> or @@ -112,13 +113,13 @@ lower case, for example the C functions:</p> </p> <p>become</p> <p> - <code>virConn::numOfDomains()</code> + <code>virConn.numOfDomains()</code> </p> <p> - <code>virDomain::setMaxMemory(long memory)</code> + <code>virDomain.setMaxMemory(long memory)</code> </p> <p> There is of course some functions where the mapping is less direct -and using extra classes to map complex arguments. The <a href="http://libvirt.org/org/libvirt/package-summary.html">Javadoc</a> is available online or as +and using extra classes to map complex arguments. The <a href="http://libvirt.org/sources/java/javadoc">Javadoc</a> is available online or as part of a separate libvirt-java-javadoc package.</p> <p>So let's look at a simple example inspired from the <code>test.java</code> test found in <code>src</code> in the source tree:</p> @@ -147,7 +148,7 @@ public class minitest { <p>There is not much to comment about it, it really is a straight mapping from the C API, the only points to notice are:</p> <ul> - <li>the import of the modules in the <code><span style="color: #0071FF; background-color: #FFFFFF">org.libvirt</span></code> namespace</li> + <li>the import of the modules in the <code><span style="color: #0071FF; background-color: #FFFFFF">org.libvirt</span></code> package</li> <li>getting a connection to the hypervisor, in that case using the readonly access to the default test hypervisor.</li> <li>getting an object representing the test domain using <span style="color: #007F00; background-color: #FFFFFF">lookupByName</span></li> -- 1.6.0.6

2 1

[libvirt] ANNOUNCE: Java Libvirt bindings version 0.3.0
by Bryan Kearney 30 Jul '09

30 Jul '09

I am happy to announce the availability of version 0.3.0 of the Libvirt Java bindings. The main change in this release is the use of JNA [1] to access the Libvirt C code instead of JNI. This results in all the glue code being pure Java which should make it easier to keep these bindings in sync with the C code. The RPMS are in fedora-testing for 10, 11 and rawhide. They will move to updates per the normal process. The code can be directly downloaded from [2]. The updated repository has been moved to git, which can be found at [3]. I am able to generate a maven repository for the bits, and was planning on putting a maven repo on libvirt.org unless folks would prefer the bits to be mirrored in a different location. Please let me know. Thanks! -- bk [1] https://jna.dev.java.net/ [2] http://www.libvirt.org/sources/java/libvirt-java-0.3.0.tar.gz [3] http://www.libvirt.org/git/?p=libvirt-java.git;a=summary

1 0

[libvirt] [PATCH] Remove MAX_TAP_ID
by Aron Griffis 30 Jul '09

30 Jul '09

As far as I can tell, there's no reason to format the device string in brAddTap(). Delegate the job to TUNSETIFF, thereby removing the loop and the MAX_TAP_ID artificial limit. This patch allows me to get 421 guests running before hitting other limits. Signed-off-by: Aron Griffis <aron.griffis(a)hp.com> --- src/bridge.c | 94 +++++++++++++++++++++------------------------------------- 1 files changed, 34 insertions(+), 60 deletions(-) diff --git a/src/bridge.c b/src/bridge.c index 0509afd..ec37192 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -49,8 +49,6 @@ #include "util.h" #include "logging.h" -#define MAX_TAP_ID 256 - #define JIFFIES_TO_MS(j) (((j)*1000)/HZ) #define MS_TO_JIFFIES(ms) (((ms)*HZ)/1000) @@ -466,76 +464,52 @@ brAddTap(brControl *ctl, int vnet_hdr, int *tapfd) { - int id, subst, fd; + int fd, len; + struct ifreq ifr = {0}; if (!ctl || !ctl->fd || !bridge || !ifname) return EINVAL; - subst = id = 0; - - if (strstr(*ifname, "%d")) - subst = 1; - if ((fd = open("/dev/net/tun", O_RDWR)) < 0) return errno; - if (vnet_hdr) - vnet_hdr = brProbeVnetHdr(fd); + ifr.ifr_flags = IFF_TAP|IFF_NO_PI; - do { - struct ifreq try; - int len; +#ifdef IFF_VNET_HDR + if (vnet_hdr && brProbeVnetHdr(fd)) + ifr.ifr_flags |= IFF_VNET_HDR; +#endif - memset(&try, 0, sizeof(struct ifreq)); + strncpy(ifr.ifr_name, *ifname, IFNAMSIZ-1); - try.ifr_flags = IFF_TAP|IFF_NO_PI; + if (ioctl(fd, TUNSETIFF, &ifr) < 0) + goto error; -#ifdef IFF_VNET_HDR - if (vnet_hdr) - try.ifr_flags |= IFF_VNET_HDR; -#endif + len = strlen(ifr.ifr_name); + if (len >= BR_IFNAME_MAXLEN - 1) { + errno = EINVAL; + goto error; + } - if (subst) { - len = snprintf(try.ifr_name, BR_IFNAME_MAXLEN, *ifname, id); - if (len >= BR_IFNAME_MAXLEN) { - errno = EADDRINUSE; - goto error; - } - } else { - len = strlen(*ifname); - if (len >= BR_IFNAME_MAXLEN - 1) { - errno = EINVAL; - goto error; - } - - strncpy(try.ifr_name, *ifname, len); - try.ifr_name[len] = '\0'; - } - - if (ioctl(fd, TUNSETIFF, &try) == 0) { - /* We need to set the interface MTU before adding it - * to the bridge, because the bridge will have its - * MTU adjusted automatically when we add the new interface. - */ - if ((errno = brSetInterfaceMtu(ctl, bridge, try.ifr_name))) - goto error; - if ((errno = brAddInterface(ctl, bridge, try.ifr_name))) - goto error; - if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1))) - goto error; - if (!tapfd && - (errno = ioctl(fd, TUNSETPERSIST, 1))) - goto error; - VIR_FREE(*ifname); - if (!(*ifname = strdup(try.ifr_name))) - goto error; - if (tapfd) - *tapfd = fd; - return 0; - } - - id++; - } while (subst && id <= MAX_TAP_ID); + /* We need to set the interface MTU before adding it + * to the bridge, because the bridge will have its + * MTU adjusted automatically when we add the new interface. + */ + if ((errno = brSetInterfaceMtu(ctl, bridge, ifr.ifr_name))) + goto error; + if ((errno = brAddInterface(ctl, bridge, ifr.ifr_name))) + goto error; + if ((errno = brSetInterfaceUp(ctl, ifr.ifr_name, 1))) + goto error; + if (!tapfd && + (errno = ioctl(fd, TUNSETPERSIST, 1))) + goto error; + VIR_FREE(*ifname); + if (!(*ifname = strdup(ifr.ifr_name))) + goto error; + if (tapfd) + *tapfd = fd; + return 0; error: close(fd);

2 2

[libvirt] [PATCH] Remove MAX_TAP_ID, take 2
by Aron Griffis 30 Jul '09

30 Jul '09

(Sorry, my first posting included some gnulib droppings in the patch. This removes that, everything else is the same.) As far as I can tell, there's no reason to format the device string in brAddTap(). Delegate the job to TUNSETIFF, thereby removing the loop and the MAX_TAP_ID artificial limit. This patch allows me to get 421 guests running before hitting other limits. Signed-off-by: Aron Griffis <aron.griffis(a)hp.com> --- src/bridge.c | 94 +++++++++++++++++++++------------------------------------- 1 files changed, 34 insertions(+), 60 deletions(-) diff --git a/src/bridge.c b/src/bridge.c index 0509afd..ec37192 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -49,8 +49,6 @@ #include "util.h" #include "logging.h" -#define MAX_TAP_ID 256 - #define JIFFIES_TO_MS(j) (((j)*1000)/HZ) #define MS_TO_JIFFIES(ms) (((ms)*HZ)/1000) @@ -466,76 +464,52 @@ brAddTap(brControl *ctl, int vnet_hdr, int *tapfd) { - int id, subst, fd; + int fd, len; + struct ifreq ifr = {0}; if (!ctl || !ctl->fd || !bridge || !ifname) return EINVAL; - subst = id = 0; - - if (strstr(*ifname, "%d")) - subst = 1; - if ((fd = open("/dev/net/tun", O_RDWR)) < 0) return errno; - if (vnet_hdr) - vnet_hdr = brProbeVnetHdr(fd); + ifr.ifr_flags = IFF_TAP|IFF_NO_PI; - do { - struct ifreq try; - int len; +#ifdef IFF_VNET_HDR + if (vnet_hdr && brProbeVnetHdr(fd)) + ifr.ifr_flags |= IFF_VNET_HDR; +#endif - memset(&try, 0, sizeof(struct ifreq)); + strncpy(ifr.ifr_name, *ifname, IFNAMSIZ-1); - try.ifr_flags = IFF_TAP|IFF_NO_PI; + if (ioctl(fd, TUNSETIFF, &ifr) < 0) + goto error; -#ifdef IFF_VNET_HDR - if (vnet_hdr) - try.ifr_flags |= IFF_VNET_HDR; -#endif + len = strlen(ifr.ifr_name); + if (len >= BR_IFNAME_MAXLEN - 1) { + errno = EINVAL; + goto error; + } - if (subst) { - len = snprintf(try.ifr_name, BR_IFNAME_MAXLEN, *ifname, id); - if (len >= BR_IFNAME_MAXLEN) { - errno = EADDRINUSE; - goto error; - } - } else { - len = strlen(*ifname); - if (len >= BR_IFNAME_MAXLEN - 1) { - errno = EINVAL; - goto error; - } - - strncpy(try.ifr_name, *ifname, len); - try.ifr_name[len] = '\0'; - } - - if (ioctl(fd, TUNSETIFF, &try) == 0) { - /* We need to set the interface MTU before adding it - * to the bridge, because the bridge will have its - * MTU adjusted automatically when we add the new interface. - */ - if ((errno = brSetInterfaceMtu(ctl, bridge, try.ifr_name))) - goto error; - if ((errno = brAddInterface(ctl, bridge, try.ifr_name))) - goto error; - if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1))) - goto error; - if (!tapfd && - (errno = ioctl(fd, TUNSETPERSIST, 1))) - goto error; - VIR_FREE(*ifname); - if (!(*ifname = strdup(try.ifr_name))) - goto error; - if (tapfd) - *tapfd = fd; - return 0; - } - - id++; - } while (subst && id <= MAX_TAP_ID); + /* We need to set the interface MTU before adding it + * to the bridge, because the bridge will have its + * MTU adjusted automatically when we add the new interface. + */ + if ((errno = brSetInterfaceMtu(ctl, bridge, ifr.ifr_name))) + goto error; + if ((errno = brAddInterface(ctl, bridge, ifr.ifr_name))) + goto error; + if ((errno = brSetInterfaceUp(ctl, ifr.ifr_name, 1))) + goto error; + if (!tapfd && + (errno = ioctl(fd, TUNSETPERSIST, 1))) + goto error; + VIR_FREE(*ifname); + if (!(*ifname = strdup(ifr.ifr_name))) + goto error; + if (tapfd) + *tapfd = fd; + return 0; error: close(fd);

3 3

[libvirt] VMware support and Server 2.0.1
by Timo Makinen 30 Jul '09

30 Jul '09

I tested libvirt with VMware Server 2.0.1 (not ESX). Server starts http on port 8333 as default and libvirt api did not have any option to give port number when connecting. Maybe connecting should be changed to support uris like: esx://host:123/ Next i tried to hardcode port into libvirt and got following error: error: internal error Expecting server major/minor version '3.5' or '4.0' but found '2.0.1' I patched libvirt again and finally got connected. Well at least list command gave out list of vms. With dumpxml i got following error: virsh # dumpxml vm02 error: internal error Missing essential config entry '' - Timo

2 1

[libvirt] [PATCH] qemu: fix monitor socket reconnection
by Ryota Ozaki 30 Jul '09

30 Jul '09

Hi, This patch fixes a handling of a qemu monitor unix socket. Current code addresses 'Socket may not have shown up yet' case with catching EACCES of connect(2), however, in that case, an errno which should be catched is ENOENT, not EACCES. Thanks, ozaki-r >From 5a4b7ee2296ca6756127c26c6bfbbe1f49ab8722 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Tue, 28 Jul 2009 23:48:22 +0900 Subject: [PATCH] qemu: fix monitor socket reconnection --- src/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 52a77be..9fb8506 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -917,8 +917,8 @@ qemudOpenMonitorUnix(virConnectPtr conn, if (ret == 0) break; - if (errno == EACCES || errno == ECONNREFUSED) { - /* EACCES : Socket may not have shown up yet + if (errno == ENOENT || errno == ECONNREFUSED) { + /* ENOENT : Socket may not have shown up yet * ECONNREFUSED : Leftover socket hasn't been removed yet */ continue; } -- 1.6.0.6

4 4

[libvirt] [PATCH] Kernel command line support for UML
by Ron Yorston 30 Jul '09

30 Jul '09

When experimenting with libvirt and UML I found it necessary to add support for additional kernel command line arguments. Ron diff -up libvirt-0.6.5/src/uml_conf.c.uml-cmdline libvirt-0.6.5/src/uml_conf.c --- libvirt-0.6.5/src/uml_conf.c.uml-cmdline 2009-07-10 16:28:51.000000000 +0100 +++ libvirt-0.6.5/src/uml_conf.c 2009-07-27 19:39:59.000000000 +0100 @@ -326,6 +326,31 @@ umlBuildCommandLineChr(virConnectPtr con } /* + * Null-terminate the current argument and return a pointer to the next. + * This should follow the same rules as the Linux kernel: arguments are + * separated by spaces; arguments can be quoted with double quotes; double + * quotes can't be escaped. + */ +static char *umlNextArg(char *args) +{ + int in_quote = 0; + + for (; *args; args++) { + if (*args == ' ' && !in_quote) { + *args++ = '\0'; + break; + } + if (*args == '"') + in_quote = !in_quote; + } + + while (*args == ' ') + args++; + + return args; +} + +/* * Constructs a argv suitable for launching uml with config defined * for a given virtual machine. */ @@ -342,6 +367,7 @@ int umlBuildCommandLine(virConnectPtr co const char **qargv = NULL; int qenvc = 0, qenva = 0; const char **qenv = NULL; + char *cmdline = NULL; uname(&ut); @@ -474,6 +500,22 @@ int umlBuildCommandLine(virConnectPtr co ADD_ARG(ret); } + if (vm->def->os.cmdline) { + char *args, *next_arg; + if ((cmdline = strdup(vm->def->os.cmdline)) == NULL) + goto no_memory; + + args = cmdline; + while (*args == ' ') + args++; + + while (*args) { + next_arg = umlNextArg(args); + ADD_ARG_LIT(args); + args = next_arg; + } + } + ADD_ARG(NULL); ADD_ENV(NULL); @@ -495,6 +537,7 @@ int umlBuildCommandLine(virConnectPtr co VIR_FREE((qenv)[i]); VIR_FREE(qenv); } + VIR_FREE(cmdline); return -1; #undef ADD_ARG

3 2

[libvirt] [PATCH 1/3] Move ldconfig calls to libvirt-client %post/%postun
by Mark McLoughlin 29 Jul '09

29 Jul '09

Now that the library has moved to libvirt-client --- libvirt.spec.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6228d0b..b79e766 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -411,7 +411,6 @@ chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd rm -fr %{buildroot} %post -/sbin/ldconfig %if %{with_libvirtd} %if %{with_qemu} @@ -440,7 +439,9 @@ if [ $1 = 0 ]; then fi %endif -%postun -p /sbin/ldconfig +%post client -p /sbin/ldconfig + +%postun client -p /sbin/ldconfig %files %defattr(-, root, root) -- 1.6.2.5

2 5

[libvirt] [PATCH] libvirt-glib: add missing details argument to callbacks
by Guido Günther 29 Jul '09

29 Jul '09

Hi, the python example is lacking the details argument in the callback. This makes the example fail due to the wrong number of arguments. Cheers, -- Guido

2 5

[libvirt] Debug the username/passwords
by Bryan Kearney 29 Jul '09

29 Jul '09

Hopefully this is the last question I have on the Java drivers. I am trying to debug the callback from openAuth(). I am passing back what I think is valid information, but I see in /var/log/messages the following: Jul 28 16:21:24 localhost libvirtd: sasl step failed -20 (SASL(-13): user not found: no secret in database) Is there a way to output what I have passed back in the credential responses? Setting the following in the /etc/libvirt/libvirtd.conf file does not seem to increase the logging: log_level=1 log_outputs="1:stderr 1:syslog:bk 1:file:virsh.log" and setting LIBVIRT_DEBUG=1,and launching libvirtd from the command line does not spit out the info. -- bk

2 2

[libvirt] ANNOUNCE: New release virt-manager 0.8.0
by Cole Robinson 29 Jul '09

29 Jul '09

I'm happy to announce a new virt-manager release, version 0.8.0. The release can be downloaded from: http://virt-manager.org/download.html The direct download link is: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.8.0.ta… This release includes: - New 'Clone VM' Wizard - Improved UI, including an overhaul of the main 'manager' view - System tray icon for easy VM access (start, stop, view console/details) - Wizard for adding serial, parallel, and video devices to existing VMs. - CPU pinning support (Michal Novotny) - Ability to view and change VM security (sVirt) settings (Dan Walsh) - Many bug fixes and improvements Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

4 3

[libvirt] PATCH: Fix remote domain events deadlock
by Daniel P. Berrange 29 Jul '09

29 Jul '09

There is a deadlock in the remote driver's dispatch code for domain events. If your callback triggers a API call that does an RPC call, then the driver will deadlock. The fix is the same as we did in the QEMU driver. We releae the lock & re-aquire it, with some extreme cleverness to protect against people deleting callbacks during the course of dispatch Daniel commit e2e6f795dd1832227c7d5c7832596be3642fe6e4 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Tue Jul 28 17:45:19 2009 +0100 Fix deadlock in remote driver domain events * src/remote_internal.c: Release driver lock when dispatching events to callbacks diff --git a/src/remote_internal.c b/src/remote_internal.c index f20ed6e..a58b768 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -167,6 +167,8 @@ struct private_data { virDomainEventQueuePtr domainEvents; /* Timer for flushing domainEvents queue */ int eventFlushTimer; + /* Flag if we're in process of dispatching */ + int domainEventDispatching; /* Self-pipe to wakeup threads waiting in poll() */ int wakeupSendFD; @@ -6288,18 +6290,26 @@ static int remoteDomainEventDeregister (virConnectPtr conn, remoteDriverLock(priv); - if (virDomainEventCallbackListRemove(conn, priv->callbackList, - callback) < 0) { - error (conn, VIR_ERR_RPC, _("removing cb fron list")); - goto done; - } - - if ( priv->callbackList->count == 0 ) { - /* Tell the server when we are the last callback deregistering */ - if (call (conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER, - (xdrproc_t) xdr_void, (char *) NULL, - (xdrproc_t) xdr_void, (char *) NULL) == -1) + if (priv->domainEventDispatching) { + if (virDomainEventCallbackListMarkDelete(conn, priv->callbackList, + callback) < 0) { + error (conn, VIR_ERR_RPC, _("marking cb for deletion")); goto done; + } + } else { + if (virDomainEventCallbackListRemove(conn, priv->callbackList, + callback) < 0) { + error (conn, VIR_ERR_RPC, _("removing cb from list")); + goto done; + } + + if ( priv->callbackList->count == 0 ) { + /* Tell the server when we are the last callback deregistering */ + if (call (conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER, + (xdrproc_t) xdr_void, (char *) NULL, + (xdrproc_t) xdr_void, (char *) NULL) == -1) + goto done; + } } rv = 0; @@ -7309,18 +7319,54 @@ done: remoteDriverUnlock(priv); } +static void remoteDomainEventDispatchFunc(virConnectPtr conn, + virDomainEventPtr event, + virConnectDomainEventCallback cb, + void *cbopaque, + void *opaque) +{ + struct private_data *priv = opaque; + + /* Drop the lock whle dispatching, for sake of re-entrancy */ + remoteDriverUnlock(priv); + virDomainEventDispatchDefaultFunc(conn, event, cb, cbopaque, NULL); + remoteDriverLock(priv); +} + void remoteDomainEventQueueFlush(int timer ATTRIBUTE_UNUSED, void *opaque) { virConnectPtr conn = opaque; struct private_data *priv = conn->privateData; + virDomainEventQueue tempQueue; remoteDriverLock(priv); - virDomainEventQueueDispatch(priv->domainEvents, priv->callbackList, - virDomainEventDispatchDefaultFunc, NULL); + priv->domainEventDispatching = 1; + + /* Copy the queue, so we're reentrant safe */ + tempQueue.count = priv->domainEvents->count; + tempQueue.events = priv->domainEvents->events; + priv->domainEvents->count = 0; + priv->domainEvents->events = NULL; + + virDomainEventQueueDispatch(&tempQueue, priv->callbackList, + remoteDomainEventDispatchFunc, priv); virEventUpdateTimeout(priv->eventFlushTimer, -1); + /* Purge any deleted callbacks */ + virDomainEventCallbackListPurgeMarked(priv->callbackList); + + if ( priv->callbackList->count == 0 ) { + /* Tell the server when we are the last callback deregistering */ + if (call (conn, priv, 0, REMOTE_PROC_DOMAIN_EVENTS_DEREGISTER, + (xdrproc_t) xdr_void, (char *) NULL, + (xdrproc_t) xdr_void, (char *) NULL) == -1) + VIR_WARN0("Failed to de-register events"); + } + + priv->domainEventDispatching = 0; + remoteDriverUnlock(priv); } -- |: 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 1

[libvirt] [PATCH] Fix trailing whitespace in NEWS
by Mark McLoughlin 29 Jul '09

29 Jul '09

Hey, I had to commit this before I could push Cheers, Mark.

1 0

[libvirt] [PATCH 00/14] Clean up spec files mess
by Mark McLoughlin 29 Jul '09

29 Jul '09

Hey, I get treated like a war criminal when I make a change in the Fedora spec file and don't send it upstream, yet there are a whole heap of changes which haven't been pushed upstream ... only one of which is mine ... two changes less than DV himself :-) The following series of patches pulls in the changes from Fedora which make sense. Some of them I'm not 100% sure of: - defaulting to policy kit - is there some reason we don't want that upstream? - The python cruft thing, not sure its needed - Converting NEWS to UTF-8 could probably be done upstream - Requiring libselinux is dubious, doesn't autorequires handle that? My final contention is that maintaining these spec files in the upstream repo actually makes it harder to maintain the Fedora spec file and helps nobody. Because of half-assed attempts to keep the two in sync, I ended up having to fix a bunch of stuff and re-instate another bunch of stuff in Fedora: - Enable netcf support - Pass --with-qemu-user=qemu etc. to configure - Move various requires to the libvirt-client sub-package - Sync some trivial cleanups from upstream spec file - Remove explicit libxml2 requires, again - Build with --without-capng if capng support is disabled - Remove explicit dir creating in makeinstall, replaced by attr in files - Set perms on /var/{run,lib,cache}/libvirt/qemu I really think we should kill these off and just point people at the Fedora spec file if they're looking for a reference spec file. I need some very strong rationale before I ever go wasting my time (2 hours) on this again. Cheers, Mark.

4 23

[libvirt] [PATCH] Remove MAX_TAP_ID
by Aron Griffis 29 Jul '09

29 Jul '09

As far as I can tell, there's no reason to format the device string in brAddTap(). Delegate the job to TUNSETIFF, thereby removing the loop and the MAX_TAP_ID artificial limit. This patch allows me to get 421 guests running before hitting other limits. Signed-off-by: Aron Griffis <aron.griffis(a)hp.com> --- src/bridge.c | 94 +++++++++++++++++++++------------------------------------- 1 files changed, 34 insertions(+), 60 deletions(-) diff --git a/.gnulib b/.gnulib deleted file mode 160000 index b653eda..0000000 --- a/.gnulib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b653eda3ac4864de205419d9f41eec267cb89eeb diff --git a/src/bridge.c b/src/bridge.c index 0509afd..ec37192 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -49,8 +49,6 @@ #include "util.h" #include "logging.h" -#define MAX_TAP_ID 256 - #define JIFFIES_TO_MS(j) (((j)*1000)/HZ) #define MS_TO_JIFFIES(ms) (((ms)*HZ)/1000) @@ -466,76 +464,52 @@ brAddTap(brControl *ctl, int vnet_hdr, int *tapfd) { - int id, subst, fd; + int fd, len; + struct ifreq ifr = {0}; if (!ctl || !ctl->fd || !bridge || !ifname) return EINVAL; - subst = id = 0; - - if (strstr(*ifname, "%d")) - subst = 1; - if ((fd = open("/dev/net/tun", O_RDWR)) < 0) return errno; - if (vnet_hdr) - vnet_hdr = brProbeVnetHdr(fd); + ifr.ifr_flags = IFF_TAP|IFF_NO_PI; - do { - struct ifreq try; - int len; +#ifdef IFF_VNET_HDR + if (vnet_hdr && brProbeVnetHdr(fd)) + ifr.ifr_flags |= IFF_VNET_HDR; +#endif - memset(&try, 0, sizeof(struct ifreq)); + strncpy(ifr.ifr_name, *ifname, IFNAMSIZ-1); - try.ifr_flags = IFF_TAP|IFF_NO_PI; + if (ioctl(fd, TUNSETIFF, &ifr) < 0) + goto error; -#ifdef IFF_VNET_HDR - if (vnet_hdr) - try.ifr_flags |= IFF_VNET_HDR; -#endif + len = strlen(ifr.ifr_name); + if (len >= BR_IFNAME_MAXLEN - 1) { + errno = EINVAL; + goto error; + } - if (subst) { - len = snprintf(try.ifr_name, BR_IFNAME_MAXLEN, *ifname, id); - if (len >= BR_IFNAME_MAXLEN) { - errno = EADDRINUSE; - goto error; - } - } else { - len = strlen(*ifname); - if (len >= BR_IFNAME_MAXLEN - 1) { - errno = EINVAL; - goto error; - } - - strncpy(try.ifr_name, *ifname, len); - try.ifr_name[len] = '\0'; - } - - if (ioctl(fd, TUNSETIFF, &try) == 0) { - /* We need to set the interface MTU before adding it - * to the bridge, because the bridge will have its - * MTU adjusted automatically when we add the new interface. - */ - if ((errno = brSetInterfaceMtu(ctl, bridge, try.ifr_name))) - goto error; - if ((errno = brAddInterface(ctl, bridge, try.ifr_name))) - goto error; - if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1))) - goto error; - if (!tapfd && - (errno = ioctl(fd, TUNSETPERSIST, 1))) - goto error; - VIR_FREE(*ifname); - if (!(*ifname = strdup(try.ifr_name))) - goto error; - if (tapfd) - *tapfd = fd; - return 0; - } - - id++; - } while (subst && id <= MAX_TAP_ID); + /* We need to set the interface MTU before adding it + * to the bridge, because the bridge will have its + * MTU adjusted automatically when we add the new interface. + */ + if ((errno = brSetInterfaceMtu(ctl, bridge, ifr.ifr_name))) + goto error; + if ((errno = brAddInterface(ctl, bridge, ifr.ifr_name))) + goto error; + if ((errno = brSetInterfaceUp(ctl, ifr.ifr_name, 1))) + goto error; + if (!tapfd && + (errno = ioctl(fd, TUNSETPERSIST, 1))) + goto error; + VIR_FREE(*ifname); + if (!(*ifname = strdup(ifr.ifr_name))) + goto error; + if (tapfd) + *tapfd = fd; + return 0; error: close(fd);

1 0

[libvirt] ANNOUNCE: New release virtinst 0.500.0
by Cole Robinson 29 Jul '09

29 Jul '09

I'm happy to announce a new virtinst release, version 0.500.0. The release can be downloaded from: http://virt-manager.org/download.html The direct download link is: http://virt-manager.org/download/sources/virtinst/virtinst-0.500.0.tar.gz This release includes: - New virt-install device options --serial, --parallel, and --video - Allow various auth types for libvirt connections (PolicyKit, SASL, ...) - New virt-clone option --auto-clone: generates all needed input. - Option to specify network device model via virt-install --network (Guido Gunther) - New virt-install option --virt-type for specifying hypervisor type (kvm, qemu). --accelerate is now the default behavior: To provision a plain qemu VM on a KVM enabled host, use '--virt-type qemu' - OVF input support for virt-convert - Many bug fixes and improvements Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH] qemu: fix missing ifname in qemu argument
by Ryota Ozaki 29 Jul '09

29 Jul '09

Hi, This patch adds missing ifname, which is a tap name for network/bridge configuration, in qemu argument of -net. Without this patch, a specified tap name, e.g., <target dev='tap01'/>, in a domain XML will be ignored. Thanks, ozaki-r >From feeca4f2cecf5c6836f7aec6e004585f3b855bed Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Tue, 28 Jul 2009 23:46:12 +0900 Subject: [PATCH] qemu: fix missing ifname in qemu argument --- src/qemu_conf.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 4fe4e39..48bf928 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1187,11 +1187,13 @@ qemuBuildHostNetStr(virConnectPtr conn, switch (net->type) { case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: - if (virAsprintf(str, "%stap%cfd=%s,vlan=%d%s%s", + if (virAsprintf(str, "%stap%cfd=%s,vlan=%d%s%s%s%s", prefix ? prefix : "", type_sep, tapfd, vlan, (net->hostnet_name ? ",name=" : ""), - (net->hostnet_name ? net->hostnet_name : "")) < 0) { + (net->hostnet_name ? net->hostnet_name : ""), + (net->ifname ? ",ifname=" : ""), + (net->ifname ? net->ifname : "")) < 0) { virReportOOMError(conn); return -1; } -- 1.6.0.6

2 2

[libvirt] Java JNA Patch series
by Bryan Kearney 29 Jul '09

29 Jul '09

Per the earlier email, here is the patch series

2 32

Re: [libvirt] VMware support and libcurl on rhel-u1
by Shahar Klein 28 Jul '09

28 Jul '09

apperantly I needed to unset CURLOPT_SSL_VERIFYHOST as well patched that and it is working now 10x Shahar ________________________________ From: Tom Hughes <tom(a)compton.nu> To: Shahar Klein <shaharklein(a)yahoo.com> Sent: Monday, July 27, 2009 2:36:32 PM Subject: Re: [libvirt] VMware support and libcurl on rhel-u1 On 27/07/09 12:33, Shahar Klein wrote: > this is what I thought but it doesn't work for me: > > [root@rain8 libvirt]# virsh -c esx://rain3?transport=http > Enter username for rain3 [root]: > Enter root password for rain3: > error: internal error curl_easy_perform() returned an error: SSL peer > certificate was not ok (51) > error: failed to connect to the hypervisor > > maybe because I'm using curl 7.15? That looks like it is still checking the certificate. Are you sure you're not still running the unpatched one somehow? I'm running curl 7.19.4 which isn't that different - does the curl_easy_setopt manual page mention the CURLOPT_SSL_VERIFYPEER option? Tom -- Tom Hughes (tom(a)compton.nu) http://www.compton.nu/

4 5

[libvirt] [PATCH 2/2] RPM spec file updated with glusterfs dependency
by Harshavardhana 28 Jul '09

28 Jul '09

Add new dependency for glusterfs rpm. --- libvirt.spec.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1e8a8ef..ccef3a5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -86,6 +86,8 @@ BuildRequires: util-linux # For showmount in FS driver (netfs discovery) BuildRequires: nfs-utils Requires: nfs-utils +# For glusterfs +Requires: glusterfs-client >= 2.0.2 %endif %if %{with_qemu} # From QEMU RPMs -- 1.6.0.6

4 6

[libvirt] [RFC/Experimental]: Tunnelled migration
by Chris Lalancette 28 Jul '09

28 Jul '09

All, Attached is the current version of the tunnelled migration patch, based upon danpb's generic datastream work. In order to use this work, you must first grab danpb's data-streams git branch here: http://gitorious.org/~berrange/libvirt/staging and then apply this patch on top. In some basic testing, this seems to work fine for me, although I have not given it a difficult scenario nor measured CPU utilization with these patches in place. DanB, these patches take a slightly different approach than you and I discussed yesterday on IRC. Just to recap, you suggested a new version of virMigratePrepare (called virMigratePrepareTunnel) that would take in as one of the arguments a datastream, and during the prepare step properly setup the datastream. Unless I'm missing something (which is entirely possible), this would also require passing that same datastream into the perform and finish stages, meaning that I'd essentially have an all new migration protocol version 3. To try to avoid that, during the prepare I store the port that we used to start the listening qemu in a new field in the virDomainObj structure. Then during the perform step, I create a datastream on the destination and run a new RPC function called virDomainMigratePrepareTunnel. This looks that port back up, associates it with the current stream, and returns back to the caller. Then the source side just does virStreamSend for all the data, and we have tunnelled migration. TODO: - More testing, especially under worst-case scenarios (VM constantly changing it's memory during migration) - CPU utilization testing to make sure that we aren't using a lot of CPU time doing this - Wall-clock testing - Switch over to using Unix Domain Sockets instead of localhost TCP migration. With a patch I put into upstream qemu (and is now in F-12), we can totally get rid of the scanning of localhost ports to find a free one, and just use Unix Domain Sockets. That should make the whole thing more robust. -- Chris Lalancette

2 2

[libvirt] test driver and virtOpenAuth()
by Bryan Kearney 28 Jul '09

28 Jul '09

I am trying to test a call into virConnectOpenAuth. How can I configure the test driver to accept auth calls on "test+tcp://localhost/default" Thanks! -- bk

2 4

[libvirt] [RFC] secrets API, was Re: [PATCH 0/9] Add support for (qcow*) volume encryption
by Miloslav Trmac 28 Jul '09

28 Jul '09

Hello, based on your comments, here is a proposal for a "secret management" API. Rather than add explicit accessors for attributes of secrets, and hard-code the "secrets are related to storage volumes" association in the API, the proposed uses XML to manipulate the association as well as other attributes, like it is used in other areas of libvirt. The user would allocate an ID for the secret using virSecretAllocateID(), set attributes of the secret using XML, e.g. <secret ephemeral='no' private='yes'> <volume>/var/lib/libvirt/images/mail.img</volume> <description>LUKS passphrase for the main hard drive of our mail server</description> </secret> Then, the secret value can be either generated and stored by libvirt, or supplied by the user using virSecretSetValue(). A simple API is provided for enumeration of all secrets. Very large deployments manage secret IDs automatically, so it probably is not necessary to provide specialized lookup functions (e.g. allowing the volume key -> secret ID lookup in less than O(number of secrets)). The <encryption> element used in volume and domain specifications remains, but it never contains any secrets directly, only something like <secret type='passphrase' secret_id='c1f11a6d-8c5d-4a3e-ac7a-4e171c5e0d4a' /> More detailed documentation is in the patch. Does that look OK? Thank you, Mirek

1 0

Re: [libvirt] [PATCH 0/9] Add support for (qcow*) volume encryption
by Miloslav Trmac 28 Jul '09

28 Jul '09

Hello, ----- "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > On Fri, Jul 24, 2009 at 07:25:54AM -0400, Miloslav Trmac wrote: > > A client in this case is the central, fully trusted, management > > system (e.g. oVirt), there is no need to protect against it. > > A more likely flow is > > > > MGMT client (no knowledge of secrets) > > | > > v > > MGMT server + key server (integrated or separate but cooperating) > > | > > v > > libvirt daemon > > | > > v > > qemu > > > > > What I am suggesting is that libvirt daemon should communicate > > > with the key server directly in all cases, and take the client > > > out of the loop. The client should merely indicate whether it > > > wants encryption or not, and never be able to directly access > > > any key material itself. With a direct trust relationship > > > between the key server and each libvirtd daemon, you do now > > > have a guarentee that keys are only ever used on the node for > > > which they are intended. You also have the additional guarentee > > > that no libvirt client can ever see any key secrets or passphrases > > > since it has been taken completely out of the loop. > > > > As far as I understand it, the whole point of virtual machine > > encryption is that the nodes are _not_ trusted, and different > > encryption keys protect data on different nodes. > > I did not mean to imply that libvirtd on a node should have > access to *all* secrets. Each libvirtd daemon has its own > identity, and when talking to a keys server it would authenticate > and the key server would only allow it access to some sub-set > of keys. ie, only the keys neccessary for VMs it needs to run. <snip> > If you have each libvirtd requesting secrets directly from the > keystore, at the time it starts a guest, then should an admin > issue a migrate command manually, the destination libvirtd > would still be unable to access the secrets of the incoming > VM, since the keystore will not have been configured to allow > it access. > > We also have to bear in mind how the MGMT server communicates > with the libvirt daemon. One likely option is using a messaging > service, which offers authenticity but not secrecy. ie, libvirt > receiving a request off the message bus can be sure the request > came from the mgmtm server, but cannot be sure it wasn't seen > by other users during transport. Thus by including secrets in > the XML, you could be exposing them to the message bus adminstrator. Is this likely to happen? No such transport is currently implemented AFAICS, and just using TLS is much simpler - it is already implemented, and gives you authentication of both sides almost for free. Why would such a messaging service be necessary for the client<->libvirtd connection, but not the libvirtd<->key server connection? > Taking your diagram, I think I would generalize it still further > to allow for mgmt server to be optional separate from key server, > and to introduce a "message bus" between MGMT server & libvirt. > Really pushing the limits of ASCII art... > > MGMT client > | > V > MGMT server <---> Key server > | ^ > V | > message bus | > | | > V | > libvirt daemon <----/ > | > V > QEMU This makes sense if you do not want to store any secrets locally at the node at any cost, but the strong coupling of the libvirtd daemon and the key server is a significant disadvantage: not only would the key server and libvirtd both have to implement the same protocol for transferring secrets, but the MGMT server, key server and libvirtd would all have to share the same concept of "identity" and the same method of authentication - and the MGMT server would have to manipulate the libvirt accounts on the key server. There are a few products that offer a company-wide key server, but there AFAIK is no standardized protocol for transferring the secrets yet (the KMIP committee was formed only a few months ago), and not even a proposal for any account management on the key server. We don't know what the industry standard will look like - or whether there will be any; right now, any key server used in connection with libvirt-managed nodes would have to implement a libvirt-specified interface (in addition to any interface it may provide to other clients). It is much simpler to use the already implemented libvirt remote interface, and give the MGMT server implementors a free hand in deciding which key server, if any, they will use, and to avoid the non-trivial effort of specifying the specialized libvirtd<->key server protocol and implementing both ends of it. If secrets related to auto-start domains are stored locally on the node, all secrets needed by libvirtd will be anticipated by the MGMT server, who can provide them before starting the operation. This makes the libvirtd->key server connection unnecessary. The API proposal that will follow adds a secret management interface to libvirtd. The API allows libvirtd to use a persistent local secret store, as well as an external key server as described above. In addition, it also allows a "fully managed" mode, where the storage and provision of secrets is the responsibility of the MGMT server. This is accomplished by giving each secret two attributes: "private", which prohibits libvirtd from divulging the secret to any client (this was done in the previous implementation in XML, but now that secrets are out-of-bound, making secrets private does not break any round-trip XML editing), and "ephemeral", which prohibits libvirt from storing the secret persistently. The MGMT server would send the necessary secrets before any operation that needs them, and delete them from the node when they are no longer necessary. Looking at your use cases: > - A node can only see secrets for VMs it is configured to run Same in "fully managed" mode. > - MGMT server does not need to ever see the secrets itself. It > merely controls access for which nodes can see them, and can > request generation of new secrets The MGMT server needs to see the secrets in "fully managed mode". The MGMT server can actually see them even if libvirtd talks to the key server directly, because the key server is allowed to manipulate permissions of the secrets and it can give itself the permission to read them. The MGMT server can also delete any interface, or boot a "rescue image" that copies the plaintext out of the virtual machine. The MGMT server must be trusted in any case. > - Messages between the MGMT server & libvirtd do not need to > be encrypted, since they don't include secrets I can't see why this is useful - the connection will use TLS anyway. > - Other users who authenticate to libvirt on a node cannot > move a VM to an unauthorized node, since it can't see secrets Same in "fully managed" mode. > - VM save memory images (which include the fully XML) do not ever > expose the secrets. So VM save image cannot be restored on an > unauthorized node. Same in "fully managed" mode. Mirek

1 0

[libvirt] VMware ESX: Add no_verify query parameter
by Matthias Bolte 28 Jul '09

28 Jul '09

Adds a no_verify query parameter to stop libcurl from verifying the server certificate for the https transport. Idea from Tom Hughes. Regards, Matthias

3 2

[libvirt] PATCH: Implement vCPU cpuTime + cpu fields for QEMU
by Daniel P. Berrange 28 Jul '09

28 Jul '09

The qemudDomainGetVcpus() method in QEMU driver has the following long standing todo item /* XXX cpu time, current pCPU mapping */ This has caused confusion for users, because they set affinity and then wonder why 'virsh vcpuinfo' constantly reports their guest as running on pCPU 0. This patch implements the missing bits, pulling it out of /proc/$PID/task/$TID/stat ie, the per-vCPU thread status file Daniel diff --git a/src/qemu_driver.c b/src/qemu_driver.c index c594495..388843f 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2465,24 +2465,44 @@ cleanup: } -static int qemudGetProcessInfo(unsigned long long *cpuTime, int pid) { +static int qemudGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, int pid, int tid) { char proc[PATH_MAX]; FILE *pidinfo; unsigned long long usertime, systime; + int cpu; + int ret; - if (snprintf(proc, sizeof(proc), "/proc/%d/stat", pid) >= (int)sizeof(proc)) { + if (tid) + ret = snprintf(proc, sizeof(proc), "/proc/%d/task/%d/stat", pid, tid); + else + ret = snprintf(proc, sizeof(proc), "/proc/%d/stat", pid); + if (ret >= (int)sizeof(proc)) { + errno = E2BIG; return -1; } if (!(pidinfo = fopen(proc, "r"))) { /*printf("cannot read pid info");*/ /* VM probably shut down, so fake 0 */ - *cpuTime = 0; + if (cpuTime) + *cpuTime = 0; + if (lastCpu) + *lastCpu = 0; return 0; } - if (fscanf(pidinfo, "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu", &usertime, &systime) != 2) { - qemudDebug("not enough arg"); + /* See 'man proc' for information about what all these fields are. We're + * only interested in a very few of them */ + if (fscanf(pidinfo, + /* pid -> stime */ + "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu" + /* cutime -> endcode */ + "%*d %*d %*d %*d %*d %*u %*u %*d %*u %*u %*u %*u" + /* startstack -> processor */ + "%*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %d", + &usertime, &systime, &cpu) != 3) { + VIR_WARN0("cannot parse process status data"); + errno = -EINVAL; return -1; } @@ -2491,9 +2511,14 @@ static int qemudGetProcessInfo(unsigned long long *cpuTime, int pid) { * _SC_CLK_TCK is jiffies per second * So calulate thus.... */ - *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long)sysconf(_SC_CLK_TCK); + if (cpuTime) + *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long)sysconf(_SC_CLK_TCK); + if (lastCpu) + *lastCpu = cpu; + - qemudDebug("Got %llu %llu %llu", usertime, systime, *cpuTime); + VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d", + pid, tid, usertime, systime, cpu); fclose(pidinfo); @@ -3133,7 +3158,7 @@ static int qemudDomainGetInfo(virDomainPtr dom, if (!virDomainIsActive(vm)) { info->cpuTime = 0; } else { - if (qemudGetProcessInfo(&(info->cpuTime), vm->pid) < 0) { + if (qemudGetProcessInfo(&(info->cpuTime), NULL, vm->pid, 0) < 0) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, ("cannot read cputime for domain")); goto cleanup; } @@ -3676,7 +3701,16 @@ qemudDomainGetVcpus(virDomainPtr dom, for (i = 0 ; i < maxinfo ; i++) { info[i].number = i; info[i].state = VIR_VCPU_RUNNING; - /* XXX cpu time, current pCPU mapping */ + + if (vm->vcpupids != NULL && + qemudGetProcessInfo(&(info[i].cpuTime), + &(info[i].cpu), + vm->pid, + vm->vcpupids[i]) < 0) { + virReportSystemError(dom->conn, errno, "%s", + _("cannot get vCPU placement & pCPU time")); + goto cleanup; + } } } -- |: 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 1

[libvirt] [PATCH] Canonicalize qemu machine types
by Mark McLoughlin 28 Jul '09

28 Jul '09

In qemu-0.11 there is a 'pc-0.10' machine type which allows you to run guests with a machine which is compatible with the pc machine in qemu-0.10 - e.g. using the original PCI class for virtio-blk and virtio-console and disabling MSI support in virtio-net. The idea here is that we don't want to surprise guests by changing the hardware when qemu is updated. I've just posted some patches for qemu-0.11 which allows libvirt to canonicalize the 'pc' machine alias to the latest machine version. This patches makes us use that so that when a guest is configured to use the 'pc' machine type, we resolve that to 'pc-0.11' machine and save that in the guest XML. See also: https://fedoraproject.org/wiki/Features/KVM_Stable_Guest_ABI * src/qemu_conf.c: add qemudCanonicalizeMachine() to parse the output of 'qemu -M ?' * src/qemu_driver.c: canonicalize the machine type in qemudDomainDefine() --- src/qemu_conf.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu_conf.h | 3 + src/qemu_driver.c | 3 + 3 files changed, 120 insertions(+), 0 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 4043d70..3f4edfa 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -470,6 +470,120 @@ virCapsPtr qemudCapsInit(void) { return NULL; } +/* Format is: + * <machine> <desc> [(alias of <machine>)] + */ +static int +qemudParseMachineTypesStr(const char *machines ATTRIBUTE_UNUSED, + const char *machine ATTRIBUTE_UNUSED, + char **canonical) +{ + const char *p = machines; + + *canonical = NULL; + + do { + const char *eol; + char *s; + + if (!(eol = strchr(p, '\n'))) + return -1; /* eof file without finding @machine */ + + if (!STRPREFIX(p, machine)) { + p = eol + 1; + continue; /* doesn't match @machine */ + } + + p += strlen(machine); + + if (*p != ' ') { + p = eol + 1; + continue; /* not a complete match of @machine */ + } + + do { + p++; + } while (*p == ' '); + + p = strstr(p, "(alias of "); + if (!p || p > eol) + return 0; /* not an alias, name is canonical */ + + *canonical = strndup(p + strlen("(alias of "), eol - p); + + s = strchr(*canonical, ')'); + if (!s) { + VIR_FREE(*canonical); + *canonical = NULL; + return -1; /* output is screwed up */ + } + + *s = '\0'; + break; + } while (1); + + return 0; +} + +int +qemudCanonicalizeMachine(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainDefPtr def) +{ + const char *const qemuarg[] = { def->emulator, "-M", "?", NULL }; + const char *const qemuenv[] = { "LC_ALL=C", NULL }; + char *machines, *canonical; + enum { MAX_MACHINES_OUTPUT_SIZE = 1024*4 }; + pid_t child; + int newstdout = -1, len; + int ret = -1, status; + + if (virExec(NULL, qemuarg, qemuenv, NULL, + &child, -1, &newstdout, NULL, VIR_EXEC_CLEAR_CAPS) < 0) + return -1; + + len = virFileReadLimFD(newstdout, MAX_MACHINES_OUTPUT_SIZE, &machines); + if (len < 0) { + virReportSystemError(NULL, errno, "%s", + _("Unable to read 'qemu -M ?' output")); + goto cleanup; + } + + if (qemudParseMachineTypesStr(machines, def->os.machine, &canonical) < 0) + goto cleanup2; + + if (canonical) { + VIR_FREE(def->os.machine); + def->os.machine = canonical; + } + + ret = 0; + +cleanup2: + VIR_FREE(machines); +cleanup: + if (close(newstdout) < 0) + ret = -1; + +rewait: + if (waitpid(child, &status, 0) != child) { + if (errno == EINTR) + goto rewait; + + VIR_ERROR(_("Unexpected exit status from qemu %d pid %lu"), + WEXITSTATUS(status), (unsigned long)child); + ret = -1; + } + /* Check & log unexpected exit status, but don't fail, + * as there's really no need to throw an error if we did + * actually read a valid version number above */ + if (WEXITSTATUS(status) != 0) { + VIR_WARN(_("Unexpected exit status '%d', qemu probably failed"), + WEXITSTATUS(status)); + } + + return ret; +} + static unsigned int qemudComputeCmdFlags(const char *help, unsigned int version, unsigned int is_kvm, diff --git a/src/qemu_conf.h b/src/qemu_conf.h index fbf2ab9..b668669 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -123,6 +123,9 @@ int qemudExtractVersionInfo (const char *qemu, unsigned int *version, unsigned int *flags); +int qemudCanonicalizeMachine (virConnectPtr conn, + virDomainDefPtr def); + int qemudParseHelpStr (const char *str, unsigned int *flags, unsigned int *version, diff --git a/src/qemu_driver.c b/src/qemu_driver.c index d2db1a2..98f8e95 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -4102,6 +4102,9 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) { } } + if (qemudCanonicalizeMachine(conn, def) < 0) + goto cleanup; + if (!(vm = virDomainAssignDef(conn, &driver->domains, def))) { -- 1.6.2.5

4 27

[libvirt] Unable to get libvirt working with KVM using direct kernel boot.
by Tiit Kaeeli 27 Jul '09

27 Jul '09

Hi, I am trying to get libvirt to manage a KVM virtual machine on Debian squeeze with multiple relevant parts included form unstable (because of need for gpt partition tables, Intel 82576 nic etc). Unfortunately the VM does not seem to boot. I will see a quemu prompt on /dev/pts/1. (Tried pressing c on it, but no difference). Nothing will appear on /dev/pts/2, /dev/pts/3 or when I type virsh console vm1_storage. If I grab the kvm command line generated by libvirt using ps and run it manually, it works fine. (Starts booting after I press c on /dev/pts/1 or remove the -S option from the command line) Libvirt configuration file: <domain type='kvm'> <name>vm1_storage</name> <uuid>29bfac01-b24d-e4ab-e741-f33f7e880d9d</uuid> <memory>4096000</memory> <currentMemory>4096000</currentMemory> <vcpu>6</vcpu> <os> <type>hvm</type> <kernel>/boot/vmlinuz-2.6.30-1-amd64</kernel> <initrd>/boot/initrd.img-2.6.30-1-amd64</initrd> <cmdline>"root=UUID=98d6d3d7-3782-4f6b-a94f-bc0272c0289d ro console=tty0 console=ttyS0,115200n8"</cmdline> </os> <features> <acpi/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm</emulator> <disk type='block' device='disk'> <source dev='/dev/vm_lvm/vm01_storage_root'/> <target dev='vda' bus='virtio'/> </disk> <interface type='ethernet'> <mac address='52:54:00:12:34:56'/> <target dev='tap0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> </devices> </domain> KVM command line that I see in ps after running virsh define /etc/libvirt/qemu/vm1_storage.xml virsh start vm1_storage (Works fine after I remove the -S option or press 'c' on quemu monitor on /dev/pts/1): /usr/bin/kvm -S -M pc -m 4000 -smp 6 -name vm1_storage -uuid 29bfac01-b24d-e4ab-e741-f33f7e880d9d -nographic -monitor pty -boot c -kernel /boot/vmlinuz-2.6.30-1-amd64 -initrd /boot/initrd.img-2.6.30-1-amd64 -append "root=UUID=98d6d3d7-3782-4f6b-a94f-bc0272c0289d ro console=tty0 console=ttyS0,115200n8" -drive file=/dev/vm_lvm/vm01_storage_root,if=virtio,index=0,boot=on -net nic,macaddr=52:54:00:12:34:56,vlan=0 -net tap,ifname=tap0,vlan=0 -serial pty -parallel none -usb /var/log/libvirt/qemu/vm1_storage.log shows: LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin HOME=/ /usr/bin/kvm -S -M pc -m 4000 -smp 6 -name vm1_storage -uuid 29bfac01-b24d-e4ab-e741-f33f7e880d9d -nographic -monitor pty -boot c -kernel /boot/vmlinuz-2.6.30-1-amd64 -initrd /boot/initrd.img-2.6.30-1-amd64 -append "root=UUID=98d6d3d7-3782-4f6b-a94f-bc0272c0289d ro console=tty0 console=ttyS0,115200n8" -drive file=/dev/vm_lvm/vm01_storage_root,if=virtio,index=0,boot=on -net nic,macaddr=52:54:00:12:34:56,vlan=0 -net tap,ifname=tap0,vlan=0 -serial pty -parallel none -usb char device redirected to /dev/pts/1 char device redirected to /dev/pts/2 qemu: loading initrd (0x76055b bytes) at 0x000000007f89f000 Versions in use: kvm 85+dfsg-4 libvirt0 0.6.5-2 libvirt-bin 0.6.5-2 linux-image-2.6.30-1-amd64 Thanks for any ideas.

2 1

[libvirt] VMware ESX: Allow leading dots in VMX config entry names
by Matthias Bolte 27 Jul '09

27 Jul '09

Hi, '.encoding = "UTF-8"' is a valid VMX config entry, so the virConfParser must accept it in VMX mode. This patch lets the parser accept those names with leading dots. Regards, Matthias

3 5

[libvirt] VMware ESX: Accept VI API version 4.0
by Matthias Bolte 27 Jul '09

27 Jul '09

Hi, This patch extends the VI API version checks to accept version 4.0 too. Regards, Matthias

2 2

[libvirt] VMware ESX: Fix memory leaks in esxDomainDumpXML()
by Matthias Bolte 27 Jul '09

27 Jul '09

Subject says it all.

2 1

[libvirt] Unable to get libvirt working with KVM using direct kernel boot.
by Tiit Kaeeli 27 Jul '09

27 Jul '09

Hi, I am trying to get libvirt to manage a KVM virtual machine on Debian squeeze with multiple relevant parts included form unstable (because of need for gpt partition tables, Intel 82576 nic etc). Unfortunately the VM does not seem to boot. I will see a quemu prompt on /dev/pts/1. (Tried pressing c on it, but no difference). Nothing will appear on /dev/pts/2, /dev/pts/3 or when I type virsh console vm1_storage. If I grab the kvm command line generated by libvirt using ps and run it manually, it works fine. (Starts booting after I press c on /dev/pts/1 or remove the -S option from the command line) Libvirt configuration file: <domain type='kvm'> <name>vm1_storage</name> <uuid>29bfac01-b24d-e4ab-e741-f33f7e880d9d</uuid> <memory>4096000</memory> <currentMemory>4096000</currentMemory> <vcpu>6</vcpu> <os> <type>hvm</type> <kernel>/boot/vmlinuz-2.6.30-1-amd64</kernel> <initrd>/boot/initrd.img-2.6.30-1-amd64</initrd> <cmdline>"root=UUID=98d6d3d7-3782-4f6b-a94f-bc0272c0289d ro console=tty0 console=ttyS0,115200n8"</cmdline> </os> <features> <acpi/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm</emulator> <disk type='block' device='disk'> <source dev='/dev/vm_lvm/vm01_storage_root'/> <target dev='vda' bus='virtio'/> </disk> <interface type='ethernet'> <mac address='52:54:00:12:34:56'/> <target dev='tap0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> </devices> </domain> KVM command line that I see in ps after running virsh define /etc/libvirt/qemu/vm1_storage.xml virsh start vm1_storage (Works fine after I remove the -S option or press 'c' on quemu monitor on /dev/pts/1): /usr/bin/kvm -S -M pc -m 4000 -smp 6 -name vm1_storage -uuid 29bfac01-b24d-e4ab-e741-f33f7e880d9d -nographic -monitor pty -boot c -kernel /boot/vmlinuz-2.6.30-1-amd64 -initrd /boot/initrd.img-2.6.30-1-amd64 -append "root=UUID=98d6d3d7-3782-4f6b-a94f-bc0272c0289d ro console=tty0 console=ttyS0,115200n8" -drive file=/dev/vm_lvm/vm01_storage_root,if=virtio,index=0,boot=on -net nic,macaddr=52:54:00:12:34:56,vlan=0 -net tap,ifname=tap0,vlan=0 -serial pty -parallel none -usb /var/log/libvirt/qemu/vm1_storage.log shows: LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin HOME=/ /usr/bin/kvm -S -M pc -m 4000 -smp 6 -name vm1_storage -uuid 29bfac01-b24d-e4ab-e741-f33f7e880d9d -nographic -monitor pty -boot c -kernel /boot/vmlinuz-2.6.30-1-amd64 -initrd /boot/initrd.img-2.6.30-1-amd64 -append "root=UUID=98d6d3d7-3782-4f6b-a94f-bc0272c0289d ro console=tty0 console=ttyS0,115200n8" -drive file=/dev/vm_lvm/vm01_storage_root,if=virtio,index=0,boot=on -net nic,macaddr=52:54:00:12:34:56,vlan=0 -net tap,ifname=tap0,vlan=0 -serial pty -parallel none -usb char device redirected to /dev/pts/1 char device redirected to /dev/pts/2 qemu: loading initrd (0x76055b bytes) at 0x000000007f89f000 Versions in use: kvm 85+dfsg-4 libvirt0 0.6.5-2 libvirt-bin 0.6.5-2 linux-image-2.6.30-1-amd64 Thanks for any ideas.

1 0

Re: [libvirt] VMware support and libcurl on rhel-u1
by Shahar Klein 27 Jul '09

27 Jul '09

I'll try with 7.15 can I test with ESX4i? Shahar ________________________________ From: Matthias Bolte <matthias.bolte(a)googlemail.com> To: Shahar Klein <shaharklein(a)yahoo.com> Sent: Sunday, July 26, 2009 5:56:18 PM Subject: Re: [libvirt] VMware support and libcurl on rhel-u1 2009/7/26 Shahar Klein <shaharklein(a)yahoo.com>: > It doesn't because I built libcurl on a different path (/usr/local/lib) > So I won't damage other stuff on this box. > I thought that this is what the LIBCURL_LIBS and LIBCURL_CFLAGS env vars are > for. No, but installing in the /usr/local prefix should also work with pkg-config. The .pc for libcurl should be located at /usr/local/lib/pkgconfig/libcurl.pc and pkg-config should find it. Maybe you have to set PKG_CONFIG_PATH in order to have pkg-config pick it up. Check the output of: pkg-config libcurl --modversion It should output 7.18 or what ever your version is, if installed correctly. > btw - Do I really need libcurl 7.18? trying to install it pushing me into > the depnendncy hell: [...] Hm... I just looked at the changelist of libcurl and something older like version 7.15 may also work, but I haven't tested it. You could give it a try and edit the configure.in file and change 7.18 to 7.15 and see if that works out. Regards, Matthias

3 10

[libvirt] [PATCH] Power Hypervisor support
by Eduardo Otubo 27 Jul '09

27 Jul '09

Hello everyone, This should be the official patch for the libvrt-0.7.0 release. Here I'll comment all the features already implemented and the roadmap we have ahead: Features supported: * Connects to HMC/VIOS or IVM systems. * Life cycle commands (resume and shutdown). * dumpxml * 'list' and 'list --all' What is being implemented: * better and centralized control for UUID * definexml * CPU management commands Any comment are always welcome. []'s -- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 otubo(a)linux.vnet.ibm.com

3 5

[libvirt] [PATCH] test: Implement BlockStats and InterfaceStats
by Cole Robinson 27 Jul '09

27 Jul '09

We fake stats values based on the current time, similar to how it's done for cpu time. --- src/test.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 114 insertions(+), 2 deletions(-) diff --git a/src/test.c b/src/test.c index f02b58b..6db3825 100644 --- a/src/test.c +++ b/src/test.c @@ -2093,6 +2093,118 @@ cleanup: return ret; } +static int testDomainBlockStats(virDomainPtr domain, + const char *path, + struct _virDomainBlockStats *stats) +{ + testConnPtr privconn = domain->conn->privateData; + virDomainObjPtr privdom; + struct timeval tv; + unsigned long long statbase; + int i, found = 0, ret = -1; + + testDriverLock(privconn); + privdom = virDomainFindByName(&privconn->domains, + domain->name); + testDriverUnlock(privconn); + + if (privdom == NULL) { + testError(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + + for (i = 0 ; i < privdom->def->ndisks ; i++) { + if (STREQ(path, privdom->def->disks[i]->dst)) { + found = 1; + break; + } + } + + if (!found) { + testError(domain->conn, VIR_ERR_INVALID_ARG, + _("invalid path: %s"), path); + goto error; + } + + if (gettimeofday(&tv, NULL) < 0) { + virReportSystemError(domain->conn, errno, + "%s", _("getting time of day")); + goto error; + } + + /* No significance to these numbers, just enough to mix it up*/ + statbase = (tv.tv_sec * 1000UL * 1000UL) + tv.tv_usec; + stats->rd_req = statbase / 10; + stats->rd_bytes = statbase / 20; + stats->wr_req = statbase / 30; + stats->wr_bytes = statbase / 40; + stats->errs = tv.tv_sec / 2; + + ret = 0; +error: + if (privdom) + virDomainObjUnlock(privdom); + return ret; +} + +static int testDomainInterfaceStats(virDomainPtr domain, + const char *path, + struct _virDomainInterfaceStats *stats) +{ + testConnPtr privconn = domain->conn->privateData; + virDomainObjPtr privdom; + struct timeval tv; + unsigned long long statbase; + int i, found = 0, ret = -1; + + testDriverLock(privconn); + privdom = virDomainFindByName(&privconn->domains, + domain->name); + testDriverUnlock(privconn); + + if (privdom == NULL) { + testError(domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + goto error; + } + + for (i = 0 ; i < privdom->def->nnets ; i++) { + if (privdom->def->nets[i]->ifname && + STREQ (privdom->def->nets[i]->ifname, path)) { + ret = 0; + break; + } + } + + if (!found) { + testError(domain->conn, VIR_ERR_INVALID_ARG, + _("invalid path, '%s' is not a known interface"), path); + goto error; + } + + if (gettimeofday(&tv, NULL) < 0) { + virReportSystemError(domain->conn, errno, + "%s", _("getting time of day")); + goto error; + } + + /* No significance to these numbers, just enough to mix it up*/ + statbase = (tv.tv_sec * 1000UL * 1000UL) + tv.tv_usec; + stats->rx_bytes = statbase / 10; + stats->rx_packets = statbase / 100; + stats->rx_errs = tv.tv_sec / 1; + stats->rx_drop = tv.tv_sec / 2; + stats->tx_bytes = statbase / 20; + stats->tx_packets = statbase / 110; + stats->tx_errs = tv.tv_sec / 3; + stats->tx_drop = tv.tv_sec / 4; + + ret = 0; +error: + if (privdom) + virDomainObjUnlock(privdom); + return ret; +} + static virDrvOpenStatus testOpenNetwork(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { @@ -4117,8 +4229,8 @@ static virDriver testDriver = { NULL, /* domainMigratePrepare */ NULL, /* domainMigratePerform */ NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ + testDomainBlockStats, /* domainBlockStats */ + testDomainInterfaceStats, /* domainInterfaceStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ testNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ -- 1.6.0.6

2 3

[libvirt] VMware support and libcurl on rhel-u1
by Shahar Klein 26 Jul '09

26 Jul '09

I'm trying to play with the new ESX driver on a rhel5-u1 x86_64 but I get this: checking for libcurl libraries >= 7.18.0... configure: error: libcurl >= 7.18.0 is required for the ESX driver according to http://curl.haxx.se/download.html there is no rpm for rhel x86_64 so I built it and tried: export LIBCURL_LIBS="-L/usr/local/lib -lcurl -L/usr/kerberos/lib64" export LIBCURL_CFLAGS="-I/usr/local/include" but configure didn't care about it am I doing something wrong here? tnx Shahar Klein

2 1

[libvirt] How to get access to QEMU monitor?
by Jun Koi 26 Jul '09

26 Jul '09

Hi, I am running QEMU via libvirt (using virsh & virt-manager). Now I want to get access to the monitor interface of QEMU, so I can issue some commands to monitor. Is there anyway to do that? Thanks, J

2 1

[libvirt] VMware ESX driver progress
by Matthias Bolte 26 Jul '09

26 Jul '09

Hi, the development was hindered by our testing cluster being offline since 2 weeks due to server room cooling system maintenance. But I finally got a basic version of dump-XML done, that fills all fields of the virDomainDef that the VMX file contains data for. Changes since first announcement: - Move code into esx subdirectory - Add esxNodeGetInfo() - Fix esxDomainGetInfo() to report the correct value for memory - Add memory and max-memory getter/setters - Add CPU scheduler getter/setters - Validate a migration before trying to perform it - Replace esxUtil_Strdup() with strdup() and remove esxUtil_MigrateStringFromLibXML() - Add esxVI_EnsureSession() to handle expiring sessions - Separate VI client code into multiple files and generate most of the type handling code with macros - Add esxDomainDumpXML() based on esxVMX_ParseConfig() The ESX driver isn't complete yet, currently it supports: - domain lookup by ID, UUID and name - domain listing - domain info retrieval - domain suspend and resume - domain start and destroy - domain reboot and shutdown, if the VMware tools are installed inside the domain - domain migration with previous validation - domain memory configuration - domain CPU amount and scheduler configuration - domain XML-dump - domain XML-from-native (VMX) - node info retrieval - node hostname retrieval The next milestone is creating/defining a new domain from a domain XML config, but this will not be finished until feature freeze for 0.7.0 on friday. Regards, Matthias

3 9

[libvirt] [PATCH 1/1] Support for Callbacks and VirtualBox Version 3.
by Pritesh Kothari 25 Jul '09

25 Jul '09

Hi All, I have added support for callbacks and VirtualBox version 3. I have attached the patch for the same, it is made against the head as of today. To check if the callbacks work you can run the example from examples/domain- events/events-c directory and then start a domain to see if you get any callback events. Regards, Pritesh

3 4

Re: [libvirt] [PATCH 0/9] Add support for (qcow*) volume encryption
by Miloslav Trmac 25 Jul '09

25 Jul '09

----- "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > > Not quite: the main case of a "dumb" client would be a large-scale > > virtualization management software that contains a primary store > > of encryption information, and gives each node access only to those > > keys that are currently necessary by the node to run its domains; > > the fact that each node has access to only a limited set of keys > > prevents an attacker that compromises a single node from reading > > disk images of all domains managed in the entire site, even if > > the disk image storage (e.g. unencrypted NFS) does not allow > > managing access by each node separately. > > > > Such a client must be able to transfer the actual secrets, not only > > identifiers, to libvirt. (The idea of a "dumb" client, that does > > not know the specifics of the format, is an additional feature on > > top, but one that implies that the client does send the actual > secrets.) > > This implies a flow of secrets > > Key server --\ > +-> libvirt client -> libvirt daemon -> qemu > MGMT server --/ > > This does not in fact guarentee that secrets for a particular > node are only used on the node for which they are intended, > because the key server cannot be sure of what libvirt daemons > the libvirt client is connected to. A client in this case is the central, fully trusted, management system (e.g. oVirt), there is no need to protect against it. A more likely flow is MGMT client (no knowledge of secrets) | v MGMT server + key server (integrated or separate but cooperating) | v libvirt daemon | v qemu > What I am suggesting is that libvirt daemon should communicate > with the key server directly in all cases, and take the client > out of the loop. The client should merely indicate whether it > wants encryption or not, and never be able to directly access > any key material itself. With a direct trust relationship > between the key server and each libvirtd daemon, you do now > have a guarentee that keys are only ever used on the node for > which they are intended. You also have the additional guarentee > that no libvirt client can ever see any key secrets or passphrases > since it has been taken completely out of the loop. As far as I understand it, the whole point of virtual machine encryption is that the nodes are _not_ trusted, and different encryption keys protect data on different nodes. If all nodes are trusted, what additional functionality does volume encryption with per-volume keys provide? If the nodes are trusted to read only data from the domains they currently host, the nodes could just as well use an encrypted local hard drive to store all images, or share a single key to encrypt all images stored on a NFS/SAN. > Key server > | > V > MGMT server -> libvirt client -> libvirt daemon -> qemu > > > Storage of secrets in a separate keystore is more important for "local" > > libvirt deployments, where libvirt manages the primary, long-term, > > store of the secrets. > > Nope, I think that having a keystore for all scenarios is the > desirable end goal. Passing secrets around in the XML should > ideally never be done at all - we should aim to always have a > keystore that can be used. Secrets in the XML would just be a > fallback for a rarely used niche cases, or disaster recovery, > or experimentation. That means that any deployment of more than one node with migration requires a separate server providing a shared keystore, even if there is only one client to manage the nodes. The N nodes x N "management consoles" case requires a centralized key store, but it's not necessary to impose it on the "1 management console" case. > > > 2. A desktop key agent (eg gnome-keyring) > > > > > > This would be useful for the unprivileged libvirtd instances > > > that run in the context of the desktop login session. Users > > > already have SSH, GPG, website keys stored here, so having > > > keys for their VM disks is obviously desirable > > > > Another option here is to let the client store the secrets in > > gnome-keyring, and transfer them to libvirt only when starting > > a domain (especially when there are no persistent domains). > > That doesn't affect the design in any way, though. > > This is undesriable because it lets requires that any client which > wishes to start the guest must have access to the secrets. We really > need to be able to have separation of this, so that when we introduce > fine grained access control, you can setup separate roles for users > who can access / work with secrets, vs users who can start/define > guests. > > > > 3. A off-node key management server > > > > > > This would be useful for a large scale data center / cluster > > > cloud deployment. This is good to allow management > scalability > > > and better separation of responsiblities of adminstration. > > > > > > If no keystore is in use, then I clearly all keys must go in & > out > > > of libvirt using the XML, which is pretty much what you're doing > > > in this series. I would say though, there is no point in clearing > > > the secret from the virStorageVolDefPtr instance/XML after volume > > > creation, since the secret is going to be kept in memory forever > > > for any guest using the volume. By not clearing the secret, an > > > app could create a volume, requesting automatic key generation, > > > then just do virStorageVolDumpXML(vol, > VIR_STORAGE_VOL_XML_SECURE) > > > to extract it and pass to onto the XML for the guest that's > created > > > > That is unreliable with current implementation, because a pool refresh > > creates all information about volumes anew by reading the volume files; > > therefore, after any pool refresh libvirt "forgets" the secrets directly > > associated with a volume (not secrets associated with an use of a volume > > in a domain). If client A creates a volume, client B can refresh the > > pool before client A is able to read the automatically generated secrets. > > One of the reasons the patch is clearing the information immediately is > > to make sure a {virStorageVolCreateXML; virStorageVolGetXMLDesc) always > > fails and no client is written depending on this racy operation sequence. > > > There is another, more important, reason why the node should never return > > encryption data to anyone who can connect to it. Consider the above- > > described situation of a large-scale virtualization deployment that uses > > volume image encryption to restrict access of nodes to volume data: If > > domain migration is supported, the nodes (all of them, or at least nodes > > within some groups) must be able to connect "read-write" to other nodes. > > This is just another argument for taking clients out of the loop completely > and having libvirt daemon always talk directly with keystores. > > > With a keystore we'd likely need a handful of APIs > > > > > > - create a secret providing a passphrase > > > - list all known secret UUIDs > > > - get the passphrase assoicated with a secret > > > - delete a secret based on UUID > > > - lookup a secret UUID based on the a disk path > > > > We might not need all of these. There are three main use > > cases for storing keys outside of XML: > > > > 1) This is a "small-scale deployment", where libvirt is the > > primary key store, and anyone that is able to connect to > > libvirtd is implicitly allowed to use the secrets. In this > > case the keystore can be managed completely automatically - > > creating a volume, or perhaps using it for the first time, > > implies storing a secret, and deleting a volume implies > > deleting a secret. Secrets are identified using a volume- > > unique object (is that a path, or an UUID?), which is > > completely transparent to the client. As long as the volume > > is "known" to libvirt, the client does not even need to > > specify any <encryption> element when creating a domain. > > > > (1a, a "small-scale deployment" where there are multiple > > clients that should be protected against each other, and > > libvirt is the primary key store, does not make sense > > unless a client account system is added to libvirt. > > > 2) The secrets are primarily stored outside libvirt (to > > restrict node access to image data), and libvirt stores > > only secrets for currently defined persistent domains (to > > support domain autostart). In this case the keystore can > > be managed completely automatically - persistent domain > > definition implies storing a secret, deleting the domain > > implies deleting a secret. Secrets are identified using > > a (domain, volume) pair, and this identifier is never > > exposed to the client. > > Deleting the domain does not imply deleting a secret, since > secrets are really associated with disks, not domains. It does, in this case - if the domain is not running on the node, the secret should not be stored on the node at all. > A disk may be shared by multiple domains. If a disk is shared, there will be multiple (domain volume) key ID pairs, and deleting one instace of the secret does not delete the other. > In addition, when you delete > a domain, libvirt does not delete the disk. It is the clients > responsiblity to delete disks after the fact. In this scenario the client does the long-term key storage. libvirt does not need to - and shouldn't - store the key merely because a volume exists. > In any case items 1 & 2 are really just 2 different implementations > of the same concept. There is a keystore, and libvirt talks to > it. Whether the keystore is local, or remote from the node is a > minor impl detail. Whether libvirt can request any secret, even if does not need to know it, is not a minor detail. > Use of a keystore of some format should be our primary goal here, > since it takes the client out of the loop. When libvirt does ACLs > on clients this is even more important, because when you revoke a > clients' access to libvirt you can be sure they don't have a > record of any of the secrets, since they never had any opportunity > to see / use them during the time they were authenticated > > 3) An external key store (such as a KMIP server) is used. In this > > case the management of access rights, listing and deleting secrets, > > would be performed by interacting with the external key store > > directly. Secrets are identified by using the external key store > > identifiers, and the client and libvirtd send these identifiers to > > each other. > > As long as we allow for secrets to be passed in the XML it will always > be possible for a client to talk to a keystore, obtain the secrets and > pass them in the XML. This is really not a desirable model to aim for > by default though, because it requires clients to know about all the > different types of keystore. If a client does not know about a particular > type of keystore, then it becomes unable to manage guests on that > libvirtd. > Not to mention the issue of trust of the client & revocation of > access. > Yes, libvirt will grow the concept of a user in the future, as well as > access controls on (user, object, operation) tuples Overall, it seems this all boils down to one thing - is libvirt intended to be a simple "virtualization server" that locally performs requested operations, managed by a separate "virtualization management" client that has full knowledge about the site (nodes, storage, secrets, access rights), with clients connecting to the "virtualization management" software instead of libvirtd, or a complete "virtualization management solution" that integrates all site-wide knowedge, accessed by dumb clients using the libvirt protocol? My reading of http://www.libvirt.org/goals.html implies the former; you seem to talk about the latter model. Have I misunderstood the role of libvirt in a large-scale deployment? Thank you, Mirek

2 2

[libvirt] [PATCH] test: Generate net interface names when assigning XML.
by Cole Robinson 25 Jul '09

25 Jul '09

We need interface names to implement InterfaceStats. --- src/test.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 68 insertions(+), 8 deletions(-) diff --git a/src/test.c b/src/test.c index 098d235..f02b58b 100644 --- a/src/test.c +++ b/src/test.c @@ -228,6 +228,66 @@ static const unsigned long long defaultPoolAlloc = 0; static int testStoragePoolObjSetDefaults(virConnectPtr conn, virStoragePoolObjPtr pool); +static char * +testDomainGenerateIfname(virConnectPtr conn, + virDomainDefPtr domdef) { + int maxif = 1024; + int ifctr, i; + + for (ifctr = 0; ifctr < maxif; ++ifctr) { + char *ifname; + int found = 0; + + if (virAsprintf(&ifname, "testnet%d", ifctr) < 0) { + virReportOOMError(conn); + return NULL; + } + + /* Generate network interface names */ + for (i = 0 ; i < domdef->nnets ; i++) { + if (domdef->nets[i]->ifname && + STREQ (domdef->nets[i]->ifname, ifname)) { + found = 1; + break; + } + } + + if (!found) + return ifname; + } + + testError(conn, VIR_ERR_INTERNAL_ERROR, + _("Exceeded max iface limit %d"), maxif); + return NULL; +} + +static virDomainObjPtr +testDomainAssignDef(virConnectPtr conn, + virDomainObjList *domlist, + virDomainDefPtr domdef) +{ + virDomainObjPtr domobj = NULL; + int i = 0; + + for (i = 0; i < domdef->nnets; i++) { + char *ifname; + if (domdef->nets[i]->ifname) + continue; + + ifname = testDomainGenerateIfname(conn, domdef); + if (!ifname) + goto error; + + domdef->nets[i]->ifname = ifname; + } + + if (!(domobj = virDomainAssignDef(conn, domlist, domdef))) + goto error; + +error: + return domobj; +} + static int testOpenDefault(virConnectPtr conn) { int u; struct timeval tv; @@ -282,7 +342,7 @@ static int testOpenDefault(virConnectPtr conn) { defaultDomainXML, VIR_DOMAIN_XML_INACTIVE))) goto error; - if (!(domobj = virDomainAssignDef(conn, &privconn->domains, domdef))) { + if (!(domobj = testDomainAssignDef(conn, &privconn->domains, domdef))) { virDomainDefFree(domdef); goto error; } @@ -608,7 +668,7 @@ static int testOpenFromFile(virConnectPtr conn, goto error; } - if (!(dom = virDomainAssignDef(conn, &privconn->domains, def))) { + if (!(dom = testDomainAssignDef(conn, &privconn->domains, def))) { virDomainDefFree(def); goto error; } @@ -920,8 +980,8 @@ testDomainCreateXML(virConnectPtr conn, const char *xml, VIR_DOMAIN_XML_INACTIVE)) == NULL) goto cleanup; - if ((dom = virDomainAssignDef(conn, &privconn->domains, - def)) == NULL) { + if ((dom = testDomainAssignDef(conn, &privconn->domains, + def)) == NULL) { virDomainDefFree(def); goto cleanup; } @@ -1471,8 +1531,8 @@ static int testDomainRestore(virConnectPtr conn, if (!def) goto cleanup; - if ((dom = virDomainAssignDef(conn, &privconn->domains, - def)) == NULL) + if ((dom = testDomainAssignDef(conn, &privconn->domains, + def)) == NULL) goto cleanup; dom->state = VIR_DOMAIN_RUNNING; @@ -1763,8 +1823,8 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn, VIR_DOMAIN_XML_INACTIVE)) == NULL) goto cleanup; - if ((dom = virDomainAssignDef(conn, &privconn->domains, - def)) == NULL) { + if ((dom = testDomainAssignDef(conn, &privconn->domains, + def)) == NULL) { goto cleanup; } def = NULL; -- 1.6.0.6

2 2

[libvirt] [PATCH] Don't allow NULL paths for BlockStats and InterfaceStats
by Cole Robinson 25 Jul '09

25 Jul '09

Do the check in libvirt.c, to save drivers from the burden. This changes behavior slightly in the qemu driver: we no longer explictly error if passed an empty string. An error will still be thrown when the device lookup fails. --- src/libvirt.c | 4 ++-- src/qemu_driver.c | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 0e6d88f..d086052 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3578,7 +3578,7 @@ virDomainBlockStats (virDomainPtr dom, const char *path, virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); return -1; } - if (!stats || size > sizeof stats2) { + if (!path || !stats || size > sizeof stats2) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } @@ -3636,7 +3636,7 @@ virDomainInterfaceStats (virDomainPtr dom, const char *path, virLibDomainError (NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); return -1; } - if (!stats || size > sizeof stats2) { + if (!path || !stats || size > sizeof stats2) { virLibDomainError (dom, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } diff --git a/src/qemu_driver.c b/src/qemu_driver.c index c4683ae..c8f451d 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -5329,12 +5329,6 @@ qemudDomainInterfaceStats (virDomainPtr dom, goto cleanup; } - if (!path || path[0] == '\0') { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, - "%s", _("NULL or empty path")); - goto cleanup; - } - /* Check the path is one of the domain's network interfaces. */ for (i = 0 ; i < vm->def->nnets ; i++) { if (vm->def->nets[i]->ifname && -- 1.6.0.6

2 1

[libvirt] [PATCH] python: Raise exceptions if virDomain*Stats fail.
by Cole Robinson 25 Jul '09

25 Jul '09

The generator couldn't tell that the stats return values were pointers. Stick a white list in the function which tries to make this distinction. --- python/generator.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/python/generator.py b/python/generator.py index 9528839..feff7a3 100755 --- a/python/generator.py +++ b/python/generator.py @@ -683,7 +683,10 @@ functions_list_exception_test = { functions_list_default_test = "%s is None" def is_list_type (name): - return name[-1:] == "*" + whitelist = [ "virDomainBlockStats", + "virDomainInterfaceStats" ] + + return name[-1:] == "*" or name in whitelist def nameFixup(name, classe, type, file): # avoid a desastrous clash -- 1.6.0.6

2 1

[libvirt] [PATCH] document telnet serial console options
by Guido Günther 24 Jul '09

24 Jul '09

Hi, attached patch updates the console docs a bit. O.k. to apply? Cheers, -- Guido

2 1

Re: [libvirt] [PATCH 1/9] Add volume encryption information handling.
by Miloslav Trmac 24 Jul '09

24 Jul '09

----- "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > For the domain XML I agree that libirt would not need to worry about > multiple LUKS keys, but for the storage volume XML we would need to > expose the fact that there are multiple keys,or allow creation of > volumes with multiple keys. I don't know. Does a fact that a feature exist imply that libvirt must fully expose it? Any use case for multiple LUKS passphrases I can think of is a bit far-fetched. > > We know that the type and amount of information that will need to be > > stored will vary depending on the "encryption format"; on the other > > hand, expecting that the information consists of independent "secrets", > > each with a simple and format-independent definition, is probably too > > optimistic. (As mentioned above, we might need a key slot ID associated > > with a LUKS passphrase; we might also need a password hash algorithm > > associated with a dm-crypt passphrase. The encryption formats used in > > practice are often complex enough that a "simple passphrase" can not > > be used.) Once we have to assume that each secret can have an "encryption > > format"-dependent format, I think it is much clearer to use something like > > The idea of a 'key slot' and 'password hash algorithm' are not neccessarily > unique to LUKS though. No, but the specific semantics and value ranges are very likely to be different across formats. > If we get 2 different encryption formats both requiring > the concept of a 'key slot' we need to represent them in the same way in the > XML, not hve a different XML for each format. I was arguing about making the internal representation format-specific, not the XML. In the XML, having something like <secret type='...' id='...'> and <parameter name='...' id='...'> is quite reasonable. I think this is not the case in the internal representation - the information will eventually have to be "parsed" into format-specific variables, and it seems better to me to do this at once from the XML, than to create an additional internal representation and additionl "parsing" code. <snip> > The libvirt approach to XML representation is to try and define XML format > that are indenpedant of specific implementations. This does imply that the > XML parser cannot really do anything beyond basic syntactic validation, > near zero semantic validation. The task of semantic validation of the > parsed data, is thus passed off to the internal drivers which provide the > specific implementations. Not having any driver-specific knowledge in the generic parser does make sense; I'll change the code. Mirek

1 0

Re: [libvirt] [PATCH 0/9] Add support for (qcow*) volume encryption
by Miloslav Trmac 24 Jul '09

24 Jul '09

Daniel, thanks for the review. ----- "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > > New XML tags are defined to represent encryption parameters (currently > > format and passphrase, more can be added in the future), e.g. > > <encryption format='qcow'> > > <passphrase>c2lsbHk=</passphrase> > > </encryption> > > (passphrase content uses base64) > > I don't think we need 'format=qcow' in there - the guest XML already > has ability to have a <driver name='qemu' type='qcow2'/> element, > and the storage vol XML also has a <format type='qcow2'/> element. The format of encrypted data is conceptually separate from the format of the image: for example, a future LVM crypt implementation is planned that will support on-line encryption key change (re-encrypting the data without needing to stop its users). This can be naturally used on partitions, but it can also be used on a ("loopback-mounted") file stored on another filesystem - which is useful because this gives us on-line encryption key change capability for both partitions and files without creating two separate implementations of the functionality. (The same loopback setup could be done with LUKS today, although it is rather pointless.) So the fact that qemu treats the unencrypted file using the "raw" format does not imply that no encryption is used, or that any particular encryption implementation is used. For these reasons I think the encryption format should be explicitly specified. (The same information could be represented in the <driver> element, but there is currently no equivalent generic functionality for the <volume> element. It is also better to keep this information "within the <encryption> node", because this allows the "dumb" client discussed below to simply store the <encryption> node for each volume, and attach it inside <domain> descriptions, without any further understanding of the encryption format.) > I think it would be good to change the naming of the inner element > a little too. I think having it called 'secret' and then a 'type' > attribute would be a little nicer. eg > > <encryption> > <secret type='passphrase'/>c2lsbHk=</secret> > </encryption> OK, I'll change that. > It might be desirable to add encryption algorithm, but that can probably > wait since qcow doesn't support multiple algorithms at this time. Exactly. The expected content of the <encryption> element is "format"-specific. > > The <encryption> tag can be added to a <volume> node passed to > > virStorageVolCreateXML() to create an encrypted volume, or to a > > <disk> node inside a <domain> to specify what encryption parameters to > > use for a domain. If the domain is persistent, the parameters > > (including the passphrase) will be saved unencrypted in /etc/libvirtd; > > the primary use case is to store the parameters outside of libvirtd, > > (perhaps by virt-manager in a GNOME keyring). > > - Support for "dumb" clients that don't know anything about encryption > > formats and the required parameters: adding an encryption format to libvirt > > would automatically make it supported in all clients. > > > > Such a client would only request that a volume should be created when > > creating it, and libvirt would choose an appropriate format, parameters > > and passphrase/key and return it to the client, who could later pass it > > unmodified inside a <domain>. > > > > This requires public API additions to let libvirt return the encryption > > information as one of the results of a volume creation operation. > > > > - Support for storing the passphrases/keys used by persistent domains > > outside of the main XML files, e.g. in a separate passphrase-encrypted > > file that must be entered on libvirtd startup. > > I think these two points overlap quite alot. Not quite: the main case of a "dumb" client would be a large-scale virtualization management software that contains a primary store of encryption information, and gives each node access only to those keys that are currently necessary by the node to run its domains; the fact that each node has access to only a limited set of keys prevents an attacker that compromises a single node from reading disk images of all domains managed in the entire site, even if the disk image storage (e.g. unencrypted NFS) does not allow managing access by each node separately. Such a client must be able to transfer the actual secrets, not only identifiers, to libvirt. (The idea of a "dumb" client, that does not know the specifics of the format, is an additional feature on top, but one that implies that the client does send the actual secrets.) Storage of secrets in a separate keystore is more important for "local" libvirt deployments, where libvirt manages the primary, long-term, store of the secrets. > As you say there are two initial approaches to persistence of secrets > > - Keep the keys in the domain XML files > - Use a separate keystore > > For the separate keystore, there are probably 3 interesting targets > to consider > > 1. A simple text (or pkcs11) file managed by libvirtd on the host > > This would be useful for the privileged libvirtd to use in > ad-hoc, small scale deployments. Perhaps allowing it to be > shared between a small number of hosts on NFS, or GFS etc > > 2. A desktop key agent (eg gnome-keyring) > > This would be useful for the unprivileged libvirtd instances > that run in the context of the desktop login session. Users > already have SSH, GPG, website keys stored here, so having > keys for their VM disks is obviously desirable Another option here is to let the client store the secrets in gnome-keyring, and transfer them to libvirt only when starting a domain (especially when there are no persistent domains). That doesn't affect the design in any way, though. > 3. A off-node key management server > > This would be useful for a large scale data center / cluster > cloud deployment. This is good to allow management scalability > and better separation of responsiblities of adminstration. > > If no keystore is in use, then I clearly all keys must go in & out > of libvirt using the XML, which is pretty much what you're doing > in this series. I would say though, there is no point in clearing > the secret from the virStorageVolDefPtr instance/XML after volume > creation, since the secret is going to be kept in memory forever > for any guest using the volume. By not clearing the secret, an > app could create a volume, requesting automatic key generation, > then just do virStorageVolDumpXML(vol, VIR_STORAGE_VOL_XML_SECURE) > to extract it and pass to onto the XML for the guest that's created That is unreliable with current implementation, because a pool refresh creates all information about volumes anew by reading the volume files; therefore, after any pool refresh libvirt "forgets" the secrets directly associated with a volume (not secrets associated with an use of a volume in a domain). If client A creates a volume, client B can refresh the pool before client A is able to read the automatically generated secrets. One of the reasons the patch is clearing the information immediately is to make sure a {virStorageVolCreateXML; virStorageVolGetXMLDesc) always fails and no client is written depending on this racy operation sequence. There is another, more important, reason why the node should never return encryption data to anyone who can connect to it. Consider the above-described situation of a large-scale virtualization deployment that uses volume image encryption to restrict access of nodes to volume data: If domain migration is supported, the nodes (all of them, or at least nodes within some groups) must be able to connect "read-write" to other nodes. Yet, if the volume image encryption is to restrict access to volume data, such connections must not allow extracting encryption secrets, or any compromised node could simply ask the other nodes for their secrets and read the data. Thus, even a read-write connection should not allow any client to read secrets. I did not realize this when I started writing the original patches; I'll modify them not to allow returning the secrets using virDomainGetXMLDesc(), which is currently possible. The only potential exception is volume creation with secret auto-generation (not implemented in these patches), and in this case it is important to ensure that only the client that initiated the volume creation, not other clients, is can get the generated secrets. The most natural implementation would be a new operation (virStorageVolCreateXMLFromAndReturn???) that generates the secrets, creates the volume, and returns the secrets in a single step. In this scenario virStorageVolDumpXML does not need to return the secrets. > If a keystore is in use, then I'd suggest we should have explicit > APIs for secret management, As argued below, that might not be necessary, depending on the intended scope of libvirt. > and forbid the use of the actual secrets > in the XML everywhere. I wouldn't necessarily be that strict - if a centralized key management server is used by libvirt, it might still make sense for users to create one-off virtual machines that are encrypted, but not managed by the centralized infrastructure. > Instead, either pass in a pre-created key UUID when creating a volume > or defining a guest eg, the XML fragment would look like this > > <encryption> > <secret type='keyuuid'>123456-1234-1245-1234-124512345</secret> > </encryption> > > Internally libvirt would then get the real passphrase from the keystore > by looking up the associated UUID. > > Or request auto-creation of a key by leaving out the data > > <encryption> > <secret type='keyuuid'/> > </encryption> > > Internally libvirt would add a key to its database, and fillin the UUID > which you could then see via DumpXML. > > With a keystore we'd likely need a handful of APIs > > - create a secret providing a passphrase > - list all known secret UUIDs > - get the passphrase assoicated with a secret > - delete a secret based on UUID > - lookup a secret UUID based on the a disk path We might not need all of these. There are three main use cases for storing keys outside of XML: 1) This is a "small-scale deployment", where libvirt is the primary key store, and anyone that is able to connect to libvirtd is implicitly allowed to use the secrets. In this case the keystore can be managed completely automatically - creating a volume, or perhaps using it for the first time, implies storing a secret, and deleting a volume implies deleting a secret. Secrets are identified using a volume-unique object (is that a path, or an UUID?), which is completely transparent to the client. As long as the volume is "known" to libvirt, the client does not even need to specify any <encryption> element when creating a domain. (1a, a "small-scale deployment" where there are multiple clients that should be protected against each other, and libvirt is the primary key store, does not make sense unless a client account system is added to libvirt. If libvirt can not distinguish between different client accounts, it can only restrict access to secrets by insisting that the client specifies a keyuuid - but the client will need to store the keyuuid values and protect them exactly as if they were the "real" secrets; the client can just as easily store the "real" secrets and skip using keyuuids altogether.) 2) The secrets are primarily stored outside libvirt (to restrict node access to image data), and libvirt stores only secrets for currently defined persistent domains (to support domain autostart). In this case the keystore can be managed completely automatically - persistent domain definition implies storing a secret, deleting the domain implies deleting a secret. Secrets are identified using a (domain, volume) pair, and this identifier is never exposed to the client. 3) An external key store (such as a KMIP server) is used. In this case the management of access rights, listing and deleting secrets, would be performed by interacting with the external key store directly. Secrets are identified by using the external key store identifiers, and the client and libvirtd send these identifiers to each other. The above seems to indicate the only operations libvirt needs from a keystore are: - generate a UUID (in a keystore-specific format) - store a secret using a specified UUID - get secret associated with an UUID - delete a secret associated with an UUID. The first two operations could perhaps be combined, depending on the specifics of the external key store (e.g. the client might want to allocate an UUID so that the client, not the node, is the "owner" of the UUID, grant the node access to the UUID, and let the node create a volume and store the secret in the UUID). > The nice thing about separating the passphrases out of the XML completely > is that we would then have the ability to do fine grained access control. > eg, you could give people ability to create new guests / volumes, using > encryption without them ever specifying, or having access to the secrets. > A seperate role could be given ability to create/list/delete secrets. > This would also let us associate one secret with many disks, which > might be a useful scenario for some people. AFAICS libvirt does not currently have the concept of an "user"; as described above, such features can be handled in an external key store. If you plan to add the "user" concept to libvirt, this would definitely make sense. Mirek

2 1

[libvirt] [PATCH 0/9] Add support for (qcow*) volume encryption
by Miloslav Trmač 24 Jul '09

24 Jul '09

Hello, the following patches add full support for qcow/qcow2 volume encryption, assuming a client that supports it. New XML tags are defined to represent encryption parameters (currently format and passphrase, more can be added in the future), e.g. <encryption format='qcow'> <passphrase>c2lsbHk=</passphrase> </encryption> (passphrase content uses base64) The <encryption> tag can be added to a <volume> node passed to virStorageVolCreateXML() to create an encrypted volume, or to a <disk> node inside a <domain> to specify what encryption parameters to use for a domain. If the domain is persistent, the parameters (including the passphrase) will be saved unencrypted in /etc/libvirtd; the primary use case is to store the parameters outside of libvirtd, (perhaps by virt-manager in a GNOME keyring). Possible enhancements: - Documentation and test cases. I'll write both if the code is acceptable, I wanted to make the code available for review first. - Support for "dumb" clients that don't know anything about encryption formats and the required parameters: adding an encryption format to libvirt would automatically make it supported in all clients. Such a client would only request that a volume should be created when creating it, and libvirt would choose an appropriate format, parameters and passphrase/key and return it to the client, who could later pass it unmodified inside a <domain>. This requires public API additions to let libvirt return the encryption information as one of the results of a volume creation operation. - Support for storing the passphrases/keys used by persistent domains outside of the main XML files, e.g. in a separate passphrase-encrypted file that must be entered on libvirtd startup.

3 25

Re: [libvirt] [PATCH 2/9] Attach encryption information to virStorageVolDef.
by Daniel P. Berrange 24 Jul '09

24 Jul '09

On Fri, Jul 24, 2009 at 12:19:22AM -0400, Miloslav Trmac wrote: > ----- "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > > > On Tue, Jul 21, 2009 at 01:11:58PM +0200, Miloslav Trma?? wrote: > > > Note that partial encryption information (e.g. specifying an encryption > > > format, but not the key/passphrase) is valid: > > > * virStorageVolGetXMLDesc() will never reveal the key/passphrase, even > > > if known by libvirt. > > > > I don't think that restriction really adds anything in the scenario > > that we're using domain XML files for persistent storage of keys. > > The patches leave this decision to the client: the client might decide > not to use persistent domains. In any case, allowing the node to store > the secrets locally does not imply that anyone that can connect to the > node read-write can access the secrets - or does it? In general all libvirt clients have the same privileges, the only restriction being local read-only clients. Basically if a client authenticates read-write then they can access / modify all objects managed on that host. In the future we will introduce fine grained access control down to a level of (user, object, operation). > > eg, if domain XML lets you see passphrases, then vol XML should > > too (given a suitable VIR_STORAGE_VOL_SECURE flag). > > Domain XML should not allow returning the secrets either, because domain > migration lets other nodes connect read-write - see [0/9] for more details. We have to allow returning the secrets, because clients need to be able to round-trip the XML without loosing data, eg xml = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE | VIR_DOMAIN_XML_SECURE) ...modify xml... virDomainDefineXML(conn, xml) must not loose any data, including the secrets. > > > * Future mechanisms could be set up to allow a libvirt user to specify > > > during volume creation that a volume should be encrypted, leaving > > > libvirt to choose suitable parameters and key and return them: > > > this would allow the libvirt user to automatically support any > > > encryption parameters (and perhaps encryption formats) supported in > > > libvirt, as long as the user can send the same information back when > > > using the volume in the future. > > > > We could allow this now without extra APIs, if we let virStorageVolGetXML > > show the ke/passphrase given a new VIR_STORAGE_VOL_SECURE flag. > > That is racy with respect to pool refresh, and gives other clients than > the node creator (again, other nodes) access to the secrets - again, > see [0/9]. Allowing other clients access to the secrets is fine - all authenticated clients are considered equal. We shouldn't try to define restrictions on this specifically for disk encryption, as fine grained per-client access control will be introduced across the whole of libvirt at a later date. There is a small race wrt to pool refresh, however, in the scenario of not using a keystore, this is an acceptable limitation IMHO. If using a keystore, then libvirt can associate a key ID with a volume and maintain that mapping long term, and reliably pass the actual secrets about internally. 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 :|

1 0

[libvirt] [PATCH] docs: say that the old repository is deprecated...
by Jim Meyering 24 Jul '09

24 Jul '09

I've just officially deprecated the original cvs-to-git-mirror libvirt repository on et.redhat.com, by git-removing all files and adding one with a pointer to the new repository: http://git.et.redhat.com/?p=libvirt.git;a=commitdiff;h=2940bc0fa9f2a3 Here's the corresponding change to update libvirt's web documentation: >From 521ac5174827400804d33e219ce02e6bd3da1089 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 24 Jul 2009 10:57:39 +0200 Subject: [PATCH] docs: say that the old repository is deprecated... * docs/downloads.html.in: but will remain for sake of old links. --- docs/downloads.html.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 0d2adb4..a34ddd1 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -74,9 +74,10 @@ <p> Jim Mereying was maintaining a CVS to git mirror on <a href="http://git.et.redhat.com/?p=libvirt.git">git.et.redhat.com</a>. - Existing users should migrate to the new git server, as the - old one will be deprecated and turned into a mirror of the - libvirt.org one. It's available as: + Existing users should migrate to the new libvirt.org git server, as the + old one is now deprecated. For the sake of old links including now- + rewritten SHA1s, we'll leave the old repository on-line for some time. + It is available as: </p> <pre> -- 1.6.4.rc2.182.g24de1

2 2

[libvirt] OpenVZ : cannot assign bridge to any interface
by Yuji NISHIDA 24 Jul '09

24 Jul '09

Hi, I'm bit confuing between 2 problems with libvirt-0.6.5 for OpenVZ. [1] bridge was created but no interface assigned to it [2] virsh dumpxml returns xml in which type is "qemu" [1] ------------------------------------------------- I tried libvirt-0.6.5 on Fedora8 to create OpenVZ container ( OpenVZ kernel is linux-2.6.18 ). A bridge was seemed to successfully create but no interface could not be assigned to the bridge. Due to that, ping could not reach the guest in container(10.0.1.2). ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ [root@node13 test]# brctl show bridge name bridge id STP enabled interfaces br101 8000.000000000000 no [root@node13 test]# ifconfig -a br101 Link encap:Ethernet HWaddr 00:00:00:00:00:00 inet addr:10.0.1.1 Bcast:10.0.1.15 Mask:255.255.255.240 inet6 addr: fe80::200:ff:fe00:0/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:30 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:0 (0.0 b) TX bytes:5031 (4.9 KiB) eth0 Link encap:Ethernet HWaddr 00:1C:C4:xx:xx:xx inet addr:133.xx.xx.xx Bcast:133.xx.xx.xx Mask:255.255.255.0 inet6 addr: fe80::21c:c4ff:xxxx:xxxx/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:196949 errors:0 dropped:0 overruns:0 frame:0 TX packets:64300 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:228373526 (217.7 MiB) TX bytes:5652593 (5.3 MiB) Interrupt:169 eth1 Link encap:Ethernet HWaddr 00:1C:C4:xx:xx:xx BROADCAST MULTICAST MTU:1500 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:0 (0.0 b) TX bytes:0 (0.0 b) Interrupt:50 lo Link encap:Local Loopback inet addr:127.0.0.1 Mask:255.0.0.0 inet6 addr: ::1/128 Scope:Host UP LOOPBACK RUNNING MTU:16436 Metric:1 RX packets:323 errors:0 dropped:0 overruns:0 frame:0 TX packets:323 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:29949 (29.2 KiB) TX bytes:29949 (29.2 KiB) sit0 Link encap:IPv6-in-IPv4 NOARP MTU:1480 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:0 (0.0 b) TX bytes:0 (0.0 b) venet0 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-00-00 UP BROADCAST POINTOPOINT RUNNING NOARP MTU:1500 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:0 (0.0 b) TX bytes:0 (0.0 b) veth101 Link encap:Ethernet HWaddr 52:54:00:52:C3:FF inet6 addr: fe80::5054:ff:fe52:c3ff/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:0 (0.0 b) TX bytes:0 (0.0 b) ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ The followings are python script and xml that I tested with. ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ [root@node13 test]# cat test.py import libvirt conn = libvirt.open('openvz:///system') conn.networkDefineXML( file('net.xml').read() ) conn.defineXML( file('test.xml').read() ) net = conn.networkLookupByName('guestnet101') net.create() guest = conn.lookupByName('101') guest.create() [root@node13 test]# cat test.xml <domain type='openvz' id='101'> <name>101</name> <os> <type>exe</type> <init>/sbin/fakeinit.sh</init> </os> <memory>524288</memory> <devices> <filesystem type='template'> <source name='fedora-10-x86_64'/> <target dir='/'/> </filesystem> <console type='pty'/> <interface type='bridge'> <mac address="52:54:00:00:01:01" /> <source bridge='guestnet101'/> <target dev='veth101'/> </interface> </devices> </domain> [root@node13 test]# cat net.xml <network> <name>guestnet101</name> <bridge name="br101" stp="off" /> <forward mode="nat"/> <ip address="10.0.1.1" netmask="255.255.255.240"> <dhcp> <range start="10.0.1.2" end="10.0.1.2" /> </dhcp> </ip> </network> ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ [2] ------------------------------------------------- I guess "type" in domain must be 'openvz' but virsh dumpxml returns it as 'qemu'. ( The configuration of VE 101 remains in [1] ) ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ [root@node13 test]# virsh dumpxml 101 <domain type='qemu' id='101'> <name>101</name> <uuid>dedee02b-b74f-6e43-f5ec-27050986efa8</uuid> <memory>0</memory> <currentMemory>0</currentMemory> <vcpu>1</vcpu> <os> <type>exe</type> <init>/sbin/init</init> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> <filesystem type='template'> <source name='fedora-10-x86_64'/> <target dir='/'/> </filesystem> <interface type='bridge'> <mac address='52:54:00:00:01:01'/> <source bridge='guestnet101'/> <target dev='veth101'/> </interface> </devices> </domain> [root@node13 test]# virsh net-dumpxml guestnet101 <network> <name>guestnet101</name> <uuid>5462e7a5-2048-3067-af9d-b134381a3f8a</uuid> <forward mode='nat'/> <bridge name='br101' stp='off' forwardDelay='0' /> <ip address='10.0.1.1' netmask='255.255.255.240'> <dhcp> <range start='10.0.1.2' end='10.0.1.2' /> </dhcp> </ip> </network> ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ Regards. ----- Yuji Nishida nishidy(a)nict.go.jp

3 3

[libvirt] How to call QEMU with -snapshot ?
by Jun Koi 24 Jul '09

24 Jul '09

Hi, I want to execute qemu (actually is KVM, qemu-system_x86-64) with -snapshot. Is there any way to do that? I tried following ways, and none works: - Put -snapshot in <emulator> in configuration file. - Create a script calling "qemu -snapshot", and rename it to qemu-system_x86-64 (and of course i rename the original one to smt else, and let my scrip call that) In all these cases, I got error about parsing for QEMU version. Thanks, J

1 0

Re: [libvirt] [PATCH 9/9] Add support for qcow encrypted volumes to qemu.
by Miloslav Trmac 24 Jul '09

24 Jul '09

----- "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > On Tue, Jul 21, 2009 at 01:12:05PM +0200, Miloslav Trma?? wrote: > > --- > > src/qemu_driver.c | 51 > ++++++++++++++++++++++++++++++++++++++++++++++++++- > > 1 files changed, 50 insertions(+), 1 deletions(-) > > IIUC this should only be needed when starting a QEMU guest. > > The 'cont' method is called from quite a few different contexts. > So it might be nice to pass a flag down from qemudStartVMDaemon > such that the passphrase handling is guarenteed to only be run > during startup (qemudStartVMDaemon is also used for migrate > and restore, so covers those scenarios OK) qemudStartVMDaemon is called during migration (and restore), but it does not sent "cont". The only place where "cont" is sent where passphrase handling is not necessary is qemudDomainResume. In any case, the passphrase handling only does something if qemu prompts for a passphrase, it does not hurt anything in other cases - on the contrary, should something go wrong and qemu would prompt for a passphrase, this ensures libvirt either supplies a passphrase, or reports an error, instead of hanging. Mirek

1 0

[libvirt] [PATCH] Add bare %s format string to printf-derivatives called with no format string
by Laine Stump 24 Jul '09

24 Jul '09

--- src/datatypes.c | 24 ++++++++++++------------ src/domain_conf.c | 9 +++++---- src/interface_conf.c | 4 ++-- src/lxc_driver.c | 2 +- src/qemu_driver.c | 4 ++-- src/storage_backend.c | 6 +++--- src/virsh.c | 4 ++-- 7 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 1e33ccb..8b3f8c3 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -289,7 +289,7 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) { if (virHashAddEntry(conn->domains, name, ret) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("failed to add domain to connection hash table")); + "%s", _("failed to add domain to connection hash table")); goto error; } conn->refs++; @@ -330,7 +330,7 @@ virReleaseDomain(virDomainPtr domain) { if (virHashRemoveEntry(conn->domains, domain->name, NULL) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("domain missing from connection hash table")); + "%s", _("domain missing from connection hash table")); conn = NULL; } @@ -430,7 +430,7 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) { if (virHashAddEntry(conn->networks, name, ret) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("failed to add network to connection hash table")); + "%s", _("failed to add network to connection hash table")); goto error; } conn->refs++; @@ -468,7 +468,7 @@ virReleaseNetwork(virNetworkPtr network) { if (virHashRemoveEntry(conn->networks, network->name, NULL) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("network missing from connection hash table")); + "%s", _("network missing from connection hash table")); conn = NULL; } @@ -603,7 +603,7 @@ _("Failed to change interface mac address from %s to %s due to differing lengths if (virHashAddEntry(conn->interfaces, name, ret) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("failed to add interface to connection hash table")); + "%s", _("failed to add interface to connection hash table")); goto error; } conn->refs++; @@ -642,7 +642,7 @@ virReleaseInterface(virInterfacePtr iface) { /* unlock before reporting error because error report grabs lock */ virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("interface missing from connection hash table")); + "%s", _("interface missing from connection hash table")); /* don't decr the conn refct if we weren't connected to it */ conn = NULL; } @@ -744,7 +744,7 @@ virGetStoragePool(virConnectPtr conn, const char *name, const unsigned char *uui if (virHashAddEntry(conn->storagePools, name, ret) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("failed to add storage pool to connection hash table")); + "%s", _("failed to add storage pool to connection hash table")); goto error; } conn->refs++; @@ -783,7 +783,7 @@ virReleaseStoragePool(virStoragePoolPtr pool) { if (virHashRemoveEntry(conn->storagePools, pool->name, NULL) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("pool missing from connection hash table")); + "%s", _("pool missing from connection hash table")); conn = NULL; } @@ -887,7 +887,7 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const c if (virHashAddEntry(conn->storageVols, key, ret) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("failed to add storage vol to connection hash table")); + "%s", _("failed to add storage vol to connection hash table")); goto error; } conn->refs++; @@ -927,7 +927,7 @@ virReleaseStorageVol(virStorageVolPtr vol) { if (virHashRemoveEntry(conn->storageVols, vol->key, NULL) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("vol missing from connection hash table")); + "%s", _("vol missing from connection hash table")); conn = NULL; } @@ -1023,7 +1023,7 @@ virGetNodeDevice(virConnectPtr conn, const char *name) if (virHashAddEntry(conn->nodeDevices, name, ret) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("failed to add node dev to conn hash table")); + "%s", _("failed to add node dev to conn hash table")); goto error; } conn->refs++; @@ -1061,7 +1061,7 @@ virReleaseNodeDevice(virNodeDevicePtr dev) { if (virHashRemoveEntry(conn->nodeDevices, dev->name, NULL) < 0) { virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, - _("dev missing from connection hash table")); + "%s", _("dev missing from connection hash table")); conn = NULL; } diff --git a/src/domain_conf.c b/src/domain_conf.c index fbe9d78..96cadd5 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -2189,7 +2189,7 @@ virSecurityLabelDefParseXML(virConnectPtr conn, VIR_FREE(p); if (def->seclabel.type < 0) { virDomainReportError(conn, VIR_ERR_XML_ERROR, - _("invalid security type")); + "%s", _("invalid security type")); goto error; } @@ -2211,7 +2211,7 @@ virSecurityLabelDefParseXML(virConnectPtr conn, VIR_SECURITY_LABEL_BUFLEN-1, ctxt); if (p == NULL) { virDomainReportError(conn, VIR_ERR_XML_ERROR, - _("security label is missing")); + "%s", _("security label is missing")); goto error; } @@ -2224,8 +2224,9 @@ virSecurityLabelDefParseXML(virConnectPtr conn, p = virXPathStringLimit(conn, "string(./seclabel/imagelabel[1])", VIR_SECURITY_LABEL_BUFLEN-1, ctxt); if (p == NULL) { - virDomainReportError(conn, VIR_ERR_XML_ERROR, - _("security imagelabel is missing")); + +virDomainReportError(conn, VIR_ERR_XML_ERROR, + "%s", _("security imagelabel is missing")); goto error; } def->seclabel.imagelabel = p; diff --git a/src/interface_conf.c b/src/interface_conf.c index 7da1a2f..a74d17e 100644 --- a/src/interface_conf.c +++ b/src/interface_conf.c @@ -601,7 +601,7 @@ virInterfaceDefParseXML(virConnectPtr conn, xmlXPathContextPtr ctxt) { tmp = virXPathString(conn, "string(./@type)", ctxt); if (tmp == NULL) { virInterfaceReportError(conn, VIR_ERR_XML_ERROR, - _("interface misses the type attribute")); + "%s", _("interface misses the type attribute")); return(NULL); } type = virInterfaceTypeFromString(tmp); @@ -643,7 +643,7 @@ virInterfaceDefParseXML(virConnectPtr conn, xmlXPathContextPtr ctxt) { bridge = virXPathNode(conn, "./bridge[1]", ctxt); if (bridge == NULL) { virInterfaceReportError(conn, VIR_ERR_XML_ERROR, - _("bridge interface misses the bridge element")); + "%s", _("bridge interface misses the bridge element")); goto error; } tmp = virXMLPropString(bridge, "stp"); diff --git a/src/lxc_driver.c b/src/lxc_driver.c index 3503573..66cfa8e 100644 --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -102,7 +102,7 @@ static virDrvOpenStatus lxcOpen(virConnectPtr conn, /* URI was good, but driver isn't active */ if (lxc_driver == NULL) { lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, - _("lxc state driver is not active")); + "%s", _("lxc state driver is not active")); return VIR_DRV_OPEN_ERROR; } } diff --git a/src/qemu_driver.c b/src/qemu_driver.c index c4683ae..3b56092 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1599,7 +1599,7 @@ static int qemudSecurityHook(void *data) { if (qemudDomainSetSecurityLabel(h->conn, h->driver, h->vm) < 0) { qemudReportError(h->conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Failed to set security label")); + "%s", _("Failed to set security label")); return -1; } @@ -3592,7 +3592,7 @@ static int qemudDomainGetSecurityLabel(virDomainPtr dom, virSecurityLabelPtr sec if (driver->securityDriver && driver->securityDriver->domainGetSecurityLabel) { if (driver->securityDriver->domainGetSecurityLabel(dom->conn, vm, seclabel) == -1) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, - _("Failed to get security label")); + "%s", _("Failed to get security label")); goto cleanup; } } diff --git a/src/storage_backend.c b/src/storage_backend.c index 67815d7..9f2dcca 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -423,7 +423,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, use_kvmimg = 0; else { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("unable to find kvm-img or qemu-img")); + "%s", _("unable to find kvm-img or qemu-img")); return -1; } @@ -485,9 +485,9 @@ virStorageBackendCreateQcowCreate(virConnectPtr conn, return -1; } if (vol->backingStore.path != NULL) { - virStorageReportError(conn, VIR_ERR_NO_SUPPORT, + virStorageReportError(conn, VIR_ERR_NO_SUPPORT, "%s", _("copy-on-write image not supported with " - "qcow-create")); + "qcow-create")); return -1; } diff --git a/src/virsh.c b/src/virsh.c index fff73a1..4499aca 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -4869,7 +4869,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) origpool = virStoragePoolLookupByVolume(origvol); if (!origpool) { - vshError(ctl, FALSE, _("failed to get parent pool")); + vshError(ctl, FALSE, "%s", _("failed to get parent pool")); goto cleanup; } @@ -6583,7 +6583,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) int found; if (!ctl->imode) { - vshError(ctl, FALSE, _("cd: command valid only in interactive mode")); + vshError(ctl, FALSE, "%s", _("cd: command valid only in interactive mode")); return -1; } -- 1.6.0.6

3 3

[libvirt] [PATCH 0/8] Support cgroups in QEMU driver (v2)
by Daniel P. Berrange 24 Jul '09

24 Jul '09

This is an updated series of the v1 patches here: http://www.redhat.com/archives/libvir-list/2009-July/msg00435.html I have re-ordered the patches a little to put the generic refactoring all first. I identified some bugs in the existing LXC driver schedular parameter handling which I fixed. Also fixed virsh to use the correct data types when setting schedular parameters instead of hardcoding a bogus type. Finally, I've made QEMU's use of cgroups configurable. Daniel P. Berrange (8): Use enums for cgroup controller types / labels Use virFileReadAll/virFileWriteStr for key cgroup read/write helpers Make cgroups a little more efficient Refactor cgroups to allow a group per driver to be managed directly Place every QEMU guest in a private cgroup Implement schedular tunables API using cgroups Use cgroups for block device whitelisting in QEMU guests Make QEMU cgroups use configurable qemud/libvirtd_qemu.aug | 2 + qemud/test_libvirtd_qemu.aug | 21 +- src/Makefile.am | 3 +- src/cgroup.c | 867 +++++++++++++++++++++++------------------- src/cgroup.h | 42 ++- src/libvirt_private.syms | 2 + src/lxc_conf.h | 2 + src/lxc_controller.c | 19 +- src/lxc_driver.c | 34 ++- src/qemu.conf | 34 ++ src/qemu_conf.c | 61 +++ src/qemu_conf.h | 5 + src/qemu_driver.c | 399 +++++++++++++++++++- src/util.c | 47 +++- src/util.h | 5 + src/virsh.c | 232 +++++++----- 16 files changed, 1237 insertions(+), 538 deletions(-)

2 18

[libvirt] clone memory leak and libvirt connection selection
by Johnny Luong 23 Jul '09

23 Jul '09

Hi, I'm trying to use libvirt-0.6.5 within a multithreaded application without libvirtd and from what it looks like, it appears to have two things that are somewhat undesirable: 1) It tries to connect to libvirtd which isn't running. But it does eventually connect to the hypervisor. 2) It appears to leak some memory within a readonly connect and close. This is not too bad but it would be an issue in my long lived daemon application. I've attached an example program illustrating the issue with the linker log and the log from valgrind showing the memory leak. The code itself is based off the one on the website. Is there a URI I can use to avoid the connection to the libvirtd daemon while still connecting to the xendstore and is the memory leak an issue with the application environment or the library? Let me know if you need any more information. Thanks, Johnny

2 1

[libvirt] [PATCH 0/2] Add some more features to LXC driver
by Daniel P. Berrange 23 Jul '09

23 Jul '09

This patch series simply adds a couple of easy features to the LXC driver. Daniel P. Berrange (2): Add domain events support to LXC driver Add domain autostart for LXC driver src/lxc_conf.h | 7 + src/lxc_driver.c | 365 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 367 insertions(+), 5 deletions(-)

2 6

[libvirt] MemoryPeek() is slow
by Jun Koi 23 Jul '09

23 Jul '09

Hi, I play around with MemoryPeek() API on QEMU. While it works well, I found that it is too slow. That is expected because of the way it works: we always need to save memory to a file, and read it in again, and that is too inefficient. I am trying to figure out a better way to do this. To do that, clearly we need to re-architecture QEMU for this: We must have another way to read memory from outside the QEMU process. Anybody could suggest a solution for this problem? I am willing to spend time on this feature to improve the situation. Thanks, J

3 6

[libvirt] PATCH: Fix many many win32 bugs
by Daniel P. Berrange 23 Jul '09

23 Jul '09

Latest GCC changed the meaning of 'printf' attribute annotation to refer to the host platform's native format specifiers. On Win32/mingw32 this means it is now validating against Microsoft's useless format specifiers. We replace all the printf like functions on Win32 thanks to GNULIB and thus should always validate against the GNU format specifiers. This means we have to use the 'gnu_printf' annotation everywhere, but only for GCC >= 4.4. This also disables the 'pwd' and 'cd' commands in virsh because neither of those build successfully on Win32. Finally, disables the OpenNebula driver on Win32 Daniel diff --git a/HACKING b/HACKING index ca39d61..da28e98 100644 --- a/HACKING +++ b/HACKING @@ -312,7 +312,7 @@ gcc's printf attribute directive in the prototype. For example, here's the one for virAsprintf, in util.h: int virAsprintf(char **strp, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf, 2, 3); + ATTRIBUTE_FMT_PRINTF(2, 3); This makes it so gcc's -Wformat and -Wformat-security options can do their jobs and cross-check format strings with the number and types diff --git a/autobuild.sh b/autobuild.sh index 54abede..d090e74 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -76,6 +76,7 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then --without-uml \ --without-vbox \ --without-openvz \ + --without-one \ --without-libvirtd make diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index 271c6ca..9514032 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -52,6 +52,7 @@ MinGW Windows libvirt virtualization library. --without-uml \ --without-vbox \ --without-openvz \ + --without-one \ --without-libvirtd make @@ -90,6 +91,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_datadir}/libvirt/schemas/storagevol.rng %{_mingw32_datadir}/libvirt/schemas/nodedev.rng %{_mingw32_datadir}/libvirt/schemas/capability.rng +%{_mingw32_datadir}/libvirt/schemas/interface.rng %{_mingw32_datadir}/locale/*/LC_MESSAGES/libvirt.mo diff --git a/qemud/dispatch.h b/qemud/dispatch.h index ab45b19..1d85df9 100644 --- a/qemud/dispatch.h +++ b/qemud/dispatch.h @@ -41,7 +41,7 @@ remoteDispatchClientRequest (struct qemud_server *server, void remoteDispatchFormatError (remote_error *rerr, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf, 2, 3); + ATTRIBUTE_FMT_PRINTF(2, 3); void remoteDispatchAuthError (remote_error *rerr); void remoteDispatchGenericError (remote_error *rerr); diff --git a/qemud/qemud.h b/qemud/qemud.h index abacbbb..254db44 100644 --- a/qemud/qemud.h +++ b/qemud/qemud.h @@ -52,15 +52,61 @@ #ifdef HAVE_ANSIDECL_H #include <ansidecl.h> #endif + +#ifndef __GNUC_PREREQ +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else +#define __GNUC_PREREQ(maj,min) 0 +#endif +#endif + +/** + * ATTRIBUTE_UNUSED: + * + * Macro to flag conciously unused parameters to functions + */ #ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED __attribute__((__unused__)) #endif -#ifndef ATTRIBUTE_FORMAT -#define ATTRIBUTE_FORMAT(args...) __attribute__((__format__ (args))) + +/** + * ATTRIBUTE_FMT_PRINTF + * + * Macro used to check printf like functions, if compiling + * with gcc. + * + * We use gnulib which guarentees we always have GNU style + * printf format specifiers even on broken Win32 platforms + * hence we have to force 'gnu_printf' for new GCC + */ +#ifndef ATTRIBUTE_FMT_PRINTF +#if __GNUC_PREREQ (4, 4) +#define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) __attribute__((__format__ (gnu_printf, fmtpos,argpos))) +#else +#define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) __attribute__((__format__ (printf, fmtpos,argpos))) +#endif #endif + +#ifndef ATTRIBUTE_RETURN_CHECK +#if __GNUC_PREREQ (3, 4) +#define ATTRIBUTE_RETURN_CHECK __attribute__((__warn_unused_result__)) #else +#define ATTRIBUTE_RETURN_CHECK +#endif +#endif + +#else +#ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED -#define ATTRIBUTE_FORMAT(...) +#endif +#ifndef ATTRIBUTE_FMT_PRINTF +#define ATTRIBUTE_FMT_PRINTF(...) +#endif +#ifndef ATTRIBUTE_RETURN_CHECK +#define ATTRIBUTE_RETURN_CHECK +#endif #endif #define qemudDebug DEBUG @@ -213,7 +259,7 @@ struct qemud_server { }; void qemudLog(int priority, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf,2,3); + ATTRIBUTE_FMT_PRINTF(2,3); diff --git a/src/buf.h b/src/buf.h index 0b78d17..7d31cb2 100644 --- a/src/buf.h +++ b/src/buf.h @@ -40,7 +40,7 @@ unsigned int virBufferUse(const virBufferPtr buf); void virBufferAdd(const virBufferPtr buf, const char *str, int len); void virBufferAddChar(const virBufferPtr buf, char c); void virBufferVSprintf(const virBufferPtr buf, const char *format, ...) - ATTRIBUTE_FORMAT(printf, 2, 3); + ATTRIBUTE_FMT_PRINTF(2, 3); void virBufferStrcat(const virBufferPtr buf, ...); void virBufferEscapeString(const virBufferPtr buf, const char *format, const char *str); void virBufferURIEncodeString (const virBufferPtr buf, const char *str); diff --git a/src/internal.h b/src/internal.h index adb6507..cf7e196 100644 --- a/src/internal.h +++ b/src/internal.h @@ -67,8 +67,13 @@ #ifdef __GNUC__ #ifndef __GNUC_PREREQ +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else #define __GNUC_PREREQ(maj,min) 0 #endif +#endif /** * ATTRIBUTE_UNUSED: @@ -80,13 +85,21 @@ #endif /** - * ATTRIBUTE_FORMAT + * ATTRIBUTE_FMT_PRINTF * - * Macro used to check printf/scanf-like functions, if compiling + * Macro used to check printf like functions, if compiling * with gcc. + * + * We use gnulib which guarentees we always have GNU style + * printf format specifiers even on broken Win32 platforms + * hence we have to force 'gnu_printf' for new GCC */ -#ifndef ATTRIBUTE_FORMAT -#define ATTRIBUTE_FORMAT(args...) __attribute__((__format__ (args))) +#ifndef ATTRIBUTE_FMT_PRINTF +#if __GNUC_PREREQ (4, 4) +#define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) __attribute__((__format__ (gnu_printf, fmtpos,argpos))) +#else +#define ATTRIBUTE_FMT_PRINTF(fmtpos,argpos) __attribute__((__format__ (printf, fmtpos,argpos))) +#endif #endif #ifndef ATTRIBUTE_RETURN_CHECK @@ -98,9 +111,15 @@ #endif #else +#ifndef ATTRIBUTE_UNUSED #define ATTRIBUTE_UNUSED -#define ATTRIBUTE_FORMAT(...) +#endif +#ifndef ATTRIBUTE_FMT_PRINTF +#define ATTRIBUTE_FMT_PRINTF(...) +#endif +#ifndef ATTRIBUTE_RETURN_CHECK #define ATTRIBUTE_RETURN_CHECK +#endif #endif /* __GNUC__ */ /* diff --git a/src/logging.h b/src/logging.h index 0b9ae79..f1e2525 100644 --- a/src/logging.h +++ b/src/logging.h @@ -121,6 +121,6 @@ extern int virLogParseFilters(const char *filters); extern int virLogParseOutputs(const char *output); extern void virLogMessage(const char *category, int priority, const char *funcname, long long linenr, int flags, - const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 6, 7); + const char *fmt, ...) ATTRIBUTE_FMT_PRINTF(6, 7); #endif diff --git a/src/security.h b/src/security.h index 585caa0..5fc3086 100644 --- a/src/security.h +++ b/src/security.h @@ -82,7 +82,7 @@ virSecurityDriverVerify(virConnectPtr conn, virDomainDefPtr def); void virSecurityReportError(virConnectPtr conn, int code, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf, 3, 4); + ATTRIBUTE_FMT_PRINTF(3, 4); /* Helpers */ void virSecurityDriverInit(virSecurityDriverPtr drv); diff --git a/src/sexpr.h b/src/sexpr.h index c3d038e..1d9adaa 100644 --- a/src/sexpr.h +++ b/src/sexpr.h @@ -49,7 +49,7 @@ void sexpr_free(struct sexpr *sexpr); const char *sexpr_node(const struct sexpr *sexpr, const char *node); int sexpr_node_copy(const struct sexpr *sexpr, const char *node, char **dst); const char *sexpr_fmt_node(const struct sexpr *sexpr, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf,2,3); + ATTRIBUTE_FMT_PRINTF(2,3); struct sexpr *sexpr_lookup(const struct sexpr *sexpr, const char *node); int sexpr_has(const struct sexpr *sexpr, const char *node); #endif diff --git a/src/threads-win32.c b/src/threads-win32.c index 10233b0..ef3f2ef 100644 --- a/src/threads-win32.c +++ b/src/threads-win32.c @@ -41,8 +41,10 @@ void virCondEventCleanup(void *data); int virThreadInitialize(void) { - virMutexInit(&virThreadLocalLock); - virThreadLocalInit(&virCondEvent, virCondEventCleanup); + if (virMutexInit(&virThreadLocalLock) < 0) + return -1; + if (virThreadLocalInit(&virCondEvent, virCondEventCleanup) < 0) + return -1; return 0; } diff --git a/src/util.h b/src/util.h index 1a7286c..43a5bbc 100644 --- a/src/util.h +++ b/src/util.h @@ -160,7 +160,7 @@ int virMacAddrCompare (const char *mac1, const char *mac2); void virSkipSpaces(const char **str); int virParseNumber(const char **str); int virAsprintf(char **strp, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf, 2, 3); + ATTRIBUTE_FMT_PRINTF(2, 3); #define VIR_MAC_BUFLEN 6 #define VIR_MAC_PREFIX_BUFLEN 3 diff --git a/src/virsh.c b/src/virsh.c index fff73a1..6919292 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -202,7 +202,7 @@ typedef struct __vshControl { static const vshCmdDef commands[]; static void vshError(vshControl *ctl, int doexit, const char *format, ...) - ATTRIBUTE_FORMAT(printf, 3, 4); + ATTRIBUTE_FMT_PRINTF(3, 4); static int vshInit(vshControl *ctl); static int vshDeinit(vshControl *ctl); static void vshUsage(void); @@ -272,9 +272,9 @@ static virStorageVolPtr vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, VSH_BYUUID|VSH_BYNAME) static void vshPrintExtra(vshControl *ctl, const char *format, ...) - ATTRIBUTE_FORMAT(printf, 2, 3); + ATTRIBUTE_FMT_PRINTF(2, 3); static void vshDebug(vshControl *ctl, int level, const char *format, ...) - ATTRIBUTE_FORMAT(printf, 3, 4); + ATTRIBUTE_FMT_PRINTF(3, 4); /* XXX: add batch support */ #define vshPrint(_ctl, ...) fprintf(stdout, __VA_ARGS__) @@ -495,6 +495,8 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) return ctl->conn ? TRUE : FALSE; } +#ifndef WIN32 + /* * "console" command */ @@ -510,8 +512,6 @@ static const vshCmdOptDef opts_console[] = { {NULL, 0, 0, NULL} }; -#ifndef __MINGW32__ - static int cmdRunConsole(vshControl *ctl, virDomainPtr dom) { @@ -574,17 +574,6 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) return ret; } -#else /* __MINGW32__ */ - -static int -cmdRunConsole(vshControl *ctl, virDomainPtr dom ATTRIBUTE_UNUSED) -{ - vshError (ctl, FALSE, "%s", _("console not implemented on this platform")); - return FALSE; -} - -#endif /* __MINGW32__ */ - static int cmdConsole(vshControl *ctl, const vshCmd *cmd) { @@ -603,6 +592,9 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) return ret; } +#endif /* WIN32 */ + + /* * "list" command */ @@ -931,7 +923,9 @@ static const vshCmdInfo info_create[] = { static const vshCmdOptDef opts_create[] = { {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML domain description")}, +#ifndef WIN32 {"console", VSH_OT_BOOL, 0, gettext_noop("attach to console after creation")}, +#endif {NULL, 0, 0, NULL} }; @@ -943,7 +937,9 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) int found; int ret = TRUE; char *buffer; +#ifndef WIN32 int console = vshCommandOptBool(cmd, "console"); +#endif if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -961,8 +957,10 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) if (dom != NULL) { vshPrint(ctl, _("Domain %s created from %s\n"), virDomainGetName(dom), from); +#ifndef WIN32 if (console) cmdRunConsole(ctl, dom); +#endif virDomainFree(dom); } else { vshError(ctl, FALSE, _("Failed to create domain from %s"), from); @@ -1083,7 +1081,9 @@ static const vshCmdInfo info_start[] = { static const vshCmdOptDef opts_start[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive domain")}, +#ifndef WIN32 {"console", VSH_OT_BOOL, 0, gettext_noop("attach to console after creation")}, +#endif {NULL, 0, 0, NULL} }; @@ -1092,7 +1092,9 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int ret = TRUE; +#ifndef WIN32 int console = vshCommandOptBool(cmd, "console"); +#endif if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -1109,8 +1111,10 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) if (virDomainCreate(dom) == 0) { vshPrint(ctl, _("Domain %s started\n"), virDomainGetName(dom)); +#ifndef WIN32 if (console) cmdRunConsole(ctl, dom); +#endif } else { vshError(ctl, FALSE, _("Failed to start domain %s"), virDomainGetName(dom)); @@ -6562,6 +6566,8 @@ editReadBackFile (vshControl *ctl, const char *filename) return ret; } + +#ifndef WIN32 /* * "cd" command */ @@ -6603,6 +6609,9 @@ cmdCd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) return 0; } +#endif + +#ifndef WIN32 /* * "pwd" command */ @@ -6638,6 +6647,7 @@ cmdPwd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) free (cwd); return !err; } +#endif /* * "edit" command @@ -6802,9 +6812,13 @@ static const vshCmdDef commands[] = { {"attach-interface", cmdAttachInterface, opts_attach_interface, info_attach_interface}, {"autostart", cmdAutostart, opts_autostart, info_autostart}, {"capabilities", cmdCapabilities, NULL, info_capabilities}, +#ifndef WIN32 {"cd", cmdCd, opts_cd, info_cd}, +#endif {"connect", cmdConnect, opts_connect, info_connect}, +#ifndef WIN32 {"console", cmdConsole, opts_console, info_console}, +#endif {"create", cmdCreate, opts_create, info_create}, {"start", cmdStart, opts_start, info_start}, {"destroy", cmdDestroy, opts_destroy, info_destroy}, @@ -6882,7 +6896,9 @@ static const vshCmdDef commands[] = { {"pool-undefine", cmdPoolUndefine, opts_pool_undefine, info_pool_undefine}, {"pool-uuid", cmdPoolUuid, opts_pool_uuid, info_pool_uuid}, +#ifndef WIN32 {"pwd", cmdPwd, NULL, info_pwd}, +#endif {"quit", cmdQuit, NULL, info_quit}, {"reboot", cmdReboot, opts_reboot, info_reboot}, {"restore", cmdRestore, opts_restore, info_restore}, diff --git a/src/virterror_internal.h b/src/virterror_internal.h index fe9a96f..da89de7 100644 --- a/src/virterror_internal.h +++ b/src/virterror_internal.h @@ -46,7 +46,7 @@ void virRaiseErrorFull(virConnectPtr conn, int int1, int int2, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf, 13, 14); + ATTRIBUTE_FMT_PRINTF(13, 14); /* Includes 'dom' and 'net' for compatbility, but they're ignored */ #define virRaiseError(conn, dom, net, domain, code, level, \ @@ -61,7 +61,7 @@ void virReportErrorHelper(virConnectPtr conn, int domcode, int errcode, const char *funcname ATTRIBUTE_UNUSED, size_t linenr ATTRIBUTE_UNUSED, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf, 7, 8); + ATTRIBUTE_FMT_PRINTF(7, 8); void virReportSystemErrorFull(virConnectPtr conn, int domcode, @@ -70,7 +70,7 @@ void virReportSystemErrorFull(virConnectPtr conn, const char *funcname, size_t linenr, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf, 7, 8); + ATTRIBUTE_FMT_PRINTF(7, 8); #define virReportSystemError(conn, theerrno, fmt,...) \ virReportSystemErrorFull((conn), \ diff --git a/src/xend_internal.c b/src/xend_internal.c index 55ffd3f..e23ae2b 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -582,7 +582,7 @@ xend_op(virConnectPtr xend, const char *name, const char *key, ...) * Returns a parsed S-Expression in case of success, NULL in case of failure */ static struct sexpr *sexpr_get(virConnectPtr xend, const char *fmt, ...) - ATTRIBUTE_FORMAT(printf,2,3); + ATTRIBUTE_FMT_PRINTF(2,3); static struct sexpr * sexpr_get(virConnectPtr xend, const char *fmt, ...) -- |: 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 1

[libvirt] How to config my VM to use KVM with libvirt?
by Jun Koi 23 Jul '09

23 Jul '09

Hi, I have a VM running under libvirt, and it is currently run with -no-kvm option (I saw that in "ps" output). Now I want to run this VM with KVM. How can I reconfigure it for that? I looked into its configuration file under /etc/libvirt/qemu, but didnt see any option to turn KVM on. Thanks, J

4 7

[libvirt] [PATCH 0/4] Fixes to some bugs encountered testing virInterface*
by Laine Stump 23 Jul '09

23 Jul '09

This series of patches fixes some problems I found while testing the virInterface implementation. Note that the 3rd patch in the series only fixes virInterface-related instances of the problem (releasing the conn lock before reporting errors). If that patch is approved, a similar thing must be done for several other functions in datatypes.c.

3 18

[libvirt] [PATCH] Release conn lock before reporting errors
by Laine Stump 23 Jul '09

23 Jul '09

This is a follow-on to 528d37. It's fixing several other cases in datatypes.c where we try to report an error while holding the conn's lock, which can't work because the error reporting also tries to lock the conn. --- src/datatypes.c | 133 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 82 insertions(+), 51 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index ba5401d..c2030dd 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -270,11 +270,13 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) { /* TODO check the UUID */ if (ret == NULL) { if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } ret->name = strdup(name); if (ret->name == NULL) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } @@ -285,6 +287,7 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) { memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); if (virHashAddEntry(conn->domains, name, ret) < 0) { + virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("failed to add domain to connection hash table")); goto error; @@ -299,7 +302,6 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) { return(ret); error: - virMutexUnlock(&conn->lock); if (ret != NULL) { VIR_FREE(ret->name); VIR_FREE(ret); @@ -325,24 +327,28 @@ virReleaseDomain(virDomainPtr domain) { DEBUG("release domain %p %s", domain, domain->name); /* TODO search by UUID first as they are better differenciators */ - if (virHashRemoveEntry(conn->domains, domain->name, NULL) < 0) + if (virHashRemoveEntry(conn->domains, domain->name, NULL) < 0) { + virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("domain missing from connection hash table")); + conn = NULL; + } domain->magic = -1; domain->id = -1; VIR_FREE(domain->name); VIR_FREE(domain); - DEBUG("unref connection %p %d", conn, conn->refs); - conn->refs--; - if (conn->refs == 0) { - virReleaseConnect(conn); - /* Already unlocked mutex */ - return; + if (conn) { + DEBUG("unref connection %p %d", conn, conn->refs); + conn->refs--; + if (conn->refs == 0) { + virReleaseConnect(conn); + /* Already unlocked mutex */ + return; + } + virMutexUnlock(&conn->lock); } - - virMutexUnlock(&conn->lock); } @@ -406,11 +412,13 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) { /* TODO check the UUID */ if (ret == NULL) { if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } ret->name = strdup(name); if (ret->name == NULL) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } @@ -420,6 +428,7 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) { memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); if (virHashAddEntry(conn->networks, name, ret) < 0) { + virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("failed to add network to connection hash table")); goto error; @@ -431,7 +440,6 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) { return(ret); error: - virMutexUnlock(&conn->lock); if (ret != NULL) { VIR_FREE(ret->name); VIR_FREE(ret); @@ -457,23 +465,27 @@ virReleaseNetwork(virNetworkPtr network) { DEBUG("release network %p %s", network, network->name); /* TODO search by UUID first as they are better differenciators */ - if (virHashRemoveEntry(conn->networks, network->name, NULL) < 0) + if (virHashRemoveEntry(conn->networks, network->name, NULL) < 0) { + virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("network missing from connection hash table")); + conn = NULL; + } network->magic = -1; VIR_FREE(network->name); VIR_FREE(network); - DEBUG("unref connection %p %d", conn, conn->refs); - conn->refs--; - if (conn->refs == 0) { - virReleaseConnect(conn); - /* Already unlocked mutex */ - return; + if (conn) { + DEBUG("unref connection %p %d", conn, conn->refs); + conn->refs--; + if (conn->refs == 0) { + virReleaseConnect(conn); + /* Already unlocked mutex */ + return; + } + virMutexUnlock(&conn->lock); } - - virMutexUnlock(&conn->lock); } @@ -714,11 +726,13 @@ virGetStoragePool(virConnectPtr conn, const char *name, const unsigned char *uui /* TODO check the UUID */ if (ret == NULL) { if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } ret->name = strdup(name); if (ret->name == NULL) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } @@ -728,6 +742,7 @@ virGetStoragePool(virConnectPtr conn, const char *name, const unsigned char *uui memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); if (virHashAddEntry(conn->storagePools, name, ret) < 0) { + virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("failed to add storage pool to connection hash table")); goto error; @@ -739,7 +754,6 @@ virGetStoragePool(virConnectPtr conn, const char *name, const unsigned char *uui return(ret); error: - virMutexUnlock(&conn->lock); if (ret != NULL) { VIR_FREE(ret->name); VIR_FREE(ret); @@ -766,23 +780,27 @@ virReleaseStoragePool(virStoragePoolPtr pool) { DEBUG("release pool %p %s", pool, pool->name); /* TODO search by UUID first as they are better differenciators */ - if (virHashRemoveEntry(conn->storagePools, pool->name, NULL) < 0) + if (virHashRemoveEntry(conn->storagePools, pool->name, NULL) < 0) { + virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("pool missing from connection hash table")); + conn = NULL; + } pool->magic = -1; VIR_FREE(pool->name); VIR_FREE(pool); - DEBUG("unref connection %p %d", conn, conn->refs); - conn->refs--; - if (conn->refs == 0) { - virReleaseConnect(conn); - /* Already unlocked mutex */ - return; + if (conn) { + DEBUG("unref connection %p %d", conn, conn->refs); + conn->refs--; + if (conn->refs == 0) { + virReleaseConnect(conn); + /* Already unlocked mutex */ + return; + } + virMutexUnlock(&conn->lock); } - - virMutexUnlock(&conn->lock); } @@ -845,16 +863,19 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const c ret = (virStorageVolPtr) virHashLookup(conn->storageVols, key); if (ret == NULL) { if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } ret->pool = strdup(pool); if (ret->pool == NULL) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } ret->name = strdup(name); if (ret->name == NULL) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } @@ -864,6 +885,7 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const c ret->conn = conn; if (virHashAddEntry(conn->storageVols, key, ret) < 0) { + virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("failed to add storage vol to connection hash table")); goto error; @@ -875,7 +897,6 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const c return(ret); error: - virMutexUnlock(&conn->lock); if (ret != NULL) { VIR_FREE(ret->name); VIR_FREE(ret->pool); @@ -903,24 +924,28 @@ virReleaseStorageVol(virStorageVolPtr vol) { DEBUG("release vol %p %s", vol, vol->name); /* TODO search by UUID first as they are better differenciators */ - if (virHashRemoveEntry(conn->storageVols, vol->key, NULL) < 0) + if (virHashRemoveEntry(conn->storageVols, vol->key, NULL) < 0) { + virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("vol missing from connection hash table")); + conn = NULL; + } vol->magic = -1; VIR_FREE(vol->name); VIR_FREE(vol->pool); VIR_FREE(vol); - DEBUG("unref connection %p %d", conn, conn->refs); - conn->refs--; - if (conn->refs == 0) { - virReleaseConnect(conn); - /* Already unlocked mutex */ - return; + if (conn) { + DEBUG("unref connection %p %d", conn, conn->refs); + conn->refs--; + if (conn->refs == 0) { + virReleaseConnect(conn); + /* Already unlocked mutex */ + return; + } + virMutexUnlock(&conn->lock); } - - virMutexUnlock(&conn->lock); } @@ -981,7 +1006,8 @@ virGetNodeDevice(virConnectPtr conn, const char *name) ret = (virNodeDevicePtr) virHashLookup(conn->nodeDevices, name); if (ret == NULL) { - if (VIR_ALLOC(ret) < 0) { + if (VIR_ALLOC(ret) < 0) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } @@ -989,11 +1015,13 @@ virGetNodeDevice(virConnectPtr conn, const char *name) ret->conn = conn; ret->name = strdup(name); if (ret->name == NULL) { + virMutexUnlock(&conn->lock); virReportOOMError(conn); goto error; } if (virHashAddEntry(conn->nodeDevices, name, ret) < 0) { + virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("failed to add node dev to conn hash table")); goto error; @@ -1005,7 +1033,6 @@ virGetNodeDevice(virConnectPtr conn, const char *name) return(ret); error: - virMutexUnlock(&conn->lock); if (ret != NULL) { VIR_FREE(ret->name); VIR_FREE(ret); @@ -1031,24 +1058,28 @@ virReleaseNodeDevice(virNodeDevicePtr dev) { virConnectPtr conn = dev->conn; DEBUG("release dev %p %s", dev, dev->name); - if (virHashRemoveEntry(conn->nodeDevices, dev->name, NULL) < 0) + if (virHashRemoveEntry(conn->nodeDevices, dev->name, NULL) < 0) { + virMutexUnlock(&conn->lock); virLibConnError(conn, VIR_ERR_INTERNAL_ERROR, _("dev missing from connection hash table")); + conn = NULL; + } dev->magic = -1; VIR_FREE(dev->name); VIR_FREE(dev->parent); VIR_FREE(dev); - DEBUG("unref connection %p %d", conn, conn->refs); - conn->refs--; - if (conn->refs == 0) { - virReleaseConnect(conn); - /* Already unlocked mutex */ - return; + if (conn) { + DEBUG("unref connection %p %d", conn, conn->refs); + conn->refs--; + if (conn->refs == 0) { + virReleaseConnect(conn); + /* Already unlocked mutex */ + return; + } + virMutexUnlock(&conn->lock); } - - virMutexUnlock(&conn->lock); } -- 1.6.0.6

3 2

[libvirt] [PATCH] Rename remaining occurrences of 'interface' to avoid MINGW32 build problem
by Laine Stump 23 Jul '09

23 Jul '09

--- qemud/remote.c | 2 +- src/interface_conf.c | 34 +++++++++++++++++----------------- src/interface_conf.h | 4 ++-- src/veth.c | 6 +++--- src/veth.h | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qemud/remote.c b/qemud/remote.c index 651e9fb..d32d513 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -61,7 +61,7 @@ static virDomainPtr get_nonnull_domain (virConnectPtr conn, remote_nonnull_domain domain); static virNetworkPtr get_nonnull_network (virConnectPtr conn, remote_nonnull_network network); -static virInterfacePtr get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface interface); +static virInterfacePtr get_nonnull_interface (virConnectPtr conn, remote_nonnull_interface iface); static virStoragePoolPtr get_nonnull_storage_pool (virConnectPtr conn, remote_nonnull_storage_pool pool); static virStorageVolPtr get_nonnull_storage_vol (virConnectPtr conn, remote_nonnull_storage_vol vol); static void make_nonnull_domain (remote_nonnull_domain *dom_dst, virDomainPtr dom_src); diff --git a/src/interface_conf.c b/src/interface_conf.c index 1cc9f36..c2e8d07 100644 --- a/src/interface_conf.c +++ b/src/interface_conf.c @@ -1207,51 +1207,51 @@ virInterfaceObjPtr virInterfaceAssignDef(virConnectPtr conn, virInterfaceObjListPtr interfaces, const virInterfaceDefPtr def) { - virInterfaceObjPtr interface; + virInterfaceObjPtr iface; - if ((interface = virInterfaceFindByName(interfaces, def->name))) { - if (interface->def) - virInterfaceDefFree(interface->def); - interface->def = def; + if ((iface = virInterfaceFindByName(interfaces, def->name))) { + if (iface->def) + virInterfaceDefFree(iface->def); + iface->def = def; - return interface; + return iface; } - if (VIR_ALLOC(interface) < 0) { + if (VIR_ALLOC(iface) < 0) { virReportOOMError(conn); return NULL; } - if (virMutexInit(&interface->lock) < 0) { + if (virMutexInit(&iface->lock) < 0) { virInterfaceReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize mutex")); - VIR_FREE(interface); + VIR_FREE(iface); return NULL; } - virInterfaceObjLock(interface); - interface->def = def; + virInterfaceObjLock(iface); + iface->def = def; if (VIR_REALLOC_N(interfaces->objs, interfaces->count + 1) < 0) { virReportOOMError(conn); - VIR_FREE(interface); + VIR_FREE(iface); return NULL; } - interfaces->objs[interfaces->count] = interface; + interfaces->objs[interfaces->count] = iface; interfaces->count++; - return interface; + return iface; } void virInterfaceRemove(virInterfaceObjListPtr interfaces, - const virInterfaceObjPtr interface) + const virInterfaceObjPtr iface) { unsigned int i; - virInterfaceObjUnlock(interface); + virInterfaceObjUnlock(iface); for (i = 0 ; i < interfaces->count ; i++) { virInterfaceObjLock(interfaces->objs[i]); - if (interfaces->objs[i] == interface) { + if (interfaces->objs[i] == iface) { virInterfaceObjUnlock(interfaces->objs[i]); virInterfaceObjFree(interfaces->objs[i]); diff --git a/src/interface_conf.h b/src/interface_conf.h index aea1208..bb9dce4 100644 --- a/src/interface_conf.h +++ b/src/interface_conf.h @@ -186,14 +186,14 @@ virInterfaceObjPtr virInterfaceFindByName(const virInterfaceObjListPtr void virInterfaceDefFree(virInterfaceDefPtr def); -void virInterfaceObjFree(virInterfaceObjPtr interface); +void virInterfaceObjFree(virInterfaceObjPtr iface); void virInterfaceObjListFree(virInterfaceObjListPtr vms); virInterfaceObjPtr virInterfaceAssignDef(virConnectPtr conn, virInterfaceObjListPtr interfaces, const virInterfaceDefPtr def); void virInterfaceRemove(virInterfaceObjListPtr interfaces, - const virInterfaceObjPtr interface); + const virInterfaceObjPtr iface); virInterfaceDefPtr virInterfaceDefParseString(virConnectPtr conn, const char *xmlStr); diff --git a/src/veth.c b/src/veth.c index 04e68b2..71d7de6 100644 --- a/src/veth.c +++ b/src/veth.c @@ -191,16 +191,16 @@ error_out: * * Returns 0 on success or -1 in case of error */ -int moveInterfaceToNetNs(const char* interface, int pidInNs) +int moveInterfaceToNetNs(const char* iface, int pidInNs) { int rc = -1; char *pid = NULL; const char *argv[] = { - "ip", "link", "set", interface, "netns", NULL, NULL + "ip", "link", "set", iface, "netns", NULL, NULL }; int cmdResult; - if (NULL == interface) { + if (NULL == iface) { goto error_out; } diff --git a/src/veth.h b/src/veth.h index 43181cd..429eb3d 100644 --- a/src/veth.h +++ b/src/veth.h @@ -19,6 +19,6 @@ int vethCreate(char* veth1, int veth1MaxLen, char* veth2, int veth2MaxLen); int vethDelete(const char* veth); int vethInterfaceUpOrDown(const char* veth, int upOrDown); -int moveInterfaceToNetNs(const char *interface, int pidInNs); +int moveInterfaceToNetNs(const char *iface, int pidInNs); #endif /* VETH_H */ -- 1.6.0.6

3 2

[libvirt] managing libvirt users in a one-server context
by Juan Miscaro 23 Jul '09

23 Jul '09

I have a single KVM server on which I want to allow co-workers the ability to create vm's. Here are my criteria in order of importance: 1. I do not want to have to grant all users root privileges. 2. I would like the vm's to use the host's bridge (br0) by default. 3. I do not want one user to be able to start, stop, or (re)define the vm's created by another user by default. 4. I would like a user to be able grant access to another user. Mostly for viewing. Can I do all this with hardcoded usernames and passwords? If not, what is my best option? -- /jm

2 1

[libvirt] Bugfix for failing to reconnect to vbox:///session
by Pritesh Kothari 23 Jul '09

23 Jul '09

Hi All, While reconnecting to vbox:///session, since the VBoxCGlueInit() is not intialized, the g_pfnGetFunctions is NULL and thus reconnection fails with SEGV. Fixed this in the patch below. Regards, Pritesh

3 4

[libvirt] [PATCH 0/1] RFC Fix problems with TLS connections & threading
by Daniel P. Berrange 23 Jul '09

23 Jul '09

Even though we are not using gcrypt directly in any libvirt code, it turns out that we are responsible for initializing its thread support, since its used by gnutls. This really sucks in terms of library API encapsulation. It is also a little annoying if libvirt is used within an app that already uses gnutls/gcrypt, because there is no checking in gcrypt to see if threading ops are already set, so our call would override any pre-existing initialization, and an apps own call would override us. The only other option I see is to punt on the whole problem and declare apps are responsible for initializing gcrypt, but then this sucks too because it means apps have to presume we're built with gnutls, and not nss - not that we support nss currently. This bug only really impacts the libvirt client if using multiple virConnectPtr objects from separate threads with a TLS based URI. The server isn't impacted because all TLS I/O is done from the single I/O thread, and not any of the RPC workers. Daniel P. Berrange (1): Initialize gcrypt threading src/remote_internal.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-)

1 1

[libvirt] [PATCH] Support physical memory in virDomainMemoryPeek()
by Nguyen Anh Quynh 23 Jul '09

23 Jul '09

Hi, This patch provides support for physical memory in virDomainMemoryPeek(). Please consider applying. Signed-off-by: Nguyen Anh Quynh <aquynh(a)gmail.com> # diffstat pmemsave3.diff docs/libvirt-api.xml | 2 +- include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 14 +++++--------- src/qemu_driver.c | 17 ++++++++--------- 4 files changed, 15 insertions(+), 19 deletions(-)

3 8

[libvirt] [PATCH 00/14] Add support for qemu NIC hotplug
by Mark McLoughlin 22 Jul '09

22 Jul '09

Hey, Here's a series of patches to (mostly) support NIC hotplug with qemu 0.10.x or later. qemu-0.10.0 introduced the host_net_add monitor command without which we cannot do NIC hotplug, so we do not try and support hotplug with older versions of KVM. With qemu-0.11.0 we will be able to pass a tap file descriptor over the monitor, but until then we cannot support 'bridge' and 'network' type interfaces. A forthcoming patch series will rectify that. Cheers, Mark.

3 60

[libvirt] fix "make distcheck" failures
by Jim Meyering 22 Jul '09

22 Jul '09

Running "make check" from a tarball would show two test failures, since some test-related files were not being distributed. [that is one of the things that "make distcheck" tests for] With these two fixes, "make distcheck" passes once again: >From 553cecaf27e86755e40bab346d4014fb0291e5cd Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 22 Jul 2009 05:07:07 -0400 Subject: [PATCH 1/2] avoid a make distcheck failure: distribute tests/interfaceschemadata/ * tests/Makefile.am (EXTRA_DIST): Add interfaceschemadata. --- tests/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index efd7c6e..74e98d1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -53,6 +53,7 @@ EXTRA_DIST = \ networkschematest \ domainschematest \ domainschemadata \ + interfaceschemadata \ storagepoolschematest \ storagepoolschemadata \ storagevolschematest \ -- 1.6.2.5 >From 76f208cc5235023c594e84783af7a33383c8f649 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 22 Jul 2009 05:10:14 -0400 Subject: [PATCH 2/2] avoid a make distcheck failure: distribute docs/schemas/interface.rng * docs/schemas/Makefile.am (schema_DATA): Add interface.rng. --- docs/schemas/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/schemas/Makefile.am b/docs/schemas/Makefile.am index c4ef0b1..ef41a63 100644 --- a/docs/schemas/Makefile.am +++ b/docs/schemas/Makefile.am @@ -3,6 +3,7 @@ schemadir = $(pkgdatadir)/schemas schema_DATA = \ domain.rng \ + interface.rng \ network.rng \ storagepool.rng \ storagevol.rng \ -- 1.6.2.5

2 1

[libvirt] [PATCH] libvirt-glib: import gtk instead of pygtk
by Guido Günther 22 Jul '09

22 Jul '09

Hi, the python example imports pygtk but uses gtk.main() so it fails to work. Attached patch fixes this. Cheers, -- Guido

1 0

[libvirt] c&p error in api doc
by Thomas Treutner 22 Jul '09

22 Jul '09

I think there's a c&p error: http://libvirt.org/html/libvirt-libvirt.html#virStoragePoolUndefine "Returns: a virStoragePoolPtr object, or NULL if creation failed" I assume it is "0 on success, -1 on failure" as the return is of type int. kr,t

3 4

[libvirt] Problem with libvirt and pci passthrough
by Mirko Raasch 22 Jul '09

22 Jul '09

Hi, i´m still having problem with libvirt and pci passthrough, if i use more then one pci card in the guest. If i start qemu 0.10.5 manualy, i can use all of the pci devices in the guest, here is the log: http://nopaste.info/610fa81fb5.html If i use libvirt to start the guest and passthrough three pci device, none of the device is usable in the guest: http://nopaste.info/ccfbfcf9a0.html Is there any limitation in libvirt? Greetings Mirko

2 6

[libvirt] [PATCH] Make tcp_chr_read() use recvmsg()
by Mark McLoughlin 22 Jul '09

22 Jul '09

Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- qemu-char.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 287e0cd..e0d7220 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1911,15 +1911,25 @@ static void tcp_chr_read(void *opaque) { CharDriverState *chr = opaque; TCPCharDriver *s = chr->opaque; + struct msghdr msg = { 0, }; + struct iovec iov[1]; uint8_t buf[1024]; int len, size; if (!s->connected || s->max_size <= 0) return; + len = sizeof(buf); if (len > s->max_size) len = s->max_size; - size = recv(s->fd, (void *)buf, len, 0); + + iov[0].iov_base = buf; + iov[0].iov_len = len; + + msg.msg_iov = iov; + msg.msg_iovlen = 1; + + size = recvmsg(s->fd, &msg, 0); if (size == 0) { /* connection closed */ s->connected = 0; -- 1.6.2.5

1 1

[libvirt] [PATCH] Add support for fd=name to tap and socket networking
by Mark McLoughlin 22 Jul '09

22 Jul '09

This allows a program to initialize a host networking device using a file descriptor passed over a unix monitor socket. The program must first pass the file descriptor using SCM_RIGHTS ancillary data with the getfd monitor command. It then may do "host_net_add tap fd=name" to use the named file descriptor. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- net.c | 42 +++++++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 7 deletions(-) diff --git a/net.c b/net.c index 90cf912..1838692 100644 --- a/net.c +++ b/net.c @@ -2410,6 +2410,23 @@ void qemu_check_nic_model_list(NICInfo *nd, const char * const *models, exit(exit_status); } +static int net_handle_fd_param(Monitor *mon, const char *param) +{ + if (!qemu_isdigit(param[0])) { + int fd; + + fd = monitor_get_fd(mon, param); + if (fd == -1) { + config_error(mon, "No file descriptor named %s found", param); + return -1; + } + + return fd; + } else { + return strtol(param, NULL, 0); + } +} + int net_client_init(Monitor *mon, const char *device, const char *p) { char buf[1024]; @@ -2650,14 +2667,20 @@ int net_client_init(Monitor *mon, const char *device, const char *p) static const char * const fd_params[] = { "vlan", "name", "fd", "sndbuf", NULL }; + ret = -1; if (check_params(chkbuf, sizeof(chkbuf), fd_params, p) < 0) { config_error(mon, "invalid parameter '%s' in '%s'\n", chkbuf, p); - ret = -1; goto out; } - fd = strtol(buf, NULL, 0); + fd = net_handle_fd_param(mon, buf); + if (fd == -1) { + goto out; + } fcntl(fd, F_SETFL, O_NONBLOCK); s = net_tap_fd_init(vlan, device, name, fd); + if (!s) { + close(fd); + } } else { static const char * const tap_params[] = { "vlan", "name", "ifname", "script", "downscript", "sndbuf", NULL @@ -2697,15 +2720,20 @@ int net_client_init(Monitor *mon, const char *device, const char *p) "vlan", "name", "fd", NULL }; int fd; + ret = -1; if (check_params(chkbuf, sizeof(chkbuf), fd_params, p) < 0) { config_error(mon, "invalid parameter '%s' in '%s'\n", chkbuf, p); - ret = -1; goto out; } - fd = strtol(buf, NULL, 0); - ret = -1; - if (net_socket_fd_init(vlan, device, name, fd, 1)) - ret = 0; + fd = net_handle_fd_param(mon, buf); + if (fd == -1) { + goto out; + } + if (!net_socket_fd_init(vlan, device, name, fd, 1)) { + close(fd); + goto out; + } + ret = 0; } else if (get_param_value(buf, sizeof(buf), "listen", p) > 0) { static const char * const listen_params[] = { "vlan", "name", "listen", NULL -- 1.6.2.5

1 0

[libvirt] [PATCH] Add monitor_get_fd() command for fetching named fds
by Mark McLoughlin 22 Jul '09

22 Jul '09

Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- monitor.c | 24 ++++++++++++++++++++++++ monitor.h | 2 ++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 817e4b7..6ad2e14 100644 --- a/monitor.c +++ b/monitor.c @@ -1774,6 +1774,30 @@ static void do_closefd(Monitor *mon, const char *fdname) fdname); } +int monitor_get_fd(Monitor *mon, const char *fdname) +{ + mon_fd_t *monfd; + + LIST_FOREACH(monfd, &mon->fds, next) { + int fd; + + if (strcmp(monfd->name, fdname) != 0) { + continue; + } + + fd = monfd->fd; + + /* caller takes ownership of fd */ + LIST_REMOVE(monfd, next); + qemu_free(monfd->name); + qemu_free(monfd); + + return fd; + } + + return -1; +} + static const mon_cmd_t mon_cmds[] = { #include "qemu-monitor.h" { NULL, NULL, }, diff --git a/monitor.h b/monitor.h index 13e8cc7..f6a43c0 100644 --- a/monitor.h +++ b/monitor.h @@ -20,6 +20,8 @@ void monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs, BlockDriverCompletionFunc *completion_cb, void *opaque); +int monitor_get_fd(Monitor *mon, const char *fdname); + void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap); void monitor_printf(Monitor *mon, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3))); -- 1.6.2.5

1 0

[libvirt] [PATCH] Add getfd and closefd monitor commands
by Mark McLoughlin 22 Jul '09

22 Jul '09

Add monitor commands to support passing file descriptors via SCM_RIGHTS. getfd assigns the passed file descriptor a name for use with other monitor commands. closefd allows passed file descriptors to be closed. If a monitor command actually uses a named file descriptor, closefd will not be required. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- monitor.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-monitor.hx | 18 ++++++++++++++ 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index e38c86e..817e4b7 100644 --- a/monitor.c +++ b/monitor.c @@ -70,6 +70,14 @@ typedef struct mon_cmd_t { const char *help; } mon_cmd_t; +/* file descriptors passed via SCM_RIGHTS */ +typedef struct mon_fd_t mon_fd_t; +struct mon_fd_t { + char *name; + int fd; + LIST_ENTRY(mon_fd_t) next; +}; + struct Monitor { CharDriverState *chr; int flags; @@ -80,6 +88,7 @@ struct Monitor { CPUState *mon_cpu; BlockDriverCompletionFunc *password_completion_cb; void *password_opaque; + LIST_HEAD(,mon_fd_t) fds; LIST_ENTRY(Monitor) entry; }; @@ -1705,6 +1714,66 @@ static void do_inject_mce(Monitor *mon, } #endif +static void do_getfd(Monitor *mon, const char *fdname) +{ + mon_fd_t *monfd; + int fd; + + fd = qemu_chr_get_msgfd(mon->chr); + if (fd == -1) { + monitor_printf(mon, "getfd: no file descriptor supplied via SCM_RIGHTS\n"); + return; + } + + if (qemu_isdigit(fdname[0])) { + monitor_printf(mon, "getfd: monitor names may not begin with a number\n"); + return; + } + + fd = dup(fd); + if (fd == -1) { + monitor_printf(mon, "Failed to dup() file descriptor: %s\n", + strerror(errno)); + return; + } + + LIST_FOREACH(monfd, &mon->fds, next) { + if (strcmp(monfd->name, fdname) != 0) { + continue; + } + + close(monfd->fd); + monfd->fd = fd; + return; + } + + monfd = qemu_mallocz(sizeof(mon_fd_t)); + monfd->name = qemu_strdup(fdname); + monfd->fd = fd; + + LIST_INSERT_HEAD(&mon->fds, monfd, next); +} + +static void do_closefd(Monitor *mon, const char *fdname) +{ + mon_fd_t *monfd; + + LIST_FOREACH(monfd, &mon->fds, next) { + if (strcmp(monfd->name, fdname) != 0) { + continue; + } + + LIST_REMOVE(monfd, next); + close(monfd->fd); + qemu_free(monfd->name); + qemu_free(monfd); + return; + } + + monitor_printf(mon, "Failed to find file descriptor named %s\n", + fdname); +} + static const mon_cmd_t mon_cmds[] = { #include "qemu-monitor.h" { NULL, NULL, }, diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 70e2475..11bdb2c 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -628,6 +628,24 @@ STEXI Inject an MCE on the given CPU (x86 only). ETEXI + { "getfd", "s", do_getfd, "getfd name", + "receive a file descriptor via SCM rights and assign it a name" }, +STEXI +@item getfd @var{fdname} +If a file descriptor is passed alongside this command using the SCM_RIGHTS +mechanism on unix sockets, it is stored using the name @var{fdname} for +later use by other monitor commands. +ETEXI + + { "closefd", "s", do_closefd, "closefd name", + "close a file descriptor previously passed via SCM rights" }, +STEXI +@item closefd @var{fdname} +Close the file descriptor previously assigned to @var{fdname} using the +@code{getfd} command. This is only needed if the file descriptor was never +used by another monitor command. +ETEXI + STEXI @end table ETEXI -- 1.6.2.5

1 0

[libvirt] [PATCH] Add SCM_RIGHTS support to unix socket character devices
by Mark McLoughlin 22 Jul '09

22 Jul '09

If a file descriptor is passed via a message with SCM_RIGHTS ancillary data on a unix socket, store the file descriptor for use in the chr_read() handler. Close the file descriptor if it was not used. The qemu_chr_get_msgfd() API provides access to the passed descriptor. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> --- qemu-char.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-char.h | 2 ++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index e0d7220..f06a614 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -168,6 +168,11 @@ void qemu_chr_read(CharDriverState *s, uint8_t *buf, int len) s->chr_read(s->handler_opaque, buf, len); } +int qemu_chr_get_msgfd(CharDriverState *s) +{ + return s->get_msgfd ? s->get_msgfd(s) : -1; +} + void qemu_chr_accept_input(CharDriverState *s) { if (s->chr_accept_input) @@ -1832,6 +1837,7 @@ typedef struct { int do_telnetopt; int do_nodelay; int is_unix; + int msgfd; } TCPCharDriver; static void tcp_chr_accept(void *opaque); @@ -1907,12 +1913,46 @@ static void tcp_chr_process_IAC_bytes(CharDriverState *chr, *size = j; } +static int tcp_get_msgfd(CharDriverState *chr) +{ + TCPCharDriver *s = chr->opaque; + + return s->msgfd; +} + +static void unix_process_msgfd(CharDriverState *chr, struct msghdr *msg) +{ + TCPCharDriver *s = chr->opaque; + struct cmsghdr *cmsg; + + for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) { + int fd; + + if (cmsg->cmsg_len != CMSG_LEN(sizeof(int)) || + cmsg->cmsg_level != SOL_SOCKET || + cmsg->cmsg_type != SCM_RIGHTS) + continue; + + fd = *((int *)CMSG_DATA(cmsg)); + if (fd < 0) + continue; + + if (s->msgfd != -1) + close(s->msgfd); + s->msgfd = fd; + } +} + static void tcp_chr_read(void *opaque) { CharDriverState *chr = opaque; TCPCharDriver *s = chr->opaque; struct msghdr msg = { 0, }; struct iovec iov[1]; + union { + struct cmsghdr cmsg; + char control[CMSG_SPACE(sizeof(int))]; + } msg_control; uint8_t buf[1024]; int len, size; @@ -1928,6 +1968,8 @@ static void tcp_chr_read(void *opaque) msg.msg_iov = iov; msg.msg_iovlen = 1; + msg.msg_control = &msg_control; + msg.msg_controllen = sizeof(msg_control); size = recvmsg(s->fd, &msg, 0); if (size == 0) { @@ -1940,10 +1982,16 @@ static void tcp_chr_read(void *opaque) closesocket(s->fd); s->fd = -1; } else if (size > 0) { + if (s->is_unix) + unix_process_msgfd(chr, &msg); if (s->do_telnetopt) tcp_chr_process_IAC_bytes(chr, s, buf, &size); if (size > 0) qemu_chr_read(chr, buf, size); + if (s->msgfd != -1) { + close(s->msgfd); + s->msgfd = -1; + } } } @@ -2105,12 +2153,14 @@ static CharDriverState *qemu_chr_open_tcp(const char *host_str, s->connected = 0; s->fd = -1; s->listen_fd = -1; + s->msgfd = -1; s->is_unix = is_unix; s->do_nodelay = do_nodelay && !is_unix; chr->opaque = s; chr->chr_write = tcp_chr_write; chr->chr_close = tcp_chr_close; + chr->get_msgfd = tcp_get_msgfd; if (is_listen) { s->listen_fd = fd; diff --git a/qemu-char.h b/qemu-char.h index e1aa8db..77d4eda 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -51,6 +51,7 @@ struct CharDriverState { int (*chr_write)(struct CharDriverState *s, const uint8_t *buf, int len); void (*chr_update_read_handler)(struct CharDriverState *s); int (*chr_ioctl)(struct CharDriverState *s, int cmd, void *arg); + int (*get_msgfd)(struct CharDriverState *s); IOEventHandler *chr_event; IOCanRWHandler *chr_can_read; IOReadHandler *chr_read; @@ -81,6 +82,7 @@ void qemu_chr_reset(CharDriverState *s); void qemu_chr_initial_reset(void); int qemu_chr_can_read(CharDriverState *s); void qemu_chr_read(CharDriverState *s, uint8_t *buf, int len); +int qemu_chr_get_msgfd(CharDriverState *s); void qemu_chr_accept_input(CharDriverState *s); void qemu_chr_info(Monitor *mon); -- 1.6.2.5

1 0

[libvirt] libvirt-java, deprecated methods?
by Thomas Treutner 22 Jul '09

22 Jul '09

Hi, I'm playing around with libvirt-0.6.5 and libvirt-java-0.2.1 these days. It looks very interesting, but I think I may have found a bug: .... conn = new Connect("xen://node02", false); .... conn.setDom0Memory(512000) gives: exception caught:org.libvirt.LibvirtException: invalid domain pointer in virDomainSetMemory level:VIR_ERR_ERROR code:VIR_ERR_INVALID_DOMAIN domain:VIR_FROM_DOM hasConn:false hasDom:false hasNet:false message:invalid domain pointer in virDomainSetMemory str1:invalid domain pointer in %s str2:virDomainSetMemory str3:null int1:0 int2:0 Furthermore, f.e. conn.GetHypervisorVersion(conn.getType()) gives: exception caught:org.libvirt.LibvirtException: this function is not supported by the hypervisor: Xen level:VIR_ERR_ERROR code:VIR_ERR_NO_SUPPORT domain:VIR_FROM_NONE hasConn:false hasDom:false hasNet:false message:this function is not supported by the hypervisor: Xen str1:this function is not supported by the hypervisor: %s str2:Xen str3:null int1:0 int2:0 But Domain dom0=conn.domainLookupByID(0); //domainLookupByName("Domain-0"); too DomainInfo dom0info = dom0.getInfo(); .... dom0.setMemory(256000); .... works without glitches and does the job (btw, I can't see any effect of setMaxMemory() on Xen?) Is it possible that there are some inconsistences between libvirt-java and libvirt? Since libvirt-java wasn't updated approx. 1y, I assume that. Thanks for feedback, kr, thomas

3 5

[libvirt] [PATCH] Extra filesystem options during backend filesystem mount.
by Harshavardhana 22 Jul '09

22 Jul '09

New option index added to support -o options for various netfs. Currently added an option for glusterfs. --- src/storage_backend_fs.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index c3d66b5..606fb47 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -604,6 +604,7 @@ static int virStorageBackendFileSystemMount(virConnectPtr conn, virStoragePoolObjPtr pool) { char *src; + char *options; const char **mntargv; /* 'mount -t auto' doesn't seem to auto determine nfs (or cifs), @@ -611,6 +612,10 @@ virStorageBackendFileSystemMount(virConnectPtr conn, * accommodate this */ int netauto = (pool->def->type == VIR_STORAGE_POOL_NETFS && pool->def->source.format == VIR_STORAGE_POOL_NETFS_AUTO); + int glusterfs = (pool->def->type == VIR_STORAGE_POOL_NETFS && + pool->def->source.format == VIR_STORAGE_POOL_NETFS_GLUSTERFS); + + int option_index; int source_index; const char *netfs_auto_argv[] = { @@ -632,9 +637,26 @@ virStorageBackendFileSystemMount(virConnectPtr conn, NULL, }; + const char *glusterfs_argv[] = { + MOUNT, + "-t", + pool->def->type == VIR_STORAGE_POOL_FS ? + virStoragePoolFormatFileSystemTypeToString(pool->def->source.format) : + virStoragePoolFormatFileSystemNetTypeToString(pool->def->source.format), + NULL, + "-o", + NULL, + pool->def->target.path, + NULL, + }; + if (netauto) { mntargv = netfs_auto_argv; source_index = 1; + } else if (glusterfs) { + mntargv = glusterfs_argv; + source_index = 3; + option_index = 5; } else { mntargv = fs_argv; source_index = 3; @@ -670,6 +692,12 @@ virStorageBackendFileSystemMount(virConnectPtr conn, } if (pool->def->type == VIR_STORAGE_POOL_NETFS) { + if (pool->def->source.format = VIR_STORAGE_POOL_NETFS_GLUSTERFS) { + if (virAsprintf(&options, "direct-io-mode=1") == -1) { + virReportOOMError(conn); + return -1; + } + } if (virAsprintf(&src, "%s:%s", pool->def->source.host.name, pool->def->source.dir) == -1) { @@ -685,6 +713,10 @@ virStorageBackendFileSystemMount(virConnectPtr conn, } mntargv[source_index] = src; + if (glusterfs) { + mntargv[option_index] = options; + } + if (virRun(conn, mntargv, NULL) < 0) { VIR_FREE(src); return -1; -- 1.6.0.6

3 6

[libvirt] Workaround to start xen inside a buggy kvm
by Thomas Fricke 22 Jul '09

22 Jul '09

Buggy kvm crashes with kernel panic if xen started inside a kvm machine. kvm needs the -no-kvm-pit, this argument is not available with libvirt. I have tested the following workaround on ubuntu 9.04 Rename kvm cd /usr/bin mv kvm kvm.orig Use the following script instead the original kvm #!/bin/sh exec kvm.orig -no-kvm-pit $* Do not forget chmod +x kvm Have fun, Thomas

1 0

[libvirt] [PATCH 0/6] virInterface bug fixes, test driver, and netcf backend driver
by Laine Stump 22 Jul '09

22 Jul '09

This series of patches first corrects a couple of bugs/deficiencies in existing virInterface code, then adds test and netcf-based backend interface drivers.

3 25

[libvirt] [patch] initialize a local variable in qemudOpenMonitorUnix()
by Jun Koi 21 Jul '09

21 Jul '09

This patch initializes a local variable in qemudOpenMonitorUnix(), thus also eliminates a compilation warning. diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 00dc6e5..d2db1a2 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -874,7 +874,7 @@ qemudOpenMonitorUnix(virConnectPtr conn, struct sockaddr_un addr; int monfd; int timeout = 3; /* In seconds */ - int ret, i; + int ret, i = 0; if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(conn, errno,

2 1

[libvirt] [PATCH] rpm spec cleanup and split off client only requirements
by Daniel Veillard 21 Jul '09

21 Jul '09

This early patch changes the spec file to: - remove the old Obsoletes: livir and such, that was 3 years ago - make sure the inter packages require %{version}-%{release} and not just %{version} - compresses the ChangeLog which is getting close to a megabyte - split out a separate libvirt-client binary rpm including only what is needed to access the libvirt service from a client viewpioint. The main package requires the client anyway So I moved in the client: - the shared library, I guess it's uncontroversial - the virsh/virt-xml-validate binaries, I guess it it doesn't block i386/x86_64 to be parallel installable that's fine - the man pages, obvious based on previous - the proxy when built, more controversial, it assumes that there is a service running locally so could be left on the main package - sasl and policykit data, more controversial, I guess it's better to associate them with the client - the schemas to allow checking on the client Some of this is still open, including the name of the subpackage which I initially expected to be libvirt-libs but in retrospect maybe -client will be more in line with the content, Comments welcome :-) 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 2

[libvirt] [PATCH 0/7] Support cgroups in QEMU driver
by Daniel P. Berrange 20 Jul '09

20 Jul '09

This series of patches introduces cgroups support to the QEMU driver. At this time it uses the 'devices' controller to whitelist block devices for QEMU guests to prevent unauthorized access. It uses the 'cpu_shares' controller to allow schedular tunables on a per guest basis. In the future we should use the 'memory' controller to enforce the limit set in the balloon driver ie if the guest does not honour the balloon request, then force the guest into swap, avoiding host overcommit. There is also some refactoring of the cgroups code to remove the assumption that libvirtd is starting in the root cgroup, remove the requirement that all controllers be active, and allow for use in non-privileged drivers. Daniel P. Berrange (7): Use enums for cgroup controller types / labels Use virFileReadAll/virFileWriteStr for key cgroup read/write helpers Make cgroups a little more efficient Place every QEMU guest in a private cgroup Implement schedular tunables API using cgroups Use cgroups for block device whitelisting in QEMU guests Refactor cgroups to allow a group per driver to be managed directly src/cgroup.c | 861 ++++++++++++++++++++++++++-------------------- src/cgroup.h | 28 +- src/libvirt_private.syms | 1 + src/lxc_conf.h | 2 + src/lxc_controller.c | 19 +- src/lxc_driver.c | 25 +- src/qemu_conf.h | 2 + src/qemu_driver.c | 355 ++++++++++++++++++- src/util.c | 27 ++- src/util.h | 2 + 10 files changed, 904 insertions(+), 420 deletions(-)

2 17

[libvirt] changing files in /var/lib/libvirt/images
by Gene Czarcinski 20 Jul '09

20 Jul '09

Assume I am working with virtual disk image files in /var/lib/libvirt/images such as removing a file, defining a new file (with qemi-img create or qemu-img convert), or simply copying a file ("cp") from elsewhere such as VMware. When I do this, Guest definition or adding hardware to an existing guest under virt- manager does not "see" the file change. That is, until I terminate virt- manager and restart /etc/init.d/libvirtd. Is there some better/easier/less-disruptive means of notifying "whatever" that the list of files has changed? I noticed that /etc/init.d/libvirtd force-reload has no effect. I also notice that restarting libvirtd and/or terminating and restarting virt- manager while there are guests running really screws things up. If such a "means" does not exist, should one be created? [should this be an RFE in bugzilla?] Gene

2 2

[libvirt] Create a new VM from an existent image?
by Jun Koi 19 Jul '09

19 Jul '09

Hi, To use libvirt, I am strying to use virt-install to create a new VM from an existent (KVM) VM image. I did the following steps: 1) run libvirtd with "libvirtd -d" (I use the latest libvirt git tree) 2) Run virt-install (0.400.3) with my existent image in img/img.winxp # virt-install --import -n winxp -f img/img.xp3 --vnc --hvm --accelerate --ram 800 However, this step returns error like: "ERROR Could not find usable default libvirt connection." Actually I am not sure that is the right way to use the new --import option with virt-install. So that might be the problem? All the code are updated, and compiled from source on Ubuntu 8.04. Any help? Thanks a lot, J

2 4

[libvirt] [PATCH] qemu: Try multiple times to open unix monitor socket
by Cole Robinson 18 Jul '09

18 Jul '09

Unlike the pty monitor (which we know exists since we scrape its path from stdout), we have no way of knowing that the unix monitor socket should exist/ be initialized. As a result, some of my KVM guests randomly fail to start on F10 host. Try to open the unix socket in a 3 second timeout loop. Ignore EACCES (path does not exist if a first time run) and ECONNREFUSED (leftover socket from a previous run hasn't been removed yet). Fixes things for me. --- src/qemu_driver.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index e2b7acb..200718b 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -874,6 +874,8 @@ qemudOpenMonitorUnix(virConnectPtr conn, { struct sockaddr_un addr; int monfd; + int timeout = 3; /* In seconds */ + int ret, i; if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(conn, errno, @@ -885,10 +887,28 @@ qemudOpenMonitorUnix(virConnectPtr conn, addr.sun_family = AF_UNIX; strncpy(addr.sun_path, monitor, sizeof(addr.sun_path)); - if (connect(monfd, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + do { + ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); + + if (ret == 0) + break; + + if (errno == EACCES || errno == ECONNREFUSED) { + /* EACCES : Socket may not have shown up yet + * ECONNREFUSED : Leftover socket hasn't been removed yet */ + continue; + } + virReportSystemError(conn, errno, "%s", _("failed to connect to monitor socket")); goto error; + + } while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0)); + + if (ret != 0) { + virReportSystemError(conn, errno, "%s", + _("monitor socket did not show up.")); + goto error; } if (qemudOpenMonitorCommon(conn, driver, vm, monfd, reconnect) < 0) -- 1.6.0.6

4 5

[libvirt] adding scsi disk failed (code=9)
by Massimo Canonico 18 Jul '09

18 Jul '09

Hi, I'm newbie and sorry if this question was already post in this ML (is there any search engine for the ML archive?). I'm trying to attach a volume in my instance. The instance is running and the volume is available, but i got this error: ---- libvirt: operation failed: adding scsi disk failed (code=9) virDomainAttachDevice() failed (err=-1) XML=<disk type='block'><driver name='phy'/><source dev='/dev/etherd/e0.8'/><target dev='sdb'/></disk> doAttachVolume() failed error=1 ---- I'm not sure where I can start to debug this error. I'm using Fedora 11, x86_64, with these packages [root@minicloud eucalyptus]# rpm -qa | grep libv libvirt-devel-0.6.2-12.fc11.x86_64 libvorbis-1.2.0-7.fc11.x86_64 libvirt-0.6.2-12.fc11.x86_64 libvirt-python-0.6.2-12.fc11.x86_64 libvolume_id-141-3.fc11.x86_64 May you help me, please? Thanks in advance, M

4 5

[libvirt] [libvirt 0.6.4] Unable to set /domain/devices/serial[@port=1] as console?
by Charles Duffy 18 Jul '09

18 Jul '09

When I do a "virsh define" with the following: <serial type='file'> <source path='/path/to/serial.log'/> <target port='0'/> </serial> <serial type='pty'> <target port='1'/> </serial> <console type='pty'> <target port='1'/> </console> The result is this: <serial type='file'> <source path='/path/to/serial.log'/> <target port='0'/> </serial> <serial type='pty'> <target port='1'/> </serial> <console type='file'> <source path='/path/to/serial.log'/> <target port='0'/> </console> ...a markedly different configuration. Is this the result of a bug, or a known behavior I've failed to catch in the docs? Thanks!

2 1

[libvirt] Tentative schedule for 0.7.0
by Daniel Veillard 18 Jul '09

18 Jul '09

Basically I would like to freeze development at the end of next week and push at the end of the month. Since I plan to be away on 31, I will probably make the release on the 30th, but I think we can still apply new features until Friday next week. To try to help w.r.t. Fedora 12 schedule I will make a 0.7.0 beta release probably on the week-end of the 25 and push it in rawhide for parallel testing, 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] One line logging fix
by Dave Allan 18 Jul '09

18 Jul '09

I noticed that I was incorrectly logging a debug message as an error in a success path in the node device code. Here's the fix. >From 0c65b2d1d90bf0d469ffe6d8a20a5566b359a61e Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Fri, 17 Jul 2009 09:57:40 -0400 Subject: [PATCH 1/1] Remove spurious log message A success path in part of the node device code contained a log message with severity ERROR; this fix makes it DEBUG. --- src/node_device_hal_linux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/node_device_hal_linux.c b/src/node_device_hal_linux.c index ddb1eef..a119404 100644 --- a/src/node_device_hal_linux.c +++ b/src/node_device_hal_linux.c @@ -50,7 +50,7 @@ static int open_wwn_file(const char *prefix, /* fd will be closed by caller */ if ((*fd = open(wwn_path, O_RDONLY)) != -1) { - VIR_ERROR(_("Opened WWN path '%s' for reading"), + VIR_DEBUG(_("Opened WWN path '%s' for reading"), wwn_path); } else { VIR_ERROR(_("Failed to open WWN path '%s' for reading"), -- 1.6.0.6

2 1

[libvirt] Guest shutdown script
by Ján ONDREJ (SAL) 18 Jul '09

18 Jul '09

Hello, when host server is shutting down, it's goot to shutdown also guests, not only kill them. Host shutdown can be touched by an admin, but also can be started by an UPS daemon or similar action. Then kill of guests is not a best solution. I have my own script, which can shutdown guest automatically: http://www.salstar.sk/pub/salpack/etc/rc.d/init.d/virt-shutdown You need to start this rc script after installation, otherwise it will not do anything. Another init script with save/restore ability is here: http://marc.info/?l=kvm&m=124775655529836&w=4 I'm not using this so I don't know, if this will work well on Fedora. A good solution can also be, if libvirt init script can shutdown guests autoamtically. It starts them, when system is booting, but does not stop them. I know, that libvirt sometimes need to be restarted without touching guests, but you also can avoid this, if you shutdown guest only if one of: - current runlevel is 0 (halt) or 6 (reboot). You can get current runlevel by running: runlevel | cut -d" " -f2 - if "service libvirt shutdown" is called, which is not very systematic, but can work well Just please do not create a new package only for guest shutdowns. :-) I am not a member of this list, so please cc me. SAL

1 0

[libvirt] How to pass not xml parameters from Libvirt to Xen in xml definition
by Alexandre CABROL PERALES 18 Jul '09

18 Jul '09

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi everybody, i need to define cpuid parameter for a specific Xen Virtual Machine. This parameters doesn't exist in libvirt definition. So how can i add this "unknow" parameter in virtual machine's xml definition to be able to manage it from virt-manager? regards, - -- Alexandre CABROL PERALES - -- Ingenieur Securite des Systemes d'Information Mob. : 06.98.82.03.06 Mail : alexandre.cabrol(a)artal.fr Key fingerprint = 1E6B B8DF 5001 A6A8 E057 9D31 7B3B EAB1 4AE4 8953 - -- ARTAL Technologies Rue Pierre-Gilles de Gennes Ens."La Rue", Bat. 9, BP 38138 31681 Labege cedex Tel. : 05.61.00.39.30 Fax : 05.61.00.20.43 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkpgSWsACgkQezvqsUrkiVMqiwCgkigm/WZ5TPToQ7RzdY0R6UJz tEAAoKIcdZ2fO5PdqZdcrzuTj6Ev4yh4 =8rlJ -----END PGP SIGNATURE-----

2 2

[libvirt] PATCH: Fix non-raw storage volume cloning
by Daniel P. Berrange 17 Jul '09

17 Jul '09

The recent storage patches broke cloning of non-raw volumes, due to a small typo. THis was identified by the libvirt TCK storage tests! Daniel diff --git a/src/storage_backend.c b/src/storage_backend.c index 1664804..67815d7 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -567,7 +567,7 @@ virStorageBackendGetBuildVolFromFunction(virConnectPtr conn, (inputvol->type == VIR_STORAGE_VOL_FILE && inputvol->target.format != VIR_STORAGE_VOL_FILE_RAW)) { - if ((tool_type = virStorageBackendFindFSImageTool(NULL)) != -1) { + if ((tool_type = virStorageBackendFindFSImageTool(NULL)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("creation of non-raw file images is " "not supported without qemu-img.")); -- |: 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 :|

3 2

[libvirt] [PATCH] build: do not emit a trailing blank line into VC'd file, NEWS
by Jim Meyering 17 Jul '09

17 Jul '09

Cole Robinson noticed that the generated NEWS file would fail the "make syntax-check" tests. This adjusts the rule that generates it not to emit any of the offending trailing blank lines. At the same time, it regenerates NEWS. >From 53af8d848d78bcc5144b2c06b2109bbdc65803cf Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 16 Jul 2009 22:46:43 +0200 Subject: [PATCH] build: do not emit a trailing blank line into VC'd file, NEWS * docs/Makefile.am ($(top_builddir)/NEWS): Adjust rule to filter out any trailing blank lines when generating this file. * NEWS: Regenerate. --- NEWS | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ docs/Makefile.am | 7 ++++- 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 5733fa8..447d2b4 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,62 @@ http://libvirt.org/news.html +0.6.5: Jul 3 2009: + - New features: create storage columes on disk backend (Henrik Persson), + drop of capabilities based on libcap-ng when possible (Daniel + Berrange) + - Portability: fix build on non-Linux targets (Daniel Berrange) + - Documentation: typo and english fixes (Runa Bhattacharjee and + Garry Dolley), Docs on extending APIs (Dave Allan), cleanup + of debug and logging documentation (Amy Griffis), add + HACKING doc to the website (Daniel Berrange), + documentation for OpenNebula driver (Abel Miguez Rodriguez) + - Bug fixes: forbid autostart on transcient networks, + xen device removal crash (Daniel Berrange), re-detection of + transient VMs after libvirtd restart(Daniel Berrange), + bug in virFindFileInPath (Daniel Berrange), handle new + availheap sysctl in Xen (Daniel Berrange), allow USB hostdev + product 0 (Cole Robinson), cleanup when creating a storage pool + fails (Henrik Persson), domain id fix on redefinition in + test driver (Cole Robinson), fix raw storage allocation (Cole + Robinson), memory reporting for inactive qemu drivers (Cole + Robinson), segfault if storage pool has no type attribute (Cole + Robinson), OpenNebula compilation issues (Javier Fontan), + dominfo command without security driver (Daniel Berrange), + domain state problems after migration or destroy (Federico + Simoncelli), leak in node device parsing (Dave Allan), + storage pool definitions reading at startup (Cole Robinson), + bogus WWN in NPIV support (David Allan), avoid a segfault with + recent Xen (Sascha), cope with libnuma failures on weird + topologies (Dan Berrange), crash in QEMU driver with bad capabilities + data (Dan Berrange), trying to re-create a pool should not destroy + it (Dave Allan), endless loop in node device XML dump (Cole Robinson), + Re-label shared and readonly images (Dan Berrange) + - Improvements: create and destroy NPIV support (David Allan), + networking in UML driver (Daniel Berrange), HAL driver restart + thread safety (Daniel Berrange), capabilities and nodeinfo + APIs for LXC (Daniel Berrange), iNUMA API for VBox (Daniel Berrange), + dynamically search and use kvm-img qemu-img or qcow-create (Doug + Goldstein), fix qemu and kvm version parsing (Mark McLoughlin), + serial number for HAL storage (Dave Allan), improve error reporting + for virConnectOpen URIs (Daniel Berrange), include OS driver name + in device XML (Daniel Berrange), fix qemu command flags fetching + (Cole Robinson), check that qemu support -drive format= (Cole + Robinson), improve emulator detection (Cole Robinson), changes + to config parser to accomodate VMX syntax (Matthias Bolte), + update network schemas and driver for missing elements (Satoru SATOH), + avoid changing file context if not needed (Tim Waugh), + skip labelling if no src path (Cole Robinson), add arm emulation + if qemu-system-arm is present (C.J. Adams-Collier) + - Cleanups: daemon check logging env variables (Daniel Berrange), + User Mode Linux start and stop cleanups (Daniel Berrange), + share the NUMA api implementations (Daniel Berrange), storage + module dependancies (Dave Allan), refactor storage XML parsing + (Cole Robinson), big cleanup of logging code (Amy Griffis), + superfluous % on format (Matthias Bolte), cleanups and updates + on OpenNebula driver (Daniel Berrange and Abel Miguez Rodriguez) + + 0.6.4: May 29 2009: - New features: new API virStorageVolCreateXMLFrom (Cole Robinson), full VBox graphic capabilities (Pritesh Kothari), Interface config diff --git a/docs/Makefile.am b/docs/Makefile.am index 4bdb827..9ac2f6d 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -127,8 +127,11 @@ libvirt-api.xml libvirt-refs.xml: apibuild.py \ -(./apibuild.py) $(top_builddir)/NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in - -@(if [ -x $(XSLTPROC) ] ; then \ - $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.in > $(top_builddir)/NEWS ; fi ); + -@(if [ -x $(XSLTPROC) ] ; then \ + $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl \ + $(top_srcdir)/docs/news.html.in \ + | perl -0777 -pe 's/\n\n+$$/\n/' \ + > $@-t && mv $@-t $@ ; fi ); clean-local: rm -f *~ *.bak *.hierarchy *.signals *-unused.txt -- 1.6.4.rc0.127.g81400

2 2

[libvirt] [PATCH 0/2] updated/working patches for netcf backend and virsh commands for virInterface*
by Laine Stump 17 Jul '09

17 Jul '09

These are updated versions of patches I previously sent: 1 - add iface-* commands to virsh to expose virInterface* functions to the cli. 2 - add the netcf backend driver. These haven't been exhaustively tested, but appear to work in simple smoke tests. Note that they all depend on the submitted-but-not-yet-committed virConnectListDefinedInterfaces() patch.

2 4

[libvirt] [PATCH 0/4] Storage disk backend fixes
by Cole Robinson 17 Jul '09

17 Jul '09

The following series fixes some issues in the disk storage backend, most wrt the recently added ability to create disk volumes. Cole Robinson (4): storage: disk: Fix parthelper '-g' option handling. storage: disk: Fix segfault creating volume without target path storage: disk: Default to 'ext2' for new volumes. storage: disk: Use capacity, not allocation, when creating volume. src/parthelper.c | 4 ++-- src/storage_backend_disk.c | 33 +++++++++++++++++++-------------- src/storage_conf.c | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-)

3 14

[libvirt] [PATCH 0/9] Storage cloning for LVM and Disk backends
by Cole Robinson 17 Jul '09

17 Jul '09

This following series implements cloning for LVM and disk backends. Most of the functionality is already here, it just needed some reorganization to be accessible for every backend. I verified the following scenarios produced a bootable image: - Clone within a disk pool - Clone within a logical pool - Clone a raw file to a disk pool - Clone a disk pool to a logical pool Cole Robinson (9): storage: Refactor FS backend 'create' function choosing. storage: Always assume we are tracking alloc progress in FS backend storage: Move most of the FS creation functions to common backend. storage: cleanup: do away with 'createFile' storage: Break out actual raw cloning to separate function. storage: Implement 'CreateBlockFrom' helper. storage: Don't try sparse detection if writing to block device. storage: Implement CreateVolFrom for logical and disk backend. storage: Fix deadlock when cloning across pools. src/storage_backend.c | 471 +++++++++++++++++++++++++++++++++++++++++ src/storage_backend.h | 15 ++ src/storage_backend_disk.c | 15 ++ src/storage_backend_fs.c | 378 ++------------------------------- src/storage_backend_logical.c | 17 ++ src/storage_driver.c | 6 +- 6 files changed, 540 insertions(+), 362 deletions(-)

3 21

[libvirt] [PATCH 0/5] Add virConnectListDefinedInterfaces/NumOfDefinedInterfaces
by Laine Stump 17 Jul '09

17 Jul '09

This patch adds everything but the backend implementation of two APIs that were requested during review of my patch to add virsh commands that expose the virInterface* API. These count and list interfaces on the host that are currently inactive (ie "down"). virConnectListInterfaces and virConnectNumOfInterfaces will list/count *only* those interfaces that are currently active. With these functions in place, I'll be able to add the "--inactive" and "--all" flags to iface-list, as suggested by danpb. Implementation of the backend of these two functions is waiting for two things: 1) supporting code in libnetcf, and 2) implementation of the rest of the backend driver functions for virInterface* (ready in the wings and waiting to go).

3 14

[libvirt] [PATCH] implement virsh dump for qemu guests
by Paolo Bonzini 17 Jul '09

17 Jul '09

This patch uses a "migrate"+"cont" combination to implement "virsh dump" for QEMU guests (BZ507551). The code is mostly based on qemudDomainSave, except that the XML prolog is not included as it is not needed to examine the dump with e.g. crash. 2009-07-08 Paolo Bonzini <bonzini(a)gnu.org> * qemu_driver.c (qemudDomainCoreDump): New. (qemuDriver): Add core dump function. --- src/qemu_driver.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 95ea882..546a691 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2844,6 +2844,89 @@ cleanup: } +static int qemudDomainCoreDump(virDomainPtr dom, + const char *path, + int flags ATTRIBUTE_UNUSED) { + struct qemud_driver *driver = dom->conn->privateData; + virDomainObjPtr vm; + char *command = NULL; + char *info = NULL; + char *safe_path = NULL; + int ret = -1; + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainIsActive(vm)) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + + /* Migrate to file */ + safe_path = qemudEscapeShellArg(path); + if (!safe_path) { + virReportOOMError(dom->conn); + goto cleanup; + } + if (virAsprintf(&command, "migrate \"exec:" + "dd of='%s' 2>/dev/null" + "\"", safe_path) == -1) { + virReportOOMError(dom->conn); + command = NULL; + goto cleanup; + } + + if (qemudMonitorCommand(vm, command, &info) < 0) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + "%s", _("migrate operation failed")); + goto cleanup; + } + + DEBUG ("%s: migrate reply: %s", vm->def->name, info); + + /* If the command isn't supported then qemu prints: + * unknown command: migrate" */ + if (strstr(info, "unknown command:")) { + qemudReportError (dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, + "%s", + _("'migrate' not supported by this qemu")); + goto cleanup; + } + + /* Migrate always stops the VM. However, since the monitor is always + attached to a pty for libvirt, it will support synchronous + operations so we get here just after the end of the migration. */ + if (vm->state == VIR_DOMAIN_RUNNING) { + if (qemudMonitorCommand(vm, "cont", &info) < 0) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + "%s", _("continue operation failed")); + goto cleanup; + } + DEBUG("Reply %s", info); + VIR_FREE(info); + } + ret = 0; + +cleanup: + VIR_FREE(safe_path); + VIR_FREE(command); + VIR_FREE(info); + if (vm) + virDomainObjUnlock(vm); + qemuDriverUnlock(driver); + return ret; +} + + static int qemudDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) { struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; @@ -5310,7 +5393,7 @@ static virDriver qemuDriver = { qemudDomainGetInfo, /* domainGetInfo */ qemudDomainSave, /* domainSave */ qemudDomainRestore, /* domainRestore */ - NULL, /* domainCoreDump */ + qemudDomainCoreDump, /* domainCoreDump */ qemudDomainSetVcpus, /* domainSetVcpus */ #if HAVE_SCHED_GETAFFINITY qemudDomainPinVcpu, /* domainPinVcpu */ -- 1.6.2.5

4 10