- Devel - libvirt List Archives

[libvirt] [PATCH] avoid another "make distcheck" failure
by Jim Meyering 09 Jan '10

09 Jan '10

"make uninstall" would fail rm: cannot remove `/home/j/w/co/libvirt/libvirt-0.7.5/_inst/share/gtk-doc/html\ /libvirtdevhelp/libvirt.devhelp': No such file or directory rm: cannot remove `/home/j/w/co/libvirt/libvirt-0.7.5/_inst/share/gtk-doc/html\ /libvirtdevhelp/index.html': No such file or directory There are two problems: first, "libvirtdevhelp" is not a valid dir name. Inserting a slash fixes that. Second, that "devhelp/" does not belong at all. It comes from each value of $$f. Using basename fixes that: With this, "make distcheck" passes once again. Pushed. >From 0418fa2e7265d6cf938f2172a0aeb9f9d7a93022 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Sat, 9 Jan 2010 09:56:20 +0100 Subject: [PATCH] avoid another "make distcheck" failure * docs/Makefile.am (uninstall-local): Separate $$f from preceding dir name with a "/" and use $$(basename $$f) rather than $$f, since some values of $$f are prefixed with devhelp/. --- docs/Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index d53f305..c19e963 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -159,4 +159,5 @@ uninstall-local: for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ - rm $(DESTDIR)$(DEVHELP_DIR)$$f ; done + rm $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \ + done -- 1.6.6.439.gaf68f

1 0

[libvirt] [PATCH] fix 7 "make check" test failures in non-srcdir build
by Jim Meyering 09 Jan '10

09 Jan '10

FYI, I've already pushed this. When I ran "make distcheck" (or just a non-srcdir "make check"), I'd get 7 failures. These were introduced by a change back in October. >From e6abf3d8f2a60249955c4d59e7b994a99faf8ace Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Sat, 9 Jan 2010 08:37:22 +0100 Subject: [PATCH] fix 7 "make check" test failures in non-srcdir build * tests/capabilityschematest: Define and use $srcdir. * tests/domainschematest: Likewise. * tests/interfaceschematest: Likewise. * tests/networkschematest: Likewise. * tests/nodedevschematest: Likewise. * tests/storagepoolschematest: Likewise. * tests/storagevolschematest: Likewise. --- tests/capabilityschematest | 3 ++- tests/domainschematest | 3 ++- tests/interfaceschematest | 3 ++- tests/networkschematest | 3 ++- tests/nodedevschematest | 3 ++- tests/storagepoolschematest | 3 ++- tests/storagevolschematest | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/capabilityschematest b/tests/capabilityschematest index 3a1acc5..482dfe3 100755 --- a/tests/capabilityschematest +++ b/tests/capabilityschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="capabilityschemadata xencapsdata" SCHEMA="capability.rng" diff --git a/tests/domainschematest b/tests/domainschematest index 28ee69a..27a93cf 100755 --- a/tests/domainschematest +++ b/tests/domainschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="domainschemadata qemuxml2argvdata sexpr2xmldata xmconfigdata xml2sexprdata" SCHEMA="domain.rng" diff --git a/tests/interfaceschematest b/tests/interfaceschematest index e9ec2a4..8e9f6ee 100755 --- a/tests/interfaceschematest +++ b/tests/interfaceschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="interfaceschemadata" SCHEMA="interface.rng" diff --git a/tests/networkschematest b/tests/networkschematest index 01b2e6f..7210055 100755 --- a/tests/networkschematest +++ b/tests/networkschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="../src/network networkxml2xmlin networkxml2xmlout" SCHEMA="network.rng" diff --git a/tests/nodedevschematest b/tests/nodedevschematest index 2f0e2b9..3f0f03f 100755 --- a/tests/nodedevschematest +++ b/tests/nodedevschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="nodedevschemadata" SCHEMA="nodedev.rng" diff --git a/tests/storagepoolschematest b/tests/storagepoolschematest index 57b2f7b..9aef382 100755 --- a/tests/storagepoolschematest +++ b/tests/storagepoolschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="storagepoolxml2xmlin storagepoolxml2xmlout" SCHEMA="storagepool.rng" diff --git a/tests/storagevolschematest b/tests/storagevolschematest index 32a8657..74b6203 100755 --- a/tests/storagevolschematest +++ b/tests/storagevolschematest @@ -1,6 +1,7 @@ #!/bin/sh -. ./schematestutils.sh +: ${srcdir=.} +. $srcdir/schematestutils.sh DIRS="storagevolxml2xmlin storagevolxml2xmlout" SCHEMA="storagevol.rng" -- 1.6.6.439.gaf68f

1 0

[libvirt] [PATCH] avoid newly-introduced test failure
by Jim Meyering 09 Jan '10

09 Jan '10

I ran "make check" and was surprised to see a failure: 10) QEMU XML-2-ARGV hugepages ... FAILED ... FAIL: qemuxml2argvtest Introduced just a couple days ago. Here's the fix: >From a4e9edbd77f428782293b9672098b6d3c80b2879 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Sat, 9 Jan 2010 09:25:04 +0100 Subject: [PATCH] avoid newly-introduced test failure * tests/qemuxml2argvdata/qemuxml2argv-hugepages.args: Update expected output to match, now that we use -mem-prealloc. --- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args index f10a40e..1e2632a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -mem-path /dev/hugepages/libvirt/qemu -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -mem-prealloc -mem-path /dev/hugepages/libvirt/qemu -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -- 1.6.6.439.gaf68f In case you can't read the above, note that all the change does is to insert "-mem-prealloc " before "-mem-path" I'm about to push this, now.

1 0

[libvirt] Some questions about the libvirt ESX driver
by Richard W.M. Jones 08 Jan '10

08 Jan '10

I'm playing with VMWare ESX 4.0 and I decided to try driving it from libvirt [git version]. Here are some random questions and issues I encountered, in no particular order. Listing domains works fine, but: (a) I have to specify ?no_verify=1 to get it to ignore the lack of valid https certificate. Is there some documentation on how to set up certificates correctly? [vSphere gives exactly the same error] (b) I have to type the root password (of the ESX server) each time. Can I avoid that? $ sudo ./tools/virsh -c 'esx://192.168.2.121/?no_verify=1' list --all Enter username for 192.168.2.121 [root]: Enter root password for 192.168.2.121: Id Name State ---------------------------------- - TestLinux shut off - TestWin shut off (c) Starting domains doesn't seem to work, and the error message is obscure: $ sudo ./tools/virsh -c 'esx://192.168.2.121/?no_verify=1' start TestLinux Enter username for 192.168.2.121 [root]: Enter root password for 192.168.2.121: error: Failed to start domain TestLinux error: internal error HTTP response code 500 for call to 'PowerOnVM_Task'. Fault: ServerFaultCode - The operation is not allowed in the current state. Is this to do with the "ask questions" API that was discussed on this list before? Specifying auto_answer=0 or auto_answer=1 didn't make any difference. (d) dumpxml XML output looks very good, and consistent with the other drivers. However it produces an odd <source file> attribute: <disk type='file' device='disk'> <driver name='lsilogic'/> <source file='[Storage1] TestLinux/TestLinux.vmdk'/> <target dev='sda' bus='scsi'/> </disk> <disk type='file' device='cdrom'> <source file='[Storage1] Fedora-12-x86_64-Live.iso'/> <target dev='hdc' bus='ide'/> </disk> (e) pool-list, net-list are not supported by the driver. That's a particular problem for me because I was really hoping to use the storage APIs from libvirt to access the VMDK files that contain domains (eg. [Storage1] TestLinux/TestLinux.vmdk in the example above). Is support for storage (particularly) and/or networks on the horizon for this driver? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

4 5

[libvirt] [PATCH] esx: Warn if the ESX server is in maintenance mode
by Matthias Bolte 08 Jan '10

08 Jan '10

--- src/esx/esx_driver.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f86654a..ddda66e 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -401,6 +401,32 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } } + /* Query the host for maintenance mode and vCenter IP address */ + if (esxVI_String_AppendValueListToList(conn, &propertyNameList, + "runtime.inMaintenanceMode\0" + "summary.managementServerIp\0") < 0 || + esxVI_LookupHostSystemByIp(conn, priv->host, hostIpAddress, + propertyNameList, &hostSystem) < 0) { + goto failure; + } + + /* Warn if host is in maintenance mode */ + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "runtime.inMaintenanceMode")) { + if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val, + esxVI_Type_Boolean) < 0) { + goto failure; + } + + if (dynamicProperty->val->boolean == esxVI_Boolean_True) { + VIR_WARN0("The server is in maintenance mode"); + } + + break; + } + } + /* Login to vCenter */ if (vCenter != NULL) { VIR_FREE(url); @@ -415,17 +441,9 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } /* Lookup the vCenter from the ESX host */ - if (esxVI_String_AppendValueToList - (conn, &propertyNameList, "summary.managementServerIp") < 0 || - esxVI_LookupHostSystemByIp(conn, priv->host, hostIpAddress, - propertyNameList, &hostSystem) < 0) { - goto failure; - } - for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, - "summary.managementServerIp")) { + if (STREQ(dynamicProperty->name, "summary.managementServerIp")) { if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val, esxVI_Type_String) < 0) { goto failure; @@ -461,8 +479,6 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) } break; - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); } } -- 1.6.0.4

2 2

[libvirt] RFC: Create a separate libvirt users mailing list ?
by Daniel P. Berrange 08 Jan '10

08 Jan '10

Hi Folks, We've been brainstorming ways to improve/broaden the libvirt community and one (of many) ideas is to create a separate libvirt users mailing list. The rationale is that this list is 95% patch submission from developers, often very high traffic and thus it may not be appealing for ordinary users to subscribe just to ask a question about libvirt usage. Although there is the virt-tools mailing list, that is really focused on the virt-manager family of apps, not a general purpose libvirt users community. Thus we're considering creating a new list libvirt-users(a)redhat.com To serve as a home for discussions relating to - Administrators/users of libvirt / libvirtd / virsh - Developers building applications on top of libvirt - Anyone else wishing to ask/talk about libvirt architecture / concepts / etc in real world deployment While the current list libvir-list(a)redhat.com To serve as continued home for most current traffic, specifically - Development of libvirt itself (libvirtd, hypervisor drivers, etc) - Development of libvirt language bindings (perl, python, java, etc) - Patch submission for libvirt & language bindings Essentially all libvirt code patches would be on libvir-list, while libvirt-users would be for app developer / end user admin discussions. For this to work of course, a significant number developers of libvirt currently on this list would also have to join libvirt-users, so we have people on the new list who are able to answer questions :-) Before we create a new list we'd like to hear from people on this list as to wether they think this would be beneficial. In particular we'd like your opinion if you are someone who's likely to switch to be exclusively on the libvirt-users list. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

5 4

Re: [libvirt] pci-stub error and MSI-X for KVM guest
by Chris Wright 08 Jan '10

08 Jan '10

* Fischer, Anna (anna.fischer(a)hp.com) wrote: > So, when setting a breakpoint for the exit() call I'm getting a bit closer to figuring where it kills my guest. Thanks, this helps clarify what is happening. > Breakpoint 1, exit (status=1) at exit.c:99 > 99 { > Current language: auto > The current source language is "auto; currently c". > (gdb) bt > #0 exit (status=1) at exit.c:99 > #1 0x0000000000470c6e in assigned_dev_pci_read_config (d=0x259c6f0, address=64, len=4) assigned_dev_pci_read_config(..., 64, 4) ^^ This is a libvirt issue. When you use virt-manager it has libvirtd fork/exec qemu-kvm. libvirtd will drop privileges and run qemu-kvm as user qemu (or perhaps root if you've edited qemu.conf). Regardless of the user, it clears capabilities. Reading PCI config space beyond just the header requires CAP_SYS_ADMIN. The above is reading the first 4 bytes of device dependent config space, and the kernel is returning 0 because qemu doesn't have CAP_SYS_ADMIN. Basically, this means that device assignment w/ libvirt will break MSI/MSI-X because qemu will never be able to see that the host device has those PCI capabilities. This, in turn, renders VF device assignment useless (since a VF is required to support MSI and/or MSI-X). Granting CAP_SYS_ADMIN for each qemu instance that does device assignment would render the privilege reduction useless (CAP_SYS_ADMIN is the kitchen sink catchall of the Linux capability system). Hmmph...

2 2

[libvirt] [PATCH] esx: Dump the raw response in case of an SOAP fault
by Matthias Bolte 08 Jan '10

08 Jan '10

