- Devel - libvirt List Archives

[libvirt] RFC move logging initialization earlier in libvirtd
by Dave Allan 11 Nov '09

11 Nov '09

I noticed yesterday that logging gets initialized fairly far into the libvirtd startup process, so messages generated during server startup don't get logged to the same sinks that will be used for the rest of the life of the daemon. I'd like to explore moving the logging startup to an earlier point. Has this idea been explored previously? Dave

2 3

[libvirt] [PATCH] phyp: ssh authentication with pub keys fixed
by Eduardo Otubo 11 Nov '09

11 Nov '09

-- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 eotubo(a)linux.vnet.ibm.com

2 9

[libvirt] ANNOUNCE: libguestfs 1.0.78 released
by Richard W.M. Jones 10 Nov '09

10 Nov '09

I'm pleased to announce the release of libguestfs 1.0.78. Libguestfs is a library for accessing and modifying virtual machine disk images. Home page: http://libguestfs.org/ Source: http://libguestfs.org/download/ Binaries: http://libguestfs.org/FAQ.html#binaries A Fedora build is available in Koji here: http://koji.fedoraproject.org/koji/packageinfo?packageID=8391 (These release notes cover all the significant changes since the last announcement which was for 1.0.67, 2 months ago). New features: - FUSE support so you can mount guest filesystems in the host: http://rwmj.wordpress.com/2009/11/03/browsing-guests-using-fuse/ - Support for btrfs, gfs, gfs2, hfs, hfs+, nilfs2, jfs, reiserfs, xfs: http://rwmj.wordpress.com/2009/11/08/filesystem-metadata-overhead/ - Support for huge (multi-exabyte) sparse virtual disks: http://rwmj.wordpress.com/2009/11/04/petabytes-exabytes-why-not/ http://git.et.redhat.com/?p=libguestfs.git;a=commit;h=5ce72e039ca332ba19bb9… - New partitioning API, supports GPT and more: http://libguestfs.org/guestfs.3.html#guestfs_part_add http://git.et.redhat.com/?p=libguestfs.git;a=commit;h=b1e1ca2f74a921b3f7845… - New tool: virt-ls http://rwmj.wordpress.com/2009/10/19/new-tool-virt-ls/ - New tool: virt-tar http://rwmj.wordpress.com/2009/10/19/new-tool-virt-tar/ - New tool: virt-edit http://rwmj.wordpress.com/2009/09/23/virt-edit/ - New tool: virt-rescue http://rwmj.wordpress.com/2009/09/22/virt-rescue/ - Windows Registry support, tools and library: http://rwmj.wordpress.com/2009/10/29/virt-win-reg-get-at-the-windows-regist… http://rwmj.wordpress.com/2009/10/28/libhivex-windows-registry-hive-extract… - OCaml bindings for virt-inspector - RELAX NG schema for virt-inspector - New APIs: utimens, vfs_type, truncate, truncate_size, lchown, lstatlist, lxattrlist, readlinklist, case_sensitive_path, find0, mkfs_b, mke2journal, and more ... - New program: OCaml viewer http://rwmj.wordpress.com/2009/09/29/graphical-virt-df/ - Allow stdout to be redirected when running guestfish remotely (Matt Booth). - Remove requirement for vmchannel support in qemu (horray!) and the tricky main loop code. Bug fixes: (Too many to list here, see: http://git.et.redhat.com/?p=libguestfs.git;a=log) Thanks to: Jim Meyering, Matt Booth and Charles Duffy for lots of bugfixes, patches and testing. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://et.redhat.com/~rjones/libguestfs/ See what it can do: http://et.redhat.com/~rjones/libguestfs/recipes.html

1 0

[libvirt] Re: libvirt code review
by Daniel Veillard 10 Nov '09

10 Nov '09

On Thu, Nov 05, 2009 at 03:27:16PM -0500, Steve Grubb wrote: > Hello, > > I missed code in a couple other directories. This is much shorter. > > -Steve > > > In daemon/libvirtd.c at line 371 the "if" statement will never be true. ret is > set to 0 at line 350 and never changed. probably a leftover from previous refactoring, server->shutdown = 1 is directly set in the cases that matters, removed ret altogether. In the current code head, server->shutdown has been renamed server->quitEventThread, so patch changed accordingly. > At line 1535 seems to want to loop on reads that return -1 and either EINTR or > EAGAIN. The implementation does not. Rather than calling return at line 1538, > it should likely have a "goto again" with the again label placed just before > the read call. Actually in that case I think the current code is fine, the function should exit 0 on EAGAIN, it's documented, I assume the read will be retried by the caller, otherwise we would have used saferead() there an internal routine taking directly care of interrupted calls. > At line 1783 is a call to write that likely wants a treatment similar to the > read above. Same thing, I guess it's intended behaviour :-) > In tools/virsh.c at line 4616 is a test that format is true. It was checked at > line 4614 and nothing changed it. Ah right, harmless but fixed :-) > At line 6810 memory is allocated. At the error exit at line 6824 it has not > been freed. okay > At line 7664 is a test for network==NULL. This will always be true. > At line 7704 is a test for iface == NULL. This will always be true. > At line 7741 is a test for pool==NULL. This will always be true. Okay, fixed, allows the test to fit in 80 columns too, Patch for git head attached. thanks a lot ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] Bump required netcf version to 0.1.4
by Laine Stump 10 Nov '09

10 Nov '09

0.1.3 will build everything, but causes a segfault. --- configure.in | 2 +- libvirt.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 7ad1a90..cd8bb95 100644 --- a/configure.in +++ b/configure.in @@ -33,7 +33,7 @@ GNUTLS_REQUIRED="1.0.25" AVAHI_REQUIRED="0.6.0" POLKIT_REQUIRED="0.6" PARTED_REQUIRED="1.8.0" -NETCF_REQUIRED="0.1.3" +NETCF_REQUIRED="0.1.4" dnl Checks for C compiler. AC_PROG_CC diff --git a/libvirt.spec.in b/libvirt.spec.in index 9238bdd..7c43180 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -308,7 +308,7 @@ BuildRequires: libcap-ng-devel >= 0.5.0 BuildRequires: libssh2-devel %endif %if %{with_netcf} -BuildRequires: netcf-devel >= 0.1.3 +BuildRequires: netcf-devel >= 0.1.4 %endif # Fedora build root suckage -- 1.6.5.15.gc274d

2 1

[libvirt] Re: libvirt code review
by Daniel Veillard 10 Nov '09

10 Nov '09

On Thu, Nov 05, 2009 at 01:12:41PM -0500, Steve Grubb wrote: > Hello, > > The following is against 0.7.2-3 from F-13 cvs. I mention each source file at > the beginning of a block and have a blank line indicating that we are moving > along to the next file. Hope you find this helpful. > > -Steve Okay I fixed the issues on a 0.7.2 branch and then backported the patch back onto git head, except for a few exceptions, everything was still applying ! > In src/util/storage_file.c at line 192, there is a test that I presume is for > -1. The problem is that its a variable that is an unsigned long is 64 bits on unsigned long size; size = ((buf[4+4+8] << 24) | (buf[4+4+8+1] << 16) | (buf[4+4+8+2] << 8) | buf[4+4+8+3]); /* QCowHeader.backing_file_size */ [...] if (size + 1 == 0) return BACKING_STORE_INVALID; if (VIR_ALLOC_N(*res, size + 1) < 0) { I think it's just to make 100% sure the size + 1 computation on the following line won't overflow. So current code looks fine to me > some arches. It would probably be better to use a unit32_t for size or change > the test. The bottom line is the test will evaluate false on some arches. unit32_t is nowhere used in libvirt code I would rather not use it, we could use size_t there since the goal is to allocate memory but I'm not 100% sure it's right, basically the test make sure we won't try to allocate more than 4G of memory in one chunk. > In src/datatypes.c at lines 335, 476, and 790, there is a test to see if uuid > is NULL. There was a test in the beginning of the function and it returned if > this was true, so this "if" statement can be deleted in all 3 cases. Hum, this is the virGetxxx() functions, they lookup objects given the name or uuid, and hold big TODOs comments at the start: /* TODO search by UUID first as they are better differenciators */ /* TODO check the UUID */ And somehow I think the intend was to allow lookup only by name, with the uuid being unknown, I would think the proper fix is actually to drop the || (uuid == NULL) at the start of the function. > In src/libvirt.c at line 1122, there is an "if" statement that "ands" 0 with > the return from STREQ. Should that have been a == ? The test evaluates false > as is. Comparing with others similar message being emitted in other places, I think '0 && ' is just a bogus remain, I'm removing it. > At line 3214, there is a test if uri == NULL. Then within that "if" > statement at line 3216 is a test for if uri is still NULL. Should that have > been a test for dstURI being NULL? yup ! That had been fixed in head since though. > In src/remote/remote_driver.c at line 939 is a do loop. By design, it seems > the intention was to reloop if waitpid returns -1 and EINTR is set. The > implementation doesn't match it. If -1 is returned, it will do the continue, > which is to jump to the end of the do loop and it evaluates reap which would > be a -1 and it will exit. I suspect instead of continue, it should "goto > again" and again would be placed before the call to waitpid. > This problem is found again at line 1406 okay, nasty, somehow it's easy to think continue will retry from top of the loop not including the test > In src/xen/sexpr.c at line 443 is a test for token == NULL. Token is > guaranteed to not be NULL because of the loop entry test at line 440. okay > In src/xen/xend_internal.c at line 1367 is a test for connectPort being true. > Prior to this, connectPort is guranteed to be valid or it would have jumped to > no_memory. okay as the affectation is done in both if and else parts of the preceeding test. > In src/xen/xm_internal.c at line 579 is a test for dh being valid. It is > guaranteed to be valid since a -1 was returned from the function on a failed > call to opendir. okay > At line 2219 is an unusual if statement. Normally you do not see something > constructed as (!cpu)<0). That would seem to have meant cpu>=0 which is more > straightforward. if (def->cpumask && !(cpus = virDomainCpuSetFormat(conn, def->cpumask, def->cpumasklen)) < 0) goto cleanup; But the function returns a string or NULL in case of error, I try to fight again not fully parenthetized test expressions but I'm loosing that fight unfortunately :-( in any case the < 0 test is bogus since it's a string if ((def->cpumask) && ((cpus = virDomainCpuSetFormat(conn, def->cpumask, def->cpumasklen)) == NULL)) goto cleanup seems the right construct to me, as it tests if the call failed. > In src/phyp/phyp_driver.c at line 1008, there is a strdup inside an if > statement with nothing catching its returned memory. Two lines later it does > the same thing again but puts it in an array. Not sure what the if statement > should have been checking, but its definitely a memory leak as is. > At line 1040 is an allocation. If that fails, it passes dom->comm to an error > reporting function. However, at line 1034, dom was set to NULL and is not > changed. > The same problem appears again at line 1085. > At line 1105 is a test for exit_status < 0. Nothing has changed it since it > was initialized. That code was completely revamped since, none of this applies now, it was pretty bad ! C.f. https://bugzilla.redhat.com/show_bug.cgi?id=529977 > In src/openvz/openvz_conf at line 336 is a test for from being NULL. However, > it was previously used at line 333 before checking if it was NULL. yeah, there was another passed pointer which should have got the same check too, cleaning this up. > In src/qemu/qemu_monitor_text.c at line 178, a variable, control, is assigned > to a member of the msg structure. However, control goes out of scope before > its used. It should be in the function level declarations. Ah right, nasty ! > In src/qemu/qemu_driver.c at line 894 is a test for retries being 0. This will > always be true since the loop has no break statements. > At line 4484, we leave the function without freeing devname. okay, > In src/lxc/lxc_conf.c at line 111, 114, and 125, we leave the function without > freeing filename. okay > In src/lxc/lxc_container.c at line 743, we leave the function without freeing > ttyPath. okay > In src/storage/storage_driver.c at lines 83 and 93 we call storageLog/fprintf > with the second parameter to %s being NULL. Wasn't an empty string intended? I used "no error message found" as we failed to gather an error message > In src/storage/storage_backend_disk.c at line 88, we leave the function > without freeing devpath. okay > At line 649 is a test for part_num being NULL. Can it ever be NULL? No, but we should check for an empty string, done > In src/node_device/node_device_hal.c at line 405 is a test for hal_cap_names > being true, its conceivable to get there without it being initialized. For > example, line 373 could jump to it. It should probably be initialized to 0. okay > At line 781 is a test for udi being true. It will alwys be false since once > its defined it will never jump to failure. > At line 782 is a use of num_devs without it being initialized. If the problem > mentioned for udi is fixed by deleting all this code, then the problem goes > away. okay removing that block, I just hope we won't add a failure jump from within the loop > In src/lxc/lxc_controller.c at line 633 is a test for containerPty not being > -1. Its conceivable to get here with it notr being initialized perhaps at line > 512 for example. It should probably be initialized to a -1. yup, okay > At line 735 is an if statement "anding" 0 with getuid(). this should probably > be a != rather than a &&. right since the error message clearly indicate we expect this to run as root. Thanks a lot for the review ! Patch for git head attached 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/

3 5

[libvirt] Mounting a raw DVD
by Adam Mooz 10 Nov '09

10 Nov '09

Hello List, I'm attempting to pass a DVD drive of a headless server into a virtual machine. So far I've managed to mount *something* into the VM, but it's being registered as a blank DVD within the VM. When I mount /dev/ dvd into the bare-metal machine it registers normally as the DVD. How do I pass physical drives into a VM and back out using libvirt? Command used: #virsh attach-disk Montreal /dev/dvd hdc --mode readonly --driver phy --type cdrom Connecting to uri: qemu:///system Disk attached successfully VM XML file: <domain type='kvm'> <name>Montreal</name> <uuid>0f79ba7f-27bf-16a0-5887-6cfa2b5569f1</uuid> <memory>2097152</memory> <currentMemory>2097152</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc-0.11'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file' device='cdrom'> <target dev='hdc' bus='ide'/> <readonly/> </disk> <disk type='file' device='disk'> <source file='(Mangled Purposely)'/> <target dev='vda' bus='virtio'/> </disk> <interface type='bridge'> <mac address='(mangled purposly)/> <source bridge='br0'/> <model type='virtio'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> <video> <model type='cirrus' vram='9216' heads='1'/> </video> </devices> </domain> Thanks in advance, ----------------------------------------------------------------- Adam Mooz Adam.Mooz(a)gmail.com AdamMooz(a)me.com http://www.AdamMooz.com

2 5

[libvirt] [RFD] API for reporting virtual machine memory statistics
by Adam Litke 10 Nov '09

10 Nov '09

I am working on a feature that enables virtual machines to report memory statistics to the host. Examples include: free memory, number of pages swapped out/in, number of page faults, etc. This information is useful to a virtual machine manager which can use it to make memory ballooning or VM migration decisions. My implementation uses the virtio-balloon driver as a conduit for the memory info. What is the best way to expose these memory stats in libvirt? I see two possibilities. The dominfo command already queries the balloon driver so I could easily extend this command to report the additional fields. The second, and better IMO, option is to introduce a new command (dommemstat) with output similar to domblkstat. What do you think? -- Thanks, Adam

2 1

[libvirt] Libvirt & VMware using bindings?
by H Alexandre 10 Nov '09

10 Nov '09

Hi, I can see on the home page that Libvirt supports Linux virtualization platform (Xen, KVM…) but in the bindings page mentions about other languages integration (perl & java for instance). I would like to know if there is a way (using those bindings) to use standard Libvirt based code to manage VMware virtualization platform ? Thanks a lot, Regards, Alex

3 2

[libvirt] Need second private network between guests's
by Gerry Reno 10 Nov '09

10 Nov '09

I've got a shared device 'br0' between my host and all my guests. The guests are now on the host network. What do I need to do in order to setup a second 'private' network between the guests? My host network is on 192.168 and I'd like the second private network on 172.19. thx, -Gerry

3 3

Re: [libvirt] Get Virtual Machine Information
by Gandhiraj Natarajan 10 Nov '09

10 Nov '09

Hi Jun Koi Thanks for your reply. I am writing a tool to document the novell xen server and its vm configuration. for this i need to know how to get operating system of vm and its ipaddress. Help me Regards, Gandhiraj Natarajan --- On Fri, 23/10/09, Jun Koi <junkoi2004(a)gmail.com> wrote: From: Jun Koi <junkoi2004(a)gmail.com> Subject: Re: [libvirt] Get Virtual Machine Information To: "Gandhiraj Natarajan" <gandhiraj_gk(a)yahoo.co.in> Date: Friday, 23 October, 2009, 7:51 PM On Thu, Oct 22, 2009 at 5:39 PM, Gandhiraj Natarajan <gandhiraj_gk(a)yahoo.co.in> wrote: > > Hi > > 1. We need to know how to get the IP addresses of virtual machines running in Novel Xen Server? Is that HVM, or PV? in the case of HVM, it is not realistic to get the IP, as the IP is managed from inside the HVM, and that is out-of-control from Dom0. > 2. We need to know how to get the proper operating system like Windows XP or 2000 or 2003? Could you explain why you need this kind of information?? Thanks, J The INTERNET now has a personality. YOURS! See your Yahoo! Homepage. http://in.yahoo.com/

1 0

[libvirt] timing issues of calling virsh on the command line
by David Wilcox 10 Nov '09

10 Nov '09

Hi, I've encountered some concurrency issues when calling virsh in a script. If I try to restore a VM too soon after it's been saved, libvirtd will stop responding. As well, if I try to save a VM too soon after it's been restored, libvirtd will stop responding. At the moment, I am not using any type of wait in my program for virsh to come back. I merely let the system call run its course and I assume that virsh will return when it's done waiting. Is there any type of wait that needs to occur in order to avoid these concurrency issues? Thanks, David

2 2

[libvirt] Add support for qemu's guestfwd
by Matthew Booth 09 Nov '09

09 Nov '09

This is an update of the patchset I posted yesterday. There have been a few changes in the 4th patch, which actually adds guestfwd support: Firstly, after discussion on IRC, it was agreed that 'vmchannel' is a poor name for the collection of implementations of private host<->guest channels, because it is the name of a specific implementation. Consequently the name has been changed to just 'channel'. Secondly, I've fixed a bunch of things I noticed while adding actual vmchannel support (patches to follow separately). Lastly, I've changed the relax-ng a bit to check the precise set of attributes for guestfwd. This change is also followed up in the vmchannel support. The patch now supports the following domain XML: <channel type='pipe'> <source path='/tmp/guestfwd'/> <target type='guestfwd' address='10.0.2.1' port='4600'/> </channel> It will output the following on the qemu command line for this: -chardev pipe,id=channel0,path=/tmp/guestfwd \ -net user,guestfwd=tcp:10.0.2.1:4600-chardev:channel0 Support for -chardev is as complete as the current character device support. Because of the legacy vmchannel, there was also some confusion about whether these patches are intended for merging. These patches aren't directly related to vmchannel, and are targeted at merging. Matt

3 16

[libvirt] [PATCH 1/2] Separate character device documentation into guest and host sections
by Matthew Booth 09 Nov '09

09 Nov '09

This change refactors the existing character device documentation to make it explicit which directives configure the guest interface, and which configure the host interface. * docs/formatdomain.html.in: Do it. --- docs/formatdomain.html.in | 117 ++++++++++++++++++++++++++++++++++----------- 1 files changed, 88 insertions(+), 29 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 72bd7b9..be35ad0 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -789,28 +789,87 @@ qemu-kvm -net nic,model=? /dev/null </devices> </domain></pre> + <p> + In each of these directives, the top-level element name (parallel, serial, + console, channel) describes how the device is presented to the guest. The + guest interface is configured by the <code>target</code> element. + </p> - <dl> - <dt><code>parallel</code></dt> - <dd>Represents a parallel port</dd> - <dt><code>serial</code></dt> - <dd>Represents a serial port</dd> - <dt><code>console</code></dt> - <dd>Represents the primary console. This can be the paravirtualized - console with Xen guests, or duplicates the primary serial port - for fully virtualized guests without a paravirtualized console.</dd> - <dt><code>source</code></dt> - <dd>The attributes available for the <code>source</code> element - vary according to the <code>type</code> attribute on the parent - tag. Allowed variations will be described below</dd> - <dt><code>target</code></dt> - <dd>The port number of the character device is specified via the - <code>port</code> attribute, numbered starting from 1. There is - usually only one console device, and 0, 1 or 2 serial devices - or parallel devices. - </dl> + <p> + The interface presented to the host is given in the <code>type</code> + attribute of the top-level element. The host interface is + configured by the <code>source</code> element. + </p> + + <h5><a name="elementsCharGuestInterface">Guest interface</a></h5> + + <p> + A character device presents itself to the guest as one of the following + types. + </p> + + <h6><a name="elementCharParallel">Parallel port</a></h6> + + <pre> + ... + <parallel type='pty'> + <source path='/dev/pts/2'/> + <target port='0'/> + </parallel> + ...</pre> + + <p> + <code>target</code> can have a <code>port</code> attribute, which + specifies the port number. Ports are numbered starting from 1. There are + usually 0, 1 or 2 parallel ports. + </p> + + <h6><a name="elementCharSerial">Serial port</a></h6> + + <pre> + ... + <serial type='pty'> + <source path='/dev/pts/3'/> + <target port='0'/> + </serial> + ...</pre> + + <p> + <code>target</code> can have a <code>port</code> attribute, which + specifies the port number. Ports are numbered starting from 1. There are + usually 0, 1 or 2 serial ports. + </p> + + <h6><a name="elementCharConsole">Console</a></h6> + + <p> + This represents the primary console. This can be the paravirtualized + console with Xen guests, or duplicates the primary serial port for fully + virtualized guests without a paravirtualized console. + </p> + + <pre> + ... + <console type='pty'> + <source path='/dev/pts/4'/> + <target port='0'/> + </console> + ...</pre> + + <p> + If the console is presented as a serial port, the <code>target</code> + element has the same attributes as for a serial port. There is usually + only 1 console. + </p> + + <h5><a name="elementsCharHostInterface">Host interface</a></h5> + + <p> + A character device presents itself to the host as one of the following + types. + </p> - <h5><a name="elementsCharSTDIO">Domain logfile</a></h5> + <h6><a name="elementsCharSTDIO">Domain logfile</a></h6> <p> This disables all input on the character device, and sends output @@ -825,7 +884,7 @@ qemu-kvm -net nic,model=? /dev/null ...</pre> - <h5><a name="elementsCharFle">Device logfile</a></h5> + <h6><a name="elementsCharFle">Device logfile</a></h6> <p> A file is opened and all data sent to the character @@ -840,7 +899,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharVC">Virtual console</a></h5> + <h6><a name="elementsCharVC">Virtual console</a></h6> <p> Connects the character device to the graphical framebuffer in @@ -855,7 +914,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharNull">Null device</a></h5> + <h6><a name="elementsCharNull">Null device</a></h6> <p> Connects the character device to the void. No data is ever @@ -869,7 +928,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharPTY">Pseudo TTY</a></h5> + <h6><a name="elementsCharPTY">Pseudo TTY</a></h6> <p> A Pseudo TTY is allocated using /dev/ptmx. A suitable client @@ -892,7 +951,7 @@ qemu-kvm -net nic,model=? /dev/null with existing syntax for <console> tags. </p> - <h5><a name="elementsCharHost">Host device proxy</a></h5> + <h6><a name="elementsCharHost">Host device proxy</a></h6> <p> The character device is passed through to the underlying @@ -910,7 +969,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharPipe">Named pipe</a></h5> + <h6><a name="elementsCharPipe">Named pipe</a></h6> <p> The character device writes output to a named pipe. See pipe(7) for @@ -925,7 +984,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharTCP">TCP client/server</a></h5> + <h6><a name="elementsCharTCP">TCP client/server</a></h6> <p> The character device acts as a TCP client connecting to a @@ -973,7 +1032,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharUDP">UDP network console</a></h5> + <h6><a name="elementsCharUDP">UDP network console</a></h6> <p> The character device acts as a UDP netconsole service, @@ -989,7 +1048,7 @@ qemu-kvm -net nic,model=? /dev/null </serial> ...</pre> - <h5><a name="elementsCharUNIX">UNIX domain socket client/server</a></h5> + <h6><a name="elementsCharUNIX">UNIX domain socket client/server</a></h6> <p> The character device acts as a UNIX domain socket server, -- 1.6.2.5

2 2

[libvirt] [PATCH 0/6] Add internal APIs for disabling error reporting
by Cole Robinson 09 Nov '09

09 Nov '09

In testing migration, I was hitting an error in the Perform step, but this was being returned as 'Unknown Error' via virsh. The reason is that even a failed Perform will call MigrateFinish to do cleanup, but Finish will always return an NULL == error in that case, overwriting the original message. I've added internal APIs which allow temporarily disabling error reporting: any ReportError calls will log the error message, but will not overwrite the previous error and will not trigger the error callback. These APIs are then used in a few places where they are needed. Thanks, Cole Cole Robinson (6): virterror: Make a thread local error state structure virterror: Add methods to temporarily disable error reporting. qemu: migrate: Disable errors in MigrateFinish if MigratePerform failed. Disable errors if Perform failed at the libvirt.c level. qemu: Disable errors in qemudShutdownVMDaemon virterror: Log reported errors when only logging output is stderr src/libvirt.c | 5 ++ src/qemu/qemu_driver.c | 13 ++++ src/util/logging.c | 3 +- src/util/virterror.c | 143 ++++++++++++++++++++++++++++++++--------- src/util/virterror_internal.h | 2 + 5 files changed, 135 insertions(+), 31 deletions(-)

2 9

[libvirt] [PATCH] Add missing OOM error checks, reports and cleanups
by Matthias Bolte 09 Nov '09

09 Nov '09

