- Devel - libvirt List Archives

[libvirt] [PATCH] Fix virPipeReadUntilEOF on more than 1024 bytes of data
by Daniel Veillard 03 Nov '10

03 Nov '10

This is a bug I found while testing the smbios support, it uses virPipeReadUntilEOF to read the stdout of the exec'ed dmidecode process and this failed to capture the full output. It read only 1024 bytes. The problem is that this is based on a poll loop, and in the loop we read at most 1024 bytes per filedescriptor, but we also note in the loop if poll indicates that the process won't output more than that on that fd by setting finished[i] = 1. The simplest way is that if we read a full buffer make sure finished[i] is still 0 because we will need another pass in the loop. Daniel diff --git a/src/util/util.c b/src/util/util.c index f7c7d32..a059675 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -984,6 +984,9 @@ virPipeReadUntilEOF(int outfd, int errfd, got = read(fds[i].fd, data, sizeof(data)); + if (got == sizeof(data)) + finished[i] = 0; + if (got == 0) { finished[i] = 1; continue; -- 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] Changing the default for qcow2 creation
by Matthew Booth 03 Nov '10

03 Nov '10

I've recently been investigating a severe performance issue I noticed when writing to a qcow2-backed image. When virt-v2v is doing a format conversion from raw to qcow2, it does the following: 1. Create a new qcow2 image 2. Launch a libguestfs appliance (kvm) using the new image 3. Write the source raw data to the appliance's block device I noticed that the same process writing to a raw image rather than a qcow2 image was adequately fast, and decided to do some testing. I've attached my simple test program.[1] It does the following: 1. Start an appliance with test.img as a disk. 2. Format test.img with ext2. 3. Create a file /test 4. Write 256M of data to /test in 2M chunks Only step 4 is timed. I ran the program against test.img prepared in 4 different ways: 1. A sparse raw file: 15.3 seconds truncate --size 300M test.img 2. A preallocated raw file: 14.8 seconds fallocate -l 300M test.img 3. A sparse qcow2 file: 223.0 seconds qemu-img create -f qcow2 test.img 300M 4. A metadata preallocated qcow2 file: 14.5 seconds qemu-img create -f qcow2 -o preallocated=metadata test.img 300M With the exception of (3), I ran the test 3 times and took the middle time rounded to 1DP. I saw about 5-10% variation. I only ran the test against (3) once. The precise ordering of 1, 2 and 4 is surprising, but given the variation probably not that interesting: they're all about the same. The interesting thing is that the overhead of qcow2 metadata creation during the test seems to account for a 15x performance penalty. I had a cursory look at metadata preallocation, which I hadn't been aware of before today. Creating a qcow2 image of any size with no preallocation results in a 136k file. If you preallocate the metadata, a sparse file is created large enough to accomodate the entire image, with >136k actually used. In the above 300M case this is 204k. On a slightly more practical 20G image, 3.3M is preallocated. It's also worth noting that the image takes considerably longer to create. On my laptop, creation without preallocation is 'instantaneous' at any size. With preallocation, a 20G image takes 6 seconds to create, and a 100G image takes 26 seconds. libvirt's qemu driver doesn't currently preallocate qcow2 metadata when creating a new image. Given the tiny disk space overhead of the metadata (0.02%) and the small processing overhead of pre-creation relative to subsequent creation on-the-fly, I suggest that the libvirt qemu driver is updated to pre-allocate metadata by default. Thoughts? Matt [1] Note that I'm running this against libguestfs from git, which uses virtio-serial rather than usermode networking for appliance<->host communication. This change alone improved the performance of this test by about 10x. If your numbers don't match mine, that's probably why. I don't know off the top of my head if this change has made it into F14 yet. It's definitely not in F13. -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490

5 6

[libvirt] New PHP bindings
by Arnar Mar Sig 03 Nov '10

03 Nov '10

Hi There are few PHP libvirt bindings out there, but all I found are procedural based and incomplete. To address this I created another binding that is OO based and in large part generated from libvirt-api.xml. The extension already supports most of the API, split into 6 classes: virConnect, virDomain, virInterface, virNetwork, virStoragePool, and virStorageVol. Snapshot of the current code can be found at: http://libvirt-debian.vm.antab.is/files/php-libvirt.tar.bz2 Or using svn from: http://svn.antab.is/php-libvirt/trunk Build instructions are in the README file. Documents can be found at http://libvirt-debian.vm.antab.is/ NOTE: Most of the docs are copied from libvirt. It has mostly been tested with libvirt test backend and PHP unit tests (phpt) are used to test, covering about 40% of basic usage. It is by no means complete and missing some functionality like classmaps (So virConnect::domainLookupBy* can return user defined class extended from virDomain) and probably leaks memory. I would appreciate any input and comments. Thanks Arnar Mar Sig

3 7

[libvirt] [PATCH 00/10] Allow access to text console with virStream APIs (v2)
by Daniel P. Berrange 02 Nov '10

02 Nov '10

2 29

[libvirt] [PATCH] xen: work with ia64 MAX_VIRT_CPUS of 64
by Eric Blake 02 Nov '10

02 Nov '10

* src/xen/xen_hypervisor.c (MAX_VIRT_CPUS): Move... * src/xen/xen_driver.h (MAX_VIRT_CPUS): ...so all xen code can see same value. * src/xen/xend_internal.c (sexpr_to_xend_domain_info) (xenDaemonDomainGetVcpusFlags, xenDaemonParseSxpr) (xenDaemonFormatSxpr): Work if MAX_VIRT_CPUS is 64 on a platform where long is 64-bits. * src/xen/xm_internal.c (xenXMDomainConfigParse) (xenXMDomainConfigFormat): Likewise. --- On at least the xen/stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git we have the case where MAX_VIRT_CPUS is 32 for x86 but 64 for ia64. That branch does not have XEN_LEGACY_MAX_VCPUS. But according to our comments, other branches had only XEN_LEGACY_MAX_VCPUS, which means that xm_internal.c would fail to compile without this patch, when targetting xen headers that lack MAX_VIRT_CPUS. src/xen/xen_driver.h | 8 ++++++++ src/xen/xen_hypervisor.c | 8 -------- src/xen/xend_internal.c | 17 +++++++++-------- src/xen/xm_internal.c | 9 +++++---- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h index 53f97d4..16d22f1 100644 --- a/src/xen/xen_driver.h +++ b/src/xen/xen_driver.h @@ -29,6 +29,14 @@ # include <winsock2.h> # endif +/* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public + * headers. Its semantic was retained with XEN_LEGACY_MAX_VCPUS. + * Ensure MAX_VIRT_CPUS is defined accordingly. + */ +# if !defined(MAX_VIRT_CPUS) && defined(XEN_LEGACY_MAX_VCPUS) +# define MAX_VIRT_CPUS XEN_LEGACY_MAX_VCPUS +# endif + extern int xenRegister (void); # define XEN_UNIFIED_HYPERVISOR_OFFSET 0 diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 3797865..ec726fe 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -109,14 +109,6 @@ typedef privcmd_hypercall_t hypercall_t; # define SYS_IFACE_MIN_VERS_NUMA 4 #endif -/* xen-unstable changeset 19788 removed MAX_VIRT_CPUS from public - * headers. Its semanitc was retained with XEN_LEGACY_MAX_VCPUS. - * Ensure MAX_VIRT_CPUS is defined accordingly. - */ -#if !defined(MAX_VIRT_CPUS) && defined(XEN_LEGACY_MAX_VCPUS) -# define MAX_VIRT_CPUS XEN_LEGACY_MAX_VCPUS -#endif - static int xen_ioctl_hypercall_cmd = 0; static int initialized = 0; static int in_init = 0; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 974e96b..614c036 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2192,7 +2192,7 @@ xenDaemonParseSxpr(virConnectPtr conn, } def->maxvcpus = sexpr_int(root, "domain/vcpus"); - def->vcpus = count_one_bits(sexpr_int(root, "domain/vcpu_avail")); + def->vcpus = count_one_bits_l(sexpr_u64(root, "domain/vcpu_avail")); if (!def->vcpus || def->maxvcpus < def->vcpus) def->vcpus = def->maxvcpus; @@ -2468,7 +2468,7 @@ sexpr_to_xend_domain_info(virDomainPtr domain, const struct sexpr *root, } info->cpuTime = sexpr_float(root, "domain/cpu_time") * 1000000000; vcpus = sexpr_int(root, "domain/vcpus"); - info->nrVirtCpu = count_one_bits(sexpr_int(root, "domain/vcpu_avail")); + info->nrVirtCpu = count_one_bits_l(sexpr_u64(root, "domain/vcpu_avail")); if (!info->nrVirtCpu || vcpus < info->nrVirtCpu) info->nrVirtCpu = vcpus; @@ -3706,7 +3706,7 @@ xenDaemonDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) ret = sexpr_int(root, "domain/vcpus"); if (!(flags & VIR_DOMAIN_VCPU_MAXIMUM)) { - int vcpus = count_one_bits(sexpr_int(root, "domain/vcpu_avail")); + int vcpus = count_one_bits_l(sexpr_u64(root, "domain/vcpu_avail")); if (vcpus) ret = MIN(vcpus, ret); } @@ -5770,10 +5770,11 @@ xenDaemonFormatSxpr(virConnectPtr conn, virBufferVSprintf(&buf, "(memory %lu)(maxmem %lu)", def->mem.cur_balloon/1024, def->mem.max_balloon/1024); virBufferVSprintf(&buf, "(vcpus %u)", def->maxvcpus); - /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is 32. */ - verify(MAX_VIRT_CPUS <= sizeof(1U) * CHAR_BIT); + /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is + either 32, or 64 on a platform where long is big enough. */ + verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); if (def->vcpus < def->maxvcpus) - virBufferVSprintf(&buf, "(vcpu_avail %u)", (1U << def->vcpus) - 1); + virBufferVSprintf(&buf, "(vcpu_avail %lu)", (1UL << def->vcpus) - 1); if (def->cpumask) { char *ranges = virDomainCpuSetFormat(def->cpumask, def->cpumasklen); @@ -5870,8 +5871,8 @@ xenDaemonFormatSxpr(virConnectPtr conn, virBufferVSprintf(&buf, "(vcpus %u)", def->maxvcpus); if (def->vcpus < def->maxvcpus) - virBufferVSprintf(&buf, "(vcpu_avail %u)", - (1U << def->vcpus) - 1); + virBufferVSprintf(&buf, "(vcpu_avail %lu)", + (1UL << def->vcpus) - 1); for (i = 0 ; i < def->os.nBootDevs ; i++) { switch (def->os.bootDevs[i]) { diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index f80e252..6c5df0f 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -776,7 +776,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { def->maxvcpus = count; if (xenXMConfigGetULong(conf, "vcpu_avail", &count, -1) < 0) goto cleanup; - def->vcpus = MIN(count_one_bits(count), def->maxvcpus); + def->vcpus = MIN(count_one_bits_l(count), def->maxvcpus); if (xenXMConfigGetString(conf, "cpus", &str, NULL) < 0) goto cleanup; @@ -2336,10 +2336,11 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn, if (xenXMConfigSetInt(conf, "vcpus", def->maxvcpus) < 0) goto no_memory; - /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is 32. */ - verify(MAX_VIRT_CPUS <= sizeof(1U) * CHAR_BIT); + /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is + either 32, or 64 on a platform where long is big enough. */ + verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); if (def->vcpus < def->maxvcpus && - xenXMConfigSetInt(conf, "vcpu_avail", (1U << def->vcpus) - 1) < 0) + xenXMConfigSetInt(conf, "vcpu_avail", (1UL << def->vcpus) - 1) < 0) goto no_memory; if ((def->cpumask != NULL) && -- 1.7.2.3

5 12

[libvirt] could no query memory balloon allocation
by Marc Haber 02 Nov '10

02 Nov '10

Hi, I am playing around with libvirt and KVM on a Debian sid system (with a self-built kernel 2.6.36, 64bit kernel and 32bit userland). I have pulled libvirt 0.8.4 from experimental. When I try staring a VM using virtu-manager, I get the error message "Error starting domain: operation failed: could not query memory balloon allocation". This is probably some weird timing issue - when I have an strace attached to the libvirtd, everything is fine. In the #kvm IRC channel, people have told me that there may be an issue between some kernel versions and some libvirt versions, but neither the list archives nor the git changelog of 0.8.5 indicate such an issue (and #virt on oftc is quiet as usual). Can anybody explain what is going on on my system and what I could do to work around the issue? Greetings Marc -- ----------------------------------------------------------------------------- Marc Haber | "I don't trust Computers. They | Mailadresse im Header Mannheim, Germany | lose things." Winona Ryder | Fon: *49 621 72739834 Nordisch by Nature | How to make an American Quilt | Fax: *49 3221 2323190

1 0

[libvirt] [PATCH] Fix build with polkit 0
by Jim Fehlig 02 Nov '10

02 Nov '10

Commit e8066d53 broke the build with polkit0: remote.c: In function 'remoteDispatchAuthPolkit': remote.c:4177: error: 'rv' undeclared (first use in this function) Add missing identifier. --- daemon/remote.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 886d53d..3cf3886 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4152,6 +4152,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server, DBusError err; const char *action; char ident[100]; + int rv; memset(ident, 0, sizeof ident); -- 1.6.0.2

2 2

[libvirt] how to attach PCI/USB device
by Zdenek Styblik 02 Nov '10

02 Nov '10

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello list and its users, as subject suggests, I'm trying to attach PCI/USB devices to Guest(VM). A-and, it doesn't work. But I swear I had it before(somewhat in the beginnings). I'm using virt-managers to add/attach devices. I've failed to attach PCI device, but it "does not" matter right now. I can attach USB devices, but they are not in VM. I've tried to attach USB HUB as well and what not - nothing. So, could somebody please tell me, how to debug it? Could it be somehow connected with qemu-kvm running 'root-less'? libvirt-0.8.4 and 0.8.5. Thank you all and nice whatever-timezone-you-are-in, Zdenek - -- Zdenek Styblik Net/Linux admin OS TurnovFree.net email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAkzPCuQACgkQ8MreUbSH7imBMACcCW+DQ4lwNmcPiM9kXNjbHIWD o68An3RwjHN98zlQumJsCGbnG5Xie0WB =4ZBd -----END PGP SIGNATURE-----

3 6

[libvirt] libvirtd: how to react on qemu watchdog events
by Hu Tao 02 Nov '10

02 Nov '10

Hi, I'm currently seeking a way to monitor qemu watchdog events and do somthing based on these events. Although there is a good example at libvirt-source/examples/domain-events/events-c/event-test.c to start with, and I did achieve my goal by little modification of the example, but it ran as a libvirt client. How can I make libvirtd monitor the events and react on them? Thanks a lot!

2 1

[libvirt] [PATCH] Fix several warnings about a non-literal format string
by Jiri Denemark 02 Nov '10

02 Nov '10

They only popped up during --disable-nls build. Without this configure option, gcc wasn't able to detect them. --- I already pushed this since it's both trivial and build-breaking. src/esx/esx_vmx.c | 2 +- src/util/iptables.c | 2 +- src/util/network.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 0a26614..36818df 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -2611,7 +2611,7 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, /* def:maxvcpus -> vmx:numvcpus */ if (def->vcpus != def->maxvcpus) { - ESX_ERROR(VIR_ERR_CONFIG_UNSUPPORTED, + ESX_ERROR(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("No support for domain XML entry 'vcpu' attribute " "'current'")); goto cleanup; diff --git a/src/util/iptables.c b/src/util/iptables.c index fc656b9..fe78d1c 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -334,7 +334,7 @@ static char *iptablesFormatNetwork(virSocketAddr *netaddr, if (!VIR_SOCKET_IS_FAMILY(netaddr, AF_INET) || !VIR_SOCKET_IS_FAMILY(netmask, AF_INET)) { - iptablesError(VIR_ERR_CONFIG_UNSUPPORTED, + iptablesError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only IPv4 addresses can be used with iptables")); return NULL; } diff --git a/src/util/network.c b/src/util/network.c index 81ac228..1abe78b 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -80,7 +80,7 @@ virSocketParseAddr(const char *val, virSocketAddrPtr addr, int family) { int err; if (val == NULL) { - virSocketError(VIR_ERR_INVALID_ARG, _("Missing address")); + virSocketError(VIR_ERR_INVALID_ARG, "%s", _("Missing address")); return -1; } @@ -173,7 +173,7 @@ virSocketFormatAddrFull(virSocketAddrPtr addr, int err; if (addr == NULL) { - virSocketError(VIR_ERR_INVALID_ARG, _("Missing address")); + virSocketError(VIR_ERR_INVALID_ARG, "%s", _("Missing address")); return NULL; } -- 1.7.3.2

1 0

Re: [libvirt] SPAM-LOW: Re: Re: Node.GetInfo error
by arnaud.champion＠devatom.fr 02 Nov '10

02 Nov '10

?:S I'm far away from a git expert :S Maybe anyone on the list can help us ? Arnaud From: 黄亮 Sent: Monday, November 01, 2010 2:42 PM To: arnaud.champion(a)devatom.fr Subject: Re: Re: Re: SPAM-LOW: Re: Re: Node.GetInfo error Hi Arnaud, I tried GitExtension, but while applying patch, it returns "Patch format detection failed. " Should I change some settings or is there something not right in the patch file? Regards 2010-11-01 -------------------------------------------------------------------------------- Lancer -------------------------------------------------------------------------------- 发件人： arnaud.champion(a)devatom.fr 发送时间： 2010-11-01 16:55:51 收件人：黄亮抄送： libvir-list(a)redhat.com 主题： Re: Re: SPAM-LOW: Re: Re: Node.GetInfo error Ok, if you are under windows (like me), use GitExtension (http://sourceforge.net/projects/gitextensions/) It works, not perfect, but it works. Arnaud From: 黄亮 Sent: Monday, November 01, 2010 9:52 AM To: arnaud.champion(a)devatom.fr Subject: Re: Re: SPAM-LOW: Re: Re: Node.GetInfo error Hi Arnaud, The NodeInfoStructure you sent to me yesterday works, thank you. I saw your patch file, should I manually apply it to the source code or is there some tools I can use to automatically apply the changes? Regards 2010-11-01 -------------------------------------------------------------------------------- Lancer -------------------------------------------------------------------------------- 发件人： arnaud.champion(a)devatom.fr 发送时间： 2010-11-01 16:37:17 收件人：黄亮抄送： libvir-list 主题： Re: SPAM-LOW: Re: Re: Node.GetInfo error Hi, I think the solution is in the last patches I have send (which are not yet in the git). Have you tried the NodeInfoStructure I have sended yesterday ? Arnaud From: 黄亮 Sent: Monday, November 01, 2010 3:01 AM To: arnaud.champion(a)devatom.fr Cc: libvir-list Subject: SPAM-LOW: Re: Re: Node.GetInfo error HI, I tried Errors.Error err = Errors.GetLastError(); MessageBox.Show(err.Message); But IDE shows compilation errors that there is no "Error" defination in "Errors", and "Errors.GetLastError()" returns int. I made a guess that maybe it was like this: Error err = Errors.SaveLastError(); MessageBox.Show("Get Info error: " + err.Message); It can be compiled but "err.Message" has nothing in it. Did I make a wrong assumption? Regards 2010-11-01 -------------------------------------------------------------------------------- Lancer -------------------------------------------------------------------------------- 发件人： arnaud.champion(a)devatom.fr 发送时间： 2010-10-31 16:48:15 收件人：黄亮抄送： libvir-list(a)redhat.com 主题： Re: Node.GetInfo error Ok, at first GetLastError return an Error object. So you should anything like : Errors.Error err = Errors.GetLastError(); MessageBox.Show(err.Message); For the NodeInfo structure, I think the problem is the same that was for DomainInfo, I'll check marshaling. Then respond you with the correct infos. Arnaud PS : can you also put libvirt-list(a)redhat.com in copy of your mails, to keep everyone in the loop ? From: 黄亮 Sent: Sunday, October 31, 2010 8:20 AM To: arnaud.champion Subject: Node.GetInfo error Hi, Sorry for disturbing again. But I get error while using Node.GetInfo. Code: NodeInfo aNodeInfo = new NodeInfo(); if (Node.GetInfo(con, aNodeInfo) < 0) { //MessageBox.Show("Node Info Error"); MessageBox.Show(Errors.GetLastError().ToString()); return 0f; } I'm sure con != IntPtr.Zero. I tried to use Errors.GetLastError(), it returns int. But I don't know what to do with it. So, any suggestions ? Thanks Regards 2010-10-31 -------------------------------------------------------------------------------- Lancer __________ Information from ESET Smart Security, version of virus signature database 5577 (20101030) __________ The message was checked by ESET Smart Security. http://www.eset.com __________ Information from ESET Smart Security, version of virus signature database 5580 (20101031) __________ The message was checked by ESET Smart Security. http://www.eset.com

5 7

[libvirt] [PATCH] [TCK] network: create networks and check for exected results
by Stefan Berger 02 Nov '10

02 Nov '10

Derived from the nwfilter test program, this one works with libvirt's networks. It creates networks from provided xml files and checks for expected configuration in iptables, running processes and virsh output using provided data files with commands to execute and the expected results for after creating the network and after tearing it down (*.post.dat). 3 tests are currently not passing due to a bug in libvirt... Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- Build.PL | 2 scripts/networks/100-apply-verify-host.t | 10 scripts/networks/networkApplyTest.sh | 343 +++++++++++++ scripts/networks/networkxml2hostout/tck-testnet-1.dat | 11 scripts/networks/networkxml2hostout/tck-testnet-1.post.dat | 4 scripts/networks/networkxml2hostout/tck-testnet-2.dat | 8 scripts/networks/networkxml2hostout/tck-testnet-2.post.dat | 4 scripts/networks/networkxml2xmlin/tck-testnet-1.xml | 12 scripts/networks/networkxml2xmlin/tck-testnet-2.xml | 12 9 files changed, 405 insertions(+), 1 deletion(-) Index: libvirt-tck/scripts/networks/networkApplyTest.sh =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkApplyTest.sh @@ -0,0 +1,343 @@ +#!/bin/bash + +VIRSH=virsh + +uri= +if [ "x${LIBVIRT_TCK_CONFIG}x" != "xx" ]; then + uri_exp=`cat ${LIBVIRT_TCK_CONFIG} | grep "^uri\s*=" | sed -e 's/uri\s*=\s*//' | tail -n 1` + if [ "x${uri_exp}x" != "xx" ]; then + eval "uri=${uri_exp}" + fi + if [ "x${uri}x" == "xx" ]; then + uri="qemu:///system" + fi +else + uri="qemu:///system" +fi +LIBVIRT_URI=${uri} + + +FLAG_WAIT="$((1<<0))" +FLAG_VERBOSE="$((1<<2))" +FLAG_LIBVIRT_TEST="$((1<<3))" +FLAG_TAP_TEST="$((1<<4))" +FLAG_FORCE_CLEAN="$((1<<5))" + +failctr=0 +passctr=0 +attachfailctr=0 +attachctr=0 + +TAP_FAIL_LIST="" +TAP_FAIL_CTR=0 +TAP_TOT_CTR=0 + +function usage() { + local cmd="$0" +cat <<EOF +Usage: ${cmd} [--help|-h|-?] [--noattach] [--wait] [--verbose] + [--libvirt-test] [--tap-test] + +Options: + --help,-h,-? : Display this help screen. + --wait : Wait for the user to press the enter key once an error + was detected + --verbose : Verbose output + --libvirt-test : Use the libvirt test output format + --tap-test : TAP format output + --force : Allow the automatic cleaning of VMs and networks + previously created by the TCK test suite + +This test creates libvirt 'networks' and checks for expected results +(iptables, running processes (dnsmasq)) using provided xml and data +file respectively. +EOF +} + + +function tap_fail() { + echo "not ok $1 - ${2:0:66}" + TAP_FAIL_LIST+="$1 " + ((TAP_FAIL_CTR++)) + ((TAP_TOT_CTR++)) +} + +function tap_pass() { + echo "ok $1 - ${2:0:70}" + ((TAP_TOT_CTR++)) +} + +function tap_final() { + local okay + + [ -n "${TAP_FAIL_LIST}" ] && echo "FAILED tests ${TAP_FAIL_LIST}" + + okay=`echo "($TAP_TOT_CTR-$TAP_FAIL_CTR)*100/$TAP_TOT_CTR" | bc -l` + echo "Failed ${TAP_FAIL_CTR}/${TAP_TOT_CTR} tests, ${okay:0:5}% okay" +} + +# A wrapper for mktemp in case it does not exist +# Echos the name of a temporary file. +function mktmpfile() { + local tmp + type -P mktemp > /dev/null + if [ $? -eq 0 ]; then + tmp=$(mktemp -t nwfvmtest.XXXXXX) + echo ${tmp} + else + while :; do + tmp="/tmp/nwfvmtest.${RANDOM}" + if [ ! -f ${tmp} ]; then + touch ${tmp} + chmod 666 ${tmp} + echo ${tmp} + break + fi + done + fi + return 0 +} + + +function checkExpectedOutput() { + local xmlfile="$1" + local datafile="$2" + local flags="$3" + local skipregex="$4" + local cmd line tmpfile tmpfile2 skip + + tmpfile=`mktmpfile` + tmpfile2=`mktmpfile` + + exec 4<${datafile} + + read <&4 + line="${REPLY}" + + while [ "x${line}x" != "xx" ]; do + cmd=`echo ${line##\#}` + + skip=0 + if [ "x${skipregex}x" != "xx" ]; then + skip=`echo ${cmd} | grep -c -E ${skipregex}` + fi + + eval ${cmd} 2>&1 | tee ${tmpfile} 1>/dev/null + + rm ${tmpfile2} 2>/dev/null + touch ${tmpfile2} + + while [ 1 ]; do + read <&4 + line="${REPLY}" + + if [ "${line:0:1}" == "#" ] || [ "x${line}x" == "xx" ]; then + + if [ ${skip} -ne 0 ]; then + break + fi + + diff ${tmpfile} ${tmpfile2} >/dev/null + + if [ $? -ne 0 ]; then + if [ $((flags & FLAG_VERBOSE)) -ne 0 ]; then + echo "FAIL ${xmlfile} : ${cmd}" + diff ${tmpfile} ${tmpfile2} + fi + ((failctr++)) + if [ $((flags & FLAG_WAIT)) -ne 0 ]; then + echo "tmp files: $tmpfile, $tmpfile2" + echo "Press enter" + read + fi + [ $((flags & FLAG_LIBVIRT_TEST)) -ne 0 ] && \ + test_result $((passctr+failctr)) "" 1 + [ $((flags & FLAG_TAP_TEST)) -ne 0 ] && \ + tap_fail $((passctr+failctr)) "${xmlfile} : ${cmd}" + else + ((passctr++)) + [ $((flags & FLAG_VERBOSE)) -ne 0 ] && \ + echo "PASS ${xmlfile} : ${cmd}" + [ $((flags & FLAG_LIBVIRT_TEST)) -ne 0 ] && \ + test_result $((passctr+failctr)) "" 0 + [ $((flags & FLAG_TAP_TEST)) -ne 0 ] && \ + tap_pass $((passctr+failctr)) "${xmlfile} : ${cmd}" + fi + + break + + fi + echo "${line}" >> ${tmpfile2} + done + done + + exec 4>&- + + rm -rf "${tmpfile}" "${tmpfile2}" 2>/dev/null +} + + +function doTest() { + local xmlfile="$1" + local datafile="$2" + local postdatafile="$3" + local flags="$4" + local netname + + if [ ! -r "${xmlfile}" ]; then + echo "FAIL : Cannot access filter XML file ${xmlfile}." + return 1 + fi + + netname=`cat "${xmlfile}" | sed -n 's/.*<name>$[[:print:]]*$<.*/\1/p'` + + ${VIRSH} net-create "${xmlfile}" > /dev/null + + checkExpectedOutput "${xmlfile}" "${datafile}" "${flags}" "" + + ${VIRSH} net-destroy "${netname}" > /dev/null + + if [ -r ${postdatafile} ]; then + checkExpectedOutput "${xmlfile}" "${postdatafile}" "${flags}" "" + fi + + return 0 +} + + +function runTests() { + local xmldir="$1" + local hostoutdir="$2" + local flags="$3" + local datafiles f c + local tap_total=0 ctr=0 + + pushd ${PWD} > /dev/null + cd ${hostoutdir} + datafiles=`ls *.dat` + popd > /dev/null + + if [ $((flags & FLAG_TAP_TEST)) -ne 0 ]; then + # Need to count the number of total tests + for fil in ${datafiles}; do + c=$(grep -c "^#" ${hostoutdir}/${fil}) + ((tap_total+=c)) + ((ctr++)) + done + echo "1..${tap_total}" + fi + + for fil in `echo "${datafiles}" | grep -v "\.post\.dat$"`; do + f=${fil%%.dat} + doTest "${xmldir}/${f}.xml" "${hostoutdir}/${fil}" \ + "${hostoutdir}/${f}.post.dat" "${flags}" + done + + if [ $((flags & FLAG_LIBVIRT_TEST)) -ne 0 ]; then + test_final $((passctr+failctr)) $failctr + elif [ $((flags & FLAG_TAP_TEST)) -ne 0 ]; then + tap_final + else + echo "" + echo "Summary: ${failctr} failures, ${passctr} passes," + if [ ${attachctr} -ne 0 ]; then + echo " ${attachfailctr} interface attachment failures with ${attachctr} attempts" + fi + fi +} + + +function main() { + local prgname="$0" + local vm1 vm2 + local xmldir="networkxml2xmlin" + local hostoutdir="networkxml2hostout" + local res rc + local flags + + while [ $# -ne 0 ]; do + case "$1" in + --help|-h|-\?) usage ${prgname}; exit 0;; + --wait) ((flags |= FLAG_WAIT ));; + --verbose) ((flags |= FLAG_VERBOSE ));; + --libvirt-test) ((flags |= FLAG_LIBVIRT_TEST ));; + --tap-test) ((flags |= FLAG_TAP_TEST ));; + --force) ((flags |= FLAG_FORCE_CLEAN ));; + *) usage ${prgname}; exit 1;; + esac + shift 1 + done + + if [ `uname` != "Linux" ]; then + if [ $((flags & FLAG_TAP_TEST)) -ne 0 ]; then + echo "1..0 # Skipped: Only valid on Linux hosts" + else + echo "This script will only run on Linux." + fi + exit 1; + fi + + if [ $((flags & FLAG_TAP_TEST)) -ne 0 ]; then + if [ "${LIBVIRT_URI}" != "qemu:///system" ]; then + echo "1..0 # Skipped: Only valid for Qemu system driver" + exit 0 + fi + + for name in `virsh list | awk '{print $2}'` + do + case ${name} in + tck*) + if [ "x${LIBVIRT_TCK_AUTOCLEAN}" == "x1" -o \ + $((flags & FLAG_FORCE_CLEAN)) -ne 0 ]; then + res=$(virsh destroy ${name} 2>&1) + res=$(virsh undefine ${name} 2>&1) + if [ $? -ne 0 ]; then + echo "Bail out! Could not undefine VM ${name}: ${res}" + exit 0 + fi + else + echo "Bail out! TCK VMs from previous tests still exist, use --force to clean" + exit 1 + fi + esac + done + + for name in `virsh net-list | sed -n '3,$p'` + do + case ${name} in + tck*) + if [ "x${LIBVIRT_TCK_AUTOCLEAN}" == "x1" -o \ + $((flags & FLAG_FORCE_CLEAN)) -ne 0 ]; then + res=$(virsh net-destroy ${name} 2>&1) + rc=$? + res=$(virsh net-undefine ${name} 2>&1) + if [ $rc -ne 0 -a $? -ne 0 ]; then + echo "Bail out! Could not destroy/undefine network ${name}: ${res}" + exit 1 + fi + else + echo "Bail out! Network ${name} already exists, use --force to clean" + exit 1 + fi + esac + done + fi + + if [ $((flags & FLAG_LIBVIRT_TEST)) -ne 0 ]; then + pushd ${PWD} > /dev/null + . test-lib.sh + if [ $? -ne 0 ]; then + exit 1 + fi + test_intro $this_test + popd > /dev/null + fi + + res=$(${VIRSH} capabilities 2>&1) + + runTests "${xmldir}" "${hostoutdir}" "${flags}" + + return 0 +} + +main "$@" Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.dat @@ -0,0 +1,11 @@ +#iptables -t nat -L -n | grep 10.1.2 +MASQUERADE tcp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 +MASQUERADE udp -- 10.1.2.0/24 !10.1.2.0/24 masq ports: 1024-65535 +MASQUERADE all -- 10.1.2.0/24 !10.1.2.0/24 +#iptables -n -L FORWARD | grep 10.1.2 +ACCEPT all -- anywhere 10.1.2.0/24 state RELATED,ESTABLISHED +ACCEPT all -- 10.1.2.0/24 anywhere +#ps aux | grep dnsmasq | grep 10.1.2 | sed -n 's/.*\$dnsmasq[[:print:]*]\$/\\1/p' +dnsmasq --strict-order --bind-interfaces --pid-file=/var/run/libvirt/network/tck-testnet.pid --conf-file= --listen-address 10.1.2.1 --except-interface lo --dhcp-range 10.1.2.2,10.1.2.254 --dhcp-lease-max=253 --dhcp-no-override +#virsh net-list | grep tck-testnet +tck-testnet active no Index: libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-1.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-1.xml @@ -0,0 +1,12 @@ +<network> + <name>tck-testnet</name> + <uuid>aadc8920-502a-4774-ac2b-cd382a204d06</uuid> + <forward mode='nat'/> + <bridge name='testbr' stp='on' delay='0' /> + <ip address='10.1.2.1' netmask='255.255.255.0'> + <dhcp> + <range start='10.1.2.2' end='10.1.2.254' /> + </dhcp> + </ip> +</network> + Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.dat @@ -0,0 +1,8 @@ +#iptables -L FORWARD | grep 10.1.2 +ACCEPT all -- anywhere 10.1.2.0/24 +ACCEPT all -- 10.1.2.0/24 anywhere +#iptables -t nat -L | grep 10.1.2 +#ps aux | grep dnsmasq | grep 10.1.2 | sed -n 's/.*\$dnsmasq[[:print:]*]\$/\\1/p' +dnsmasq --strict-order --bind-interfaces --pid-file=/var/run/libvirt/network/tck-testnet.pid --conf-file= --listen-address 10.1.2.1 --except-interface lo --dhcp-range 10.1.2.2,10.1.2.254 --dhcp-lease-max=253 --dhcp-no-override +#virsh net-list | grep tck-testnet +tck-testnet active no Index: libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-2.xml =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2xmlin/tck-testnet-2.xml @@ -0,0 +1,12 @@ +<network> + <name>tck-testnet</name> + <uuid>aadc8920-502a-4774-ac2b-cd382a204d06</uuid> + <forward mode='route'/> + <bridge name='testbr' stp='on' delay='0' /> + <ip address='10.1.2.1' netmask='255.255.255.0'> + <dhcp> + <range start='10.1.2.2' end='10.1.2.254' /> + </dhcp> + </ip> +</network> + Index: libvirt-tck/scripts/networks/100-apply-verify-host.t =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/100-apply-verify-host.t @@ -0,0 +1,10 @@ +#!/bin/bash + +pwd=$(dirname $0) + +pushd ${PWD} > /dev/null + +cd ${pwd} +bash ./networkApplyTest.sh --tap-test + +popd > /dev/null Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-1.post.dat @@ -0,0 +1,4 @@ +#iptables -t nat -L -n | grep 10.1.2 +#iptables -n -L FORWARD | grep 10.1.2 +#ps aux | grep dnsmasq | grep 10.1.2 | sed -n 's/.*\$dnsmasq[[:print:]*]\$/\\1/p' +#virsh net-list | grep tck-testnet Index: libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat =================================================================== --- /dev/null +++ libvirt-tck/scripts/networks/networkxml2hostout/tck-testnet-2.post.dat @@ -0,0 +1,4 @@ +#iptables -t nat -L -n | grep 10.1.2 +#iptables -n -L FORWARD | grep 10.1.2 +#ps aux | grep dnsmasq | grep 10.1.2 | sed -n 's/.*\$dnsmasq[[:print:]*]\$/\\1/p' +#virsh net-list | grep tck-testnet Index: libvirt-tck/Build.PL =================================================================== --- libvirt-tck.orig/Build.PL +++ libvirt-tck/Build.PL @@ -29,7 +29,7 @@ sub process_pkgdata_files { my $name = $File::Find::name; if (-d) { $tck_dirs{$name} = []; - } elsif (-f && (/\.t$/ || /\.sh$/ || /\.fwall$/ || /\.xml$/)) { + } elsif (-f && /\.(t|sh|fwall|xml|dat)$/) { push @{$tck_dirs{$dir}}, $name; } };

3 8

[libvirt] [PATCH 0/4] Fix handling of errors with disk labelling on NFS
by Daniel P. Berrange 01 Nov '10

01 Nov '10

The previous commit 06f81c63ebc19cb0e51f9b397991f6d6ae56d090 masked a flaw with handling of errors for NFS disk labels. If you had multiple devices that required labelling, and an disk on root squashing NFS, then when the failure occurred for the NFS file, all further devices would be skipped. The caller would then ignore the error and try to launch the guest anyway, unless there was a stdin_path on NFS. Since NFS error handling was not dealt with in the correct place, this in turn meant that disk hotplug failed with root squashing NFS. All in all a bit of a mess. This tries to clean up the code handling errors closer to the point of occurrance libvirt_private.syms | 1 + qemu/qemu_driver.c | 3 +-- qemu/qemu_monitor_text.c | 28 +++++++++++++++++++--------- security/security_selinux.c | 11 +++++++---- util/storage_file.c | 32 +++++++++++++++++++++++++------- util/storage_file.h | 9 +++++++++ 6 files changed, 62 insertions(+), 22 deletions(-) Daniel

2 8

[libvirt] [PATCH] docs: fix typo
by Eric Blake 01 Nov '10

01 Nov '10

* docs/drvqemu.html.in (qemu): Fix typo. --- Noticed this while browsing the web; pushing it as obvious. docs/drvqemu.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index ab54133..7230cae 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -70,7 +70,7 @@ qemu+ssh://root@example.com/system (remote access, SSH tunnelled) application. Thus the QEMU instances spawned from this driver will share the same privileges as the client application. The intended use case for this driver is desktop virtualization, with virtual - machines storing their disk imags in the user's home directory and + machines storing their disk images in the user's home directory and being managed from the local desktop login session. </p> -- 1.7.2.3

1 0

[libvirt] [C# bindings][PATCH] Add/Clean comments and virConnecSetErrorFunc Sample
by arnaud.champion＠devatom.fr 01 Nov '10

01 Nov '10

?Hi, here is a new patch, it add/correct some comments. It also make virDomainInfo marshaling working. It also add a new sample virConnectSetErrorFunc to show usage of virConnectSetErrorFunc, virError struct, virDomainInfo struct. Regards, Arnaud

2 4

[libvirt] [PATCH 1/2] qemu: add the USB devices to the cgroup whitelist
by Diego Elio Pettenò 01 Nov '10

01 Nov '10

Make sure that the QEmu process within the cgroup can access the device file for the USB device that has to be connected to the virtual domain. --- src/qemu/qemu_driver.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a7cce6a..0612e69 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3434,6 +3434,25 @@ static int qemuSetupChardevCgroup(virDomainDefPtr def, } +static int qemuSetupHostUsbDeviceCgroup(usbDevice *dev ATTRIBUTE_UNUSED, + const char *path, + void *opaque) +{ + virCgroupPtr cgroup = opaque; + int rc; + + VIR_DEBUG("Process path '%s' for USB device", path); + rc = virCgroupAllowDevicePath(cgroup, path); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to allow device %s"), + path); + return -1; + } + + return 0; +} + static int qemuSetupCgroup(struct qemud_driver *driver, virDomainObjPtr vm) { @@ -3507,6 +3526,23 @@ static int qemuSetupCgroup(struct qemud_driver *driver, qemuSetupChardevCgroup, cgroup) < 0) goto cleanup; + + for (i = 0; i < vm->def->nhostdevs; i++) { + virDomainHostdevDefPtr hostdev = vm->def->hostdevs[i]; + usbDevice *usb; + + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) + continue; + if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) + continue; + + if ((usb = usbGetDevice(hostdev->source.subsys.u.usb.bus, + hostdev->source.subsys.u.usb.device)) == NULL) + goto cleanup; + + if (usbDeviceFileIterate(usb, qemuSetupHostUsbDeviceCgroup, cgroup) < 0 ) + goto cleanup; + } } if ((rc = qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY))) { @@ -8511,6 +8547,25 @@ static int qemudDomainAttachHostUsbDevice(struct qemud_driver *driver, goto error; } + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_DEVICES)) { + virCgroupPtr cgroup = NULL; + usbDevice *usb; + + if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) !=0 ) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to find cgroup for %s\n"), + vm->def->name); + goto error; + } + + if ((usb = usbGetDevice(hostdev->source.subsys.u.usb.bus, + hostdev->source.subsys.u.usb.device)) == NULL) + goto error; + + if (usbDeviceFileIterate(usb, qemuSetupHostUsbDeviceCgroup, cgroup) < 0 ) + goto error; + } + qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) ret = qemuMonitorAddDevice(priv->mon, devstr); -- 1.7.3.2

3 4

[libvirt] [PATCH] qemu: add the USB devices to the cgroup whitelist
by Diego Elio Pettenò 01 Nov '10

01 Nov '10

Add a new interface to hostusb.h to add an USB device abstraction to a cgroup whitelist; then use it both when attaching a new USB device and when adding it to the commandline so that the device can be accessed by the QEmu-specific cgroup. --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 36 ++++++++++++++++++++++++++++++++++++ src/util/hostusb.c | 6 ++++++ src/util/hostusb.h | 4 +++- 4 files changed, 46 insertions(+), 1 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cf06256..0c6f308 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -707,6 +707,7 @@ virMutexUnlock; # usb.h +usbAllowDeviceCgroup; usbDeviceFileIterate; usbDeviceGetBus; usbDeviceGetDevno; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1eea3a9..acf319e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3505,6 +3505,23 @@ static int qemuSetupCgroup(struct qemud_driver *driver, qemuSetupChardevCgroup, cgroup) < 0) goto cleanup; + + for (i = 0; i < vm->def->nhostdevs; i++) { + virDomainHostdevDefPtr hostdev = vm->def->hostdevs[i]; + usbDevice *usb; + + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) + continue; + if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) + continue; + + if ((usb = usbFindDevice(hostdev->source.subsys.u.usb.vendor, + hostdev->source.subsys.u.usb.product)) == NULL) + goto cleanup; + + if (usbAllowDeviceCgroup(usb, cgroup) < 0) + goto cleanup; + } } if ((rc = qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY))) { @@ -8454,6 +8471,25 @@ static int qemudDomainAttachHostUsbDevice(struct qemud_driver *driver, goto error; } + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_DEVICES)) { + virCgroupPtr cgroup = NULL; + usbDevice *usb; + + if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) !=0 ) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to find cgroup for %s\n"), + vm->def->name); + goto error; + } + + if ((usb = usbFindDevice(hostdev->source.subsys.u.usb.vendor, + hostdev->source.subsys.u.usb.product)) == NULL) + goto error; + + if (usbAllowDeviceCgroup(usb, cgroup) < 0) + goto error; + } + qemuDomainObjEnterMonitorWithDriver(driver, vm); if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) ret = qemuMonitorAddDevice(priv->mon, devstr); diff --git a/src/util/hostusb.c b/src/util/hostusb.c index 2d6e414..2cbe1fb 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -225,3 +225,9 @@ int usbDeviceFileIterate(usbDevice *dev, { return (actor)(dev, dev->path, opaque); } + +int usbAllowDeviceCgroup(usbDevice *dev, + virCgroupPtr group) +{ + return virCgroupAllowDevicePath(group, dev->path); +} diff --git a/src/util/hostusb.h b/src/util/hostusb.h index f4a13ca..12269ad 100644 --- a/src/util/hostusb.h +++ b/src/util/hostusb.h @@ -23,6 +23,7 @@ # define __VIR_USB_H__ # include "internal.h" +# include "cgroup.h" typedef struct _usbDevice usbDevice; @@ -48,6 +49,7 @@ typedef int (*usbDeviceFileActor)(usbDevice *dev, int usbDeviceFileIterate(usbDevice *dev, usbDeviceFileActor actor, void *opaque); - +int usbAllowDeviceCgroup(usbDevice *dev, + virCgroupPtr group); #endif /* __VIR_USB_H__ */ -- 1.7.3.2

2 3

Re: [libvirt] SPAM-LOW: Re: Re: Node.GetInfo error
by arnaud.champion＠devatom.fr 01 Nov '10

01 Nov '10

?Ok, if you are under windows (like me), use GitExtension (http://sourceforge.net/projects/gitextensions/) It works, not perfect, but it works. Arnaud From: 黄亮 Sent: Monday, November 01, 2010 9:52 AM To: arnaud.champion(a)devatom.fr Subject: Re: Re: SPAM-LOW: Re: Re: Node.GetInfo error Hi Arnaud, The NodeInfoStructure you sent to me yesterday works, thank you. I saw your patch file, should I manually apply it to the source code or is there some tools I can use to automatically apply the changes? Regards 2010-11-01 -------------------------------------------------------------------------------- Lancer -------------------------------------------------------------------------------- 发件人： arnaud.champion(a)devatom.fr 发送时间： 2010-11-01 16:37:17 收件人：黄亮抄送： libvir-list 主题： Re: SPAM-LOW: Re: Re: Node.GetInfo error Hi, I think the solution is in the last patches I have send (which are not yet in the git). Have you tried the NodeInfoStructure I have sended yesterday ? Arnaud From: 黄亮 Sent: Monday, November 01, 2010 3:01 AM To: arnaud.champion(a)devatom.fr Cc: libvir-list Subject: SPAM-LOW: Re: Re: Node.GetInfo error HI, I tried Errors.Error err = Errors.GetLastError(); MessageBox.Show(err.Message); But IDE shows compilation errors that there is no "Error" defination in "Errors", and "Errors.GetLastError()" returns int. I made a guess that maybe it was like this: Error err = Errors.SaveLastError(); MessageBox.Show("Get Info error: " + err.Message); It can be compiled but "err.Message" has nothing in it. Did I make a wrong assumption? Regards 2010-11-01 -------------------------------------------------------------------------------- Lancer -------------------------------------------------------------------------------- 发件人： arnaud.champion(a)devatom.fr 发送时间： 2010-10-31 16:48:15 收件人：黄亮抄送： libvir-list(a)redhat.com 主题： Re: Node.GetInfo error Ok, at first GetLastError return an Error object. So you should anything like : Errors.Error err = Errors.GetLastError(); MessageBox.Show(err.Message); For the NodeInfo structure, I think the problem is the same that was for DomainInfo, I'll check marshaling. Then respond you with the correct infos. Arnaud PS : can you also put libvirt-list(a)redhat.com in copy of your mails, to keep everyone in the loop ? From: 黄亮 Sent: Sunday, October 31, 2010 8:20 AM To: arnaud.champion Subject: Node.GetInfo error Hi, Sorry for disturbing again. But I get error while using Node.GetInfo. Code: NodeInfo aNodeInfo = new NodeInfo(); if (Node.GetInfo(con, aNodeInfo) < 0) { //MessageBox.Show("Node Info Error"); MessageBox.Show(Errors.GetLastError().ToString()); return 0f; } I'm sure con != IntPtr.Zero. I tried to use Errors.GetLastError(), it returns int. But I don't know what to do with it. So, any suggestions ? Thanks Regards 2010-10-31 -------------------------------------------------------------------------------- Lancer __________ Information from ESET Smart Security, version of virus signature database 5577 (20101030) __________ The message was checked by ESET Smart Security. http://www.eset.com

1 0

Re: [libvirt] Node.GetInfo error
by arnaud.champion＠devatom.fr 01 Nov '10

01 Nov '10

?Ok, at first GetLastError return an Error object. So you should anything like : Errors.Error err = Errors.GetLastError(); MessageBox.Show(err.Message); For the NodeInfo structure, I think the problem is the same that was for DomainInfo, I'll check marshaling. Then respond you with the correct infos. Arnaud PS : can you also put libvirt-list(a)redhat.com in copy of your mails, to keep everyone in the loop ? From: 黄亮 Sent: Sunday, October 31, 2010 8:20 AM To: arnaud.champion Subject: Node.GetInfo error Hi, Sorry for disturbing again. But I get error while using Node.GetInfo. Code: NodeInfo aNodeInfo = new NodeInfo(); if (Node.GetInfo(con, aNodeInfo) < 0) { //MessageBox.Show("Node Info Error"); MessageBox.Show(Errors.GetLastError().ToString()); return 0f; } I'm sure con != IntPtr.Zero. I tried to use Errors.GetLastError(), it returns int. But I don't know what to do with it. So, any suggestions ? Thanks Regards 2010-10-31 -------------------------------------------------------------------------------- Lancer

2 4

[libvirt] ESXi 4.1 Driver
by Sherif Nagy 31 Oct '10

31 Oct '10

Dear All, Any idea what release of Libvirt has or will have the support for ESXi 4.1 driver? Thank You, Regards, Sherif

1 1

Re: [libvirt] SPAM-LOW: Domain.GetInfo error
by arnaud.champion＠devatom.fr 31 Oct '10

31 Oct '10

?Hi, In fact, when you compile libvirt with mingwin/msys, the binaries are compiled in 32 bits, even it runs on a 64 bits system. Accordingly, C# bindings must be targeted as x86 (32 bits) when compiling them. This isn't a problem for a 64 bits application which use bindings, .Net make the trick to make it works. I haven't made any test with xen (I haven't xen) but if your sample works, it means libvirt is compiled with xen support. Happy halloween to you also. Arnaud From: 黄亮 Sent: Sunday, October 31, 2010 6:52 AM To: arnaud.champion(a)devatom.fr Subject: Re: Re: SPAM-LOW: Domain.GetInfo error Hi, Thanks for your reply. It works with the patch you provide in last letter. But I don't understand "x86 target" you mentioned, does it mean if I want to make the code run, the server which runs xend & libvirtd must be a x86 arch, not a x64 arch? As to the question "are you sure also that libvirt dll is compiled with xen support ?" I just follow the instructions on http://github.com/photron/msys_setup, without the ESX support, I think it should support Xen, though it isn't write in explicit. Anyway, at least it's working. Thanks for your reply. Regards and Best wishes, and Happy Halloween XD 2010-10-31 -------------------------------------------------------------------------------- Lancer -------------------------------------------------------------------------------- 发件人： arnaud.champion(a)devatom.fr 发送时间： 2010-10-31 01:21:52 收件人：黄亮抄送： libvir-list(a)redhat.com 主题： Re: SPAM-LOW: Domain.GetInfo error Hi, So, at first, are you sure that conn != IntPtr.Zero and pDomain != IntPtr.Zero. if both pointer are ok, can you please check the DomainInfo marshal, I have just sended patch today around this structure, and I think the patch is not yet pushed to the git. The DomainInfo structure must be marshaled in this way : /// <summary> /// Structure to handle domain informations /// </summary> [StructLayout(LayoutKind.Sequential)] public class DomainInfo { /// <summary> /// The running state, one of virDomainState. /// </summary> private byte state; /// <summary> /// The maximum memory in KBytes allowed. /// </summary> [MarshalAs(UnmanagedType.SysUInt)] public UIntPtr maxMem; /// <summary> /// The memory in KBytes used by the domain. /// </summary> [MarshalAs(UnmanagedType.SysUInt)] public UIntPtr memory; /// <summary> /// The number of virtual CPUs for the domain. /// </summary> public ushort nrVirtCpu; /// <summary> /// The CPU time used in nanoseconds. /// </summary> [MarshalAs(UnmanagedType.SysUInt)] public UIntPtr cpuTime; /// <summary> /// The running state, one of virDomainState. /// </summary> public DomainState State { get { return (DomainState)state; } } } Also, another important thing change : the libvirt bindings project must have an x86 target to make this marshaling working. This is also in the patch. Another thing, you can also use Errors.GetLastErro() method to identify the problem, it return an error class which can inform you about the problem. Best regards, Arnaud PS : are you sure also that libvirt dll is compiled with xen support ? From: 黄亮 Sent: Saturday, October 30, 2010 7:07 PM To: arnaud.champion Subject: SPAM-LOW: Domain.GetInfo error Dear Arnaud Here is my test code. Function Domain.GetInfo return -1 and I don't know where is the mistake. Would you do me a favor to point out the problem? Thank you! Code: IntPtr conn = Connect.Open("xen+tcp://192.168.0.1?no_verify=1"); String DomainName = e.Node.Text; IntPtr pDomain = Domain.LookupByName(conn, DomainName); DomainInfo aInfo = new DomainInfo(); if (Domain.GetInfo(pDomain, aInfo) == -1) { MessageBox.Show("Get Info error"); return; } 2010-10-31 -------------------------------------------------------------------------------- 黄亮 __________ Information from ESET Smart Security, version of virus signature database 5576 (20101029) __________ The message was checked by ESET Smart Security. http://www.eset.com

1 0

Re: [libvirt] SPAM-LOW: Domain.GetInfo error
by arnaud.champion＠devatom.fr 30 Oct '10

30 Oct '10

?Hi, So, at first, are you sure that conn != IntPtr.Zero and pDomain != IntPtr.Zero. if both pointer are ok, can you please check the DomainInfo marshal, I have just sended patch today around this structure, and I think the patch is not yet pushed to the git. The DomainInfo structure must be marshaled in this way : /// <summary> /// Structure to handle domain informations /// </summary> [StructLayout(LayoutKind.Sequential)] public class DomainInfo { /// <summary> /// The running state, one of virDomainState. /// </summary> private byte state; /// <summary> /// The maximum memory in KBytes allowed. /// </summary> [MarshalAs(UnmanagedType.SysUInt)] public UIntPtr maxMem; /// <summary> /// The memory in KBytes used by the domain. /// </summary> [MarshalAs(UnmanagedType.SysUInt)] public UIntPtr memory; /// <summary> /// The number of virtual CPUs for the domain. /// </summary> public ushort nrVirtCpu; /// <summary> /// The CPU time used in nanoseconds. /// </summary> [MarshalAs(UnmanagedType.SysUInt)] public UIntPtr cpuTime; /// <summary> /// The running state, one of virDomainState. /// </summary> public DomainState State { get { return (DomainState)state; } } } Also, another important thing change : the libvirt bindings project must have an x86 target to make this marshaling working. This is also in the patch. Another thing, you can also use Errors.GetLastErro() method to identify the problem, it return an error class which can inform you about the problem. Best regards, Arnaud PS : are you sure also that libvirt dll is compiled with xen support ? From: 黄亮 Sent: Saturday, October 30, 2010 7:07 PM To: arnaud.champion Subject: SPAM-LOW: Domain.GetInfo error Dear Arnaud Here is my test code. Function Domain.GetInfo return -1 and I don't know where is the mistake. Would you do me a favor to point out the problem? Thank you! Code: IntPtr conn = Connect.Open("xen+tcp://192.168.0.1?no_verify=1"); String DomainName = e.Node.Text; IntPtr pDomain = Domain.LookupByName(conn, DomainName); DomainInfo aInfo = new DomainInfo(); if (Domain.GetInfo(pDomain, aInfo) == -1) { MessageBox.Show("Get Info error"); return; } 2010-10-31 -------------------------------------------------------------------------------- 黄亮

1 0

[libvirt] Hyper-V driver ?
by arnaud.champion＠devatom.fr 30 Oct '10

30 Oct '10

?Hi, I was just thinking about Hyper-V, has anyone ever tried to create a driver for Hyper-V via WinRM (http://msdn.microsoft.com/en-us/library/aa384426(VS.85).aspx) I don't know if it is possible, and I have certainly not the skills to make one, but I think it can be a possibility no ? Regards, Arnaud

4 5

[libvirt] virDomainInfo marshalling prolem
by arnaud.champion＠devatom.fr 30 Oct '10

30 Oct '10

?Hi, I am working on the marshaling of the virDomainInfo structure. I have marshalled it in this way : /// <summary> /// Structure to handle domain informations /// </summary> [StructLayout(LayoutKind.Sequential)] public class DomainInfo { /// <summary> /// The running state, one of virDomainState. /// </summary> private Byte state; /// <summary> /// The maximum memory in KBytes allowed. /// </summary> public int maxMem; /// <summary> /// The memory in KBytes used by the domain. /// </summary> public int memory; /// <summary> /// The number of virtual CPUs for the domain. /// </summary> public short nrVirtCpu; /// <summary> /// The CPU time used in nanoseconds. /// </summary> public long cpuTime; /// <summary> /// The running state, one of virDomainState. /// </summary> public DomainState State { get { return (DomainState)state; } } } It work fine in 32 bits, but not in 64 bits, it seems that packing in 64 bits is different so infos are not in order. Am I right ? Regards, Arnaud

4 10

[libvirt] [PATCH C#] Always close connections and free domains
by Matthias Bolte 30 Oct '10

30 Oct '10

Also free the unmanaged authDataPtr in the virConnectOpenAuth examples. --- examples/MonoDevelop/virConnectOpen/MainWindow.cs | 10 ++++++++++ .../MonoDevelop/virConnectOpenAuth/MainWindow.cs | 20 +++++++++++++------- examples/VisualStudio/virConnectOpen/Form1.cs | 10 ++++++++++ examples/VisualStudio/virConnectOpenAuth/Form1.cs | 16 +++++++++++----- 4 files changed, 44 insertions(+), 12 deletions(-) diff --git a/examples/MonoDevelop/virConnectOpen/MainWindow.cs b/examples/MonoDevelop/virConnectOpen/MainWindow.cs index 849f99f..0abae49 100644 --- a/examples/MonoDevelop/virConnectOpen/MainWindow.cs +++ b/examples/MonoDevelop/virConnectOpen/MainWindow.cs @@ -25,19 +25,29 @@ public partial class MainWindow : Gtk.Window protected virtual void OnButton1Clicked (object sender, System.EventArgs e) { + StoragePoolListStore.Clear (); + IntPtr conn = Connect.Open(entry1.Text); if (conn != IntPtr.Zero) { int numOfStoragePools = Connect.NumOfStoragePools(conn); if (numOfStoragePools == -1) + { ShowError("Unable to get the number of storage pools"); + goto cleanup; + } string[] storagePoolsNames = new string[numOfStoragePools]; int listStoragePools = Connect.ListStoragePools(conn, ref storagePoolsNames, numOfStoragePools); if (listStoragePools == -1) + { ShowError("Unable to list storage pools"); + goto cleanup; + } foreach (string storagePoolName in storagePoolsNames) AddStoragePoolInTreeView(storagePoolName); + cleanup: + Connect.Close(conn); } else { diff --git a/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs b/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs index 996a417..d02acd4 100644 --- a/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs +++ b/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs @@ -43,8 +43,12 @@ public partial class MainWindow : Gtk.Window Application.Quit (); a.RetVal = true; } + protected virtual void OnButton1Clicked (object sender, System.EventArgs e) { + // Remove all items + domainListStore.Clear (); + // Fill a structure to pass username and password to callbacks AuthData authData = new AuthData { password = entry3.Text, user_name = entry2.Text }; IntPtr authDataPtr = Marshal.AllocHGlobal(Marshal.SizeOf(authData)); @@ -64,7 +68,8 @@ public partial class MainWindow : Gtk.Window // Request the connection IntPtr conn = Connect.OpenAuth(entry1.Text, ref auth, 0); - + Marshal.FreeHGlobal(authDataPtr); + if (conn != IntPtr.Zero) { // Get the number of defined (not running) domains @@ -73,7 +78,7 @@ public partial class MainWindow : Gtk.Window if (Connect.ListDefinedDomains(conn, ref definedDomainNames, numOfDefinedDomains) == -1) { ShowError("Unable to list defined domains"); - return; + goto cleanup; } // Add the domain names to the listbox @@ -88,7 +93,7 @@ public partial class MainWindow : Gtk.Window if (Connect.ListDomains(conn, runningDomainIDs, numOfRunningDomain) == -1) { ShowError("Unable to list running domains"); - return; + goto cleanup; } // Add the domain names to the listbox @@ -98,16 +103,19 @@ public partial class MainWindow : Gtk.Window if (domainPtr == IntPtr.Zero) { ShowError("Unable to lookup domains by id"); - return; + goto cleanup; } string domainName = Domain.GetName(domainPtr); + Domain.Free(domainPtr); if (string.IsNullOrEmpty(domainName)) { ShowError("Unable to get domain name"); - return; + goto cleanup; } AddDomainInTreeView(domainName); } + + cleanup: Connect.Close(conn); } else @@ -156,7 +164,5 @@ public partial class MainWindow : Gtk.Window } return 0; } - - } diff --git a/examples/VisualStudio/virConnectOpen/Form1.cs b/examples/VisualStudio/virConnectOpen/Form1.cs index 870b83d..240aaaa 100644 --- a/examples/VisualStudio/virConnectOpen/Form1.cs +++ b/examples/VisualStudio/virConnectOpen/Form1.cs @@ -27,18 +27,28 @@ namespace virConnectOpen private void btnConnect_Click(object sender, EventArgs e) { + lbStoragePool.Items.Clear(); + IntPtr conn = Connect.Open(tbURI.Text); if (conn != IntPtr.Zero) { int numOfStoragePools = Connect.NumOfStoragePools(conn); if (numOfStoragePools == -1) + { ShowError("Unable to get the number of storage pools"); + goto cleanup; + } string[] storagePoolsNames = new string[numOfStoragePools]; int listStoragePools = Connect.ListStoragePools(conn, ref storagePoolsNames, numOfStoragePools); if (listStoragePools == -1) + { ShowError("Unable to list storage pools"); + goto cleanup; + } foreach (string storagePoolName in storagePoolsNames) lbStoragePool.Items.Add(storagePoolName); + cleanup: + Connect.Close(conn); } else { diff --git a/examples/VisualStudio/virConnectOpenAuth/Form1.cs b/examples/VisualStudio/virConnectOpenAuth/Form1.cs index 7901c27..87634a0 100644 --- a/examples/VisualStudio/virConnectOpenAuth/Form1.cs +++ b/examples/VisualStudio/virConnectOpenAuth/Form1.cs @@ -44,6 +44,8 @@ namespace virConnectOpenAuth private void btnConnect_Click(object sender, EventArgs e) { + lbDomains.Items.Clear(); + // Fill a structure to pass username and password to callbacks AuthData authData = new AuthData { password = tbPassword.Text, user_name = tbUsername.Text }; IntPtr authDataPtr = Marshal.AllocHGlobal(Marshal.SizeOf(authData)); @@ -62,6 +64,7 @@ namespace virConnectOpenAuth // Request the connection IntPtr conn = Connect.OpenAuth(tbURI.Text, ref auth, 0); + Marshal.FreeHGlobal(authDataPtr); if (conn != IntPtr.Zero) { @@ -70,9 +73,9 @@ namespace virConnectOpenAuth string[] definedDomainNames = new string[numOfDefinedDomains]; if (Connect.ListDefinedDomains(conn, ref definedDomainNames, numOfDefinedDomains) == -1) { - MessageBox.Show("Unable to list defined domains", "List defined domains failed", MessageBoxButtons.OK, + MessageBox.Show("Unable to list defined domains", "List defined domains failed", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; + goto cleanup; } // Add the domain names to the listbox @@ -86,7 +89,7 @@ namespace virConnectOpenAuth { MessageBox.Show("Unable to list running domains", "List running domains failed", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; + goto cleanup; } // Add the domain names to the listbox @@ -97,17 +100,20 @@ namespace virConnectOpenAuth { MessageBox.Show("Unable to lookup domains by id", "Lookup domain failed", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; + goto cleanup; } string domainName = Domain.GetName(domainPtr); + Domain.Free(domainPtr); if (string.IsNullOrEmpty(domainName)) { MessageBox.Show("Unable to get domain name", "Get domain name failed", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; + goto cleanup; } lbDomains.Items.Add(domainName); } + + cleanup: Connect.Close(conn); } else -- 1.7.0.4

4 4

[libvirt] Lxc support
by Jean-Philippe Menil 30 Oct '10

30 Oct '10

Hi, i'm trying to test the lxc support in libvirt, but but libvirt failed to start container with error "lxcContainerAvailable:897 : clone call returned Operation not permitted, container support is not enabled" Althought i've compiled libvirt with th lxc support: configure: Configuration summary configure: ===================== configure: configure: Drivers configure: configure: Xen: no configure: Proxy: no configure: QEMU: yes configure: UML: yes configure: OpenVZ: no configure: VBox: no configure: XenAPI: no configure: LXC: yes configure: PHYP: no configure: ONE: no configure: ESX: no configure: Test: yes configure: Remote: yes configure: Network: yes configure: Libvirtd: yes configure: netcf: no configure: macvtap: yes configure: virtport: no Here is my xml: <domain type='lxc'> <name>lxc1</name> <memory>500000</memory> <os> <type>exe</type> <init>/bin/sh</init> </os> <vcpu>1</vcpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/lib/libvirt/libvirt_lxc</emulator> <filesystem type='mount'> <source dir='/var/lib/lxc/lxc1/rootfs'/> <target dir='/'/> </filesystem> <interface type='bridge'> <source bridge='U13'/> <target dev='veth0'/> </interface> <console type='pty' > <target port='5'/> </console> </devices> </domain> And here are the errors: 10:41:09.968: debug : virCgroupNew:542 : New group / 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 0:cpu at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 1:cpuacct at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 2:cpuset at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 3:memory at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 4:devices at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 5:freezer at /var/local/cgroup in 10:41:09.968: debug : virCgroupNew:542 : New group /libvirt 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 0:cpu at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 1:cpuacct at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 2:cpuset at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 3:memory at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 4:devices at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 5:freezer at /var/local/cgroup in 10:41:09.968: debug : virCgroupMakeGroup:484 : Make group /libvirt 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupNew:542 : New group /libvirt/lxc 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 0:cpu at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 1:cpuacct at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 2:cpuset at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 3:memory at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 4:devices at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 5:freezer at /var/local/cgroup in 10:41:09.968: debug : virCgroupMakeGroup:484 : Make group /libvirt/lxc 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/lxc/ 10:41:09.968: debug : lxcControllerRun:595 : Setting up private /dev/pts 10:41:10.012: debug : lxcControllerRun:621 : Mouting 'devpts' on /var/lib/lxc/lxc1/rootfs/dev/pts 10:41:10.012: debug : lxcControllerRun:636 : Opening tty on private /var/lib/lxc/lxc1/rootfs/dev/pts/ptmx 10:41:10.044: debug : lxcContainerAvailable:897 : clone call returned Operation not permitted, container support is not enabled 10:41:10.044: debug : lxcContainerStart:848 : Enable network namespaces 10:41:10.076: debug : lxcContainerStart:854 : clone() completed, new container PID is -1 10:41:10.076: error : lxcContainerStart:858 : Failed to run clone container: Operation not permitted 10:41:10.076: debug : vethDelete:159 : veth: veth1 10:41:10.076: debug : virRunWithHook:818 : ip link del veth1 Can someone tell me what i'm doing wrong? Many thanks. Regards.

5 8

[libvirt] [PATCH] build: cleanup declaration of xen tests.
by Diego Elio Pettenò 29 Oct '10

29 Oct '10

Only build statstest and reconnect if they should be used, so add them behind the ENABLE_XEN_TESTS conditional. --- tests/Makefile.am | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9720b6e..20b6805 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -73,11 +73,14 @@ EXTRA_DIST = \ qemuhelpdata check_PROGRAMS = virshtest conftest sockettest \ - nodeinfotest statstest qparamtest virbuftest + nodeinfotest qparamtest virbuftest if WITH_XEN check_PROGRAMS += xml2sexprtest sexpr2xmltest \ - reconnect xmconfigtest xencapstest + xmconfigtest xencapstest +if ENABLE_XEN_TESTS +check_PROGRAMS += statstest reconnect +endif endif if WITH_QEMU check_PROGRAMS += qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest qemuhelptest @@ -149,7 +152,6 @@ EXTRA_DIST += $(test_scripts) TESTS = virshtest \ nodeinfotest \ - statstest \ qparamtest \ virbuftest \ sockettest \ @@ -161,7 +163,7 @@ TESTS += xml2sexprtest \ xmconfigtest \ xencapstest if ENABLE_XEN_TESTS -TESTS += reconnect +TESTS += reconnect statstest endif endif -- 1.7.3.2

2 1

[libvirt] [PATCH 1/2] support compression at virsh dump
by KAMEZAWA Hiroyuki 29 Oct '10

29 Oct '10

>From 4f74c4a69785432258ad5ea5e695d1b94aaa5b30 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> Date: Thu, 28 Oct 2010 16:31:46 +0900 Subject: [PATCH 1/2] add compression support for "virsh dump" Add dump_image_format[] to qemu.conf and support compressed dump at virsh dump. coredump compression is important for saving disk space in an environment where multiple guests run. In general, "disk space for dump" is specially allocated and will be a dead space in the system. It's used only at emergency. So, it's better to have both of save_image_format and dump_image_format. "save" is done in scheduled manner with enough calculated disk space for it. This code reuses some of save_image_format[] and supports the same format. Changelog: - modified libvirtd_qemu.aug - modified test_libvirtd_qemu.aug - fixed error handling of qemudSaveCompressionTypeFromString() --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 4 +++ src/qemu/qemu_conf.c | 11 ++++++++++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 41 ++++++++++++++++++++++++++++++++------ src/qemu/test_libvirtd_qemu.aug | 2 + 6 files changed, 53 insertions(+), 7 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index b9ace3e..66994fd 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -36,6 +36,7 @@ module Libvirtd_qemu = | str_array_entry "cgroup_controllers" | str_array_entry "cgroup_device_acl" | str_entry "save_image_format" + | str_entry "dump_image_format" | str_entry "hugetlbfs_mount" | bool_entry "relaxed_acs_check" | bool_entry "vnc_allow_host_audio" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 53b76e7..e2c581e 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -145,7 +145,11 @@ # saving a domain in order to save disk space; the list above is in descending # order by performance and ascending order by compression ratio. # +# save_image_format is used when you use 'virsh save' at scheduled saving. +# dump_image_format is used when you use 'virsh dump' at emergency crashdump. +# # save_image_format = "raw" +# dump_image_format = "raw" # If provided by the host and a hugetlbfs mount point is configured, diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 5bd3d4c..b5c17b5 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -325,6 +325,17 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, } } + p = virConfGetValue (conf, "dump_image_format"); + CHECK_TYPE ("dump_image_format", VIR_CONF_STRING); + if (p && p->str) { + VIR_FREE(driver->dumpImageFormat); + if (!(driver->dumpImageFormat = strdup(p->str))) { + virReportOOMError(); + virConfFree(conf); + return -1; + } + } + p = virConfGetValue (conf, "hugetlbfs_mount"); CHECK_TYPE ("hugetlbfs_mount", VIR_CONF_STRING); if (p && p->str) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 530dcdb..bbe6887 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -164,6 +164,7 @@ struct qemud_driver { virSecurityDriverPtr securitySecondaryDriver; char *saveImageFormat; + char *dumpImageFormat; pciDeviceList *activePciHostdevs; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b119ca1..51ad50b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5907,11 +5907,22 @@ static int qemudDomainCoreDump(virDomainPtr dom, int resume = 0, paused = 0; int ret = -1, fd = -1; virDomainEventPtr event = NULL; - const char *args[] = { - "cat", - NULL, - }; + int compress; qemuDomainObjPrivatePtr priv; + /* + * We reuse "save" flag for "dump" here. Then, we can support the same + * format in "save" and "dump". + */ + compress = QEMUD_SAVE_FORMAT_RAW; + if (driver->dumpImageFormat) { + compress = qemudSaveCompressionTypeFromString(driver->dumpImageFormat); + if (compress < 0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Invalid dump image format specified in " + "configuration file")); + return -1; + } + } qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -5978,9 +5989,25 @@ static int qemudDomainCoreDump(virDomainPtr dom, } qemuDomainObjEnterMonitorWithDriver(driver, vm); - ret = qemuMonitorMigrateToFile(priv->mon, - QEMU_MONITOR_MIGRATE_BACKGROUND, - args, path, 0); + if (compress == QEMUD_SAVE_FORMAT_RAW) { + const char *args[] = { + "cat", + NULL, + }; + ret = qemuMonitorMigrateToFile(priv->mon, + QEMU_MONITOR_MIGRATE_BACKGROUND, + args, path, 0); + } else { + const char *prog = qemudSaveCompressionTypeToString(compress); + const char *args[] = { + prog, + "-c", + NULL, + }; + ret = qemuMonitorMigrateToFile(priv->mon, + QEMU_MONITOR_MIGRATE_BACKGROUND, + args, path, 0); + } qemuDomainObjExitMonitorWithDriver(driver, vm); if (ret < 0) goto endjob; diff --git a/src/qemu/test_libvirtd_qemu.aug b/src/qemu/test_libvirtd_qemu.aug index 6788346..efbf642 100644 --- a/src/qemu/test_libvirtd_qemu.aug +++ b/src/qemu/test_libvirtd_qemu.aug @@ -94,6 +94,8 @@ cgroup_device_acl = [ \"/dev/null\", \"/dev/full\", \"/dev/zero\" ] save_image_format = \"gzip\" +dump_image_format = \"gzip\" + hugetlbfs_mount = \"/dev/hugepages\" set_process_name = 1 -- 1.7.2.3

3 5

[libvirt] [PATCH] qemu_driver: add virCgroupMounted
by Lai Jiangshan 29 Oct '10

29 Oct '10

When wen mount any cgroup without "-o devices", we will fail to start vms: # virsh start vm1 error: Failed to start domain vm1 error: Unable to deny all devices for vm1: No such file or directory When wen mount any cgroup without "-o cpu", we will fail to get schedinfo: # virsh schedinfo vm1 Scheduler : posix error: unable to get cpu shares tunable: No such file or directory We should only use the cgroup controllers which are mounted on host. So I add virCgroupMounted() for qemuCgroupControllerActive() Signed-off-by: Lai Jiangshan <laijs(a)cn.fujitsu.com> --- diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3b127d6..5885ad8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -61,6 +61,7 @@ virConfWriteMem; # cgroup.h virCgroupForDomain; virCgroupForDriver; +virCgroupMounted; virCgroupRemove; virCgroupFree; virCgroupAddTask; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 16f34f7..f09d029 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -724,6 +724,8 @@ static int qemuCgroupControllerActive(struct qemud_driver *driver, { if (driver->cgroup == NULL) return 0; + if (!virCgroupMounted(driver->cgroup, controller)) + return 0; if (driver->cgroupControllers & (1 << controller)) return 1; return 0; diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 7e887dc..8fac389 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -71,6 +71,17 @@ void virCgroupFree(virCgroupPtr *group) VIR_FREE(*group); } +/** + * virCgroupMounted: query whether a cgroup subsystem is mounted or not + * + * @cgroup: The group structure to be queried + * @controller: cgroup subsystem id + */ +bool virCgroupMounted(virCgroupPtr cgroup, int controller) +{ + return !!cgroup->controllers[controller].mountPoint; +} + #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R /* * Process /proc/mounts figuring out what controllers are diff --git a/src/util/cgroup.h b/src/util/cgroup.h index b8f2d08..9e1c61f 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -83,5 +83,6 @@ int virCgroupGetFreezerState(virCgroupPtr group, char **state); int virCgroupRemove(virCgroupPtr group); void virCgroupFree(virCgroupPtr *group); +bool virCgroupMounted(virCgroupPtr cgroup, int controller); #endif /* CGROUP_H */

3 2

[libvirt] [PATCH] vbox: Don't warn when the linker search path doesn't contain VBoxXPCOMC.so
by Matthias Bolte 29 Oct '10

29 Oct '10

This is actually a workaround, to unbreak make check on systems without VirtualBox. --- src/vbox/vbox_XPCOMCGlue.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 7648e54..15a9622 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -124,7 +124,14 @@ static int tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing) g_hVBoxXPCOMC = dlopen(name, RTLD_NOW | RTLD_LOCAL); if (g_hVBoxXPCOMC == NULL) { - VIR_WARN("Could not dlopen '%s': %s", name, dlerror()); + /* + * FIXME: Don't warn in this case as it currently breaks make check + * on systems without VirtualBox. + */ + if (dir != NULL) { + VIR_WARN("Could not dlopen '%s': %s", name, dlerror()); + } + goto cleanup; } -- 1.7.0.4

2 1

[libvirt] [PATCH C#] Don't add a column per item in the Mono virConnectOpenAuth example
by Matthias Bolte 29 Oct '10

29 Oct '10

--- .../MonoDevelop/virConnectOpenAuth/MainWindow.cs | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs b/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs index d02acd4..4a3411d 100644 --- a/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs +++ b/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs @@ -36,6 +36,10 @@ public partial class MainWindow : Gtk.Window treeview1.AppendColumn(tvcDomains); treeview1.Model = domainListStore; + + CellRendererText crtDomainCell = new CellRendererText(); + tvcDomains.PackStart(crtDomainCell, true); + tvcDomains.AddAttribute(crtDomainCell, "text", 0); } protected void OnDeleteEvent (object sender, DeleteEventArgs a) @@ -137,9 +141,6 @@ public partial class MainWindow : Gtk.Window private void AddDomainInTreeView(string domainName) { domainListStore.AppendValues(domainName); - CellRendererText crtDomainCell = new CellRendererText(); - tvcDomains.PackStart(crtDomainCell, true); - tvcDomains.AddAttribute(crtDomainCell, "text", 0); } private static int AuthCallback(ref ConnectCredential[] creds, IntPtr cbdata) -- 1.7.0.4

3 4

[libvirt] [PATCH] vbox: Stop hardcoding a single path for VBoxXPCOMC.so
by Matthias Bolte 29 Oct '10

29 Oct '10

This partly reverts df90ca7661b0a789bd790ccf8258a4527c13eb8d. Don't disable the VirtualBox driver when configure can't find VBoxXPCOMC.so, rely on detection at runtime again instead. Keep --with-vbox=/path/to/virtualbox intact, added to for: https://bugzilla.redhat.com/show_bug.cgi?id=609185 Detection order for VBoxXPCOMC.so: 1. VBOX_APP_HOME environment variable 2. configure provided location 3. hardcoded list of known locations 4. dynamic linker search path Also cleanup the glue code and improve error reporting. --- Patch is based on Daniel's suggestion in: https://www.redhat.com/archives/libvir-list/2010-October/msg00852.html configure.ac | 53 +--------- po/POTFILES.in | 1 + src/vbox/vbox_XPCOMCGlue.c | 232 +++++++++++++++++++++++--------------------- src/vbox/vbox_XPCOMCGlue.h | 14 --- 4 files changed, 130 insertions(+), 170 deletions(-) diff --git a/configure.ac b/configure.ac index e41f2b5..40d6b69 100644 --- a/configure.ac +++ b/configure.ac @@ -225,8 +225,8 @@ AC_ARG_WITH([xenapi], AC_HELP_STRING([--with-xenapi], [add XenAPI support @<:@default=check@:>@]),[],[with_xenapi=check]) AC_ARG_WITH([vbox], AC_HELP_STRING([--with-vbox=@<:@PFX@:>@], - [VirtualBox XPCOMC location @<:@default=check@:>@]),[], - [with_vbox=check]) + [VirtualBox XPCOMC location @<:@default=yes@:>@]),[], + [with_vbox=yes]) AC_ARG_WITH([lxc], AC_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=check@:>@]),[],[with_lxc=check]) AC_ARG_WITH([one], @@ -332,51 +332,10 @@ dnl vbox_xpcomc_dir= -if test "x$with_vbox" = "xyes" || test "x$with_vbox" = "xcheck"; then - AC_MSG_CHECKING([for VirtualBox XPCOMC location]) - - for vbox in \ - /usr/lib/virtualbox/VBoxXPCOMC.so \ - /usr/lib64/virtualbox/VBoxXPCOMC.so \ - /usr/lib/VirtualBox/VBoxXPCOMC.so \ - /opt/virtualbox/VBoxXPCOMC.so \ - /opt/VirtualBox/VBoxXPCOMC.so \ - /opt/virtualbox/i386/VBoxXPCOMC.so \ - /opt/VirtualBox/i386/VBoxXPCOMC.so \ - /opt/virtualbox/amd64/VBoxXPCOMC.so \ - /opt/VirtualBox/amd64/VBoxXPCOMC.so \ - /usr/local/lib/virtualbox/VBoxXPCOMC.so \ - /usr/local/lib/VirtualBox/VBoxXPCOMC.so \ - /Applications/VirtualBox.app/Contents/MacOS/VBoxXPCOMC.dylib \ - ; do - if test -f "$vbox"; then - vbox_xpcomc_dir=`AS_DIRNAME(["$vbox"])` - break - fi - done - - if test -n "$vbox_xpcomc_dir"; then - AC_MSG_RESULT([$vbox_xpcomc_dir]) - with_vbox=yes - else - if test "x$with_vbox" = "xcheck"; then - AC_MSG_RESULT([not found, disabling VirtualBox driver]) - with_vbox=no - else - AC_MSG_RESULT([not found]) - AC_MSG_ERROR([VirtualBox XPCOMC is required for the VirtualBox driver]) - fi - fi -else - if test "x$with_vbox" != "xno"; then - if test -f ${with_vbox}/VBoxXPCOMC.so || \ - test -f ${with_vbox}/VBoxXPCOMC.dylib; then - vbox_xpcomc_dir=$with_vbox - with_vbox=yes - else - AC_MSG_ERROR([$with_vbox does not contain VirtualBox XPCOMC]) - fi - fi +if test "x$with_vbox" != "xyes" && test "x$with_vbox" != "xno"; then + # intentionally don't do any further checks here on the provided path + vbox_xpcomc_dir=$with_vbox + with_vbox=yes fi AC_DEFINE_UNQUOTED([VBOX_XPCOMC_DIR], ["$vbox_xpcomc_dir"], diff --git a/po/POTFILES.in b/po/POTFILES.in index 541335e..dafef47 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -93,6 +93,7 @@ src/util/util.c src/util/virtaudit.c src/util/virterror.c src/util/xml.c +src/vbox/vbox_XPCOMCGlue.c src/vbox/vbox_driver.c src/vbox/vbox_tmpl.c src/xen/proxy_internal.c diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index e8b0bd1..7648e54 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -32,13 +32,18 @@ #include <config.h> -#include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stdarg.h> #include <dlfcn.h> +#include <stdbool.h> #include "vbox_XPCOMCGlue.h" +#include "internal.h" +#include "memory.h" +#include "util.h" +#include "logging.h" +#include "virterror_internal.h" + +#define VIR_FROM_THIS VIR_FROM_VBOX /******************************************************************************* @@ -60,8 +65,6 @@ *******************************************************************************/ /** The dlopen handle for VBoxXPCOMC. */ void *g_hVBoxXPCOMC = NULL; -/** The last load error. */ -char g_szVBoxErrMsg[256]; /** Pointer to the VBoxXPCOMC function table. */ PCVBOXXPCOM g_pVBoxFuncs = NULL; /** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */ @@ -69,104 +72,97 @@ PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions = NULL; /** - * Wrapper for setting g_szVBoxErrMsg. Can be an empty stub. - * - * @param fAlways When 0 the g_szVBoxErrMsg is only set if empty. - * @param pszFormat The format string. - * @param ... The arguments. - */ -static void setErrMsg(int fAlways, const char *pszFormat, ...) -{ -#ifndef LIBVIRT_VERSION - if ( fAlways - || !g_szVBoxErrMsg[0]) - { - va_list va; - va_start(va, pszFormat); - vsnprintf(g_szVBoxErrMsg, sizeof(g_szVBoxErrMsg), pszFormat, va); - va_end(va); - } -#else /* libvirt */ - (void)fAlways; - (void)pszFormat; -#endif /* libvirt */ -} - - -/** * Try load VBoxXPCOMC.so/dylib/dll from the specified location and resolve all * the symbols we need. * - * @returns 0 on success, -1 on failure. - * @param pszHome The director where to try load VBoxXPCOMC from. Can - * be NULL. - * @param fSetAppHome Whether to set the VBOX_APP_HOME env.var. or not - * (boolean). + * @returns 0 on success, -1 on failure and 1 if VBoxXPCOMC was not found. + * @param dir The directory where to try load VBoxXPCOMC from. Can + * be NULL. + * @param setAppHome Whether to set the VBOX_APP_HOME env.var. or not. + * @param ignoreMissing Whether to ignore missing library or not. */ -static int tryLoadOne(const char *pszHome, int fSetAppHome) +static int tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing) { - size_t cchHome = pszHome ? strlen(pszHome) : 0; - size_t cbBufNeeded; - char szName[4096]; - int rc = -1; + int result = -1; + char *name = NULL; + PFNVBOXGETXPCOMCFUNCTIONS pfnGetFunctions; + + if (dir != NULL) { + if (virAsprintf(&name, "%s/%s", dir, DYNLIB_NAME) < 0) { + virReportOOMError(); + return -1; + } - /* - * Construct the full name. - */ - cbBufNeeded = cchHome + sizeof("/" DYNLIB_NAME); - if (cbBufNeeded > sizeof(szName)) - { - setErrMsg(1, "path buffer too small: %u bytes needed", - (unsigned)cbBufNeeded); - return -1; - } - if (cchHome) - { - memcpy(szName, pszHome, cchHome); - szName[cchHome] = '/'; - cchHome++; + if (!virFileExists(name)) { + if (!ignoreMissing) { + VIR_ERROR(_("Libaray '%s' doesn't exist"), name); + } + + return -1; + } + } else { + name = strdup(DYNLIB_NAME); + + if (name == NULL) { + virReportOOMError(); + return -1; + } } - memcpy(&szName[cchHome], DYNLIB_NAME, sizeof(DYNLIB_NAME)); /* * Try load it by that name, setting the VBOX_APP_HOME first (for now). * Then resolve and call the function table getter. */ - if (fSetAppHome) - { - if (pszHome) - setenv("VBOX_APP_HOME", pszHome, 1 /* always override */); - else + if (setAppHome) { + if (dir != NULL) { + setenv("VBOX_APP_HOME", dir, 1 /* always override */); + } else { unsetenv("VBOX_APP_HOME"); + } } - g_hVBoxXPCOMC = dlopen(szName, RTLD_NOW | RTLD_LOCAL); - if (g_hVBoxXPCOMC) - { - PFNVBOXGETXPCOMCFUNCTIONS pfnGetFunctions; - pfnGetFunctions = (PFNVBOXGETXPCOMCFUNCTIONS) - dlsym(g_hVBoxXPCOMC, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME); - if (pfnGetFunctions) - { - g_pVBoxFuncs = pfnGetFunctions(VBOX_XPCOMC_VERSION); - if (g_pVBoxFuncs) - { - g_pfnGetFunctions = pfnGetFunctions; - return 0; - } - /* bail out */ - setErrMsg(1, "%.80s: pfnGetFunctions(%#x) failed", - szName, VBOX_XPCOMC_VERSION); - } - else - setErrMsg(1, "dlsym(%.80s/%.32s): %.128s", - szName, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, dlerror()); + g_hVBoxXPCOMC = dlopen(name, RTLD_NOW | RTLD_LOCAL); + + if (g_hVBoxXPCOMC == NULL) { + VIR_WARN("Could not dlopen '%s': %s", name, dlerror()); + goto cleanup; + } + + pfnGetFunctions = (PFNVBOXGETXPCOMCFUNCTIONS) + dlsym(g_hVBoxXPCOMC, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME); + + if (pfnGetFunctions == NULL) { + VIR_ERROR(_("Could not dlsym %s from '%s': %s"), + VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, name, dlerror()); + goto cleanup; + } + + g_pVBoxFuncs = pfnGetFunctions(VBOX_XPCOMC_VERSION); + + if (g_pVBoxFuncs == NULL) { + VIR_ERROR(_("Calling %s from '%s' failed"), + VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, name); + goto cleanup; + } + + g_pfnGetFunctions = pfnGetFunctions; + result = 0; + + if (dir != NULL) { + VIR_DEBUG("Found %s in '%s'", DYNLIB_NAME, dir); + } else { + VIR_DEBUG("Found %s in dynamic linker search path", DYNLIB_NAME); + } + +cleanup: + if (g_hVBoxXPCOMC != NULL && result < 0) { dlclose(g_hVBoxXPCOMC); g_hVBoxXPCOMC = NULL; } - else - setErrMsg(0, "dlopen(%.80s): %.160s", szName, dlerror()); - return rc; + + VIR_FREE(name); + + return result; } @@ -175,34 +171,53 @@ static int tryLoadOne(const char *pszHome, int fSetAppHome) * function pointers. * * @returns 0 on success, -1 on failure. - * - * @remark This should be considered moved into a separate glue library since - * its its going to be pretty much the same for any user of VBoxXPCOMC - * and it will just cause trouble to have duplicate versions of this - * source code all around the place. */ int VBoxCGlueInit(void) { - /* - * If the user specifies the location, try only that. - */ - const char *pszHome = getenv("VBOX_APP_HOME"); - if (pszHome) - return tryLoadOne(pszHome, 0); + int i; + static const char *knownDirs[] = { + "/usr/lib/virtualbox", + "/usr/lib/virtualbox-ose", + "/usr/lib64/virtualbox", + "/usr/lib64/virtualbox-ose", + "/usr/lib/VirtualBox", + "/opt/virtualbox", + "/opt/VirtualBox", + "/opt/virtualbox/i386", + "/opt/VirtualBox/i386", + "/opt/virtualbox/amd64", + "/opt/VirtualBox/amd64", + "/usr/local/lib/virtualbox", + "/usr/local/lib/VirtualBox", + "/Applications/VirtualBox.app/Contents/MacOS" + }; + const char *home = getenv("VBOX_APP_HOME"); + + /* If the user specifies the location, try only that. */ + if (home != NULL) { + if (tryLoadOne(home, false, false) < 0) { + return -1; + } + } - /* - * Try the configured location. - */ - g_szVBoxErrMsg[0] = '\0'; + /* Try the additionally configured location. */ + if (VBOX_XPCOMC_DIR[0] != '\0') { + if (tryLoadOne(VBOX_XPCOMC_DIR, true, true) >= 0) { + return 0; + } + } - if (tryLoadOne(VBOX_XPCOMC_DIR, 1) == 0) - return 0; + /* Try the known locations. */ + for (i = 0; i < ARRAY_CARDINALITY(knownDirs); ++i) { + if (tryLoadOne(knownDirs[i], true, true) >= 0) { + return 0; + } + } - /* - * Finally try the dynamic linker search path. - */ - if (tryLoadOne(NULL, 1) == 0) + /* Finally try the dynamic linker search path. */ + if (tryLoadOne(NULL, false, true) >= 0) { return 0; + } /* No luck, return failure. */ return -1; @@ -214,14 +229,13 @@ int VBoxCGlueInit(void) */ void VBoxCGlueTerm(void) { - if (g_hVBoxXPCOMC) - { + if (g_hVBoxXPCOMC != NULL) { #if 0 /* VBoxRT.so doesn't like being reloaded. See @bugref{3725}. */ dlclose(g_hVBoxXPCOMC); #endif g_hVBoxXPCOMC = NULL; } + g_pVBoxFuncs = NULL; g_pfnGetFunctions = NULL; - memset(g_szVBoxErrMsg, 0, sizeof(g_szVBoxErrMsg)); } diff --git a/src/vbox/vbox_XPCOMCGlue.h b/src/vbox/vbox_XPCOMCGlue.h index c04eefa..6c44030 100644 --- a/src/vbox/vbox_XPCOMCGlue.h +++ b/src/vbox/vbox_XPCOMCGlue.h @@ -32,26 +32,12 @@ /* This has to be the oldest version we support. */ # include "vbox_CAPI_v2_2.h" -# ifdef __cplusplus -extern "C" { -# endif - -/** The dlopen handle for VBoxXPCOMC. */ -extern void *g_hVBoxXPCOMC; -/** The last load error. */ -extern char g_szVBoxErrMsg[256]; /** Pointer to the VBoxXPCOMC function table. */ extern PCVBOXXPCOM g_pVBoxFuncs; /** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */ extern PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions; - int VBoxCGlueInit(void); void VBoxCGlueTerm(void); - -# ifdef __cplusplus -} -# endif - #endif -- 1.7.0.4

3 3

[libvirt] [PATCH] Fix typo
by Hu Tao 29 Oct '10

29 Oct '10

--- include/libvirt/libvirt.h.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index b45f7ec..3379210 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2044,7 +2044,7 @@ typedef enum { /** - * virConnectDomainEventWatchdogCallback: + * virConnectDomainEventIOErrorCallback: * @conn: connection object * @dom: domain on which the event occurred * @srcPath: The host file on which the IO error occurred @@ -2064,7 +2064,7 @@ typedef void (*virConnectDomainEventIOErrorCallback)(virConnectPtr conn, void *opaque); /** - * virConnectDomainEventWatchdogCallback: + * virConnectDomainEventIOErrorReasonCallback: * @conn: connection object * @dom: domain on which the event occurred * @srcPath: The host file on which the IO error occurred -- 1.7.3

3 2

[libvirt] Fwd: Re: Lxc support
by Jean-Philippe Menil 29 Oct '10

29 Oct '10

-------- Message original -------- Sujet: Re: [libvirt] Lxc support Date : Fri, 29 Oct 2010 13:13:16 +0200 De : Jean-Philippe Menil <jean-philippe.menil(a)univ-nantes.fr> Répondre à : jean-philippe.menil(a)univ-nantes.fr Organisation : IRTS - DSI - Université de Nantes Pour : Daniel P. Berrange <berrange(a)redhat.com> Le 29/10/2010 12:39, Daniel P. Berrange a écrit : > On Fri, Oct 29, 2010 at 12:27:59PM +0200, Jean-Philippe Menil wrote: >> Le 29/10/2010 12:00, Osier a écrit : >>> On 10/29/2010 04:42 PM, Jean-Philippe Menil wrote: >>>> Hi, >>>> >>>> i'm trying to test the lxc support in libvirt, but but libvirt failed to >>>> start container with error "lxcContainerAvailable:897 : clone call >>>> returned Operation not permitted, container support is not enabled" >>>> >>> >>> What's the kernel version you use? Just as the error message says, the >>> system call 'clone' failed, It's probly caused by lacking of kernel >>> support. >>> >>> At least you should make sure 'clone' support these flags: >>> >>> CLONE_NEWPID, CLONE_NEWNS, CLONE_NEWUTS, CLONE_NEWIPC, SIGCHLD > >> thanks for your response. >> The kernel is a 2.6.36 wit hthe following: >> root@redbreast:/tmp# cat /boot/config-2.6.36-dsiun-1a | grep -i pid >> CONFIG_PROC_PID_CPUSET=y >> CONFIG_PID_NS=y >> # CONFIG_SPI_SPIDEV is not set >> CONFIG_HID_PID=y > > You need to check for _NS= here, and want to see the following > > $ grep _NS= /boot/config-2.6.34.6-54.fc13.x86_64 > CONFIG_CGROUP_NS=y > CONFIG_UTS_NS=y > CONFIG_IPC_NS=y > CONFIG_USER_NS=y > CONFIG_PID_NS=y > CONFIG_NET_NS=y > > Daniel Sorry, forgot to cc the list Ok, So my kernel lokks fine: root@redbreast:/tmp# cat /boot/config-2.6.36-dsiun-1a | grep _NS CONFIG_CGROUP_NS=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y Libvirt was compiled with following: --with-qemu --with-qemu-user=libvirt-qemu --with-qemu-group=kvm --without-xen --without-openvz --without-avahi --without-sasl --without-polkit --without-udev --without-hal --with-storage-fs --with-storage-lvm --without-storage-iscsi --with-storage-disk --with-init-scripts=none --without-numactl --without-selinux --without-esx --without-libssh2 --without-capng --with-macvtap --enable-debug --with-lxc

1 0

[libvirt] [PATCH] qemu: Fix one memory leak in qemu driver.c
by Osier Yang 29 Oct '10

29 Oct '10

* src/qemu/qemu_driver.c (qemuDomainManagedSavePath) --- src/qemu/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 89b4d11..976fb72 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5843,6 +5843,7 @@ qemuDomainManagedSavePath(struct qemud_driver *driver, virDomainObjPtr vm) { char *ret; if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, vm->def->name) < 0) { + VIR_FREE(ret); virReportOOMError(); return(NULL); } -- 1.7.2.3

2 1

[libvirt] Fixing the output of "virsh help"
by Justin Clift 29 Oct '10

29 Oct '10

Hi all, The output of virsh --help has become pretty unwieldy for people, so I'd like to adjust it to display things in a fashion that's easier to locate things in. Below is my first mock up of what the new output should look like, with it broken into functional categories. Does this seem like the best approach? Open to completely different ideas, different layout approaches, etc. :) Notes: + In a final (working) solution, each of the commands would be alphabetically sorted in its category. Only roughly manually sorted them below, to show the general effect. + Some of the lines below looked like they might wrap in email, so I manually cut them off with "...". Not thinking of doing that in a coded up version. We'd just let them wrap. ;) + Pretty sure we'd need to adjust the test suite components that leverage from virsh --help, but I don't think it can be avoided. ********************************************************************** virsh # help Commands: CPU Management ************** cpu-baseline compute baseline CPU cpu-compare compare host CPU with a CPU described by an ... maxvcpus connection vcpu maximum setvcpus change number of virtual CPUs vcpucount domain vcpu counts vcpuinfo detailed domain vcpu information vcpupin control domain vcpu affinity Device Management ***************** attach-device attach device from an XML file attach-disk attach disk device detach-device detach device from an XML file detach-disk detach disk device update-device update device from an XML file Domain Management ***************** autostart autostart a domain create create a domain from an XML file destroy destroy a domain define define (but don't start) a domain from an XML... domid convert a domain name or UUID to domain id domuuid convert a domain name or id to domain UUID dominfo domain information domjobinfo domain job information domjobabort abort active domain job domname convert a domain id or UUID to domain name domstate domain state domblkstat get device block stats for a domain domifstat get network interface stats for a domain dommemstat get memory statistics for a domain domblkinfo domain block device size information domxml-from-native Convert native config to domain XML domxml-to-native Convert domain XML to native config dump dump the core of a domain to a file for anal... dumpxml domain information in XML edit edit XML configuration for a domain list list domains managedsave managed save of a domain state managedsave-remove Remove managed save of a domain memtune Get/Set memory paramters migrate migrate domain to another host migrate-setmaxdowntime set maximum tolerable downtime reboot reboot a domain restore restore a domain from a saved state in a file resume resume a domain save save a domain state to a file setmem change memory allocation setmaxmem change maximum memory limit shutdown gracefully shutdown a domain start start a (previously defined) inactive domain suspend suspend a domain undefine undefine an inactive domain Management of Secrets ********************* secret-define define or modify a secret from an XML file secret-dumpxml secret attributes in XML secret-set-value set a secret value secret-get-value Output a secret value secret-undefine undefine a secret secret-list list secrets Networking ********** net-autostart autostart a network net-create create a network from an XML file net-define define (but don't start) a network from... net-destroy destroy a network net-dumpxml network information in XML net-edit edit XML configuration for a network net-list list networks net-name convert a network UUID to network name net-start start a (previously defined) inactive network net-undefine undefine an inactive network net-uuid convert a network name to network UUID Network Interfaces ****************** attach-interface attach network interface detach-interface detach network interface iface-list list physical host interfaces iface-name convert an interface MAC address to inte... iface-mac convert an interface name to interface M... iface-dumpxml interface information in XML iface-define define (but don't start) a physical host... iface-undefine undefine a physical host interface (remo... iface-edit edit XML configuration for a physical ho... iface-start start a physical host interface (enable ... iface-destroy destroy a physical host interface (disab... Nodes ***** nodeinfo node information nodedev-list enumerate devices on this host nodedev-dumpxml node device details in XML nodedev-dettach dettach node device from its device driver nodedev-reattach reattach node device to its device driver nodedev-reset reset node device nodedev-create create a device defined by an XML file o... nodedev-destroy destroy a device on the node NWfilter ******** nwfilter-define define or update a network filter from a... nwfilter-undefine undefine a network filter nwfilter-dumpxml network filter information in XML nwfilter-list list network filters nwfilter-edit edit XML configuration for a network filter Snapshots ********* snapshot-create Create a snapshot snapshot-current Get the current snapshot snapshot-delete Delete a domain snapshot snapshot-dumpxml Dump XML for a domain snapshot snapshot-list List snapshots for a domain snapshot-revert Revert a domain to a snapshot Storage Pools ************* find-storage-pool-sources discover potential storage poo... find-storage-pool-sources-as find potential storage pool... pool-autostart autostart a pool pool-build build a pool pool-create create a pool from an XML file pool-create-as create a pool from a set of args pool-define define (but don't start) a pool from an ... pool-define-as define a pool from a set of args pool-destroy destroy a pool pool-delete delete a pool pool-dumpxml pool information in XML pool-edit edit XML configuration for a storage pool pool-info storage pool information pool-list list pools pool-name convert a pool UUID to pool name pool-refresh refresh a pool pool-start start a (previously defined) inactive pool pool-undefine undefine an inactive pool pool-uuid convert a pool name to pool UUID Storage Volumes *************** vol-create create a vol from an XML file vol-create-from create a vol, using another volume as input vol-create-as create a volume from a set of args vol-clone clone a volume. vol-delete delete a vol vol-wipe wipe a vol vol-dumpxml vol information in XML vol-info storage vol information vol-list list vols vol-pool returns the storage pool for a given ... vol-path returns the volume path for a given ... vol-name returns the volume name for a given ... vol-key returns the volume key for a given ... Virsh itself ************** cd change the current directory connect (re)connect to hypervisor console connect to the guest console echo echo arguments exit quit this interactive terminal help print help pwd print the current directory quit quit this interactive terminal uri print the hypervisor canonical URI version show version vncdisplay vnc display Not sure (need suggestions) :> ****************************** capabilities capabilities freecell NUMA free memory hostname print the hypervisor hostname schedinfo show/set scheduler parameters ttyconsole tty console virsh # **********************************************************************

3 4

[libvirt] "qemudDispatchSignalEvent" warning... but QEMU support not compiled in
by Justin Clift 29 Oct '10

29 Oct '10

Hi all, Just noticed this warning message when shutting down foreground libvirtd on OSX (via ^C): 17:24:04.247: warning : qemudDispatchSignalEvent:402 : Shutting down on signal 2 Didn't think anything of it, till realising that libvirtd was compiled without QEMU support. It doesn't seem to be hurting anything, but mentioning it in case someone knows what it's about and whether we should care. :) Regards and best wishes, Justin Clift

2 2

[libvirt] C# bindings raising an error
by arnaud.champion＠devatom.fr 29 Oct '10

29 Oct '10

?Hi, I start to work on a new sample code for C# bindings. The goal is to show how to use errors callbacks... Do you a way to raise an error for sample ? (I know it's an antagonist request ) Regards, Arnaud

3 6

Re: [libvirt] SPAM-LOW: Re: Re: System.DllNotFoundException
by arnaud.champion＠devatom.fr 29 Oct '10

29 Oct '10

?You're welcome, glad to help you. Arnaud From: 黄亮 Sent: Friday, October 29, 2010 10:07 AM To: arnaud.champion(a)devatom.fr Subject: SPAM-LOW: Re: Re: System.DllNotFoundException Hi, depends.exe really helps! it turns out that there are 7 dlls I'm missing. Thanks to the dll-files.com, I can download all of them. And put all of them in the same dir with my test exe, it works. Thank you arnaud, you really help a lot. Best wishes 2010-10-29 -------------------------------------------------------------------------------- Lancer -------------------------------------------------------------------------------- 发件人： arnaud.champion(a)devatom.fr 发送时间： 2010-10-29 15:38:47 收件人：黄亮抄送： libvir-list(a)redhat.com 主题： Re: System.DllNotFoundException Hi, what do you mean when you say "I use the .cs file you release to create a dll project" ? C# bindings are provided with a visual studio 2010 solution, I think it's better to use it if you can. If you can't (because you have vs2005 or vs2008), please re-create a solution with all C# bindings codes. Be sure you have the dll in your Debug directory : libcurl-4.dll libgcrypt-11.dll libgnutls-26.dll libgpg-error-0.dll libportablexdr-0.dll libtasn1-3.dll libvirt-0.dll libxml2-2.dll Also, be carefull about one thing : these dll must be in the directory of the executable. I mean if you create a project "testBinding" which produce "testBindings.exe", then these dlls must be in the same directory of "testBindings.exe". You can also use "depends.exe" (http://www.dependencywalker.com/) which is a tool used to check dll dependency. You open your libvirt-0.dll with it and see if there is no missing dll (maybe a dll miss you, and I don't see it because my system ever own it, I don't know). Arnaud From: 黄亮 Sent: Friday, October 29, 2010 3:51 AM To: arnaud.champion(a)devatom.fr Subject: System.DllNotFoundException Hello Arnaud I've compiled libvirt using photron scripts and got the libvirt-0.dll I use the .cs file you released to create a dll project, and get CSharpDll.dll Then I create a new project to invoke CSharpDll.dll, I got a System.DllNotFoundException while "Libvirt.Connect.Open" is trying to work. The exception shows libvirt-0.dll cannot be found. I tried to put libvirt-0.dll everywhere. In the same dir with .sln, with .cs file, in Debug dir, even in Windows/System32 dir. But I got no luck. It's still stuck. So I need your help to get me out of the mess. Would you please tell me where I may go wrong? Many Thanks 2010-10-29 -------------------------------------------------------------------------------- Lancer __________ Information from ESET Smart Security, version of virus signature database 5573 (20101028) __________ The message was checked by ESET Smart Security. http://www.eset.com

1 0

Re: [libvirt] System.DllNotFoundException
by arnaud.champion＠devatom.fr 29 Oct '10

29 Oct '10

?Hi, what do you mean when you say "I use the .cs file you release to create a dll project" ? C# bindings are provided with a visual studio 2010 solution, I think it's better to use it if you can. If you can't (because you have vs2005 or vs2008), please re-create a solution with all C# bindings codes. Be sure you have the dll in your Debug directory : libcurl-4.dll libgcrypt-11.dll libgnutls-26.dll libgpg-error-0.dll libportablexdr-0.dll libtasn1-3.dll libvirt-0.dll libxml2-2.dll Also, be carefull about one thing : these dll must be in the directory of the executable. I mean if you create a project "testBinding" which produce "testBindings.exe", then these dlls must be in the same directory of "testBindings.exe". You can also use "depends.exe" (http://www.dependencywalker.com/) which is a tool used to check dll dependency. You open your libvirt-0.dll with it and see if there is no missing dll (maybe a dll miss you, and I don't see it because my system ever own it, I don't know). Arnaud From: 黄亮 Sent: Friday, October 29, 2010 3:51 AM To: arnaud.champion(a)devatom.fr Subject: System.DllNotFoundException Hello Arnaud I've compiled libvirt using photron scripts and got the libvirt-0.dll I use the .cs file you released to create a dll project, and get CSharpDll.dll Then I create a new project to invoke CSharpDll.dll, I got a System.DllNotFoundException while "Libvirt.Connect.Open" is trying to work. The exception shows libvirt-0.dll cannot be found. I tried to put libvirt-0.dll everywhere. In the same dir with .sln, with .cs file, in Debug dir, even in Windows/System32 dir. But I got no luck. It's still stuck. So I need your help to get me out of the mess. Would you please tell me where I may go wrong? Many Thanks 2010-10-29 -------------------------------------------------------------------------------- Lancer

1 0

[libvirt] [PATCH C#] Fix two memory leaks in the ConnectCredential.Result setter
by Matthias Bolte 29 Oct '10

29 Oct '10

StringToHGlobalAnsi returns a pointer to unmanaged memory that must be freed using FreeHGlobal. When the setter is called twice the strdup'ed unmanaged string from the first call leaks. Free it before assigning it again. --- NativeFunctions.cs | 6 +++++- Types.cs | 13 +++++++++++-- projects/MonoDevelop/LibvirtBindings.dll.config | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/NativeFunctions.cs b/NativeFunctions.cs index 25d7532..71136b8 100644 --- a/NativeFunctions.cs +++ b/NativeFunctions.cs @@ -16,8 +16,12 @@ namespace Libvirt { public class NativeFunctions { - // TODO : this is atemporary workaround for virConnectOpenAuth callback, this should be removed + // TODO : this is a temporary workaround for virConnectOpenAuth callback, this should be removed [DllImport("msvcrt.dll", EntryPoint = "_strdup", CallingConvention = CallingConvention.Cdecl)] public static extern IntPtr StrDup(IntPtr strSource); + + // TODO : this is a temporary workaround for virConnectOpenAuth callback, this should be removed + [DllImport("msvcrt.dll", EntryPoint = "free", CallingConvention = CallingConvention.Cdecl)] + public static extern void Free(IntPtr ptr); } } diff --git a/Types.cs b/Types.cs index 0d471fb..37a1f47 100644 --- a/Types.cs +++ b/Types.cs @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) * Arnaud Champion <arnaud.champion(a)devatom.fr> * Jaromír Červenka <cervajz(a)cervajz.com> @@ -406,6 +406,10 @@ namespace Libvirt [StructLayout(LayoutKind.Sequential)] public class ConnectCredential { + public ConnectCredential () + { + result = IntPtr.Zero; + } ///<summary> /// One of virConnectCredentialType constants ///</summary> @@ -473,8 +477,13 @@ namespace Libvirt } set { - result = NativeFunctions.StrDup(Marshal.StringToHGlobalAnsi(value)); + IntPtr tmp = Marshal.StringToHGlobalAnsi(value); + + NativeFunctions.Free(result); + result = NativeFunctions.StrDup(tmp); resultlen = (uint)value.Length; + + Marshal.FreeHGlobal(tmp); } } } diff --git a/projects/MonoDevelop/LibvirtBindings.dll.config b/projects/MonoDevelop/LibvirtBindings.dll.config index d0ded4c..2dfa2e4 100644 --- a/projects/MonoDevelop/LibvirtBindings.dll.config +++ b/projects/MonoDevelop/LibvirtBindings.dll.config @@ -6,6 +6,8 @@ </dllmap> <dllmap dll="msvcrt.dll"> <dllentry os="windows" dll="msvcrt.dll" name="_strdup" target="_strdup" /> + <dllentry os="windows" dll="msvcrt.dll" name="free" target="free" /> <dllentry os="linux" dll="libc.so.6" name="_strdup" target="strdup" /> + <dllentry os="linux" dll="libc.so.6" name="free" target="free" /> </dllmap> </configuration> -- 1.7.0.4

3 3

[libvirt] [PATCH] show compiled in options in virsh --version
by Daniel Veillard 29 Oct '10

29 Oct '10

To ease debugging this trivial patch allows to find what was compiled in in the local version of libvirt, this doesn't work for remote access but that's probably sufficient. With the patch I get on my machine: paphio:~/libvirt/tools -> ./virsh --version Virsh command line tool of libvirt 0.8.4 See web site at http://libvirt.org/ Compiled with support for: Hypervisors: Xen QEmu/KVM UML OpenVZ LXC ESX PHYP Test Networking: Remote Daemon Network Bridging Netcf Nwfilter Storage: Dir Disk Filesystem SCSI Multipath iSCSI LVM Miscellaneous: SELinux Secrets Debug Readline paphio:~/libvirt/tools -> instead of just "0.8.4" 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/

7 12

[libvirt] [PATCH 0/2] speed up qemu domain save by increasing dd blocksize
by Laine Stump 29 Oct '10

29 Oct '10

These two patches are posted together because applying the 2nd exposes the bug fixed by the first. Here are the results of tests I made with various block sizes before deciding the 1MB really was the best balance (all tests were done on a paused 512MB domain, saving to local disk on a Lenovo T61 laptop) BS M:SS save image size ----- ---- --------------- 2048K - 0:56 476135451 1024K - 0:56 475090953 512k - 1:02 474564173 256k - 1:10 474303797 128k - 1:25 474176859 512 - 3:47 474085423 - the original I didn't bother testing sizes between 512 and 128k, as there was still significant improvement from 128k to 256k.

5 27

[libvirt] [PATCH] fix warnign on virtaudit.c
by KAMEZAWA Hiroyuki 28 Oct '10

28 Oct '10

I met this on the latest git tree. == >From fdd982b0cf3b772f61825736e6fc98bf948c4792 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> Date: Thu, 28 Oct 2010 16:18:07 +0900 Subject: [PATCH] libvirt-audit-printf-warning-fix fix warning CC libvirt_util_la-virtaudit.lo cc1: warnings being treated as errors util/virtaudit.c: In function 'virAuditEncode': util/virtaudit.c:146: error: implicit declaration of function 'virAsprintf' [-Wimplicit-function-declaration] util/virtaudit.c:146: error: nested extern declaration of 'virAsprintf' [-Wnested-externs] --- src/util/virtaudit.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/virtaudit.c b/src/util/virtaudit.c index d568660..6af7af0 100644 --- a/src/util/virtaudit.c +++ b/src/util/virtaudit.c @@ -30,6 +30,7 @@ #include "virterror_internal.h" #include "logging.h" #include "virtaudit.h" +#include "util.h" /* Provide the macros in case the header file is old. FIXME: should be removed. */ -- 1.7.2.3

2 1

[libvirt] libvirt-csharp coverage update
by arnaud.champion＠devatom.fr 28 Oct '10

28 Oct '10

?Hi Justin, I have sended some patches today. When they will be pushed the coverage will the one in the xls file. I have also changed the linux testing environment, now I test mono bindings with Ubuntu 10.10 x64 and mono compiled in 64 bits, because we have seen some troubles with marshaling in this configuration. So, here are the all the test environements : - Windows 7 (64 bits) / .Net 4 - Windows 7 (64 bits) / Mono (compiled in 32 bits) 2.6.7 - Ubuntu 10.10 amd64 / Mono (compiled in 64 bits) 2.6.7 I will notify you about any changes about testing envs. Best regards, Arnaud

5 10

[libvirt] [PATCH] eliminate possibility of a double-closed file descriptor
by Stefan Berger 28 Oct '10

28 Oct '10

The 2nd and 3rd hunk show the only double-closed file descriptor code part that I found while trying to clean up close(). The first hunk seems a harmless cleanup in that same file. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> Index: Stefan/src/storage/storage_backend_logical.c =================================================================== --- Stefan.orig/src/storage/storage_backend_logical.c +++ Stefan/src/storage/storage_backend_logical.c @@ -37,6 +37,7 @@ #include "util.h" #include "memory.h" #include "logging.h" +#include "files.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -408,10 +409,10 @@ virStorageBackendLogicalBuildPool(virCon virReportSystemError(errno, _("cannot clear device header of '%s'"), pool->def->source.devices[i].path); - close(fd); + VIR_FORCE_CLOSE(fd); goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot close device '%s'"), pool->def->source.devices[i].path); @@ -622,7 +623,7 @@ virStorageBackendLogicalCreateVol(virCon goto cleanup; } - if (close(fd) < 0) { + if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot close file '%s'"), vol->target.path); @@ -641,8 +642,7 @@ virStorageBackendLogicalCreateVol(virCon return 0; cleanup: - if (fd != -1) - close(fd); + VIR_FORCE_CLOSE(fd); virStorageBackendLogicalDeleteVol(conn, pool, vol, 0); return -1; }

2 2

[libvirt] [PATCH] qemu: check for vm after starting a job
by Eric Blake 28 Oct '10

28 Oct '10

https://bugzilla.redhat.com/show_bug.cgi?id=638285 - when migrating a guest, it was very easy to provoke a race where an application could query block information on a VM that had just been migrated away. Any time qemu code obtains a job lock, it must also check that the VM was not taken down in the time where it was waiting for the lock. * src/qemu/qemu_driver.c (qemudDomainSetMemory) (qemudDomainGetInfo, qemuDomainGetBlockInfo): Check that vm still exists after obtaining job lock, before starting monitor action. --- src/qemu/qemu_driver.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ae1d833..af5126d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -463,7 +463,8 @@ static int ATTRIBUTE_RETURN_CHECK qemuDomainObjEndJob(virDomainObjPtr obj) * obj must be locked before calling, qemud_driver must be unlocked * * To be called immediately before any QEMU monitor API call - * Must have alrady called qemuDomainObjBeginJob(). + * Must have already called qemuDomainObjBeginJob(), and checked + * that the VM is still active. * * To be followed with qemuDomainObjExitMonitor() once complete */ @@ -504,7 +505,7 @@ static void qemuDomainObjExitMonitor(virDomainObjPtr obj) * obj must be locked before calling, qemud_driver must be locked * * To be called immediately before any QEMU monitor API call - * Must have alrady called qemuDomainObjBeginJob(). + * Must have already called qemuDomainObjBeginJob(). * * To be followed with qemuDomainObjExitMonitorWithDriver() once complete */ @@ -522,7 +523,7 @@ static void qemuDomainObjEnterMonitorWithDriver(struct qemud_driver *driver, vir /* obj must NOT be locked before calling, qemud_driver must be unlocked, * and will be locked after returning * - * Should be paired with an earlier qemuDomainObjEnterMonitor() call + * Should be paired with an earlier qemuDomainObjEnterMonitorWithDriver() call */ static void qemuDomainObjExitMonitorWithDriver(struct qemud_driver *driver, virDomainObjPtr obj) { @@ -4948,6 +4949,12 @@ static int qemudDomainSetMemory(virDomainPtr dom, unsigned long newmem) { if (qemuDomainObjBeginJob(vm) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + priv = vm->privateData; qemuDomainObjEnterMonitor(vm); r = qemuMonitorSetBalloon(priv->mon, newmem); @@ -5014,11 +5021,17 @@ static int qemudDomainGetInfo(virDomainPtr dom, } else if (!priv->jobActive) { if (qemuDomainObjBeginJob(vm) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } qemuDomainObjEnterMonitor(vm); err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); qemuDomainObjExitMonitor(vm); if (err < 0) { + endjob: if (qemuDomainObjEndJob(vm) == 0) vm = NULL; goto cleanup; @@ -10343,6 +10356,11 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, qemuDomainObjPrivatePtr priv = vm->privateData; if (qemuDomainObjBeginJob(vm) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } qemuDomainObjEnterMonitor(vm); ret = qemuMonitorGetBlockExtent(priv->mon, @@ -10350,6 +10368,7 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, &info->allocation); qemuDomainObjExitMonitor(vm); + endjob: if (qemuDomainObjEndJob(vm) == 0) vm = NULL; } else { -- 1.7.2.3

3 6

[libvirt] iptables complains about a bad rule
by Matthias Bolte 28 Oct '10

28 Oct '10

With libvirt from git on Ubuntu 10.04 I get this 3 errors (actually 2 warnings an 1 error) when starting libvirtd: 23:15:45.221: error : virRunWithHook:855 : internal error '/sbin/iptables --table mangle --delete POSTROUTING --out-interface virbr0 --protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill' exited with non-zero status 2 and signal 0: iptables v1.4.4: unknown option `--checksum-fill' Try `iptables -h' or 'iptables --help' for more information. 23:15:45.238: error : virRunWithHook:855 : internal error '/sbin/iptables --table filter --delete INPUT --in-interface virbr0 --protocol udp --destination-port 69 --jump ACCEPT' exited with non-zero status 1 and signal 0: iptables: Bad rule (does a matching rule exist in that chain?). 23:15:45.275: error : virRunWithHook:855 : internal error '/sbin/iptables --table mangle --insert POSTROUTING --out-interface virbr0 --protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill' exited with non-zero status 2 and signal 0: iptables v1.4.4: unknown option `--checksum-fill' Try `iptables -h' or 'iptables --help' for more information. The first and the last one just indicate that my iptables here is too old to know about --checksum-fill, but what about the second one? Matthias

2 4

[libvirt] cgroups and USB passthrough devices don't work together
by Diego Elio Pettenò 28 Oct '10

28 Oct '10

Hi all, beside the problem with USB devices I sent the patch for earlier, there is another problem that I'm not sure how to fix: the QEmu cgroup is _not_ allowed to access the device when adding it to the virtual machine. Basically it'd need a call to virCgroupAllowDevicePath() when adding the device… -- 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 1

[libvirt] [PATCH] qemu: Unref domain on error of opening qemu monitor
by Hu Tao 28 Oct '10

28 Oct '10

The domain refed will be left unrefed when there is error when opening qemu monitor, so unref it. --- src/qemu/qemu_driver.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 25695df..4bcfb27 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1385,7 +1385,7 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) (driver->securityDriver,vm) < 0) { VIR_ERROR(_("Failed to set security context for monitor for %s"), vm->def->name); - goto error; + return ret; } /* Hold an extra reference because we can't allow 'vm' to be @@ -1420,8 +1420,10 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjExitMonitorWithDriver(driver, vm); error: - if (ret < 0) + if (ret < 0) { qemuMonitorClose(priv->mon); + virDomainObjUnref(vm); + } return ret; } -- 1.7.3

3 4