Currently only the faultcode and faultstring are deserialized, the detail part is ignored. The implementation of many new SOAP types would be necessary to deserialize the detail part correctly. As an intermediate solution the raw response is dumped to the debug log. --- src/esx/esx_vi.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bad987c..9cade3d 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -692,6 +692,12 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, "HTTP response code %d for call to '%s'. " "Fault: %s - %s", (*response)->responseCode, methodName, fault->faultcode, fault->faultstring); + + /* FIXME: Dump raw response until detail part gets deserialized */ + VIR_DEBUG("HTTP response code %d for call to '%s' [[[[%s]]]]", + (*response)->responseCode, methodName, + (*response)->content); + goto failure; } else { if (virAsprintf(&xpathExpression, -- 1.6.0.4

2 1

[libvirt] [PATCH] Replace old CVS references with GIT
by Matthias Bolte 08 Jan '10

08 Jan '10

--- HACKING | 6 +++--- docs/FAQ.html.in | 2 +- docs/bugs.html.in | 6 +++--- docs/contact.html.in | 4 ++-- docs/deployment.html.in | 4 ++-- docs/hacking.html.in | 6 +++--- src/Makefile.am | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/HACKING b/HACKING index 3fb1113..0c65dad 100644 --- a/HACKING +++ b/HACKING @@ -15,14 +15,14 @@ should work: or: - cvs diff -up > libvirt-myfeature.patch + git diff > libvirt-myfeature.patch (3) Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the sequence of patches fits together. -(4) Make sure your patches apply against libvirt CVS. Developers -only follow CVS and don't care much about released versions. +(4) Make sure your patches apply against libvirt GIT. Developers +only follow GIT and don't care much about released versions. (5) Run the automated tests on your code before submitting any changes. In particular, configure with compile warnings set to -Werror: diff --git a/docs/FAQ.html.in b/docs/FAQ.html.in index a436e78..50f798d 100644 --- a/docs/FAQ.html.in +++ b/docs/FAQ.html.in @@ -119,7 +119,7 @@ packages as well as the public headers to compile against libxenstore.</p> </li> <li> - <em>I use the CVS version and there is no configure script</em> + <em>I use the GIT version and there is no configure script</em> <p>The configure script (and other Makefiles) are generated. Use the autogen.sh script to regenerate the configure script and Makefiles, like:</p> diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 380bcff..fa557a8 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -16,7 +16,7 @@ <p> If you are using official libvirt binaries from a Linux distribution check below for distribution specific bug reporting policies first. - For general libvirt bug reports, from self-built releases, CVS snapshots + For general libvirt bug reports, from self-built releases, GIT snapshots and any other non-distribution supported builds, enter tickets under the <code>Virtualization Tools</code> product and the <code>libvirt</code> component. @@ -64,8 +64,8 @@ </p> <ul> - <li>The version number of the libvirt build, or date of the CVS - checkout</li> + <li>The version number of the libvirt build, or SHA1 of the GIT + commit</li> <li>The hardware architecture being used</li> <li>The name of the hypervisor (Xen, QEMU, KVM)</li> <li>The XML config of the guest domain if relevant</li> diff --git a/docs/contact.html.in b/docs/contact.html.in index 4b9f532..5d055b1 100644 --- a/docs/contact.html.in +++ b/docs/contact.html.in @@ -12,8 +12,8 @@ <a href="https://www.redhat.com/mailman/listinfo/libvir-list">associated Web</a> page and follow the instructions. Patches with explanations and provided as attachments are really appreciated and will be discussed on the mailing list. - If possible generate the patches by using <code>cvs diff -up</code> in a CVS - checkout. + If possible generate the patches by using <code>git diff</code> in a GIT + clone. </p> <h2>IRC discussion</h2> diff --git a/docs/deployment.html.in b/docs/deployment.html.in index 47c4892..94c480f 100644 --- a/docs/deployment.html.in +++ b/docs/deployment.html.in @@ -25,10 +25,10 @@ # make install </pre> - <h2>Built from CVS / GIT</h2> + <h2>Built from GIT</h2> <p> - When building from CVS it is necessary to generate the autotools + When building from GIT it is necessary to generate the autotools support files. This requires having <code>autoconf</code>, <code>automake</code>, <code>libtool</code> and <code>intltool</code> installed. The process can be automated with the <code>autogen.sh</code> diff --git a/docs/hacking.html.in b/docs/hacking.html.in index af63411..43a79f7 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -19,13 +19,13 @@ or: </p> <pre> - cvs diff -up > libvirt-myfeature.patch + git diff > libvirt-myfeature.patch </pre></li> <li>Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the sequence of patches fits together.</li> - <li>Make sure your patches apply against libvirt CVS. Developers - only follow CVS and don't care much about released versions.</li> + <li>Make sure your patches apply against libvirt GIT. Developers + only follow GIT and don't care much about released versions.</li> <li><p>Run the automated tests on your code before submitting any changes. In particular, configure with compile warnings set to -Werror:</p> <pre> diff --git a/src/Makefile.am b/src/Makefile.am index 8ef0e81..dbf708b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -367,7 +367,7 @@ if HAVE_RPCGEN # Maintainer-only target for re-generating the derived .c/.h source # files, which are actually derived from the .x file. # -# For committing protocol changes to CVS, the GLIBC rpcgen *must* +# For committing protocol changes to GIT, the GLIBC rpcgen *must* # be used. # # Support for non-GLIB rpcgen is here as a convenience for -- 1.6.0.4

2 2

[libvirt] [PATCH] don't test "res == NULL" after we've already dereferenced it
by Jim Meyering 08 Jan '10

08 Jan '10

As the log says, once we've dereferenced it, there's no point in comparing to NULL. >From 463eaf1027a154e71839a67eca85b3ada8b817ff Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 6 Jan 2010 12:45:07 +0100 Subject: [PATCH] don't test "res == NULL" after we've already dereferenced it * src/xen/proxy_internal.c (xenProxyCommand): It is known to be non-NULL at that point, so remove the "ret == NULL" guard, and instead add an assert(ret != NULL), in case future code changes cause the condition to becomes false. Include <assert.h>. --- src/xen/proxy_internal.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/xen/proxy_internal.c b/src/xen/proxy_internal.c index ec4522b..42b6e91 100644 --- a/src/xen/proxy_internal.c +++ b/src/xen/proxy_internal.c @@ -1,7 +1,7 @@ /* * proxy_client.c: client side of the communication with the libvirt proxy. * - * Copyright (C) 2006, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2006, 2008, 2009, 2010 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -11,6 +11,7 @@ #include <config.h> #include <stdio.h> +#include <assert.h> #include <stdlib.h> #include <unistd.h> #include <errno.h> @@ -444,7 +445,8 @@ retry: /* * do more checks on the incoming packet. */ - if ((res == NULL) || (res->version != PROXY_PROTO_VERSION) || + assert (res != NULL); + if ((res->version != PROXY_PROTO_VERSION) || (res->len < sizeof(virProxyPacket))) { virProxyError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Communication error with proxy: malformed packet\n")); -- 1.6.6.387.g2649b1

3 9

[libvirt] [PATCH] let "configure --disable-shared" work once again
by Jim Meyering 08 Jan '10

08 Jan '10

Per this thread: http://thread.gmane.org/gmane.comp.emulators.libvirt/19672 here's a patch that solves both problems: >From 1b330b3070f904dfc1c380151afa3aaf2a121cd3 Mon Sep 17 00:00:00 2001 From: Jim Meyering <jim(a)meyering.net> Date: Thu, 7 Jan 2010 21:07:42 +0100 Subject: [PATCH] let "configure --disable-shared" work once again Without this change, ./autogen.sh --disable-shared && make would evoke a "can not build a shared library" failure for libvirtmod.la. However, without the -shared link option in python/Makefile.am, it was possible to install non-functional python support. Instead, make --disable-shared also disable building python. * configure.ac: Make --disable-shared imply --without-python and silently override --with-python. * python/Makefile.am (libvirtmod_la_LDFLAGS): Do not use -shared. This reverts 8838ee39ab1c2bb7fffe93bfda220692664e8be6. --- configure.in | 4 ++++ python/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 3f2f8ff..3e98035 100644 --- a/configure.in +++ b/configure.in @@ -1813,6 +1813,10 @@ AC_ARG_WITH([qemu-group], AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account]) AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account]) +if test "$enable_shared:$with_python" = no:yes; then + AC_MSG_WARN([you've used --disable-shared; so disabling python support]) + with_python=no +fi # Only COPYING.LIB is under version control, yet COPYING # is included as part of the distribution tarball. diff --git a/python/Makefile.am b/python/Makefile.am index 58c6729..04342b7 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -39,7 +39,7 @@ libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h # need extra flags here libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@ -libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ +libvirtmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs \ @CYGWIN_EXTRA_LDFLAGS@ libvirtmod_la_LIBADD = $(mylibs) \ @CYGWIN_EXTRA_LIBADD@ @CYGWIN_EXTRA_PYTHON_LIBADD@ -- 1.6.6.425.g4dc2d

3 9

[libvirt] [PATCH] Disallow building Python bindings if shared libraries are disabled.
by Diego Elio Pettenò 08 Jan '10

08 Jan '10

Patch concept by Jim Meyering <jim(a)meyering.net>, moved before the Python testing, and changed the message a bit to explain the problem. --- configure.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 3f2f8ff..5275412 100644 --- a/configure.in +++ b/configure.in @@ -1466,6 +1466,11 @@ dnl AC_ARG_WITH([python], [ --with-python Build python bindings (on)],[],[with_python=yes]) +if test "$enable_shared:$with_python" = no:yes; then + AC_MSG_WARN([Disabling shared libraries is incompatible with building Python extensions.]) + with_python=no +fi + PYTHON_VERSION= PYTHON_INCLUDES= if test "$with_python" != "no" ; then -- 1.6.6

2 1

[libvirt] fix build failure with --disable-shared
by Jim Meyering 08 Jan '10

08 Jan '10

Laine Stump noticed a failure to build with --disable-shared and found that removing the unconditional "-shared" option in python/Makefile.am would fix it. The change below reverts 8838ee39ab1c2bb7fffe93bfda220692664e8be6, so Diego, if your goal (with the reverted change) was more than to avoid seemingly-unnecessary work, please tell us what it was. >From 1de9c4a9a4175c9f1eb9302ad7fa9867e8a242a4 Mon Sep 17 00:00:00 2001 From: Laine Stump <laine(a)laine.org> Date: Thu, 7 Jan 2010 21:07:42 +0100 Subject: [PATCH] let "configure --disable-shared" work once again Without this change, ./autogen.sh --disable-shared && make would evoke a "can not build a shared library" failure for libvirtmod.la. * python/Makefile.am (libvirtmod_la_LDFLAGS): Do not use -shared. --- python/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 58c6729..04342b7 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -39,7 +39,7 @@ libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h # need extra flags here libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@ -libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ +libvirtmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs \ @CYGWIN_EXTRA_LDFLAGS@ libvirtmod_la_LIBADD = $(mylibs) \ @CYGWIN_EXTRA_LIBADD@ @CYGWIN_EXTRA_PYTHON_LIBADD@ -- 1.6.6.425.g4dc2d

4 12

[libvirt] [PATCH] Qemu: ask for memory preallocation with large pages
by Daniel Veillard 08 Jan '10

08 Jan '10

The -mem-prealloc flag should be used when using large pages This ensures qemu tries to allocate all required memory immediately, rather than when first used. The latter mode will crash qemu if hugepages aren't available when accessed, while the former should gracefully fallback to non-hugepages. * src/qemu/qemu_conf.c: add -mem-prealloc flag to qemu command line when using large pages Daniel diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 824055f..d3da776 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2108,6 +2108,7 @@ int qemudBuildCommandLine(virConnectPtr conn, def->emulator); goto error; } + ADD_ARG_LIT("-mem-prealloc"); ADD_ARG_LIT("-mem-path"); ADD_ARG_LIT(driver->hugepage_path); } -- 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] DNAT, bridge, iptables and network
by Mihamina Rakotomandimby 08 Jan '10

08 Jan '10

Manao ahoana, Hello, Bonjour, My server has 3 public IPs: IP1, IP2, IP3. I intend to create 3 bridges: virbr1, virbr2, virbr3. Each bridge will NAT from 3 to 5 KVM guests. About IP1: I would like incoming connexion on IP1 to: - IP1:80 to be DNAT'd to one virbr1 VM, specialized on HTTP - IP1:3306 to be DNAT'd to another virbr1 VM, specialized on MySQL - IP1:53 to be DNAT'd to another virbr1 VM, specialized on DNS Same about IP2 and IP3. Should I assign a public IP address to each brdige? I think "no" because there will be a problem of network segment: --> What range will I give to the guests? I think my only solution is to give private IPs (192.168.X.X) to the brigdes (3 separate subnets), and use iptables with something like: iptables -t nat -A PREROUTING -p tcp -m tcp -d $IP1 --dport 80 \ -j DNAT --to-destination $VIRBR1_HTTP_GUEST iptables -t nat -A PREROUTING -p tcp -m tcp -d $IP1 --dport 3306 \ -j DNAT --to-destination $VIRBR1_MySQL_GUEST iptables -t nat -A PREROUTING -p udp -d $IP1 --dport 53 \ -j DNAT --to-destination $VIRBR1_DNS_GUEST Should be alright? More informations: I use Ubuntu 9.10 Misaotra, Thanks, Merci. -- Architecte Informatique chez Blueline/Gulfsat: Administration Systeme, Recherche & Developpement +261 34 29 155 34 / +261 33 11 207 36

1 0

[libvirt] [Patch v0.5] iSCSI Multi-IQN (Libvirt Support)
by Shyam Iyer 08 Jan '10

08 Jan '10

This patch set realizes the multi-IQN concept discussed in an earlier thread http://www.mail-archive.com/libvir-list@redhat.com/msg16706.html And here .. http://www.mail-archive.com/libvir-list@redhat.com/msg17499.html The patch realizes an XML schema like the one below and allows libvirt to read through it to create storage pools. These XMLs when created using a virtualization manager realize unique VM to storage LUN mappings through a single console and thus opening up possibilities for the following scenarios - * possibility of multiple IQNs for a single Guest * option for hypervisor's initiator to use these IQNs on behalf of the guest Change Log from v0.4: 1) Set default tab space to 4(Hopefully this is corrected this time ;) ) 2) Review comments from Dave Allan a) Use output of "iscsiadm -m iface" to search for existing iqn names in the iface files. 3) Create new unique iface file names for user provided iqn names if the iqns are not present in the existing iface files. Change Log from v0.3: 1) Set default tab space to 4 2) Use Case Description for Commit Log 3) Review comments from Dave Allan a) No initiator iqn in the xml would mean use of the default initiator iqn name b) Initiator iqn provided would mean a unique session to be created using the provided iqn name. c) Single iSCSI session per pool 4) Added syntax in doc/schemas/storagepool.rng There are no new errors introduced by this patch with "make check" and "make syntax-check" tests. Signed-off-by: Sudhir Bellad <sudhir_bellad(a)dell.com> Signed-off-by: Shyam Iyer <shyam_iyer(a)dell.com>

2 1

[libvirt] [PATCH] [RFC] xen domctl version 6
by Jim Fehlig 07 Jan '10

07 Jan '10

xen-unstable c/s 20685 changed the domctl interface, adding a field to xen_domctl_getdomaininfo structure. This additional field causes stack corruption in libvirt. xen-unstable c/s 20711 rightly bumped the domctl interface version so it is at least possible to handle the new field. The attached patch accounts for shr_pages field added to xen_domctl_getdomaininfo structure. I'm not thrilled about the changes to all the macros - suggestions for improvement welcomed. Tested with domctl version 5 and 6. Regards, Jim

2 3

[libvirt] [PATCH] network/bridge_driver.c: avoid potential NULL-dereference
by Jim Meyering 07 Jan '10

07 Jan '10

obvious typo: >From 6f0810192dc6d9b223f2f973812fd787f398576c Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 5 Jan 2010 15:48:42 +0100 Subject: [PATCH] network/bridge_driver.c: avoid potential NULL-dereference * src/network/bridge_driver.c (networkBuildDnsmasqArgv): Correct test for NULL *argv. --- src/network/bridge_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index abee78c..69809b3 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1,7 +1,7 @@ /* * driver.c: core driver methods for managing qemu guests * - * Copyright (C) 2006-2009 Red Hat, Inc. + * Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -513,7 +513,7 @@ networkBuildDnsmasqArgv(virConnectPtr conn, return 0; no_memory: - if (argv) { + if (*argv) { for (i = 0; (*argv)[i]; i++) VIR_FREE((*argv)[i]); VIR_FREE(*argv); -- 1.6.6.384.g14e6a

2 2

[libvirt] About VirtualBox and Libvirt
by Prashant Wakchaure 07 Jan '10

07 Jan '10

Is anybody know how to connect libvirt to VirtualBox remotely???? -- Thanks & Regards, Prashant Wakchaure

2 1

[libvirt] libvirt 0.7.5 vs qemu 0.12.1 imcompatability?
by Tom Hughes 07 Jan '10

07 Jan '10

The update from qemu 0.11.0 to qemu 0.12.1 in the virt-preview repository seems to have broken things. Starting a VM now just gives me a blank screen and a log which says: Option 'ipv4': Use 'on' or 'off' Failed to parse "yes" for "dummy.ipv4" I assume libvirt is sending a it a command on the monitor interface that it no longer understands... Tom -- Tom Hughes (tom(a)compton.nu) http://www.compton.nu/

4 7

[libvirt] [PATCH] Fix free of invalid pointer in node_device_driver
by Jim Fehlig 07 Jan '10

07 Jan '10

If device does not have a driver, an uninitialized pointer was being free()'d in node_device_driver. Here's a small patch to fix it. Regards, Jim

2 2

[libvirt] [PATCH] virsh: Use VIR_FREE instead of free
by Matthias Bolte 07 Jan '10

07 Jan '10

virsh uses other parts of the internal API already, so use VIR_FREE also. --- tools/virsh.c | 297 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 146 insertions(+), 151 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index e2a32b4..2844927 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -46,6 +46,7 @@ #include "buf.h" #include "console.h" #include "util.h" +#include "memory.h" static char *progname; @@ -481,7 +482,7 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) ctl->conn = NULL; } - free(ctl->name); + VIR_FREE(ctl->name); ctl->name = vshStrdup(ctl, vshCommandOptString(cmd, "name", NULL)); if (!ro) { @@ -560,7 +561,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); - free(doc); + VIR_FREE(doc); if (!xml) goto cleanup; ctxt = xmlXPathNewContext(xml); @@ -583,8 +584,8 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) xmlXPathFreeContext(ctxt); if (xml) xmlFreeDoc(xml); - free(thisHost); - free(thatHost); + VIR_FREE(thisHost); + VIR_FREE(thatHost); return ret; } @@ -651,7 +652,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxid = virConnectListDomains(ctl->conn, &ids[0], maxid)) < 0) { vshError(ctl, "%s", _("Failed to list active domains")); - free(ids); + VIR_FREE(ids); return FALSE; } @@ -662,7 +663,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) maxname = virConnectNumOfDefinedDomains(ctl->conn); if (maxname < 0) { vshError(ctl, "%s", _("Failed to list inactive domains")); - free(ids); + VIR_FREE(ids); return FALSE; } if (maxname) { @@ -670,8 +671,8 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxname = virConnectListDefinedDomains(ctl->conn, names, maxname)) < 0) { vshError(ctl, "%s", _("Failed to list inactive domains")); - free(ids); - free(names); + VIR_FREE(ids); + VIR_FREE(names); return FALSE; } @@ -708,7 +709,7 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with domains is not atomic operation */ if (!dom) { - free(names[i]); + VIR_FREE(names[i]); continue; } @@ -720,10 +721,10 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, "%3s %-20s %s\n", "-", names[i], state); virDomainFree(dom); - free(names[i]); + VIR_FREE(names[i]); } - free(ids); - free(names); + VIR_FREE(ids); + VIR_FREE(names); return TRUE; } @@ -1019,7 +1020,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) return FALSE; dom = virDomainCreateXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (dom != NULL) { vshPrint(ctl, _("Domain %s created from %s\n"), @@ -1070,7 +1071,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) return FALSE; dom = virDomainDefineXML(ctl->conn, buffer); - free (buffer); + VIR_FREE(buffer); if (dom != NULL) { vshPrint(ctl, _("Domain %s defined from %s\n"), @@ -1371,7 +1372,7 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) if (schedulertype!= NULL){ vshPrint(ctl, "%-15s: %s\n", _("Scheduler"), schedulertype); - free(schedulertype); + VIR_FREE(schedulertype); } else { vshPrint(ctl, "%-15s: %s\n", _("Scheduler"), _("Unknown")); goto cleanup; @@ -1436,7 +1437,7 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) } cleanup: - free(params); + VIR_FREE(params); virDomainFree(dom); return ret_val; } @@ -1724,7 +1725,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) if ((str = virDomainGetOSType(dom))) { vshPrint(ctl, "%-15s %s\n", _("OS Type:"), str); - free(str); + VIR_FREE(str); } if (virDomainGetInfo(dom, &info) == 0) { @@ -1912,8 +1913,8 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) ret = FALSE; } - free(cpumap); - free(cpuinfo); + VIR_FREE(cpumap); + VIR_FREE(cpuinfo); virDomainFree(dom); return ret; } @@ -2037,7 +2038,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) VIR_USE_CPU(cpumap, cpu); } else { vshError(ctl, _("Physical CPU %d doesn't exist."), cpu); - free(cpumap); + VIR_FREE(cpumap); virDomainFree(dom); return FALSE; } @@ -2050,7 +2051,7 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) ret = FALSE; } - free(cpumap); + VIR_FREE(cpumap); virDomainFree(dom); return ret; } @@ -2281,7 +2282,7 @@ cmdCapabilities (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) return FALSE; } vshPrint (ctl, "%s\n", caps); - free (caps); + VIR_FREE(caps); return TRUE; } @@ -2326,7 +2327,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) dump = virDomainGetXMLDesc(dom, flags); if (dump != NULL) { printf("%s", dump); - free(dump); + VIR_FREE(dump); } else { ret = FALSE; } @@ -2373,7 +2374,7 @@ cmdDomXMLFromNative(vshControl *ctl, const vshCmd *cmd) xmlData = virConnectDomainXMLFromNative(ctl->conn, format, configData, flags); if (xmlData != NULL) { printf("%s", xmlData); - free(xmlData); + VIR_FREE(xmlData); } else { ret = FALSE; } @@ -2419,7 +2420,7 @@ cmdDomXMLToNative(vshControl *ctl, const vshCmd *cmd) configData = virConnectDomainXMLToNative(ctl->conn, format, xmlData, flags); if (configData != NULL) { printf("%s", configData); - free(configData); + VIR_FREE(configData); } else { ret = FALSE; } @@ -2707,7 +2708,7 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) return FALSE; network = virNetworkCreateXML(ctl->conn, buffer); - free (buffer); + VIR_FREE(buffer); if (network != NULL) { vshPrint(ctl, _("Network %s created from %s\n"), @@ -2755,7 +2756,7 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) return FALSE; network = virNetworkDefineXML(ctl->conn, buffer); - free (buffer); + VIR_FREE(buffer); if (network != NULL) { vshPrint(ctl, _("Network %s defined from %s\n"), @@ -2838,7 +2839,7 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) dump = virNetworkGetXMLDesc(network, 0); if (dump != NULL) { printf("%s", dump); - free(dump); + VIR_FREE(dump); } else { ret = FALSE; } @@ -2936,13 +2937,13 @@ cleanup: if (iface) virInterfaceFree (iface); - free (doc); - free (doc_edited); - free (doc_reread); + VIR_FREE(doc); + VIR_FREE(doc_edited); + VIR_FREE(doc_reread); if (tmp) { unlink (tmp); - free (tmp); + VIR_FREE(tmp); } return ret; @@ -2988,7 +2989,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxactive = virConnectListNetworks(ctl->conn, activeNames, maxactive)) < 0) { vshError(ctl, "%s", _("Failed to list active networks")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } @@ -2999,7 +3000,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) maxinactive = virConnectNumOfDefinedNetworks(ctl->conn); if (maxinactive < 0) { vshError(ctl, "%s", _("Failed to list inactive networks")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } if (maxinactive) { @@ -3009,8 +3010,8 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virConnectListDefinedNetworks(ctl->conn, inactiveNames, maxinactive)) < 0) { vshError(ctl, "%s", _("Failed to list inactive networks")); - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return FALSE; } @@ -3029,7 +3030,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with networks is not atomic operation */ if (!network) { - free(activeNames[i]); + VIR_FREE(activeNames[i]); continue; } @@ -3043,7 +3044,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) _("active"), autostartStr); virNetworkFree(network); - free(activeNames[i]); + VIR_FREE(activeNames[i]); } for (i = 0; i < maxinactive; i++) { virNetworkPtr network = virNetworkLookupByName(ctl->conn, inactiveNames[i]); @@ -3052,7 +3053,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with networks is not atomic operation */ if (!network) { - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); continue; } @@ -3067,10 +3068,10 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) autostartStr); virNetworkFree(network); - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); } - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return TRUE; } @@ -3261,7 +3262,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxactive = virConnectListInterfaces(ctl->conn, activeNames, maxactive)) < 0) { vshError(ctl, "%s", _("Failed to list active interfaces")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } @@ -3272,7 +3273,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) maxinactive = virConnectNumOfDefinedInterfaces(ctl->conn); if (maxinactive < 0) { vshError(ctl, "%s", _("Failed to list inactive interfaces")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } if (maxinactive) { @@ -3282,8 +3283,8 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virConnectListDefinedInterfaces(ctl->conn, inactiveNames, maxinactive)) < 0) { vshError(ctl, "%s", _("Failed to list inactive interfaces")); - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return FALSE; } @@ -3300,7 +3301,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with interfaces is not atomic */ if (!iface) { - free(activeNames[i]); + VIR_FREE(activeNames[i]); continue; } @@ -3309,7 +3310,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) _("active"), virInterfaceGetMACString(iface)); virInterfaceFree(iface); - free(activeNames[i]); + VIR_FREE(activeNames[i]); } for (i = 0; i < maxinactive; i++) { virInterfacePtr iface = @@ -3317,7 +3318,7 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with interfaces is not atomic */ if (!iface) { - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); continue; } @@ -3326,10 +3327,10 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) _("inactive"), virInterfaceGetMACString(iface)); virInterfaceFree(iface); - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); } - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return TRUE; } @@ -3430,7 +3431,7 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) dump = virInterfaceGetXMLDesc(iface, flags); if (dump != NULL) { printf("%s", dump); - free(dump); + VIR_FREE(dump); } else { ret = FALSE; } @@ -3473,7 +3474,7 @@ cmdInterfaceDefine(vshControl *ctl, const vshCmd *cmd) return FALSE; iface = virInterfaceDefineXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (iface != NULL) { vshPrint(ctl, _("Interface %s defined from %s\n"), @@ -3685,7 +3686,7 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) return FALSE; pool = virStoragePoolCreateXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (pool != NULL) { vshPrint(ctl, _("Pool %s created from %s\n"), @@ -3739,7 +3740,7 @@ cmdNodeDeviceCreate(vshControl *ctl, const vshCmd *cmd) } dev = virNodeDeviceCreateXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (dev != NULL) { vshPrint(ctl, _("Node device %s created from %s\n"), @@ -3896,10 +3897,10 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) if (printXML) { printf("%s", xml); - free (xml); + VIR_FREE(xml); } else { pool = virStoragePoolCreateXML(ctl->conn, xml, 0); - free (xml); + VIR_FREE(xml); if (pool != NULL) { vshPrint(ctl, _("Pool %s created\n"), name); @@ -3947,7 +3948,7 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) return FALSE; pool = virStoragePoolDefineXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (pool != NULL) { vshPrint(ctl, _("Pool %s defined from %s\n"), @@ -3985,10 +3986,10 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) if (printXML) { printf("%s", xml); - free (xml); + VIR_FREE(xml); } else { pool = virStoragePoolDefineXML(ctl->conn, xml, 0); - free (xml); + VIR_FREE(xml); if (pool != NULL) { vshPrint(ctl, _("Pool %s defined\n"), name); @@ -4188,7 +4189,7 @@ cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd) dump = virStoragePoolGetXMLDesc(pool, 0); if (dump != NULL) { printf("%s", dump); - free(dump); + VIR_FREE(dump); } else { ret = FALSE; } @@ -4238,7 +4239,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxactive = virConnectListStoragePools(ctl->conn, activeNames, maxactive)) < 0) { vshError(ctl, "%s", _("Failed to list active pools")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } @@ -4249,7 +4250,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) maxinactive = virConnectNumOfDefinedStoragePools(ctl->conn); if (maxinactive < 0) { vshError(ctl, "%s", _("Failed to list inactive pools")); - free(activeNames); + VIR_FREE(activeNames); return FALSE; } if (maxinactive) { @@ -4257,8 +4258,8 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxinactive = virConnectListDefinedStoragePools(ctl->conn, inactiveNames, maxinactive)) < 0) { vshError(ctl, "%s", _("Failed to list inactive pools")); - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return FALSE; } @@ -4275,7 +4276,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with pools is not atomic operation */ if (!pool) { - free(activeNames[i]); + VIR_FREE(activeNames[i]); continue; } @@ -4289,7 +4290,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) _("active"), autostartStr); virStoragePoolFree(pool); - free(activeNames[i]); + VIR_FREE(activeNames[i]); } for (i = 0; i < maxinactive; i++) { virStoragePoolPtr pool = virStoragePoolLookupByName(ctl->conn, inactiveNames[i]); @@ -4298,7 +4299,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with pools is not atomic operation */ if (!pool) { - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); continue; } @@ -4313,10 +4314,10 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) autostartStr); virStoragePoolFree(pool); - free(inactiveNames[i]); + VIR_FREE(inactiveNames[i]); } - free(activeNames); - free(inactiveNames); + VIR_FREE(activeNames); + VIR_FREE(inactiveNames); return TRUE; } @@ -4388,13 +4389,13 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) } srcList = virConnectFindStoragePoolSources(ctl->conn, type, srcSpec, 0); - free(srcSpec); + VIR_FREE(srcSpec); if (srcList == NULL) { vshError(ctl, _("Failed to find any %s pool sources"), type); return FALSE; } vshPrint(ctl, "%s", srcList); - free(srcList); + VIR_FREE(srcList); return TRUE; } @@ -4439,13 +4440,13 @@ cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) return FALSE; srcList = virConnectFindStoragePoolSources(ctl->conn, type, srcSpec, 0); - free(srcSpec); + VIR_FREE(srcSpec); if (srcList == NULL) { vshError(ctl, _("Failed to find any %s pool sources"), type); return FALSE; } vshPrint(ctl, "%s", srcList); - free(srcList); + VIR_FREE(srcList); return TRUE; } @@ -4718,7 +4719,7 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) } xml = virBufferContentAndReset(&buf); vol = virStorageVolCreateXML(pool, xml, 0); - free (xml); + VIR_FREE(xml); virStoragePoolFree(pool); if (vol != NULL) { @@ -4857,7 +4858,7 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) } vol = virStorageVolCreateXML(pool, buffer, 0); - free (buffer); + VIR_FREE(buffer); virStoragePoolFree(pool); if (vol != NULL) { @@ -4928,7 +4929,7 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) ret = TRUE; cleanup: - free (buffer); + VIR_FREE(buffer); if (pool) virStoragePoolFree(pool); if (inputvol) @@ -5036,7 +5037,7 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) ret = TRUE; cleanup: - free(origxml); + VIR_FREE(origxml); xmlFree(newxml); if (origvol) virStorageVolFree(origvol); @@ -5170,7 +5171,7 @@ cmdVolDumpXML(vshControl *ctl, const vshCmd *cmd) dump = virStorageVolGetXMLDesc(vol, 0); if (dump != NULL) { printf("%s", dump); - free(dump); + VIR_FREE(dump); } else { ret = FALSE; } @@ -5219,7 +5220,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if ((maxactive = virStoragePoolListVolumes(pool, activeNames, maxactive)) < 0) { vshError(ctl, "%s", _("Failed to list active vols")); - free(activeNames); + VIR_FREE(activeNames); virStoragePoolFree(pool); return FALSE; } @@ -5235,7 +5236,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* this kind of work with vols is not atomic operation */ if (!vol) { - free(activeNames[i]); + VIR_FREE(activeNames[i]); continue; } @@ -5248,11 +5249,11 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, "%-20s %-40s\n", virStorageVolGetName(vol), path); - free(path); + VIR_FREE(path); virStorageVolFree(vol); - free(activeNames[i]); + VIR_FREE(activeNames[i]); } - free(activeNames); + VIR_FREE(activeNames); virStoragePoolFree(pool); return TRUE; } @@ -5390,7 +5391,7 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) return FALSE; res = virSecretDefineXML(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); if (res == NULL) { vshError(ctl, _("Failed to set attributes from %s"), from); @@ -5438,7 +5439,7 @@ cmdSecretDumpXML(vshControl *ctl, const vshCmd *cmd) if (xml == NULL) goto cleanup; printf("%s", xml); - free(xml); + VIR_FREE(xml); ret = TRUE; cleanup: @@ -5491,7 +5492,7 @@ cmdSecretSetValue(vshControl *ctl, const vshCmd *cmd) res = virSecretSetValue(secret, (unsigned char *)value, value_size, 0); memset(value, 0, value_size); - free (value); + VIR_FREE(value); if (res != 0) { vshError(ctl, "%s", _("Failed to set secret value")); @@ -5541,7 +5542,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd) base64_encode_alloc((char *)value, value_size, &base64); memset(value, 0, value_size); - free(value); + VIR_FREE(value); if (base64 == NULL) { vshError(ctl, "%s", _("Failed to allocate memory")); @@ -5549,7 +5550,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd) } printf("%s", base64); memset(base64, 0, strlen(base64)); - free(base64); + VIR_FREE(base64); ret = TRUE; cleanup: @@ -5625,7 +5626,7 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) maxuuids = virConnectListSecrets(ctl->conn, uuids, maxuuids); if (maxuuids < 0) { vshError(ctl, "%s", _("Failed to list secrets")); - free(uuids); + VIR_FREE(uuids); return FALSE; } @@ -5639,7 +5640,7 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) const char *usageType = NULL; if (!sec) { - free(uuids[i]); + VIR_FREE(uuids[i]); continue; } @@ -5658,9 +5659,9 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) uuids[i], _("Unused")); } virSecretFree(sec); - free(uuids[i]); + VIR_FREE(uuids[i]); } - free(uuids); + VIR_FREE(uuids); return TRUE; } @@ -5867,7 +5868,7 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) virNodeListDevices(ctl->conn, cap, devices, num_devices, 0); if (num_devices < 0) { vshError(ctl, "%s", _("Failed to list node devices")); - free(devices); + VIR_FREE(devices); return FALSE; } qsort(&devices[0], num_devices, sizeof(char*), namesorter); @@ -5898,17 +5899,17 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) indentBuf); } for (i = 0 ; i < num_devices ; i++) { - free(devices[i]); - free(parents[i]); + VIR_FREE(devices[i]); + VIR_FREE(parents[i]); } - free(parents); + VIR_FREE(parents); } else { for (i = 0; i < num_devices; i++) { vshPrint(ctl, "%s\n", devices[i]); - free(devices[i]); + VIR_FREE(devices[i]); } } - free(devices); + VIR_FREE(devices); return TRUE; } @@ -5950,7 +5951,7 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd) } vshPrint(ctl, "%s\n", xml); - free(xml); + VIR_FREE(xml); virNodeDeviceFree(device); return TRUE; } @@ -6102,7 +6103,7 @@ cmdHostname (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } vshPrint (ctl, "%s\n", hostname); - free (hostname); + VIR_FREE(hostname); return TRUE; } @@ -6131,7 +6132,7 @@ cmdURI (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } vshPrint (ctl, "%s\n", uri); - free (uri); + VIR_FREE(uri); return TRUE; } @@ -6174,7 +6175,7 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); - free(doc); + VIR_FREE(doc); if (!xml) goto cleanup; ctxt = xmlXPathNewContext(xml); @@ -6248,7 +6249,7 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); - free(doc); + VIR_FREE(doc); if (!xml) goto cleanup; ctxt = xmlXPathNewContext(xml); @@ -6315,7 +6316,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) } ret = virDomainAttachDevice(dom, buffer); - free (buffer); + VIR_FREE(buffer); if (ret < 0) { vshError(ctl, _("Failed to attach device from %s"), from); @@ -6373,7 +6374,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) } ret = virDomainDetachDevice(dom, buffer); - free (buffer); + VIR_FREE(buffer); if (ret < 0) { vshError(ctl, _("Failed to detach device from %s"), from); @@ -6499,8 +6500,8 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) cleanup: if (dom) virDomainFree(dom); - free(buf); - free(tmp); + VIR_FREE(buf); + VIR_FREE(tmp); return ret; } @@ -6552,7 +6553,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); - free(doc); + VIR_FREE(doc); if (!xml) { vshError(ctl, "%s", _("Failed to get interface information")); goto cleanup; @@ -6776,8 +6777,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) cleanup: if (dom) virDomainFree(dom); - free(buf); - free(tmp); + VIR_FREE(buf); + VIR_FREE(tmp); return ret; } @@ -6825,7 +6826,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) xml = xmlReadDoc((const xmlChar *) doc, "domain.xml", NULL, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOWARNING); - free(doc); + VIR_FREE(doc); if (!xml) { vshError(ctl, "%s", _("Failed to get disk information")); goto cleanup; @@ -6927,7 +6928,7 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) return FALSE; result = virConnectCompareCPU(ctl->conn, buffer, 0); - free (buffer); + VIR_FREE(buffer); switch (result) { case VIR_CPU_COMPARE_INCOMPATIBLE: @@ -6979,7 +6980,7 @@ editWriteToTempFile (vshControl *ctl, const char *doc) if (fd == -1) { vshError(ctl, _("mkstemp: failed to create temporary file: %s"), strerror(errno)); - free (ret); + VIR_FREE(ret); return NULL; } @@ -6988,14 +6989,14 @@ editWriteToTempFile (vshControl *ctl, const char *doc) ret, strerror(errno)); close (fd); unlink (ret); - free (ret); + VIR_FREE(ret); return NULL; } if (close (fd) == -1) { vshError(ctl, _("close: %s: failed to write or close temporary file: %s"), ret, strerror(errno)); unlink (ret); - free (ret); + VIR_FREE(ret); return NULL; } @@ -7047,16 +7048,16 @@ editFile (vshControl *ctl, const char *filename) if (command_ret == -1) { vshError(ctl, _("%s: edit command failed: %s"), command, strerror(errno)); - free (command); + VIR_FREE(command); return -1; } if (command_ret != WEXITSTATUS (0)) { vshError(ctl, _("%s: command exited with non-zero status"), command); - free (command); + VIR_FREE(command); return -1; } - free (command); + VIR_FREE(command); return 0; } @@ -7153,7 +7154,7 @@ cmdPwd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) else vshPrint (ctl, _("%s\n"), cwd); - free (cwd); + VIR_FREE(cwd); return !err; } #endif @@ -7249,13 +7250,13 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) if (dom) virDomainFree (dom); - free (doc); - free (doc_edited); - free (doc_reread); + VIR_FREE(doc); + VIR_FREE(doc_edited); + VIR_FREE(doc_reread); if (tmp) { unlink (tmp); - free (tmp); + VIR_FREE(tmp); } return ret; @@ -7620,8 +7621,8 @@ vshCommandOptFree(vshCmdOpt * arg) a = a->next; - free(tmp->data); - free(tmp); + VIR_FREE(tmp->data); + VIR_FREE(tmp); } } @@ -7637,7 +7638,7 @@ vshCommandFree(vshCmd *cmd) if (tmp->opts) vshCommandOptFree(tmp->opts); - free(tmp); + VIR_FREE(tmp); } } @@ -7705,7 +7706,7 @@ vshCommandOptStringList(const vshCmd *cmd, const char *name, char ***data) if (arg->def && STREQ(arg->def->name, name)) { char **tmp = realloc(val, sizeof(*tmp) * (nval+1)); if (!tmp) { - free(val); + VIR_FREE(val); return -1; } val = tmp; @@ -8171,8 +8172,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr) vshError(ctl, _("unknown command: '%s'"), tkdata); goto syntaxError; /* ... or ignore this command only? */ } - free(tkdata); - tkdata = NULL; + VIR_FREE(tkdata); } else if (tk == VSH_TK_OPTION) { if (!(opt = vshCmddefGetOption(cmd, tkdata))) { vshError(ctl, @@ -8180,8 +8180,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr) cmd->name, tkdata); goto syntaxError; } - free(tkdata); /* option name */ - tkdata = NULL; + VIR_FREE(tkdata); /* option name */ if (opt->type != VSH_OT_BOOL) { /* option data */ @@ -8238,7 +8237,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr) c->next = NULL; if (!vshCommandCheckOpts(ctl, c)) { - free(c); + VIR_FREE(c); goto syntaxError; } @@ -8257,7 +8256,7 @@ vshCommandParse(vshControl *ctl, char *cmdstr) vshCommandFree(ctl->cmd); if (first) vshCommandOptFree(first); - free(tkdata); + VIR_FREE(tkdata); return FALSE; } @@ -8398,7 +8397,7 @@ _vshRealloc(vshControl *ctl, void *ptr, size_t size, const char *filename, int l if ((x = realloc(ptr, size))) return x; - free(ptr); + VIR_FREE(ptr); vshError(ctl, _("%s: %d: failed to allocate %d bytes"), filename, line, (int) size); exit(EXIT_FAILURE); @@ -8578,7 +8577,7 @@ vshCloseLogFile(vshControl *ctl) } if (ctl->logfile) { - free(ctl->logfile); + VIR_FREE(ctl->logfile); ctl->logfile = NULL; } } @@ -8644,7 +8643,7 @@ vshReadlineOptionsGenerator(const char *text, int state) cmd = vshCmddefSearch(cmdname); list_index = 0; len = strlen(text); - free(cmdname); + VIR_FREE(cmdname); } if (!cmd) @@ -8714,17 +8713,17 @@ vshReadlineInit(vshControl *ctl) if (virAsprintf(&ctl->historydir, "%s/.virsh", userdir) < 0) { vshError(ctl, "%s", _("Out of memory")); - free(userdir); + VIR_FREE(userdir); return -1; } if (virAsprintf(&ctl->historyfile, "%s/histroy", ctl->historydir) < 0) { vshError(ctl, "%s", _("Out of memory")); - free(userdir); + VIR_FREE(userdir); return -1; } - free(userdir); + VIR_FREE(userdir); read_history(ctl->historyfile); @@ -8743,11 +8742,8 @@ vshReadlineDeinit (vshControl *ctl) write_history(ctl->historyfile); } - free(ctl->historydir); - free(ctl->historyfile); - - ctl->historydir = NULL; - ctl->historyfile = NULL; + VIR_FREE(ctl->historydir); + VIR_FREE(ctl->historyfile); } static char * @@ -8800,7 +8796,7 @@ vshDeinit(vshControl *ctl) { vshReadlineDeinit(ctl); vshCloseLogFile(ctl); - free(ctl->name); + VIR_FREE(ctl->name); if (ctl->conn) { if (virConnectClose(ctl->conn) != 0) { vshError(ctl, "%s", _("failed to disconnect from the hypervisor")); @@ -8964,7 +8960,7 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) vshDebug(ctl, 2, "command: \"%s\"\n", cmdstr); ret = vshCommandParse(ctl, cmdstr); - free(cmdstr); + VIR_FREE(cmdstr); return ret; } return TRUE; @@ -9044,8 +9040,7 @@ main(int argc, char **argv) if (vshCommandParse(ctl, ctl->cmdstr)) vshCommandRun(ctl, ctl->cmd); } - free(ctl->cmdstr); - ctl->cmdstr = NULL; + VIR_FREE(ctl->cmdstr); } while (ctl->imode); if (ctl->cmdstr == NULL) -- 1.6.0.4