--- daemon/remote.c | 10 +-- src/conf/domain_conf.c | 4 +- src/conf/node_device_conf.c | 13 +++- src/esx/esx_driver.c | 5 ++ src/lxc/lxc_driver.c | 27 +++++-- src/openvz/openvz_conf.c | 12 ++- src/openvz/openvz_driver.c | 17 +++-- src/phyp/phyp_driver.c | 7 ++- src/qemu/qemu_conf.c | 64 +++++++++++++---- src/qemu/qemu_driver.c | 12 ++-- src/qemu/qemu_monitor_text.c | 4 +- src/remote/remote_driver.c | 135 +++++++++++++++++++++++++++++++---- src/secret/secret_driver.c | 8 ++- src/security/security_apparmor.c | 5 +- src/storage/storage_backend_scsi.c | 15 ++++ src/util/conf.c | 14 ++++ src/vbox/vbox_tmpl.c | 25 +++++-- src/xen/xen_driver.c | 12 +++- src/xen/xen_hypervisor.c | 15 ++++- src/xen/xen_inotify.c | 13 ++-- src/xen/xend_internal.c | 45 ++++++++++--- src/xen/xm_internal.c | 47 ++++++++++--- src/xen/xs_internal.c | 64 ++++++++++++----- 23 files changed, 444 insertions(+), 129 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 4296fc3..31d9841 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -565,7 +565,7 @@ remoteDispatchDomainSetSchedulerParameters (struct qemud_server *server ATTRIBUT remoteDispatchFormatError (rerr, "%s", _("nparams too large")); return -1; } - if (VIR_ALLOC_N(params, nparams)) { + if (VIR_ALLOC_N(params, nparams) < 0) { remoteDispatchOOMError(rerr); return -1; } @@ -721,10 +721,8 @@ remoteDispatchDomainBlockPeek (struct qemud_server *server ATTRIBUTE_UNUSED, ret->buffer.buffer_len = size; if (VIR_ALLOC_N (ret->buffer.buffer_val, size) < 0) { - char ebuf[1024]; virDomainFree (dom); - remoteDispatchFormatError (rerr, "%s", - virStrerror(errno, ebuf, sizeof ebuf)); + remoteDispatchOOMError(rerr); return -1; } @@ -772,10 +770,8 @@ remoteDispatchDomainMemoryPeek (struct qemud_server *server ATTRIBUTE_UNUSED, ret->buffer.buffer_len = size; if (VIR_ALLOC_N (ret->buffer.buffer_val, size) < 0) { - char ebuf[1024]; virDomainFree (dom); - remoteDispatchFormatError (rerr, "%s", - virStrerror(errno, ebuf, sizeof ebuf)); + remoteDispatchOOMError(rerr); return -1; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 918a5d7..28bee54 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3431,8 +3431,10 @@ static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, goto error; if (n) { obj->nvcpupids = n; - if (VIR_REALLOC_N(obj->vcpupids, obj->nvcpupids) < 0) + if (VIR_REALLOC_N(obj->vcpupids, obj->nvcpupids) < 0) { + virReportOOMError(conn); goto error; + } for (i = 0 ; i < n ; i++) { char *pidstr = virXMLPropString(nodes[i], "pid"); diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index c2c5a44..c5083cc 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1057,13 +1057,18 @@ virNodeDeviceDefParseXML(virConnectPtr conn, xmlXPathContextPtr ctxt, int create /* Extract device name */ if (create == EXISTING_DEVICE) { def->name = virXPathString(conn, "string(./name[1])", ctxt); + + if (!def->name) { + virNodeDeviceReportError(conn, VIR_ERR_NO_NAME, NULL); + goto error; + } } else { def->name = strdup("new device"); - } - if (!def->name) { - virNodeDeviceReportError(conn, VIR_ERR_NO_NAME, NULL); - goto error; + if (!def->name) { + virReportOOMError(conn); + goto error; + } } /* Extract device parent, if any */ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 93fb5a9..f81f744 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2262,6 +2262,7 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) esxVI_DynamicProperty *dynamicProperty = NULL; esxVI_VirtualMachinePowerState powerState; int count = 0; + int i; if (names == NULL || maxnames < 0) { goto failure; @@ -2329,6 +2330,10 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) return count; failure: + for (i = 0; i < count; ++i) { + VIR_FREE(names[i]); + } + count = -1; goto cleanup; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 0fd7a17..f44901c 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -445,6 +445,9 @@ static char *lxcGetOSType(virDomainPtr dom) ret = strdup(vm->def->os.type); + if (ret == NULL) + virReportOOMError(dom->conn); + cleanup: if (vm) virDomainObjUnlock(vm); @@ -724,14 +727,18 @@ static int lxcSetupInterfaces(virConnectPtr conn, if (NULL == def->nets[i]->ifname) { def->nets[i]->ifname = strdup(parentVeth); } - if (VIR_REALLOC_N(*veths, (*nveths)+1) < 0) + if (VIR_REALLOC_N(*veths, (*nveths)+1) < 0) { + virReportOOMError(conn); goto error_exit; - if (((*veths)[(*nveths)++] = strdup(containerVeth)) == NULL) + } + if (((*veths)[(*nveths)] = strdup(containerVeth)) == NULL) { + virReportOOMError(conn); goto error_exit; + } + (*nveths)++; if (NULL == def->nets[i]->ifname) { - lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("Failed to allocate veth names")); + virReportOOMError(conn); goto error_exit; } @@ -1771,13 +1778,19 @@ static int lxcVersion(virConnectPtr conn, unsigned long *version) return 0; } -static char *lxcGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, - int *nparams) +static char *lxcGetSchedulerType(virDomainPtr domain, int *nparams) { + char *schedulerType = NULL; + if (nparams) *nparams = 1; - return strdup("posix"); + schedulerType = strdup("posix"); + + if (schedulerType == NULL) + virReportOOMError(domain->conn); + + return schedulerType; } static int lxcSetSchedulerParameters(virDomainPtr domain, diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index c928afb..6eeece8 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -386,8 +386,8 @@ openvzReadFSConf(virConnectPtr conn, if (VIR_ALLOC(fs) < 0) goto no_memory; - if(virAsprintf(&veid_str, "%d", veid) < 0) - goto error; + if (virAsprintf(&veid_str, "%d", veid) < 0) + goto no_memory; fs->type = VIR_DOMAIN_FS_TYPE_MOUNT; fs->src = openvz_replace(temp, "$VEID", veid_str); @@ -547,8 +547,10 @@ openvzWriteConfigParam(const char * conf_file, const char *param, const char *va int fd = -1, temp_fd = -1; char line[PATH_MAX] ; - if (virAsprintf(&temp_file, "%s.tmp", conf_file)<0) + if (virAsprintf(&temp_file, "%s.tmp", conf_file)<0) { + virReportOOMError(NULL); return -1; + } fd = open(conf_file, O_RDONLY); if (fd == -1) @@ -733,8 +735,10 @@ openvzCopyDefaultConfig(int vpsid) if (confdir == NULL) goto cleanup; - if (virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir, configfile_value) < 0) + if (virAsprintf(&default_conf_file, "%s/ve-%s.conf-sample", confdir, configfile_value) < 0) { + virReportOOMError(NULL); goto cleanup; + } if (openvzLocateConfFile(vpsid, conf_file, PATH_MAX, "conf")<0) goto cleanup; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 53fcaee..467c03b 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -767,9 +767,11 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml) VIR_DOMAIN_XML_INACTIVE)) == NULL) goto cleanup; - if (vmdef->os.init == NULL && - !(vmdef->os.init = strdup("/sbin/init"))) { - goto cleanup; + if (vmdef->os.init == NULL) { + if (!(vmdef->os.init = strdup("/sbin/init"))) { + virReportOOMError(conn); + goto cleanup; + } } vm = virDomainFindByName(&driver->domains, vmdef->name); @@ -844,9 +846,12 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml, VIR_DOMAIN_XML_INACTIVE)) == NULL) goto cleanup; - if (vmdef->os.init == NULL && - !(vmdef->os.init = strdup("/sbin/init"))) - goto cleanup; + if (vmdef->os.init == NULL) { + if (!(vmdef->os.init = strdup("/sbin/init"))) { + virReportOOMError(conn); + goto cleanup; + } + } vm = virDomainFindByName(&driver->domains, vmdef->name); if (vm) { diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index a92046a..6aee504 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1732,7 +1732,8 @@ phypUUIDTable_ReadFile(virConnectPtr conn) goto err; } } - } + } else + virReportOOMError(conn); close(fd); return 0; @@ -1833,8 +1834,10 @@ phypUUIDTable_Init(virConnectPtr conn) VIR_WARN("%s %d", "Unable to generate UUID for domain", ids[i]); } - } else + } else { + virReportOOMError(conn); goto err; + } if (phypUUIDTable_WriteFile(conn) == -1) goto err; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e1e24c3..28567b2 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -417,17 +417,17 @@ qemudParseMachineTypesStr(const char *output, continue; if (VIR_ALLOC(machine) < 0) - goto error; + goto no_memory; if (!(machine->name = strndup(p, t - p))) { VIR_FREE(machine); - goto error; + goto no_memory; } if (VIR_REALLOC_N(list, nitems + 1) < 0) { VIR_FREE(machine->name); VIR_FREE(machine); - goto error; + goto no_memory; } p = t; @@ -446,7 +446,7 @@ qemudParseMachineTypesStr(const char *output, continue; if (!(machine->canonical = strndup(p, t - p))) - goto error; + goto no_memory; } } while ((p = next)); @@ -455,7 +455,8 @@ qemudParseMachineTypesStr(const char *output, return 0; -error: + no_memory: + virReportOOMError(NULL); virCapabilitiesFreeMachines(list, nitems); return -1; } @@ -537,23 +538,22 @@ qemudGetOldMachinesFromInfo(virCapsGuestDomainInfoPtr info, return 0; } - if (VIR_ALLOC_N(list, info->nmachines) < 0) + if (VIR_ALLOC_N(list, info->nmachines) < 0) { + virReportOOMError(NULL); return 0; + } for (i = 0; i < info->nmachines; i++) { if (VIR_ALLOC(list[i]) < 0) { - virCapabilitiesFreeMachines(list, info->nmachines); - return 0; + goto no_memory; } if (info->machines[i]->name && !(list[i]->name = strdup(info->machines[i]->name))) { - virCapabilitiesFreeMachines(list, info->nmachines); - return 0; + goto no_memory; } if (info->machines[i]->canonical && !(list[i]->canonical = strdup(info->machines[i]->canonical))) { - virCapabilitiesFreeMachines(list, info->nmachines); - return 0; + goto no_memory; } } @@ -561,6 +561,11 @@ qemudGetOldMachinesFromInfo(virCapsGuestDomainInfoPtr info, *nmachines = info->nmachines; return 1; + + no_memory: + virReportOOMError(NULL); + virCapabilitiesFreeMachines(list, info->nmachines); + return 0; } static int @@ -668,15 +673,19 @@ qemudCapsInitGuest(virCapsPtr caps, if (info->machine) { virCapsGuestMachinePtr machine; - if (VIR_ALLOC(machine) < 0) + if (VIR_ALLOC(machine) < 0) { + virReportOOMError(NULL); return -1; + } if (!(machine->name = strdup(info->machine))) { + virReportOOMError(NULL); VIR_FREE(machine); return -1; } if (VIR_ALLOC_N(machines, nmachines) < 0) { + virReportOOMError(NULL); VIR_FREE(machine->name); VIR_FREE(machine); return -1; @@ -1166,7 +1175,10 @@ qemudNetworkIfaceConnect(virConnectPtr conn, if (brname == NULL) return -1; } else if (net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { - brname = strdup(net->data.bridge.brname); + if (!(brname = strdup(net->data.bridge.brname))) { + virReportOOMError(conn); + return -1; + } } else { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("Network type %d is not supported"), net->type); @@ -1276,12 +1288,15 @@ qemuAssignNetNames(virDomainDefPtr def, if (virAsprintf(&nic_name, "%s.%d", net->model ? net->model : "nic", - nic_index) < 0) + nic_index) < 0) { + virReportOOMError(NULL); return -1; + } if (virAsprintf(&hostnet_name, "%s.%d", qemuNetTypeToHostNet(net->type), hostnet_index) < 0) { + virReportOOMError(NULL); VIR_FREE(nic_name); return -1; } @@ -2434,7 +2449,7 @@ int qemudBuildCommandLine(virConnectPtr conn, hostdev->source.subsys.u.pci.function); if (ret < 0) { pcidev = NULL; - goto error; + goto no_memory; } ADD_ARG_LIT("-pcidevice"); ADD_ARG_LIT(pcidev); @@ -2589,6 +2604,7 @@ no_memory: for (i = 0 ; i < argcount ; i++) VIR_FREE(arglist[i]); VIR_FREE(arglist); + virReportOOMError(NULL); return -1; } @@ -3177,12 +3193,19 @@ qemuParseCommandLineChr(virConnectPtr conn, def->data.udp.connectHost = strndup(val, svc1-val); else def->data.udp.connectHost = strdup(val); + + if (!def->data.udp.connectHost) + goto no_memory; + if (svc1) { svc1++; if (host2) def->data.udp.connectService = strndup(svc1, host2-svc1); else def->data.udp.connectService = strdup(svc1); + + if (!def->data.udp.connectService) + goto no_memory; } if (host2) { @@ -3191,10 +3214,15 @@ qemuParseCommandLineChr(virConnectPtr conn, def->data.udp.bindHost = strndup(host2, svc2-host2); else def->data.udp.bindHost = strdup(host2); + + if (!def->data.udp.bindHost) + goto no_memory; } if (svc2) { svc2++; def->data.udp.bindService = strdup(svc2); + if (!def->data.udp.bindService) + goto no_memory; } } else if (STRPREFIX(val, "tcp:") || STRPREFIX(val, "telnet:")) { @@ -3217,12 +3245,16 @@ qemuParseCommandLineChr(virConnectPtr conn, def->data.tcp.listen = 1; def->data.tcp.host = strndup(val, svc-val); + if (!def->data.tcp.host) + goto no_memory; svc++; if (opt) { def->data.tcp.service = strndup(svc, opt-svc); } else { def->data.tcp.service = strdup(svc); } + if (!def->data.tcp.service) + goto no_memory; } else if (STRPREFIX(val, "unix:")) { const char *opt; val += strlen("unix:"); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5463951..f022f89 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -364,17 +364,13 @@ qemudSecurityCapsInit(virSecurityDriverPtr secdrv, caps->host.secModel.model = strdup(model); if (!caps->host.secModel.model) { - char ebuf[1024]; - VIR_ERROR(_("Failed to copy secModel model: %s"), - virStrerror(errno, ebuf, sizeof ebuf)); + virReportOOMError(NULL); return -1; } caps->host.secModel.doi = strdup(doi); if (!caps->host.secModel.doi) { - char ebuf[1024]; - VIR_ERROR(_("Failed to copy secModel DOI: %s"), - virStrerror(errno, ebuf, sizeof ebuf)); + virReportOOMError(NULL); return -1; } @@ -5851,8 +5847,10 @@ static struct qemuStreamMigFile *qemuStreamMigOpen(virStreamPtr st, int timeout = 3; int ret; - if (VIR_ALLOC(qemust) < 0) + if (VIR_ALLOC(qemust) < 0) { + virReportOOMError(st->conn); return NULL; + } qemust->fd = socket(AF_UNIX, SOCK_STREAM, 0); if (qemust->fd < 0) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 66526dc..35cd330 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -201,8 +201,10 @@ qemuMonitorSend(const virDomainObjPtr vm, size_t len; int ret = -1; - if (virAsprintf(&full, "%s\r", cmd) < 0) + if (virAsprintf(&full, "%s\r", cmd) < 0) { + virReportOOMError(NULL); return -1; + } len = strlen(full); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ee7a046..c866111 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -870,12 +870,12 @@ doRemoteOpen (virConnectPtr conn, } if(VIR_ALLOC(priv->callbackList)<0) { - error(conn, VIR_ERR_INVALID_ARG, _("Error allocating callbacks list")); + virReportOOMError(conn); goto failed; } if(VIR_ALLOC(priv->domainEvents)<0) { - error(conn, VIR_ERR_INVALID_ARG, _("Error allocating domainEvents")); + virReportOOMError(conn); goto failed; } @@ -2751,9 +2751,18 @@ remoteListDefinedDomains (virConnectPtr conn, char **const names, int maxnames) * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -3086,7 +3095,7 @@ remoteDomainSetSchedulerParameters (virDomainPtr domain, /* Serialise the scheduler parameters. */ args.params.params_len = nparams; if (VIR_ALLOC_N(args.params.params_val, nparams) < 0) { - error (domain->conn, VIR_ERR_RPC, _("out of memory allocating array")); + virReportOOMError(domain->conn); goto done; } @@ -3432,9 +3441,18 @@ remoteListNetworks (virConnectPtr conn, char **const names, int maxnames) * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -3505,9 +3523,18 @@ remoteListDefinedNetworks (virConnectPtr conn, * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -3921,9 +3948,18 @@ remoteListInterfaces (virConnectPtr conn, char **const names, int maxnames) * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -3993,9 +4029,18 @@ remoteListDefinedInterfaces (virConnectPtr conn, char **const names, int maxname * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -4314,9 +4359,18 @@ remoteListStoragePools (virConnectPtr conn, char **const names, int maxnames) * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -4383,9 +4437,18 @@ remoteListDefinedStoragePools (virConnectPtr conn, * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -4890,9 +4953,18 @@ remoteStoragePoolListVolumes (virStoragePoolPtr pool, char **const names, int ma * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(pool->conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -5290,9 +5362,18 @@ static int remoteNodeListDevices(virConnectPtr conn, * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -5443,9 +5524,18 @@ static int remoteNodeDeviceListCaps(virNodeDevicePtr dev, * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.names.names_len; ++i) + for (i = 0; i < ret.names.names_len; ++i) { names[i] = strdup (ret.names.names_val[i]); + if (names[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(names[i]); + + virReportOOMError(dev->conn); + goto cleanup; + } + } + rv = ret.names.names_len; cleanup: @@ -6496,9 +6586,18 @@ remoteSecretListSecrets (virConnectPtr conn, char **uuids, int maxuuids) * names and the list of pointers, so we have to strdup the * names here. */ - for (i = 0; i < ret.uuids.uuids_len; ++i) + for (i = 0; i < ret.uuids.uuids_len; ++i) { uuids[i] = strdup (ret.uuids.uuids_val[i]); + if (uuids[i] == NULL) { + for (--i; i >= 0; --i) + VIR_FREE(uuids[i]); + + virReportOOMError(conn); + goto cleanup; + } + } + rv = ret.uuids.uuids_len; cleanup: @@ -6707,8 +6806,10 @@ remoteStreamOpen(virStreamPtr st, struct private_data *priv = st->conn->privateData; struct private_stream_data *stpriv; - if (VIR_ALLOC(stpriv) < 0) + if (VIR_ALLOC(stpriv) < 0) { + virReportOOMError(st->conn); return NULL; + } /* Initialize call object used to receive replies */ stpriv->proc_nr = proc_nr; @@ -7106,8 +7207,10 @@ prepareCall(virConnectPtr conn, struct remote_message_header hdr; struct remote_thread_call *rv; - if (VIR_ALLOC(rv) < 0) + if (VIR_ALLOC(rv) < 0) { + virReportOOMError(conn); return NULL; + } if (virCondInit(&rv->cond) < 0) { VIR_FREE(rv); diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 1d5b4f7..1eef468 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -449,8 +449,10 @@ secretLoad(virConnectPtr conn, virSecretDriverStatePtr driver, if (secretLoadValidateUUID(conn, def, xml_basename) < 0) goto cleanup; - if (VIR_ALLOC(secret) < 0) + if (VIR_ALLOC(secret) < 0) { + virReportOOMError(conn); goto cleanup; + } secret->def = def; def = NULL; @@ -578,8 +580,10 @@ secretListSecrets(virConnectPtr conn, char **uuids, int maxuuids) char *uuidstr; if (i == maxuuids) break; - if (VIR_ALLOC_N(uuidstr, VIR_UUID_STRING_BUFLEN) < 0) + if (VIR_ALLOC_N(uuidstr, VIR_UUID_STRING_BUFLEN) < 0) { + virReportOOMError(conn); goto cleanup; + } virUUIDFormat(secret->def->uuid, uuidstr); uuids[i] = uuidstr; i++; diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 6db51cd..6c2dce5 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -56,13 +56,16 @@ profile_status(const char *str, const int check_enforcing) int rc = -1; /* create string that is '<str> \0' for accurate matching */ - if (virAsprintf(&tmp, "%s ", str) == -1) + if (virAsprintf(&tmp, "%s ", str) == -1) { + virReportOOMError(NULL); return rc; + } if (check_enforcing != 0) { /* create string that is '<str> (enforce)\0' for accurate matching */ if (virAsprintf(&etmp, "%s (enforce)", str) == -1) { VIR_FREE(tmp); + virReportOOMError(NULL); return rc; } } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index c70b1ed..4b181d7 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -326,6 +326,14 @@ getNewStyleBlockDevice(virConnectPtr conn, } *block_device = strdup(block_dirent->d_name); + + if (*block_device == NULL) { + virReportOOMError(conn); + closedir(block_dir); + retval = -1; + goto out; + } + VIR_DEBUG(_("Block device is '%s'"), *block_device); break; @@ -360,9 +368,16 @@ getOldStyleBlockDevice(virConnectPtr conn, blockp++; *block_device = strdup(blockp); + if (*block_device == NULL) { + virReportOOMError(conn); + retval = -1; + goto out; + } + VIR_DEBUG(_("Block device is '%s'"), *block_device); } +out: return retval; } diff --git a/src/util/conf.c b/src/util/conf.c index 2aa4a55..8126f69 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -388,6 +388,10 @@ virConfParseString(virConfParserCtxtPtr ctxt) return(NULL); } ret = strndup(base, ctxt->cur - base); + if (ret == NULL) { + virReportOOMError(NULL); + return NULL; + } NEXT; } else if ((ctxt->cur + 6 < ctxt->end) && (ctxt->cur[0] == '"') && (ctxt->cur[1] == '"') && (ctxt->cur[2] == '"')) { @@ -404,6 +408,10 @@ virConfParseString(virConfParserCtxtPtr ctxt) return(NULL); } ret = strndup(base, ctxt->cur - base); + if (ret == NULL) { + virReportOOMError(NULL); + return NULL; + } ctxt->cur += 3; } else if (CUR == '"') { NEXT; @@ -415,6 +423,10 @@ virConfParseString(virConfParserCtxtPtr ctxt) return(NULL); } ret = strndup(base, ctxt->cur - base); + if (ret == NULL) { + virReportOOMError(NULL); + return NULL; + } NEXT; } return(ret); @@ -857,11 +869,13 @@ virConfSetValue (virConfPtr conf, if (!cur) { if (VIR_ALLOC(cur) < 0) { + virReportOOMError(NULL); virConfFreeValue(value); return (-1); } cur->comment = NULL; if (!(cur->name = strdup(setting))) { + virReportOOMError(NULL); virConfFreeValue(value); VIR_FREE(cur); return (-1); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d29e424..0957809 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1333,13 +1333,18 @@ cleanup: return ret; } -static char *vboxDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { +static char *vboxDomainGetOSType(virDomainPtr dom) { /* Returning "hvm" always as suggested on list, cause * this functions seems to be badly named and it * is supposed to pass the ABI name and not the domain * operating system driver as I had imagined ;) */ - return strdup("hvm"); + char *osType = strdup("hvm"); + + if (osType == NULL) + virReportOOMError(dom->conn); + + return osType; } static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) { @@ -1881,7 +1886,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) { if (valueDisplayUtf8) sdlDisplay = strdup(valueDisplayUtf8); if (sdlDisplay == NULL) { - vboxError(dom->conn, VIR_ERR_SYSTEM_ERROR, "%s", "strdup failed"); + virReportOOMError(dom->conn); /* just don't go to cleanup yet as it is ok to have * sdlDisplay as NULL and we check it below if it * exist and then only use it there @@ -1895,7 +1900,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) { if (valueDisplayUtf8) guiDisplay = strdup(valueDisplayUtf8); if (guiDisplay == NULL) { - vboxError(dom->conn, VIR_ERR_SYSTEM_ERROR, "%s", "strdup failed"); + virReportOOMError(dom->conn); /* just don't go to cleanup yet as it is ok to have * guiDisplay as NULL and we check it below if it * exist and then only use it there @@ -1932,7 +1937,7 @@ static char *vboxDomainDumpXML(virDomainPtr dom, int flags) { def->graphics[def->ngraphics]->type = VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP; def->graphics[def->ngraphics]->data.desktop.display = strdup(getenv("DISPLAY")); if (def->graphics[def->ngraphics]->data.desktop.display == NULL) { - vboxError(dom->conn, VIR_ERR_SYSTEM_ERROR, "%s", "strdup failed"); + virReportOOMError(dom->conn); /* just don't go to cleanup yet as it is ok to have * display as NULL */ @@ -3983,6 +3988,11 @@ static int vboxDomainAttachDevice(virDomainPtr dom, const char *xml) { def->os.type = strdup("hvm"); + if (def->os.type == NULL) { + virReportOOMError(dom->conn); + goto cleanup; + } + dev = virDomainDeviceDefParse(dom->conn, data->caps, def, xml, VIR_DOMAIN_XML_INACTIVE); if (dev == NULL) { @@ -4176,6 +4186,11 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) { def->os.type = strdup("hvm"); + if (def->os.type == NULL) { + virReportOOMError(dom->conn); + goto cleanup; + } + dev = virDomainDeviceDefParse(dom->conn, data->caps, def, xml, VIR_DOMAIN_XML_INACTIVE); if (dev == NULL) { diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 479db10..a83b764 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -138,14 +138,20 @@ xenDomainUsedCpus(virDomainPtr dom) if (xenUnifiedNodeGetInfo(dom->conn, &nodeinfo) < 0) return(NULL); - if (VIR_ALLOC_N(cpulist, priv->nbNodeCpus) < 0) + if (VIR_ALLOC_N(cpulist, priv->nbNodeCpus) < 0) { + virReportOOMError(dom->conn); goto done; - if (VIR_ALLOC_N(cpuinfo, nb_vcpu) < 0) + } + if (VIR_ALLOC_N(cpuinfo, nb_vcpu) < 0) { + virReportOOMError(dom->conn); goto done; + } cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); if (xalloc_oversized(nb_vcpu, cpumaplen) || - VIR_ALLOC_N(cpumap, nb_vcpu * cpumaplen) < 0) + VIR_ALLOC_N(cpumap, nb_vcpu * cpumaplen) < 0) { + virReportOOMError(dom->conn); goto done; + } if ((ncpus = xenUnifiedDomainGetVcpus(dom, cpuinfo, nb_vcpu, cpumap, cpumaplen)) >= 0) { diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index e107d1e..f25629a 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -1114,11 +1114,15 @@ xenHypervisorGetSchedulerType(virDomainPtr domain, int *nparams) switch (op.u.getschedulerid.sched_id){ case XEN_SCHEDULER_SEDF: schedulertype = strdup("sedf"); + if (schedulertype == NULL) + virReportOOMError(domain->conn); if (nparams) *nparams = 6; break; case XEN_SCHEDULER_CREDIT: schedulertype = strdup("credit"); + if (schedulertype == NULL) + virReportOOMError(domain->conn); if (nparams) *nparams = 2; break; @@ -2755,6 +2759,7 @@ xenHypervisorDomainGetOSType (virDomainPtr dom) { xenUnifiedPrivatePtr priv; xen_getdomaininfo dominfo; + char *ostype = NULL; priv = (xenUnifiedPrivatePtr) dom->conn->privateData; if (priv->handle < 0) @@ -2774,8 +2779,14 @@ xenHypervisorDomainGetOSType (virDomainPtr dom) return (NULL); if (XEN_GETDOMAININFO_FLAGS(dominfo) & DOMFLAGS_HVM) - return strdup("hvm"); - return strdup("linux"); + ostype = strdup("hvm"); + else + ostype = strdup("linux"); + + if (ostype == NULL) + virReportOOMError(dom->conn); + + return ostype; } virDomainPtr diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index aa3893a..a41711d 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -107,6 +107,7 @@ xenInotifyXenCacheLookup(virConnectPtr conn, if (!*name) { DEBUG0("Error getting dom from def"); + virReportOOMError(conn); return -1; } return 0; @@ -145,8 +146,7 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, if (!memcmp(rawuuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN)) { *name = strdup(priv->configInfoList->doms[i]->name); if (!*name) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, - _("finding dom for %s"), uuid_str); + virReportOOMError(conn); return -1; } memcpy(uuid, priv->configInfoList->doms[i]->uuid, VIR_UUID_BUFLEN); @@ -159,8 +159,10 @@ xenInotifyXendDomainsDirLookup(virConnectPtr conn, const char *filename, return -1; } - if (!(*name = strdup(dom->name))) + if (!(*name = strdup(dom->name))) { + virReportOOMError(conn); return -1; + } memcpy(uuid, dom->uuid, VIR_UUID_BUFLEN); virDomainFree(dom); /* succeeded too find domain by uuid */ @@ -380,7 +382,7 @@ cleanup: * Returns 0 or -1 in case of error. */ virDrvOpenStatus -xenInotifyOpen(virConnectPtr conn ATTRIBUTE_UNUSED, +xenInotifyOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { @@ -397,8 +399,7 @@ xenInotifyOpen(virConnectPtr conn ATTRIBUTE_UNUSED, priv->useXenConfigCache = 0; if (VIR_ALLOC(priv->configInfoList) < 0) { - virXenInotifyError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to allocate configInfoList")); + virReportOOMError(conn); return -1; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index f86e022..3c660be 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -1055,8 +1055,13 @@ xenDaemonDomainLookupByID(virConnectPtr xend, "%s", _("domain information incomplete, missing name")); goto error; } - if (domname) + if (domname) { *domname = strdup(name); + if (*domname == NULL) { + virReportOOMError(xend); + goto error; + } + } if (sexpr_uuid(uuid, root, "domain/uuid") < 0) { virXendError(xend, VIR_ERR_INTERNAL_ERROR, @@ -2946,8 +2951,10 @@ xenDaemonOpen(virConnectPtr conn, goto failed; } else if (STRCASEEQ (conn->uri->scheme, "http")) { if (conn->uri->port && - virAsprintf(&port, "%d", conn->uri->port) == -1) + virAsprintf(&port, "%d", conn->uri->port) == -1) { + virReportOOMError(conn); goto failed; + } if (xenDaemonOpen_tcp(conn, conn->uri->server ? conn->uri->server : "localhost", @@ -3164,6 +3171,9 @@ xenDaemonDomainGetOSType(virDomainPtr domain) type = strdup("linux"); } + if (type == NULL) + virReportOOMError(domain->conn); + sexpr_free(root); return(type); @@ -3959,6 +3969,10 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) if (id >= 0) { if (!memcmp(uuid, ident, VIR_UUID_BUFLEN)) { name = strdup(*tmp); + + if (name == NULL) + virReportOOMError(conn); + break; } } @@ -3979,7 +3993,14 @@ xenDaemonLookupByUUID(virConnectPtr conn, const unsigned char *uuid) id = sexpr_int(root, "domain/domid"); else id = -1; - name = domname ? strdup(domname) : NULL; + + if (domname) { + name = strdup(domname); + + if (name == NULL) + virReportOOMError(conn); + } + sexpr_free(root); } @@ -4308,8 +4329,7 @@ xenDaemonDomainSetAutostart(virDomainPtr domain, autonode->u.s.car->u.value = (autostart ? strdup("start") : strdup("ignore")); if (!(autonode->u.s.car->u.value)) { - virXendError(domain->conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("no memory")); + virReportOOMError(domain->conn); goto error; } @@ -4628,7 +4648,7 @@ error: static int xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { struct sexpr *root = NULL; - int ret = -1; + int i, ret = -1; struct sexpr *_for_i, *node; xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; @@ -4651,12 +4671,19 @@ xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxnames if (node->kind != SEXPR_VALUE) continue; - names[ret++] = strdup(node->u.value); + if ((names[ret++] = strdup(node->u.value)) == NULL) { + virReportOOMError(conn); + goto error; + } + if (ret >= maxnames) break; } error: + for (i = 0; i < ret; ++i) + VIR_FREE(names[i]); + sexpr_free(root); return(ret); } @@ -4708,14 +4735,14 @@ xenDaemonGetSchedulerType(virDomainPtr domain, int *nparams) if (STREQ (ret, "credit")) { schedulertype = strdup("credit"); if (schedulertype == NULL){ - virXendError(domain->conn, VIR_ERR_SYSTEM_ERROR, "%s", _("strdup failed")); + virReportOOMError(domain->conn); goto error; } *nparams = XEN_SCHED_CRED_NPARAM; } else if (STREQ (ret, "sedf")) { schedulertype = strdup("sedf"); if (schedulertype == NULL){ - virXendError(domain->conn, VIR_ERR_SYSTEM_ERROR, "%s", _("strdup failed")); + virReportOOMError(domain->conn); goto error; } *nparams = XEN_SCHED_SEDF_NPARAM; diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 5e8931e..5878ba1 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -689,8 +689,10 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { int i; const char *defaultArch, *defaultMachine; - if (VIR_ALLOC(def) < 0) + if (VIR_ALLOC(def) < 0) { + virReportOOMError(conn); return NULL; + } def->virtType = VIR_DOMAIN_VIRT_XEN; def->id = -1; @@ -1100,7 +1102,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { } if (VIR_ALLOC(net) < 0) - goto cleanup; + goto no_memory; if (mac[0]) { unsigned int rawmac[6]; @@ -1234,7 +1236,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { goto skippci; if (VIR_ALLOC(hostdev) < 0) - goto cleanup; + goto no_memory; hostdev->managed = 0; hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; @@ -1922,8 +1924,10 @@ static int xenXMConfigSetInt(virConfPtr conf, const char *setting, long l) { virConfValuePtr value = NULL; - if (VIR_ALLOC(value) < 0) + if (VIR_ALLOC(value) < 0) { + virReportOOMError(NULL); return -1; + } value->type = VIR_CONF_LONG; value->next = NULL; @@ -1937,13 +1941,16 @@ static int xenXMConfigSetString(virConfPtr conf, const char *setting, const char *str) { virConfValuePtr value = NULL; - if (VIR_ALLOC(value) < 0) + if (VIR_ALLOC(value) < 0) { + virReportOOMError(NULL); return -1; + } value->type = VIR_CONF_STRING; value->next = NULL; if (!(value->str = strdup(str))) { VIR_FREE(value); + virReportOOMError(NULL); return -1; } @@ -2133,8 +2140,10 @@ xenXMDomainConfigFormatPCI(virConnectPtr conn, if (!hasPCI) return 0; - if (VIR_ALLOC(pciVal) < 0) + if (VIR_ALLOC(pciVal) < 0) { + virReportOOMError(conn); return -1; + } pciVal->type = VIR_CONF_LIST; pciVal->list = NULL; @@ -2149,8 +2158,10 @@ xenXMDomainConfigFormatPCI(virConnectPtr conn, def->hostdevs[i]->source.subsys.u.pci.domain, def->hostdevs[i]->source.subsys.u.pci.bus, def->hostdevs[i]->source.subsys.u.pci.slot, - def->hostdevs[i]->source.subsys.u.pci.function) < 0) + def->hostdevs[i]->source.subsys.u.pci.function) < 0) { + virReportOOMError(conn); goto error; + } if (VIR_ALLOC(val) < 0) { VIR_FREE(buf); @@ -2748,6 +2759,7 @@ cleanup: struct xenXMListIteratorContext { virConnectPtr conn; + int oom; int max; int count; char ** names; @@ -2757,13 +2769,18 @@ static void xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const char *name, struct xenXMListIteratorContext *ctx = data; virDomainPtr dom = NULL; + if (ctx->oom) + return; + if (ctx->count == ctx->max) return; dom = xenDaemonLookupByName(ctx->conn, name); if (!dom) { - ctx->names[ctx->count] = strdup(name); - ctx->count++; + if (!(ctx->names[ctx->count] = strdup(name))) + ctx->oom = 1; + else + ctx->count++; } else { virDomainFree(dom); } @@ -2777,7 +2794,7 @@ static void xenXMListIterator(void *payload ATTRIBUTE_UNUSED, const char *name, int xenXMListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) { xenUnifiedPrivatePtr priv; struct xenXMListIteratorContext ctx; - int ret = -1; + int i, ret = -1; if (!VIR_IS_CONNECT(conn)) { xenXMError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); @@ -2794,11 +2811,21 @@ int xenXMListDefinedDomains(virConnectPtr conn, char **const names, int maxnames maxnames = virHashSize(priv->configCache); ctx.conn = conn; + ctx.oom = 0; ctx.count = 0; ctx.max = maxnames; ctx.names = names; virHashForEach(priv->nameConfigMap, xenXMListIterator, &ctx); + + if (ctx.oom) { + for (i = 0; i < ctx.count; i++) + VIR_FREE(ctx.names[i]); + + virReportOOMError(conn); + goto cleanup; + } + ret = ctx.count; cleanup: diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 0fabcf8..f8ef00b 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -305,17 +305,15 @@ xenStoreOpen(virConnectPtr conn, #ifndef PROXY /* Init activeDomainList */ if (VIR_ALLOC(priv->activeDomainList) < 0) { - virXenStoreError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to allocate activeDomainList")); + virReportOOMError(conn); return -1; } /* Init watch list before filling in domInfoList, so we can know if it is the first time through when the callback fires */ - if ( VIR_ALLOC(priv->xsWatchList) < 0 ) { - virXenStoreError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("failed to allocate xsWatchList")); + if (VIR_ALLOC(priv->xsWatchList) < 0) { + virReportOOMError(conn); return -1; } @@ -892,7 +890,8 @@ xenStoreDomainGetOSTypeID(virConnectPtr conn, int id) { } if (str == NULL) str = strdup("linux"); - + if (str == NULL) + virReportOOMError(conn); return (str); } @@ -944,6 +943,10 @@ xenStoreDomainGetNetworkID(virConnectPtr conn, int id, const char *mac) { if (match) { ret = strdup(list[i]); + + if (ret == NULL) + virReportOOMError(conn); + break; } } @@ -995,15 +998,19 @@ xenStoreDomainGetDiskID(virConnectPtr conn, int id, const char *dev) { if (val == NULL) break; if ((devlen != len) || memcmp(val, dev, len)) { - free (val); + VIR_FREE (val); } else { ret = strdup(list[i]); - free (val); - free (list); + + if (ret == NULL) + virReportOOMError(conn); + + VIR_FREE (val); + VIR_FREE (list); return (ret); } } - free (list); + VIR_FREE (list); } snprintf(dir, sizeof(dir), "/local/domain/0/backend/tap/%d", id); list = xs_directory(priv->xshandle, 0, dir, &num); @@ -1014,15 +1021,19 @@ xenStoreDomainGetDiskID(virConnectPtr conn, int id, const char *dev) { if (val == NULL) break; if ((devlen != len) || memcmp(val, dev, len)) { - free (val); + VIR_FREE (val); } else { ret = strdup(list[i]); - free (val); - free (list); + + if (ret == NULL) + virReportOOMError(conn); + + VIR_FREE (val); + VIR_FREE (list); return (ret); } } - free (list); + VIR_FREE (list); } return (NULL); } @@ -1100,7 +1111,7 @@ int xenStoreAddWatch(virConnectPtr conn, xenStoreWatchCallback cb, void *opaque) { - xenStoreWatchPtr watch; + xenStoreWatchPtr watch = NULL; int n; xenStoreWatchListPtr list; xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData; @@ -1123,25 +1134,38 @@ int xenStoreAddWatch(virConnectPtr conn, } if (VIR_ALLOC(watch) < 0) - return -1; + goto no_memory; + watch->path = strdup(path); watch->token = strdup(token); watch->cb = cb; watch->opaque = opaque; + if (watch->path == NULL || watch->token == NULL) { + goto no_memory; + } + /* Make space on list */ n = list->count; if (VIR_REALLOC_N(list->watches, n + 1) < 0) { - virXenStoreError(NULL, VIR_ERR_INTERNAL_ERROR, - "%s", _("reallocating list")); - VIR_FREE(watch); - return -1; + goto no_memory; } list->watches[n] = watch; list->count++; return xs_watch(priv->xshandle, watch->path, watch->token); + + no_memory: + if (watch) { + VIR_FREE(watch->path); + VIR_FREE(watch->token); + VIR_FREE(watch); + } + + virReportOOMError(conn); + + return -1; } /* -- 1.6.0.4

2 3

[libvirt] [PATCH 0/2] Break out virDomainObjIsDuplicate function
by Cole Robinson 09 Nov '09

09 Nov '09

Code to check for a VM duplicate in create/define/restore is present in various forms throughout several drivers. Break this code out into its own function (virDomainObjIsDuplicate) and use where applicable. Cole Robinson (2): qemu: Break out function to check if we can create/define/restore qemu: Use same create/define overwrite logic for migration prepare. src/conf/domain_conf.c | 64 ++++++++++++++++++++++ src/conf/domain_conf.h | 4 ++ src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 68 ++--------------------- src/qemu/qemu_driver.c | 132 ++++----------------------------------------- src/test/test_driver.c | 14 +++++- src/uml/uml_driver.c | 20 ++------ 7 files changed, 104 insertions(+), 199 deletions(-)

3 6

[libvirt] Status and freeze for 0.7.3
by Daniel Veillard 09 Nov '09

09 Nov '09

I think we still have some pending feature patches needed for commit before entering the 0.7.3 freeze, for example the 15 patches from Dan Berrange, I was also wondering about the udev, patch though Cole last review might indicate it's better postponing a bit. Jiri CPU flags patches may actually wait a bit, since without the associated qemu driver code they don't introduce any functional change and that will provide more time to make sure the description fits everybody's needs. I still need to review Cole patches to disable temporarily error propagation, and if I missed some features patches for review or commit please tell me because we should try to enter the freeze sometime this week. Of course the various cleanup patches like Matthias ones, or the one needed from Eduardo can and should be commited during the freeze, I have myself a number of fixes pending due to an external code review that I will have to look at this week. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] opennebula: Fix potential memory/mutex leak in state driver startup
by Matthias Bolte 08 Nov '09

08 Nov '09

In case of an error the domains hash and the driver mutex may leak. * src/opennebula/one_driver.c: free/destroy domains hash and driver mutex in error cases --- src/opennebula/one_driver.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 19a335c..f461ff6 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -617,23 +617,26 @@ static int oneStartup(int privileged ATTRIBUTE_UNUSED){ return -1; } + c_oneStart(); + oneDriverLock(one_driver); + if (virDomainObjListInit(&one_driver->domains) < 0) { - virMutexDestroy(&one_driver->lock); - VIR_FREE(one_driver); - return -1; + goto error; } - c_oneStart(); - oneDriverLock(one_driver); one_driver->nextid=1; if ((one_driver->caps = oneCapsInit()) == NULL) { - oneDriverUnlock(one_driver); - VIR_FREE(one_driver); - return -1; + virReportOOMError(NULL); + goto error; } oneDriverUnlock(one_driver); return 0; + +error: + oneDriverUnlock(one_driver); + oneShutdown(); + return -1; } static int oneShutdown(void){ -- 1.6.0.4

2 1

[libvirt] [PATCH] Add a Python example that lists active ESX domains
by Matthias Bolte 08 Nov '09

08 Nov '09

It also demonstrates how to use the libvirt.openAuth() method. * examples/python/Makefile.am: add esxlist.py to EXTRA_DIST * examples/python/README: add some notes about esxlist.py * examples/python/esxlist.py: the new example --- examples/python/Makefile.am | 2 +- examples/python/README | 19 +++++ examples/python/esxlist.py | 155 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 175 insertions(+), 1 deletions(-) create mode 100755 examples/python/esxlist.py diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am index 0742226..dcd2c24 100644 --- a/examples/python/Makefile.am +++ b/examples/python/Makefile.am @@ -1,3 +1,3 @@ EXTRA_DIST= \ README \ - dominfo.py domrestore.py domsave.py domstart.py + dominfo.py domrestore.py domsave.py domstart.py esxlist.py diff --git a/examples/python/README b/examples/python/README index 02c5bfb..f4db76c 100644 --- a/examples/python/README +++ b/examples/python/README @@ -8,7 +8,26 @@ domstart.py - create a domU from an XML description if the domU isn't running yet domsave.py - save all running domU's into a directory domrestore.py - restore domU's from their saved files in a directory +esxlist.py - list active domains of an VMware ESX host and print some info. + also demonstrates how to use the libvirt.openAuth() method The XML files in this directory are examples of the XML format that libvirt expects, and will have to be adapted for your setup. They are only needed for domstart.py + + +Some additional notes for the esxlist.py example: + +You may see remote errors complaining about missing certificates: + + Cannot access CA certificate '/usr/local/etc/pki/CA/cacert.pem': No such file + or directory + +This is expected, libvirt tries to find network and storage drivers for ESX, +but those are not implemented yet (November 2009). While searching for this +drivers, libvirt may try to start a local libvirtd instance, but fails because +of the missing certificates. It'll warn about that: + + Failed to find the network: Is the daemon running? + +This is also expected and can be ignored. diff --git a/examples/python/esxlist.py b/examples/python/esxlist.py new file mode 100755 index 0000000..a0602e8 --- /dev/null +++ b/examples/python/esxlist.py @@ -0,0 +1,155 @@ +#! /usr/bin/python +# esxlist - list active domains of an ESX host and print some info. +# also demonstrates how to use the libvirt.openAuth() method + +import libvirt +import sys +import os +import libxml2 +import getpass + + +def usage(): + print "Usage: %s HOSTNAME" % sys.argv[0] + print " List active domains of HOSTNAME and print some info" + + +# This is the callback method passed to libvirt.openAuth() (see below). +# +# The credentials argument is a list of credentials that libvirt (actually +# the ESX driver) would like to request. An element of this list is itself a +# list containing 5 items (4 inputs, 1 output): +# - the credential type, e.g. libvirt.VIR_CRED_AUTHNAME +# - a prompt to be displayed to the user +# - a challenge, the ESX driver sets this to the hostname to allow automatic +# distinction between requests for ESX and vCenter credentials +# - a default result for the request +# - a place to store the actual result for the request +# +# The user_data argument is the user data item of the auth argument (see below) +# passed to libvirt.openAuth(). +def request_credentials(credentials, user_data): + for credential in credentials: + if credential[0] == libvirt.VIR_CRED_AUTHNAME: + # prompt the user to input a authname. display the provided message + credential[4] = raw_input(credential[1] + ": ") + + # if the user just hits enter raw_input() returns an empty string. + # in this case return the default result through the last item of + # the list + if len(credential[4]) == 0: + credential[4] = credential[3] + elif credential[0] == libvirt.VIR_CRED_NOECHOPROMPT: + # use the getpass module to prompt the user to input a password. + # display the provided message and return the result through the + # last item of the list + credential[4] = getpass.getpass(credential[1] + ": ") + else: + return -1 + + return 0 + + +def print_section(title): + print "\n%s" % title + print "=" * 60 + + +def print_entry(key, value): + print "%-10s %-10s" % (key, value) + + +def print_xml(key, ctx, path): + res = ctx.xpathEval(path) + + if res is None or len(res) == 0: + value = "Unknown" + else: + value = res[0].content + + print_entry(key, value) + + return value + + +if len(sys.argv) != 2: + usage() + sys.exit(2) + + +hostname = sys.argv[1] + +# Connect to libvirt +uri = "esx://%s/?no_verify=1" % hostname + +# The auth argument is a list that contains 3 items: +# - a list of supported credential types +# - a callable that takes 2 arguments +# - user data that will be passed to the callable as second argument +# +# In this example the supported credential types are VIR_CRED_AUTHNAME and +# VIR_CRED_NOECHOPROMPT, the callable is the unbound method request_credentials +# (see above) and the user data is None. +# +# libvirt (actually the ESX driver) will call the callable to request +# credentials in order to log into the ESX host. The callable would also be +# called if the connection URI would reference a vCenter to request credentials +# in order to log into the vCenter +auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_NOECHOPROMPT], + request_credentials, None] +conn = libvirt.openAuth(uri, auth, 0) + +if conn is None: + print "Failed to open connection to %s" % hostname + sys.exit(1) + +state_names = { libvirt.VIR_DOMAIN_RUNNING : "running", + libvirt.VIR_DOMAIN_BLOCKED : "idle", + libvirt.VIR_DOMAIN_PAUSED : "paused", + libvirt.VIR_DOMAIN_SHUTDOWN : "in shutdown", + libvirt.VIR_DOMAIN_SHUTOFF : "shut off", + libvirt.VIR_DOMAIN_CRASHED : "crashed", + libvirt.VIR_DOMAIN_NOSTATE : "no state" } + +for id in conn.listDomainsID(): + domain = conn.lookupByID(id) + info = domain.info() + + print_section("Domain " + domain.name()) + print_entry("ID:", id) + print_entry("UUID:", domain.UUIDString()) + print_entry("State:", state_names[info[0]]) + print_entry("MaxMem:", info[1]) + print_entry("UsedMem:", info[2]) + print_entry("VCPUs:", info[3]) + + # Read some info from the XML desc + print_section("Devices of " + domain.name()) + + xmldesc = domain.XMLDesc(0) + doc = libxml2.parseDoc(xmldesc) + ctx = doc.xpathNewContext() + devs = ctx.xpathEval("/domain/devices/*") + first = True + + for d in devs: + ctx.setContextNode(d) + + if not first: + print "------------------------------------------------------------" + else: + first = False + + print_entry("Device", d.name) + + type = print_xml("Type:", ctx, "@type") + + if type == "file": + print_xml("Source:", ctx, "source/@file") + print_xml("Target:", ctx, "target/@dev") + elif type == "block": + print_xml("Source:", ctx, "source/@dev") + print_xml("Target:", ctx, "target/@dev") + elif type == "bridge": + print_xml("Source:", ctx, "source/@bridge") + print_xml("MAC Addr:", ctx, "mac/@address") -- 1.6.0.4

2 1

[libvirt] [PATCH v2 0/2] CPU flags capabilities and domain configuration
by Jiri Denemark 08 Nov '09

08 Nov '09

Hi, These are two initial patches for CPU flags/masks support for libvirt. The first patch contains changes to schemas and describes semantics of new elements and attributes. The second patch introduces internal API functions for XML parsing and formating. Version 2 changes: - feature names moved to a 'name' attribute of 'feature' element - 'cpu' element in guest capabilities renamed as 'cpuselection' - topology attributes restricted to positiveInteger - move 'cpu' element above 'os' element in domain configuration schema - feature names restricted to [a-zA-Z0-9\-_]+ - feature names are not internally converted to lower case Jiri Denemark (2): XML schema for CPU flags XML parsing/formating code for CPU flags docs/schemas/capability.rng | 46 ++++++- docs/schemas/domain.rng | 62 ++++++++ include/libvirt/virterror.h | 1 + src/Makefile.am | 9 +- src/conf/capabilities.c | 31 ++++- src/conf/capabilities.h | 6 + src/conf/cpu_conf.c | 331 +++++++++++++++++++++++++++++++++++++++++++ src/conf/cpu_conf.h | 110 ++++++++++++++ src/conf/domain_conf.c | 15 ++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 8 + src/util/virterror.c | 3 + 12 files changed, 620 insertions(+), 4 deletions(-) create mode 100644 src/conf/cpu_conf.c create mode 100644 src/conf/cpu_conf.h

2 3

[libvirt] [PATCH 0/9] Several bug fixes for the Power Hypervisor driver
by Matthias Bolte 07 Nov '09

07 Nov '09

After the last large patch has been applied I reviewed the whole driver code and found several bugs and issues. Most important memory leaks and two potential infinite loops. I've no Power Hypervisor at hand, so I can't test this changes with an actual system. Eduardo could you test this patches to make sure they don't break existing functionality? Matthias

3 20

[libvirt] 3 patches to solve bug 524280
by Daniel Veillard 06 Nov '09

06 Nov '09

Basically dnsmasq limits itself by default to 150 leases maximum. Which means we may inflict an arbitrary limit in the number of domains running on a given host https://bugzilla.redhat.com/show_bug.cgi?id=524280 The patches do 3 things: - first introduce IPv4 and IPv6 parsing routines, generally useful this could be used to double check input in other places too - then when a DHCP range is defined use those routines to parse the start and end, do some cheking and keep the range size in the structure - last when exec'ing dnsmasq compute the sum of all dhcp ranges and pass the max lease option Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 16

[libvirt] [PATCH] qemu: Allow cpu pinning for all logical CPUs, not just physical
by Cole Robinson 06 Nov '09

06 Nov '09

This is what virsh already expects when printing output, and what 'man cpuset' claims to support. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1f3a0e4..5463951 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1222,7 +1222,7 @@ qemudInitCpus(virConnectPtr conn, const char *migrateFrom) { #if HAVE_SCHED_GETAFFINITY cpu_set_t mask; - int i, maxcpu = QEMUD_CPUMASK_LEN; + int i, hostcpus, maxcpu = QEMUD_CPUMASK_LEN; virNodeInfo nodeinfo; if (nodeGetInfo(conn, &nodeinfo) < 0) @@ -1230,8 +1230,9 @@ qemudInitCpus(virConnectPtr conn, /* setaffinity fails if you set bits for CPUs which * aren't present, so we have to limit ourselves */ - if (maxcpu > nodeinfo.cpus) - maxcpu = nodeinfo.cpus; + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); + if (maxcpu > hostcpus) + maxcpu = hostcpus; CPU_ZERO(&mask); if (vm->def->cpumask) { @@ -3339,7 +3340,7 @@ qemudDomainPinVcpu(virDomainPtr dom, struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; cpu_set_t mask; - int i, maxcpu; + int i, maxcpu, hostcpus; virNodeInfo nodeinfo; int ret = -1; @@ -3371,13 +3372,14 @@ qemudDomainPinVcpu(virDomainPtr dom, if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); maxcpu = maplen * 8; - if (maxcpu > nodeinfo.cpus) - maxcpu = nodeinfo.cpus; + if (maxcpu > hostcpus) + maxcpu = hostcpus; CPU_ZERO(&mask); for (i = 0 ; i < maxcpu ; i++) { - if ((cpumap[i/8] >> (i % 8)) & 1) + if (VIR_CPU_USABLE(cpumap, maplen, 0, i)) CPU_SET(i, &mask); } @@ -3409,7 +3411,7 @@ qemudDomainGetVcpus(virDomainPtr dom, struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; virNodeInfo nodeinfo; - int i, v, maxcpu; + int i, v, maxcpu, hostcpus; int ret = -1; qemuDriverLock(driver); @@ -3434,9 +3436,10 @@ qemudDomainGetVcpus(virDomainPtr dom, if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); maxcpu = maplen * 8; - if (maxcpu > nodeinfo.cpus) - maxcpu = nodeinfo.cpus; + if (maxcpu > hostcpus) + maxcpu = hostcpus; /* Clamp to actual number of vcpus */ if (maxinfo > vm->nvcpupids) -- 1.6.5.1

2 2

[libvirt] [PATCH] Cleanup whitespace in docs
by Matthew Booth 06 Nov '09

06 Nov '09

This patch is the result of running the following command in the docs direct sed -i 's/\t/ /g; s/\s*$//' *.html.in * docs/api.html.in docs/api_extension.html.in docs/apps.html.in docs/archnetwork.html.in docs/archstorage.html.in docs/bugs.html.in docs/drvlxc.html.in docs/drvone.html.in docs/drvqemu.html.in docs/drvxen.html.in docs/formatdomain.html.in docs/formatnetwork.html.in docs/formatsecret.html.in docs/formatstorage.html.in docs/hacking.html.in docs/hvsupport.html.in docs/index.html.in docs/news.html.in docs/relatedlinks.html.in docs/sitemap.html.in: convert tabs into 8 spaces and remove trailing whitespace docs/api.html.in | 6 +- docs/api_extension.html.in | 14 +- docs/apps.html.in | 92 ++++++------ docs/archnetwork.html.in | 26 ++-- docs/archstorage.html.in | 16 +- docs/bugs.html.in | 34 ++-- docs/drvlxc.html.in | 80 +++++----- docs/drvone.html.in | 14 +- docs/drvqemu.html.in | 28 ++-- docs/drvxen.html.in | 38 +++--- docs/formatdomain.html.in | 376 ++++++++++++++++++++++---------------------- docs/formatnetwork.html.in | 158 +++++++++--------- docs/formatsecret.html.in | 8 +- docs/formatstorage.html.in | 208 ++++++++++++------------ docs/hacking.html.in | 108 +++++++------- docs/hvsupport.html.in | 2 +- docs/index.html.in | 36 ++-- docs/news.html.in | 94 ++++++------ docs/relatedlinks.html.in | 22 ++-- docs/sitemap.html.in | 16 +- 20 files changed, 688 insertions(+), 688 deletions(-) Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team M: +44 (0)7977 267231 GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490

2 1

[libvirt] [PATCH] Use virBuffer when constructing QEMU character device command line
by Matthew Booth 06 Nov '09

06 Nov '09

This patch updates qemudBuildCommandLineChrDevStr to use a virBuffer instead of a char[]. This is slightly tidier, and it makes it cleaner to (ap|pre)pend the output in other command lines. * src/qemu/qemu_conf.c: Update qemudBuildCommandLineChrDevStr to use a virBuffer --- src/qemu/qemu_conf.c | 97 +++++++++++++++++++++++-------------------------- 1 files changed, 46 insertions(+), 51 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 40613dd..052ae98 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1409,83 +1409,66 @@ qemuBuildHostNetStr(virConnectPtr conn, return 0; } -static int qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev, - char *buf, - int buflen) +static void qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev, + virBufferPtr buf) { switch (dev->type) { case VIR_DOMAIN_CHR_TYPE_NULL: - if (virStrcpy(buf, "null", buflen) == NULL) - return -1; + virBufferAddLit(buf, "null"); break; case VIR_DOMAIN_CHR_TYPE_VC: - if (virStrcpy(buf, "vc", buflen) == NULL) - return -1; + virBufferAddLit(buf, "vc"); break; case VIR_DOMAIN_CHR_TYPE_PTY: - if (virStrcpy(buf, "pty", buflen) == NULL) - return -1; + virBufferAddLit(buf, "pty"); break; case VIR_DOMAIN_CHR_TYPE_DEV: - if (snprintf(buf, buflen, "%s", - dev->data.file.path) >= buflen) - return -1; + virBufferStrcat(buf, dev->data.file.path, NULL); break; case VIR_DOMAIN_CHR_TYPE_FILE: - if (snprintf(buf, buflen, "file:%s", - dev->data.file.path) >= buflen) - return -1; + virBufferVSprintf(buf, "file:%s", dev->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_PIPE: - if (snprintf(buf, buflen, "pipe:%s", - dev->data.file.path) >= buflen) - return -1; + virBufferVSprintf(buf, "pipe:%s", dev->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_STDIO: - if (virStrcpy(buf, "stdio", buflen) == NULL) - return -1; + virBufferAddLit(buf, "stdio"); break; case VIR_DOMAIN_CHR_TYPE_UDP: - if (snprintf(buf, buflen, "udp:%s:%s@%s:%s", - dev->data.udp.connectHost, - dev->data.udp.connectService, - dev->data.udp.bindHost, - dev->data.udp.bindService) >= buflen) - return -1; + virBufferVSprintf(buf, "udp:%s:%s@%s:%s", + dev->data.udp.connectHost, + dev->data.udp.connectService, + dev->data.udp.bindHost, + dev->data.udp.bindService); break; case VIR_DOMAIN_CHR_TYPE_TCP: if (dev->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET) { - if (snprintf(buf, buflen, "telnet:%s:%s%s", - dev->data.tcp.host, - dev->data.tcp.service, - dev->data.tcp.listen ? ",server,nowait" : "") >= buflen) - return -1; + virBufferVSprintf(buf, "telnet:%s:%s%s", + dev->data.tcp.host, + dev->data.tcp.service, + dev->data.tcp.listen ? ",server,nowait" : ""); } else { - if (snprintf(buf, buflen, "tcp:%s:%s%s", - dev->data.tcp.host, - dev->data.tcp.service, - dev->data.tcp.listen ? ",server,nowait" : "") >= buflen) - return -1; + virBufferVSprintf(buf, "tcp:%s:%s%s", + dev->data.tcp.host, + dev->data.tcp.service, + dev->data.tcp.listen ? ",server,nowait" : ""); } break; case VIR_DOMAIN_CHR_TYPE_UNIX: - if (snprintf(buf, buflen, "unix:%s%s", - dev->data.nix.path, - dev->data.nix.listen ? ",server,nowait" : "") >= buflen) - return -1; + virBufferVSprintf(buf, "unix:%s%s", + dev->data.nix.path, + dev->data.nix.listen ? ",server,nowait" : ""); break; } - - return 0; } #define QEMU_SERIAL_PARAM_ACCEPTED_CHARS \ @@ -1773,13 +1756,17 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-nographic"); if (monitor_chr) { - char buf[4096]; + virBuffer buf = VIR_BUFFER_INITIALIZER; - if (qemudBuildCommandLineChrDevStr(monitor_chr, buf, sizeof(buf)) < 0) + qemudBuildCommandLineChrDevStr(monitor_chr, &buf); + const char *argStr = virBufferContentAndReset(&buf); + if (argStr == NULL) goto error; ADD_ARG_LIT("-monitor"); - ADD_ARG_LIT(buf); + ADD_ARG_LIT(argStr); + + VIR_FREE(argStr); } if (def->localtime) @@ -2059,14 +2046,18 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("none"); } else { for (i = 0 ; i < def->nserials ; i++) { - char buf[4096]; + virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainChrDefPtr serial = def->serials[i]; - if (qemudBuildCommandLineChrDevStr(serial, buf, sizeof(buf)) < 0) + qemudBuildCommandLineChrDevStr(serial, &buf); + const char *argStr = virBufferContentAndReset(&buf); + if (argStr == NULL) goto error; ADD_ARG_LIT("-serial"); - ADD_ARG_LIT(buf); + ADD_ARG_LIT(argStr); + + VIR_FREE(argStr); } } @@ -2075,14 +2066,18 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("none"); } else { for (i = 0 ; i < def->nparallels ; i++) { - char buf[4096]; + virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainChrDefPtr parallel = def->parallels[i]; - if (qemudBuildCommandLineChrDevStr(parallel, buf, sizeof(buf)) < 0) + qemudBuildCommandLineChrDevStr(parallel, &buf); + const char *argStr = virBufferContentAndReset(&buf); + if (argStr == NULL) goto error; ADD_ARG_LIT("-parallel"); - ADD_ARG_LIT(buf); + ADD_ARG_LIT(argStr); + + VIR_FREE(argStr); } } -- 1.6.2.5

3 3

[libvirt] [PATCH] Cleanup virBuffer usage in qemdBuildCommandLine
by Matthew Booth 06 Nov '09

06 Nov '09

Dan Berrangé pointed out that using virBufferError() is preferred to checking virBufferContentAndReset() for NULL return. Also, this allows ADD_ARG_LIT to be replaced with ADD_ARG, skipping an intermediate variable. * src/qemu_qemu_conf.c: Cleanup usage of virBuffer in qemudBuildCommandLine --- src/qemu/qemu_conf.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index f010f4a..4a278e3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2182,7 +2182,6 @@ int qemudBuildCommandLine(virConnectPtr conn, for (i = 0 ; i < def->nchannels ; i++) { virBuffer buf = VIR_BUFFER_INITIALIZER; - const char *argStr; char id[16]; virDomainChrDefPtr channel = def->channels[i]; @@ -2199,24 +2198,18 @@ int qemudBuildCommandLine(virConnectPtr conn, } qemudBuildCommandLineChrDevChardevStr(channel, id, &buf); - argStr = virBufferContentAndReset(&buf); - if (argStr == NULL) + if (virBufferError(&buf)) goto error; ADD_ARG_LIT("-chardev"); - ADD_ARG_LIT(argStr); - - VIR_FREE(argStr); + ADD_ARG(virBufferContentAndReset(&buf)); qemudBuildCommandLineChrDevTargetStr(channel, id, &buf); - argStr = virBufferContentAndReset(&buf); - if (argStr == NULL) + if (virBufferError(&buf)) goto error; ADD_ARG_LIT("-net"); - ADD_ARG_LIT(argStr); - - VIR_FREE(argStr); + ADD_ARG(virBufferContentAndReset(&buf)); } } -- 1.6.2.5

2 1

[libvirt] [PATCH] add sentinel attribute
by Paolo Bonzini 06 Nov '09

06 Nov '09

This patch adds a (macro-wrapped) sentinel attribute to functions that take a NULL-terminated variable argument list. This is a nice debugging aid. * src/internal.h (ATTRIBUTE_SENTINEL): New. * src/util/buf.c (virBufferStrcat): Use it. * src/util/ebtables.c (ebtablesAddRemoveRule): Use it. * src/util/iptables.c (iptableAddRemoveRule: Use it. * src/util/qparams.h (new_qparam_set, append_qparams): Use it. --- src/internal.h | 11 +++++++++++ src/util/buf.h | 3 ++- src/util/ebtables.c | 2 +- src/util/iptables.c | 2 +- src/util/qparams.h | 6 ++++-- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/internal.h b/src/internal.h index bd1cfe6..09c19ea 100644 --- a/src/internal.h +++ b/src/internal.h @@ -93,6 +93,17 @@ #endif /** + * ATTRIBUTE_SENTINEL: + * + * Macro to check for NULL-terminated varargs lists + */ +#ifndef ATTRIBUTE_SENTINEL +#if __GNUC_PREREQ (4, 0) +#define ATTRIBUTE_SENTINEL __attribute__((__sentinel__)) +#endif +#endif + +/** * ATTRIBUTE_FMT_PRINTF * * Macro used to check printf like functions, if compiling diff --git a/src/util/buf.h b/src/util/buf.h index 7d31cb2..94ee8a3 100644 --- a/src/util/buf.h +++ b/src/util/buf.h @@ -41,7 +41,8 @@ void virBufferAdd(const virBufferPtr buf, const char *str, int len); void virBufferAddChar(const virBufferPtr buf, char c); void virBufferVSprintf(const virBufferPtr buf, const char *format, ...) ATTRIBUTE_FMT_PRINTF(2, 3); -void virBufferStrcat(const virBufferPtr buf, ...); +void virBufferStrcat(const virBufferPtr buf, ...) + ATTRIBUTE_SENTINEL; void virBufferEscapeString(const virBufferPtr buf, const char *format, const char *str); void virBufferURIEncodeString (const virBufferPtr buf, const char *str); diff --git a/src/util/ebtables.c b/src/util/ebtables.c index 60427d7..20f3342 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -175,7 +175,7 @@ ebtRulesNew(const char *table, return NULL; } -static int +static int ATTRIBUTE_SENTINEL ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) { va_list args; diff --git a/src/util/iptables.c b/src/util/iptables.c index 4562800..284f3c0 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -382,7 +382,7 @@ iptRulesNew(const char *table, return NULL; } -static int +static int ATTRIBUTE_SENTINEL iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...) { va_list args; diff --git a/src/util/qparams.h b/src/util/qparams.h index 1a92048..a2f5aa2 100644 --- a/src/util/qparams.h +++ b/src/util/qparams.h @@ -38,10 +38,12 @@ struct qparam_set { }; /* New parameter set. */ -extern struct qparam_set *new_qparam_set (int init_alloc, ...); +extern struct qparam_set *new_qparam_set (int init_alloc, ...) + ATTRIBUTE_SENTINEL; /* Appending parameters. */ -extern int append_qparams (struct qparam_set *ps, ...); +extern int append_qparams (struct qparam_set *ps, ...) + ATTRIBUTE_SENTINEL; extern int append_qparam (struct qparam_set *ps, const char *name, const char *value); -- 1.6.2.5

3 5

Re: [libvirt] Remote access and libvirtd
by Maximilian Wilhelm 06 Nov '09

06 Nov '09

Anno domini 2009 Dave Bryson scripsit: Hi Dave! (Moved the thread back to the list, hope thats OK) > Thank you for the response. I'm working with ESX and am looking at > libvirt to see if it would be beneficial to use over the ESX SOAP API > (i'm not a SOAP fan). But in the case of remote access it doesn't appear > that libvirt will be able to help me. Well, the ESX driver is working completely remote and should therefore be helpful. The driver only uses the VI API, which practically is SOAP, to communicate with the server. If you could describe the problem you are facing a bit more precisly, one could give you some hints about how to solve this. Ciao Max -- Träume nicht von Dein Leben: Lebe Deinen Traum!

4 3

[libvirt] [PATCH 0/2] test: Update inactive guest config on shutdown
by Cole Robinson 05 Nov '09

05 Nov '09

This small series teaches the test driver to abide changes to the inactive domain definition (caused by 'defining' over an already running domain). Cole Robinson (2): test: Add testDomainShutdownState helper test: Update inactive guest config on shutdown src/test/test_driver.c | 48 +++++++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 19 deletions(-)

2 5

[libvirt] [PATCH] fix cut-and-paste error
by Paolo Bonzini 05 Nov '09

05 Nov '09

Seems like a bad merge conflict. * src/qemu/qemu_driver.c (qemudDomainMigratePerform): Do call doPeer2PeerMigrate for VIR_MIGRATE_PEER2PEER. --- Note: untested beyond compiling. src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0ed2136..635d787 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6792,9 +6792,9 @@ qemudDomainMigratePerform (virDomainPtr dom, event = NULL; } - if ((flags & VIR_MIGRATE_TUNNELLED)) { + if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (doPeer2PeerMigrate(dom, vm, uri, flags, dname, resource) < 0) - /* doTunnelMigrate already set the error, so just get out */ + /* doPeer2PeerMigrate already set the error, so just get out */ goto cleanup; } else { if (doNativeMigrate(dom, vm, uri, flags, dname, resource) < 0) -- 1.6.2.5

3 2

[libvirt] [PATCH 00/15] Rewrite the QEMU monitor handling v2
by Daniel P. Berrange 05 Nov '09

05 Nov '09

This is an update of this series: http://www.redhat.com/archives/libvir-list/2009-October/msg00644.html minus the patches DV already ACKd which I've merged. The main change in this series is that I've removed the change which added a RW-lock primitive in the QEMU driver. Instead I've implemented the job condition variable idea I described here http://www.redhat.com/archives/libvir-list/2009-October/msg00815.html The nice thing about this is that its actually possible to start doing timeouts of commands. This series only partially supports timeouts. A long running monitor command itself will not timeout, but if a second API call is made while someone else is using the monitor, this waiting call will timeout after 30 seconds if the monitor was not relased. Daniel

3 37

[libvirt] [PATCH] network utilities: Add functions for address->text and get/set port number
by Matthew Booth 05 Nov '09

05 Nov '09

--- src/libvirt_private.syms | 3 ++ src/util/network.c | 88 +++++++++++++++++++++++++++++++++++++++++++++- src/util/network.h | 6 +++ 3 files changed, 96 insertions(+), 1 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8525dbd..15d75fd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -289,10 +289,13 @@ virFree; virSocketAddrInNetwork; virSocketAddrIsNetmask; virSocketCheckNetmask; +virSocketFormatAddr; +virSocketGetPort; virSocketGetRange; virSocketParseAddr; virSocketParseIpv4Addr; virSocketParseIpv6Addr; +virSocketSetPort; # network_conf.h diff --git a/src/util/network.c b/src/util/network.c index abd866c..094130f 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -9,6 +9,7 @@ */ #include <config.h> +#include <arpa/inet.h> #include "memory.h" #include "network.h" @@ -64,7 +65,7 @@ static int getIPv6Addr(virSocketAddrPtr addr, virIPv6AddrPtr tab) { * Mostly a wrapper for getaddrinfo() extracting the address storage * from the numeric string like 1.2.3.4 or 2001:db8:85a3:0:0:8a2e:370:7334 * - * Returns the lenght of the network address or -1 in case of error. + * Returns the length of the network address or -1 in case of error. */ int virSocketParseAddr(const char *val, virSocketAddrPtr addr, int hint) { @@ -116,6 +117,91 @@ virSocketParseIpv6Addr(const char *val, virSocketAddrPtr addr) { return(virSocketParseAddr(val, addr, AF_INET6)); } +/* + * virSocketFormatAddr: + * @addr: an initialised virSocketAddrPtr + * + * Returns a string representation of the given address + * Returns NULL on any error + * Caller must free the returned string + */ +char * +virSocketFormatAddr(virSocketAddrPtr addr) { + char *out; + size_t outlen; + void *inaddr; + + if (addr->stor.ss_family == AF_INET) { + outlen = INET_ADDRSTRLEN; + inaddr = &addr->inet4.sin_addr; + } + + else if (addr->stor.ss_family == AF_INET6) { + outlen = INET6_ADDRSTRLEN; + inaddr = &addr->inet6.sin6_addr; + } + + else { + return NULL; + } + + if (VIR_ALLOC_N(out, outlen) < 0) + return NULL; + + if (inet_ntop(addr->stor.ss_family, inaddr, out, outlen) == NULL) { + VIR_FREE(out); + return NULL; + } + + return out; +} + +/* + * virSocketSetPort: + * @addr: an initialised virSocketAddrPtr + * @port: the port number to set + * + * Set the transport layer port of the given virtSocketAddr + * + * Returns 0 on success, -1 on failure + */ +int +virSocketSetPort(virSocketAddrPtr addr, in_port_t port) { + if(addr->stor.ss_family == AF_INET) { + addr->inet4.sin_port = port; + } + + else if(addr->stor.ss_family == AF_INET6) { + addr->inet6.sin6_port = port; + } + + else { + return -1; + } + + return 0; +} + +/* + * virSocketGetPort: + * @addr: an initialised virSocketAddrPtr + * + * Returns the transport layer port of the given virtSocketAddr + * Returns 0 if @addr is invalid + */ +in_port_t +virSocketGetPort(virSocketAddrPtr addr) { + if(addr->stor.ss_family == AF_INET) { + return addr->inet4.sin_port; + } + + else if(addr->stor.ss_family == AF_INET6) { + return addr->inet6.sin6_port; + } + + return 0; +} + /** * virSocketAddrIsNetmask: * @netmask: the netmask address diff --git a/src/util/network.h b/src/util/network.h index e590747..7618547 100644 --- a/src/util/network.h +++ b/src/util/network.h @@ -34,6 +34,12 @@ int virSocketParseIpv4Addr(const char *val, int virSocketParseIpv6Addr(const char *val, virSocketAddrPtr addr); +char * virSocketFormatAddr(virSocketAddrPtr addr); + +int virSocketSetPort(virSocketAddrPtr addr, in_port_t port); + +in_port_t virSocketGetPort(virSocketAddrPtr addr); + int virSocketAddrInNetwork(virSocketAddrPtr addr1, virSocketAddrPtr addr2, virSocketAddrPtr netmask); -- 1.6.2.5

3 7

[libvirt] [PATCH] create() and destroy() support for Power Hypervisor
by Eduardo Otubo 05 Nov '09

05 Nov '09

Hello all, This patch includes a lot of changes: * I changed all references of uuid_db to uuid_table. Bigger name, but this semantic has a better understanding. * Now we have a little control of UUID generated for each partition. It's based on a table that matches UUID with LPAR's IDs, I keep it in a file that is stored in the managed system (HMC or IVM). Even having isolated functions to manipulate this file I still need to implement a way to lock it and make the operation atomic to avoid corruptions. * The XML file used in the create() function still must be improved. I used the <disk> tag to make a work around to handle storage pools. Now I ask for some help, how do I use the <pool> tag if there is no reference to it at the virDomainDef structure? I've been told that libvirt possibly would make a mini-release this week to push some major fixes on Fedora 12. Is there a little possibility to push these new phyp features too? This would be very important for the phyp project, since this functions are not just to manage partitions but manipulate them. Any comments are always welcome. []'s -- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 eotubo(a)linux.vnet.ibm.com

5 13

[libvirt] Remote access and libvirtd
by Dave Bryson 05 Nov '09

05 Nov '09

I need to be able to access libvirt remotely. Reading through the documention is says "libvirtd should be running on the remote machine" for clarification does this mean that libvirtd needs to run *on* the remote hypervisor? Thanks, Dave

2 1

[libvirt] Add support for legacy -vmchannel option
by Matthew Booth 05 Nov '09

05 Nov '09

These patches add support for the legacy qemu -vmchannel option. The following domain xml: <channel type='unix'> <source mode='bind' path='/tmp/vmchannel'/> <target type='vmchannel' deviceid='0200'/> </channel> becomes: -vmchannel di:0200,unix:/tmp/vmchannel,server,nowait I don't expect these to be merged, but I would appreciate a review. Thanks, Matt

4 6

[libvirt] Guestfwd support (round 3)
by Matthew Booth 05 Nov '09

05 Nov '09

This is substantially the same as the last set. I don't think I changed patches 1 and 2 at all. Patch 3 is updated to use a virBuffer as Rich Jones recommended. Patch 4 is updated slightly for the above change, and there are a couple of other trivial tidy ups in there. Patch 5 is new. QEMU's guestfwd only supports IPv4 addresses, so we check for that. Rich Jones also noted that guestfwd is specific to QEMU. If there's a good chance this same syntax might do something simililar in a different driver, I agree that changing the name would be a good idea. However, I'm not familiar enough with other hypervisors to be able to make a call on this. If nothing else does anything similar, I'd keep the QEMU name for clarity. Matt

3 17

[libvirt] [PATCH] LXC allow container to have ethN interfaces
by Ryota Ozaki 05 Nov '09

05 Nov '09

Current implementation of lxc driver creates vethN named interface(s) in the host and passes as it is to a container. The reason why it doesn't use ethN is due to the limitation that one namespace cannot have multiple iterfaces that have an identical name so that we give up creating ethN named interface in the host for the container. However, we should be able to allow the container to have ethN by changing the name after clone(CLONE_NEWNET). The patch simply does that and numberes to ethN with ascending order from zero with no concern for what vethN is named. So say if there is one interface, its name will be eth0. Note that this patch is based on top of the prior cleanup patches. --- src/lxc/lxc_container.c | 34 ++++++++++++++++++++++++---------- src/lxc/veth.c | 31 +++++++++++++++++++++++++++++++ src/lxc/veth.h | 1 + 3 files changed, 56 insertions(+), 10 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 2419345..97b7903 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -225,26 +225,38 @@ static int lxcContainerWaitForContinue(int control) /** - * lxcContainerEnableInterfaces: + * lxcContainerRenameAndEnableInterfaces: * @nveths: number of interfaces * @veths: interface names * - * This function will enable the interfaces for this container. + * This function will rename the interfaces to ethN + * with id ascending order from zero and enable the + * renamed interfaces for this container. * * Returns 0 on success or nonzero in case of error */ -static int lxcContainerEnableInterfaces(unsigned int nveths, - char **veths) +static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, + char **veths) { int rc = 0; unsigned int i; + char *newname = NULL; for (i = 0 ; i < nveths ; i++) { - DEBUG("Enabling %s", veths[i]); - rc = vethInterfaceUpOrDown(veths[i], 1); - if (0 != rc) { + rc = virAsprintf(&newname, "eth%d", i); + if (rc < 0) goto error_out; - } + + DEBUG("Renaming %s to %s", veths[i], newname); + rc = setInterfaceName(veths[i], newname); + if (0 != rc) + goto error_out; + + DEBUG("Enabling %s", newname); + rc = vethInterfaceUpOrDown(newname, 1); + if (0 != rc) + goto error_out; + VIR_FREE(newname); } /* enable lo device only if there were other net devices */ @@ -252,6 +264,7 @@ static int lxcContainerEnableInterfaces(unsigned int nveths, rc = vethInterfaceUpOrDown("lo", 1); error_out: + VIR_FREE(newname); return rc; } @@ -757,8 +770,9 @@ static int lxcContainerChild( void *data ) if (lxcContainerWaitForContinue(argv->monitor) < 0) return -1; - /* enable interfaces */ - if (lxcContainerEnableInterfaces(argv->nveths, argv->veths) < 0) + /* rename and enable interfaces */ + if (lxcContainerRenameAndEnableInterfaces(argv->nveths, + argv->veths) < 0) return -1; /* drop a set of root capabilities */ diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 8617cf7..ede85ce 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -247,3 +247,34 @@ int setMacAddr(const char* iface, const char* macaddr) error_out: return rc; } + +/** + * setInterfaceName + * @iface: name of device + * @new: new name of @iface + * + * Changes the name of the given device with the + * given new name using this command: + * ip link set @iface name @new + * + * Returns 0 on success or -1 in case of error + */ +int setInterfaceName(const char* iface, const char* new) +{ + int rc = -1; + const char *argv[] = { + "ip", "link", "set", iface, "name", new, NULL + }; + int cmdResult; + + if (NULL == iface || NULL == new) { + goto error_out; + } + + rc = virRun(NULL, argv, &cmdResult); + if (0 == rc) + rc = cmdResult; + +error_out: + return rc; +} diff --git a/src/lxc/veth.h b/src/lxc/veth.h index 8f2f514..8075a5e 100644 --- a/src/lxc/veth.h +++ b/src/lxc/veth.h @@ -21,5 +21,6 @@ int vethDelete(const char* veth); int vethInterfaceUpOrDown(const char* veth, int upOrDown); int moveInterfaceToNetNs(const char *iface, int pidInNs); int setMacAddr(const char* iface, const char* macaddr); +int setInterfaceName(const char* iface, const char* new); #endif /* VETH_H */ -- 1.6.2.5

2 1

[libvirt] [PATCH 0/3] LXC misc fixes and cleanups
by Ryota Ozaki 05 Nov '09

05 Nov '09

This patch series fix and cleanup over whole lxc codes. I want to clean up before adding more in them. Thanks, ozaki-r Ryota Ozaki (3): LXC fix wrong or out-of-date function descriptions LXC cleanup and fix lxcError LXC cleanup deep indentation in lxcDomainSetAutostart src/lxc/lxc_container.c | 85 +++++++++++----------- src/lxc/lxc_controller.c | 40 ++++++----- src/lxc/lxc_driver.c | 177 +++++++++++++++++++++++++--------------------- src/lxc/veth.c | 8 +- 4 files changed, 164 insertions(+), 146 deletions(-)

3 7

[libvirt] flush guest page cache and suspend?
by Marco Colombo 05 Nov '09

05 Nov '09

Hi, I'm new to this list. I've searched the archives (and google) but I haven't found an answer. Recently I moved to CentOS 5.4, with libvirt-0.6.3 and kvm-83. They are rather new compared to 5.3 ones, so I'm still investigating on the new capabilities. My guests disk images are LV single devices, /dev/vg_virt/<guestname>, usually with two partitions, the root fs and swap space. I'd like to run backups on the node only, taking snapshots of the LVs. I'm already doing that, actually. Everything works fine, using bacula (with one minor glitch, but that's for another list). Now I wonder if it makes sense to suspend the guest before creating the snapshot: virsh suspend <guestname> lvcreate --snapshot ... virsh resume <guestname> ... perform backup ... lvremove -f <the snapshot> but thinking about it a second time it seems it doesn't add anything to the equation, the filesystem is still potentially unclean, with data to be written still in the guest page cache. The filesystem is ext3, so it's not that bad (recovers a consistent state from the journal, with standard options even data-consistent, not just metadata-consistent). Yet it's like doing a backup of a (potentially badly) crashed filesystem. While I trust the recovery step of ext3, my feeling is that it can't be 100% reliable. I have (rarely) seen ext3 crash and ask for fsck at boot, journal or not (for truth's sake, I can't rule out an hard disk problem in those cases). So, first question: does the suspend command cause a flush in the guest OS (details: both guest and node are CentOS 5.4, hypervisor is qemu-kvm)? I guess not (otherwise I won't be here). So if not, what are the options to force the sync? Ideally, there should be a single atomic 'sync & suspend'. In practice, I can think of some workarounds: ssh <guest> -c sync, or the very old-fashioned way of enabling the 'sync' user and logging in from the serial console, or issuing a sysrq-s, again on the console. I'm interested in the latter, but I wasn't able to trigger the sysrq from either 'virsh console <guestname>' or 'screen `virsh ttyconsole <guestname>` (tried minicom, too). The serial console is on pty, I'm not even sure you can generate a break on a pty. (and yes, I remembered to sysctl -w kernel.sysrq=1 on the guest). I know XEN has 'xm sysrq', but this is kvm. Is there anything similar? I think it can be done if you invoke qemu-kvm from the command line with -nographics (it multiplexes the console and the monitor lines on stdin/out, and you can send a 'break' with C-a b I think, I've never tried). So question 2): is there a way to send a sysrq-s to the guest? My fallback plan is to try and map the serial line over telnet instead of pty, and the figure out a way to send the break (which I think is part of the telnet protocol) from the command line. I'd rather not mess with telnet and local port assignment to the guests, if not necessary. My really fallback plan is to revert to shutdown/snapshot/create, which is overkill for a daily backup. Question 3): does it _really_ make sense to try and sync the guest OS page cache before taking the snapshot? Or is it just me being paranoid? For reference, here's the qemu cmdline of one of the guests: /usr/libexec/qemu-kvm -S -M pc -m 512 -smp 1 -name wtitv -uuid 445d0fe5-c1b6-4baf-a186-da1fe021158c -monitor pty -pidfile /var/run/libvirt/qemu//wtitv.pid -boot c -drive file=/dev/vg_virt/wtitv,if=ide,index=0,boot=on -net nic,macaddr=00:16:3e:57:45:4f,vlan=0,model=e1000 -net tap,fd=14,script=,vlan=0,ifname=vnet0 -serial pty -parallel none -usb -usbdevice tablet -vnc 127.0.0.1:0 and here's the xml config file for libvirt, same guest: <domain type='kvm'> <name>wtitv</name> <uuid>445d0fe5-c1b6-4baf-a186-da1fe021158c</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <features> <acpi/> </features> <devices> <emulator>/usr/libexec/qemu-kvm</emulator> <disk type='block' device='disk'> <source dev='/dev/vg_virt/wtitv'/> <target dev='hda' bus='ide'/> </disk> <interface type='bridge'> <mac address='00:16:3e:57:45:4f'/> <source bridge='br1'/> <model type='e1000'/> </interface> <console type='pty'> <target port='0'/> </console> <input type='tablet' bus='usb'/> <graphics type='vnc' autoport='yes'/> </devices> </domain> TIA, .TM.

2 2

[libvirt] [PATCH 0/2] CPU flags capabilities and domain configuration
by Jiri Denemark 05 Nov '09

05 Nov '09

Hi, These are two initial patches for CPU flags/masks support for libvirt. The first patch contains changes to schemas and describes semantics of new elements and attributes. The second patch introduces internal API functions for XML parsing and formating. Jiri Denemark (2): XML schema for CPU flags XML parsing/formating code for CPU flags docs/schemas/capability.rng | 30 ++++ docs/schemas/domain.rng | 49 ++++++ include/libvirt/virterror.h | 1 + src/Makefile.am | 9 +- src/conf/capabilities.c | 31 ++++- src/conf/capabilities.h | 6 + src/conf/cpu_conf.c | 345 +++++++++++++++++++++++++++++++++++++++++++ src/conf/cpu_conf.h | 110 ++++++++++++++ src/conf/domain_conf.c | 15 ++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 8 + src/util/virterror.c | 3 + 12 files changed, 606 insertions(+), 3 deletions(-) create mode 100644 src/conf/cpu_conf.c create mode 100644 src/conf/cpu_conf.h

2 4

[libvirt] F12beta guest will not connect to LAN via bridge
by Gerry Reno 05 Nov '09

05 Nov '09

Setup: HOST: F11 x86_64 GUEST: F12beta x86_64 I have a number of guests setup on this host and all connect without a problem with the 'br0' bridge on the host. I created a new guest and loaded F12beta on it. I defined it to also use 'br0' networking but this guest cannot ping anything on the LAN. All the other guests have no problems communicating to addresses on the LAN. Details: ### on HOST: # brctl showmacs br0 port no mac addr is local? ageing timer 1 00:0b:82:11:bc:cb no 15.88 3 00:0c:01:30:50:00 no 16.37 2 00:0c:01:40:50:00 no 2.51 1 00:0c:29:e3:bc:ee no 0.49 1 00:18:f8:48:27:15 no 2.51 1 00:18:f8:9b:ba:b4 no 116.39 1 00:18:f8:9b:ba:b5 no 20.60 1 00:1a:4d:5e:f6:36 no 156.43 1 00:24:1d:19:05:cf yes 0.00 3 06:1d:1d:7a:31:9b yes 0.00 2 06:ba:11:dd:7b:08 yes 0.00 1 54:52:00:24:5e:cf no 28.93 # EXISTING GUEST: network interface in xml file: <interface type='bridge'> <mac address='00:0c:01:30:50:00'/> <source bridge='br0'/> <target dev='vnet0'/> <model type='virtio'/> </interface> # NEW GUEST: network interface in xml file: <interface type='bridge'> <mac address='00:0c:01:40:50:00'/> <source bridge='br0'/> <target dev='vnet0'/> <model type='virtio'/> </interface> ### on EXISTING GUEST: DEVICE=eth0 ONBOOT=yes BOOTPROTO=static HWADDR=00:0c:01:30:50:00 IPADDR=192.168.1.200 NETMASK=255.255.255.0 NETWORK=192.168.1.0 ### on NEW GUEST: DEVICE=eth0 ONBOOT=yes BOOTPROTO=static HWADDR=00:0c:01:40:50:00 IPADDR=192.168.1.210 NETMASK=255.255.255.0 GATEWAY=192.168.1.1 NETWORK=192.168.1.0 TYPE=Ethernet IPV6INIT=no USERCTL=no ### on EXISTING GUEST: # ping 192.168.1.1 succeeds ### on NEW GUEST: # ping 192.168.1.1 fails with Destination Host Unreachable Is there something else I need to configure in F12beta to get this working? -Gerry

1 2

[libvirt] Minor doc fix for <clock>
by Cole Robinson 04 Nov '09

04 Nov '09

FYI, I just pushed this minor docs fix: commit 45bd290b64c9f911ebb6e0990f8fcef249576436 Author: Cole Robinson <crobinso(a)redhat.com> Date: Wed Nov 4 13:26:28 2009 -0500 docs: <clock> property is 'offset', not 'sync' diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 53cd960..d26ce75 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -300,7 +300,7 @@ <dl> <dt><code>clock</code></dt> - <dd>The <code>sync</code> attribute takes either "utc" or + <dd>The <code>offset</code> attribute takes either "utc" or "localtime" to specify how the guest clock is initialized in relation to the host OS. </dd> Thanks, Cole

1 0

[libvirt] ESX with Python binding
by Dave Bryson 04 Nov '09

04 Nov '09

I'm new to libvirt. Is it possible to use the python binding with the latest ESX support? If so, does anyone have a simple example I can try? Thanks in advance! Dave

3 2

[libvirt] [RFC][PATCH] LXC allow a container to have ethN named interfaces
by Ryota Ozaki 04 Nov '09

04 Nov '09

Note that this patch is not mature yet and still proof- of-concept prototype, although it actually works. Current implementation of lxc driver creates vethN named interface(s) in the host and passes as it is to a container. The reason why it doesn't use ethN is due to the limitation that one namespace cannot have multiple iterfaces that have an identical name so that we give up creating ethN named interface in the host for the container. However, we should be able to allow the container to have ethN by changing the name after clone(CLONE_NEWNET) in controller. To this end, this patch extends --veth argument of controller to be able to have two names; one is the name of a created veth, and the other is a new name. The format is: --veth veth1,eth0 --veth veth3,eth1 ... where veth1 is old name and eth0 is new one. The implementation also allows a single name, in that case, controller does not do nothing for the interface, which is the original behavior. The numbering of the new names is simply ascending order from zero. So if there is one interface, its name will be eth0. --- src/lxc/lxc_container.c | 23 ++++++++++++++++++----- src/lxc/lxc_container.h | 1 + src/lxc/lxc_controller.c | 30 ++++++++++++++++++++++++++++-- src/lxc/lxc_driver.c | 30 +++++++++++++++++++++++++----- src/lxc/veth.c | 20 ++++++++++++++++++++ src/lxc/veth.h | 1 + 6 files changed, 93 insertions(+), 12 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index f4381e7..f065788 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -84,6 +84,7 @@ struct __lxc_child_argv { virDomainDefPtr config; unsigned int nveths; char **veths; + char **newveths; int monitor; char *ttyPath; }; @@ -233,14 +234,23 @@ static int lxcContainerWaitForContinue(int control) * Returns 0 on success or nonzero in case of error */ static int lxcContainerEnableInterfaces(unsigned int nveths, - char **veths) + char **veths, char **newveths) { int rc = 0; unsigned int i; for (i = 0 ; i < nveths ; i++) { - DEBUG("Enabling %s", veths[i]); - rc = vethInterfaceUpOrDown(veths[i], 1); + char *veth = veths[i]; + if (newveths[i] && !STREQ(veths[i], newveths[i])) { + DEBUG("changing %s", veths[i]); + rc = setInterfaceName(veths[i], newveths[i]); + if (0 != rc) { + goto error_out; + } + veth = newveths[i]; + } + DEBUG("Enabling %s", veth); + rc = vethInterfaceUpOrDown(veth, 1); if (0 != rc) { goto error_out; } @@ -758,7 +768,9 @@ static int lxcContainerChild( void *data ) return -1; /* enable interfaces */ - if (lxcContainerEnableInterfaces(argv->nveths, argv->veths) < 0) + if (lxcContainerEnableInterfaces(argv->nveths, + argv->veths, + argv->newveths) < 0) return -1; /* drop a set of root capabilities */ @@ -786,6 +798,7 @@ static int userns_supported(void) int lxcContainerStart(virDomainDefPtr def, unsigned int nveths, char **veths, + char **newveths, int control, char *ttyPath) { @@ -793,7 +806,7 @@ int lxcContainerStart(virDomainDefPtr def, int flags; int stacksize = getpagesize() * 4; char *stack, *stacktop; - lxc_child_argv_t args = { def, nveths, veths, control, ttyPath }; + lxc_child_argv_t args = { def, nveths, veths, newveths, control, ttyPath }; /* allocate a stack for the container */ if (VIR_ALLOC_N(stack, stacksize) < 0) { diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index a1dd5a1..d796380 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -49,6 +49,7 @@ int lxcContainerSendContinue(int control); int lxcContainerStart(virDomainDefPtr def, unsigned int nveths, char **veths, + char **newveths, int control, char *ttyPath); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 545f718..75dd73a 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -493,6 +493,7 @@ static int lxcControllerRun(virDomainDefPtr def, unsigned int nveths, char **veths, + char **newveths, int monitor, int client, int appPty) @@ -603,6 +604,7 @@ lxcControllerRun(virDomainDefPtr def, if ((container = lxcContainerStart(def, nveths, veths, + newveths, control[1], containerPtyPath)) < 0) goto cleanup; @@ -649,6 +651,7 @@ int main(int argc, char *argv[]) char *name = NULL; int nveths = 0; char **veths = NULL; + char **newveths = NULL; int monitor = -1; int appPty = -1; int bg = 0; @@ -691,10 +694,33 @@ int main(int argc, char *argv[]) virReportOOMError(NULL); goto cleanup; } - if ((veths[nveths++] = strdup(optarg)) == NULL) { + if (VIR_REALLOC_N(newveths, nveths+1) < 0) { virReportOOMError(NULL); goto cleanup; } + { + char *sep = strchr(optarg, ','); + if (sep) { + *sep = '\0'; + sep++; + if ((veths[nveths] = strdup(optarg)) == NULL) { + virReportOOMError(NULL); + goto cleanup; + } + if ((newveths[nveths] = strdup(sep)) == NULL) { + virReportOOMError(NULL); + goto cleanup; + } + nveths++; + } else { + if ((veths[nveths] = strdup(optarg)) == NULL) { + virReportOOMError(NULL); + goto cleanup; + } + newveths[nveths] = NULL; + nveths++; + } + } break; case 'c': @@ -803,7 +829,7 @@ int main(int argc, char *argv[]) goto cleanup; } - rc = lxcControllerRun(def, nveths, veths, monitor, client, appPty); + rc = lxcControllerRun(def, nveths, veths, newveths, monitor, client, appPty); cleanup: diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4f0787b..1323cff 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -693,13 +693,15 @@ static int lxcVMCleanup(virConnectPtr conn, static int lxcSetupInterfaces(virConnectPtr conn, virDomainDefPtr def, unsigned int *nveths, - char ***veths) + char ***veths, + char ***newveths) { int rc = -1, i; char *bridge = NULL; char parentVeth[PATH_MAX] = ""; char containerVeth[PATH_MAX] = ""; brControl *brctl = NULL; + char *newveth; if (brInit(&brctl) != 0) return -1; @@ -744,10 +746,20 @@ static int lxcSetupInterfaces(virConnectPtr conn, if (NULL == def->nets[i]->ifname) { def->nets[i]->ifname = strdup(parentVeth); } + if (VIR_REALLOC_N(*veths, (*nveths)+1) < 0) goto error_exit; - if (((*veths)[(*nveths)++] = strdup(containerVeth)) == NULL) + if (VIR_REALLOC_N(*newveths, (*nveths)+1) < 0) + goto error_exit; + + if (((*veths)[*nveths] = strdup(containerVeth)) == NULL) + goto error_exit; + if (virAsprintf(&newveth, "eth%d", i) < 0) goto error_exit; + if (((*newveths)[*nveths] = strdup(newveth)) == NULL) + goto error_exit; + (*nveths)++; + VIR_FREE(newveth); if (NULL == def->nets[i]->ifname) { lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, @@ -906,6 +918,7 @@ static int lxcControllerStart(virConnectPtr conn, virDomainObjPtr vm, int nveths, char **veths, + char **newveths, int appPty, int logfd) { @@ -1029,7 +1042,13 @@ static int lxcControllerStart(virConnectPtr conn, for (i = 0 ; i < nveths ; i++) { ADD_ARG_LIT("--veth"); - ADD_ARG_LIT(veths[i]); + if (newveths[i]) { + if (virAsprintf(&tmp, "%s,%s", veths[i], newveths[i]) < 0) + goto no_memory; + ADD_ARG_LIT(tmp); + } else { + ADD_ARG_LIT(veths[i]); + } } ADD_ARG(NULL); @@ -1107,6 +1126,7 @@ static int lxcVmStart(virConnectPtr conn, int logfd = -1; unsigned int nveths = 0; char **veths = NULL; + char **newveths = NULL; if ((r = virFileMakePath(driver->logDir)) < 0) { virReportSystemError(conn, r, @@ -1135,7 +1155,7 @@ static int lxcVmStart(virConnectPtr conn, VIR_FREE(parentTtyPath); } - if (lxcSetupInterfaces(conn, vm->def, &nveths, &veths) != 0) + if (lxcSetupInterfaces(conn, vm->def, &nveths, &veths, &newveths) != 0) goto cleanup; /* Persist the live configuration now we have veth & tty info */ @@ -1152,7 +1172,7 @@ static int lxcVmStart(virConnectPtr conn, if (lxcControllerStart(conn, vm, - nveths, veths, + nveths, veths, newveths, parentTty, logfd) < 0) goto cleanup; diff --git a/src/lxc/veth.c b/src/lxc/veth.c index b15df8d..fbd1195 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -247,3 +247,23 @@ int setMacAddr(const char* iface, const char* macaddr) error_out: return rc; } + +int setInterfaceName(const char* iface, const char* new) +{ + int rc = -1; + const char *argv[] = { + "ip", "link", "set", iface, "name", new, NULL + }; + int cmdResult; + + if (NULL == iface || NULL == new) { + goto error_out; + } + + rc = virRun(NULL, argv, &cmdResult); + if (0 == rc) + rc = cmdResult; + +error_out: + return rc; +} diff --git a/src/lxc/veth.h b/src/lxc/veth.h index 8f2f514..8075a5e 100644 --- a/src/lxc/veth.h +++ b/src/lxc/veth.h @@ -21,5 +21,6 @@ int vethDelete(const char* veth); int vethInterfaceUpOrDown(const char* veth, int upOrDown); int moveInterfaceToNetNs(const char *iface, int pidInNs); int setMacAddr(const char* iface, const char* macaddr); +int setInterfaceName(const char* iface, const char* new); #endif /* VETH_H */ -- 1.6.2.5

2 4

[libvirt] starting vm using virsh somewhat fails
by Ricardo Tiago 04 Nov '09

04 Nov '09

Hi all, I have started a vm using virsh create domain.xml and it starts for a second and then its destroyed automatically. When I do xm create -f <xm cfg> it works fine. I don't know if this is relevant but virsh net-list --all Name State Autostart ----------------------------------------- default inactive yes virsh net-start default error: Failed to start network default error: Failed to open file '/etc/sysconfig/system-config-firewall': No such file or directory Can this be the problem? Why do I need /etc/sysconfig/system-config-firewall? Domain XML Description: (converted from a xm cfg file) <domain type='xen'> <name>rtiago_test</name> <uuid>8f07fe28-753f-2729-d76d-bdbd892f949a</uuid> <memory>2560000</memory> <currentMemory>200000</currentMemory> <vcpu>8</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> <type arch='x86_64' machine='xenpv'>linux</type> <cmdline>rtiago</cmdline> </os> <clock offset='utc'/> <on_poweroff>restart</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <disk type='file' device='disk'> <driver name='file'/> <source file='/images/fc-6.img'/> <target dev='xvda1' bus='xen'/> </disk> </domain>

1 1

[libvirt] [PATCH] network utilities: Allocate space for terminating NUL in virSocketFormatAddr
by Matthew Booth 04 Nov '09

04 Nov '09

* src/util/network.c: Allocate an additional byte for virSocketFormatAddr's return buffer --- src/util/network.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/network.c b/src/util/network.c index 56426e7..f6588c7 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -135,12 +135,12 @@ virSocketFormatAddr(virSocketAddrPtr addr) { return NULL; if (addr->stor.ss_family == AF_INET) { - outlen = INET_ADDRSTRLEN; + outlen = INET_ADDRSTRLEN + 1; inaddr = &addr->inet4.sin_addr; } else if (addr->stor.ss_family == AF_INET6) { - outlen = INET6_ADDRSTRLEN; + outlen = INET6_ADDRSTRLEN + 1; inaddr = &addr->inet6.sin6_addr; } -- 1.6.2.5

2 2

[libvirt] [PATCH] Fix up NLS warnings.
by Chris Lalancette 04 Nov '09

04 Nov '09

When building with --disable-nls, I got a few messages like this: storage/storage_backend.c: In function 'virStorageBackendCreateQemuImg': storage/storage_backend.c:571: warning: format not a string literal and no format arguments Fix these up. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 6 +++--- src/storage/storage_backend.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ba6b28d..a9c8573 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1813,7 +1813,7 @@ virDomainWatchdogDefParseXML(virConnectPtr conn, model = virXMLPropString (node, "model"); if (model == NULL) { - virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR, + virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR, "%s", _("watchdog must contain model name")); goto error; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9a5c43a..1e984c5 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1858,7 +1858,7 @@ static int lxcSetSchedulerParameters(virDomainPtr domain, for (i = 0; i < nparams; i++) { virSchedParameterPtr param = &params[i]; if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) { - lxcError(NULL, domain, VIR_ERR_INVALID_ARG, + lxcError(NULL, domain, VIR_ERR_INVALID_ARG, "%s", _("invalid type for cpu_shares tunable, expected a 'ullong'")); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 38fe19e..7295641 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5299,7 +5299,7 @@ static int qemuSetSchedulerParameters(virDomainPtr dom, if (STREQ(param->field, "cpu_shares")) { int rc; if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, "%s", _("invalid type for cpu_shares tunable, expected a 'ullong'")); goto cleanup; } @@ -6479,7 +6479,7 @@ static int doTunnelSendAll(virDomainPtr dom, break; if (virStreamSend(st, buffer, nbytes) < 0) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "%s", _("Failed to write migration data to remote libvirtd")); return -1; } @@ -6701,7 +6701,7 @@ static int doNonTunnelMigrate(virDomainPtr dom, goto cleanup; if (uri_out == NULL) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare2 did not set uri")); } diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 18a69be..bb926cd 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -568,7 +568,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, return -1; } if (enc->nsecrets > 1) { - virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, + virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, "%s", _("too many secrets for qcow encryption")); return -1; } -- 1.6.0.6

3 3

[libvirt] libvirt generates bad kvm command line
by Harald Dunkel 04 Nov '09

04 Nov '09

Hi folks, using this command sequence <code> export VIRSH_DEFAULT_CONNECT_URI=qemu:///system name=Testing kvmdir=/export/hdunkel/kvm hda=$kvmdir/$name/hda.qcow2 iso=/export/isos/debian-testing-amd64-netinst.iso mkdir -p $kvmdir/$name qemu-img create -f qcow2 $hda 32G virt-install --connect ${VIRSH_DEFAULT_CONNECT_URI} \ -n $name -r 1024 -vcpus=1 -f $hda -c $iso \ --network=bridge:br0 --vnc --accelerate -v \ --os-type=linux --os-variant=debianSqueeze </code> I get the famous "cdrom boot failure code 0003" error. The log file shows that libvirt generated this kvm command line: <code> LC_ALL=C \ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \ HOME=/root USER=root LOGNAME=root QEMU_AUDIO_DRV=none \ /usr/bin/kvm -S -M pc -m 1024 -smp 1 -name Testing \ -uuid 3a6b6b3f-84e6-6a21-a51a-2c61cf3914e2 \ -monitor unix:/var/lib/libvirt/qemu/Testing.monitor,server,nowait \ -no-reboot -boot d \ -drive file=/export/hdunkel/kvm/Testing/hda.qcow2,if=virtio,index=0 -drive file=/export/isos/debian-testing-amd64-netinst.iso,if=virtio,media=cdrom,index=1 \ -net nic,macaddr=52:54:00:3e:0b:26,vlan=0,model=virtio,name=virtio.0 \ -net tap,fd=18,vlan=0,name=tap.0 -serial pty -parallel none \ -usb -usbdevice tablet -vnc 127.0.0.1:0 -k en-us -vga cirrus </code> If I try this on the command line, then there is the same 0003 error. If I omit the if=virtio for the cdrom drive, then it boots the cd without 0003. Can you reproduce this? Is this a problem with libvirt or with the kvm module? Kernel is 2.6.31.5, i.e. kvm 0.88. libvirt is 0.7.2 Any helpful comments would be highly appreciated. Harri

4 7

[libvirt] [PATCH 0/6] test: Implement GetVcpus and PinVcpu
by Cole Robinson 03 Nov '09

03 Nov '09

Using the recently committed support for driver specific domain data blobs[1], carry around VCPU pinning info for running test domains, which enables supporting GetVcpus and PinVcpu, which makes my life easier when adding support in virt-manager. [1] http://libvirt.org/git/?p=libvirt.git;a=commit;h=3505790b85da55c16191a9dca4… Cole Robinson (6): test: Fixes for SetVcpus test: Break out wrapper for setting up started domain state. test: Use privateData to track running VM vcpu state test: Update vcpu runtime info in SetVcpus test: Implement virDomainGetVcpus test: Implement virDomainPinVcpu src/test/test_driver.c | 354 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 337 insertions(+), 17 deletions(-)

2 13

[libvirt] [PATCH 0/3] qemu: Use same create/define overwrite logic for migration
by Cole Robinson 03 Nov '09

03 Nov '09

As pointed out by Dan here: https://www.redhat.com/archives/libvir-list/2009-October/msg00784.html We should be using the same logic for collision prevention and domain redefinition in the migrate routines as we use in create/define/restore. Cole Robinson (3): qemu: Remove compiled out localhost migration support qemu: Break out function to check if we can create/define/restore qemu: Use same create/define overwrite logic for migration prepare. src/qemu/qemu_driver.c | 191 ++++++++++++++++-------------------------------- 1 files changed, 62 insertions(+), 129 deletions(-)

3 8

[libvirt] [PATCH] storage: conf: Fix memory leak in encryption parsing
by Cole Robinson 03 Nov '09

03 Nov '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/storage_encryption_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index b97b989..a329622 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -112,6 +112,7 @@ virStorageEncryptionSecretParse(virConnectPtr conn, xmlXPathContextPtr ctxt, uuidstr); goto cleanup; } + VIR_FREE(uuidstr); } else { virStorageReportError(conn, VIR_ERR_XML_ERROR, "%s", _("missing volume encryption uuid")); -- 1.6.5.1

2 2

[libvirt] [PATCH] Various error reporting fixes
by Cole Robinson 03 Nov '09

03 Nov '09

- Don't duplicate SystemError - Use proper error code in domain_conf - Fix a broken error call in qemu_conf - Don't use VIR_ERR_ERROR in security driver (isn't a valid code in this case) Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/conf/storage_conf.c | 6 +++--- src/qemu/qemu_conf.c | 6 ++---- src/qemu/qemu_driver.c | 2 +- src/security/security_apparmor.c | 30 +++++++++++++++--------------- src/security/security_driver.c | 2 +- src/security/security_selinux.c | 10 +++++----- src/xen/xen_hypervisor.c | 4 +--- tests/cpuset | 2 +- 9 files changed, 30 insertions(+), 34 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ba6b28d..ca141e1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3705,7 +3705,7 @@ virDomainCpuSetParse(virConnectPtr conn, const char **str, char sep, return (ret); parse_error: - virDomainReportError(conn, VIR_ERR_XEN_CALL, + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("topology cpuset syntax error")); return (-1); } diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 2924a0d..065cd04 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1593,9 +1593,9 @@ virStoragePoolObjSaveDef(virConnectPtr conn, char path[PATH_MAX]; if ((err = virFileMakePath(driver->configDir))) { - virStorageReportError(conn, err, - _("cannot create config directory %s"), - driver->configDir); + virReportSystemError(conn, err, + _("cannot create config directory %s"), + driver->configDir); return -1; } diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 59873d7..71b3550 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1106,10 +1106,8 @@ int qemudExtractVersion(virConnectPtr conn, return -1; if (stat(binary, &sb) < 0) { - char ebuf[1024]; - qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("Cannot find QEMU binary %s: %s"), binary, - virStrerror(errno, ebuf, sizeof ebuf)); + virReportSystemError(conn, errno, + _("Cannot find QEMU binary %s"), binary); return -1; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0470315..e8606c8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1773,7 +1773,7 @@ static int qemuDomainSetHostdevOwnership(virConnectPtr conn, } return 0; #else - qemudReportError(conn, NULL, NULL, "%s", + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SUPPORT, "%s", _("unable to set host device ownership on this platform")); return -1; #endif diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 16de0f2..6db51cd 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -112,7 +112,7 @@ profile_status_file(const char *str) if (snprintf(profile, PATH_MAX, "%s/%s", APPARMOR_DIR "/libvirt", str) > PATH_MAX - 1) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("profile name exceeds maximum length")); } @@ -204,7 +204,7 @@ load_profile(virConnectPtr conn, const char *profile, virDomainObjPtr vm, if (errno == EINTR) goto rewait; - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("Unexpected exit status from virt-aa-helper " "%d pid %lu"), WEXITSTATUS(status), (unsigned long)child); @@ -265,7 +265,7 @@ use_apparmor(void) if ((len = readlink("/proc/self/exe", libvirt_daemon, PATH_MAX - 1)) < 0) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("could not find libvirtd")); return rc; } @@ -289,13 +289,13 @@ AppArmorSecurityDriverProbe(void) /* see if template file exists */ if (snprintf(template, PATH_MAX, "%s/TEMPLATE", APPARMOR_DIR "/libvirt") > PATH_MAX - 1) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("template too large")); return SECURITY_DRIVER_DISABLE; } if (!virFileExists(template)) { - virSecurityReportError(NULL, VIR_ERR_ERROR, + virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, _("template \'%s\' does not exist"), template); return SECURITY_DRIVER_DISABLE; } @@ -326,7 +326,7 @@ AppArmorGenSecurityLabel(virConnectPtr conn, virDomainObjPtr vm) if ((vm->def->seclabel.label) || (vm->def->seclabel.model) || (vm->def->seclabel.imagelabel)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("security label already defined for VM")); return rc; @@ -338,7 +338,7 @@ AppArmorGenSecurityLabel(virConnectPtr conn, virDomainObjPtr vm) /* if the profile is not already loaded, then load one */ if (profile_loaded(profile_name) < 0) { if (load_profile(conn, profile_name, vm, NULL) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot generate AppArmor profile " "\'%s\'"), profile_name); goto clean; @@ -395,13 +395,13 @@ AppArmorGetSecurityLabel(virConnectPtr conn, if (virStrcpy(sec->label, profile_name, VIR_SECURITY_LABEL_BUFLEN) == NULL) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("error copying profile name")); goto clean; } if ((sec->enforcing = profile_status(profile_name, 1)) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("error calling profile_status()")); goto clean; } @@ -424,7 +424,7 @@ AppArmorRestoreSecurityLabel(virConnectPtr conn, virDomainObjPtr vm) if (secdef->imagelabel) { if ((rc = remove_profile(secdef->label)) != 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("could not remove profile for \'%s\'"), secdef->label); } @@ -450,7 +450,7 @@ AppArmorSetSecurityLabel(virConnectPtr conn, return rc; if (STRNEQ(drv->name, secdef->model)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "\'%s\' model configured for domain, but " "hypervisor driver is \'%s\'."), @@ -460,7 +460,7 @@ AppArmorSetSecurityLabel(virConnectPtr conn, } if (aa_change_profile(profile_name) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("error calling aa_change_profile()")); goto clean; } @@ -490,7 +490,7 @@ AppArmorRestoreSecurityImageLabel(virConnectPtr conn, /* Update the profile only if it is loaded */ if (profile_loaded(secdef->imagelabel) >= 0) { if (load_profile(conn, secdef->imagelabel, vm, NULL) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " "\'%s\'"), secdef->imagelabel); @@ -520,7 +520,7 @@ AppArmorSetSecurityImageLabel(virConnectPtr conn, if (secdef->imagelabel) { /* if the device doesn't exist, error out */ if (!virFileExists(disk->src)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("\'%s\' does not exist"), disk->src); return rc; } @@ -531,7 +531,7 @@ AppArmorSetSecurityImageLabel(virConnectPtr conn, /* update the profile only if it is loaded */ if (profile_loaded(secdef->imagelabel) >= 0) { if (load_profile(conn, secdef->imagelabel, vm, disk) < 0) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot update AppArmor profile " "\'%s\'"), secdef->imagelabel); diff --git a/src/security/security_driver.c b/src/security/security_driver.c index 43d52b1..4e6172d 100644 --- a/src/security/security_driver.c +++ b/src/security/security_driver.c @@ -123,7 +123,7 @@ virSecurityDriverSetDOI(virConnectPtr conn, const char *doi) { if (strlen(doi) >= VIR_SECURITY_DOI_BUFLEN) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("%s: DOI \'%s\' is " "longer than the maximum allowed length of %d"), __func__, doi, VIR_SECURITY_DOI_BUFLEN - 1); diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 6a03af7..0e31077 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -189,13 +189,13 @@ SELinuxGenSecurityLabel(virConnectPtr conn, vm->def->seclabel.label = SELinuxGenNewContext(default_domain_context, mcs); if (! vm->def->seclabel.label) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); goto err; } vm->def->seclabel.imagelabel = SELinuxGenNewContext(default_image_context, mcs); if (! vm->def->seclabel.imagelabel) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); goto err; } @@ -285,9 +285,9 @@ SELinuxGetSecurityLabel(virConnectPtr conn, } if (strlen((char *) ctx) >= VIR_SECURITY_LABEL_BUFLEN) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("security label exceeds " - "maximum lenth: %d"), + "maximum length: %d"), VIR_SECURITY_LABEL_BUFLEN - 1); return -1; } @@ -647,7 +647,7 @@ SELinuxSetSecurityLabel(virConnectPtr conn, int i; if (!STREQ(drv->name, secdef->model)) { - virSecurityReportError(conn, VIR_ERR_ERROR, + virSecurityReportError(conn, VIR_ERR_INTERNAL_ERROR, _("security label driver mismatch: " "'%s' model configured for domain, but " "hypervisor driver is '%s'."), diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 3aa3c30..e107d1e 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2298,9 +2298,7 @@ get_cpu_flags(virConnectPtr conn, const char **hvm, int *pae, int *longmode) if ((fd = open("/dev/cpu/self/cpuid", O_RDONLY)) == -1 || pread(fd, &regs, sizeof(regs), 0) != sizeof(regs)) { - char ebuf[1024]; - virXenError(conn, VIR_ERR_SYSTEM_ERROR, - "couldn't read CPU flags: %s", virStrerror(errno, ebuf, sizeof ebuf)); + virReportSystemError(conn, errno, "%s", _("could not read CPU flags")); goto out; } diff --git a/tests/cpuset b/tests/cpuset index 9f43269..89c19e0 100755 --- a/tests/cpuset +++ b/tests/cpuset @@ -41,7 +41,7 @@ sed "s/vcpu>/vcpu cpuset='aaa'>/" xml > xml-invalid || fail=1 $abs_top_builddir/tools/virsh --connect test:///default define xml-invalid > out 2>&1 && fail=1 cat <<\EOF > exp || fail=1 error: Failed to define domain from xml-invalid -error: failed Xen syscall topology cpuset syntax error +error: internal error topology cpuset syntax error EOF compare exp out || fail=1 -- 1.6.5.1

2 2

[libvirt] [PATCH v2] Improve error reporting for virConnectGetHostname calls
by Cole Robinson 03 Nov '09

03 Nov '09

All drivers have copy + pasted inadequate error reporting which wraps util.c:virGetHostname. Move all error reporting to this function, and improve what we report. Changes from v1: Drop the driver wrappers around virGetHostname. This means we still need to keep the new conn argument to virGetHostname, but I think it's worth it. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/libvirtd.c | 7 +++---- src/lxc/lxc_driver.c | 16 +--------------- src/qemu/qemu_driver.c | 22 ++-------------------- src/test/test_driver.c | 16 +--------------- src/uml/uml_driver.c | 17 +---------------- src/util/util.c | 18 +++++++++++++++--- src/util/util.h | 2 +- src/vbox/vbox_tmpl.c | 16 +--------------- src/xen/xen_driver.c | 20 +------------------- src/xen/xend_internal.c | 6 ++---- tools/virsh.c | 2 +- 11 files changed, 29 insertions(+), 113 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 0615cd2..322a320 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -993,11 +993,10 @@ static int qemudNetworkInit(struct qemud_server *server) { if (!mdns_name) { char groupname[64], *localhost, *tmp; /* Extract the host part of the potentially FQDN */ - localhost = virGetHostname(); - if (localhost == NULL) { - virReportOOMError(NULL); + localhost = virGetHostname(NULL); + if (localhost == NULL) goto cleanup; - } + if ((tmp = strchr(localhost, '.'))) *tmp = '\0'; snprintf(groupname, sizeof(groupname)-1, "Virtualization Host %s", localhost); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 47e59f6..05fc48d 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2027,20 +2027,6 @@ cleanup: return ret; } -static char *lxcGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int lxcFreezeContainer(lxc_driver_t *driver, virDomainObjPtr vm) { int timeout = 1000; /* In milliseconds */ @@ -2258,7 +2244,7 @@ static virDriver lxcDriver = { NULL, /* supports_feature */ NULL, /* type */ lxcVersion, /* version */ - lxcGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ NULL, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ lxcGetCapabilities, /* getCapabilities */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 437a1b4..0470315 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2610,21 +2610,6 @@ cleanup: return ret; } -static char * -qemudGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int qemudListDomains(virConnectPtr conn, int *ids, int nids) { struct qemud_driver *driver = conn->privateData; int n; @@ -6248,11 +6233,8 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; /* Get hostname */ - if ((hostname = virGetHostname()) == NULL) { - virReportSystemError (dconn, errno, - "%s", _("failed to determine host name")); + if ((hostname = virGetHostname(dconn)) == NULL) goto cleanup; - } /* XXX this really should have been a properly well-formed * URI, but we can't add in tcp:// now without breaking @@ -7084,7 +7066,7 @@ static virDriver qemuDriver = { qemudSupportsFeature, /* supports_feature */ qemudGetType, /* type */ qemudGetVersion, /* version */ - qemudGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ qemudGetMaxVCPUs, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ qemudGetCapabilities, /* getCapabilities */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 7e19072..31b5ad3 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1023,20 +1023,6 @@ static int testGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, return (0); } -static char *testGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int testGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type ATTRIBUTE_UNUSED) { @@ -4674,7 +4660,7 @@ static virDriver testDriver = { NULL, /* supports_feature */ NULL, /* type */ testGetVersion, /* version */ - testGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ testGetMaxVCPUs, /* getMaxVcpus */ testNodeGetInfo, /* nodeGetInfo */ testGetCapabilities, /* getCapabilities */ diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index fac3c4c..2455b92 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1146,21 +1146,6 @@ cleanup: return ret; } -static char * -umlGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int umlListDomains(virConnectPtr conn, int *ids, int nids) { struct uml_driver *driver = conn->privateData; int n; @@ -1790,7 +1775,7 @@ static virDriver umlDriver = { NULL, /* supports_feature */ umlGetType, /* type */ umlGetVersion, /* version */ - umlGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ NULL, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ umlGetCapabilities, /* getCapabilities */ diff --git a/src/util/util.c b/src/util/util.c index 08070da..853d3a0 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1805,30 +1805,42 @@ int virDiskNameToIndex(const char *name) { #define AI_CANONIDN 0 #endif -char *virGetHostname(void) +char *virGetHostname(virConnectPtr conn) { int r; char hostname[HOST_NAME_MAX+1], *result; struct addrinfo hints, *info; r = gethostname (hostname, sizeof(hostname)); - if (r == -1) + if (r == -1) { + virReportSystemError (conn, errno, + "%s", _("failed to determine host name")); return NULL; + } NUL_TERMINATE(hostname); memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME|AI_CANONIDN; hints.ai_family = AF_UNSPEC; r = getaddrinfo(hostname, NULL, &hints, &info); - if (r != 0) + if (r != 0) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("getaddrinfo failed for '%s': %s"), + hostname, gai_strerror(r)); return NULL; + } if (info->ai_canonname == NULL) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("could not determine canonical host name")); freeaddrinfo(info); return NULL; } /* Caller frees this string. */ result = strdup (info->ai_canonname); + if (!result) + virReportOOMError(conn); + freeaddrinfo(info); return result; } diff --git a/src/util/util.h b/src/util/util.h index 3ef26e6..f4e395e 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -222,7 +222,7 @@ static inline int getuid (void) { return 0; } static inline int getgid (void) { return 0; } #endif -char *virGetHostname(void); +char *virGetHostname(virConnectPtr conn); int virKillProcess(pid_t pid, int sig); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index aecda23..c6305ac 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -591,20 +591,6 @@ static int vboxGetVersion(virConnectPtr conn, unsigned long *version) { return 0; } -static char *vboxGetHostname(virConnectPtr conn) { - char *hostname; - - /* the return string should be freed by caller */ - hostname = virGetHostname(); - if (hostname == NULL) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s", - "failed to determine host name"); - return NULL; - } - - return hostname; -} - static int vboxGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) { vboxGlobalData *data = conn->privateData; PRUint32 maxCPUCount = 0; @@ -6402,7 +6388,7 @@ virDriver NAME(Driver) = { NULL, /* supports_feature */ NULL, /* type */ vboxGetVersion, /* version */ - vboxGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ vboxGetMaxVcpus, /* getMaxVcpus */ nodeGetInfo, /* nodeGetInfo */ vboxGetCapabilities, /* getCapabilities */ diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index f2744b0..6dc4ac0 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -478,24 +478,6 @@ xenUnifiedGetVersion (virConnectPtr conn, unsigned long *hvVer) return -1; } -/* NB: Even if connected to the proxy, we're still on the - * same machine. - */ -static char * -xenUnifiedGetHostname (virConnectPtr conn) -{ - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } - /* Caller frees this string. */ - return result; -} - static int xenUnifiedGetMaxVcpus (virConnectPtr conn, const char *type) { @@ -1659,7 +1641,7 @@ static virDriver xenUnifiedDriver = { xenUnifiedSupportsFeature, /* supports_feature */ xenUnifiedType, /* type */ xenUnifiedGetVersion, /* version */ - xenUnifiedGetHostname, /* getHostname */ + virGetHostname, /* getHostname */ xenUnifiedGetMaxVcpus, /* getMaxVcpus */ xenUnifiedNodeGetInfo, /* nodeGetInfo */ xenUnifiedGetCapabilities, /* getCapabilities */ diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index d3ab019..9080754 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -4347,11 +4347,9 @@ xenDaemonDomainMigratePrepare (virConnectPtr dconn, * deallocates this string. */ if (uri_in == NULL) { - *uri_out = virGetHostname(); - if (*uri_out == NULL) { - virReportOOMError(dconn); + *uri_out = virGetHostname(dconn); + if (*uri_out == NULL) return -1; - } } return 0; diff --git a/tools/virsh.c b/tools/virsh.c index 6b93405..3c668da 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -524,7 +524,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) char *thatHost = NULL; char *thisHost = NULL; - if (!(thisHost = virGetHostname())) { + if (!(thisHost = virGetHostname(ctl->conn))) { vshError(ctl, "%s", _("Failed to get local hostname")); goto cleanup; } -- 1.6.5.1

2 2

[libvirt] [PATCH] Make monitor type (miimon/arpmon) optional in bond xml.
by Laine Stump 03 Nov '09

03 Nov '09

Lack of one of these in the live xml output was causing the parse to fail. --- src/conf/interface_conf.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 31af957..31abf12 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -631,13 +631,17 @@ static int virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def, xmlXPathContextPtr ctxt) { xmlNodePtr node; - int ret = 0; + int ret = -1; unsigned long tmp; def->data.bond.mode = virInterfaceDefParseBondMode(conn, ctxt); if (def->data.bond.mode < 0) goto error; + ret = virInterfaceDefParseBondItfs(conn, def, ctxt); + if (ret != 0) + goto error; + node = virXPathNode(conn, "./miimon[1]", ctxt); if (node != NULL) { def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_MII; @@ -669,15 +673,13 @@ virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def, } def->data.bond.carrier = virInterfaceDefParseBondMiiCarrier(conn, ctxt); - if (def->data.bond.carrier < 0) + if (def->data.bond.carrier < 0) { + ret = -1; goto error; + } - ret = virInterfaceDefParseBondItfs(conn, def, ctxt); + } else if ((node = virXPathNode(conn, "./arpmon[1]", ctxt)) != NULL) { - goto done; - } - node = virXPathNode(conn, "./arpmon[1]", ctxt); - if (node != NULL) { def->data.bond.monit = VIR_INTERFACE_BOND_MONIT_ARP; ret = virXPathULong(conn, "string(./arpmon/@interval)", ctxt, &tmp); @@ -693,23 +695,17 @@ virInterfaceDefParseBond(virConnectPtr conn, virInterfaceDefPtr def, if (def->data.bond.target == NULL) { virInterfaceReportError(conn, VIR_ERR_XML_ERROR, "%s", _("bond interface arpmon target missing")); + ret = -1; goto error; } def->data.bond.validate = virInterfaceDefParseBondArpValid(conn, ctxt); - if (def->data.bond.validate < 0) + if (def->data.bond.validate < 0) { + ret = -1; goto error; - - ret = virInterfaceDefParseBondItfs(conn, def, ctxt); - - goto done; + } } - - virInterfaceReportError(conn, VIR_ERR_XML_ERROR, - "%s", _("bond interface need miimon or arpmon element")); error: - ret = -1; -done: return(ret); } @@ -1109,11 +1105,6 @@ virInterfaceBondDefFormat(virConnectPtr conn, virBufferPtr buf, else if (def->data.bond.validate == VIR_INTERFACE_BOND_ARP_ALL) virBufferAddLit(buf, " validate='all'"); virBufferAddLit(buf, "/>\n"); - } else { - virInterfaceReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("bond monitoring type %d unknown"), - def->data.bond.monit); - return(-1); } for (i = 0;i < def->data.bond.nbItf;i++) { if (virInterfaceBareDevDefFormat(conn, buf, def->data.bond.itf[i]) < 0) -- 1.6.5.15.gc274d

2 1

[libvirt] [PATCH 0/3] IPv6 / multi address / report live config in virInterface
by laine＠laine.org 03 Nov '09

03 Nov '09

This is the 2nd iteration of this patchset incorporating danpb's suggestions. Along with a couple other minor things, the type attribute is again a required attribute, and netcf support will be omitted in the build unless you have netcf-devel-0.1.3 or greater. Since there is no netcf-devel-0.1.3 yet, I tested this by changing the appropriate strings to 0.1.2. 0.1.3 will be released "soon" (I want to try and get IPv6 address reporting in before lutter cuts another release). I just wanted to get the patches to the list early to get some visual review in case I screwed up anything new ;-) Note that (unless you're building/installing netcf from the head of git) if you try to fake out the version of netcf yourself you'll get runtime errors from virInterfaceGetXMLDesc (iface-dumpxml) due to there being no "type" attribute in the interface xml.

4 21

[libvirt] [PATCH] give up python interpreter lock before calling cb
by Dan Kenigsberg 03 Nov '09

03 Nov '09

suggested by danpb on irc --- python/libvirt-override.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 5d24fd2..53e36c0 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2355,7 +2355,9 @@ libvirt_virEventInvokeHandleCallback(PyObject *self ATTRIBUTE_UNUSED, opaque = (void *) PyvirVoidPtr_Get(py_opaque); if(cb) + LIBVIRT_BEGIN_ALLOW_THREADS cb (watch, fd, event, opaque); + LIBVIRT_END_ALLOW_THREADS return VIR_PY_INT_SUCCESS; } @@ -2379,7 +2381,9 @@ libvirt_virEventInvokeTimeoutCallback(PyObject *self ATTRIBUTE_UNUSED, cb = (virEventTimeoutCallback) PyvirEventTimeoutCallback_Get(py_f); opaque = (void *) PyvirVoidPtr_Get(py_opaque); if(cb) + LIBVIRT_BEGIN_ALLOW_THREADS cb (timer, opaque); + LIBVIRT_END_ALLOW_THREADS return VIR_PY_INT_SUCCESS; } -- 1.6.2.5

3 3

[libvirt] The 0.7.3 release schedule
by Daniel Veillard 03 Nov '09

03 Nov '09

Well, clearly we can't keep up with the current plan, we should be in freeze right now and there is an awful lot of patches on the list waiting for review and push. Let's try to push everything by this week-end and have next week as the testing and freeze time. Maybe we can squeeze everything in time, that would allow the release by the Friday 13th (unless we want to avoid that ;-) Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH] Allow NULL mac address in virGetInterface.
by Laine Stump 03 Nov '09

03 Nov '09

There are places where an interface will not have a mac address, and netcf returns this as a NULL pointer rather than a pointer to an empty string. Rather than checking for this all over the place in libvirt, just save it in the virInterface object as an empty string. --- src/datatypes.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index 89ad309..ecefc59 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -588,10 +588,15 @@ virInterfacePtr virGetInterface(virConnectPtr conn, const char *name, const char *mac) { virInterfacePtr ret = NULL; - if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (mac == NULL)) { + if ((!VIR_IS_CONNECT(conn)) || (name == NULL)) { virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return(NULL); } + + /* a NULL mac from caller is okay. Treat it as blank */ + if (mac == NULL) + mac = ""; + virMutexLock(&conn->lock); ret = (virInterfacePtr) virHashLookup(conn->interfaces, name); -- 1.6.5.15.gc274d

2 3

[libvirt] [PATCH] Remove redundant virFileDeletePID() call
by Chris Lalancette 03 Nov '09

03 Nov '09

qemudShutdownVMDaemon() calls qemudRemoveDomainStatus(), which then calls virFileDeletePID(). qemudShutdownVMDaemon() then unnecessarily calls virFileDeletePID() again. Remove this second usage of it, and also slightly refactor qemudRemoveDomainStatus() to VIR_WARN appropriate error messages. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu/qemu_driver.c | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fd064af..38fe19e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -269,7 +269,7 @@ qemudRemoveDomainStatus(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm) { - int rc = -1; + char ebuf[1024]; char *file = NULL; if (virAsprintf(&file, "%s/%s.xml", driver->stateDir, vm->def->name) < 0) { @@ -277,19 +277,14 @@ qemudRemoveDomainStatus(virConnectPtr conn, goto cleanup; } - if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) { - qemudReportError(conn, vm, NULL, VIR_ERR_INTERNAL_ERROR, - _("Failed to unlink status file %s"), file); - goto cleanup; - } - - if(virFileDeletePid(driver->stateDir, vm->def->name)) - goto cleanup; + if (unlink(file) < 0 && errno != ENOENT && errno != ENOTDIR) + VIR_WARN(_("Failed to remove domain XML for %s: %s"), + vm->def->name, virStrerror(errno, buf, sizeof(ebuf))); + if (virFileDeletePid(driver->stateDir, vm->def->name) != 0) + VIR_WARN(_("Failed to remove PID file for %s: %s"), + vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); - rc = 0; -cleanup: - VIR_FREE(file); - return rc; + return 0; } @@ -2224,15 +2219,7 @@ retry: vm->def->name); } - if (qemudRemoveDomainStatus(conn, driver, vm) < 0) { - VIR_WARN(_("Failed to remove domain status for %s"), - vm->def->name); - } - if ((ret = virFileDeletePid(driver->stateDir, vm->def->name)) != 0) { - char ebuf[1024]; - VIR_WARN(_("Failed to remove PID file for %s: %s"), - vm->def->name, virStrerror(errno, ebuf, sizeof ebuf)); - } + qemudRemoveDomainStatus(conn, driver, vm); vm->pid = -1; vm->def->id = -1; -- 1.6.0.6

2 2

[libvirt] [PATCH 00/21] Rewrite the QEMU monitor handling
by Daniel P. Berrange 03 Nov '09

03 Nov '09

This patch series rewrites the QEMU monitor handling almost completely. The key theme here is to move from a totally synchronous way of interacting with the monitor, to a totally asynchronous way. This allows us to handle receipt & dispatch of asychronous events from QEMU. For example a notification of a disk-full error, or VM state change. In the process of doing this re-factoring I have also dropped in basic support/infrastructure for the JSON based monitor. The basic JSON parsing/formatting is working, but this needs to wait until QEMU community finalize their monitor syntax for the new commands & what args they accept. Daniel

5 45

[libvirt] cannot get virt-manager to see VM
by Gerry Reno 02 Nov '09

02 Nov '09

I used qemu-img to create a raw image. I then create an xml file with no uuid but a new name and new mac address. Then I did a 'virsh define NEW.img'. When I do a 'virsh list --all' the new VM is there but shut_off. But this new machine does not appear in virt-manager. What do I need to do to get the new machine to appear in the list of machines in virt-manager? I want to start this machine using virt-manager. This is on F11 with libvirt 0.6.2. -Gerry

1 0

[libvirt] [REPOST] Fix --with-init-script configure option
by Matthew Booth 02 Nov '09

02 Nov '09

Looks like this one might have dropped off the radar.

3 3

[libvirt] [PATCH] ESX: Don't automatically follow redirects.
by Matthias Bolte 02 Nov '09

02 Nov '09

The default transport for the VI API is HTTPS. If the server redirects from HTTPS to HTTP the driver would silently follow that redirection. The user assumes to communicate with the server over a secure transport but isn't. This patch disables automatical redirection following. The driver reports an error if the server tries to redirect. * src/esx/esx_vi.c: refactor the call to curl_easy_perform() into a function and do error handling there, disable automatical redirection following for curl * src/esx/esx_vi.h: change the type of responseCode to int --- src/esx/esx_vi.c | 166 +++++++++++++++++++++++++++--------------------------- src/esx/esx_vi.h | 2 +- 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index dc51e20..bcf110f 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -216,6 +216,68 @@ esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, } #endif +static int +esxVI_CURL_Perform(virConnectPtr conn, esxVI_Context *ctx, const char *url) +{ + CURLcode errorCode; + long responseCode = 0; +#if LIBCURL_VERSION_NUM >= 0x071202 /* 7.18.2 */ + const char *redirectUrl = NULL; +#endif + + errorCode = curl_easy_perform(ctx->curl_handle); + + if (errorCode != CURLE_OK) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_perform() returned an error: %s (%d)", + curl_easy_strerror(errorCode), errorCode); + return -1; + } + + errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, + &responseCode); + + if (errorCode != CURLE_OK) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned an " + "error: %s (%d)", curl_easy_strerror(errorCode), + errorCode); + return -1; + } + + if (responseCode < 0) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_getinfo(CURLINFO_RESPONSE_CODE) returned a " + "negative response code"); + return -1; + } + + if (responseCode == 301) { +#if LIBCURL_VERSION_NUM >= 0x071202 /* 7.18.2 */ + errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_REDIRECT_URL, + &redirectUrl); + + if (errorCode != CURLE_OK) { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "curl_easy_getinfo(CURLINFO_REDIRECT_URL) returned " + "an error: %s (%d)", curl_easy_strerror(errorCode), + errorCode); + } else { + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "The server redirects from '%s' to '%s'", url, + redirectUrl); + } +#else + ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "The server redirects from '%s'", url); +#endif + + return -1; + } + + return responseCode; +} + int esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, const char *ipAddress, const char *username, @@ -269,7 +331,7 @@ esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, curl_easy_setopt(ctx->curl_handle, CURLOPT_URL, ctx->url); curl_easy_setopt(ctx->curl_handle, CURLOPT_USERAGENT, "libvirt-esx"); curl_easy_setopt(ctx->curl_handle, CURLOPT_HEADER, 0); - curl_easy_setopt(ctx->curl_handle, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(ctx->curl_handle, CURLOPT_FOLLOWLOCATION, 0); curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYPEER, noVerify ? 0 : 1); curl_easy_setopt(ctx->curl_handle, CURLOPT_SSL_VERIFYHOST, noVerify ? 0 : 2); curl_easy_setopt(ctx->curl_handle, CURLOPT_COOKIEFILE, ""); @@ -433,8 +495,7 @@ esxVI_Context_DownloadFile(virConnectPtr conn, esxVI_Context *ctx, const char *url, char **content) { virBuffer buffer = VIR_BUFFER_INITIALIZER; - CURLcode errorCode; - long responseCode; + int responseCode = 0; if (content == NULL || *content != NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); @@ -448,27 +509,19 @@ esxVI_Context_DownloadFile(virConnectPtr conn, esxVI_Context *ctx, curl_easy_setopt(ctx->curl_handle, CURLOPT_UPLOAD, 0); curl_easy_setopt(ctx->curl_handle, CURLOPT_HTTPGET, 1); - errorCode = curl_easy_perform(ctx->curl_handle); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } + responseCode = esxVI_CURL_Perform(conn, ctx, url); - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, - &responseCode); + virMutexUnlock(&ctx->curl_lock); - if (errorCode != CURLE_OK) { + if (responseCode < 0) { + goto failure; + } else if (responseCode != 200) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; + "HTTP response code %d while trying to download '%s'", + responseCode, url); + goto failure; } - virMutexUnlock(&ctx->curl_lock); - if (virBufferError(&buffer)) { virReportOOMError(conn); goto failure; @@ -476,32 +529,19 @@ esxVI_Context_DownloadFile(virConnectPtr conn, esxVI_Context *ctx, *content = virBufferContentAndReset(&buffer); - if (responseCode != 200) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d while trying to download '%s'", - (int)responseCode, url); - goto failure; - } - return 0; failure: free(virBufferContentAndReset(&buffer)); return -1; - - unlock: - virMutexUnlock(&ctx->curl_lock); - - goto failure; } int esxVI_Context_UploadFile(virConnectPtr conn, esxVI_Context *ctx, const char *url, const char *content) { - CURLcode errorCode; - long responseCode; + int responseCode = 0; if (content == NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); @@ -515,40 +555,20 @@ esxVI_Context_UploadFile(virConnectPtr conn, esxVI_Context *ctx, curl_easy_setopt(ctx->curl_handle, CURLOPT_UPLOAD, 1); curl_easy_setopt(ctx->curl_handle, CURLOPT_INFILESIZE, strlen(content)); - errorCode = curl_easy_perform(ctx->curl_handle); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } - - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, - &responseCode); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } + responseCode = esxVI_CURL_Perform(conn, ctx, url); virMutexUnlock(&ctx->curl_lock); - if (responseCode != 200 && responseCode != 201) { + if (responseCode < 0) { + return -1; + } else if (responseCode != 200 && responseCode != 201) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "HTTP response code %d while trying to upload to '%s'", - (int)responseCode, url); + responseCode, url); return -1; } return 0; - - unlock: - virMutexUnlock(&ctx->curl_lock); - - return -1; } int @@ -558,7 +578,6 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, { virBuffer buffer = VIR_BUFFER_INITIALIZER; esxVI_Fault *fault = NULL; - CURLcode errorCode; if (request == NULL || response == NULL || *response != NULL) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Invalid argument"); @@ -577,27 +596,14 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, curl_easy_setopt(ctx->curl_handle, CURLOPT_POSTFIELDS, request); curl_easy_setopt(ctx->curl_handle, CURLOPT_POSTFIELDSIZE, strlen(request)); - errorCode = curl_easy_perform(ctx->curl_handle); - - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_perform() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; - } + (*response)->responseCode = esxVI_CURL_Perform(conn, ctx, ctx->url); - errorCode = curl_easy_getinfo(ctx->curl_handle, CURLINFO_RESPONSE_CODE, - &(*response)->responseCode); + virMutexUnlock(&ctx->curl_lock); - if (errorCode != CURLE_OK) { - ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "curl_easy_getinfo() returned an error: %s (%d)", - curl_easy_strerror(errorCode), errorCode); - goto unlock; + if ((*response)->responseCode < 0) { + goto failure; } - virMutexUnlock(&ctx->curl_lock); - if (virBufferError(&buffer)) { virReportOOMError(conn); goto failure; @@ -695,8 +701,7 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, } } else if ((*response)->responseCode != 200) { ESX_VI_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "HTTP response code %d", (int)(*response)->responseCode); - + "HTTP response code %d", (*response)->responseCode); goto failure; } @@ -708,11 +713,6 @@ esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, esxVI_Fault_Free(&fault); return -1; - - unlock: - virMutexUnlock(&ctx->curl_lock); - - goto failure; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 4892fde..4b3005e 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -110,7 +110,7 @@ int esxVI_Context_Execute(virConnectPtr conn, esxVI_Context *ctx, */ struct _esxVI_Response { - long responseCode; /* required */ + int responseCode; /* required */ char *content; /* required */ xmlDocPtr document; /* optional */ xmlXPathContextPtr xpathContext; /* optional */ -- 1.6.0.4

3 5

[libvirt] [patch] Add openvzDomainSetMemoryInternal
by Yuji NISHIDA 02 Nov '09

02 Nov '09

Hi all, This patch is to set KMEMSIZE for OpenVZ. This function is used for initializing the parameter of KMEMSIZE to start container. openvzDomainSetMemory should be left for another purpose so I added new one. I think users should specify memory as kbyte ( or bigger ). --- src/openvz/openvz_driver.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index f64ad1e..5c1fefa 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -69,6 +69,7 @@ static int openvzGetMaxVCPUs(virConnectPtr conn, const char *type); static int openvzDomainGetMaxVcpus(virDomainPtr dom); static int openvzDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus); static int openvzDomainSetVcpusInternal(virConnectPtr conn, virDomainObjPtr vm, unsigned int nvcpus); +static int openvzDomainSetMemoryInternal(virConnectPtr conn, virDomainObjPtr vm, unsigned long memory); static void openvzDriverLock(struct openvz_driver *driver) { @@ -803,6 +804,14 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml) } } + if (vm->def->memory > 0) { + if (openvzDomainSetMemoryInternal(conn, vm, vm->def->memory) < 0) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Could not set memory size")); + goto cleanup; + } + } + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = -1; @@ -1364,6 +1373,29 @@ static int openvzNumDefinedDomains (virConnectPtr conn) { return ninactive; } +static int openvzDomainSetMemoryInternal(virConnectPtr conn, virDomainObjPtr vm, + unsigned long mem) { + struct openvz_driver *driver = conn->privateData; + char str_mem[16]; + const char *prog[] = { VZCTL, "--quiet", "set", PROGRAM_SENTINAL, + "--kmemsize", str_mem, "--save", NULL }; + + /* memory has to be changed its format from kbyte to byte */ + snprintf( str_mem, sizeof(str_mem), "%lu", mem * 1024 ); + + openvzSetProgramSentinal(prog, vm->def->name); + if (virRun(conn, prog, NULL) < 0) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + _("Could not exec %s"), VZCTL); + goto cleanup; + } + + return 0; + +cleanup: + return -1; +} + static virDriver openvzDriver = { VIR_DRV_OPENVZ, "OPENVZ", -- 1.5.3.4 ----- Yuji Nishida nishidy(a)nict.go.jp

2 1

[libvirt] Don't use private struct member names of in6_addr
by Matthias Bolte 02 Nov '09

02 Nov '09

__in6_u.__u6_addr16 is the private name for this struct member, s6_addr16 is the public one. Our buildserver revealed this problem, because for some reason the internal names are missing the __ prefix there. Matthias

2 2

[libvirt] Remaining interface state reporting issue - bond options
by Laine Stump 02 Nov '09

02 Nov '09

With the patches I sent to netcf-devel last night, along with lutter's (or DV's, take your pick ;-) netcf patch to eliminate the segfault, my patches for reporting interface info now pass make check with no errors. I believe lutter will be making a netcf release tomorrow or so, after he gets back on solid ground. There is one issue left that I'm unsure what to do about - while the xml returned from netcf for bond interfaces does list all the slave interfaces of the bond and their types (and any required info for that type), the parser for bond info in libvirt requires either an miimon or arpmode node inside the bond, eg: <interface type="bond" name="bond0"> <bond> <miimon freq="100" updelay="10" carrier="ioctl"/> <interface type="ethernet" name="eth1"/> <interface type="ethernet" name="eth0"/> </bond> </interface> I haven't been able to find a source of this information yet and, while it may be useful, I don't see it as necessary. Once again I'm proposing that we make these optional in the XML, such that this would be acceptable: <interface type="bond" name="bond0"> <bond> <interface type="ethernet" name="eth1"/> <interface type="ethernet" name="eth0"/> </bond> </interface> Once we do that, the netcf-reported state of all 4 supported interface types (ethernet, bridge, vlan, bond) will pass libvirt's parsing test.

2 2

[libvirt] Add support for qemu's guestfwd
by Matthew Booth 02 Nov '09

02 Nov '09

This series adds support for a vmchannel using qemu's guestfwd. I'll be following up with support for virtio-serial and RHEL5's vmchannel. A vmchannel is specified as: <vmchannel type='pipe'> <source path='/tmp/vmchannel'/> <target type='guestfwd' address='10.0.2.1' port='4600'/> </vmchannel> There are a couple of minor complications. Firstly, the existing chrdev structure assumes that all front-ends take only a port. There's a bit of code churn adding a second union to this struct to allow for different data for different backends. Secondly, it turns out that the existing syntax for character devices doesn't really work for guestfwd. Specifically it won't allow common options to be added. This is fixed in qemu git with the new -chardev syntax. Consequently, this patch only adds support for guestfwd using -chardev. We add detection for -chardev, and a new internal utility function to output -chardev command lines for all existing character device backends. Matt

1 4

[libvirt] [PATCH] drop the -logrotate.conf from /etc/logrotate.d/ovirt-logrotate.conf
by Dan Kenigsberg 01 Nov '09

01 Nov '09

No Fedora package uses .conf in that directory; furthermore, rpmlint protests about it: the file name should match the name of the containing rpm. Let us conform. --- logrotate/ovirt-logrotate | 2 +- ovirt-node.spec.in | 4 ++-- scripts/ovirt-config-logging | 2 +- scripts/ovirt-functions | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/logrotate/ovirt-logrotate b/logrotate/ovirt-logrotate index a61af6f..ad32951 100644 --- a/logrotate/ovirt-logrotate +++ b/logrotate/ovirt-logrotate @@ -1,3 +1,3 @@ # Run each log rotation every 10 minutes -*/10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/ovirt-logrotate.conf +*/10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/ovirt-node-stateless */10 * * * * root /usr/sbin/logrotate /etc/logrotate.d/syslog diff --git a/ovirt-node.spec.in b/ovirt-node.spec.in index 3a8266e..20fea25 100644 --- a/ovirt-node.spec.in +++ b/ovirt-node.spec.in @@ -180,7 +180,7 @@ cd - %{__install} -p -m0755 kinit/ovirt-kinit %{buildroot}%{_sysconfdir}/cron.hourly %{__install} -p -m0644 logrotate/ovirt-logrotate %{buildroot}%{_sysconfdir}/cron.d -%{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d +%{__install} -p -m0644 logrotate/ovirt-logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/ovirt-node-stateless echo "oVirt Node release %{version}-%{release}" > %{buildroot}%{_sysconfdir}/ovirt-release mkdir -p %{buildroot}/%{_sysconfdir}/default @@ -310,7 +310,7 @@ fi %{_initrddir}/ovirt %{_initrddir}/ovirt-post %config %{_sysconfdir}/cron.hourly/ovirt-kinit -%config %{_sysconfdir}/logrotate.d/ovirt-logrotate.conf +%config %{_sysconfdir}/logrotate.d/ovirt-node-stateless %config %{_sysconfdir}/cron.d/ovirt-logrotate %{_sysconfdir}/ovirt-config-boot.d %{_sysconfdir}/ovirt-config-setup.d diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging index 464dfcb..de238b7 100755 --- a/scripts/ovirt-config-logging +++ b/scripts/ovirt-config-logging @@ -158,7 +158,7 @@ function prompt_user { $syslog_server_protocol fi sed -c -i -e "s/^size=.*/size=${max_log_size}k/" \ - /etc/logrotate.d/ovirt-logrotate.conf + /etc/logrotate.d/ovirt-node-stateless return ;; 1) diff --git a/scripts/ovirt-functions b/scripts/ovirt-functions index 98e88e7..7e84415 100644 --- a/scripts/ovirt-functions +++ b/scripts/ovirt-functions @@ -28,7 +28,7 @@ OVIRT_CONFIG_FILES="\ /etc/default/ovirt \ /etc/sysconfig/network \ /etc/collectd.conf \ - /etc/logrotate.d/ovirt-logrotate.conf + /etc/logrotate.d/ovirt-node-stateless " # Save stdout to fd 6 and stderr to fd 7. Redirect normal stdout/stderr -- 1.6.2.5

2 2

Re: [libvirt] [PATCH 10/21] Don't let parent of daemon exit until basic initialization is done
by Laurent Léonard 01 Nov '09

01 Nov '09

Hi, I'm not a C expert, but I see there is a use of an unitialized variable: default: { int got, exitstatus = 0; int ret; char status; close(statuspipe[1]); /* We wait to make sure the first child forked successfully */ if ((got = waitpid(pid, &exitstatus, 0)) < 0 || got != pid || status != 0) { <<< here return -1; } That explains the issue described by Guido, because he uses an i386 system. It was impossible for me to reproduce the issue because I use an amd64 system. char test; if (test == 0) puts("ok"); else puts("ko"); produces: - "ok" on amd64 system - "ko" on i386 system If I use the exitstatus variable in the test it seems to work great on both architectures. -- Laurent Léonard

2 1

[libvirt] [PATCH] network utilities
by Daniel Veillard 30 Oct '09

30 Oct '09

Revamping my previous patches to parse IPv4/6 numeric addresses, adding range computation and netmask checking entries too. As suggested I used an union for the socket address type: typedef union { struct sockaddr_storage stor; struct sockaddr_in inet4; struct sockaddr_in6 inet6; } virSocketAddr; typedef virSocketAddr *virSocketAddrPtr; But I wonder if it's not better to make it a struct and add the lenght of the address as this is usually needed when passing one of the struct sockaddr_* and that lenght is returned as part of parsing, keeping both together is probably more useful. A macro to get the type AF_INET/AF_INET6 out of a virSocketAddr might be useful instead of having the users manually guess that ->stor.ss_family is teh filed to look at. Also I wonder how useful the Ipv6 code for netmask and ranges really is, it seems that IPv6 mostly go with prefix and never use netmasks, maybe that's just dead code, maybe that's just wrong, anyway here it is. I named the header and file network.[ch] as I think other network related utilities like validation or generation of MAC addresses could well be moved in that file too. 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/

3 8

[libvirt] [PATCH] Fix up a bogus TLS message.
by Chris Lalancette 30 Oct '09

30 Oct '09

When working with the TLS transport, I noticed that every single time a remote stream was closed, I would get a message like: 09:09:40.793: error : remoteIOReadBuffer:7328 : failed to read from TLS socket A TLS packet with unexpected length was received. libvir: QEMU error : failed to read from TLS socket A TLS packet with unexpected length was received. in the logs. This happens because of a race in libvirtd; one thread handles the doRemoteClose(), which calls gnutls_bye() followed by close() while another thread is poll()'ing on the same fd. Once the close() happens, the poll returns with revents set to POLLIN, and we would poll one more time for data from the now-closed fd. Fix this situation by setting poll->session to NULL when we clean up, and check for that in remoteIOHandleInput(). Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/remote/remote_driver.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index bf001eb..335f44b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1389,6 +1389,7 @@ doRemoteClose (virConnectPtr conn, struct private_data *priv) if (priv->uses_tls && priv->session) { gnutls_bye (priv->session, GNUTLS_SHUT_RDWR); gnutls_deinit (priv->session); + priv->session = NULL; } #if HAVE_SASL if (priv->saslconn) @@ -7223,6 +7224,12 @@ remoteIOReadBuffer(virConnectPtr conn, int ret; if (priv->uses_tls) { + if (!priv->session) { + /* we may have reached here one more time after gnutls_bye() + * was called, so just return here + */ + return 0; + } tls_resend: ret = gnutls_record_recv (priv->session, bytes, len); if (ret == GNUTLS_E_INTERRUPTED) -- 1.6.0.6

3 3

[libvirt] Restore after restart libvirtd
by Diego Woitasen 30 Oct '09

30 Oct '09

Hi, I 'm playing with save/restore domains. It's working, but if I restart libvirtd after 'save domain file' and then try to restore it I get: error: Failed to restore domain from /tmp/domain.out error: operation failed: domain 'domainname' is already defined with uuid 17c77406-b6e3-621a-1fae-420affce8f48 If I move domainname.xml out of libvirt config. directory it works, but I think this should not be necessary. Regards, Diego -- Diego Woitasen

2 3

[libvirt] 0.7.1 compile fails on opensuse 11.1
by Dominik Klein 30 Oct '09

30 Oct '09

Hi it seems openSuSE 11.1 does not come with a pkgconfig for the device-mapper-devel package. I created a bug [1] for opensuse but was also told to mention it here so configure.in could be patched once the bug was fixed. Regards Dominik 1 https://bugzilla.novell.com/show_bug.cgi?id=54094

4 9

[libvirt] [PATCH] Priority of vzctl create should be lower
by Yuji NISHIDA 30 Oct '09

30 Oct '09

Hi all About OpenVZ, it uses vzctl command that produces tar/gzip commands. I think we should lower these commands for running other procedures prior to them. This is the patch to achieve it with nice/ionice commands. From ff3cf022995ef541136bd40579af2eeb20aeafdb Mon Sep 17 00:00:00 2001 From: root <root(a)node13.nvlab.org> Date: Mon, 26 Oct 2009 02:44:43 +0000 Subject: [PATCH] lower priority for running tar and gzip during vzctl create --- src/openvz/openvz_driver.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index f64ad1e..59d38ae 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -130,6 +130,14 @@ openvzDomainDefineCmd(virConnectPtr conn, } while (0) narg = 0; + + /* lower priority for running tar and gzip */ + ADD_ARG_LIT("nice"); + ADD_ARG_LIT("-n"); + ADD_ARG_LIT("19"); + ADD_ARG_LIT("ionice"); + ADD_ARG_LIT("-c3"); + ADD_ARG_LIT(VZCTL); ADD_ARG_LIT("--quiet"); ADD_ARG_LIT("create"); -- 1.5.3.4 ----- Yuji Nishida nishidy(a)nict.go.jp

3 3

[libvirt] QEMU driver thread safety rules
by Daniel P. Berrange 30 Oct '09

30 Oct '09

The current QEMU driver makes use of 2 locks - The driver lock - The virDomainObjPtr lock The idea is the driver lock is not held for long periods of time. Unfortunately we don't always deal with this very well - some code needs todo quite alot with the driver - particularly starting and stopping of guests. The bigger problem is that the virDomainObjPtr lock is often held for long periods, specifically whenever we invoke a monitor command. Some of these commands can take a very long time (even infinite if someone has send SIGSTOP to QEMU). This very quickly blocks the whole driver. I've realized that even with the series of monitor patches I sent out, changing the driver mutex to a RWLock, and adding a separate lock on the qemuMonitorPtr object iself, there's still a major concurrency problem: the virDomainObjPtr lock is held for too long. I propose to drop the RWLock patch, and do something totally different instead.... We fundamentally need to drop the virDomainObjPtr lock whenever we invoke a monitor command. Unfortunately, merely dropping the virDomainObjPtr and acquiring the qemuMonitorPtr is not safe. An API call which changes the VM state typically has 3 phases 1. Check what state/config the VM is in 2. Invoke the monitor command 3. Update the state/config of the VM If we release the virDomainObjPtr, and acquire qemuMonitorPtr at step 2, then other APIs calls will be able to complete their own step 1 checks, and get blocked at step 2. This is not safe, because when the original call moves onto step 3 and changes the state, this will have invalidated the checks the other sleeping API calls made in step 1. We need to prevent any API call starting step 1, for as long as there is a monitor command being run, even if the lock on virDomainObjPtr is not held. The only way I see todo this, is to introduce a condition variable indicating that a state change is to be made. Any API call which intends to make a state change must acquire this condition prior to step 1. They can thus safely do their checks, and move onto step 2, releasing the virDomainObj lock whle the monitor command is running, and reacquiring it after. All other API calls making changes get safely queued up at step 1, but API calls which simply wish to query information can run without being blocked at all. This fixes the major concurrency problem with running monitor commands. The use of a condition variable at the start of step 1, also allows us to time out API calls, if some other thread get stuck in the monitor for too long. I think this also makes the use of a RWLock on the QEMU driver unneccessary, since no code will ever be holding a mutex in any place that sleeps/wait. Only the condition variable will be held during sleeps/waits. Since we'll now effectively have 3 locks, and 1 condition variable this is getting kind of complex. So the rest of this mail is a file I propose to put in src/qemu/THREADS.txt describing what is going on, and showing the recommended design patterns to use. Daniel QEMU Driver Threading: The Rules ================================= This document describes how thread safety is ensured throughout the QEMU driver. The criteria for this model are: - Objects must never be exclusively locked for any pro-longed time - Code which sleeps must be able to time out after suitable period - Must be safe against dispatch asynchronous events from monitor Basic locking primitives ------------------------ There are a number of locks on various objects * struct qemud_driver: RWLock This is the top level lock on the entire driver. Every API call in the QEMU driver is blocked while this is held, though some internal callbacks may still run asynchronously. This lock must never be held for anything which sleeps/waits (ie monitor commands) When obtaining the driver lock, under *NO* circumstances must any lock be held on a virDomainObjPtr. This *WILL* result in deadlock. * virDomainObjPtr: Mutex Will be locked after calling any of the virDomainFindBy{ID,Name,UUID} methods. Lock must be held when changing/reading any variable in the virDomainObjPtr Once the lock is held, you must *NOT* try to lock the driver. You must release all virDomainObjPtr locks before locking the driver, or deadlock *WILL* occurr. If the lock needs to be dropped & then re-acquired for a short period of time, the reference count must be incremented first using virDomainObjRef(). If the reference count is incremented in this way, it is not neccessary to have the driver locked when re-acquiring the dropped locked, since the reference count prevents it being freed by another thread. This lock must not be held for anything which sleeps/waits (ie monitor commands). * qemuMonitorPrivatePtr: Job condition Since virDomainObjPtr lock must not be held during sleeps, the job condition provides additional protection for code making updates. Immediately after acquiring the virDomainObjPtr lock, any method which intends to update state, must acquire the job condition. The virDomainObjPtr lock is released while blocking on this condition variable. Once the job condition is acquired a method can safely release the virDomainObjPtr lock whenever it hits a piece of code which may sleep/wait, and re-acquire it after the sleep/ wait. * qemuMonitorPtr: Mutex Lock to be used when invoking any monitor command to ensure safety wrt any asynchronous events that may be dispatched from the monitor. It should be acquired before running a command. The job condition *MUST* be held before acquiring the monitor lock The virDomainObjPtr lock *MUST* be held before acquiring the monitor lock. The virDomainObjPtr lock *MUST* then be released when invoking the monitor command. The driver lock *MUST* be released when invoking the monitor commands. This ensures that the virDomainObjPtr & driver are both unlocked while sleeping/waiting for the monitor response. Helper methods -------------- To lock the driver qemuDriverLock() - Acquires the driver lock qemuDriverUnlock() - Releases the driver lock To lock the virDomainObjPtr virDomainObjLock() - Acquires the virDomainObjPtr lock virDomainObjUnlock() - Releases the virDomainObjPtr lock To acquire the job condition variable (int jobActive) qemuDomainObjBeginJob() (if driver is unlocked) - Increments ref count on virDomainObjPtr - Wait qemuDomainObjPrivate condition 'jobActive != 0' using virDomainObjPtr mutex - Sets jobActive to 1 qemuDomainObjBeginJobWithDriver() (if driver needs to be locked) - Unlocks driver - Increments ref count on virDomainObjPtr - Wait qemuDomainObjPrivate condition 'jobActive != 0' using virDomainObjPtr mutex - Sets jobActive to 1 - Unlocks virDomainObjPtr - Locks driver - Locks virDomainObjPtr NB: this variant is required in order to comply with lock ordering rules for virDomainObjPtr vs driver qemuDomainObjEndJob() - Set jobActive to 0 - Signal on qemuDomainObjPrivate condition - Decrements ref count on virDomainObjPtr To acquire the QEMU monitor lock qemuDomainObjEnterMonitor() - Acquires the qemuMonitorObjPtr lock - Releases the virDomainObjPtr lock qemuDomainObjExitMonitor() - Acquires the virDomainObjPtr lock - Releases the qemuMonitorObjPtr lock NB: caller must take care to drop the driver lock if neccessary Design patterns --------------- All driver methods must follow one of these design patterns to ensure thread safety and lock correctness. * Accessing or updating something with just the driver qemuDriverLock(driver); ...do work... qemuDriverUnlock(driver); * Accessing something directly todo with a virDomainObjPtr virDomainObjPtr obj; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDriverUnlock(driver); ...do work... virDomainObjUnlock(obj); * Accessing something directly todo with a virDomainObjPtr and driver virDomainObjPtr obj; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); ...do work... virDomainObjUnlock(obj); qemuDriverUnlock(driver); * Updating something directly todo with a virDomainObjPtr virDomainObjPtr obj; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDriverUnlock(driver); qemuDomainObjBeginJob(obj); ...do work... qemuDomainObjEndJob(obj); virDomainObjUnlock(obj); * Invoking a monitor command on a virDomainObjPtr virDomainObjPtr obj; qemuDomainObjPrivatePtr priv; qemuDriverLockRO(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDriverUnlock(driver); qemuDomainObjBeginJob(obj); ...do prep work... qemuDomainObjEnterMonitor(obj); qemuMonitorXXXX(priv->mon); qemuDomainObjExitMonitor(obj); ...do final work... qemuDomainObjEndJob(obj); virDomainObjUnlock(obj); * Invoking a monitor command on a virDomainObjPtr with driver locked too virDomainObjPtr obj; qemuDomainObjPrivatePtr priv; qemuDriverLock(driver); obj = virDomainFindByUUID(driver->domains, dom->uuid); qemuDomainObjBeginJobWithDriver(obj); ...do prep work... qemuDomainObjEnterMonitor(obj); qemuDriverUnlock(driver); qemuMonitorXXXX(priv->mon); qemuDriverLock(driver); qemuDomainObjExitMonitor(obj); ...do final work... qemuDomainObjEndJob(obj); virDomainObjUnlock(obj); qemuDriverUnlock(driver); Summary ------- * Respect lock ordering rules: never lock driver if anything else is already locked * Don't hold locks in code which sleeps: unlock driver & virDomainObjPtr when using monitor -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 4

[libvirt] remote clients are non-interruptible
by John Levon 30 Oct '09

30 Oct '09

remoteIOEventLoop() has this: 6974 repoll: 6975 ret = poll(fds, ARRAY_CARDINALITY(fds), -1); 6976 if (ret < 0 && errno == EINTR) 6977 goto repoll; with the result that all clients using the remote driver cannot be control-C'd. Dan, you added this code it seems, why? regards john

4 3

[libvirt] Re: [virt-tools-list] Remote management over SSH fails to connect
by Cole Robinson 30 Oct '09

30 Oct '09

On 10/25/2009 10:25 AM, Jon Nordby wrote: > I get the following errors (skipping "system" yields the same): > [root@jon-laptop ~]# virsh -c qemu+ssh://10.0.0.2/system list > error: server closed connection > error: failed to connect to the hypervisor > > However, SSH and libvirtd both work on their own: > [root@jon-laptop ~]# ssh 10.0.0.2 > Last login: Sun Oct 25 14:06:07 2009 from 10.0.0.143 > [root@server0 ~]# virsh list > Id Name State > ---------------------------------- > 21 family-server running > > The connection is allowed in hosts.allow > libvirt 0.7.2 in both ends, kvm backend, Arch Linux > > What could be the source of this problem? And how can I find it? > ccing libvirt-list This could be an issue of 'nc' incompatibility. Does the 'nc' command on the remote system support the -U option? If you run the virsh command with LIBVIRT_DEBUG=1 virsh ... you should see the ssh command being run. See if running the command by hand produces an error. - Cole

3 2

[libvirt] Release 0.3.1 of libvirt-java
by Bryan Kearney 29 Oct '09

29 Oct '09

I have released version 0.3.1 of libvirt-java. Thanks to Thomas Treutner for his debugging help. You can get the latest from: Latest source tarball, rpm, and srpm: http://libvirt.org/sources/java/ Latest source code: git://libvirt.org/git/libvirt-java.git Maven: http://www.libvirt.org/maven2/ Latest rpms were submitted to Fedora Rawhide and F-11. iBiblio should update soon. -- bk

1 0

[libvirt] Got Windows guests?
by Richard W.M. Jones 29 Oct '09

29 Oct '09

Hello fellow Fedora, libvirt and libguestfs users, If you have any Windows guests, then you can help Fedora to support Windows guests better by spending a few minutes testing the Windows Registry feature we just added to libguestfs 1.0.75. You will need: - A Windows NT/200x/XP/Vista/7/... guest - Fedora 12 or Fedora Rawhide host - libguestfs-tools >= 1.0.75 (from updates or http://koji.fedoraproject.org/koji/packageinfo?packageID=8391 ) - a few minutes of your time The tests: (1) Run the virt-win-reg commands shown in the following web page, where "MyWinGuest" should be replaced with the name of the Windows guest as known to libvirt: http://libguestfs.org/virt-win-reg.1.html#examples Do the commands run without any errors? Does the output look sensible? If you have several Windows guests, please try as many different sorts as possible! (2) Download the registry binary files and try to convert them to XML: guestfish -i MyWinGuest --ro <<'EOF' download win:\windows\system32\config\software software download win:\windows\system32\config\system system download win:\windows\system32\config\sam sam download win:\windows\system32\config\security security EOF hivexml software > software.xml hivexml system > system.xml hivexml sam > sam.xml hivexml security > security.xml Do those commands run without error? If there's an error, try adding the hivexml -k option. Does the XML look complete? (Try running the XML through tidy -xml -indent -quiet < foo.xml | less ) I hope you don't find any bugs, but if you do: Send a reply to this message, or report a bug in Bugzilla: https://bugzilla.redhat.com/enter_bug.cgi?component=libguestfs&product=Virt… It's useful to include the following details: HIVEX_DEBUG=1 hivexml regfile 2>&1 > log.out The Registry file itself that is failing (but note that Registry files can contain sensitive data). It's also useful to have positive feedback ("it worked!"). Thanks for any testing you can give, and if you have any other suggestions for handling Windows guests from Fedora, please let me know. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/

1 0

[libvirt] Application using libvirt crashes when having concurrent TLS connections (gnutls problem)
by Thomas Treutner 29 Oct '09

29 Oct '09

Hi list, I was wondering about the status of this bug: https://bugzilla.redhat.com/show_bug.cgi?id=512367 Is it correct that this is a bug in the libvirt client? I ran into this today, as I've written a kind of a VM scheduler (ressource requirements, placement etc.) in Java (libvirt-java 0.3.0, libvirt 0.6.5) and this is a show-stopper for me right now. I had some troubles with the newest version of libvirt (it couldn't connect to Xen IIRC), so I don't want to mess my setup again for nothing. What is actually causing this problem resp. in which situation is libvirt broken? When a client uses more than one connection at the same time? Or when a client uses more than one connection to the same server at the same time? Are there any recommeded workarounds? TIA & kr, thomas

3 8

[libvirt] [PATCH] ESX: Change disk selection for datastore detection.
by Matthias Bolte 29 Oct '09

29 Oct '09

In order to register a new virtual machine the ESX driver needs to upload a VMX file to a datastore. Try to put this file beside the main VMDK file of the virtual machine. Change the disk selection for datastore detection to choose the first file-based harddisk instead of just the first disk. The first disk may be a CDROM disk and ISO images are normaly not located in the virtual machine's directory. * src/esx/esx_driver.c: change disk selection for datastore detection --- src/esx/esx_driver.c | 44 +++++++++++++++++++++++++++++++++----------- 1 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index e063b46..a0efa5d 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2410,6 +2410,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) esxPrivate *priv = (esxPrivate *)conn->privateData; virDomainDefPtr def = NULL; char *vmx = NULL; + int i; + virDomainDiskDefPtr disk = NULL; esxVI_ObjectContent *virtualMachine = NULL; char *datastoreName = NULL; char *directoryName = NULL; @@ -2458,31 +2460,51 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) goto failure; } - /* Build VMX datastore URL */ + /* + * Build VMX datastore URL. Use the source of the first file-based harddisk + * to deduce the datastore and path for the VMX file. Don't just use the + * first disk, because it may be CDROM disk and ISO images are normaly not + * located in the virtual machine's directory. This approach to deduce the + * datastore isn't perfect but should work in the majority of cases. + */ if (def->ndisks < 1) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Domain XML doesn't contain a disk, cannot deduce datastore " - "and path for VMX file"); + "Domain XML doesn't contain any disks, cannot deduce " + "datastore and path for VMX file"); goto failure; } - if (def->disks[0]->src == NULL) { + for (i = 0; i < def->ndisks; ++i) { + if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK && + def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_FILE) { + disk = def->disks[i]; + break; + } + } + + if (disk == NULL) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "First disk has no source, cannot deduce datastore and path " - "for VMX file"); + "Domain XML doesn't contain any file-based harddisks, " + "cannot deduce datastore and path for VMX file"); goto failure; } - if (esxUtil_ParseDatastoreRelatedPath(conn, def->disks[0]->src, - &datastoreName, &directoryName, - &fileName) < 0) { + if (disk->src == NULL) { + ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, + "First file-based harddisk has no source, cannot deduce " + "datastore and path for VMX file"); + goto failure; + } + + if (esxUtil_ParseDatastoreRelatedPath(conn, disk->src, &datastoreName, + &directoryName, &fileName) < 0) { goto failure; } if (! virFileHasSuffix(fileName, ".vmdk")) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Expecting source of first disk '%s' to be a VMDK image", - def->disks[0]->src); + "Expecting source '%s' of first file-based harddisk to be a " + "VMDK image", disk->src); goto failure; } -- 1.6.0.4

2 2

[libvirt] [PATCH] ESX: Fallback to the preliminary name if the datastore cannot be found.
by Matthias Bolte 28 Oct '09

28 Oct '09

This allows to use domain-xml-from-native with VMX files that reference unavailable datastores. * src/esx/esx_vmx.c: fallback to the preliminary name if the datastore cannot be found --- src/esx/esx_vmx.c | 43 +++++++++++++++++++++++-------------------- 1 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 8e2bdec..a9ff1b4 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -606,34 +606,37 @@ esxVMX_AbsolutePathToDatastoreRelatedPath(virConnectPtr conn, if (ctx != NULL) { if (esxVI_LookupDatastoreByName(conn, ctx, preliminaryDatastoreName, NULL, &datastore, - esxVI_Occurence_RequiredItem) < 0) { + esxVI_Occurence_OptionalItem) < 0) { goto failure; } - for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; - dynamicProperty = dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "summary.accessible")) { - /* Ignore it */ - } else if (STREQ(dynamicProperty->name, "summary.name")) { - if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val, - esxVI_Type_String) < 0) { - goto failure; + if (datastore != NULL) { + for (dynamicProperty = datastore->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "summary.accessible")) { + /* Ignore it */ + } else if (STREQ(dynamicProperty->name, "summary.name")) { + if (esxVI_AnyType_ExpectType(conn, dynamicProperty->val, + esxVI_Type_String) < 0) { + goto failure; + } + + datastoreName = dynamicProperty->val->string; + break; + } else if (STREQ(dynamicProperty->name, "summary.url")) { + /* Ignore it */ + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); } - - datastoreName = dynamicProperty->val->string; - break; - } else if (STREQ(dynamicProperty->name, "summary.url")) { - /* Ignore it */ - } else { - VIR_WARN("Unexpected '%s' property", dynamicProperty->name); } } if (datastoreName == NULL) { - ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, - "Could not retrieve datastore name for absolute path '%s'", - absolutePath); - goto failure; + VIR_WARN("Could not retrieve datastore name for absolute " + "path '%s', falling back to preliminary name '%s'", + absolutePath, preliminaryDatastoreName); + + datastoreName = preliminaryDatastoreName; } } else { datastoreName = preliminaryDatastoreName; -- 1.6.0.4

2 1

[libvirt] [PATCH] ESX: Unify naming of VI API utility and convenience functions.
by Matthias Bolte 28 Oct '09

28 Oct '09

Unified function naming scheme: - 'lookup' functions query the ESX or vCenter for information - 'get' functions return information from a local object * src/esx/esx_driver.c, src/esx/esx_vi.[ch]: unify function naming --- src/esx/esx_driver.c | 95 ++++++++++++++++++++++++++++---------------------- src/esx/esx_vi.c | 77 +++++++++++++++++++++++----------------- src/esx/esx_vi.h | 32 +++++++++------- 3 files changed, 116 insertions(+), 88 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index a0efa5d..93fb5a9 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -90,9 +90,10 @@ esxSupportsLongMode(virConnectPtr conn) if (esxVI_String_AppendValueToList(conn, &propertyNameList, "hardware.cpuFeature") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -522,9 +523,10 @@ esxSupportsVMotion(virConnectPtr conn) if (esxVI_String_AppendValueToList(conn, &propertyNameList, "capability.vmotionSupported") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -653,9 +655,10 @@ esxGetHostname(virConnectPtr conn) (conn, &propertyNameList, "config.network.dnsConfig.hostName\0" "config.network.dnsConfig.domainName\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -750,9 +753,10 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) "hardware.memorySize\0" "hardware.numaInfo.numNodes\0" "summary.hardware.cpuModel\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->hostFolder, - "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystem) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + priv->host->hostFolder, + "HostSystem", propertyNameList, + esxVI_Boolean_True, &hostSystem) < 0) { goto failure; } @@ -914,9 +918,10 @@ esxListDomains(virConnectPtr conn, int *ids, int maxids) if (esxVI_String_AppendValueToList(conn, &propertyNameList, "runtime.powerState") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -970,7 +975,7 @@ esxNumberOfDomains(virConnectPtr conn) return -1; } - return esxVI_GetNumberOfDomainsByPowerState + return esxVI_LookupNumberOfDomainsByPowerState (conn, priv->host, esxVI_VirtualMachinePowerState_PoweredOn, esxVI_Boolean_False); } @@ -999,9 +1004,10 @@ esxDomainLookupByID(virConnectPtr conn, int id) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -1082,9 +1088,10 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -1168,9 +1175,10 @@ esxDomainLookupByName(virConnectPtr conn, const char *name) "name\0" "runtime.powerState\0" "config.uuid\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -2042,10 +2050,10 @@ esxDomainGetMaxVcpus(virDomainPtr domain) if (esxVI_String_AppendValueToList(domain->conn, &propertyNameList, "capability.maxSupportedVcpus") < 0 || - esxVI_GetObjectContent(domain->conn, priv->host, - priv->host->hostFolder, "HostSystem", - propertyNameList, esxVI_Boolean_True, - &hostSystem) < 0) { + esxVI_LookupObjectContentByType(domain->conn, priv->host, + priv->host->hostFolder, "HostSystem", + propertyNameList, esxVI_Boolean_True, + &hostSystem) < 0) { goto failure; } @@ -2270,9 +2278,10 @@ esxListDefinedDomains(virConnectPtr conn, char **const names, int maxnames) if (esxVI_String_AppendValueListToList(conn, &propertyNameList, "name\0" "runtime.powerState\0") < 0 || - esxVI_GetObjectContent(conn, priv->host, priv->host->vmFolder, - "VirtualMachine", propertyNameList, - esxVI_Boolean_True, &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, priv->host->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -2337,7 +2346,7 @@ esxNumberOfDefinedDomains(virConnectPtr conn) return -1; } - return esxVI_GetNumberOfDomainsByPowerState + return esxVI_LookupNumberOfDomainsByPowerState (conn, priv->host, esxVI_VirtualMachinePowerState_PoweredOn, esxVI_Boolean_True); } @@ -2550,8 +2559,8 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml ATTRIBUTE_UNUSED) goto failure; } - if (esxVI_GetResourcePool(conn, priv->host, hostSystem, - &resourcePool) < 0) { + if (esxVI_LookupResourcePoolByHostSystem(conn, priv->host, hostSystem, + &resourcePool) < 0) { goto failure; } @@ -3071,8 +3080,8 @@ esxDomainMigratePerform(virDomainPtr domain, goto failure; } - if (esxVI_GetResourcePool(domain->conn, priv->vCenter, hostSystem, - &resourcePool) < 0) { + if (esxVI_LookupResourcePoolByHostSystem(domain->conn, priv->vCenter, + hostSystem, &resourcePool) < 0) { goto failure; } @@ -3172,8 +3181,8 @@ esxNodeGetFreeMemory(virConnectPtr conn) goto failure; } - if (esxVI_GetResourcePool(conn, priv->host, hostSystem, - &managedObjectReference) < 0) { + if (esxVI_LookupResourcePoolByHostSystem(conn, priv->host, hostSystem, + &managedObjectReference) < 0) { goto failure; } @@ -3182,9 +3191,11 @@ esxNodeGetFreeMemory(virConnectPtr conn) /* Get memory usage of resource pool */ if (esxVI_String_AppendValueToList(conn, &propertyNameList, "runtime.memory") < 0 || - esxVI_GetObjectContent(conn, priv->host, managedObjectReference, - "ResourcePool", propertyNameList, - esxVI_Boolean_False, &resourcePool) < 0) { + esxVI_LookupObjectContentByType(conn, priv->host, + managedObjectReference, + "ResourcePool", propertyNameList, + esxVI_Boolean_False, + &resourcePool) < 0) { goto failure; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index fa971d8..dc51e20 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -374,9 +374,10 @@ esxVI_Context_Connect(virConnectPtr conn, esxVI_Context *ctx, const char *url, } /* Get pointer to Datacenter for later use */ - if (esxVI_GetObjectContent(conn, ctx, ctx->service->rootFolder, - "Datacenter", propertyNameList, - esxVI_Boolean_True, &datacenterList) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, ctx->service->rootFolder, + "Datacenter", propertyNameList, + esxVI_Boolean_True, + &datacenterList) < 0) { goto failure; } @@ -1061,6 +1062,10 @@ esxVI_List_Deserialize(virConnectPtr conn, xmlNodePtr node, esxVI_List **list, /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Utility and Convenience Functions + * + * Function naming scheme: + * - 'lookup' functions query the ESX or vCenter for information + * - 'get' functions get information from a local object */ int @@ -1301,9 +1306,11 @@ esxVI_EnsureSession(virConnectPtr conn, esxVI_Context *ctx) #else if (esxVI_String_AppendValueToList(conn, &propertyNameList, "currentSession") < 0 || - esxVI_GetObjectContent(conn, ctx, ctx->service->sessionManager, - "SessionManager", propertyNameList, - esxVI_Boolean_False, &sessionManager) < 0) { + esxVI_LookupObjectContentByType(conn, ctx, + ctx->service->sessionManager, + "SessionManager", propertyNameList, + esxVI_Boolean_False, + &sessionManager) < 0) { goto failure; } @@ -1358,11 +1365,12 @@ esxVI_EnsureSession(virConnectPtr conn, esxVI_Context *ctx) int -esxVI_GetObjectContent(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ManagedObjectReference *root, - const char *type, esxVI_String *propertyNameList, - esxVI_Boolean recurse, - esxVI_ObjectContent **objectContentList) +esxVI_LookupObjectContentByType(virConnectPtr conn, esxVI_Context *ctx, + esxVI_ManagedObjectReference *root, + const char *type, + esxVI_String *propertyNameList, + esxVI_Boolean recurse, + esxVI_ObjectContent **objectContentList) { int result = 0; esxVI_ObjectSpec *objectSpec = NULL; @@ -1479,9 +1487,9 @@ esxVI_GetVirtualMachinePowerState(virConnectPtr conn, int -esxVI_GetNumberOfDomainsByPowerState(virConnectPtr conn, esxVI_Context *ctx, - esxVI_VirtualMachinePowerState powerState, - esxVI_Boolean inverse) +esxVI_LookupNumberOfDomainsByPowerState(virConnectPtr conn, esxVI_Context *ctx, + esxVI_VirtualMachinePowerState powerState, + esxVI_Boolean inverse) { esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachineList = NULL; @@ -1492,9 +1500,10 @@ esxVI_GetNumberOfDomainsByPowerState(virConnectPtr conn, esxVI_Context *ctx, if (esxVI_String_AppendValueToList(conn, &propertyNameList, "runtime.powerState") < 0 || - esxVI_GetObjectContent(conn, ctx, ctx->vmFolder, "VirtualMachine", - propertyNameList, esxVI_Boolean_True, - &virtualMachineList) < 0) { + esxVI_LookupObjectContentByType(conn, ctx, ctx->vmFolder, + "VirtualMachine", propertyNameList, + esxVI_Boolean_True, + &virtualMachineList) < 0) { goto failure; } @@ -1646,9 +1655,10 @@ esxVI_GetVirtualMachineIdentity(virConnectPtr conn, -int esxVI_GetResourcePool(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ObjectContent *hostSystem, - esxVI_ManagedObjectReference **resourcePool) +int +esxVI_LookupResourcePoolByHostSystem + (virConnectPtr conn, esxVI_Context *ctx, esxVI_ObjectContent *hostSystem, + esxVI_ManagedObjectReference **resourcePool) { int result = 0; esxVI_String *propertyNameList = NULL; @@ -1684,9 +1694,10 @@ int esxVI_GetResourcePool(virConnectPtr conn, esxVI_Context *ctx, if (esxVI_String_AppendValueToList(conn, &propertyNameList, "resourcePool") < 0 || - esxVI_GetObjectContent(conn, ctx, managedObjectReference, - "ComputeResource", propertyNameList, - esxVI_Boolean_False, &computeResource) < 0) { + esxVI_LookupObjectContentByType(conn, ctx, managedObjectReference, + "ComputeResource", propertyNameList, + esxVI_Boolean_False, + &computeResource) < 0) { goto failure; } @@ -1751,9 +1762,9 @@ esxVI_LookupHostSystemByIp(virConnectPtr conn, esxVI_Context *ctx, goto failure; } - if (esxVI_GetObjectContent(conn, ctx, managedObjectReference, - "HostSystem", propertyNameList, - esxVI_Boolean_False, hostSystem) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, managedObjectReference, + "HostSystem", propertyNameList, + esxVI_Boolean_False, hostSystem) < 0) { goto failure; } @@ -1803,9 +1814,10 @@ esxVI_LookupVirtualMachineByUuid(virConnectPtr conn, esxVI_Context *ctx, } } - if (esxVI_GetObjectContent(conn, ctx, managedObjectReference, - "VirtualMachine", propertyNameList, - esxVI_Boolean_False, virtualMachine) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, managedObjectReference, + "VirtualMachine", propertyNameList, + esxVI_Boolean_False, + virtualMachine) < 0) { goto failure; } @@ -1852,9 +1864,10 @@ esxVI_LookupDatastoreByName(virConnectPtr conn, esxVI_Context *ctx, goto failure; } - if (esxVI_GetObjectContent(conn, ctx, ctx->datacenter, - "Datastore", completePropertyNameList, - esxVI_Boolean_True, &datastoreList) < 0) { + if (esxVI_LookupObjectContentByType(conn, ctx, ctx->datacenter, + "Datastore", completePropertyNameList, + esxVI_Boolean_True, + &datastoreList) < 0) { goto failure; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 6ba6bed..4892fde 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -192,29 +192,33 @@ int esxVI_List_Deserialize(virConnectPtr conn, xmlNodePtr node, /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Utility and Convenience Functions + * + * Function naming scheme: + * - 'lookup' functions query the ESX or vCenter for information + * - 'get' functions get information from a local object */ -int -esxVI_Alloc(virConnectPtr conn, void **ptrptr, size_t size); +int esxVI_Alloc(virConnectPtr conn, void **ptrptr, size_t size); -int -esxVI_CheckSerializationNecessity(virConnectPtr conn, const char *element, - esxVI_Boolean required); +int esxVI_CheckSerializationNecessity(virConnectPtr conn, const char *element, + esxVI_Boolean required); int esxVI_BuildFullTraversalSpecItem (virConnectPtr conn, esxVI_SelectionSpec **fullTraversalSpecList, const char *name, const char *type, const char *path, const char *selectSetNames); + int esxVI_BuildFullTraversalSpecList (virConnectPtr conn, esxVI_SelectionSpec **fullTraversalSpecList); int esxVI_EnsureSession(virConnectPtr conn, esxVI_Context *ctx); -int esxVI_GetObjectContent(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ManagedObjectReference *root, - const char *type, esxVI_String *propertyNameList, - esxVI_Boolean recurse, - esxVI_ObjectContent **objectContentList); +int esxVI_LookupObjectContentByType(virConnectPtr conn, esxVI_Context *ctx, + esxVI_ManagedObjectReference *root, + const char *type, + esxVI_String *propertyNameList, + esxVI_Boolean recurse, + esxVI_ObjectContent **objectContentList); int esxVI_GetManagedEntityStatus (virConnectPtr conn, esxVI_ObjectContent *objectContent, @@ -225,7 +229,7 @@ int esxVI_GetVirtualMachinePowerState (virConnectPtr conn, esxVI_ObjectContent *virtualMachine, esxVI_VirtualMachinePowerState *powerState); -int esxVI_GetNumberOfDomainsByPowerState +int esxVI_LookupNumberOfDomainsByPowerState (virConnectPtr conn, esxVI_Context *ctx, esxVI_VirtualMachinePowerState powerState, esxVI_Boolean inverse); @@ -233,9 +237,9 @@ int esxVI_GetVirtualMachineIdentity(virConnectPtr conn, esxVI_ObjectContent *virtualMachine, int *id, char **name, unsigned char *uuid); -int esxVI_GetResourcePool(virConnectPtr conn, esxVI_Context *ctx, - esxVI_ObjectContent *hostSystem, - esxVI_ManagedObjectReference **resourcePool); +int esxVI_LookupResourcePoolByHostSystem + (virConnectPtr conn, esxVI_Context *ctx, esxVI_ObjectContent *hostSystem, + esxVI_ManagedObjectReference **resourcePool); int esxVI_LookupHostSystemByIp(virConnectPtr conn, esxVI_Context *ctx, const char *ipAddress, -- 1.6.0.4

2 1

[libvirt] [PATCH] ESX: Fix memory leak in list handling functions.
by Matthias Bolte 28 Oct '09

28 Oct '09

If an error occurs between the allocation of an item and appending it to the list, the item leaks. Free such orphaned items in error cases. * src/esx/esx_vi.c: free orphaned items in error cases --- src/esx/esx_vi.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index bcf110f..04860e2 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -959,28 +959,22 @@ esxVI_List_CastFromAnyType(virConnectPtr conn, esxVI_AnyType *anyType, esxVI_AnyType_Free(&childAnyType); - if (esxVI_AnyType_Deserialize(conn, childNode, &childAnyType) < 0) { + if (esxVI_AnyType_Deserialize(conn, childNode, &childAnyType) < 0 || + castFromAnyTypeFunc(conn, childAnyType, &item) < 0 || + esxVI_List_Append(conn, list, item) < 0) { goto failure; } item = NULL; - - if (castFromAnyTypeFunc(conn, childAnyType, &item) < 0) { - goto failure; - } - - if (esxVI_List_Append(conn, list, item) < 0) { - goto failure; - } } - cleanup: esxVI_AnyType_Free(&childAnyType); return result; failure: + freeFunc(&item); freeFunc(list); result = -1; @@ -1039,20 +1033,18 @@ esxVI_List_Deserialize(virConnectPtr conn, xmlNodePtr node, esxVI_List **list, goto failure; } - item = NULL; - - if (deserializeFunc(conn, node, &item) < 0) { + if (deserializeFunc(conn, node, &item) < 0 || + esxVI_List_Append(conn, list, item) < 0) { goto failure; } - if (esxVI_List_Append(conn, list, item) < 0) { - goto failure; - } + item = NULL; } return 0; failure: + freeFunc(&item); freeFunc(list); return -1; -- 1.6.0.4

2 1

[libvirt] [PATCH 0/4] Support for SPICE graphics
by Daniel P. Berrange 28 Oct '09

28 Oct '09

This series of patches adds minimal support for SPICE graphics which is newly introduced in RHEL-5.4's fork of KVM. Since this is not yet merged in upstream QEMU/KVM, I'm not proposing to merge all these patches. The two XML schema patches are straightforward to merge. The two implementation ones are RHEL5 specific and I want to avoid declaring them supported until we have a sign of what the upstream merge will look like, since previous attempst to support KVM args prior to QEMU acceptance have been very painful long term. Daniel

3 14

[libvirt] [PATCH] libvirt-devel should only require libvirt-client
by Mark McLoughlin 28 Oct '09

28 Oct '09

There's a long known issue where if you install libvirt in a guest, the default virtual network will conflict with the default virtual network in the host. That's one of the reasons we have the libvirt-client RPM - it allows you to install the client library without having the host side installed. Rich Jones points out that if you install libvirt-devel in a guest, then you get libvirtd installed and the network conflict: https://bugzilla.redhat.com/531200 libvirt-devel should only require libvirt-client - e.g. nothing in the devel package pertains to anything in the libvirt RPM. The Fedora packaging guidelines say: https://fedoraproject.org/wiki/Packaging/Guidelines#Devel_Packages Devel packages must require the base package using a fully versioned dependency ... But for all intents and purposes, libvirt-client is our base RPM. * libvirt.spec.in: make libvirt-devel require libvirt-client --- libvirt.spec.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6cd0888..7e1550e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -341,7 +341,7 @@ virtualization capabilities of recent versions of Linux (and other OSes). %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries -Requires: libvirt = %{version}-%{release} +Requires: libvirt-client = %{version}-%{release} Requires: pkgconfig %if %{with_xen} Requires: xen-devel -- 1.6.2.5

2 1

[libvirt] [PATCH] qemu: Fix an error message in GetVcpus
by Cole Robinson 28 Oct '09

28 Oct '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 082cb04..a3beedb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3481,7 +3481,8 @@ qemudDomainGetVcpus(virDomainPtr dom, if (!virDomainIsActive(vm)) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_INVALID, - "%s",_("cannot pin vcpus on an inactive domain")); + "%s", + _("cannot list vcpu pinning for an inactive domain")); goto cleanup; } -- 1.6.5.rc2

2 2

[libvirt] [PATCH] Fix p2p migration without a passed uri.
by Cole Robinson 28 Oct '09

28 Oct '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/libvirt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 926c539..126675e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3217,7 +3217,7 @@ virDomainMigrate (virDomainPtr domain, char *dstURI = NULL; if (uri == NULL) { dstURI = virConnectGetURI(dconn); - if (!uri) + if (!dstURI) return NULL; } -- 1.6.5.rc2

2 2

[libvirt] [PATCH] virterror: Add a missing 'break' for VIR_ERR_INVALID_SECRET
by Cole Robinson 28 Oct '09

28 Oct '09

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/util/virterror.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/virterror.c b/src/util/virterror.c index 657cb3f..10f979c 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1082,6 +1082,7 @@ virErrorMsg(virErrorNumber error, const char *info) errmsg = _("Invalid secret"); else errmsg = _("Invalid secret: %s"); + break; case VIR_ERR_NO_SECRET: if (info == NULL) errmsg = _("Secret not found"); -- 1.6.5.rc2

2 2

[libvirt] [PATCH] qemu: migrate: Don't require manual URI to specify a port
by Cole Robinson 28 Oct '09

28 Oct '09

The xen driver will generate a migration port if only a hostname is passed in the optional migrate URI, so let's do the same in qemu. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fb952d8..3ef29a6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6304,15 +6304,32 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, /* Get the port number. */ p = strrchr (uri_in, ':'); - p++; /* definitely has a ':' in it, see above */ - this_port = virParseNumber (&p); - if (this_port == -1 || p-uri_in != strlen (uri_in)) { - qemudReportError (dconn, NULL, NULL, VIR_ERR_INVALID_ARG, - "%s", _("URI did not have ':port' at the end")); - goto cleanup; + if (p == strchr(uri_in, ':')) { + /* Generate a port */ + this_port = QEMUD_MIGRATION_FIRST_PORT + port++; + if (port == QEMUD_MIGRATION_NUM_PORTS) + port = 0; + + /* Caller frees */ + if (virAsprintf(uri_out, "%s:%d", uri_in, this_port) < 0) { + virReportOOMError (dconn); + goto cleanup; + } + + } else { + p++; /* definitely has a ':' in it, see above */ + this_port = virParseNumber (&p); + if (this_port == -1 || p-uri_in != strlen (uri_in)) { + qemudReportError (dconn, NULL, NULL, VIR_ERR_INVALID_ARG, + "%s", _("URI ended with incorrect ':port'")); + goto cleanup; + } } } + if (uri_out && *uri_out) + VIR_DEBUG("Generated uri_out=%s", *uri_out); + /* Parse the domain XML. */ if (!(def = virDomainDefParseString(dconn, driver->caps, dom_xml, VIR_DOMAIN_XML_INACTIVE))) { -- 1.6.5.rc2

2 2

[libvirt] [PATCH 0/4] test: Support virStorageFindPoolSources
by Cole Robinson 28 Oct '09

28 Oct '09

The following series refactors the storage pool parsing code to better facilitate FindPoolSources (both for the test driver, and future pool backend implementations). The last patch implements a FindPoolSources for the test driver, with hardcoded results for test:///default. Thanks, Cole Cole Robinson (4): storage: Break out pool source parsing to a separate function. storage: Break out function to add pool source to a SourceList. storage: Add ParseSourceString function for use with FindPoolSources. test: Support virStorageFindPoolSources src/conf/storage_conf.c | 259 +++++++++++++++++++++++---------- src/conf/storage_conf.h | 7 + src/libvirt_private.syms | 2 + src/storage/storage_backend_fs.c | 65 ++++----- src/storage/storage_backend_logical.c | 9 +- src/test/test_driver.c | 75 +++++++++- 6 files changed, 291 insertions(+), 126 deletions(-)

2 9

[libvirt] [PATCH] Update the documentation for virDomainMigrateToURI
by Chris Lalancette 28 Oct '09

28 Oct '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/libvirt.c | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 9e87900..5787f22 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3154,7 +3154,7 @@ virDomainMigrateDirect (virDomainPtr domain, * XML includes details of the support URI schemes. If omitted * the dconn will be asked for a default URI. * - * In either case it is typically only neccessary to specify a + * In either case it is typically only necessary to specify a * URI if the destination host has multiple interfaces and a * specific interface is required to transmit migration data. * @@ -3273,7 +3273,7 @@ error: /** * virDomainMigrateToURI: * @domain: a domain object - * @duri: mandatory URI for the destination host + * @duri: mandatory URI for the destination host (see below) * @flags: flags * @dname: (optional) rename domain to this at destination * @bandwidth: (optional) specify migration bandwidth limit in Mbps @@ -3285,28 +3285,31 @@ error: * VIR_MIGRATE_LIVE Do not pause the VM during migration * VIR_MIGRATE_PEER2PEER Direct connection between source & destination hosts * VIR_MIGRATE_TUNNELLED Tunnel migration data over the libvirt RPC channel + * VIR_MIGRATE_PERSIST_DEST If the migration is successful, persist the domain + * on the destination host. + * VIR_MIGRATE_UNDEFINE_SOURCE If the migration is successful, undefine the + * domain on the source host. * - * VIR_MIGRATE_TUNNELLED requires that VIR_MIGRATE_PEER2PEER be set. - * Applications using the VIR_MIGRATE_PEER2PEER flag will probably - * prefer to invoke virDomainMigrateToURI, avoiding the need to - * open connection to the destination host themselves. - * - * If a hypervisor supports renaming domains during migration, - * then you may set the dname parameter to the new name (otherwise - * it keeps the same name). If this is not supported by the - * hypervisor, dname must be NULL or else you will get an error. - * - * If the VIR_MIGRATE_PEER2PEER flag is set, the duri parameter - * must be a valid libvirt connection URI, by which the source - * libvirt driver can connect to the destination libvirt. - * + * The operation of this API hinges on the VIR_MIGRATE_PEER2PEER flag. * If the VIR_MIGRATE_PEER2PEER flag is NOT set, the duri parameter * takes a hypervisor specific format. The hypervisor capabilities - * XML includes details of the support URI schemes. Not all hypervisors + * XML includes details of the supported URI schemes. Not all hypervisors * will support this mode of migration, so if the VIR_MIGRATE_PEER2PEER - * flag is not set, then it may be neccessary to use the alternative + * flag is not set, then it may be necessary to use the alternative * virDomainMigrate API providing an explicit virConnectPtr for the - * destination host + * destination host. + * + * If the VIR_MIGRATE_PEER2PEER flag IS set, the duri parameter + * must be a valid libvirt connection URI, by which the source + * libvirt driver can connect to the destination libvirt. + * + * VIR_MIGRATE_TUNNELLED requires that VIR_MIGRATE_PEER2PEER be set. + * + * If a hypervisor supports renaming domains during migration, + * the dname parameter specifies the new name for the domain. + * Setting dname to NULL keeps the domain name the same. If domain + * renaming is not supported by the hypervisor, dname must be NULL or + * else an error will be returned. * * The maximum bandwidth (in Mbps) that will be used to do migration * can be specified with the bandwidth parameter. If set to 0, -- 1.6.0.6

3 3

[libvirt] [PATCH] Better error message when libvirtd fails to start.
by Chris Lalancette 28 Oct '09

28 Oct '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- daemon/libvirtd.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 78dfb2d..03bc1b4 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -2972,7 +2972,9 @@ int main(int argc, char **argv) { if (mkdir (rundir, 0755)) { if (errno != EEXIST) { - VIR_ERROR0 (_("unable to create rundir")); + char ebuf[1024]; + VIR_ERROR(_("unable to create rundir %s: %s"), rundir, + virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } } -- 1.6.0.6

3 3

[libvirt] [PATCH] add <bootp server="...">
by Paolo Bonzini 28 Oct '09

28 Oct '09

This patch adds an optional attribute to the <bootp> tag, that allows to specify a TFTP server address other than the address of the DHCP server itself. This can be used to forward the BOOTP settings of the host down to the guest. This is something that configurations such as Xen's default network achieve naturally, but must be done manually for NAT. 2009-10-22 Paolo Bonzini <pbonzini(a)redhat.com> * docs/formatnetwork.html.in: Document new attribute. * docs/schemas/network.rng: Add it to schema. * src/conf/network_conf.h: Add it to struct. * src/conf/network_conf.c: Add it to parser and pretty printer. * src/network/bridge_driver.c: Put it in the dnsmasq command line. * tests/networkxml2xmlin/netboot-proxy-network.xml: New. * tests/networkxml2xmlout/netboot-proxy-network.xml: New. * tests/networkxml2xmltest.c: Add the new test. --- docs/formatnetwork.html.in | 15 ++++++++++----- docs/schemas/network.rng | 3 +++ src/conf/network_conf.c | 9 ++++++++- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 9 +++++++-- tests/networkxml2xmlin/netboot-proxy-network.xml | 13 +++++++++++++ tests/networkxml2xmlout/netboot-proxy-network.xml | 13 +++++++++++++ tests/networkxml2xmltest.c | 1 + 8 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 tests/networkxml2xmlin/netboot-proxy-network.xml create mode 100644 tests/networkxml2xmlout/netboot-proxy-network.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index e471385..eb61f15 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -142,11 +142,16 @@ name to be given that host by the DHCP server (via the <code>name</code> attribute). <span class="since">Since 0.4.5</span> </dd><dt><code>bootp</code></dt><dd>The optional <code>bootp</code> - element specifies BOOTP options to be provided by the DHCP server. - Only one attribute is supported, <code>file</code>, giving the file - to be used for the boot image). The BOOTP options currently have to - be the same for all address ranges and statically assigned addresses.<span - class="since">Since 0.7.1.</span> + element specifies BOOTP options to be provided by the DHCP server. + Two attributes are supported: <code>file</code> is mandatory and + gives the file to be used for the boot image; <code>server</code> is + optional and gives the address of the TFTP server from which the boot + image will be fetched. <code>server</code> defaults to the same host + that runs the DHCP server, as is the case when the <code>tftp</code> + element is used. The BOOTP options currently have to be the same + for all address ranges and statically assigned addresses.<span + class="since">Since 0.7.1 (<code>server</code> since 0.7.3).</span> + </dd> </dl> <h2><a name="examples">Example configuration</a></h2> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 7a2d7d4..adef792 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -109,6 +109,9 @@ <optional> <element name="bootp"> <attribute name="file"><text/></attribute> + <optional> + <attribute name="server"><text/></attribute> + </optional> </element> </optional> </element> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 40f5fdd..fd8efb0 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -117,6 +117,7 @@ void virNetworkDefFree(virNetworkDefPtr def) VIR_FREE(def->tftproot); VIR_FREE(def->bootfile); + VIR_FREE(def->bootserver); VIR_FREE(def); } @@ -313,6 +314,7 @@ virNetworkDHCPRangeDefParseXML(virConnectPtr conn, } def->bootfile = (char *)file; + def->bootserver = (char *) xmlGetProp(cur, BAD_CAST "server"); } cur = cur->next; @@ -671,8 +673,13 @@ char *virNetworkDefFormat(virConnectPtr conn, virBufferAddLit(&buf, "/>\n"); } if (def->bootfile) { - virBufferEscapeString(&buf, " <bootp file='%s' />\n", + virBufferEscapeString(&buf, " <bootp file='%s' ", def->bootfile); + if (def->bootserver) { + virBufferEscapeString(&buf, "server='%s' ", + def->bootserver); + } + virBufferAddLit(&buf, "/>\n"); } virBufferAddLit(&buf, " </dhcp>\n"); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index e983a01..6175b0f 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -81,6 +81,7 @@ struct _virNetworkDef { char *tftproot; char *bootfile; + char *bootserver; }; typedef struct _virNetworkObj virNetworkObj; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 95bc810..bc241ef 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -402,7 +402,7 @@ networkBuildDnsmasqArgv(virConnectPtr conn, (2 * network->def->nhosts) + /* --enable-tftp --tftp-root /srv/tftp */ (network->def->tftproot ? 3 : 0) + - /* --dhcp-boot pxeboot.img */ + /* --dhcp-boot pxeboot.img[,,12.34.56.78] */ (network->def->bootfile ? 2 : 0) + 1; /* NULL */ @@ -488,8 +488,13 @@ networkBuildDnsmasqArgv(virConnectPtr conn, APPEND_ARG(*argv, i++, network->def->tftproot); } if (network->def->bootfile) { + snprintf(buf, sizeof(buf), "%s%s%s", + network->def->bootfile, + network->def->bootserver ? ",," : "", + network->def->bootserver ? network->def->bootserver : ""); + APPEND_ARG(*argv, i++, "--dhcp-boot"); - APPEND_ARG(*argv, i++, network->def->bootfile); + APPEND_ARG(*argv, i++, buf); } #undef APPEND_ARG diff --git a/tests/networkxml2xmlin/netboot-proxy-network.xml b/tests/networkxml2xmlin/netboot-proxy-network.xml new file mode 100644 index 0000000..ecb6738 --- /dev/null +++ b/tests/networkxml2xmlin/netboot-proxy-network.xml @@ -0,0 +1,13 @@ +<network> + <name>netboot</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <bridge name="virbr1" stp='off' delay='1'/> + <domain name="example.com"/> + <forward/> + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.2" end="192.168.122.254" /> + <bootp file="pxeboot.img" server="10.20.30.40" /> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2xmlout/netboot-proxy-network.xml b/tests/networkxml2xmlout/netboot-proxy-network.xml new file mode 100644 index 0000000..e11c50b --- /dev/null +++ b/tests/networkxml2xmlout/netboot-proxy-network.xml @@ -0,0 +1,13 @@ +<network> + <name>netboot</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward mode='nat'/> + <bridge name='virbr1' stp='off' delay='1' /> + <domain name='example.com'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254' /> + <bootp file='pxeboot.img' server='10.20.30.40' /> + </dhcp> + </ip> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index b02d735..957e64b 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -89,6 +89,7 @@ mymain(int argc, char **argv) DO_TEST("routed-network"); DO_TEST("nat-network"); DO_TEST("netboot-network"); + DO_TEST("netboot-proxy-network"); return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } -- 1.6.2.5

4 5

[libvirt] [PATCH] Improve error reporting for virConnectGetHostname calls
by Cole Robinson 28 Oct '09

28 Oct '09

All drivers have copy + pasted inadequate error reporting which wraps util.c:virGetHostname. Move all error reporting to this function, and improve what we report. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- daemon/libvirtd.c | 3 +-- src/lxc/lxc_driver.c | 10 +--------- src/qemu/qemu_driver.c | 14 ++------------ src/test/test_driver.c | 10 +--------- src/uml/uml_driver.c | 10 +--------- src/util/util.c | 18 +++++++++++++++--- src/util/util.h | 2 +- src/vbox/vbox_tmpl.c | 11 +---------- src/xen/xen_driver.c | 10 +--------- src/xen/xend_internal.c | 3 +-- tools/virsh.c | 2 +- 11 files changed, 26 insertions(+), 67 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 03d091a..058e684 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -939,9 +939,8 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) { if (!mdns_name) { char groupname[64], *localhost, *tmp; /* Extract the host part of the potentially FQDN */ - localhost = virGetHostname(); + localhost = virGetHostname(NULL); if (localhost == NULL) { - virReportOOMError(NULL); goto cleanup; } if ((tmp = strchr(localhost, '.'))) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ef97364..73f1c8e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2058,16 +2058,8 @@ cleanup: static char *lxcGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int lxcFreezeContainer(lxc_driver_t *driver, virDomainObjPtr vm) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a3beedb..86546e5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2623,16 +2623,8 @@ cleanup: static char * qemudGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError (conn, errno, - "%s", _("failed to determine host name")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int qemudListDomains(virConnectPtr conn, int *ids, int nids) { @@ -6283,9 +6275,7 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; /* Get hostname */ - if ((hostname = virGetHostname()) == NULL) { - virReportSystemError (dconn, errno, - "%s", _("failed to determine host name")); + if ((hostname = virGetHostname(dconn)) == NULL) { goto cleanup; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 36f8158..4a081be 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -994,16 +994,8 @@ static int testGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, static char *testGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int testGetMaxVCPUs(virConnectPtr conn ATTRIBUTE_UNUSED, diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 9a7fe42..cd92a6b 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1131,16 +1131,8 @@ cleanup: static char * umlGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int umlListDomains(virConnectPtr conn, int *ids, int nids) { diff --git a/src/util/util.c b/src/util/util.c index 98f8a14..49eac6d 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1804,30 +1804,42 @@ int virDiskNameToIndex(const char *name) { #define AI_CANONIDN 0 #endif -char *virGetHostname(void) +char *virGetHostname(virConnectPtr conn) { int r; char hostname[HOST_NAME_MAX+1], *result; struct addrinfo hints, *info; r = gethostname (hostname, sizeof(hostname)); - if (r == -1) + if (r == -1) { + virReportSystemError (conn, errno, + "%s", _("failed to determine host name")); return NULL; + } NUL_TERMINATE(hostname); memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME|AI_CANONIDN; hints.ai_family = AF_UNSPEC; r = getaddrinfo(hostname, NULL, &hints, &info); - if (r != 0) + if (r != 0) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("getaddrinfo failed for '%s': %s"), + hostname, gai_strerror(r)); return NULL; + } if (info->ai_canonname == NULL) { + ReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("could not determine canonical host name")); freeaddrinfo(info); return NULL; } /* Caller frees this string. */ result = strdup (info->ai_canonname); + if (!result) + virReportOOMError(conn); + freeaddrinfo(info); return result; } diff --git a/src/util/util.h b/src/util/util.h index 8679636..85d5488 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -222,7 +222,7 @@ static inline int getuid (void) { return 0; } static inline int getgid (void) { return 0; } #endif -char *virGetHostname(void); +char *virGetHostname(virConnectPtr conn); int virKillProcess(pid_t pid, int sig); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 4f43901..2a17946 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -594,17 +594,8 @@ static int vboxGetVersion(virConnectPtr conn, unsigned long *version) { } static char *vboxGetHostname(virConnectPtr conn) { - char *hostname; - /* the return string should be freed by caller */ - hostname = virGetHostname(); - if (hostname == NULL) { - vboxError(conn, VIR_ERR_INTERNAL_ERROR,"%s", - "failed to determine host name"); - return NULL; - } - - return hostname; + return virGetHostname(conn); } static int vboxGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) { diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index f2744b0..0818cd3 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -484,16 +484,8 @@ xenUnifiedGetVersion (virConnectPtr conn, unsigned long *hvVer) static char * xenUnifiedGetHostname (virConnectPtr conn) { - char *result; - - result = virGetHostname(); - if (result == NULL) { - virReportSystemError(conn, errno, - "%s", _("cannot lookup hostname")); - return NULL; - } /* Caller frees this string. */ - return result; + return virGetHostname(conn); } static int diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index d3ab019..6d1d851 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -4347,9 +4347,8 @@ xenDaemonDomainMigratePrepare (virConnectPtr dconn, * deallocates this string. */ if (uri_in == NULL) { - *uri_out = virGetHostname(); + *uri_out = virGetHostname(dconn); if (*uri_out == NULL) { - virReportOOMError(dconn); return -1; } } diff --git a/tools/virsh.c b/tools/virsh.c index 6b93405..3c668da 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -524,7 +524,7 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom) char *thatHost = NULL; char *thisHost = NULL; - if (!(thisHost = virGetHostname())) { + if (!(thisHost = virGetHostname(ctl->conn))) { vshError(ctl, "%s", _("Failed to get local hostname")); goto cleanup; } -- 1.6.5.rc2

3 3

[libvirt] [PATCH] qemu: migrate: Error if we collide with an inactive domain
by Cole Robinson 28 Oct '09

28 Oct '09

Currently the check for a VM name/uuid collision on the migrate destination only errors for active domains. Not sure why this wouldn't apply for non running VMs as well, so drop the check. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 86546e5..fb952d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6341,13 +6341,10 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn, if (!vm) vm = virDomainFindByName(&driver->domains, dname); if (vm) { - if (virDomainIsActive(vm)) { - qemudReportError (dconn, NULL, NULL, VIR_ERR_OPERATION_FAILED, - _("domain with the same name or UUID already exists as '%s'"), - vm->def->name); - goto cleanup; - } - virDomainObjUnlock(vm); + qemudReportError (dconn, NULL, NULL, VIR_ERR_OPERATION_FAILED, + _("domain with the same name or UUID already exists as '%s'"), + vm->def->name); + goto cleanup; } if (!(vm = virDomainAssignDef(dconn, -- 1.6.5.rc2

3 2

[libvirt] New APIs for checking some object properties (v2)
by Daniel P. Berrange 28 Oct '09

28 Oct '09

This is a second posting of the proposal from earlier today http://www.redhat.com/archives/libvir-list/2009-October/msg00556.html The changes since last time - Renamed some existing internal APIs which had bad names which clashed with our new public APis. - Fix the comment bugs Daniel mentioned - Change the return status from '> 0' to '1', so we can explicitly add other positive integer return codes if ever required - Implement the new APIs for (nearly) all drivers Daniel

3 12

[libvirt] [PATCH 0/2] Fix a couple problems encountered during virInterface testing
by Laine Stump 28 Oct '09

28 Oct '09

When testing all the different possibilities of interfaces with the new netcf release + my latest libvirt patches (ACKed, but not yet committed), I came across some problems, addressed by the following two patches. The first patch is for a bug that crept in due to a last minute change suggested in danpb's review - I missed changing a couple places to account for changing the initial value of "ret". It could alternately be squashed into this patch, which hasn't yet been committed: https://www.redhat.com/archives/libvir-list/2009-October/msg00689.html The second patch loosens up the parsing of vlan, bond, and bridge interface XML because the live config XML doesn't know how to get those items yet. I believe the necessary items can be learned and included by the time for the *next* libvirt release, but think that the new functionality there already is too useful (and too needy of more hands to test) to delay the entire set for that long.

2 4

[libvirt] Trouble starting a QEMU guest with IPv6 VNC address
by Kaitlin Rupert 28 Oct '09

28 Oct '09

Hello, I am trying to start a QEMU guest with an IPv6 VNC address. I can specify the address and start the guest, but the VNC port shows up under the IPv4 list: # virsh dumpxml domU1 | grep graphics <graphics type='vnc' port='5900' autoport='no' listen='::1' keymap='en-us'/> # cat /proc/net/tcp | grep 170C 2: 00000000:170C 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 621103 1 ffff88007a043a80 299 0 0 2 -1 # cat /proc/net/tcp6 | grep 170C # # ps -ef | grep qemu root 16451 1 43 04:17 ? 00:00:18 /usr/bin/qemu-system-x86_64 -S -M pc -m 128 -smp 1 -name domU1 -uuid 2aebe290-d1ed-11dd-90eb-001a64bc024c -monitor pty -pidfile /var/run/libvirt/qemu//domU1.pid -no-acpi -boot c -drive file=/tmp/default-kvm-dimage,if=ide,index=0,boot=on -net nic,macaddr=11:22:33:aa:bb:cc,vlan=0 -net tap,fd=17,vlan=0 -serial none -parallel none -usb -vnc ::1:0 -k en-us I started the same guest manually, but I appended an ",ipv6' flag to the vnc option (see below). With this change, the port shows up in the IPv6 list. # /usr/bin/qemu-system-x86_64 -M pc -m 128 -smp 1 -name domU1 -uuid 2aebe290-d1ed-11dd-90eb-001a64bc024c -monitor pty -pidfile /var/run/libvirt/qemu//domU1.pid -no-acpi -boot c -drive file=/tmp/default-kvm-dimage,if=ide,index=0,boot=on -net nic,macaddr=11:22:33:aa:bb:cc,vlan=0 -net tap,fd=17,vlan=0 -serial none -parallel none -usb -vnc ::1:0,ipv6 -k en-us # cat /proc/net/tcp6 | grep 170C 2: 00000000000000000000000000000000:170C 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 621485 1 ffff88007a30ad00 299 0 0 2 -1 # cat /proc/net/tcp | grep 170C # I'd like to fix the qemu driver so that it specifies this flag, but I am unsure whether a guest XML change or some other change is appropriate here. Would it be better to have the qemu driver code do some detection on the address that is passed in? Thanks! -- Kaitlin Rupert IBM Linux Technology Center kaitlin(a)linux.vnet.ibm.com

3 3