2 2

[libvirt] [PATCH] xend_internal: don't let invalid input provoke NULL dereference
by Jim Meyering 06 Jan '10

06 Jan '10

If there's a good reason to test for NULL "conn", then we certainly must not dereference "conn" before that point. This assumes we do want to retain the NULL test. Note that many other functions perform this same test. >From 2c7b628728efcb5a59c1e7aa1cba763f5ef0045a Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 6 Jan 2010 12:59:21 +0100 Subject: [PATCH] xend_internal: don't let invalid input provoke NULL dereference * src/xen/xend_internal.c (xenDaemonOpen_unix): Do not dereference a NULL "conn". Move first deref to follow the "conn == NULL" test. --- src/xen/xend_internal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 827aac4..be033f5 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -748,11 +748,12 @@ int xenDaemonOpen_unix(virConnectPtr conn, const char *path) { struct sockaddr_un *addr; - xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; + xenUnifiedPrivatePtr priv; if ((conn == NULL) || (path == NULL)) return (-1); + priv = (xenUnifiedPrivatePtr) conn->privateData; memset(&priv->addr, 0, sizeof(priv->addr)); priv->addrfamily = AF_UNIX; /* -- 1.6.6.387.g2649b1

2 2

[libvirt] [PATCH] virsh: Add persistent history using libreadline
by Matthias Bolte 06 Jan '10

06 Jan '10

--- tools/virsh.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 65 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 21f9710..e2a32b4 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -41,6 +41,7 @@ #endif #include "internal.h" +#include "virterror_internal.h" #include "base64.h" #include "buf.h" #include "console.h" @@ -197,6 +198,8 @@ typedef struct __vshControl { */ char *logfile; /* log file name */ int log_fd; /* log file descriptor */ + char *historydir; /* readline history directory name */ + char *historyfile; /* readline history file name */ } __vshControl; @@ -8689,9 +8692,11 @@ vshReadlineCompletion(const char *text, int start, } -static void -vshReadlineInit(void) +static int +vshReadlineInit(vshControl *ctl) { + char *userdir = NULL; + /* Allow conditional parsing of the ~/.inputrc file. */ rl_readline_name = "virsh"; @@ -8700,6 +8705,49 @@ vshReadlineInit(void) /* Limit the total size of the history buffer */ stifle_history(500); + + /* Prepare to read/write history from/to the ~/.virsh/history file */ + userdir = virGetUserDirectory(NULL, getuid()); + + if (userdir == NULL) + return -1; + + if (virAsprintf(&ctl->historydir, "%s/.virsh", userdir) < 0) { + vshError(ctl, "%s", _("Out of memory")); + free(userdir); + return -1; + } + + if (virAsprintf(&ctl->historyfile, "%s/histroy", ctl->historydir) < 0) { + vshError(ctl, "%s", _("Out of memory")); + free(userdir); + return -1; + } + + free(userdir); + + read_history(ctl->historyfile); + + return 0; +} + +static void +vshReadlineDeinit (vshControl *ctl) +{ + if (ctl->historyfile != NULL) { + if (mkdir(ctl->historydir, 0755) < 0 && errno != EEXIST) { + char ebuf[1024]; + vshError(ctl, _("Failed to create '%s': %s"), + ctl->historydir, virStrerror(errno, ebuf, sizeof ebuf)); + } else + write_history(ctl->historyfile); + } + + free(ctl->historydir); + free(ctl->historyfile); + + ctl->historydir = NULL; + ctl->historyfile = NULL; } static char * @@ -8710,8 +8758,15 @@ vshReadline (vshControl *ctl ATTRIBUTE_UNUSED, const char *prompt) #else /* !USE_READLINE */ +static int +vshReadlineInit (vshControl *ctl ATTRIBUTE_UNUSED) +{ + /* empty */ + return 0; +} + static void -vshReadlineInit (void) +vshReadlineDeinit (vshControl *ctl ATTRIBUTE_UNUSED) { /* empty */ } @@ -8743,6 +8798,7 @@ vshReadline (vshControl *ctl, const char *prompt) static int vshDeinit(vshControl *ctl) { + vshReadlineDeinit(ctl); vshCloseLogFile(ctl); free(ctl->name); if (ctl->conn) { @@ -8969,7 +9025,12 @@ main(int argc, char **argv) _("Type: 'help' for help with commands\n" " 'quit' to quit\n\n")); } - vshReadlineInit(); + + if (vshReadlineInit(ctl) < 0) { + vshDeinit(ctl); + exit(EXIT_FAILURE); + } + do { const char *prompt = ctl->readonly ? VSH_PROMPT_RO : VSH_PROMPT_RW; ctl->cmdstr = -- 1.6.0.4

3 3

[libvirt] [PATCH] esx: Fix 'vpx' MAC address range and allow arbitrary MAC addresses
by Matthias Bolte 06 Jan '10

06 Jan '10

The MAC addresses with 00:50:56 prefix are split into several ranges: 00:50:56:00:00:00 - 00:50:56:3f:ff:ff 'static' range (manually assigned) 00:50:56:80:00:00 - 00:50:56:bf:ff:ff 'vpx' range (assigned by a VI Client) Erroneously the 'vpx' range was assumed to be larger and to occupy the remaining addresses of the 00:50:56 prefix that are not part of the 'static' range. 00:50:56 was used as prefix for generated MAC addresses, this is not possible anymore, because there are gaps in the allowed ranges. Therefore, change the prefix to 00:0c:29 which is the prefix for auto generated MAC addresses anyway. Allow arbitrary MAC addresses to be used and set the checkMACAddress VMX option to false in case the MAC address doesn't fall into any predefined range. * docs/drvesx.html.in: update website accordingly * src/esx/esx_driver.c: set the auto generation prefix to 00:0c:29 * src/esx/esx_vmx.c: fix MAC address range handling and allow arbitrary MAC addresses * tests/vmx2xml*, tests/xml2vmx*: add some basic MAC address range tests --- docs/drvesx.html.in | 74 ++++++++++++++++++++-- src/esx/esx_driver.c | 2 +- src/esx/esx_vmx.c | 49 +++++++++------ tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx | 8 +++ tests/vmx2xmldata/vmx2xml-ethernet-generated.xml | 19 ++++++ tests/vmx2xmldata/vmx2xml-ethernet-other.vmx | 8 +++ tests/vmx2xmldata/vmx2xml-ethernet-other.xml | 19 ++++++ tests/vmx2xmldata/vmx2xml-ethernet-static.vmx | 7 ++ tests/vmx2xmldata/vmx2xml-ethernet-static.xml | 19 ++++++ tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx | 7 ++ tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml | 19 ++++++ tests/vmx2xmltest.c | 5 ++ tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx | 13 ++++ tests/xml2vmxdata/xml2vmx-ethernet-generated.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-ethernet-other.vmx | 13 ++++ tests/xml2vmxdata/xml2vmx-ethernet-other.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-ethernet-static.vmx | 12 ++++ tests/xml2vmxdata/xml2vmx-ethernet-static.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx | 12 ++++ tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml | 14 ++++ tests/xml2vmxtest.c | 5 ++ 21 files changed, 320 insertions(+), 27 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-generated.xml create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-other.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-other.xml create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-static.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-static.xml create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-generated.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-other.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-other.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-static.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-static.xml create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index b7909ff..44a144f 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -16,8 +16,8 @@ SOAP based <a href="http://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/"> VMware Virtual Infrastructure API</a> (VI API) to communicate with the - ESX server, like the VMware Virtual Infrastructure Client does. Since - version 4.0 this API is called + ESX server, like the VMware Virtual Infrastructure Client (VI client) + does. Since version 4.0 this API is called <a href="http://www.vmware.com/support/developer/vc-sdk/visdk400pubs/ReferenceGuide/"> VMware vSphere API</a>. </p> @@ -159,7 +159,7 @@ type://[username@]hostname[:port]/[?extraparameters] There are several specialties in the domain XML config for ESX domains. </p> - <h3>Restrictions</h3> + <h3><a name="restrictions">Restrictions</h3> <p> There are some restrictions for some values of the domain XML config. The driver will complain if this restrictions are violated. @@ -173,12 +173,13 @@ type://[username@]hostname[:port]/[?extraparameters] </li> <li> Valid MAC address prefixes are <code>00:0c:29</code> and - <code>00:50:56</code> + <code>00:50:56</code>. <span class="since">Since 0.7.6</span> + arbitrary <a href="#macaddresses">MAC addresses</a> are supported. </li> </ul> - <h3>Datastore references</h3> + <h3><a name="datastore">Datastore references</h3> <p> Storage is managed in datastores. VMware uses a special path format to reference files in a datastore. Basically, the datastore name is put @@ -197,7 +198,68 @@ type://[username@]hostname[:port]/[?extraparameters] </p> - <h3>Available hardware</h3> + <h3><a name="macaddresses">MAC addresses</h3> + <p> + VMware has registered two MAC address prefixes for domains: + <code>00:0c:29</code> and <code>00:50:56</code>. These prefixes are + split into ranges for different purposes. + </p> + <table class="top_table"> + <tr> + <th>Range</th> + <th>Purpose</th> + </tr> + <tr> + <td> + <code>00:0c:29:00:00:00</code> - <code>00:0c:29:ff:ff:ff</code> + </td> + <td> + An ESX server autogenerates MAC addresses from this range if + the VMX file doesn't contain a MAC address when trying to start + a domain. + </td> + </tr> + <tr> + <td> + <code>00:50:56:00:00:00</code> - <code>00:50:56:3f:ff:ff</code> + </td> + <td> + MAC addresses from this range can by manually assigned by the + user in the VI client. + </td> + </tr> + <tr> + <td> + <code>00:50:56:80:00:00</code> - <code>00:50:56:bf:ff:ff</code> + </td> + <td> + A VI client autogenerates MAC addresses from this range for + newly defined domains. + </td> + </tr> + </table> + <p> + The VMX files generated by the ESX driver always contain a MAC address, + because libvirt generates a random one if an interface element in the + domain XML file lacks a MAC address. + <span class="since">Since 0.7.6</span> the ESX driver sets the prefix + for generated MAC addresses to <code>00:0c:29</code>. Before 0.7.6 + the <code>00:50:56</code> prefix was used. Sometimes this resulted in + the generation of out-of-range MAC address that were rejected by the + ESX server. + </p> + <p> + Also <span class="since">since 0.7.6</span> every MAC address outside + this ranges can be used. For such MAC addresses the ESX server-side + check is disabled in the VMX file to stop the ESX server from rejecting + out-of-predefined-range MAC addresses. + </p> +<pre> +ethernet0.checkMACAddress = "false" +</pre> + + + <h3><a name="hardware">Available hardware</h3> <p> VMware ESX supports different models of SCSI controllers and network cards. diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 30e21e0..f86654a 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -184,7 +184,7 @@ esxCapsInit(virConnectPtr conn) return NULL; } - virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x00, 0x50, 0x56 }); + virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x00, 0x0c, 0x29 }); virCapabilitiesAddHostMigrateTransport(caps, "esx"); /* i686 */ diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index d3cad1d..4b334b6 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -266,8 +266,8 @@ def->nets[0]... ethernet0.addressType = "generated" # default to "generated" - ethernet0.generatedAddressOffset = "0" # ? ->mac = <value> <=> ethernet0.generatedAddress = "<value>" + ethernet0.generatedAddressOffset = "0" # ? ethernet0.addressType = "static" # default to "generated" @@ -277,10 +277,15 @@ def->nets[0]... ethernet0.addressType = "vpx" # default to "generated" ->mac = <value> <=> ethernet0.generatedAddress = "<value>" + + ethernet0.addressType = "static" # default to "generated" +->mac = <value> <=> ethernet0.address = "<value>" + ethernet0.checkMACAddress = "false" # mac address outside the VMware prefixes + # 00:0c:29 prefix for autogenerated mac's -> ethernet0.addressType = "generated" # 00:50:56 prefix for manual configured mac's # 00:50:56:00:00:00 - 00:50:56:3f:ff:ff -> ethernet0.addressType = "static" - # 00:50:56:40:00:00 - 00:50:56:ff:ff:ff -> ethernet0.addressType = "vpx" + # 00:50:56:80:00:00 - 00:50:56:bf:ff:ff -> ethernet0.addressType = "vpx" # 00:05:69 old prefix from esx 1.5 @@ -2602,6 +2607,7 @@ esxVMX_FormatEthernet(virConnectPtr conn, virDomainNetDefPtr def, int controller, virBufferPtr buffer) { char mac_string[VIR_MAC_STRING_BUFLEN]; + unsigned int prefix, suffix; if (controller < 0 || controller > 3) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, @@ -2654,33 +2660,36 @@ esxVMX_FormatEthernet(virConnectPtr conn, virDomainNetDefPtr def, return -1; } + /* def:mac -> vmx:addressType, vmx:(generated)Address, vmx:checkMACAddress */ virFormatMacAddr(def->mac, mac_string); - if (def->mac[0] == 0x00 && def->mac[1] == 0x0c && def->mac[2] == 0x29) { + prefix = (def->mac[0] << 16) | (def->mac[1] << 8) | def->mac[2]; + suffix = (def->mac[3] << 16) | (def->mac[4] << 8) | def->mac[5]; + + if (prefix == 0x000c29) { virBufferVSprintf(buffer, "ethernet%d.addressType = \"generated\"\n", controller); virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", controller, mac_string); virBufferVSprintf(buffer, "ethernet%d.generatedAddressOffset = \"0\"\n", controller); - } else if (def->mac[0] == 0x00 && def->mac[1] == 0x50 && def->mac[2] == 0x56) { - if (def->mac[3] <= 0x3f) { - virBufferVSprintf(buffer, "ethernet%d.addressType = \"static\"\n", - controller); - virBufferVSprintf(buffer, "ethernet%d.address = \"%s\"\n", - controller, mac_string); - } else { - virBufferVSprintf(buffer, "ethernet%d.addressType = \"vpx\"\n", - controller); - virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", - controller, mac_string); - } + } else if (prefix == 0x005056 && suffix <= 0x3fffff) { + virBufferVSprintf(buffer, "ethernet%d.addressType = \"static\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.address = \"%s\"\n", + controller, mac_string); + } else if (prefix == 0x005056 && suffix >= 0x800000 && suffix <= 0xbfffff) { + virBufferVSprintf(buffer, "ethernet%d.addressType = \"vpx\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.generatedAddress = \"%s\"\n", + controller, mac_string); } else { - ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Unsupported MAC address prefix '%02X:%02X:%02X', expecting " - "'00:0c:29' or '00:50:56'", - def->mac[0], def->mac[1], def->mac[2]); - return -1; + virBufferVSprintf(buffer, "ethernet%d.addressType = \"static\"\n", + controller); + virBufferVSprintf(buffer, "ethernet%d.address = \"%s\"\n", + controller, mac_string); + virBufferVSprintf(buffer, "ethernet%d.checkMACAddress = \"false\"\n", + controller); } return 0; diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx new file mode 100644 index 0000000..f27e0a0 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.vmx @@ -0,0 +1,8 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "generated" +ethernet0.generatedAddress = "00:0C:29:11:22:33" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml new file mode 100644 index 0000000..ffb203b --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml @@ -0,0 +1,19 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:0c:29:11:22:33'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-other.vmx new file mode 100644 index 0000000..da46a70 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.vmx @@ -0,0 +1,8 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.checkMACAddress = "false" +ethernet0.addressType = "static" +ethernet0.address = "00:12:34:56:78:90" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml new file mode 100644 index 0000000..4c44fbc --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml @@ -0,0 +1,19 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:12:34:56:78:90'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-static.vmx new file mode 100644 index 0000000..8b7a5b3 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.vmx @@ -0,0 +1,7 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml new file mode 100644 index 0000000..7ef2d3d --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml @@ -0,0 +1,19 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:50:56:11:22:33'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx new file mode 100644 index 0000000..b4d9172 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.vmx @@ -0,0 +1,7 @@ +config.version = "8" +virtualHW.version = "4" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "vpx" +ethernet0.generatedAddress = "00:50:56:87:65:43" diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml new file mode 100644 index 0000000..1d90f31 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml @@ -0,0 +1,19 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory>32768</memory> + <currentMemory>32768</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:50:56:87:65:43'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 150a58d..0cb387b 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -139,6 +139,11 @@ mymain(int argc, char **argv) DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); + DO_TEST("ethernet-generated", "ethernet-generated", esxVI_APIVersion_25); + DO_TEST("ethernet-static", "ethernet-static", esxVI_APIVersion_25); + DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_APIVersion_25); + DO_TEST("ethernet-other", "ethernet-other", esxVI_APIVersion_25); + DO_TEST("serial-file", "serial-file", esxVI_APIVersion_25); DO_TEST("serial-device", "serial-device", esxVI_APIVersion_25); DO_TEST("serial-pipe-client-app", "serial-pipe", esxVI_APIVersion_25); diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx new file mode 100644 index 0000000..ae825a5 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx @@ -0,0 +1,13 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-generated" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "generated" +ethernet0.generatedAddress = "00:0C:29:11:22:33" +ethernet0.generatedAddressOffset = "0" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-generated.xml b/tests/xml2vmxdata/xml2vmx-ethernet-generated.xml new file mode 100644 index 0000000..aac8a74 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-generated.xml @@ -0,0 +1,14 @@ +<domain type='vmware'> + <name>ethernet-generated</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:0c:29:11:22:33'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx new file mode 100644 index 0000000..452076a --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx @@ -0,0 +1,13 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-static" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:12:34:56:78:90" +ethernet0.checkMACAddress = "false" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-other.xml b/tests/xml2vmxdata/xml2vmx-ethernet-other.xml new file mode 100644 index 0000000..cf1ce7c --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-other.xml @@ -0,0 +1,14 @@ +<domain type='vmware'> + <name>ethernet-static</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:12:34:56:78:90'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx new file mode 100644 index 0000000..154a28b --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx @@ -0,0 +1,12 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-static" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "static" +ethernet0.address = "00:50:56:11:22:33" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-static.xml b/tests/xml2vmxdata/xml2vmx-ethernet-static.xml new file mode 100644 index 0000000..b803de4 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-static.xml @@ -0,0 +1,14 @@ +<domain type='vmware'> + <name>ethernet-static</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:50:56:11:22:33'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx new file mode 100644 index 0000000..31283f6 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx @@ -0,0 +1,12 @@ +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "ethernet-vpx" +memsize = "4" +numvcpus = "1" +ethernet0.present = "true" +ethernet0.networkName = "VM Network" +ethernet0.connectionType = "bridged" +ethernet0.addressType = "vpx" +ethernet0.generatedAddress = "00:50:56:87:65:43" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml new file mode 100644 index 0000000..1490238 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml @@ -0,0 +1,14 @@ +<domain type='vmware'> + <name>ethernet-vpx</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <interface type='bridge'> + <mac address='00:50:56:87:65:43'/> + <source bridge='VM Network'/> + </interface> + </devices> +</domain> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index abf1f32..b5b7cc8 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -192,6 +192,11 @@ mymain(int argc, char **argv) DO_TEST("ethernet-custom", "ethernet-custom", esxVI_APIVersion_25); DO_TEST("ethernet-bridged", "ethernet-bridged", esxVI_APIVersion_25); + DO_TEST("ethernet-generated", "ethernet-generated", esxVI_APIVersion_25); + DO_TEST("ethernet-static", "ethernet-static", esxVI_APIVersion_25); + DO_TEST("ethernet-vpx", "ethernet-vpx", esxVI_APIVersion_25); + DO_TEST("ethernet-other", "ethernet-other", esxVI_APIVersion_25); + DO_TEST("serial-file", "serial-file", esxVI_APIVersion_25); DO_TEST("serial-device", "serial-device", esxVI_APIVersion_25); DO_TEST("serial-pipe", "serial-pipe", esxVI_APIVersion_25); -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Fix deserialization for VI API calls CancelTask and UnregisterVM
by Matthias Bolte 06 Jan '10

06 Jan '10

--- src/esx/esx_vi_methods.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index be21112..7925f26 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -601,7 +601,7 @@ esxVI_CancelTask(virConnectPtr conn, esxVI_Context *ctx, request = virBufferContentAndReset(&buffer); - if (esxVI_Context_Execute(conn, ctx, "UnregisterVM", request, &response, + if (esxVI_Context_Execute(conn, ctx, "CancelTask", request, &response, esxVI_Occurrence_None) < 0) { goto failure; } @@ -652,7 +652,7 @@ esxVI_UnregisterVM(virConnectPtr conn, esxVI_Context *ctx, request = virBufferContentAndReset(&buffer); - if (esxVI_Context_Execute(conn, ctx, "AnswerVM", request, &response, + if (esxVI_Context_Execute(conn, ctx, "UnregisterVM", request, &response, esxVI_Occurrence_None) < 0) { goto failure; } -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Fix and improve the libcurl debug callback
by Matthias Bolte 06 Jan '10

06 Jan '10

The data passed to the callback is not guaranteed to be zero terminated, take care of that by coping the data and adding a zero terminator. Also dump the data for other types than CURLINFO_TEXT. Set CURLOPT_VERBOSE to 1 so the debug callback is called when enabled. --- src/esx/esx_vi.c | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index a7498f0..bad987c 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -181,27 +181,50 @@ static int esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, char *info, size_t size, void *data ATTRIBUTE_UNUSED) { + char *buffer = NULL; + + /* + * The libcurl documentation says: + * + * The data pointed to by the char * passed to this function WILL NOT + * be zero terminated, but will be exactly of the size as told by the + * size_t argument. + * + * To handle this properly in order to pass the info string to VIR_DEBUG + * a zero terminated copy of the info string has to be allocated. + */ + if (VIR_ALLOC_N(buffer, size + 1) < 0) { + return 0; + } + + if (virStrncpy(buffer, info, size, size + 1) == NULL) { + VIR_FREE(buffer); + return 0; + } + switch (type) { case CURLINFO_TEXT: - VIR_DEBUG0("CURLINFO_TEXT"); - fwrite(info, 1, size, stderr); - printf("\n\n"); + if (size > 0 && buffer[size - 1] == '\n') { + buffer[size - 1] = '\0'; + } + + VIR_DEBUG("CURLINFO_TEXT [[[[%s]]]]", buffer); break; case CURLINFO_HEADER_IN: - VIR_DEBUG0("CURLINFO_HEADER_IN"); + VIR_DEBUG("CURLINFO_HEADER_IN [[[[%s]]]]", buffer); break; case CURLINFO_HEADER_OUT: - VIR_DEBUG0("CURLINFO_HEADER_OUT"); + VIR_DEBUG("CURLINFO_HEADER_OUT [[[[%s]]]]", buffer); break; case CURLINFO_DATA_IN: - VIR_DEBUG0("CURLINFO_DATA_IN"); + VIR_DEBUG("CURLINFO_DATA_IN [[[[%s]]]]", buffer); break; case CURLINFO_DATA_OUT: - VIR_DEBUG0("CURLINFO_DATA_OUT"); + VIR_DEBUG("CURLINFO_DATA_OUT [[[[%s]]]]", buffer); break; default: @@ -209,6 +232,8 @@ esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, break; } + VIR_FREE(buffer); + return 0; } #endif @@ -338,8 +363,8 @@ esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_WRITEFUNCTION, esxVI_CURL_WriteBuffer); #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT - curl_easy_setopt(ctx->curl_handle, CURLOPT_DEBUGFUNCTION, - esxVI_CURL_Debug); + curl_easy_setopt(ctx->curl_handle, CURLOPT_DEBUGFUNCTION, esxVI_CURL_Debug); + curl_easy_setopt(ctx->curl_handle, CURLOPT_VERBOSE, 1); #endif if (virMutexInit(&ctx->curl_lock) < 0) { -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Don't warn about an empty URI path
by Matthias Bolte 06 Jan '10

06 Jan '10

--- src/esx/esx_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5cdadfd..30e21e0 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -293,7 +293,8 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags ATTRIBUTE_UNUSED) return VIR_DRV_OPEN_DECLINED; } - if (conn->uri->path != NULL && STRNEQ(conn->uri->path, "/")) { + if (conn->uri->path != NULL && STRNEQ(conn->uri->path, "") && + STRNEQ(conn->uri->path, "/")) { VIR_WARN("Ignoring unexpected path '%s' in URI", conn->uri->path); } -- 1.6.0.4

2 1

[libvirt] [PATCH] esx: Also allow virtualHW version 4 for ESX 4.0
by Matthias Bolte 06 Jan '10

06 Jan '10

A domain with virtualHW version 4 is allowed on an ESX 4.0 server. If a domain is migrated from an ESX 3.5 server to an ESX 4.0 server then the virtualHW version stays the same. So a ESX 4.0 server can host domains with virtualHW version 4. --- src/esx/esx_vmx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 9aad592..d3cad1d 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -780,9 +780,9 @@ esxVMX_ParseConfig(virConnectPtr conn, esxVI_Context *ctx, const char *vmx, break; case esxVI_APIVersion_40: - if (virtualHW_version != 7) { + if (virtualHW_version != 4 && virtualHW_version != 7) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Expecting VMX entry 'virtualHW.version' to be 7 for " + "Expecting VMX entry 'virtualHW.version' to be 4 or 7 for " "VI API version 4.0 but found %lld", virtualHW_version); goto failure; } -- 1.6.0.4

2 1

[libvirt] [PATCH] Don't free an uninitalized pointer in update_driver_name()
by Matthias Bolte 06 Jan '10

06 Jan '10

This invalid free results in heap corruption. Some symptoms I saw because of this were libvirtd crashing and virt-manager hanging while trying to enumerate devices. --- src/node_device/node_device_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index ecbac0f..fbadfca 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -78,7 +78,7 @@ static int update_driver_name(virConnectPtr conn, virNodeDeviceObjPtr dev) { char *driver_link = NULL; - char *devpath; + char *devpath = NULL; char *p; int ret = -1; @@ -114,7 +114,7 @@ static int update_driver_name(virConnectPtr conn, cleanup: VIR_FREE(driver_link); - free(devpath); + VIR_FREE(devpath); return ret; } #else -- 1.6.0.4

2 1

[libvirt] Fwd: Re: [Qemu-devel] Re: qemu-kvm-0.12 bug?
by Thomas Treutner 06 Jan '10

06 Jan '10

Hi, there is a new parameter in qemu-0.12 required for virtio_balloon support. Is there an appropriate XML-entry in libvirt's domain config yet or any plans to introduce one? A quick googling for "libvirt balloon" didn't reveal any hints. Adam, how did you test the memstat reporting feature? kr, tom ---------- Forwarded Message ---------- Subject: Re: [Qemu-devel] Re: qemu-kvm-0.12 bug? Date: Tuesday 29 December 2009 From: Luiz Capitulino <lcapitulino(a)redhat.com> To: Thomas Treutner <thomas(a)scripty.at> On Tue, 29 Dec 2009 13:08:26 +0100 Thomas Treutner <thomas(a)scripty.at> wrote: > On Tuesday 29 December 2009 12:48:39 Luiz Capitulino wrote: > > On Tue, 29 Dec 2009 13:10:36 +0200 Avi Kivity <avi(a)redhat.com> wrote: > > > Hm, I get "The balloon device has not been activated by the guest" in > > > the qemu monitor. > > > > Is the "-balloon virtio" parameter passed on the command-line? > > # grep balloon /usr/local/var/log/libvirt/qemu/* | wc -l > 0 > > These logs include some history - so the parameter isn't used by libvirt even > when ballooning works? This parameter is new in qemu-0.12.

5 8

[libvirt] [PATCH 0/1] Don't update vol details after build
by David Allan 06 Jan '10

06 Jan '10

This patch fixes the bug reported at: https://bugzilla.redhat.com/show_bug.cgi?id=510450 See the patch for details. Dave

3 3

[libvirt] [PATCH] Disable building of static Python module.
by Diego Elio Pettenò 06 Jan '10

06 Jan '10

Python modules are loaded at runtime so the static version of it is not really needed, this avoids duplicating the build for the PIC and non-PIC cases. --- python/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/python/Makefile.am b/python/Makefile.am index 04342b7..58c6729 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -39,7 +39,7 @@ libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h # need extra flags here libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@ -libvirtmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs \ +libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \ @CYGWIN_EXTRA_LDFLAGS@ libvirtmod_la_LIBADD = $(mylibs) \ @CYGWIN_EXTRA_LIBADD@ @CYGWIN_EXTRA_PYTHON_LIBADD@ -- 1.6.6.rc4

2 1

[libvirt] [PATCH] Fix parsing of 'info chardev' line endings
by Matthew Booth 06 Jan '10

06 Jan '10

This change makes the 'info chardev' parser ignore any trailing whitespace on a line. This fixes a specific problem handling a '\r\n' line ending. * src/qemu/qemu_monitor_text.c: Ignore trailing whitespace in 'info chardev' output. --- src/qemu/qemu_monitor_text.c | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 0cb9ea6..4fd8c4a 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1622,15 +1622,26 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, goto cleanup; } - char *pos = reply; /* The current start of searching */ - char *end = pos + strlen(reply); /* The end of the reply string */ + char *pos; /* The current start of searching */ + char *next = reply; /* The start of the next line */ char *eol; /* The character which ends the current line */ + char *end = reply + strlen(reply); /* The end of the reply string */ + + while (next) { + pos = next; - while (pos < end) { /* Split the output into lines */ eol = memchr(pos, '\n', end - pos); - if (eol == NULL) + if (eol == NULL) { eol = end; + next = NULL; + } else { + next = eol + 1; + } + + /* Ignore all whitespace immediately before eol */ + while (eol > pos && c_isspace(*(eol-1))) + eol -= 1; /* Look for 'filename=pty:' */ #define NEEDLE "filename=pty:" @@ -1638,13 +1649,13 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, /* If it's not there we can ignore this line */ if (!needle) - goto next; + continue; /* id is everthing from the beginning of the line to the ':' * find ':' and turn it into a terminator */ char *colon = memchr(pos, ':', needle - pos); if (colon == NULL) - goto next; + continue; *colon = '\0'; char *id = pos; @@ -1664,9 +1675,6 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, goto cleanup; } #undef NEEDLE - - next: - pos = eol + 1; } ret = 0; -- 1.6.5.2

3 2

[libvirt] iptables rules location
by Mihamina Rakotomandimby 06 Jan '10

06 Jan '10

Manao ahoana, Hello, Bonjour, When starting libvirt there are some iptables rules setup. I would like to know where are they stored (and the filename, I use ubuntu package, need to 'find' or 'locate'). Misaotra, Thanks, Merci. -- Architecte Informatique chez Blueline/Gulfsat: Administration Systeme, Recherche & Developpement +261 34 29 155 34 / +261 33 11 207 36

2 1

[libvirt] [PATCH] vbox_tmpl.c: avoid NULL deref upon vboxDomainCreateXML failure
by Jim Meyering 05 Jan '10

05 Jan '10

Similar to others, >From 5dcb4d95a351cb6fa32ebaafb96756275e1079e2 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 16 Dec 2009 13:56:57 +0100 Subject: [PATCH] vbox_tmpl.c: avoid NULL deref upon vboxDomainCreateXML failure * src/vbox/vbox_tmpl.c (vboxDomainCreateXML): Don't call vboxDomainUndefine on a NULL "dom". --- src/vbox/vbox_tmpl.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d6b681c..ba70053 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -990,8 +990,6 @@ cleanup: static virDomainPtr vboxDomainCreateXML(virConnectPtr conn, const char *xml, unsigned int flags ATTRIBUTE_UNUSED) { - virDomainPtr dom = NULL; - /* VirtualBox currently doesn't have support for running * virtual machines without actually defining them and thus * for time being just define new machine and start it. @@ -1000,17 +998,13 @@ static virDomainPtr vboxDomainCreateXML(virConnectPtr conn, const char *xml, * change this behaviour to the expected one. */ - dom = vboxDomainDefineXML(conn, xml); - if (dom) { - if (vboxDomainCreate(dom) < 0) - goto cleanup; - } else { - goto cleanup; - } + virDomainPtr dom = vboxDomainDefineXML(conn, xml); + if (dom == NULL) + return NULL; - return dom; + if (0 < vboxDomainCreate(dom)) + return dom; -cleanup: vboxDomainUndefine(dom); return NULL; } -- 1.6.6.rc2.275.g51e2d

2 7

[libvirt] [PATCH] qemu_driver.c: remove useless, warning-provoking test
by Jim Meyering 05 Jan '10

05 Jan '10

Tools like coverity and maybe clang notice that we dereference uri_out, and then (later) test whether uri_out is NULL. Obviously one or the other must go. Presuming that we will always pass a non-NULL uri_out arg to this function, I chose to mark that parameter as ATTRIBUTE_NONNULL. I removed the unnecessary test, too. If anyone is concerned that a non-NULL (non-literal) value will be passed, I can also add an assertion. >From 6ce3a9656d978b37d866f55606bc5031ad8e6b2f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 5 Jan 2010 16:32:11 +0100 Subject: [PATCH] qemu_driver.c: remove useless, warning-provoking test * src/qemu/qemu_driver.c (qemudDomainMigratePrepare2): Remove useless test of always-non-NULL uri_out parameter. Use ATTRIBUTE_NONNULL to inform tools. --- src/qemu/qemu_driver.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4639478..daa6f94 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1,7 +1,7 @@ /* * driver.c: core driver methods for managing qemu guests * - * Copyright (C) 2006, 2007, 2008, 2009 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008, 2009, 2010 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -6961,7 +6961,7 @@ cleanup: * * This starts an empty VM listening on a TCP port. */ -static int +static int ATTRIBUTE_NONNULL (5) qemudDomainMigratePrepare2 (virConnectPtr dconn, char **cookie ATTRIBUTE_UNUSED, int *cookielen ATTRIBUTE_UNUSED, @@ -7068,7 +7068,7 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, } } - if (uri_out && *uri_out) + if (*uri_out) VIR_DEBUG("Generated uri_out=%s", *uri_out); /* Parse the domain XML. */ -- 1.6.6.387.g2649b1

2 2

[libvirt] [PATCH] qemu_driver.c: avoid NULL dereference upon disk-op failure
by Jim Meyering 05 Jan '10

05 Jan '10

The local, "cgroup" is initialized to NULL, and may still have that value when the code below is reached. That would provoke a NULL-dereference in virCgroupDenyDevicePath. >From c1caed370a7b2eae2e964a6059b014530143075c Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 16 Dec 2009 14:15:50 +0100 Subject: [PATCH] qemu_driver.c: avoid NULL dereference upon disk-op failure * src/qemu/qemu_driver.c (qemudDomainAttachDevice): Call virCgroupDenyDevicePath only if cgroup is non-NULL. --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9ef6c35..81afecf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5485,7 +5485,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom, virDomainDiskDeviceTypeToString(dev->data.disk->device)); /* Fallthrough */ } - if (ret != 0) { + if (ret != 0 && cgroup) { virCgroupDenyDevicePath(cgroup, dev->data.disk->src); } -- 1.6.6.rc2.275.g51e2d

2 2

[libvirt] Migration with non-shared storage
by Kenneth Nagin 05 Jan '10

05 Jan '10

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

1 0

[libvirt] [PATCH] openvz_conf.c: don't dereference NULL upon failure
by Jim Meyering 05 Jan '10

05 Jan '10

"dom" is set to NULL within the while loop: virDomainObjUnlock(dom); dom = NULL; If on a subsequent iteration something fails, we goto "cleanup" or "no_memory", both of which have us run this code: fclose(fp); virDomainObjUnref(dom); return -1; And the virDomainObjUnref function would dereference "dom". >From 3971ff17c7e9f1ddbc443d48b86fe6ba60a2d4a0 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 15 Dec 2009 16:16:57 +0100 Subject: [PATCH] openvz_conf.c: don't dereference NULL upon failure * src/openvz/openvz_conf.c (openvzLoadDomains): Avoid NULL deref of "dom". --- src/openvz/openvz_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 7e9abbf..43bbaf2 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -535,7 +535,8 @@ int openvzLoadDomains(struct openvz_driver *driver) { cleanup: fclose(fp); - virDomainObjUnref(dom); + if (dom) + virDomainObjUnref(dom); return -1; } -- 1.6.6.rc2.275.g51e2d

2 2

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

04 Jan '10

Hi. This is a patchset for blocking assignment of PCI devices below non-ACS capable switch. In case user still wants to assign such device even though it might not be safe, she can specify permissive='yes' attribute for <hostdev>. Special thanks to Chris L. who created a standalone program the PCI check. This code is a port of that check to libvirt. Jiri Denemark (3): Tests for ACS in PCIe switches New 'permissive' attribute for hostdev Use pciDeviceIsAssignable in qemu driver docs/schemas/domain.rng | 8 +++ src/conf/domain_conf.c | 14 ++++- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 3 + src/qemu/qemu_driver.c | 9 +++- src/util/pci.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/pci.h | 7 ++ 7 files changed, 186 insertions(+), 3 deletions(-)

5 12

Re: [libvirt] New libvirt API for domain memory statistics reporting (V3)
by Thomas Treutner 04 Jan '10

04 Jan '10

On Wednesday 23 December 2009 19:42:20 Adam Litke wrote: > Attached to this email are two patches: > > memstats-kernel-2.6.32-rc5.patch: > Applies to 2.6.32-rc5 which should be a capable-enough kernel for > testing and development. > > memstats-qemu-0.12.1.patch: > Applies to qemu-0.12.1 which can be found here: > http://mirrors.igsobe.com/nongnu/qemu/qemu-0.12.1.tar.gz > Unfortunately, it is not trivial for me to port this work to 0.11.0 so > you will have to find a resolution to your BIOS woes first and then use > this version. Who knows, it might already be fixed in 0.12.1. I tried with qemu-*kvm*-0.12.1.1, no memstats yet, but dynamically setting the amount of memory now doesn't work at all. I'll try to isolate the problem, I suspect it comes from qemu-kvm-0.12.1.1. I can't use qemu-0.12.1: $ ./configure --enable-kvm --disable-xen #error Missing KVM capability KVM_CAP_DESTROY_MEMORY_REGION_WORKS NOTE: To enable KVM support, update your kernel to 2.6.29+ or install recent kvm-kmod from http://sourceforge.net/projects/kvm. ERROR ERROR: User requested feature kvm ERROR: configure was not able to find it ERROR $ uname -r 2.6.32.2 $ modinfo kvm_amd ... vermagic: 2.6.32.2 SMP mod_unload modversions .... kr,tom

2 1

[libvirt] [PATCH 0/12] Standardized device addressing & SCSI controller/disk hotplug
by Daniel P. Berrange 04 Jan '10

04 Jan '10

This patch series is a combination of series done by Wolfgang Mauerer to support proper SCSI drive hotplug and new work by myself to introduce generic addressing for all devices. Wolfgang's most recent posting was http://www.redhat.com/archives/libvir-list/2009-November/msg00574.html http://www.redhat.com/archives/libvir-list/2009-November/msg00701.html When testing that series I came across a few minor issues, but more importantly it made me realize how important it is that we introduce explicit device addressing in our XML format. Wolfgang's series had added new element for SCSI controllers, with PCI address info about the controller <controller type='ide' index='0'> <address domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> And had also extended the <disk> element to include a SCSI controller name, and bus/unit ID. eg <disk> ... <controller name="<identifier>" pci_addr="<addr>" bus="<number>" unit="<number>"/> </disk> I then remembered that for support NIC/VirtIO/hostdev disk unplug Mark M had previously added PCI address information to the internal XML state files for <interface>, <disk> and <hostdev> elements. All of these places using PCI addresses suffered from the fact that we only knew the addresses of devices we'd hotplug and had no idea of addresses of devices present at boot time. A further issue with the addition of <controller> to the <disk> element, is that not all disk types have a concept of a controller. For example, every VirtIO disk is in fact a full PCI device, so having a <controller> element in <disk> is not meaningful for VirtIO. The solution that I believe solves all our problems, is to add a generic <address> element to every single device. This address element contains info about how the device is associated with the logical parent device. There will be three types of address in this series of patches, though we could imagine adding more later. - PCI address - domain, bus, slot, function - USB address - bus, device - Drive address - controller, bus, unit Anything that is a PCI device will obviously use PCI addresses. - PCI: sound, audio, video, all virtio, watchdog, disk controllers - USB: all usb devices - Drive: SCSI, IDE & Floppy disks, but *not* VirtIO/Xen disks Xen paravirt devices aren't really covered in this scheme. I could imagine adding a fourth address type for Xen. This would in fact let us handle driver domains - ie a backend outside dom0. I won't deal with Xen in this series though. The XML for each address type looks like <address type='pci' mode='static' domain='0x0000' bus='0x1e' slot='0x07' function='0x0'/> <address type='usb' mode='dynamic' bus='007' dev='003'/> <address type='drive' mode='dynamic' controller='1' bus='0' unit='5'/> The 'mode' attribute for any of them is allowed to be either 'static' or 'dynamic'. A static address is one specified by the end user when defining the XML, while a dynamic address is one automatically chosen by libvirt/QEMU every time a guest boots. The idea of static addresses is to allow management apps to guarentee that PCI device & drive numbering never changes. This series does not actually implement static addressing for PCI yet, because it requires that we change the way we generate QEMU command line arguments. It does do static addressing for disks. libvirt itself will auto-assign all drive addresses, and QEMU will auto-assign PCI adresses in dynamic mode. When starting a guest VM we run 'info pci' to get a list of PCI vendor/product IDs and matching PCI addresses. We then attempt to match those up with the devices we specified to QEMU. It sounds nasty, but it actually works fairly well. This means we also now make it possible to hotunplug any device, even those the VM was initially booted with There are two ways I can envisage mgmt apps using this address functionality - Boot a guest with no addresses specified, grab the XML and change all 'dynamic' attrs to 'static' and then define the persistent config with this. The addresses will then be unchanged forever more - Explicitly give a full list of addresses the very first time a guest is created. There is one small issue with all this, we need to know every PCI device in the guest. It turns out there are a handful of devices in QEMU we don't represent in XML yet - Virtio balloon device - Virtio console (this is easy to address with matt's patches) - ISA bridge - USB controller - Some kind of PCI bridge (not clear what this is, it has PCI ID 8086:7113 If an management application is to be able to fully control static PCI addressing, we need to represent these somehow, so apps can give them addresses. Technically we could get away with not representing the ISA/PCI bridge since QEMU always gives them the first PCI slot no matter what. Still need the VirtIO & USB devices dealt with. Finally, here is an example of a guest running with a huge number of devices. Notice how we've auto-detected the PCI address of every device, and every disk. In particular notice how VirtiO disks got the PCI address, while SCSI disks got the drive address. <domain type='kvm' id='2'> <name>plain</name> <uuid>c7a1edbd-edaf-9455-926a-d65c16db1809</uuid> <memory>219200</memory> <currentMemory>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc-0.11'>hvm</type> <kernel>/home/berrange/vmlinuz-PAE</kernel> <initrd>/home/berrange/initrd-PAE.img</initrd> <boot dev='hd'/> </os> <features> <acpi/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/home/berrange/VirtualMachines/plain.qcow'/> <target dev='vda' bus='virtio'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x0b' function='0x0'/> </disk> <disk type='file' device='cdrom'> <source file='/home/berrange/gpxe.iso'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' mode='dynamic' controller='0' bus='1' unit='0'/> </disk> <disk type='file' device='disk'> <source file='/home/berrange/output.img'/> <target dev='sda' bus='scsi'/> <address type='drive' mode='dynamic' controller='0' bus='0' unit='0'/> </disk> <disk type='file' device='disk'> <source file='/home/berrange/output.img'/> <target dev='sdd' bus='scsi'/> <address type='drive' mode='dynamic' controller='0' bus='0' unit='3'/> </disk> <disk type='file' device='disk'> <source file='/home/berrange/output.img'/> <target dev='sdf' bus='scsi'/> <address type='drive' mode='dynamic' controller='0' bus='0' unit='5'/> </disk> <controller type='scsi' index='0'> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </controller> <controller type='ide' index='0'> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <controller type='fdc' index='0'/> <interface type='user'> <mac address='52:54:00:5b:ef:21'/> <model type='ne2k_pci'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <interface type='user'> <mac address='52:54:00:1c:dc:98'/> <model type='virtio'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </interface> <interface type='user'> <mac address='52:54:00:f7:c5:0e'/> <model type='e1000'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </interface> <interface type='user'> <mac address='52:54:00:56:6c:55'/> <model type='pcnet'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </interface> <interface type='user'> <mac address='52:54:00:ca:0d:58'/> <model type='rtl8139'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </interface> <serial type='pty'> <source path='/dev/pts/5'/> <target port='0'/> </serial> <console type='pty' tty='/dev/pts/5'> <source path='/dev/pts/5'/> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5900' autoport='yes'/> <sound model='ac97'> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </sound> <sound model='es1370'> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/> </sound> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <watchdog model='i6300esb' action='reset'> <address type='pci' mode='dynamic' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/> </watchdog> </devices> <seclabel type='dynamic' model='selinux'> <label>system_u:system_r:svirt_t:s0:c181,c286</label> <imagelabel>system_u:object_r:svirt_image_t:s0:c181,c286</imagelabel> </seclabel> </domain> Daniel

4 34

[libvirt] FIrst approximation of creating volumes directly with desired uid
by Laine Stump 04 Jan '10

04 Jan '10

|I've made an attempt to create storage volumes directly with the desired uid/gid (by forking a new process, calling setuid/setgid in that process, and then creating the file). Since it's sure to get ripped apart, I've put it up on gitorious rather than sending patches to the list. The repository is: git://gitorious.org/~laine/libvirt/laine-staging.git <git://gitorious.org/%7Elaine/libvirt/laine-staging.git> and the branch is (in a quite non-sequiter fashion) "xml2xmltest" Only the last 3 commits on the branch are related to this topic. The first adds uid and gid args to virRun (and all related functions) so that new processes can be run as a different user. This is necessary for the cases where we call an external program to create the image (qemu-img, for example). The second commit adds two new functions to util.c: virFileCreate and virDirCreate. In the case that the current process is running as root, and the caller has requested a different uid or gid for the new file/directory, these functions do the proper fork dance to get this done and return proper status to the caller. The third commit uses the enhanced virRun, and the two new functions to change the way that storage volumes are created. I've noted some of my concerns about doing things this way in a bugzilla report about the problem I'm trying to fix: https://bugzilla.redhat.com/show_bug.cgi?id=547543 |

1 0

[libvirt] virsh -c xen:/// list: = Connection refused
by Gerry Reno 02 Jan '10

02 Jan '10

I'm running the 2.6.31.6 pv_ops dom0 kernel, libvirt 0.7.0 and Xen 3.4.1. When I try connecting to the Xen hypervisor using virsh it gives me a "Connection refused": root@grp-01-23-02:~# xm list Name ID Mem VCPUs State Time(s) Domain-0 0 1020 4 r----- 858.3 root@grp-01-23-02:~# virsh -c xen:/// list Connecting to uri: xen:/// error: unable to connect to 'localhost:8000': Connection refused error: failed to connect to the hypervisor How can I get virsh to connect with Xen? -Gerry

1 1

[libvirt] define tap-only networking
by richard lucassen 29 Dec '09

29 Dec '09

Hello list, I'm pretty new to libvirt and I'd like to try to set up simple networking as described here: http://www.xaq.nl/kvm-tap-howto.txt Is it possible to set up networking through simple tap devices using the xml format? And if yes, can someone give me a hint how to set this up? R. -- ___________________________________________________________________ It is better to remain silent and be thought a fool, than to speak aloud and remove all doubt. +------------------------------------------------------------------+ | Richard Lucassen, Utrecht | | Public key and email address: | | http://www.lucassen.org/mail-pubkey.html | +------------------------------------------------------------------+

2 2

[libvirt] kvm-shell
by Michael Kress 25 Dec '09

25 Dec '09

Hi, I don't know if that already exists somewhere ... I've written it for me and wanted to share it with you. It's a minimal kvm shell for end users - it allows them to start/stop/reboot their own kvm guests. http://www.michael-kress.de/2009/12/kvm-shell/ kvm-shell should run on all platforms. Have fun. Regards Michael -- Michael Kress, kress(a)hal.saar.de

1 0

[libvirt] LXC support?
by Diego Elio “Flameeyes” Pettenò 23 Dec '09

23 Dec '09

I've been wanting to give a try to libvirt to handle containers from LXC as well, but seems like if I follow the default configuration example, I get this: virsh # create /etc/libvirt/lxc/axant.xml errore: Impossibile creare il dominio da /etc/libvirt/lxc/axant.xml errore: unknown OS type exe [sorry for the Italian message, but it doesn't really matter] The configuration is this: <domain type='lxc'> <name>axant</name> <memory>14680064</memory> <os> <type>exe</type> <init>/init</init> </os> <vcpu>8</vcpu> <clock offset="utc" /> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='mount'> <source dir='/media/chroots/axant'/> <target dir='/'/> </filesystem> <interface type='bridge'> <mac address="8e:8b:e5:aa:28:b6" /> <source bridge="br0" /> </interface> <console type='pty' /> </devices> </domain> am I doing something wrong or the doc at [1] is outdated somehow? [1] http://libvirt.org/drvlxc.html -- Diego Elio Pettenò — “Flameeyes” http://blog.flameeyes.eu/ If you found a .asc file in this mail and know not what it is, it's a GnuPG digital signature: http://www.gnupg.org/

2 3

[libvirt] Test failures on current git master
by Diego Elio “Flameeyes” Pettenò 23 Dec '09

23 Dec '09

I'm sincerely not sure what's going on here since the first validity errors (for bond.xml) don't seem right to me, so I'll leave it to whoever has an idea what the problem might be. -- Diego Elio Pettenò — “Flameeyes” http://blog.flameeyes.eu/ If you found a .asc file in this mail and know not what it is, it's a GnuPG digital signature: http://www.gnupg.org/

3 4

[libvirt] Release of libvirt-0.7.5
by Daniel Veillard 23 Dec '09

23 Dec '09

As scheduled, the release hist the server, it's available on the ftp ftp://libvirt.org/libvirt/ It really includes a lot of bug fixes, as well as some new API and features. I would expect the next release to be around end of January 2010 something like a feature freeze around Jan 22 and a push on 29. That way we will be back on the "end of month release" scheme :-) Features: - Add new API virDomainMemoryStats to header and drivers (Adam Litke) - Public API and domain extension for CPU flags (Jiri Denemark) - expose SR IOV physical/virtual function relationships (Dave Allan) - Support for JSON mode monitor [deactivated] (Daniel P. Berrange) - Support for interface model='netfront' (Jiri Denemark) - vbox: Add support for version 3.1 (Pritesh Kothari) - Support QEMU's virtual FAT block device driver (Daniel P. Berrange) Documentation: - Document the dommemstat command in the virsh man page (Adam Litke) - esx: Add more links to external documentation (Matthias Bolte) - esx: Extend documentation about 'vcenter' and add some about 'auto_answer' (Matthias Bolte) - Fix and improve domain xml video element description (Matthias Bolte) - Fix owner and group in example volume XML (Matthew Booth) - add missing doc for device <shareable/> option (Daniel Veillard) - add AppArmor test and examples to dist (Jamie Strandboge) - Update location of C# bindings. (Richard Jones) - Fix typo in QEMU driver webpage (Daniel P. Berrange) - Clarify documentation for private symbols (Wolfgang Mauerer) - Fix news.html validation (Dan Kenigsberg) Portability: - Define ATTRIBUTE_SENTINEL for GCC < 4.0 too (Matthias Bolte) - Fix compilation with configure --disable-nls (Matthias Bolte) - Fix configure check for SASL (Matthias Bolte) - Fix GnuTLS pkg-config check (Matthias Bolte) - Report an error if no XDR library can be found (Matthias Bolte) - Fix compilation with gcrypt < 1.4.2 (Matthias Bolte) - Don't mix LDFLAGS and LIBS in the configure script (Diego Elio Pettenò) - Don't make it possible to define HAVE_HAL but not enable it in automake (Diego Elio Pettenò) - Fix install location for Python bindings (Matthias Bolte) - Use AM_PATH_PYTHON and python-config to detect Python configuration (Matthias Bolte) - Fix a compilation failure if yajl not avail (Daniel Veillard) - Fix compilation for configure --disable-nls (Matthias Bolte) Bug fixes: - cpu: Fix memory leaks in x86FeatureLoad and x86ModelLoad (Matthias Bolte) - Make Xen VT-d PCI attach/detach work (Chris Lalancette) - Fix detection of JSON when restarting libvirtd (Daniel P. Berrange) - Fix reporting of TLS connection errors (Daniel P. Berrange) - Fix typo in qemudDomainAttachHostPciDevice() (Daniel Veillard) - esx: Destroy virtual machine on a vCenter if available (Matthias Bolte) - esx: Undefine virtual machine on a vCenter if available (Matthias Bolte) - Initialize gcrypt threading (Daniel P. Berrange) - Fix bug in storage driver accessing wrong private data (Daniel P. Berrange) - esx_vi.c: do not call through NULL function pointer (Jim Meyering) - esx_util.c: avoid NULL deref for invalid inputs (Jim Meyering) - esx: Don't goto failure for invalid arguments in VMX code (Matthias Bolte) - Fix memory leak in qemudBuildCommandLine (Matthias Bolte) - avoid malfunction when virFileResolveLink is applied to non-POSIX FS (Jim Meyering) - libvirt.c: don't let a NULL "cpumaps" argument provoke a NULL-deref (Jim Meyering) - qemu migration: avoid NULL-deref given an invalid input (Jim Meyering) - qemu_driver.c: don't unlink(NULL) on OOM error path (Jim Meyering) - remote_driver.c: also zero out ->saslDecodedOffset member (Jim Meyering) - qemu_driver.c: avoid double free on error path (Jim Meyering) - libvirtd: avoid a NULL dereference on error path (Jim Meyering) - virsh: avoid double-free (Jim Meyering) - node_device_driver.c: don't write beyond EOB for 4K-byte symlink (Jim Meyering) - Eliminate failure to delete empty storage pools (Laine Stump) - Fix use of virEventAddHandleImpl() (Jiri Denemark) - Fix possible NULL pointer dereference (Paolo Bonzini) - fix various breakages in qemu Dump command (Paolo Bonzini) - Fix reference leak in remoteDispatchStorageVolCreateXmlFrom (Matthias Bolte) - Fix memory leak in virStorageBackendCopyToFD (Matthias Bolte) - retrieve paused/running state at migration start (Paolo Bonzini) - fix migration of paused vms upon failure (Paolo Bonzini) - qemu driver: Fix segfault in libvirt/libvirtd when uri->path is NULL. (Richard Jones) - Fix a wellformedness problem in secret.rng (Diego Elio Pettenò) - Fix virDomainObj ref handling in QEMU driver (Daniel P. Berrange) - Pull code to start CPUs executing out of qemudInitCpuAffinity() (Daniel P. Berrange) - Fix migration cancellation for QEMU (Daniel P. Berrange) - Fix crash when deleting monitor while a command is in progress (Daniel P. Berrange) - udev_device_get_devpath might return NULL (Guido Günther) - Fix some locking issues (Matthias Bolte) - Fix event test timer checks on kernels with HZ=100 (Daniel P. Berrange) - Fix threading problems in python bindings (Daniel P. Berrange) - Supress annoying libcap-ng errors from valgrind (Daniel P. Berrange) - Fix two leaks in test driver (Daniel P. Berrange) - Free cgroup device ACL list on driver shutdown (Daniel P. Berrange) - xen: Fix unconditional freeing in xenDaemonListDefinedDomains() (Matthias Bolte) - Fix default disk type when parsing QEMU argv (Daniel P. Berrange) - remove port filter when network device is detached (Gerhard Stenzel) Improvements: - convert missing server entry points into unsupported errors (Daniel Veillard) - fix some error report when on remote access (Olivier Fourdan) - Disable JSON mode monitor until QEMU is more mature (Daniel P. Berrange) - Only probe for CPU models if required (Jiri Denemark) - Add cpu_map.xml to libvirt.spec (Jiri Denemark) - Install cpu_map.xml (Jiri Denemark) - esx: Don't warn about '/' paths (Matthias Bolte) - esx: Extend vCenter query parameter (Matthias Bolte) - esx: Improve domain lookup by UUID (Matthias Bolte) - build: update gnulib submodule to latest (Jim Meyering) - Relax the allowed values for machine type in schema (Daniel Veillard) - Implement --pool option for virsh vol-path (Dave Allan) - nodedev: Add removable storage 'media_label' prop (Cole Robinson) - add --live support to "virsh dump" (Paolo Bonzini) - add --crash support to "virsh dump" (Paolo Bonzini) - Get QEMU pty paths from the monitor (Matthew Booth) - Extract the assigned pty device for QEmu channels (Matthew Booth) - Make QEMU driver use -chardev everywhere if available (Matthew Booth) - add virsh --suspend arg to migrate command (Paolo Bonzini) - reload iptables rules on libvirtd restart (Mark McLoughlin) - reload iptables rules simply by re-adding them (Mark McLoughlin) - Plumb domain description tag in xend backend (Jim Fehlig) - Make QEMU text monitor parsing more robust (Daniel P. Berrange) - Hook up JSON monitor to emit basic lifecycle events (Daniel P. Berrange) - Add QEMU monitor callbacks for basic lifecycle events (Daniel P. Berrange) - Switch over to passing a callback table to QEMU monitor (Daniel P. Berrange) - Introduce callbacks for serializing domain object private data to XML (Daniel P. Berrange) - Switch LXC driver to use a private data blob for virDomainObj state (Daniel P. Berrange) - Switch UML driver to use a private data blob for virDomainObj state (Daniel P. Berrange) - Add a 'format' arg to qemuMonitorChangeMedia() since JSON will support it (Daniel P. Berrange) - Introduce a simple API for handling JSON data (Daniel P. Berrange) - Add --system flag to autogen.sh to make it easy to build with right prefix (Daniel P. Berrange) - Export all symbols from xml.h for internal use (Jiri Denemark) - vbox: Use virIndexToDiskName() in vboxGenerateMediumName() (Matthias Bolte) - Tests for interface type/model configuration (Jiri Denemark) - Add virIndexToDiskName and fix mapping gap (Matthias Bolte) - Add another SENTINEL attribute (Paolo Bonzini) - Fix help message (Wolfgang Mauerer) - Alternate CPU affinity impl to cope with NR_CPUS > 1024 (Daniel P. Berrange) Cleanups: - The secret driver is stateful, link it directly to libvirtd (Matthias Bolte) - Remove undefined symbols from libvirt_private.syms (Matthias Bolte) - boolean shadows a typedef in rpcndr.h when compiled with MinGW (Matthias Bolte) - Rename DATADIR to PKGDATADIR to fix win32 build (Jiri Denemark) - Move cpu_map.xml to -client RPM (Jiri Denemark) - Fix undefined reference to 'close_used_without_including_unistd_h' (Matthias Bolte) - Fix argument type of virProcessInfoSetAffinity dummy function (Matthias Bolte) - esx: Use occurrence enum to specify expected result of a SOAP call (Matthias Bolte) - esx: Fix occurence typo (Matthias Bolte) - esx: Removed unused inttypes.h include (Matthias Bolte) - esx: Replace libxml1 'xmlChildrenNode' with libxml2 'children' (Matthias Bolte) - esx: Use more suitable error code in esxVI_LookupVirtualMachineByUuid() (Matthias Bolte) - esx: Add automatic question handling (Matthias Bolte) - avoid calling exit with a constant; use EXIT_* instead (Jim Meyering) - maint: remove from VC two gnulib-provided files (Jim Meyering) - xm_internal.c: remove misleading dead code (Jim Meyering) - Cleanup temporary #define after use (Matthew Booth) - Suppress cgroup error message on sucess startup (Ryota Ozaki) - Small change of RNG syntax for domain (Diego Elio Pettenò) - remove iptablesReloadRules() and related code (Mark McLoughlin) - remove all traces of lokkit support (Mark McLoughlin) - Add virBufferFreeAndReset() and replace free() (Matthias Bolte) - Fix the news file non-ascii characters (Daniel Veillard) - Add missing commas to the 0.7.4 news section (Matthias Bolte) - Change generated HTML to UTF-8 encoding (Daniel Veillard) - Avoid an type-punned pointer aliasing pbm (Daniel Veillard) - Move qemuMonitorEscape + migrate status enum into shared monitor code (Daniel P. Berrange) - vbox: Update IIDs from version 3.1-beta2 to 3.1-final (Matthias Bolte) - Fix ReprotError vs ReportError typo in JSON code (Daniel P. Berrange) - Fix inverted conditional test in configure.ac check for yajl (Daniel P. Berrange) - Pull schedular affinity code out into a separate module (Daniel P. Berrange) - Ignore docs/ directory for strcmp() syntax check (Daniel P. Berrange) Again a lot of work in this release, thanks everybody for your contributions, enjoy and I wish you a good end of year ! 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] New libvirt API for domain memory statistics reporting (V3)
by Adam Litke 23 Dec '09

23 Dec '09

Daniel, Daniel, and Matthias: Thanks for your review. This series addresses almost all of your most recent comments. I am still working on writing a decent implementation for the test driver but I wanted to get these updates out right away. Changes since V2: * Ported to GIT HEAD for easier merging :) * Amounts of memory are now reported in kilobytes * Added flags parameter to API (currently unused) * Moved to less awkward xdr wire format for remote driver * Stats 'Free' and 'Total' renamed to 'Unused' and 'Available' * Various small fixups: constant names, data types, etc Changes since V1: * New system for maintaining ABI compatibility and API extensibility: Rather than passing around a fixed-size stats structure, work with arrays of stats. An enum of known statistic tags (SWAP_IN, SWAP_OUT, TOTAL_MEM, etc) is defined. A stat is defined as a tag/value pair. When making a call to the API, the caller provides an array of stats and the size of the array. That array is filled with up to the requested number of stats (depending on hypervisor and guest support). The number of stats provided is returned. * Miscellaneous changes: Changed the API function from virDomainMemStats to virDomainMemoryStats Added documentation for each memory stat -- When using ballooning to manage overcommitted memory on a host, a system for guests to communicate their memory usage to the host can provide information that will minimize the impact of ballooning on the guests while maximizing efficient use of host memory. The design of such a communication channel was recently added to version 0.8.2 of the VirtIO Spec (See Appendix G): - http://ozlabs.org/~rusty/virtio-spec/virtio-spec-0.8.2.pdf Host-side and guest-side implementations have been accepted for inclusion in their respective projects: - Guest: http://lkml.org/lkml/2009/11/30/274 - Host: http://lists.gnu.org/archive/html/qemu-devel/2009-12/msg00380.html The following patch series implements a new libvirt interface to expose these memory statistics. Thank you for your review and comments. [PATCH 1/6] domMemoryStats: Add domainMemoryStats method to struct _virDriver [PATCH 2/6] domMemoryStats: Add public symbol to libvirt API [PATCH 3/6] qemu-driver: Enable domainMemStats in the qemu driver [PATCH 4/6] remote-driver: Add domainMemoryStats support [PATCH 5/6] virsh: Enable virDomainMemoryStats as a new command [PATCH 6/6] python: Add python bindings for virDomainMemoryStats

4 15

[libvirt] [PATCH] The secret driver is stateful, link it directly to libvirtd
by Matthias Bolte 23 Dec '09

23 Dec '09

All other stateful drivers are linked directly to libvirtd instead of libvirt.so. Link the secret driver to libvirtd too. * daemon/Makefile.am: link the secret driver to libvirtd * src/Makefile.am: don't link the secret driver to libvirt.so * src/libvirt_private.syms: remove the secretRegister symbol --- daemon/Makefile.am | 2 ++ src/Makefile.am | 3 ++- src/libvirt_private.syms | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index ab3f238..f6b6a3a 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -110,6 +110,8 @@ endif if WITH_NODE_DEVICES libvirtd_LDADD += ../src/libvirt_driver_nodedev.la endif + + libvirtd_LDADD += ../src/libvirt_driver_secret.la endif libvirtd_LDADD += ../src/libvirt.la diff --git a/src/Makefile.am b/src/Makefile.am index 42108c0..526d985 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -598,7 +598,8 @@ if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_secret.la else noinst_LTLIBRARIES += libvirt_driver_secret.la -libvirt_la_LIBADD += libvirt_driver_secret.la +# Stateful, so linked to daemon instead +#libvirt_la_LIBADD += libvirt_driver_secret.la endif libvirt_driver_secret_la_CFLAGS = \ -I@top_srcdir@/src/conf diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index f90f269..31c944c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -456,8 +456,6 @@ virSecretDefParseString; virSecretDefParseFile; virSecretDefFormat; -# secret_driver.h -secretRegister; # security.h virSecurityDriverVerify; -- 1.6.0.4

2 3

[libvirt] [PATCH] Move cpu_map.xml to -client RPM
by Jiri Denemark 23 Dec '09

23 Dec '09

All the cpu code is part of libvirt library and it might be used by drivers which do not require libvirtd to be running. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index e1d4e53..9b4f2c6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -687,8 +687,6 @@ fi %{_datadir}/libvirt/networks/default.xml %endif -%{_datadir}/libvirt/cpu_map.xml - %dir %{_localstatedir}/run/libvirt/ %dir %{_localstatedir}/lib/libvirt/ @@ -776,6 +774,8 @@ fi %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storageencryption.rng +%{_datadir}/libvirt/cpu_map.xml + %if %{with_sasl} %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %endif -- 1.6.6.rc4

2 2

[libvirt] [PATCH] Remove undefined symbols from libvirt_private.syms
by Matthias Bolte 23 Dec '09

23 Dec '09

MinGW's ld gives an error when trying to export undefined symbols. --- src/libvirt_private.syms | 4 ---- src/util/network.h | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 31c944c..10940eb 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -362,7 +362,6 @@ virFree; # network.h -virSocketAddrInNetwork; virSocketAddrIsNetmask; virSocketCheckNetmask; virSocketFormatAddr; @@ -435,8 +434,6 @@ pciDeviceListDel; pciDeviceFileIterate; pciDeviceListCount; pciDeviceListGet; -pciDeviceListLock; -pciDeviceListUnlock; pciDeviceListSteal; @@ -503,7 +500,6 @@ virStoragePoolObjUnlock; # storage_encryption_conf.h virStorageEncryptionFree; -virStorageEncryptionDropSecrets; virStorageEncryptionParseNode; virStorageEncryptionFormat; virStorageGenerateQcowPassphrase; diff --git a/src/util/network.h b/src/util/network.h index 3762ef2..d5c2c9b 100644 --- a/src/util/network.h +++ b/src/util/network.h @@ -40,10 +40,6 @@ int virSocketSetPort(virSocketAddrPtr addr, int port); int virSocketGetPort(virSocketAddrPtr addr); -int virSocketAddrInNetwork(virSocketAddrPtr addr1, - virSocketAddrPtr addr2, - virSocketAddrPtr netmask); - int virSocketGetRange (virSocketAddrPtr start, virSocketAddrPtr end); -- 1.6.0.4

2 1

[libvirt] [PATCH] boolean shadows a typedef in rpcndr.h when compiled with MinGW
by Matthias Bolte 23 Dec '09

23 Dec '09

Alter the offending variable names to fix this. --- src/esx/esx_vi.h | 2 +- src/esx/esx_vi_types.h | 4 ++-- src/util/json.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 840a3c3..f76689c 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -138,7 +138,7 @@ struct _esxVI_Enumeration { int esxVI_Enumeration_CastFromAnyType(virConnectPtr conn, const esxVI_Enumeration *enumeration, - esxVI_AnyType *anyType, int *boolean); + esxVI_AnyType *anyType, int *value); int esxVI_Enumeration_Serialize(virConnectPtr conn, const esxVI_Enumeration *enumeration, int value, const char *element, diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 4183324..77f712e 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -131,11 +131,11 @@ enum _esxVI_Boolean { esxVI_Boolean_False, }; -int esxVI_Boolean_Serialize(virConnectPtr conn, esxVI_Boolean boolean, +int esxVI_Boolean_Serialize(virConnectPtr conn, esxVI_Boolean boolean_, const char *element, virBufferPtr output, esxVI_Boolean required); int esxVI_Boolean_Deserialize(virConnectPtr conn, xmlNodePtr node, - esxVI_Boolean *boolean); + esxVI_Boolean *boolean_); diff --git a/src/util/json.c b/src/util/json.c index 35f6e52..4b3e629 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -201,7 +201,7 @@ virJSONValuePtr virJSONValueNewNumberDouble(double data) } -virJSONValuePtr virJSONValueNewBoolean(int boolean) +virJSONValuePtr virJSONValueNewBoolean(int boolean_) { virJSONValuePtr val; @@ -209,7 +209,7 @@ virJSONValuePtr virJSONValueNewBoolean(int boolean) return NULL; val->type = VIR_JSON_TYPE_BOOLEAN; - val->data.boolean = boolean; + val->data.boolean = boolean_; return val; } @@ -350,9 +350,9 @@ int virJSONValueObjectAppendNumberDouble(virJSONValuePtr object, const char *key return 0; } -int virJSONValueObjectAppendBoolean(virJSONValuePtr object, const char *key, int boolean) +int virJSONValueObjectAppendBoolean(virJSONValuePtr object, const char *key, int boolean_) { - virJSONValuePtr jvalue = virJSONValueNewBoolean(boolean); + virJSONValuePtr jvalue = virJSONValueNewBoolean(boolean_); if (!jvalue) return -1; if (virJSONValueObjectAppend(object, key, jvalue) < 0) { @@ -688,12 +688,12 @@ static int virJSONParserHandleNull(void * ctx) return 1; } -static int virJSONParserHandleBoolean(void * ctx, int boolean) +static int virJSONParserHandleBoolean(void * ctx, int boolean_) { virJSONParserPtr parser = ctx; - virJSONValuePtr value = virJSONValueNewBoolean(boolean); + virJSONValuePtr value = virJSONValueNewBoolean(boolean_); - VIR_DEBUG("parser=%p boolean=%d", parser, boolean); + VIR_DEBUG("parser=%p boolean=%d", parser, boolean_); if (!value) return 0; -- 1.6.0.4

2 1

[libvirt] Problem about Libvirt and Virtualbox....
by Prashant Wakchaure 23 Dec '09

23 Dec '09

Hello, Currently I am working on libvirt API and I am trying to connect virtualbox with libvirt. I using ubuntu 9.10 and libvirt 0.7.0 but I am unable to connect to virtualbox (3.1.2) to the libvirt. Please guide me..... Waiting for your replay.....

2 1

[libvirt] [PATCH] fix some error report when on remote access
by Daniel Veillard 22 Dec '09

22 Dec '09

When querying about a domain from 0.3.3 (or RHEL 5.3) domain located on a 0.6.3 (RHEL-5) machine, the errors are not properly reported. This patch from Olivier Fourdan <ofourdan(a)redhat.com> , slightly modified to not change the semantic when the domain os details cannot be provided is attached, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] convert missing server entry points into unsupported errors
by Daniel Veillard 22 Dec '09

22 Dec '09

If using a remote access, sometimes an RPC entry point is not available, and currently we just end up with a raw: error: unknown procedure: xxx error, while this should be more cleanly reported as an unsupported entry point like for local access, e.g when calling an older RHEL-5.3 without patch paphio:~/libvirt -> tools/virsh --connect xen+ssh://root@test3 dominfo test5 Id: 1 Name: test5 UUID: 62cd4e2e-5117-e4ba-2dbf-68a37031c3e4 OS Type: linux State: idle CPU(s): 1 CPU time: 254.5s Max memory: 524288 kB Used memory: 524108 kB error: unknown procedure: 122 with patch paphio:~/libvirt -> tools/virsh --connect xen+ssh://root@test3 dominfo test5 Id: 1 Name: test5 UUID: 62cd4e2e-5117-e4ba-2dbf-68a37031c3e4 OS Type: linux State: idle CPU(s): 1 CPU time: 254.6s Max memory: 524288 kB Used memory: 524080 kB paphio:~/libvirt -> the application knows that some feature may not be avilable but expects the VIR_ERR_NO_SUPPORT to be reported, not an internal RPC problem, I also noticed that we do "%s", thiscall->err.message ? *thiscall->err.message : NULL); for passing the error message, which is a sure way to crash if there is no error message and changing this to "%s", thiscall->err.message ? *thiscall->err.message : "unknown"); I expect the server to always return an error message in practice, but this need fixing. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH v4 00/11] CPU selection patches
by Jiri Denemark 22 Dec '09

22 Dec '09

Hi, This is a third version of CPU selection patchset. Patches with documentation collected from commit logs of this patch set will come later. Changes in version 4: - really fix all CPUID assembly code - fixed arguments to virXPathULongHex() - added flags to virConnectCompareCPU() API - unused double linked list converted to single linked one - reorganized patchset to allow bisecting - fixes in qemu driver - added cpu_conf.c to libvirt_proxy as dep of domain_conf. - disabled XML parsing code in cpu_conf.c for proxy - more cpus added to cpu_map.xml - document virConnectCompareCPU() API call Changes in version 3: - fix build on i386 Changes in version 2: - virConnectGetHostCPU() API call was completely removed - 'CPU driver implementation' (11/14) patch was dropped - virConnectCompareCPU() API call is implemented directly by hypervisor drivers - new cpuCompareXML() internal function to make virConnectCompareCPU() simpler Jirka Jiri Denemark (11): XML schema for CPU flags XML parsing/formating code for CPU flags Public API Internal driver API Public API implementation Wire protocol format and server side dispatcher Remote driver CPU selection infrastructure CPU map for models and features Implement CPU selection in QEMU driver Implement virsh commands configure.in | 20 + daemon/remote.c | 22 + docs/schemas/capability.rng | 46 ++- docs/schemas/domain.rng | 62 +++ include/libvirt/libvirt.h.in | 25 + include/libvirt/virterror.h | 1 + proxy/Makefile.am | 1 + src/Makefile.am | 23 +- src/conf/capabilities.c | 31 ++- src/conf/capabilities.h | 6 + src/conf/cpu_conf.c | 368 +++++++++++++ src/conf/cpu_conf.h | 119 +++++ src/conf/domain_conf.c | 15 + src/conf/domain_conf.h | 2 + src/cpu/cpu.c | 242 +++++++++ src/cpu/cpu.h | 129 +++++ src/cpu/cpu_generic.c | 123 +++++ src/cpu/cpu_generic.h | 32 ++ src/cpu/cpu_map.c | 130 +++++ src/cpu/cpu_map.h | 41 ++ src/cpu/cpu_map.xml | 345 +++++++++++++ src/cpu/cpu_x86.c | 1162 ++++++++++++++++++++++++++++++++++++++++++ src/cpu/cpu_x86.h | 31 ++ src/cpu/cpu_x86_data.h | 45 ++ src/driver.h | 5 + src/esx/esx_driver.c | 1 + src/libvirt.c | 43 ++ src/libvirt_private.syms | 19 + src/libvirt_public.syms | 5 + src/lxc/lxc_driver.c | 1 + src/opennebula/one_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 1 + src/qemu/qemu_conf.c | 398 ++++++++++++++- src/qemu/qemu_conf.h | 7 + src/qemu/qemu_driver.c | 43 ++- src/remote/remote_driver.c | 27 + src/remote/remote_protocol.x | 13 +- src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/util/virterror.c | 3 + src/vbox/vbox_tmpl.c | 1 + src/xen/xen_driver.c | 1 + tools/virsh.c | 65 +++ 44 files changed, 3624 insertions(+), 34 deletions(-) create mode 100644 src/conf/cpu_conf.c create mode 100644 src/conf/cpu_conf.h create mode 100644 src/cpu/cpu.c create mode 100644 src/cpu/cpu.h create mode 100644 src/cpu/cpu_generic.c create mode 100644 src/cpu/cpu_generic.h create mode 100644 src/cpu/cpu_map.c create mode 100644 src/cpu/cpu_map.h create mode 100644 src/cpu/cpu_map.xml create mode 100644 src/cpu/cpu_x86.c create mode 100644 src/cpu/cpu_x86.h create mode 100644 src/cpu/cpu_x86_data.h

4 21

[libvirt] [PATCH] Report an error if no XDR library can be found
by Matthias Bolte 22 Dec '09

22 Dec '09

--- configure.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 3be11f2..81548b8 100644 --- a/configure.in +++ b/configure.in @@ -116,7 +116,8 @@ dnl If portablexdr is installed, prefer that. dnl Otherwise try -lrpc (Cygwin) -lxdr (some MinGW), -lnsl (Solaris) dnl or none (most Unix) AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[ - AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl]) + AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl],[], + [AC_MSG_ERROR([Cannot find a XDR library])]) ]) AC_CHECK_LIB([intl],[gettext],[]) -- 1.6.0.4

3 6

[libvirt] [PATCH] cpu: Fix memory leaks in x86FeatureLoad and x86ModelLoad
by Matthias Bolte 22 Dec '09

22 Dec '09

Also backup and restore the original ctxt->node value in x86FeatureLoad. --- src/cpu/cpu_x86.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index af0a65b..7c50261 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -274,6 +274,7 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, { struct x86_map *map = data; xmlNodePtr *nodes = NULL; + xmlNodePtr ctxt_node = ctxt->node; struct x86_feature *feature = NULL; int ret = 0; int i; @@ -340,6 +341,9 @@ x86FeatureLoad(xmlXPathContextPtr ctxt, } out: + ctxt->node = ctxt_node; + VIR_FREE(nodes); + return ret; no_memory: @@ -664,6 +668,7 @@ x86ModelLoad(xmlXPathContextPtr ctxt, } out: + VIR_FREE(nodes); return ret; no_memory: -- 1.6.0.4

4 4

[libvirt] [PATCH] Add myself to AUTHORS :-)
by Jiri Denemark 22 Dec '09

22 Dec '09

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- AUTHORS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/AUTHORS b/AUTHORS index 8bb652f..bff1b20 100644 --- a/AUTHORS +++ b/AUTHORS @@ -80,6 +80,7 @@ Patches have also been contributed by: Satoru SATOH <satoru.satoh(a)gmail.com> Paolo Bonzini <pbonzini(a)redhat.com> Miloslav Trmač <mitr(a)redhat.com> + Jiri Denemark <jdenemar(a)redhat.com> [....send patches to get your name here....] -- 1.6.6.rc4

3 2

[libvirt] [PATCH] Only probe for CPU models if required
by Jiri Denemark 22 Dec '09

22 Dec '09

CPU models where probe everytime a qemu command line was built. But it only makes sense to do so when a guest's XML contains CPU model. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_conf.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 36bf9a2..3f6c79b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1778,17 +1778,18 @@ qemudBuildCommandLineCPU(virConnectPtr conn, { const virCPUDefPtr host = driver->caps->host.cpu; virCPUDefPtr guest = NULL; - unsigned int ncpus; + unsigned int ncpus = 0; const char **cpus = NULL; union cpuData *data = NULL; int ret = -1; virBuffer buf = VIR_BUFFER_INITIALIZER; int i; - if (qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0) + if (def->cpu && def->cpu->model + && qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0) goto cleanup; - if (ncpus > 0 && host && def->cpu && def->cpu->model) { + if (ncpus > 0 && host) { virCPUCompareResult cmp; cmp = cpuGuestData(conn, host, def->cpu, &data); -- 1.6.6.rc4

3 2

[libvirt] [PATCH] Install cpu_map.xml
by Jiri Denemark 22 Dec '09

22 Dec '09

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/Makefile.am | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7d731de..42108c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ INCLUDES = \ -DSBINDIR=\""$(sbindir)"\" \ -DSYSCONF_DIR="\"$(sysconfdir)\"" \ -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ - -DDATADIR=\""$(datadir)/libvirt"\" \ + -DDATADIR=\""$(pkgdatadir)"\" \ -DLOCAL_STATE_DIR=\""$(localstatedir)"\" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ $(WARN_CFLAGS) \ @@ -287,7 +287,9 @@ CPU_SOURCES = \ cpu/cpu_x86.h cpu/cpu_x86.c cpu/cpu_x86_data.h \ cpu/cpu_map.h cpu/cpu_map.c -EXTRA_DIST += cpu/cpu_map.xml +pkgdata_DATA = cpu/cpu_map.xml + +EXTRA_DIST += $(pkgdata_DATA) ######################### # -- 1.6.6.rc4

3 2

[libvirt] [PATCH] Fix undefined reference to 'close_used_without_including_unistd_h'
by Matthias Bolte 22 Dec '09

22 Dec '09

Found while trying to cross-compile libvirt on Fedora 12 for Windows. gnulib redefines 'close' to 'close_used_without_including_unistd_h' in sys/socket.h if winsock2.h is present and unistd.h has not been included before sys/socket.h. Reorder some includes to fix this. --- src/conf/network_conf.c | 2 +- src/remote/remote_driver.c | 10 +++++----- src/util/util.h | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index ab76f21..a64adf9 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -25,10 +25,10 @@ #include <config.h> +#include <unistd.h> #include <arpa/inet.h> #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> #include <fcntl.h> #include <string.h> #include <dirent.h> diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 23fd0e3..be51366 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -23,10 +23,6 @@ #include <config.h> -/* Windows socket compatibility functions. */ -#include <errno.h> -#include <sys/socket.h> - #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -37,7 +33,11 @@ #include <sys/stat.h> #include <fcntl.h> -#ifndef HAVE_WINSOCK2_H /* Unix & Cygwin. */ +/* Windows socket compatibility functions. */ +#include <errno.h> +#include <sys/socket.h> + +#ifndef HAVE_WINSOCK2_H /* Unix & Cygwin. */ # include <sys/un.h> # include <net/if.h> # include <netinet/in.h> diff --git a/src/util/util.h b/src/util/util.h index 49b27f2..d556daa 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -27,6 +27,7 @@ #include "verify.h" #include "internal.h" +#include <unistd.h> #include <sys/select.h> #include <sys/types.h> -- 1.6.0.4

3 2

[libvirt] [PATCH] Fix argument type of virProcessInfoSetAffinity dummy function
by Matthias Bolte 22 Dec '09

22 Dec '09

--- src/util/processinfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/processinfo.c b/src/util/processinfo.c index a0dac34..397848e 100644 --- a/src/util/processinfo.c +++ b/src/util/processinfo.c @@ -164,7 +164,7 @@ realloc: #else /* HAVE_SCHED_GETAFFINITY */ int virProcessInfoSetAffinity(pid_t pid ATTRIBUTE_UNUSED, - unsigned char *map ATTRIBUTE_UNUSED, + const unsigned char *map ATTRIBUTE_UNUSED, size_t maplen ATTRIBUTE_UNUSED, int maxcpu ATTRIBUTE_UNUSED) { -- 1.6.0.4

3 2

[libvirt] [PATCH] Fix compilation with configure --disable-nls
by Matthias Bolte 22 Dec '09

22 Dec '09

--- src/cpu/cpu.c | 4 ++-- src/cpu/cpu_map.c | 2 +- src/qemu/qemu_monitor_json.c | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index e822f22..975ca28 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -48,7 +48,7 @@ cpuGetSubDriver(virConnectPtr conn, if (arch == NULL) { virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("undefined hardware architecture")); + "%s", _("undefined hardware architecture")); return NULL; } @@ -130,7 +130,7 @@ cpuDecode(virConnectPtr conn, if (cpu == NULL) { virCPUReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("invalid CPU definition")); + "%s", _("invalid CPU definition")); return -1; } diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 067f6ff..d615e15 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -79,7 +79,7 @@ int cpuMapLoad(const char *arch, if (arch == NULL) { virCPUReportError(NULL, VIR_ERR_INTERNAL_ERROR, - _("undefined hardware architecture")); + "%s", _("undefined hardware architecture")); return -1; } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 03562e8..b96f4ac 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -645,7 +645,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, devices = virJSONValueObjectGet(reply, "return"); if (!devices || devices->type != VIR_JSON_TYPE_ARRAY) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("blockstats reply was missing device list")); goto cleanup; } @@ -655,13 +655,13 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, virJSONValuePtr stats; const char *thisdev; if (!dev || dev->type != VIR_JSON_TYPE_OBJECT) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("blockstats device entry was not in expected format")); goto cleanup; } if ((thisdev = virJSONValueObjectGetString(dev, "device")) == NULL) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("blockstats device entry was not in expected format")); goto cleanup; } @@ -672,7 +672,7 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, found = 1; if ((stats = virJSONValueObjectGet(dev, "stats")) == NULL || stats->type != VIR_JSON_TYPE_OBJECT) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("blockstats stats entry was not in expected format")); goto cleanup; } @@ -919,13 +919,13 @@ qemuMonitorJSONGetMigrationStatusReply(virJSONValuePtr reply, char *statusstr; if (!(ret = virJSONValueObjectGet(reply, "return"))) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("info migration reply was missing return data")); return -1; } if (!(statusstr = virJSONValueObjectGetString(ret, "status"))) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("info migration reply was missing return status")); return -1; } @@ -1214,25 +1214,25 @@ qemuMonitorJSONGetGuestAddress(virJSONValuePtr reply, addr = virJSONValueObjectGet(reply, "return"); if (!addr || addr->type != VIR_JSON_TYPE_OBJECT) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("pci_add reply was missing device address")); return -1; } if (virJSONValueObjectGetNumberUint(addr, "domain", guestDomain) < 0) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("pci_add reply was missing device domain number")); return -1; } if (virJSONValueObjectGetNumberUint(addr, "bus", guestBus) < 0) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("pci_add reply was missing device bus number")); return -1; } if (virJSONValueObjectGetNumberUint(addr, "slot", guestSlot) < 0) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("pci_add reply was missing device slot number")); return -1; } -- 1.6.0.4

3 2

[libvirt] [PATCH] Fix configure check for SASL
by Matthias Bolte 22 Dec '09

22 Dec '09

The option --with-sasl defaults to 'check', but an inverted test logic lets the SASL check fail with an error instead of disabling SASL. Fix the test logic so SASL support gets disabled if SASL is missing and --with-sasl is set to check. --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index a86b8ca..c401111 100644 --- a/configure.in +++ b/configure.in @@ -613,7 +613,7 @@ if test "x$with_sasl" != "xno"; then CFLAGS="$CFLAGS $SASL_CFLAGS" LIBS="$LIBS $SASL_LIBS" AC_CHECK_HEADER([sasl/sasl.h],[],[ - if test "x$with_sasl" != "xcheck" ; then + if test "x$with_sasl" = "xcheck" ; then with_sasl=no else fail=1 -- 1.6.0.4

2 1

[libvirt] [PATCH] Fix GnuTLS pkg-config check
by Matthias Bolte 22 Dec '09

22 Dec '09

The testlogic for $PKG_CONFIG was inverted, checking for an empty string before using PKG_CHECK_MODULES. Use -x instead of -z and add an else branch to the if checking for $GNUTLS_FOUND = no to add -lgcrypt in case the GnuTLS libraries are detected by pkg-config. --- configure.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index 81548b8..a86b8ca 100644 --- a/configure.in +++ b/configure.in @@ -555,7 +555,7 @@ dnl GnuTLS library GNUTLS_CFLAGS= GNUTLS_LIBS= GNUTLS_FOUND=no -if test -z "$PKG_CONFIG" ; then +if test -x "$PKG_CONFIG" ; then PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, [GNUTLS_FOUND=yes], [GNUTLS_FOUND=no]) fi @@ -572,6 +572,8 @@ if test "$GNUTLS_FOUND" = "no"; then dnl it explicitly for the calls to gcry_control/check_version GNUTLS_LIBS="$LIBS -lgcrypt" LIBS="$old_libs" +else + GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt" fi AC_SUBST([GNUTLS_CFLAGS]) -- 1.6.0.4

3 2

[libvirt] [PATCH] Define ATTRIBUTE_SENTINEL for GCC < 4.0 too
by Matthias Bolte 22 Dec '09

22 Dec '09

ATTRIBUTE_SENTINEL was defined for GCC >= 4.0 only, resulting in compile errors when using GCC < 4.0. --- src/internal.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/internal.h b/src/internal.h index 09c19ea..5ca1fa3 100644 --- a/src/internal.h +++ b/src/internal.h @@ -100,6 +100,8 @@ #ifndef ATTRIBUTE_SENTINEL #if __GNUC_PREREQ (4, 0) #define ATTRIBUTE_SENTINEL __attribute__((__sentinel__)) +#else +#define ATTRIBUTE_SENTINEL #endif #endif -- 1.6.0.4

4 3

[libvirt] [PATCH] Disable JSON mode monitor until QEMU is more mature
by Daniel P. Berrange 21 Dec '09

21 Dec '09

* src/qemu/qemu_conf.h: Remove QEMU_CMD_FLAG_0_12 and just leave the lone JSON flag * src/qemu/qemu_conf.c: Enable JSON on QEMU 0.13 or later, but leave it disabled for now --- src/qemu/qemu_conf.c | 8 ++++++-- src/qemu/qemu_conf.h | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 36bf9a2..0e66dd7 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1146,8 +1146,12 @@ static unsigned int qemudComputeCmdFlags(const char *help, if (version >= 10000) flags |= QEMUD_CMD_FLAG_0_10; - if (version >= 12000) - flags |= QEMUD_CMD_FLAG_0_12; + /* Keep disabled till we're actually ready to turn on JSON mode + * The plan is todo it in 0.13.0 QEMU, but lets wait & see... */ +#if 0 + if (version >= 13000) + flags |= QEMUD_CMD_FLAG_MONITOR_JSON; +#endif return flags; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index e958850..209cd31 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -76,8 +76,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_MIGRATE_QEMU_UNIX = (1 << 21), /* Does qemu support unix domain sockets for migration? */ QEMUD_CMD_FLAG_CHARDEV = (1 << 22), /* Is the new -chardev arg available */ QEMUD_CMD_FLAG_ENABLE_KVM = (1 << 23), /* Is the -enable-kvm flag available to "enable KVM full virtualization support" */ - QEMUD_CMD_FLAG_0_12 = (1 << 24), - QEMUD_CMD_FLAG_MONITOR_JSON = QEMUD_CMD_FLAG_0_12, /* JSON mode for monitor */ + QEMUD_CMD_FLAG_MONITOR_JSON = (1 << 24), /* JSON mode for monitor */ }; /* Main driver state */ -- 1.6.5.2

2 1

[libvirt] [PATCH] Add cpu_map.xml to libvirt.spec
by Jiri Denemark 21 Dec '09

21 Dec '09

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index dd067ad..e1d4e53 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -687,6 +687,8 @@ fi %{_datadir}/libvirt/networks/default.xml %endif +%{_datadir}/libvirt/cpu_map.xml + %dir %{_localstatedir}/run/libvirt/ %dir %{_localstatedir}/lib/libvirt/ -- 1.6.6.rc4

2 1

[libvirt] [PATCH]: Make Xen VT-d PCI attach/detach work
by Chris Lalancette 21 Dec '09

21 Dec '09

All, The Xen code for making HVM VT-d PCI passthrough attach and detach is currently not properly working. There are 2 problems: 1) In xenDaemonAttachDevice(), we were always trying to reconfigure a PCI passthrough device, even the first time we added it. This was because the code in virDomainXMLDevID() was not checking xenstore for the existence of the device, and always returning 0 (meaning that the device already existed). 2) In xenDaemonDetachDevice(), we were trying to use "device_destroy" to detach a PCI device. While you would think that is the right method to call, it's actually wrong for PCI devices. In particular, in upstream Xen (and soon in RHEL-5 Xen), device_configure is actually used to destroy a PCI device. The attached patch fixes both of these problems. To fix the attach problem I add a lookup into xenstore to see if the device we are trying to attach already exists. To fix the detach problem I change it so that for PCI detach (only), we use device_configure with the appropriate sxpr to do the detachment. Tested by me on RHEL-5 on a VT-d capable machine, and, in combination with the RHEL-5 xen patch, fixes the problem for me in testing. (note: this solves https://bugzilla.redhat.com/show_bug.cgi?id=546671) Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

2 1

Re: [libvirt] Author: Adam Litke <agl@us.ibm.com>
by Daniel Veillard 21 Dec '09

21 Dec '09

On Mon, Dec 21, 2009 at 09:21:43AM -0500, Adam Litke wrote: > virsh: Document the dommemstat command in the virsh man page > > Provide a basic mention of the dommemstat command in the virsh man page. At > first I thought it would be handy to describe the stats and their semantics, > but the rest of the man page does not go into that kind of detail so I have > omitted it here. In any case it is documented in the libvirt API. > > Signed-off-by: Adam Litke <agl(a)us.ibm.com> > To: Daniel Veillard <veillard(a)redhat.com> > Cc: libvir-list(a)redhat.com > > diff --git a/tools/virsh.pod b/tools/virsh.pod > index 3830464..ee8cc11 100644 > --- a/tools/virsh.pod > +++ b/tools/virsh.pod > @@ -257,6 +257,10 @@ Get device block stats for a running domain. > > Get network interface stats for a running domain. > > +=item B<dommemstat> I<domain> > + > +Get memory stats for a running domain. > + > =item B<dominfo> I<domain-id> > > Returns basic information about the domain. Okay, thanks ! applied :-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 1/6] domMemoryStats: Add domainMemoryStats method to struct _virDriver
by Adam Litke 21 Dec '09

21 Dec '09

Set up the types for the domainMemoryStats function and insert it into the virDriver structure definition. Because of static initializers, update every driver and set the new field to NULL. Note: The changes in python/* are to fix compiler errors. The actual python binding is implemented in a later patch. Signed-off-by: Adam Litke <agl(a)us.ibm.com> To: Daniel Veillard <veillard(a)redhat.com> Cc: Daniel P. Berrange <berrange(a)redhat.com> Cc: libvirt list <libvir-list(a)redhat.com> --- include/libvirt/libvirt.h.in | 53 ++++++++++++++++++++++++++++++++++++++++++ python/generator.py | 4 ++- src/driver.h | 7 +++++ src/esx/esx_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/opennebula/one_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 1 + src/qemu/qemu_driver.c | 1 + src/remote/remote_driver.c | 1 + src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/vbox/vbox_tmpl.c | 1 + src/xen/xen_driver.c | 1 + 14 files changed, 74 insertions(+), 1 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 6c3aded..820bf98 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -333,6 +333,55 @@ struct _virDomainInterfaceStats { */ typedef virDomainInterfaceStatsStruct *virDomainInterfaceStatsPtr; +/** + * Memory Statistics Tags: + */ +typedef enum { + /* The total amount of data read from swap space (in kB). */ + VIR_DOMAIN_MEMORY_STAT_SWAP_IN = 0, + /* The total amount of memory written out to swap space (in kB). */ + VIR_DOMAIN_MEMORY_STAT_SWAP_OUT = 1, + + /* + * Page faults occur when a process makes a valid access to virtual memory + * that is not available. When servicing the page fault, if disk IO is + * required, it is considered a major fault. If not, it is a minor fault. + * These are expressed as the number of faults that have occurred. + */ + VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT = 2, + VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT = 3, + + /* + * The amount of memory left completely unused by the system. Memory that + * is available but used for reclaimable caches should NOT be reported as + * free. This value is expressed in kB. + */ + VIR_DOMAIN_MEMORY_STAT_UNUSED = 4, + + /* + * The total amount of usable memory as seen by the domain. This value + * may be less than the amount of memory assigned to the domain if a + * balloon driver is in use or if the guest OS does not initialize all + * assigned pages. This value is expressed in kB. + */ + VIR_DOMAIN_MEMORY_STAT_AVAILABLE = 5, + + /* + * The number of statistics supported by this version of the interface. + * To add new statistics, add them to the enum and increase this value. + */ + VIR_DOMAIN_MEMORY_STAT_NR = 6, +} virDomainMemoryStatTags; + +typedef struct _virDomainMemoryStat virDomainMemoryStatStruct; + +struct _virDomainMemoryStat { + int tag; + unsigned long long val; +}; + +typedef virDomainMemoryStatStruct *virDomainMemoryStatPtr; + /* Domain core dump flags. */ typedef enum { @@ -644,6 +693,10 @@ int virDomainInterfaceStats (virDomainPtr dom, const char *path, virDomainInterfaceStatsPtr stats, size_t size); +int virDomainMemoryStats (virDomainPtr dom, + virDomainMemoryStatPtr stats, + unsigned int nr_stats, + unsigned int flags); int virDomainBlockPeek (virDomainPtr dom, const char *path, unsigned long long offset, diff --git a/python/generator.py b/python/generator.py index 3fd7f90..06f1ff4 100755 --- a/python/generator.py +++ b/python/generator.py @@ -160,7 +160,8 @@ def enum(type, name, value): functions_failed = [] functions_skipped = [ - "virConnectListDomains" + "virConnectListDomains", + "virDomainMemoryStats" ] skipped_modules = { @@ -170,6 +171,7 @@ skipped_types = { # 'int *': "usually a return type", 'virConnectDomainEventCallback': "No function types in python", 'virEventAddHandleFunc': "No function types in python", + 'virDomainMemoryStatPtr': "Not implemented yet", } ####################################################################### diff --git a/src/driver.h b/src/driver.h index 09ce8e2..6193e47 100644 --- a/src/driver.h +++ b/src/driver.h @@ -229,6 +229,12 @@ typedef int struct _virDomainInterfaceStats *stats); typedef int + (*virDrvDomainMemoryStats) + (virDomainPtr domain, + struct _virDomainMemoryStat *stats, + unsigned int nr_stats); + +typedef int (*virDrvDomainBlockPeek) (virDomainPtr domain, const char *path, @@ -419,6 +425,7 @@ struct _virDriver { virDrvDomainMigrateFinish domainMigrateFinish; virDrvDomainBlockStats domainBlockStats; virDrvDomainInterfaceStats domainInterfaceStats; + virDrvDomainMemoryStats domainMemoryStats; virDrvDomainBlockPeek domainBlockPeek; virDrvDomainMemoryPeek domainMemoryPeek; virDrvNodeGetCellsFreeMemory nodeGetCellsFreeMemory; diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index ea464a3..2626162 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3412,6 +3412,7 @@ static virDriver esxDriver = { esxDomainMigrateFinish, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ NULL, /* nodeGetCellsFreeMemory */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c8e2dca..ff998c7 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2438,6 +2438,7 @@ static virDriver lxcDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ lxcDomainInterfaceStats, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index a30c110..a4ad31e 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -765,6 +765,7 @@ static virDriver oneDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ NULL, /* nodeGetCellsFreeMemory */ diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 1c0fccc..7acce5b 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1517,6 +1517,7 @@ static virDriver openvzDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ NULL, /* nodeGetCellsFreeMemory */ diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index c4fcfed..07adccb 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1633,6 +1633,7 @@ virDriver phypDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ NULL, /* nodeGetCellsFreeMemory */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9ef6c35..1ddc23e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7907,6 +7907,7 @@ static virDriver qemuDriver = { NULL, /* domainMigrateFinish */ qemudDomainBlockStats, /* domainBlockStats */ qemudDomainInterfaceStats, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ qemudDomainBlockPeek, /* domainBlockPeek */ qemudDomainMemoryPeek, /* domainMemoryPeek */ nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 77962fe..5d32d3b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8814,6 +8814,7 @@ static virDriver remote_driver = { remoteDomainMigrateFinish, /* domainMigrateFinish */ remoteDomainBlockStats, /* domainBlockStats */ remoteDomainInterfaceStats, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ remoteDomainBlockPeek, /* domainBlockPeek */ remoteDomainMemoryPeek, /* domainMemoryPeek */ remoteNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 7db9a4c..21ea491 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5220,6 +5220,7 @@ static virDriver testDriver = { NULL, /* domainMigrateFinish */ testDomainBlockStats, /* domainBlockStats */ testDomainInterfaceStats, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ testNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 48ef103..035ed0c 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1906,6 +1906,7 @@ static virDriver umlDriver = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ umlDomainBlockPeek, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d6b681c..e2e1ce6 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -7028,6 +7028,7 @@ virDriver NAME(Driver) = { NULL, /* domainMigrateFinish */ NULL, /* domainBlockStats */ NULL, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ NULL, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index ed94bed..e952610 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -1844,6 +1844,7 @@ static virDriver xenUnifiedDriver = { xenUnifiedDomainMigrateFinish, /* domainMigrateFinish */ xenUnifiedDomainBlockStats, /* domainBlockStats */ xenUnifiedDomainInterfaceStats, /* domainInterfaceStats */ + NULL, /* domainMemoryStats */ xenUnifiedDomainBlockPeek, /* domainBlockPeek */ NULL, /* domainMemoryPeek */ xenUnifiedNodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */ -- 1.6.5

4 8

[libvirt] [PATCH] Fix typo in qemudDomainAttachHostPciDevice()
by Jiri Denemark 21 Dec '09

21 Dec '09

The 'if' statement is supposed to check return value of pci = pciGetDevice(conn, ...); Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 890aa84..60dea9c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5290,7 +5290,7 @@ static int qemudDomainAttachHostPciDevice(virConnectPtr conn, hostdev->source.subsys.u.pci.bus, hostdev->source.subsys.u.pci.slot, hostdev->source.subsys.u.pci.function); - if (!dev) + if (!pci) return -1; if ((hostdev->managed && pciDettachDevice(conn, pci) < 0) || -- 1.6.6.rc4

2 1

[libvirt] Executing scripts when bridge interface becomes available
by Felix Schwarz 20 Dec '09

20 Dec '09

Hi, I'm using libvirt on a CentOS 5.4 host (so my libvirt is quite old) with a routed setup. My configuration is easy and works reliable as far as I can tell now. As far as I know, I have to add routes manually (so that the host knows which IPs need to be routed to the virbr1). My ip command looks like this: /sbin/ip route add <guest ip> dev virbr1 scope link Currently I have really problems finding the right spot where I should configure the routes and it looks like libvirt does not offer any support for that. 1. I can add the route when my network comes up because virbr1 is not available at that time. 2. If I switch my vm to the 'ethernet' interface, I can use a custom script but then I have to do all the network setup myself which looks like overkill and time-consuming (as I have to rebuild things that libvirt already does perfectly). I just want to add some routes... To me the perfect solution would be either: a) have start/stop scripts defined in the network configuration b) have start/stop scripts defined in the vm configuration - Does libvirt 0.7 offer things like that? (I could not find something in the documentation) - Is there an obvious way that I missed when it comes to route configuration? fs

1 0

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

20 Dec '09

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

1 0

[libvirt] [PATCH 00/13] esx: Automatic question handling and other improvements
by Matthias Bolte 18 Dec '09

18 Dec '09

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

2 25

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

18 Dec '09

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

2 2

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

18 Dec '09

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

3 4

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

18 Dec '09

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

1 0

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

18 Dec '09

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

2 1

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

18 Dec '09

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

1 0

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

17 Dec '09

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

4 18

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

17 Dec '09

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

4 6

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

17 Dec '09

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

4 33

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

17 Dec '09

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

2 3

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

17 Dec '09

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

2 22

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

16 Dec '09

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

2 10

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

16 Dec '09

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

1 0

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

16 Dec '09

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

2 5

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

16 Dec '09

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

4 5

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

15 Dec '09

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

2 2

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

15 Dec '09

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

2 2

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

15 Dec '09

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

2 1

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

15 Dec '09

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

3 4

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

15 Dec '09

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

3 4

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

15 Dec '09

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

3 2

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

15 Dec '09

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

3 3