- Devel - libvirt List Archives

[libvirt] Virsh migrate --live fails
by Subba Rao, Sandeep M (STSD) 25 Sep '09

25 Sep '09

Hi, I'm trying to live move a domU using virsh migrate command: [root@RHEL53Xen1 ~]# xm list Name ID Mem(MiB) VCPUs State Time(s) Copy_RHELVM3 1 511 1 -b---- 898.3 Domain-0 0 1507 4 r----- 133702.5 [root@RHEL53Xen1 ~]# virsh migrate --live Copy_RHELVM3 xen+ssh://15.154.102.20 error: server closed connection [root@RHEL53Xen1 ~]# However the same works using xm migrate --live. The source and the destination are RHEL 5.3 Xen hosts. Libvirt: [root@RHEL53Xen1 ~]# rpm -qa | grep libvirt libvirt-0.3.3-14.el5 libvirt-devel-0.3.3-14.el5 libvirt-cim-0.5.1-4.el5 libvirt-python-0.3.3-14.el5 Xen: [root@RHEL53Xen1 ~]# rpm -qa | grep xen xen-3.0.3-80.el5 xen-libs-3.0.3-80.el5 xen-devel-3.0.3-80.el5 kernel-xen-2.6.18-128.el5 I was earlier getting the error - "can't connect: Name or service not known". So, installed libvirt-0.6.4 as mentioned in the following link: https://bugzilla.redhat.com/show_bug.cgi?id=348861 After installing libvirt-0.6.4, I'm getting "server closed connection" error. Any help is much appreciated. Thanks, Sandeep

2 2

[libvirt] node device devicekit backend
by Dave Allan 25 Sep '09

25 Sep '09

I've been looking at implementing a libudev backed node device, and I noticed that the devicekit node device backend doesn't build. Since I believe DeviceKit is deprecated for this sort of use, and AFAIK the DeviceKit support was never functionally equivalent to the HAL support, I'm wondering if we can just drop DeviceKit support. It also drags in glib, which is a separate problem. Opinions? Dave

2 1

[libvirt] Miscellaneous fixes to build with -Werror
by Charles Duffy 25 Sep '09

25 Sep '09

HACKING suggests compiling with --enable-compile-warnings=error before submitting any patches; however, current master fails for me on this account (CentOS 5.3; gcc 4.1.2). Please see attached. I suspect most of these should be uncontroversial -- but wonder if perhaps virStrcpy uses would be better converted to virStrcpyStatic rather than adding virStrcpy to the symbol list as done here, and am curious about whether the need for explicit initialization to silence a warning regarding qemudSetLogging's log_level indicates a bug in the macro later used to assign that value.

4 6

[libvirt] Some problem with the save function
by Daniel Berteaud 25 Sep '09

25 Sep '09

Hi everyone. This is my first post to this list, so excuse me if it's not the right place to poste info like this. I've found some problems in qemu_driver.c in the latest versions of libvirt: - the first problem was also present in 0.7.0. If we run qemu guests unprivileged, we cannot use the save function (virsh save guestname /path/to/file). The reason seems to be that libvirt first create the destination file to write the header and the XML definition. The file is owned by root with 600 permission. Then, we ask qemu to append the dump of the memory (via the migrate exec: call) to this file. This part doesn't work because the qemu user cannot write to this file. So we endup with a file which only contains the header and the XML, and the guest is stoped :/ - the second problem is present since libvirt 0.7.1. Now that the saved file can be compressed, it seems we cannot save in a raw format any more. This is due to this part in the code (qemu_driver.c): if (STREQ (prog, "raw")) prog = "cat"; internalret = virAsprintf(&command, "migrate \"exec:" "%s -c >> '%s' 2>/dev/null\"", prog, safe_path); which result in "migrate \"exec cat -c >> safe_path 2>/dev/null\"" But cat doesn't support the -c argument, so once again, the save fails, as we end up with a save file which only contains the header and the XML definition. Unfortunately, my C knowledge is near 0, so I cannot correct this myself. - the third problem, is that restore doesn't work any more. I haven't dig it yet, but when I try to restore a guest using a saved file (uncompressed produced under libvirt 0.7.0), I've this error: virsh restore /tmp/guest.state error: Failed to restore domain from /tmp/guest.state error: internal error unable to start guest: Nothing interesting in /var/log/libvirt/qemu/guest.log: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root /usr/bin/qemu-kvm -S -M pc -m 2048 -smp 4 -name guest -uuid 37b5937b-eacf-fda6-f4d0-33537d61b414 -monitor unix:/var/lib/libvirt/qemu/guest.monitor,server,nowait -localtime -no-reboot -boot c -drive file=/dev/data/guest,if=ide,index=0,boot=on -drive file=/var/lib/libvirt/iso/boot.iso,if=ide,media=cdrom,index=2 -net nic,macaddr=52:54:00:48:c4:ca,vlan=0,name=nic.0 -net tap,fd=25,vlan=0,name=tap.0 -serial pty -parallel none -usb -usbdevice tablet -vnc 127.0.0.1:0 -k fr -vga cirrus -incoming exec:cat The qemu process eats 100% of CPU during a few seconds, then stops (if I strace it during this time, I see a lot of error like bad file descriptor). Anyone have save/restore functions working with 0.7.1 ? Cheers, Daniel -- Daniel Berteaud FIREWALL-SERVICES SARL. Société de Services en Logiciels Libres Technopôle Montesquieu 33650 MARTILLAC Tel : 05 56 64 15 32 Fax : 05 56 64 15 32 Mail: daniel(a)firewall-services.com Web : http://www.firewall-services.com

5 14

[libvirt] qemu_driver migrateuri handling broken?
by Gregor Schaffrath 24 Sep '09

24 Sep '09

Hi all. Short summary on DV's request ;) I ran into a problem migrating kvm machines with libvirt-0.6.5: 1) At first, using the same syntax for the migrateuri as with xen (just the IP) did not work... looking into the source code (! ;) ), I found a different syntax for qemu. 2) using tcp://<ip>:<port> just produced an 'unknown failure' on the receiving side: root@loadgen137:~> virsh -c qemu:///system migrate --live kvm-testnode-vnode3 qemu+tcp://10.192.11.136/system?no_verify=1 tcp://10.192.11.136:12345 error: Unknown failure (Note: it was working like a charm when I eliminated the migrateuri altogether, but this was not an option in all my work environments, since one of them doesn't feature DNS, breaking migration on the hostname alone (and keeping /etc/hosts in sync on n machines is something I'd like to avoid, if possible ;) )) 3) removing the case distinction and the handling of the migrateuri in the qemudDomainMigratePrepare2 function in qemu_driver.c entirely (if-statement, and full else-part) solved both my issues. --- The issue seems to be current with 0.7.1 as well (at least I did receive the same error message - I did not investigate further) --- My 2ct: ;) I think that a wrapper like libvirt should consequently abstract lower level details (such as 'qemu', or 'xen') as much as possible (that's what libvirt is for, I guess :) ). Since the removal of the URI handling solves both the issue _and_ eliminates a case distinction between xen and qemu (painlessly, as far as I can see), I'd suggest perhaps considering the removal. :) As to the sending side specification of transfer ports: I think there should always be a possiblity to leave port selection up to libvirt, as the sending side does not necessarily an oversight over the free ports on the receiving side. (I feel that the reason for the different syntax including mandatory :port part was motivated by the wish to allow users to specify ports on the sending side) Cheers, Gregor Schaffrath.

3 5

[libvirt] [PATCH] Fix a typo in virDiskHasValidPciAddr()
by Jiri Denemark 24 Sep '09

24 Sep '09

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 09368d9..d494e54 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -125,7 +125,7 @@ struct _virDomainDiskDef { static inline int virDiskHasValidPciAddr(virDomainDiskDefPtr def) { - return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot; + return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot; } -- 1.6.5.rc1

3 2

[libvirt] "Unable to read QEMU help output: Interrupted system call" doing virDomainRestore() on current master
by Charles Duffy 24 Sep '09

24 Sep '09

Howdy. I've had this issue since yesterday, but avoided reporting it until determining today that it occurs on an unmodified upstream tree as well as my own local branch: $ virsh restore ramsave error: Failed to restore domain from ramsave error: Unable to read QEMU help output: Interrupted system call This happens immediately (no delay) and only on restore; "virsh start" behaves as usual. When running libvirtd under gdb, the failure mode is different: $ virsh restore ramsave error: Failed to restore domain from ramsave error: internal error Timed out while reading monitor startup output When running libvirtd under strace, this shows the binary being run (["/usr/bin/qemu-kvm", "-help"]) failing with a SIGPIPE while attempting to write to stdout. strace also shows a SIGSEGV being delivered to a libvirtd thread (a few clone()s removed from the parent) after that thread attempts to close all its open file descriptors above 0-2, but without being able to run gdb I'm at a bit of a loss as to what that thread is doing. Any suggestions?

2 1

[libvirt] [PATCH 0/5] Python fixes
by Cole Robinson 24 Sep '09

24 Sep '09

The following series fixes some functional (and cosmetic) issues with the python bindings. Thanks, Cole Cole Robinson (5): python: Don't generate conflicting conn.createXML functions. python: Add a newline between virConnect and virNode for readability. python: Don't generate bindings for vir*Ref python: Use a pure python implementation of 'vir*GetConnect' python: Fix generated virInterface method names python/generator.py | 40 +++++++++++++++++++++++++++++++++++++--- python/virConnect.py | 1 + 2 files changed, 38 insertions(+), 3 deletions(-)

2 8

[libvirt] building libvirtd fails on libxml-2
by Dan Bar Dov 24 Sep '09

24 Sep '09

I'm running on Centos5.3 Building using: ./autogen.sh --prefix=/usr configure fails with checking libxml2 xml2-config >= 2.6.0 ... configure: error: Could not find libxml2 anywhere (see config.log for details). but rpm -qa | grep libxml2 libxml2-python-2.6.26-2.1.2.7 libxml2-2.6.26-2.1.2.7 libxml2-2.6.26-2.1.2.7 So what's the problem, or better yet, how to fix it? Thanks, Dan

3 4

[libvirt] RFC: Rename / move / delete files in GIT
by Daniel P. Berrange 24 Sep '09

24 Sep '09

With the 0.7.1 relesae out of the way I'd like to suggest that we take this time to move around some files in GIT to correct some long standing wierd/bad naming decisions :-) The qemud/ directory is better named 'daemon', and some of the things in there should really have been in the src/ directory. So... * qemud/ -> daemon/ * qemud/qemud.{h,c} daemon/main.{h,c} * qemud/default-network.xml -> src/network/default.xml * qemud/libvirtd_qemu.aug src/qemu/qemu.aug * qemud/test_libvirtd_qemu.aug src/qemu/test_qemu.aug * qemud/remote_protocol.x -> src/remote/remote_protocol.x In the src/ directory we should move the rest of the drivers into their own sub-directories. Basically want one sub directory for each of the 'mod_LTLIBRARIES' declared in the src/Makefile.am. This will ensure we keep separate build dependancies, not accidentally including files that we shouldn't. * src/qemu_*.{c,h} -> src/qemu/ * src/xen_unified.{c,h} -> src/xen/xen_driver.{c,h} * src/xend_*, src/xm_* src/xen_* -> src/xen/ * src/test.{c,h} -> src/test/test_driver.{c,h} * src/storage*.{c,h} -> src/storage/ * src/security*.{c,h} -> src/security/ * src/remote_internal.{c,h} -> src/remote/remote_driver.{c,h} * src/interface_driver.c -> src/interface/netcf_driver.c * src/network_driver.c -> src/network/network_driver.c * src/lxc_* -> src/lxc/ * src/openvz_* -> src/openvz/ * src/node_device* -> src/nodedev/ That would just leave all the shared source files in src/. We could leave them there, or create a src/util/ directory for that stuff. Move virsh into the tools directory * src/virsh.c -> tools/virsh.c * docs/virsh.pod -> tools/virsh.pod * virsh.1: delete from GIT Sanitise naming in python/ directory, to make it clear which are the manually overriden methods. * python/libvir.c -> python/override-api.c * python/libvir.py -> python/override-api.py * python/libvirt-python-api.xml python/override-api.xml * python/libvirt_wrap.h -> python/types.h * python/virConnect.py -> python/override-virConnect.py Cleanup the docs/ directory * docs/*.html.in -> docs/website/ * docs/*.html: delete from GIT * docs/devhelp: delete from GIT * docs/html: delete from GIT * docs/libvirt-{api,refs}.xml: delete from GIT * docs/examples/ -> examples/ * docs/test*xml -> examples/xml/test/ * docs/storage -> examples/xml/storage/ Remove include/libvirt/libvirt.h from GIT For there places where I list 'delete from GIT', we would ensure that when you run 'make dist' the files are still included in the tar.gz NB, we would also update the cron job that deploys the website on libvirt.org soo that it runs 'make' in the docs/website directory to generate the .html files. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

4 8

[libvirt] [PATCH] Allow control over QEMU audio backend
by Daniel P. Berrange 24 Sep '09

24 Sep '09

When using VNC for graphics + keyboard + mouse, we shouldn't then use the host OS for audio. Audio should go back over VNC. When using SDL for graphics, we should use the host OS for audio since that's where the display is. We need to allow certain QEMU env variables to be passed through to guest too to allow choice of QEMU audio backend. * qemud/libvirtd.sysconf: Mention QEMU/SDL audio env vars * src/qemu_conf.c: Passthrough QEMU/SDL audio env for SDL display, disable host audio for VNC display --- daemon/libvirtd.sysconf | 8 ++++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.sysconf b/daemon/libvirtd.sysconf index fe4596a..28080a0 100644 --- a/daemon/libvirtd.sysconf +++ b/daemon/libvirtd.sysconf @@ -7,3 +7,11 @@ # Override Kerberos service keytab for SASL/GSSAPI #KRB5_KTNAME=/etc/libvirt/krb5.tab + +# Override the QEMU/SDL default audio driver probing when +# starting virtual machines using SDL graphics +# +# NB these have no effect for VMs using VNC +#QEMU_AUDIO_DRV=sdl +# +#SDL_AUDIODRIVER=pulse diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 273aeca..74ca52b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2109,6 +2109,13 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-k"); ADD_ARG_LIT(def->graphics[0]->data.vnc.keymap); } + + /* QEMU implements a VNC extension for providing audio, so we + * set the audio backend to none, to prevent it opening the + * host OS audio devices since that causes security issues + * and is non-sensical when using VNC. + */ + ADD_ENV_LIT("QEMU_AUDIO_DRV=none"); } else if ((def->ngraphics == 1) && def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { char *xauth = NULL; @@ -2131,6 +2138,13 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ENV(display); if (def->graphics[0]->data.sdl.fullscreen) ADD_ARG_LIT("-full-screen"); + + /* If using SDL for video, then we should just let it + * use QEMU's host audio drivers, possibly SDL too + * User can set these two before starting libvirtd + */ + ADD_ENV_COPY("QEMU_AUDIO_DRV"); + ADD_ENV_COPY("SDL_AUDIODRIVER"); } if (def->nvideos) { -- 1.6.2.5

2 2

[libvirt] ESX: Check if a datastore is accessible before accessing its URL property
by Matthias Bolte 23 Sep '09

23 Sep '09

An inaccessible datastore has no valid URL property. * src/esx/esx_vi.c: esxVI_LookupDatastoreByName(): check if datastore is accessible before accessing its URL property * src/esx/esx_vmx.c: update to changed datastore properties PS: This patch has to be applied after the 12er patch series. Matthias

3 2

[libvirt] ESX [01/12]: Add esxNodeGetFreeMemory()
by Matthias Bolte 23 Sep '09

23 Sep '09

* src/esx/esx_driver.c: add esxNodeGetFreeMemory(), cache IP address * src/esx/esx_vi.[ch]: refactor resource pool query into esxVI_GetResourcePool() * src/esx/esx_vi_types.[ch]: bind VI type ResourcePoolResourceUsage

3 2

[libvirt] [PATCH] Fix up "make check"
by Chris Lalancette 23 Sep '09

23 Sep '09

While running make check, I noticed that it was actually using the virsh binary from my system, in /usr/bin/virsh, and not the one that was just compiled. This doesn't seem to be the intent, so I changed all of the test scripts to point to the one built in-tree, not the system one. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tests/cpuset | 6 +++--- tests/define-dev-segfault | 4 ++-- tests/libvirtd-pool | 4 ++-- tests/read-bufsiz | 6 +++--- tests/read-non-seekable | 6 +++--- tests/start | 4 ++-- tests/test_conf.sh | 2 +- tests/undefine | 8 ++++---- tests/vcpupin | 6 +++--- tests/virsh-all | 6 +++--- tests/virsh-synopsis | 6 +++--- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/cpuset b/tests/cpuset index eeb0ee2..a3abe14 100755 --- a/tests/cpuset +++ b/tests/cpuset @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi . $srcdir/test-lib.sh @@ -26,7 +26,7 @@ fi fail=0 # generate input -virsh --connect test:///default dumpxml 1 > xml || fail=1 +$abs_top_builddir/tools/virsh --connect test:///default dumpxml 1 > xml || fail=1 # require the presence of the string we'll transform grep '<vcpu>' xml > /dev/null || fail=1 @@ -34,7 +34,7 @@ grep '<vcpu>' xml > /dev/null || fail=1 sed "s/vcpu>/vcpu cpuset='aaa'>/" xml > xml-invalid || fail=1 # Require failure and a diagnostic. -virsh --connect test:///default define xml-invalid > out 2>&1 && 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 diff --git a/tests/define-dev-segfault b/tests/define-dev-segfault index 4ae286f..cce1c07 100755 --- a/tests/define-dev-segfault +++ b/tests/define-dev-segfault @@ -4,7 +4,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=$(pwd) @@ -62,7 +62,7 @@ cat <<\EOF > D.xml || fail=1 EOF url=test:///default -virsh --connect "$url" 'define D.xml; dumpxml D' > out 2>&1 || fail=1 +$abs_top_builddir/tools/virsh --connect "$url" 'define D.xml; dumpxml D' > out 2>&1 || fail=1 cat > exp <<EOF || fail=1 Domain D defined from D.xml diff --git a/tests/libvirtd-pool b/tests/libvirtd-pool index 59da5a6..96da111 100755 --- a/tests/libvirtd-pool +++ b/tests/libvirtd-pool @@ -3,7 +3,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=$(pwd) @@ -14,7 +14,7 @@ fail=0 pwd=$(pwd) || fail=1 -virsh --connect test:///default \ +$abs_top_builddir/tools/virsh --connect test:///default \ pool-define-as --print-xml \ P dir src-host /src/path /src/dev S /target-path \ 1>out 2>&1 diff --git a/tests/read-bufsiz b/tests/read-bufsiz index 7d53735..9652817 100755 --- a/tests/read-bufsiz +++ b/tests/read-bufsiz @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=`pwd` @@ -29,7 +29,7 @@ test -z "$abs_top_srcdir" && abs_top_srcdir=`pwd`/.. fail=0 # Output a valid definition, to be used as input. -virsh -c test:///default dumpxml 1 > xml || fail=1 +$abs_top_builddir/tools/virsh -c test:///default dumpxml 1 > xml || fail=1 for i in before after; do # The largest BUFSIZ I've seen is 128K. This is slightly larger. @@ -38,7 +38,7 @@ for i in before after; do # Append or prepend enough spaces to push the size over the limit: ( test $i = before && cat sp xml || cat xml sp ) > $in || fail=1 - virsh --connect test:///default define $in > out || fail=1 + $abs_top_builddir/tools/virsh --connect test:///default define $in > out || fail=1 printf "Domain test defined from $in\n\n" > exp || fail=1 compare exp out || fail=1 done diff --git a/tests/read-non-seekable b/tests/read-non-seekable index 8a7bdcd..648def6 100755 --- a/tests/read-non-seekable +++ b/tests/read-non-seekable @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi . $srcdir/test-lib.sh @@ -40,11 +40,11 @@ cat <<\EOF > dom </domain> EOF -virsh -c test:///default define dom > /dev/null || fail=1 +$abs_top_builddir/tools/virsh -c test:///default define dom > /dev/null || fail=1 mkfifo_or_skip_ fifo cat dom > fifo & -virsh -c test:///default define fifo > /dev/null || fail=1 +$abs_top_builddir/tools/virsh -c test:///default define fifo > /dev/null || fail=1 (exit $fail); exit $fail diff --git a/tests/start b/tests/start index f457d59..6f7815a 100755 --- a/tests/start +++ b/tests/start @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=$(pwd) @@ -30,7 +30,7 @@ fail=0 test_url=test:///default # expect this to fail -virsh -c $test_url start test > out 2> err && fail=1 +$abs_top_builddir/tools/virsh -c $test_url start test > out 2> err && fail=1 # stdout gets a newline echo > exp || fail=1 diff --git a/tests/test_conf.sh b/tests/test_conf.sh index 62c2324..2754765 100755 --- a/tests/test_conf.sh +++ b/tests/test_conf.sh @@ -2,7 +2,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi . $srcdir/test-lib.sh diff --git a/tests/undefine b/tests/undefine index fafdae7..048a98b 100755 --- a/tests/undefine +++ b/tests/undefine @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi . $srcdir/test-lib.sh @@ -26,7 +26,7 @@ fi fail=0 # Attempt to undefine a running domain, by domain name. -virsh -q -c test:///default undefine test > out 2>&1 +$abs_top_builddir/tools/virsh -q -c test:///default undefine test > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 error: Failed to undefine domain test @@ -35,7 +35,7 @@ EOF compare exp out || fail=1 # A different diagnostic when specifying a domain ID -virsh -q -c test:///default undefine 1 > out 2>&1 +$abs_top_builddir/tools/virsh -q -c test:///default undefine 1 > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 error: a running domain like 1 cannot be undefined; @@ -44,7 +44,7 @@ EOF compare exp out || fail=1 # Succeed, now: first shut down, then undefine, both via name. -virsh -q -c test:///default 'shutdown test; undefine test' > out 2>&1 +$abs_top_builddir/tools/virsh -q -c test:///default 'shutdown test; undefine test' > out 2>&1 test $? = 0 || fail=1 cat <<\EOF > exp || fail=1 Domain test is being shutdown diff --git a/tests/vcpupin b/tests/vcpupin index 79b02dc..c243d80 100755 --- a/tests/vcpupin +++ b/tests/vcpupin @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi . $srcdir/test-lib.sh @@ -26,7 +26,7 @@ fi fail=0 # Invalid syntax. -virsh --connect test:///default vcpupin test a 0,1 > out 2>&1 +$abs_top_builddir/tools/virsh --connect test:///default vcpupin test a 0,1 > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 error: vcpupin: Invalid or missing vCPU number. @@ -35,7 +35,7 @@ EOF compare exp out || fail=1 # An out-of-range vCPU number deserves a diagnostic, too. -virsh --connect test:///default vcpupin test 100 0,1 > out 2>&1 +$abs_top_builddir/tools/virsh --connect test:///default vcpupin test 100 0,1 > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 error: vcpupin: Invalid vCPU number. diff --git a/tests/virsh-all b/tests/virsh-all index 03ea466..6accf44 100755 --- a/tests/virsh-all +++ b/tests/virsh-all @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=$(pwd) @@ -29,14 +29,14 @@ fail=0 test_url=test:///default -virsh -c $test_url help > cmds || framework_failure +$abs_top_builddir/tools/virsh -c $test_url help > cmds || framework_failure cmds=$(sed -n 's/^ $[^ ][^ ]*$ .*/\1/p' cmds) || framework_failure test -n "$cmds" || framework_failure for i in $cmds; do echo testing $i... 1>&2 # For now, just run the command and ignore output and exit status. - virsh -c $test_url $i < /dev/null > /dev/null 2>&1 + $abs_top_builddir/tools/virsh -c $test_url $i < /dev/null > /dev/null 2>&1 done (exit $fail); exit $fail diff --git a/tests/virsh-synopsis b/tests/virsh-synopsis index 24038dd..e700993 100755 --- a/tests/virsh-synopsis +++ b/tests/virsh-synopsis @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=$(pwd) @@ -28,12 +28,12 @@ fail=0 test_url=test:///default -virsh -c $test_url help > cmds || framework_failure +$abs_top_builddir/tools/virsh -c $test_url help > cmds || framework_failure cmds=$(sed -n 's/^ $[^ ][^ ]*$ .*/\1/p' cmds) || framework_failure test -n "$cmds" || framework_failure for i in $cmds; do - virsh -c $test_url help $i > help || fail=1 + $abs_top_builddir/tools/virsh -c $test_url help $i > help || fail=1 grep -A1 '^ SYNOPSIS$' help > synopsis \ || { echo 1>&2 missing or invalid help SYNOPSIS for $i; fail=1; } sed -n 2p synopsis > s2 || framework_failure -- 1.6.0.6

2 2

[libvirt] virsh capabilities, kvm with apic and toggle
by Garry Dolley 23 Sep '09

23 Sep '09

When I run 'virsh capabilities' on a libvirt 0.6.4 system with qemu 0.10 and kvm-84, one of the results I get is: <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> <machine>pc</machine> <machine>isapc</machine> <domain type='qemu'> </domain> <domain type='kvm'> <emulator>/usr/bin/kvm</emulator> </domain> </arch> <features> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> I'm wondering why the "apic" feature can't be toggled. Passing -no-kvm-irqchip to kvm would turn off "PIC/IOAPIC/LAPIC" -- Garry Dolley ARP Networks, Inc. | http://www.arpnetworks.com | (818) 206-0181 Data center, VPS, and IP Transit solutions Member Los Angeles County REACT, Unit 336 | WQGK336 Blog http://scie.nti.st

2 1

[libvirt] [RFC,PATCH] network: add 'netboot' option to dhcp config
by Jeremy Kerr 23 Sep '09

23 Sep '09

Currently, libvirtd will start a dnsmasq process for the virtual network, but (aside from killing the dnsmasq process and replacing it), there's no way to define tftp boot options. This change introduces a 'netboot' tag to the dhcp configuration: <network> <name>default</name> <bridge name="virbr%d" /> <forward/> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> <netboot root="/srv/tftp" file="pxeboot.img"/> </dhcp> </ip> </network> When root= and file= attributes are present, these are passed to the arguments to dnsmasq: dnsmasq [...] --enable-tftp --tftp-root /srv/tftp --dhcp-boot pxeboot.img At present, only local tftp servers are supported (ie, dnsmasq runs as the tftp server), but we could improve this in future by adding a server= attribute. Signed-off-by: Jeremy Kerr <jk(a)ozlabs.org> --- docs/formatnetwork.html.in | 6 ++++++ docs/schemas/network.rng | 6 ++++++ src/network_conf.c | 28 ++++++++++++++++++++++++++++ src/network_conf.h | 9 +++++++++ src/network_driver.c | 10 ++++++++++ 5 files changed, 59 insertions(+) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index fd68430..3186498 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -138,6 +138,12 @@ 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>netboot</code></dt> + <dd>The optional <code>netboot</code> element specified network boot + options to be provided by the DHCP server. Two attributes are + required: <code>root</code> (the root path of the TFTP server), and + <code>file</code> (the file to be used for the boot image). + </dd> </dl> <h2><a name="examples">Example configuration</a></h2> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index a4281a5..571e916 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -76,6 +76,12 @@ <attribute name="ip"><text/></attribute> </element> </zeroOrMore> + <optional> + <element name="netboot"> + <attribute name="root"><text/></attribute> + <attribute name="file"><text/></attribute> + </element> + </optional> </element> </element> </optional> diff --git a/src/network_conf.c b/src/network_conf.c index 3764bb4..87bb5e4 100644 --- a/src/network_conf.c +++ b/src/network_conf.c @@ -115,6 +115,9 @@ void virNetworkDefFree(virNetworkDefPtr def) } VIR_FREE(def->hosts); + VIR_FREE(def->tftproot); + VIR_FREE(def->bootfile); + VIR_FREE(def); } @@ -299,6 +302,24 @@ virNetworkDHCPRangeDefParseXML(virConnectPtr conn, def->hosts[def->nhosts].name = (char *)name; def->hosts[def->nhosts].ip = (char *)ip; def->nhosts++; + + } else if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "netboot")) { + xmlChar *root, *file; + + if (!(root = xmlGetProp(cur, BAD_CAST "root"))) { + cur = cur->next; + continue; + } + + if (!(file = xmlGetProp(cur, BAD_CAST "file"))) { + cur = cur->next; + xmlFree(root); + continue; + } + + def->tftproot = (char *)root; + def->bootfile = (char *)file; } cur = cur->next; @@ -621,6 +642,13 @@ char *virNetworkDefFormat(virConnectPtr conn, virBufferVSprintf(&buf, "ip='%s' ", def->hosts[i].ip); virBufferAddLit(&buf, "/>\n"); } + if (virNetworkDefProvidesNetboot(def)) { + virBufferAddLit(&buf, " <netboot"); + virBufferEscapeString(&buf, " root='%s'", def->tftproot); + virBufferEscapeString(&buf, " file='%s'", def->bootfile); + virBufferAddLit(&buf, " />\n"); + } + virBufferAddLit(&buf, " </dhcp>\n"); } diff --git a/src/network_conf.h b/src/network_conf.h index 4076f9a..f6f7c1e 100644 --- a/src/network_conf.h +++ b/src/network_conf.h @@ -78,8 +78,17 @@ struct _virNetworkDef { unsigned int nhosts; /* Zero or more dhcp hosts */ virNetworkDHCPHostDefPtr hosts; + + char *tftproot; + char *bootfile; }; +static inline int +virNetworkDefProvidesNetboot(const virNetworkDefPtr def) +{ + return def->tftproot && def->bootfile; +} + typedef struct _virNetworkObj virNetworkObj; typedef virNetworkObj *virNetworkObjPtr; struct _virNetworkObj { diff --git a/src/network_driver.c b/src/network_driver.c index 49855bf..cf462f2 100644 --- a/src/network_driver.c +++ b/src/network_driver.c @@ -400,6 +400,8 @@ networkBuildDnsmasqArgv(virConnectPtr conn, (2 * network->def->nranges) + /* --dhcp-range 10.0.0.2,10.0.0.254 */ /* --dhcp-host 01:23:45:67:89:0a,hostname,10.0.0.3 */ (2 * network->def->nhosts) + + /* --enable-tftp --tftp-root /srv/tftp --dhcp-boot pxeboot.img */ + (virNetworkDefProvidesNetboot(network->def) ? 5 : 0) + 1; /* NULL */ if (VIR_ALLOC_N(*argv, len) < 0) @@ -478,6 +480,14 @@ networkBuildDnsmasqArgv(virConnectPtr conn, APPEND_ARG(*argv, i++, buf); } + if (virNetworkDefProvidesNetboot(network->def)) { + APPEND_ARG(*argv, i++, "--enable-tftp"); + APPEND_ARG(*argv, i++, "--tftp-root"); + APPEND_ARG(*argv, i++, network->def->tftproot); + APPEND_ARG(*argv, i++, "--dhcp-boot"); + APPEND_ARG(*argv, i++, network->def->bootfile); + } + #undef APPEND_ARG return 0;

8 17

[libvirt] [PATCH] virStrncpy
by Chris Lalancette 23 Sep '09

23 Sep '09

Next revision of the virStrncpy patch. This one has the feedback from Mattias Bolte incorporated in, and passes all of the "make check" tests. I've also done basic testing on the hypervisors I have access to, (xen and kvm) and it seems to work there. That doesn't guarantee that it is bug-free, but most of the problems have been ironed out.

3 6

[libvirt] [RFC] Support for CPUID masking v2
by Jiri Denemark 23 Sep '09

23 Sep '09

Hi, This is an attempt to provide similar flexibility to CPU ID masking without being x86-specific and unfriendly to users. As suggested by Dan, we need a way to specify both CPU flags and topology to achieve this goal. Firstly, CPU topology and all (actually all that libvirt knows about) CPU features have to be advertised in host capabilities: <host> <cpu> ... <features> <feature>NAME</feature> </features> <topology> <sockets>NUMBER_OF_SOCKETS</sockets> <cores>CORES_PER_SOCKET</cores> <threads>THREADS_PER_CORE</threads> </topology> </cpu> ... </host> I'm not 100% sure we should represent CPU features as <feature>NAME</feature> especially because some features are currently advertised as <NAME/>. However, extending XML schema every time a new feature is introduced doesn't look like a good idea at all. The problem is we can't get rid of <NAME/>-style features, which would result in redundancy: <features> <vmx/> <feature>vmx</feature> </features> But I think it's better than changing the schema to add new features. Secondly, drivers which support detailed CPU specification have to advertise it in guest capabilities. In case <features> are meant to be hypervisor features, than it could look like: <guest> ... <features> <cpu/> </features> </guest> But if they are meant to be CPU features, we need to come up with something else: <guest> ... <cpu_selection/> </guest> I'm not sure how to deal with named CPUs suggested by Dan. Either we need to come up with global set of named CPUs and document what they mean or let drivers specify their own named CPUs and advertise them through guest capabilities: <guest> ... <cpu model="NAME"> <feature>NAME</feature> ... </cpu> </guest> The former approach would make matching named CPUs with those defined by a hypervisor (such as qemu) quite hard. The latter could bring the need for hardcoding features provided by specific CPU models or, in case we decide not to provide a list of features for each CPU model, it can complicate transferring a domain from one hypervisor to another. And finally, CPU may be configured in domain XML configuration: <domain> ... <cpu model="NAME"> <topology> <sockets>NUMBER_OF_SOCKETS</sockets> <cores>CORES_PER_SOCKET</cores> <threads>THREADS_PER_CORE</threads> </topology> <feature name="NAME" mode="set|check" value="on|off"/> </cpu> </domain> Mode 'check' checks physical CPU for the feature and refuses the domain to start if it doesn't match. VCPU feature is set to the same value. Mode 'set' just sets the VCPU feature. Final note: <topology> could also be called <cpu_topology> to avoid confusion with NUMA <topology>, which is used in host capabilities. However, I prefer <cpu><topology>...</topology></cpu> over <cpu><cpu_topology>...</cpu_topology></cpu>. Thanks for your comments. Jirka

5 10

[libvirt] Fix Xen virConnectPtr leak
by Matthias Bolte 22 Sep '09

22 Sep '09

The commit cb51aa48a777ddae6997faa9f28350cb62655ffd "Fix up connection reference counting." changed the driver closing and virConnectPtr unref-logic in virConnectClose(). Before this commit virConnectClose() closed all drivers of the given virConnectPtr and virUnrefConnect()'ed it afterwards. After this commit the driver-closing is done in virUnrefConnect() if and only if the ref-count of the virConnectPtr dropped to zero. This change in execution order leads to a virConnectPtr leak, at least for connections to Xen. The relevant call sequences: virConnectOpen() -> xenUnifiedOpen() ... ... xenInotifyOpen() -> virConnectRef(conn) ... xenStoreOpen() -> xenStoreAddWatch() -> conn->refs++ virConnectClose() -> xenUnifiedClose() ... ... xenInotifyClose() -> virUnrefConnect(conn) ... xenStoreClose() -> xenStoreRemoveWatch() -> virUnrefConnect(conn) Before the commit this additional virConnectRef/virUnrefConnect calls where no problem, because virConnectClose() closed the drivers explicitly and the additional refs added by the Xen subdrivers were removed properly. After the commit this additional refs result in a virConnectPtr leak (including a leak of the hypercall file handle; that's how I noticed this problem), because now the drivers are only close if and only if the ref-count drops to zero, but this cannot happen anymore, because the additional refs from the Xen subdrivers would only be removed if the drivers get closed, but that doesn't happen because the ref-count cannot drop to zero. The fix for this problem is simple: remove the virConnectRef/virUnrefConnect calls from the Xen subdrivers (see attached patch). Maybe someone could explain why the Xen Inotify and Xen Store driver do this extra ref-counting, but none of the other Xen subdrivers. It seems unnecessary to me and can be removed without problems. Matthias

3 3

[libvirt] kvm networking () on debian unstable
by Thomas Koch 22 Sep '09

22 Sep '09

Hi, I'm trying to get NAT networking running as described in http://libvirt.org/formatnetwork.html#examplesNAT But in the guest, ifconfig shows only the lo interface. I created the kvm image (debian lenny 5.0.3) directly with qemu-img and kvm, because virt- install also didn't work. Afterwards I created the XML file for libvirt: <domain type='kvm'> <name>hadoop1</name> <uuid>c40b6644-362a-e5ab-8825-cd1a7fbe24eb</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>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='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/hadoop1.qcow2'/> <target dev='hda' bus='ide'/> </disk> <interface type='network'> <mac address='52:54:00:05:74:bb'/> <source network='default'/> <model type='virtio'/> </interface>  <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='de-ch'/> <video> <model type='cirrus' vram='9216' heads='1'/> </video> </devices> </domain> The network config is: <network> <name>default</name> <bridge name="virbr0" /> <forward/> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> </dhcp> </ip> </network> ifconfig of the host (needs cleanup, I know): eth1 Link encap:Ethernet Hardware Adresse 00:1c:25:18:4d:e6 UP BROADCAST RUNNING MULTICAST MTU:1500 Metrik:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 Kollisionen:0 Sendewarteschlangenlänge:1000 RX bytes:0 (0.0 B) TX bytes:0 (0.0 B) Speicher:fe200000-fe220000 eth1:avahi Link encap:Ethernet Hardware Adresse 00:1c:25:18:4d:e6 inet Adresse:169.254.6.97 Bcast:169.254.255.255 Maske:255.255.0.0 UP BROADCAST RUNNING MULTICAST MTU:1500 Metrik:1 Speicher:fe200000-fe220000 lo Link encap:Lokale Schleife inet Adresse:127.0.0.1 Maske:255.0.0.0 inet6-Adresse: ::1/128 Gültigkeitsbereich:Maschine UP LOOPBACK RUNNING MTU:16436 Metrik:1 RX packets:160751 errors:0 dropped:0 overruns:0 frame:0 TX packets:160751 errors:0 dropped:0 overruns:0 carrier:0 Kollisionen:0 Sendewarteschlangenlänge:0 RX bytes:27262569 (25.9 MiB) TX bytes:27262569 (25.9 MiB) virbr0 Link encap:Ethernet Hardware Adresse 4a:30:15:4d:b5:0d inet Adresse:192.168.122.1 Bcast:192.168.122.255 Maske:255.255.255.0 inet6-Adresse: fe80::8804:ecff:febc:fa54/64 Gültigkeitsbereich:Verbindung UP BROADCAST RUNNING MULTICAST MTU:1500 Metrik:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:299 errors:0 dropped:0 overruns:0 carrier:0 Kollisionen:0 Sendewarteschlangenlänge:0 RX bytes:0 (0.0 B) TX bytes:47842 (46.7 KiB) vnet0 Link encap:Ethernet Hardware Adresse 4a:30:15:4d:b5:0d inet6-Adresse: fe80::4830:15ff:fe4d:b50d/64 Gültigkeitsbereich:Verbindung UP BROADCAST RUNNING MULTICAST MTU:1500 Metrik:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:128 errors:0 dropped:0 overruns:0 carrier:0 Kollisionen:0 Sendewarteschlangenlänge:500 RX bytes:0 (0.0 B) TX bytes:16426 (16.0 KiB) wlan0 Link encap:Ethernet Hardware Adresse 00:1d:e0:08:89:21 inet Adresse:192.168.178.23 Bcast:192.168.178.255 Maske:255.255.255.0 inet6-Adresse: fe80::21d:e0ff:fe08:8921/64 Gültigkeitsbereich:Verbindung UP BROADCAST RUNNING MULTICAST MTU:1500 Metrik:1 RX packets:10608 errors:0 dropped:0 overruns:0 frame:0 TX packets:10358 errors:0 dropped:0 overruns:0 carrier:0 Kollisionen:0 Sendewarteschlangenlänge:1000 RX bytes:7515487 (7.1 MiB) TX bytes:1367200 (1.3 MiB) wmaster0 Link encap:UNSPEC Hardware Adresse 00-1D- E0-08-89-21-00-00-00-00-00-00-00-00-00-00 UP BROADCAST RUNNING MULTICAST MTU:1500 Metrik:1 RX packets:0 errors:0 dropped:0 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 Kollisionen:0 Sendewarteschlangenlänge:1000 RX bytes:0 (0.0 B) TX bytes:0 (0.0 B) Thanks for any help, Thomas Koch, http://www.koch.ro

2 2

[libvirt] [PATCH] tiny tiny typos
by Dan Kenigsberg 22 Sep '09

22 Sep '09

--- docs/auth.html.in | 2 +- docs/downloads.html.in | 2 +- docs/errors.html | 2 +- docs/errors.html.in | 2 +- docs/formatdomain.html.in | 2 +- docs/java.html.in | 2 +- docs/news.html.in | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/auth.html.in b/docs/auth.html.in index 04b1210..5e5497e 100644 --- a/docs/auth.html.in +++ b/docs/auth.html.in @@ -151,7 +151,7 @@ Plugin "gssapiv2" [loaded], API version: 4 features: WANT_CLIENT_FIRST|PROXY_AUTHENTICATION|NEED_SERVER_FQDN </pre> <p> -Next is is necessary for the administrator of the Kerberos realm to issue a principle +Next is necessary for the administrator of the Kerberos realm to issue a principle for the libvirt server. There needs to be one principle per host running the libvirt daemon. The principle should be named <code>libvirt/full.hostname(a)KERBEROS.REALM</code>. This is typically done by running the <code>kadmin.local</code> command on the Kerberos diff --git a/docs/downloads.html.in b/docs/downloads.html.in index a34ddd1..493923c 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -60,7 +60,7 @@ <p> The libvirt build process uses GNU autotools, so after obtaining a checkout it is necessary to generate the configure script and Makefile.in templates using the <code>autogen.sh</code> command, passing the extra - arguments as as for configure. As an example, to do a complete build and + arguments as for configure. As an example, to do a complete build and install it into your home directory run:</p> <pre> diff --git a/docs/errors.html b/docs/errors.html index dad8c69..c34bcd8 100644 --- a/docs/errors.html +++ b/docs/errors.html @@ -107,7 +107,7 @@ to 0 or NULL if unused</p> <ul><li>str1, str2, str3: string information, usually str1 is the error message format</li><li>int1, int2: integer information</li></ul> <p>So usually, setting up specific error handling with libvirt consist of -registering an handler with with <a href="html/libvirt-virterror.html#virSetErrorFunc">virSetErrorFunc</a> or +registering a handler with <a href="html/libvirt-virterror.html#virSetErrorFunc">virSetErrorFunc</a> or with <a href="html/libvirt-virterror.html#virConnSetErrorFunc">virConnSetErrorFunc</a>, check the value of the code value, take appropriate action, if needed let libvirt print the error on stderr by calling <a href="html/libvirt-virterror.html#virDefaultErrorFunc">virDefaultErrorFunc</a>. diff --git a/docs/errors.html.in b/docs/errors.html.in index 57cbe6f..cbd6e4b 100644 --- a/docs/errors.html.in +++ b/docs/errors.html.in @@ -58,7 +58,7 @@ to 0 or NULL if unused</p> <li>int1, int2: integer information</li> </ul> <p>So usually, setting up specific error handling with libvirt consist of -registering an handler with with <a href="html/libvirt-virterror.html#virSetErrorFunc">virSetErrorFunc</a> or +registering a handler with <a href="html/libvirt-virterror.html#virSetErrorFunc">virSetErrorFunc</a> or with <a href="html/libvirt-virterror.html#virConnSetErrorFunc">virConnSetErrorFunc</a>, check the value of the code value, take appropriate action, if needed let libvirt print the error on stderr by calling <a href="html/libvirt-virterror.html#virDefaultErrorFunc">virDefaultErrorFunc</a>. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 915814d..49b212e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -500,7 +500,7 @@ </interface> ...</pre> - <h5><a name="elementsNICSBridge">Bridge to to LAN</a></h5> + <h5><a name="elementsNICSBridge">Bridge to LAN</a></h5> <p> <strong><em> diff --git a/docs/java.html.in b/docs/java.html.in index 5c659bb..d3e3ebc 100644 --- a/docs/java.html.in +++ b/docs/java.html.in @@ -5,7 +5,7 @@ <h2>Presentation</h2> <p>The Java bindings make use of <a href="https://jna.dev.java.net/">JNA</a> - to expose the C API in a Java friendly way. The bindings are are based on + to expose the C API in a Java friendly way. The bindings are based on work initiated by Toth Istvan.</p> <h2>Getting it</h2> diff --git a/docs/news.html.in b/docs/news.html.in index faba773..31f4aea 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -1375,7 +1375,7 @@ and check the <a href="ChangeLog.html">ChangeLog</a> to gauge progress.</p> </ul> <h3>0.0.3: Feb 9 2006</h3> <ul> - <li>Switch name from from 'libvir' to libvirt</li> + <li>Switch name from 'libvir' to libvirt</li> <li>Starting infrastructure to add code examples</li> <li>Update of python bindings for completeness</li> </ul> -- 1.6.2.5

4 3

[libvirt] [PATCH] add doc for graphic and video elements
by Florian Vichot 22 Sep '09

22 Sep '09

Hello The title says it all. Here's some doc explaining the new syntax of the video and graphic elements in the domain XML. It (probably) won't get me any literary awards but, eh, it's a start :) Florian

3 2

[libvirt] [PATCH: 0/MANY] Re-arrange files in the source tree
by Daniel P. Berrange 22 Sep '09

22 Sep '09

This is a followup to http://www.redhat.com/archives/libvir-list/2009-September/msg00477.html I am not actually going to spam the list with all the patches, since it'd generate a HUGE series of mails. Instead I have published a branch containing all the patches which you can directly pull into your GIT checkout. I recommend you do the following set of steps. - make maintainer-clean - git checkout master - git pull - git remote add -f danb git://gitorious.org/~berrange/libvirt/staging.git - git checkout -b rearrange danb/rearrange You will now have a checkout on a branch called 'rearrange' containing all my patches applied. If you want to go straight into building it, the normal build process still applies eg ./autogen && make I've committed the changes in a large series of steps to make it easier to see what's going on at each point. To see the list of changes run the following git log -b berrange/rearrange master.. The changes basically follow everything we discussed in the previous thread I've added a src/README file which describes the split of sub-directories. I'll reproduce the content here for convenience libvirt library code README =========================== The directory provides the bulk of the libvirt codebase. Everything except for the libvirtd daemon and client tools. The build uses a large number of libtool convenience libraries - one for each child directory, and then links them together for the final libvirt.so, although some bits get linked directly to libvirtd daemon instead. The files directly in this directory are supporting the public API entry points & data structures. There are two core shared modules to be aware of: * util/ - a collection of shared APIs that can be used by any code. This directory is always in the include path for all things built * conf/ - APIs for parsing / manipulating all the official XML files used by the public API. This directory is only in the include path for driver implementation modules Then there are the hypervisor implementations: * esx/ - VMWare ESX and GSX support using XMLRPC * lxc/ - Linux Native Containers * opennebula/ - Open Nebula using XMLRPC * openvz/ - OpenVZ containers using cli tools * phyp/ - IBM Power Hypervisor using CLI tools over SSH * qemu/ - QEMU / KVM using qemu CLI/monitor * remote/ - Generic libvirt native RPC client * test/ - A "mock" driver for testing * uml/ - User Mode Linux * vbox/ - Virtual Box using native API * xen/ - Xen using hypercalls, XenD SEXPR & XenStore Finally some secondary drivers that are shared for several HVs. Currently these are used by LXC, OpenVZ, QEMU, UML and Xen drivers. The ESX, OpenNebula, Power Hypervisor, Remote, Test & VirtualBox drivers all implement the secondary drivers directly * interface/ - Host network interface management * network/ - Virtual NAT networking * node_device/ - Host device enumeration * secret/ - Secret management * security/ - Mandatory access control drivers * storage/ - Storage management drivers Since both the hypervisor and secondary drivers can be built as dlopen()able modules, it is *FORBIDDEN* to have build dependancies between these directories. Drivers are only allowed to depend on the public API, and the internal APIs in the util/ and conf/ directories For the docs directory, I left the docs/libvirt-{api,refs}.xml files in GIT as Daniel requested. I have removed the *.html, devhelp/*.html and html/*.html files though. These are all re-generated when doing make in the docs directory, and the generated HTML is included in the tar.gz when doing make dist. So end users won't have to rebuild them, only libvirt developers The example programs & XML is now all under examples/ with various sub-directories. The qemud/ directory is renamed to daemon/ The python/ directory has its file nameing changed and the genrator tweaked so that its more obvious which are generated files and which are manually written. virsh has moved to the tools/ directory, and the docs/pki_check.sh file has been turned into a real installed tool, tools/virt-pki-validate along with man page. A few minor bugs were fixed along the way (eg bogus include files discovered when files were moved) & unused png/gif images in docs/ There should be no FUNCTIONAL change in any of this work though. It is a pure re-arrangement of files. Please try out a build using this 'rearrange' branch from gitorious. Since this is a huge change I'd like to apply this to the master repo as soon as people can verify its doing the right thing for them. FWIW, I checked an RPM build and 'make distcheck' too with no issues. Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 3

[libvirt] [PATCH] lxc: suspend/resume support
by Ryota Ozaki 22 Sep '09

22 Sep '09

Hi, This patch implements suspend/resume functions for LXC using cgroups freezer subsystem. The use of freezer is quite simple and well documented in Documentation/cgroups/freezer-subsystem.txt. The patch just uses it as it is. That is like: # freeze the container echo FROZEN > /target/container/freezer.state # unfreeze the container echo THAWED > /target/container/freezer.state However, freezer sometimes looks behaving different from the document. The document is saying "It's important to note that freezing can be incomplete. In that case we return EBUSY.", but in the case returning 0, freezing can be incomplete under load. So the code doesn't believe the return value and always check the content of freezer.state to identify whether the freezing is finished. Please refer to the comments in the code for more details. And the patch modifies domain_conf.c that assumes obj->monitor_chr != NULL but that is true only when qemu. Thanks, ozaki-r >From 50d273941eaf764f3ac3458ff10e618c771b77ef Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Wed, 16 Sep 2009 17:59:54 +0900 Subject: [PATCH] lxc: suspend/resume support --- src/cgroup.c | 23 ++++++- src/cgroup.h | 4 + src/domain_conf.c | 27 ++++---- src/lxc_driver.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 225 insertions(+), 15 deletions(-) diff --git a/src/cgroup.c b/src/cgroup.c index 111601d..2e646fd 100644 --- a/src/cgroup.c +++ b/src/cgroup.c @@ -32,7 +32,8 @@ #define CGROUP_MAX_VAL 512 VIR_ENUM_IMPL(virCgroupController, VIR_CGROUP_CONTROLLER_LAST, - "cpu", "cpuacct", "cpuset", "memory", "devices"); + "cpu", "cpuacct", "cpuset", "memory", "devices", + "freezer"); struct virCgroupController { int type; @@ -896,3 +897,23 @@ int virCgroupGetCpuacctUsage(virCgroupPtr group, unsigned long long *usage) VIR_CGROUP_CONTROLLER_CPUACCT, "cpuacct.usage", (uint64_t *)usage); } + +int virCgroupSetFreezerState(virCgroupPtr group, const char *state) +{ + return virCgroupSetValueStr(group, + VIR_CGROUP_CONTROLLER_CPU, + "freezer.state", state); +} + +int virCgroupGetFreezerState(virCgroupPtr group, char **state) +{ + int ret; + ret = virCgroupGetValueStr(group, + VIR_CGROUP_CONTROLLER_CPU, + "freezer.state", state); + if (ret == 0) { + char *p = strchr(*state, '¥n'); + if (p) *p = '¥0'; + } + return ret; +} diff --git a/src/cgroup.h b/src/cgroup.h index 6d43b14..aba56c6 100644 --- a/src/cgroup.h +++ b/src/cgroup.h @@ -21,6 +21,7 @@ enum { VIR_CGROUP_CONTROLLER_CPUSET, VIR_CGROUP_CONTROLLER_MEMORY, VIR_CGROUP_CONTROLLER_DEVICES, + VIR_CGROUP_CONTROLLER_FREEZER, VIR_CGROUP_CONTROLLER_LAST }; @@ -68,6 +69,9 @@ int virCgroupGetCpuShares(virCgroupPtr group, unsigned long long *shares); int virCgroupGetCpuacctUsage(virCgroupPtr group, unsigned long long *usage); +int virCgroupSetFreezerState(virCgroupPtr group, const char *state); +int virCgroupGetFreezerState(virCgroupPtr group, char **state); + int virCgroupRemove(virCgroupPtr group); void virCgroupFree(virCgroupPtr *group); diff --git a/src/domain_conf.c b/src/domain_conf.c index 5ae0775..5e37d96 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -4433,19 +4433,22 @@ char *virDomainObjFormat(virConnectPtr conn, virDomainStateTypeToString(obj->state), obj->pid); - switch (obj->monitor_chr->type) { - case VIR_DOMAIN_CHR_TYPE_UNIX: - monitorpath = obj->monitor_chr->data.nix.path; - break; - default: - case VIR_DOMAIN_CHR_TYPE_PTY: - monitorpath = obj->monitor_chr->data.file.path; - break; - } + /* obj->monitor_chr is set only for qemu */ + if (obj->monitor_chr) { + switch (obj->monitor_chr->type) { + case VIR_DOMAIN_CHR_TYPE_UNIX: + monitorpath = obj->monitor_chr->data.nix.path; + break; + default: + case VIR_DOMAIN_CHR_TYPE_PTY: + monitorpath = obj->monitor_chr->data.file.path; + break; + } - virBufferEscapeString(&buf, " <monitor path='%s'", monitorpath); - virBufferVSprintf(&buf, " type='%s'/>¥n", - virDomainChrTypeToString(obj->monitor_chr->type)); + virBufferEscapeString(&buf, " <monitor path='%s'", monitorpath); + virBufferVSprintf(&buf, " type='%s'/>¥n", + virDomainChrTypeToString(obj->monitor_chr->type)); + } if (obj->nvcpupids) { diff --git a/src/lxc_driver.c b/src/lxc_driver.c index 0ec1e92..2399d98 100644 --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -1862,6 +1862,188 @@ static char *lxcGetHostname (virConnectPtr conn) return result; } +static int lxcFreezeContainer(lxc_driver_t *driver, virDomainObjPtr vm) +{ + int timeout = 3; /* In seconds */ + int check_interval = 500; /* In milliseconds */ + int n_try = (timeout * (1000 / check_interval)); + int i = 0; + int ret = -1; + char *state = NULL; + virCgroupPtr cgroup = NULL; + + if (!(driver->cgroup && + virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) == 0)) + return -1; + + while (++i <= n_try) { + int r; + /* + * Writing "FROZEN" to the "freezer.state" freezes the group, + * i.e., the container, temporarily transiting "FREEZING" state. + * Once the freezing is completed, the state of the group transits + * to "FROZEN". + * (see linux-2.6/Documentation/cgroups/freezer-subsystem.txt) + */ + r = virCgroupSetFreezerState(cgroup, "FROZEN"); + + /* + * Returning EBUSY explicitly indicates that the group is + * being freezed but incomplete and other errors are true + * errors. + */ + if (r < 0 && r != -EBUSY) { + VIR_DEBUG("Writing freezer.state failed with errno: %d", r); + goto error; + } + + /* + * Unfortunately, returning 0 (success) is likely to happen + * even when the freezing has not been completed. Sometimes + * the state of the group remains "FREEZING" like when + * returning -EBUSY and even worse may never transit to + * "FROZEN" even if writing "FROZEN" again. + * + * So we don't trust the return value anyway and always + * decide that the freezing has been complete only with + * the state actually transit to "FROZEN". + */ + usleep(check_interval * 1000); + + r = virCgroupGetFreezerState(cgroup, &state); + + if (r < 0) { + VIR_DEBUG("Reading freezer.state failed with errno: %d", r); + goto error; + } + VIR_DEBUG("Read freezer.state: %s", state); + + if (STREQ(state, "FROZEN")) { + ret = 0; + goto cleanup; + } + + VIR_FREE(state); + } + VIR_DEBUG0("lxcFreezeContainer timeout"); +error: + /* + * If timeout or an error on reading the state occurs, + * activate the group again and return an error. + * This is likely to fall the group back again gracefully. + */ + virCgroupSetFreezerState(cgroup, "THAWED"); + ret = -1; + +cleanup: + if (cgroup) + virCgroupFree(&cgroup); + VIR_FREE(state); + return ret; +} + +static int lxcDomainSuspend(virDomainPtr dom) +{ + lxc_driver_t *driver = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + + lxcDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + lxcError(dom->conn, dom, VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainIsActive(vm)) { + lxcError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + + if (vm->state != VIR_DOMAIN_PAUSED) { + if (lxcFreezeContainer(driver, vm) < 0) { + lxcError(dom->conn, dom, VIR_ERR_OPERATION_FAILED, + "%s", _("suspend operation failed")); + goto cleanup; + } + vm->state = VIR_DOMAIN_PAUSED; + } + + if (virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) + goto cleanup; + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + lxcDriverUnlock(driver); + return ret; +} + +static int lxcUnfreezeContainer(lxc_driver_t *driver, virDomainObjPtr vm) +{ + int ret; + virCgroupPtr cgroup = NULL; + + if (!(driver->cgroup && + virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) == 0)) + return -1; + + ret = virCgroupSetFreezerState(cgroup, "THAWED"); + + virCgroupFree(&cgroup); + return ret; +} + +static int lxcDomainResume(virDomainPtr dom) +{ + lxc_driver_t *driver = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + + lxcDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + lxcError(dom->conn, dom, VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!virDomainIsActive(vm)) { + lxcError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + + if (vm->state == VIR_DOMAIN_PAUSED) { + if (lxcUnfreezeContainer(driver, vm) < 0) { + lxcError(dom->conn, dom, VIR_ERR_OPERATION_FAILED, + "%s", _("resume operation failed")); + goto cleanup; + } + vm->state = VIR_DOMAIN_RUNNING; + } + + if (virDomainSaveStatus(dom->conn, driver->stateDir, vm) < 0) + goto cleanup; + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + lxcDriverUnlock(driver); + return ret; +} + + /* Function Tables */ static virDriver lxcDriver = { VIR_DRV_LXC, /* the number virDrvNo */ @@ -1881,8 +2063,8 @@ static virDriver lxcDriver = { lxcDomainLookupByID, /* domainLookupByID */ lxcDomainLookupByUUID, /* domainLookupByUUID */ lxcDomainLookupByName, /* domainLookupByName */ - NULL, /* domainSuspend */ - NULL, /* domainResume */ + lxcDomainSuspend, /* domainSuspend */ + lxcDomainResume, /* domainResume */ lxcDomainShutdown, /* domainShutdown */ NULL, /* domainReboot */ lxcDomainDestroy, /* domainDestroy */ -- 1.6.0.6

3 7

[libvirt] [PATCH] Power Hypervisor now with libssh2
by Eduardo Otubo 22 Sep '09

22 Sep '09

Hello friends, This is the new version of phyp driver now using libssh2. I also did some other changes: * Added some debug information. Sometimes its worth to know which command is being executed and where. So I added the PHYP_CMD_DEBUG macro. * All the connection startup is now "hard coded" in libssh2. For example, I need to open the socket and start the connection all by myself. Not a big deal, but in a near future I am planning to send a patch to libssh2 to encapsulate all these procedures into functions, hence, less code, probably less bugs :) * There is a lot of "out of scope" functions in the bottom of the file. In the next patch I may put all those together in a phyp_config.[ch] in order to get things clearer. What's up next: * The problem of handling the UUID in a centralized way still remains. I started to handle this by opening a sftp connection to the HMC system and transfer my UUID database. But there is an odd behavior that makes the driver connect OR NOT to some HMC systems. * CPU management: this feature planned to be released in this version is not ready yet due to the issue above. * Storage management. Vacations: I'll be on vacations from 26th/august to 14th/september. I'll check my emails in the meanwhile, but no so often. Anyway, any comments on this patch are always welcome :) []'s -- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 otubo(a)linux.vnet.ibm.com

2 3

[libvirt] [PATCH] Remove an unnecessary variable from remoteIOReadMessage().
by Chris Lalancette 21 Sep '09

21 Sep '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/remote_internal.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/remote_internal.c b/src/remote_internal.c index dd7b31e..b89d45d 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -6942,10 +6942,9 @@ remoteIOReadMessage(virConnectPtr conn, struct private_data *priv, if (priv->saslconn) { if (priv->saslDecoded == NULL) { char encoded[8192]; - unsigned int encodedLen = sizeof(encoded); int ret, err; ret = remoteIOReadBuffer(conn, priv, in_open, - encoded, encodedLen); + encoded, sizeof(encoded)); if (ret < 0) return -1; if (ret == 0) -- 1.6.0.6

2 3

[libvirt] [PATCH] Simple fix of a comment in qemuStringToArgvEnv.
by Chris Lalancette 21 Sep '09

21 Sep '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index f92bcef..273aeca 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -2363,7 +2363,7 @@ static int qemuStringToArgvEnv(const char *args, curr = next; } - /* Iterate over list of args, finding first arg not containining + /* Iterate over list of args, finding first arg not containing * the '=' character (eg, skip over env vars FOO=bar) */ for (envend = 0 ; ((envend < argcount) && (strchr(arglist[envend], '=') != NULL)); -- 1.6.0.6

2 1

[libvirt] [PATCH] Fix up comments for domainXML{To,From}Native.
by Chris Lalancette 21 Sep '09

21 Sep '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/esx/esx_driver.c | 4 ++-- src/lxc_driver.c | 4 ++-- src/phyp/phyp_driver.c | 4 ++-- src/test.c | 4 ++-- src/uml_driver.c | 4 ++-- src/vbox/vbox_tmpl.c | 4 ++-- src/xen_unified.c | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 07afc10..8fad457 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3061,8 +3061,8 @@ static virDriver esxDriver = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ esxDomainDumpXML, /* domainDumpXML */ - esxDomainXMLFromNative, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ + esxDomainXMLFromNative, /* domainXMLFromNative */ + NULL, /* domainXMLToNative */ esxListDefinedDomains, /* listDefinedDomains */ esxNumberOfDefinedDomains, /* numOfDefinedDomains */ esxDomainCreate, /* domainCreate */ diff --git a/src/lxc_driver.c b/src/lxc_driver.c index 0ec1e92..eafd8ba 100644 --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -1901,8 +1901,8 @@ static virDriver lxcDriver = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ lxcDomainDumpXML, /* domainDumpXML */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ + NULL, /* domainXMLFromNative */ + NULL, /* domainXMLToNative */ lxcListDefinedDomains, /* listDefinedDomains */ lxcNumDefinedDomains, /* numOfDefinedDomains */ lxcDomainStart, /* domainCreate */ diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 2f8a314..e2a2caf 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1347,8 +1347,8 @@ virDriver phypDriver = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ phypDomainDumpXML, /* domainDumpXML */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ + NULL, /* domainXMLFromNative */ + NULL, /* domainXMLToNative */ phypListDefinedDomains, /* listDefinedDomains */ phypNumDefinedDomains, /* numOfDefinedDomains */ NULL, /* domainCreate */ diff --git a/src/test.c b/src/test.c index 368a3cb..5f1ba62 100644 --- a/src/test.c +++ b/src/test.c @@ -4227,8 +4227,8 @@ static virDriver testDriver = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ testDomainDumpXML, /* domainDumpXML */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ + NULL, /* domainXMLFromNative */ + NULL, /* domainXMLToNative */ testListDefinedDomains, /* listDefinedDomains */ testNumOfDefinedDomains, /* numOfDefinedDomains */ testDomainCreate, /* domainCreate */ diff --git a/src/uml_driver.c b/src/uml_driver.c index a2b9495..d28cc30 100644 --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -1823,8 +1823,8 @@ static virDriver umlDriver = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ umlDomainDumpXML, /* domainDumpXML */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ + NULL, /* domainXMLFromNative */ + NULL, /* domainXMLToNative */ umlListDefinedDomains, /* listDefinedDomains */ umlNumDefinedDomains, /* numOfDefinedDomains */ umlDomainStart, /* domainCreate */ diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 7270710..c02b18c 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -6426,8 +6426,8 @@ virDriver NAME(Driver) = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ vboxDomainDumpXML, /* domainDumpXML */ - NULL, /* domainXmlFromNative */ - NULL, /* domainXmlToNative */ + NULL, /* domainXMLFromNative */ + NULL, /* domainXMLToNative */ vboxListDefinedDomains, /* listDefinedDomains */ vboxNumOfDefinedDomains, /* numOfDefinedDomains */ vboxDomainCreate, /* domainCreate */ diff --git a/src/xen_unified.c b/src/xen_unified.c index dfa9ca5..b826198 100644 --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -1692,8 +1692,8 @@ static virDriver xenUnifiedDriver = { NULL, /* domainGetSecurityLabel */ NULL, /* nodeGetSecurityModel */ xenUnifiedDomainDumpXML, /* domainDumpXML */ - xenUnifiedDomainXMLFromNative, /* domainXmlFromNative */ - xenUnifiedDomainXMLToNative, /* domainXmlToNative */ + xenUnifiedDomainXMLFromNative, /* domainXMLFromNative */ + xenUnifiedDomainXMLToNative, /* domainXMLToNative */ xenUnifiedListDefinedDomains, /* listDefinedDomains */ xenUnifiedNumOfDefinedDomains, /* numOfDefinedDomains */ xenUnifiedDomainCreate, /* domainCreate */ -- 1.6.0.6

2 1

[libvirt] [PATCH] Fix a double-free in qemudRunLoop()
by Chris Lalancette 21 Sep '09

21 Sep '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- qemud/qemud.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 00b9859..087f5da 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2270,7 +2270,6 @@ cleanup: } VIR_FREE(server->workers); - free(server->workers); virMutexUnlock(&server->lock); return ret; } -- 1.6.0.6

2 1

[libvirt] [PATCH] Don't do virSetConnError when virDrvSupportsFeature is successful.
by Chris Lalancette 21 Sep '09

21 Sep '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/libvirt.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 4a11688..fa59dc7 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1349,8 +1349,11 @@ virDrvSupportsFeature (virConnectPtr conn, int feature) } ret = VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature); - /* Copy to connection error object for back compatability */ - virSetConnError(conn); + + if (ret < 0) + /* Copy to connection error object for back compatability */ + virSetConnError(conn); + return ret; } -- 1.6.0.6

2 1

[libvirt] [PATCH] Fix up 'neccessary -> necessary' in a comment.
by Chris Lalancette 21 Sep '09

21 Sep '09

Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/virterror.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/virterror.c b/src/virterror.c index 77b295c..e421ab7 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -641,7 +641,7 @@ virRaiseErrorFull(virConnectPtr conn, /* * All errors are recorded in thread local storage * For compatability, public API calls will copy them - * to the per-connection error object when neccessary + * to the per-connection error object when necessary */ to = virLastErrorObject(); if (!to) -- 1.6.0.6

2 1

[libvirt] [PATCH 2/2] Fix leak in PCI hostdev hot-unplug
by Mark McLoughlin 21 Sep '09

21 Sep '09

* src/qemu_driver.c: sync the hostdev hot-unplug code with the disk/net code. --- src/qemu_driver.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index de31581..2ddcdc0 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -6206,14 +6206,20 @@ static int qemudDomainDetachHostPciDevice(virConnectPtr conn, pciFreeDevice(conn, pci); } - if (i != --vm->def->nhostdevs) - memmove(&vm->def->hostdevs[i], - &vm->def->hostdevs[i+1], - sizeof(*vm->def->hostdevs) * (vm->def->nhostdevs-i)); - if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) { - virReportOOMError(conn); - ret = -1; + if (vm->def->nhostdevs > 1) { + memmove(vm->def->hostdevs + i, + vm->def->hostdevs + i + 1, + sizeof(*vm->def->hostdevs) * + (vm->def->nhostdevs - (i + 1))); + vm->def->nhostdevs--; + if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) { + /* ignore, harmless */ + } + } else { + VIR_FREE(vm->def->hostdevs); + vm->def->nhostdevs = 0; } + virDomainHostdevDefFree(detach); return ret; } -- 1.6.2.5

2 1

[libvirt] [PATCH 1/2] Fix net/disk hot-unplug segfault
by Mark McLoughlin 21 Sep '09

21 Sep '09

When we hot-unplug the last device, we're currently double-freeing the device definition. Reported by Michal Nowak here: https://bugzilla.redhat.com/523953 * src/qemu_driver.c: fix double free --- src/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index a65334f..de31581 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -5998,7 +5998,7 @@ try_command: /* ignore, harmless */ } } else { - VIR_FREE(vm->def->disks[0]); + VIR_FREE(vm->def->disks); vm->def->ndisks = 0; } virDomainDiskDefFree(detach); @@ -6100,7 +6100,7 @@ qemudDomainDetachNetDevice(virConnectPtr conn, /* ignore, harmless */ } } else { - VIR_FREE(vm->def->nets[0]); + VIR_FREE(vm->def->nets); vm->def->nnets = 0; } virDomainNetDefFree(detach); -- 1.6.2.5

2 2

[libvirt] virsh migrate with libvirt-0.6.2: failed to start listening VM
by David Wilcox 21 Sep '09

21 Sep '09

Hello, I'm trying to migrate a vm from a fedora 11 host to another fedora 11 host. Both hosts are on the same subnet. Both machines have identical architectures. We use an nfs shared storage mounted, but both machines also have their own hard drives. I get the machines up and running alright. Here's the printout of virsh when I try to do the migration. # virsh list Id Name State ---------------------------------- 1 windowsxp running 2 potato running # virsh migrate 1 qemu+ssh://prodigy/system Password: error: operation failed: failed to start listening VM On the other machine, the log file that gets created under /var/log/libvirt/qemo/windowsxp.log LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin /usr/bin/qemu-kvm -S -M pc -m 512 -smp 1 -name windowsxp -uuid 24d2fd62-ed4f-a321-e264-200b347cfa6c -monitor pty -pidfile /var/run/libvirt/qemu//windowsxp.pid -localtime -no-acpi -boot c -drive file=/var/lib/libvirt/images/windowsxp.img,if=ide,index=0,boot=on -drive file=/aml/iso/windows_xp_sp3.iso,if=ide,media=cdrom,index=2 -net nic,macaddr=54:52:00:01:f1:06,vlan=0 -net tap,fd=19,vlan=0 -serial pty -parallel none -usb -usbdevice tablet -vnc 127.0.0.1:0 -soundhw es1370 -incoming tcp:0.0.0.0:49159 qemu: could not open disk image /var/lib/libvirt/images/windowsxp.img I would think that the virtual machine should copy from the one machine to the other. Isn't libvirt supposed to copy the image file? What's even stranger, I've been trying this for awhile. It's failed every time, except once when it succeded. I don't know what made it succeed in that case and fail in all the other cases. Thanks.

2 1

[libvirt] regarding the network information for Domain
by anuj rampal 18 Sep '09

18 Sep '09

Hi all, im trying to call libvirt api from windows. I have created a guest OS(windows) using the libvirt api from my windows machine. It gets created fine it also gets the the IP address from the DHCP also. So all works fine. Now to RDP into the machine what I have to do is 1. logon to my host machine. 2. open the guest OS using either "virt-viewer" or "virt-manager". 3. check out the IP address of the machine. 4. then RDP into the guest OS. My Question: Is there a way to find The IP address of the Guest OS.??? ---------------------------------------------------------------------------------------------------------------------------- im also trying to cross compile "virt-viewer 0.0.3" but this is what i get when i do make: [root@FC-11 virt-viewer-0.0.3]# make make all-recursive make[1]: Entering directory `/root/virt-viewer-0.0.3' Making all in src make[2]: Entering directory `/root/virt-viewer-0.0.3/src' /bin/sh ../libtool --tag=CC --mode=link i686-pc-mingw32-gcc -mms-bitfields -I/usr/i686-pc-mingw32/sys-root/mingw/include/gtk-vnc-1.0 -I/usr/i686-pc-mingw32/sys-root/mingw/include/gtk-2.0 -I/usr/i686-pc-mingw32/sys-root/mingw/include -I/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/include -I/usr/i686-pc-mingw32/sys-root/mingw/include/atk-1.0 -I/usr/i686-pc-mingw32/sys-root/mingw/include/cairo -I/usr/i686-pc-mingw32/sys-root/mingw/include/pango-1.0 -I/usr/i686-pc-mingw32/sys-root/mingw/include/glib-2.0 -I/usr/i686-pc-mingw32/sys-root/mingw/lib/glib-2.0/include -I/usr/i686-pc-mingw32/sys-root/mingw/include/pixman-1 -I/usr/i686-pc-mingw32/sys-root/mingw/include/libpng12 -mms-bitfields -I/usr/i686-pc-mingw32/sys-root/mingw/include/gtk-2.0 -I/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/include -I/usr/i686-pc-mingw32/sys-root/mingw/include/atk-1.0 -I/usr/i686-pc-mingw32/sys-root/mingw/include/cairo -I/usr/i686-pc-mingw32/sys-root/mingw/include/pango-1.0 -I/usr/i686-pc-mingw32/sys-root/mingw/include/glib-2.0 -I/usr/i686-pc-mingw32/sys-root/mingw/lib/glib-2.0/include -I/usr/i686-pc-mingw32/sys-root/mingw/include/pixman-1 -I/usr/i686-pc-mingw32/sys-root/mingw/include/libpng12 -I/usr/i686-pc-mingw32/sys-root/mingw/include/libxml2 -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables -Wall -Wmissing-prototypes -std=c99 -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Winline -Wredundant-decls -Wno-sign-compare -g -O2 -o virt-viewer.exe virt_viewer-main.o -Wl,-luuid -L/usr/i686-pc-mingw32/sys-root/mingw/lib -lgtk-vnc-1.0 -lgtk-win32-2.0 -lgnutls -lgdk-win32-2.0 -limm32 -lshell32 -lole32 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lgio-2.0 -lcairo -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lm -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -Wl,-luuid -L/usr/i686-pc-mingw32/sys-root/mingw/lib -lgtk-win32-2.0 -lgdk-win32-2.0 -limm32 -lshell32 -lole32 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lgio-2.0 -lcairo -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lm -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -L/usr/i686-pc-mingw32/sys-root/mingw/lib -lxml2 -lvirt -lpthread ../libtool: line 834: X--tag=CC: command not found ../libtool: line 867: libtool: ignoring unknown tag : command not found ../libtool: line 834: X--mode=link: command not found ../libtool: line 1001: *** Warning: inferring the mode of operation is deprecated.: command not found ../libtool: line 1002: *** Future versions of Libtool will require --mode=MODE be specified.: command not found ../libtool: line 2074: X-mms-bitfields: command not found ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/gtk-vnc-1.0: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/gtk-2.0: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/include: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/atk-1.0: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/cairo: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/pango-1.0: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/glib-2.0: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/lib/glib-2.0/include: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/pixman-1: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/libpng12: No such file or directory ../libtool: line 2074: X-mms-bitfields: command not found ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/gtk-2.0: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/lib/gtk-2.0/include: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/atk-1.0: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/cairo: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/pango-1.0: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/glib-2.0: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/lib/glib-2.0/include: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/pixman-1: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/libpng12: No such file or directory ../libtool: line 2239: X-I/usr/i686-pc-mingw32/sys-root/mingw/include/libxml2: No such file or directory ../libtool: line 2239: X-Wp,-D_FORTIFY_SOURCE=2: command not found ../libtool: line 2239: X-fexceptions: command not found ../libtool: line 2239: X-fstack-protector: command not found ../libtool: line 2239: X--param=ssp-buffer-size=4: command not found ../libtool: line 2239: X-fasynchronous-unwind-tables: command not found ../libtool: line 2239: X-Wall: command not found ../libtool: line 2239: X-Wmissing-prototypes: command not found ../libtool: line 2239: X-std=c99: command not found ../libtool: line 2239: X-Wnested-externs: command not found ../libtool: line 2239: X-Wpointer-arith: command not found ../libtool: line 2239: X-Wextra: command not found ../libtool: line 2239: X-Wshadow: command not found ../libtool: line 2239: X-Wcast-align: command not found ../libtool: line 2239: X-Wwrite-strings: command not found ../libtool: line 2239: X-Waggregate-return: command not found ../libtool: line 2239: X-Winline: command not found ../libtool: line 2239: X-Wredundant-decls: command not found ../libtool: line 2239: X-Wno-sign-compare: command not found ../libtool: line 2239: X-g: command not found ../libtool: line 2239: X-O2: command not found ../libtool: line 2202: X-Wl,-luuid: command not found Fatal server error: Server is already active for display 0 If this server is no longer running, remove /tmp/.X0-lock and start again. Please consult the The X.Org Foundation support at http://wiki.x.org for help. ../libtool: line 1958: X-L/usr/i686-pc-mingw32/sys-root/mingw/lib: No such file or directory ../libtool: line 1981: X/root/virt-viewer-0.0.3/src: No such file or directory ../libtool: line 2202: X-Wl,-luuid: command not found Fatal server error: Server is already active for display 0 If this server is no longer running, remove /tmp/.X0-lock and start again. Please consult the The X.Org Foundation support at http://wiki.x.org for help. ../libtool: line 1958: X-L/usr/i686-pc-mingw32/sys-root/mingw/lib: No such file or directory ../libtool: line 1981: X/root/virt-viewer-0.0.3/src: No such file or directory ../libtool: line 1958: X-L/usr/i686-pc-mingw32/sys-root/mingw/lib: No such file or directory ../libtool: line 1981: X/root/virt-viewer-0.0.3/src: No such file or directory ../libtool: line 2408: Xvirt-viewer.exe: command not found ../libtool: line 2413: X/usr/lib/qt-3.3/bin:/usr/kerberos/sbin:/usr/kerberos/bin:/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin: No such file or directory ../libtool: line 2420: Xvirt-viewer.exe: command not found ../libtool: line 2555: X-lgtk-vnc-1.0: command not found ../libtool: line 2555: X-lgtk-win32-2.0: command not found ../libtool: line 2555: X-lgnutls: command not found ../libtool: line 2555: X-lgdk-win32-2.0: command not found ../libtool: line 2555: X-limm32: command not found ../libtool: line 2555: X-lshell32: command not found ../libtool: line 2555: X-lole32: command not found ../libtool: line 2555: X-latk-1.0: command not found ../libtool: line 2555: X-lgdk_pixbuf-2.0: command not found ../libtool: line 2555: X-lpangocairo-1.0: command not found ../libtool: line 2555: X-lgio-2.0: command not found ../libtool: line 2555: X-lcairo: command not found ../libtool: line 2555: X-lpangowin32-1.0: command not found ../libtool: line 2555: X-lgdi32: command not found ../libtool: line 2555: X-lpango-1.0: command not found ../libtool: line 2555: X-lgobject-2.0: command not found ../libtool: line 2555: X-lgmodule-2.0: command not found ../libtool: line 2555: X-lglib-2.0: command not found ../libtool: line 2555: X-lintl: command not found ../libtool: line 2555: X-lgtk-win32-2.0: command not found ../libtool: line 2555: X-lgdk-win32-2.0: command not found ../libtool: line 2555: X-limm32: command not found ../libtool: line 2555: X-lshell32: command not found ../libtool: line 2555: X-lole32: command not found ../libtool: line 2555: X-latk-1.0: command not found ../libtool: line 2555: X-lgdk_pixbuf-2.0: command not found ../libtool: line 2555: X-lpangocairo-1.0: command not found ../libtool: line 2555: X-lgio-2.0: command not found ../libtool: line 2555: X-lcairo: command not found ../libtool: line 2555: X-lpangowin32-1.0: command not found ../libtool: line 2555: X-lgdi32: command not found ../libtool: line 2555: X-lpango-1.0: command not found ../libtool: line 2555: X-lgobject-2.0: command not found ../libtool: line 2555: X-lgmodule-2.0: command not found ../libtool: line 2555: X-lglib-2.0: command not found ../libtool: line 2555: X-lintl: command not found ../libtool: line 2555: X-lxml2: command not found ../libtool: line 2555: X-lvirt: command not found ../libtool: line 2555: X-lpthread: command not found ../libtool: line 2637: X-L/root/virt-viewer-0.0.3/src: No such file or directory ../libtool: line 2555: X-lgtk-vnc-1.0: command not found ../libtool: line 2555: X-lgnutls: command not found ../libtool: line 2555: X-lgtk-win32-2.0: command not found ../libtool: line 2555: X-lgdk-win32-2.0: command not found ../libtool: line 2555: X-limm32: command not found ../libtool: line 2555: X-lshell32: command not found ../libtool: line 2555: X-lole32: command not found ../libtool: line 2555: X-latk-1.0: command not found ../libtool: line 2555: X-lgdk_pixbuf-2.0: command not found ../libtool: line 2555: X-lpangocairo-1.0: command not found ../libtool: line 2555: X-lgio-2.0: command not found ../libtool: line 2555: X-lcairo: command not found ../libtool: line 2555: X-lpangowin32-1.0: command not found ../libtool: line 2555: X-lgdi32: command not found ../libtool: line 2555: X-lpango-1.0: command not found ../libtool: line 2555: X-lgobject-2.0: command not found ../libtool: line 2555: X-lgmodule-2.0: command not found ../libtool: line 2555: X-lglib-2.0: command not found ../libtool: line 2555: X-lintl: command not found ../libtool: line 2555: X-lxml2: command not found ../libtool: line 2555: X-lvirt: command not found ../libtool: line 2555: X-lpthread: command not found ../libtool: line 2637: X-L/root/virt-viewer-0.0.3/src: No such file or directory ../libtool: line 2555: X-lgtk-vnc-1.0: command not found ../libtool: line 2555: X-lgnutls: command not found ../libtool: line 2555: X-lgtk-win32-2.0: command not found ../libtool: line 2555: X-lgdk-win32-2.0: command not found ../libtool: line 2555: X-limm32: command not found ../libtool: line 2555: X-lshell32: command not found ../libtool: line 2555: X-lole32: command not found ../libtool: line 2555: X-latk-1.0: command not found ../libtool: line 2555: X-lgdk_pixbuf-2.0: command not found ../libtool: line 2555: X-lpangocairo-1.0: command not found ../libtool: line 2555: X-lgio-2.0: command not found ../libtool: line 2555: X-lcairo: command not found ../libtool: line 2555: X-lpangowin32-1.0: command not found ../libtool: line 2555: X-lgdi32: command not found ../libtool: line 2555: X-lpango-1.0: command not found ../libtool: line 2555: X-lgobject-2.0: command not found ../libtool: line 2555: X-lgmodule-2.0: command not found ../libtool: line 2555: X-lglib-2.0: command not found ../libtool: line 2555: X-lintl: command not found ../libtool: line 2555: X-lxml2: command not found ../libtool: line 2555: X-lvirt: command not found ../libtool: line 2555: X-lpthread: command not found ../libtool: line 5172: Xi686-pc-mingw32-gcc "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" -o @OUTPUT@ virt_viewer-main.o -L/root/virt-viewer-0.0.3/src -lgtk-vnc-1.0 -lgnutls -lgtk-win32-2.0 -lgdk-win32-2.0 -limm32 -lshell32 -lole32 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lgio-2.0 -lcairo -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -lxml2 -lvirt -lpthread: No such file or directory ../libtool: line 5173: Xi686-pc-mingw32-gcc "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" "" -o @OUTPUT@ virt_viewer-main.o -L/root/virt-viewer-0.0.3/src -lgtk-vnc-1.0 -lgnutls -lgtk-win32-2.0 -lgdk-win32-2.0 -limm32 -lshell32 -lole32 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lgio-2.0 -lcairo -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -lxml2 -lvirt -lpthread: No such file or directory Fatal server error: Server is already active for display 0 If this server is no longer running, remove /tmp/.X0-lock and start again. Please consult the The X.Org Foundation support at http://wiki.x.org for help. ../libtool: line 5182: : command not found make[2]: Leaving directory `/root/virt-viewer-0.0.3/src' Making all in man make[2]: Entering directory `/root/virt-viewer-0.0.3/man' make[2]: Nothing to be done for `all'. make[2]: Leaving directory `/root/virt-viewer-0.0.3/man' Making all in plugin make[2]: Entering directory `/root/virt-viewer-0.0.3/plugin' make[2]: Nothing to be done for `all'. make[2]: Leaving directory `/root/virt-viewer-0.0.3/plugin' make[2]: Entering directory `/root/virt-viewer-0.0.3' make[2]: Leaving directory `/root/virt-viewer-0.0.3' make[1]: Leaving directory `/root/virt-viewer-0.0.3' could any1 help me out with this. Thanks in advance. Regards Anuj

2 1

[libvirt] guests and pulseaudio fighting over audio devices
by Dave Allan 18 Sep '09

18 Sep '09

I noticed that when a KVM guest created with virt-manager is running on F10, sound on the physical host stops working. When all VMs are shutdown, sound starts working again. Removing the <sound> tag from the VM XML allows sound to work while the VM is booted. To further complicate troubleshooting, if audio is already playing when the guest is started it keeps playing, since pulse already has the device open. The message in /var/log/messages when I try to play audio is: pulseaudio[6492]: module-alsa-sink.c: Error opening PCM device front:0: Device or resource busy strace of pulseaudio shows: open("/dev/snd/pcmC0D0p", O_RDWR|O_NONBLOCK) = -1 EBUSY (Device or resource busy) but fuser and lsof show nothing. A trivial test program also sees Device or resource busy when trying to open /dev/snd/pcmC0D0p I am in favor of removing the <sound> tag from the default configuration, since I don't use sound from within guests and I do use sound on my desktop, but perhaps this behavior is specific to my configuration. I haven't investigated it exhaustively. What does everybody else think? Dave

2 2

[libvirt] Resubmission: [PATCH 0/6] sVirt AppArmor security driver
by Jamie Strandboge 16 Sep '09

16 Sep '09

Resubmitting based on feedback from this list. Notably, *alloc calls have been removed and syntax-check completes without error for all files. Jamie On Fri, 04 Sep 2009, Jamie Strandboge wrote: > This patch series implements the AppArmor security driver for sVirt. > This implementation was developed for the Ubuntu AppArmorLibvirtProfile > specification[1], but is general enough for any AppArmor deployment > (such as Ubuntu, *SUSE and Mandriva). > > This patch has seen quite a bit of real world testing in Ubuntu 9.10 > (our development release) in our 0.7.0-1ubuntu3 package. I did make a > few small changes after going through HACKING, but mostly I got the > tests going and added documentation. > > DESIGN > ------ > When a virtual machine is started, determine if a profile is currently > defined for the machine, and use it if available. If not, generate a new > profile for the machine based on a template, which is by default a very > restrictive profile allowing access to disk files, and anything else > needed to run, such as the pid, monitor and log files. > > Virtual machines should have a unique profile specific to that machine. > To ensure uniqueness, the profile name will be derived from the UUID of > the virtual machine. These profiles should be configurable, either by > adjusting the profile template for new machines, creating/modifying the > VM profile directly or through the use of AppArmor abstractions. This > will allow for administrators to fine-tune confinement for individual > machines if desired. > > If enabled at compile time, the sVirt security model will be activated > if AppArmor is available on the host OS and a profile for the libvirtd > daemon is loaded when libvirtd is started. > > libvirtd should not be allowed to create arbitrary profiles or modify > profiles directly, so as to not allow libvirtd to potentially (ie via a > security bug in libvirtd itself) bootstrap out of AppArmor confinement. > > Because root privileges are needed to manipulate AppArmor profiles, > qemu:///session will not be supported at this time, but the > implementation must allow for a confined libvirtd with qemu:///session > guests running unconfined. This can be revisited when AppArmor supports > per-user profiles. > > Please see the specification[1] for more details. > > > PATCHES > ------- > The patches are all against trunk as of yesterday. Testing was done on > trunk and there seem to be no regressions over the the 0.7.0-1ubuntu3 > package in Ubuntu. > > > [PATCH 1*] > patch_1a_reenable-nonfile-labels.patch: > When James Morris originally submitted his sVirt patches (as seen in > libvirt 0.6.1), he did not require on disk labelling for > virSecurityDomainRestoreImageLabel. A later commit[2] changed this > behavior to assume on disk labelling, which halts implementations for > path-based MAC systems such as AppArmor and TOMOYO where > vm->def->seclabel is required to obtain the label. This patch simply > adds the 'virDomainObjPtr vm' argument back to *RestoreImageLabel. > > patch_1b_optional.patch: > Due to the above change, 'make syntax-check' fails because > SELinuxRestoreSecurityImageLabel() does not use the 'virDomainObjPtr > vm'. patch_1b_optional.patch is a simple patch to fix this by checking > if vm->def->seclabel == NULL and returns with error if it does. I > realize this may not be desired in the long term, but it should be > harmless enough to include. > > > [PATCH 2] > patch_2_security_c.patch: > Updates src/security.c for AppArmor > > > [PATCH 3] > patch_3_security_apparmor.patch: > Adds security_apparmor.c, security_apparmor.h, virt-aa-helper.c and > updates po/POTFILES.in. virt-aa-helper.c is a new binary which is used > exclusively by the AppArmor security driver to manipulate AppArmor. > These files compile without warning and pass syntax-check. > > > [PATCH 4] > patch_4_tests.patch: > Adds tests for virt-aa-helper and the security driver. secaatest.c is > identical to seclabeltest.c except it initializes the 'apparmor' driver > instead of 'selinux'. These tests are integrated into 'make check' and > pass. > > > [PATCH 5] > patch_5_docs.patch: > Updates docs/drvqemu.html.in for AppArmor and adds profile examples to > examples/apparmor. > > > [PATCH 6] > patch_6_autoconf.patch: > Updates Makefile.am and configure.in for AppArmor. It is based on and > should operate the same as the SELinux configuration. > > > Caveats and known issues: > 1. it does not take advantage of the recent host device labelling > functionality yet > 2. it does not properly handle hot-plugging of devices yet > 3. qemu:///session runs unconfined (see above) > > > Thanks! > > Jamie (jdstrand on Freenode and OFTC) > > [1] https://wiki.ubuntu.com/SecurityTeam/Specifications/AppArmorLibvirtProfile > [2] http://libvirt.org/git/?p=libvirt.git;a=commit;h=c86afc85ee0d1ec6d76c2d254b… > -- Jamie Strandboge | http://www.canonical.com

4 14

[libvirt] Passing -no-kvm-irqchip to KVM/QEMU guests
by Garry Dolley 16 Sep '09

16 Sep '09

Dear libvirt, Is there a way to tell a KVM/QEMU guest managed by libvirt to start with the "-no-kvm-irqchip" argument? I have some FreeBSD 7 guests with timing issues, and if I try to start the VMs manually with -no-kvm-irqchip, the timing issues go away (the only known workaround right now). However, if the guest is managed by libvirt, I have found no way to pass this command line option. I'm running libvirt 0.6.4 on Ubuntu 9.04 Thoughts? -- Garry Dolley ARP Networks, Inc. | http://www.arpnetworks.com | (818) 206-0181 Data center, VPS, and IP Transit solutions Member Los Angeles County REACT, Unit 336 | WQGK336 Blog http://scie.nti.st

3 3

[libvirt] Python binding to virConnectListInterfaces
by Shahar Klein 16 Sep '09

16 Sep '09

Hi I'm trying to implement virConnectListInterfaces for the ESX driver (actually the esx_interface driver) but the python generator does not write the code for this function in generator.py this function is in a special table called: skip_impl and there is a comment saying: # Class methods which are written by hand in libvir.c but the Python-level # code is still automatically generated (so they are not in skip_function()) I'm not sure what does it mean should I implement in libvir.c? and I'm done? thanks ahead Shahar

4 8

[libvirt] ESX driver does not support vmxnet3
by Shahar Klein 16 Sep '09

16 Sep '09

diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index 70e9305..6bd6b93 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -1409,10 +1409,11 @@ esxVMX_ParseEthernet(virConnectPtr conn, virConfPtr conf, int controller, if (virtualDev != NULL && STRCASENEQ(virtualDev, "vlance") && STRCASENEQ(virtualDev, "vmxnet") && + STRCASENEQ(virtualDev, "vmxnet3") && STRCASENEQ(virtualDev, "e1000")) { ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR, "Expecting VMX entry '%s' to be 'vlance' or 'vmxnet' or " - "'e1000' but found '%s'", virtualDev_name, virtualDev); + "'vmxnet3' or 'e1000' but found '%s'", virtualDev_name, virtualDev); goto failure; }

3 2

[libvirt] [PATCH] doc: don't emit trailing blanks into generated and VC'd NEWS file
by Jim Meyering 15 Sep '09

15 Sep '09

Daniel Veillard reported that the generated and VC'd NEWS file was causing trouble because the latest version contains trailing spaces, which conflicts with our server-side hook to prevent that. Here's the fix to avoid emitting those trailing spaces: >From 8110d304f49a217021371321ade0026ccd2627e1 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 15 Sep 2009 15:01:26 +0200 Subject: [PATCH] doc: don't emit trailing blanks into generated and VC'd NEWS file * docs/Makefile.am ($(top_builddir)/NEWS): Filter out trailing white space. --- docs/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 9ac2f6d..1125931 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -131,6 +131,7 @@ $(top_builddir)/NEWS: $(top_srcdir)/docs/news.xsl $(top_srcdir)/docs/news.html.i $(XSLTPROC) --nonet $(top_srcdir)/docs/news.xsl \ $(top_srcdir)/docs/news.html.in \ | perl -0777 -pe 's/\n\n+$$/\n/' \ + | perl -pe 's/[ \t]+$//' \ > $@-t && mv $@-t $@ ; fi ); clean-local: -- 1.6.5.rc1.171.g3f463

2 1

[libvirt] Release of libvirt-0.7.1
by Daniel Veillard 15 Sep '09

15 Sep '09

Okay, it's finally out of the box and available as usual at ftp://libvirt.org/libvirt/ There is a fair amount of new features and improvement, not surprizing considering 0.7.0 was 1.5 months ago. And of course many bug fixes and cleanups: * New Features: - Add an internal <secret> XML handling API (Miloslav Trmač) - VBox 3.0.6 API change support (Pritesh Kothari) - also allow use of XZ for Qemu image compression (Jim Meyering) - Multipath storage support module (Dave Allan) - VBox add Storage Volume support (Pritesh Kothari) - Support configuration of huge pages in guests (Daniel P. Berrange) - Add support for encrypted (qcow) volume creation. (Miloslav Trmač) - Secret manipulation public API (Miloslav Trmač) - support lzop save compression for qemu (Charles Duffy) - Support new PolicyKit 1.0 API (Daniel P. Berrange) - Compressed save image format for Qemu. (Chris Lalancette) - QEmu add host PCI device hotplug support (Mark McLoughlin) * Portability: - Fix win32 platform build (Daniel P. Berrange) * Documentation: - Minor comment changes (Laine Stump) - Fix up virNodeGetCellsFreeMemory (Chris Lalancette) - Fix some typos & remove unhelpful acronyms in QEMU docs (Daniel P. Berrange) - Add documentation about the QEMU driver security features (Daniel P. Berrange) - Remove 'the the' typo in docs (Daniel P. Berrange) - Fix some URLs in virsh manpage (Mark McLoughlin) - Add link to AbiCloud web management system (Daniel P. Berrange) - Update logging documentation (Amy Griffis) * Bug Fixes: - VBox bug when starting machine from old versions (Pritesh Kothari) - ESX avoid potential leaks (Matthias Bolte) - Fix more OOM handling bugs (Daniel P. Berrange) - Fix logging buffer overrun read (Daniel P. Berrange) - Fix misc thread locking bugs / bogus warnings (Daniel P. Berrange) - Fix regression from "Avoid polling on FDs with no events" (Chris Lalancette) - Close logfile fd after spawning qemu (Ryota Ozaki) - Check for libssh2 >= 1.0 for phy driver (Maximilian Wilhelm) - Avoid another leak in src/xend_internal.c (Matthias Bolte) - Avoid a leak in xenDaemonLookupByID (Matthias Bolte) - VBox fix minor bugs in display and added OOM checks (Pritesh Kothari) - Some close/fclose/closedir calls are missing (Matthias Bolte) - lxc_container.c: avoid a leak on error paths (Jim Meyering) - Fix several memory leaks (Ryota Ozaki) - Fix a memory leak in virsh (Laine Stump) - Fix ID field in virDomainPtr after starting Xen VM (Daniel P. Berrange) - Fix memory leak of monitor character device (Daniel P. Berrange) - Automatically set correct ownership of QEMU state directories (Daniel P. Berrange) - Avoid polling on FDs with no events enabled (Daniel P. Berrange) - esx_vi: return -1 upon failure, as intended (Matthias Bolte) - python: let libvirt_virConnectDomainEventCallback indicate success (Jim Meyering) - uml_conf.c: don't return an uninitialized pointer (Jim Meyering) - storage_backend.c: assure clang that inputvol can't be NULL (Jim Meyering) - libvir.c: avoid NULL dereference in virStoragePoolSetAutostart (Jim Meyering) - lxc: avoid NULL dereference upon getmntent failure (Jim Meyering) - storage_backend_fs: avoid NULL dereference on opendir failure (Jim Meyering) - Fix bugs in virDomainMigrate v2 code. (Chris Lalancette) - VMware ESX: Don't warn on some query parameter (Matthias Bolte) - Don't blindly reorder disk drives (Daniel P. Berrange) - Fix sexpr2string() to handle empty list. (Jim Fehlig) - Fix driver entry table for UML numa APIs (Daniel P. Berrange) - Fix crash in virsh vol-key command (Pritesh Kothari) - 517157 fix selinux problem with images on NFS (Darryl L. Pierce) - Fix phypOpen() escape_specialcharacters (Mattias Bolte) - Power Hypervisor: fix potential segfault (Mattias Bolte) - Fix bridge/tap system error reporting (Mark McLoughlin) - Reset PCI host devices after hot-unplug (Mark McLoughlin) - Reset unmanaged PCI host devices before hotplug (Mark McLoughlin) - Fix up connection reference counting. (Chris Lalancette) - Fix LXC driver crash when kernel doesn't support clone (Daniel P. Berrange) - Make LXC / UML drivers robust against NUMA topology brokenness (Daniel P. Berrange) - Run 'cont' on successful migration finish. (Chris Lalancette) - Fix QEMU domain status after restore. (Chris Lalancette) - Handle kernels with no ipv6 support (Mark McLoughlin) - Set perms on /var/lib/libvirt/boot to 0711 (Mark McLoughlin) - chown kernel/initrd before spawning qemu (Mark McLoughlin) - Several fixes to libvirtd's log setup (Amy Griffis) - Fix memleak if esxOpen fails (Matthias Bolte) * Improvements: - Add UUID definition required by storage encryption import (Daniel P. Berrange) - Make secrets RNG more strict (Daniel P. Berrange) - Fill in secret UUID for qcow encryption (Daniel P. Berrange) - Add usage type/id as a public API property of virSecret (Daniel P. Berrange) - Fix UUID handling in secrets/storage encryption APIs (Daniel P. Berrange) - Save vcpuinfo in status file (Daniel P. Berrange) - Restart libvirtd upon RPM upgrade (Daniel P. Berrange) - Add support for qcow encrypted volumes to qemu. (Miloslav Trmač) - Provide missing passphrase when creating a volume. (Miloslav Trmač) - Add virsh commands for secrets APIs (Miloslav Trmač) - Local file implementation of secret driver API (Miloslav Trmač) - Mask out flags used internally for virSecretGetValue (Miloslav Trmač) - Add <usage> to <secret> docs (Miloslav Trmač) - Support relabelling of USB and PCI devices (Daniel P. Berrange) - Add helper APIs for iterating over PCI device resource files (Daniel P. Berrange) - Add helper module for dealing with USB host devices (Daniel P. Berrange) - Test that domain-specific qemu machine types are used correctly (Mark McLoughlin) - Probe machine types from kvm binary too (Mark McLoughlin) - Look up machine types from all domains in qemudGetOldMachines() (Mark McLoughlin) - Test qemu machine aliases (Mark McLoughlin) - Add qemu -help test data for qemu-kvm-0.11.0-rc2 (Mark McLoughlin) - Add a more featureful qemu capabilities test data (Mark McLoughlin) - Add arm arch to capabilities schema (Mark McLoughlin) - Update capabilities schema to allow multiple machines per domain (Mark McLoughlin) - Add esx and tcp migration uri transports to capabilities schema (Mark McLoughlin) - Reintroduce support for lzop compression (Charles Duffy) - build: update gnulib submodule to latest (Jim Meyering) - Add flags and requires for Multipath storage (Daniel Veillard) - ESX raise error if UUID parse failed (Matthias Bolte) - ESX add domain undefine based on esxVI_UnregisterVM (Matthias Bolte) - ESX add esxGetCapabilities() with basic defaults (Matthias Bolte) - Switch Power Hypervisor to libssh2 (Eduardo Otubo) - Allow libvirtd to RPC to external libvirtd (Chris Lalancette) - Add support for setting disk drive serial numbers (Daniel P. Berrange) - VBox support for defining/dumping video devices (Pritesh Kothari) - Generic parsing support for video acceleration (Pritesh Kothari) - VMware ESX: Allow ethernet address type 'vpx' (Matthias Bolte) - Support for getting/setting number of cpus in VBox (Pritesh Kothari) - Make handling of monitor prompts more general. (Miloslav Trmač) - Attach encryption information to virDomainDiskDef. (Miloslav Trmač) - Recognize encryption format of qcow volumes. (Miloslav Trmač) - Attach encryption information to virStorageVolDef. (Miloslav Trmač) - Add volume encryption information handling. (Miloslav Trmač) - Secret manipulation API docs refresh & wire up python generator (Miloslav Trmač) - Secret manipulation remote client (Miloslav Trmač) - Secret manipulation libvirtd wire protocol & remote dispatcher (Miloslav Trmač) - Secret manipulation public API implementation (Miloslav Trmač) - Secret manipulation internal API (Miloslav Trmač) - Add test for recently fixed crash with latest XenD (Daniel P. Berrange) - Don't expose 'vnet%d' to the user (Mark McLoughlin) - Maintain a list of active PCI hostdevs and use it in pciResetDevice() (Mark McLoughlin) - Simplify PCI hostdev prepare/re-attach using a pciDeviceList type (Mark McLoughlin) - Use pci_addr=auto with QEMU's pci_add monitor command (Mark McLoughlin) - Check active domain hostdevs before allowing PCI reset (Mark McLoughlin) - Allow pciResetDevice() to reset multiple devices (Mark McLoughlin) - Improve PCI host device reset error message (Mark McLoughlin) - Reset and re-attach PCI host devices on guest shutdown (Mark McLoughlin) - Allow PM reset on multi-function PCI devices (Mark McLoughlin) - Detect KVM's PCI device assignment support (Mark McLoughlin) - Split virDomainMigrate into functions. (Chris Lalancette) - Consolidate code for parsing the logging env (Amy Griffis) * Cleanups: - Remove accidentally added UUID re-definition in storage schema (Daniel P. Berrange) - ESX cleanup of CPU model strings (Matthias Bolte) - Fix use of dlopen modules (Daniel P. Berrange) - Consolidate "cont" into qemudMonitorSendCont() (Miloslav Trmač) - Cleanup sec driver error reporting to use virReportSystemError (Daniel P. Berrange) - Port QEMU driver to use USB/PCI device helpers (Daniel P. Berrange) - Simplify and fix qemudCanonicalizeMachine() (Mark McLoughlin) - Split up qemudGetOldMachines() (Mark McLoughlin) - Re-factor qemu test machine allocation code (Mark McLoughlin) - Canonicalize the qemu machine type in qemuxml2argvtest (Mark McLoughlin) - Dump qemu driver capabilities if test debugging enabled (Mark McLoughlin) - Fix formatting of machine types in capabilities XML (Mark McLoughlin) - qemu_driver.c: factor out more duplication (Jim Meyering) - Deprecate lzma and lzop in favor of xz, add dep (Daniel Veillard) - qemu_driver.c: factor out duplication in compression-type handling (Jim Meyering) - openvz_conf.c: remove dead store to "p"; use strchrnul (Jim Meyering) - Remove some tabs used for indent (Daniel Veillard) - Updated a number of localizations and regenerated (Daniel Veillard) - Add a missing comment (Miloslav Trmač) - Fix a pasto in storage_encryption_conf.c (Miloslav Trmač) - xm_internal.c: remove four useless comparisons after strchr (Jim Meyering) - xm_internal.c: remove dead increment of "data" (Jim Meyering) - network_driver.c: remove dead store to "err" (Jim Meyering) - iptables.c: remove dead store to "s" (Jim Meyering) - util.c: avoid dead store to "flag" (Jim Meyering) - domain_conf.c: remove two dead stores (Jim Meyering) - xm_internal.c: remove two ret=... dead stores (Jim Meyering) - xm_internal.c: remove dead stores of local, "type" (Jim Meyering) - network_conf.c: remove dead store to "err" (Jim Meyering) - openvz_driver.c: avoid dead store to "err" (Jim Meyering) - xend_internal.c: Remove two dead stores to "ret" (Jim Meyering) - storage_driver.c: remove two dead stores to "backend" (Jim Meyering) - qemu_conf.c: add a comment suggesting why we leave a dead-store (Jim Meyering) - hash.c: remove a dead store (Jim Meyering) - interface_conf.c: remove a dead-store and declaration (Jim Meyering) - eventtest.c: detect write failure and avoid dead stores (Jim Meyering) - openvz_conf.c: Remove dead store to copy_fd (Jim Meyering) - storage_backend_logical.c: appease clang: remove useless increment (Jim Meyering) - ESX simplify SOAP request and response handling (Matthias Bolte) - ESX use virXPathNode*() to simplify XPath handling (Matthias Bolte) - ESX: make esxVI_GetVirtualMachineIdentity() robust (Matthias Bolte) - ESX: Fix VMX path parsing and URL encoding (Matthias Bolte) - VBox driver cleanups (Pritesh Kothari) - PHYP driver cleanups (Daniel Veillard) - Move QEMU monitor socket in /var/lib/libvirt/qemu (Daniel P. Berrange) - xen_internal.c: remove two unused local variables (Jim Meyering) - mdns.c: remove dead initialization (Jim Meyering) - node_device_conf.c: remove dead initialization (Jim Meyering) - openvz_conf.c: don't use undefined local, "net" (Jim Meyering) - test.c: don't use undefined local, "def" (Jim Meyering) - remote_internal.c: appease clang (Jim Meyering) - infra: define ATTRIBUTE_NONNULL to mark non-NULL parameters (Jim Meyering) - lxc: don't unlink(NULL) in main (Jim Meyering) - storage_conf.c: avoid overflow upon use of "z" or "Z" (zebi) suffix (Jim Meyering) - VBox cleanup and update of networking shutdown (Pritesh Kothari) - Box cleanup and update of networking XML functions (Pritesh Kothari) - Fix misc OOM bugs (Daniel P. Berrange) - Misc fixes to secrets API code (Daniel P. Berrange) - Only add glusterfs dep for Fedora >= 11 (Daniel P. Berrange) - Remove redundant base64 include file (Daniel P. Berrange) - Don't assume buffered output echoes the command. (Miloslav Trmač) - Update chinese, polish and spanish localizations (Daniel Veillard) - OpenVZ: accept NULL as type for GetMaxVCPUs. (Chris Lalancette) - Remove use of strncpy in qemudExtractMonitorPath. (Chris Lalancette) - Refactor policycode auth code to avoid compiler warnings (Daniel P. Berrange) - spec file: add URL to Source tag (Mark McLoughlin) - Small fixes for qemu save compression. (Chris Lalancette) - Fix thinko in PCI hostdev detach (Mark McLoughlin) - Revert changes to allow pciResetDevice() reset multiple devices (Mark McLoughlin) - Fix list updating after disk/network/hostdev hot-unplug (Mark McLoughlin) - Re-name remote_internal.c:driver to remote_driver (Mark McLoughlin) - Cosmetic change to 'virsh nodedev-list --tree' output (Mark McLoughlin) - Re-factor hostdev hotplug (Mark McLoughlin) - Remove a duplicated assignment in Xen PCI parsing. (Chris Lalancette) - Fix up a few minor indentation issues. (Chris Lalancette) - Fix phyp escape_specialcharacters. (Chris Lalancette) - Make openvzGetVPSUUID take a len. (Chris Lalancette) - Minor cleanup of error path for c_oneVmInfo. (Chris Lalancette) - Fix up a whitespace in comments in src/console.c (Chris Lalancette) - Fix up a stray whitespace in virHashGrow. (Chris Lalancette) - Remove unsafe strncpy from esx_vmx.c (Chris Lalancette) - Cleanup VIR_LOG_DEBUG parsing in eventtest (Amy Griffis) - Tighten libvirt's parsing of logging env (Amy Griffis) - Cleanup structure name naming (Matthias Bolte) - Add proper OOM reporting for esxDomainGetOSType (Matthias Bolte) Thanks to everybody who contributed one way or another, this list is getting longuer every release :-) 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] Trouble booting Xen VM with NFS root file system
by Matthias Schmidt 15 Sep '09

15 Sep '09

Hi, I'm currently trying to boot a Xen VM with the root file system on NFS via libvirt. Previously we used a small python script and "xm create" to boot a number of VMs (which worked fine). Now I'm trying to integrate that functionality in a python project which uses libvirt, but sadly booting the VMs fail. The small script constructs a Xen command line which looks like the following: create =("/usr/sbin/xm create /foo.cfg \ kernel=%s ramdisk=%s memory=64\ root=/dev/nfs nfs_server=%s nfs_root=%s name=%s vif='mac=%s'\ dhcp='dhcp' vcpus=1 extra='init=/stateless.sh xencons=tty1'\ ")%(vm_kernel, vm_ramdisk, vm_nfs_server, vm_nfs_root, hostname, vif) kernel and ramdisk are the path to the installed version, vm_nfs_server is the IP address of the NFS server and vm_nfs_root the path to the operating system installation (which is a Debian Linux). Firing up the script brings up all VMs with a read-only NFS root file system. Now I tried to do this with libvirt, but all attempts failed with the following error popping up after the VM boots (after a certain time(out)): Gave up waiting for root device. Common problems: - Boot args (cat /proc/cmdline) - Check rootdelay= (did the system wait long enough?) - Check root= (did the system wait for the right device?) - Missing modules (cat /proc/modules; ls /dev) ALERT! /dev/nfs does not exist. Dropping to a shell! BusyBox v1.10.2 (Debian 1:1.10.2-2) built-in shell (ash) Enter 'help' for a list of built-in commands. /bin/sh: can't access tty; job control turned off (initramfs) cat /proc/cmdline root=/dev/nfs nfs_server=10.0.0.150 nfs_root=/opt/xge/util/ph vif="mac=1A:00:00:00:00:64" dhcp=dhcp extra="init=./stateless.sh xencons=tty" The cmdline looks the same as in the script, but booting won't work. I can provide the libvirt XML used to boot the VM and further information if that is necessary. Cheers Matthias PS: I'm using Xen 3.2.1, Kernel 2.6.26 and libvirt 0.6.3 from Debian here.

2 1

[libvirt] RFE storage cloning across connections.
by "Jóhann B. Guðmundsson" 15 Sep '09

15 Sep '09

Virt-manager now supports migration and VM cloning however cloning only works within a connection though so you can't clone to another machine. It certainly would be a nice addition if supports storage cloning across connections. Best regards. Jóhann B.

2 1

[libvirt] ANNOUNCE: perl bindings Sys-Virt release 0.2.2
by Daniel P. Berrange 15 Sep '09

15 Sep '09

FYI I have just uploaded a new release 0.2.2 of the libvirt perl bindings, Sys-Virt, to CPAN. http://search.cpan.org/dist/Sys-Virt/ Direct download link http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.2.2.tar.gz Changes since 0.2.1: - Add all new APIs upto libvirt 0.7.0 APIs (listing defined network interfaces) - Add missing APIs for looking up storage volumes based on path and key - Fix lookup of network interfaces based on MAC address - Add missing APIs for defining network interfaces and starting defined interfaces There will of course shortly be another release to cover the soon to be released APIs in libvirt 0.7.1 Regards, Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

Re: [libvirt] Interface driver and ESX support
by Matthias Bolte 15 Sep '09

15 Sep '09

Okay, I finally got the patches cleaned up. I just posted this 12 patches series to the mailing list. Apply them all to an up to date git clone and apply the attached, updated ESX interface driver stub patch in the end. Patch 6 of 12 adds the binding for HostCpuIdInfo and contains the functions to handle ArrayOf* types. Matthias 2009/9/13 Shahar Klein <shaharklein(a)yahoo.com>: > I see > You are making my (coding) life easier : ) > thanks > ________________________________ > From: Matthias Bolte <matthias.bolte(a)googlemail.com> > To: Shahar Klein <shaharklein(a)yahoo.com> > Cc: libvir-list(a)redhat.com > Sent: Sunday, September 13, 2009 4:39:22 PM > Subject: Re: [libvirt] Interface driver and ESX support > > No, as I said before you should wait until you can use the unpublished > binding of HostCpuIdInfo as an example. This also includes the code to > handle ArrayOf* types. I'm currently cleaning up this patches (didn't > have time on thursday for that) and will post them today, just wait > for this patches, because they will help you. > > Matthias > > 2009/9/13 Shahar Klein <shaharklein(a)yahoo.com>: >> I've defined (among others): >> int esxVI_PhysicalNic_CastListFromAnyType(virConnectPtr conn, >> esxVI_AnyType >> *anyType, esxVI_PhysicalNic **pNicList); >> but runing it returns somthing like: >> Expecting type 'PhysicalNic' but found 'ArrayOfPhysicalNic' >> Does it mean I should also implement: >> esxVI_ArrayOfPhysicalNic_CastListFromAnyType() >> and all the funcs/type definition coming with it? >> thanks >> Shahar >> ________________________________ >> From: Matthias Bolte <matthias.bolte(a)googlemail.com> >> To: Shahar Klein <shaharklein(a)yahoo.com> >> Cc: libvir-list(a)redhat.com >> Sent: Thursday, September 10, 2009 6:24:25 PM >> Subject: Re: [libvirt] Interface driver and ESX support >> >> 2009/9/10 Shahar Klein <shaharklein(a)yahoo.com>: >>> I'm not sure what you mean about mapping >>> lets take the pnics as a study case for me >>> do I need to define a structure similar to this: >>> >>> >>> http://www.vmware.com/support/developer/vc-sdk/visdk400pubs/ReferenceGuide/… >>> and also take care for it's allocation? >>> >> >> Yes, you need to implement the mapping (a better word may be >> 'binding') of this VI API type to a C type, that also includes to care >> about its allocation. You'll need to implement at least this set of >> function in esx_vi_types.[ch]: >> >> esxVI_PhysicalNic_Alloc() >> esxVI_PhysicalNic_Free() >> esxVI_PhysicalNic_CastFromAnyType() >> esxVI_PhysicalNic_CastListFromAnyType() >> esxVI_PhysicalNic_Deserialize() >> esxVI_PhysicalNic_DeserializeList() >> >> You could use the binding for the HostCpuIdInfo type, but >> unfortunately I haven't published the code for it yet. This code also >> includes some essential helper functions for >> esxVI_PhysicalNic_CastListFromAnyType(). >> >> Beside the PhysicalNic type, you may also have to bind the types of >> its members like PhysicalNicLinkInfo, PhysicalNicSpec and >> HostIpConfig, if you need or care about the information provided by >> them. >> >> The binding for HostCpuIdInfo is part of a larger set of patches that >> add some new features to ESX driver, but the patches needs some >> cleanup first. I may have some time later this evening to clean them >> up and post them. >> >> PS: You should refer to version 2.5 of the VI API [1] and not 4.0, >> because the complete VI API mapping is currently based on version 2.5. >> At some point I'll have to properly distinguish between version 2.5 >> and 4.0, but currently I would like to stick to version 2.5 only. >> >> [1] >> http://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/ >> >> Matthias >> >> > >

3 3

[libvirt] [PATCH]: Bug when you try to start machines made will older VBox versions
by Pritesh Kothari 15 Sep '09

15 Sep '09

Hi All, Thanks to Florian, who pointed out the bug, due to which you can't start domains defined with older builds or with empty "FRONTEND/Type" tag in their xml files. Fixed it in the following patch. Regards, Pritesh

2 1

[libvirt] [PATCH 0/4] Changes to API/ABI for secrets handling
by Daniel P. Berrange 15 Sep '09

15 Sep '09

This series makes two changes to the public API and wire protocol ABI for the secrets handling support recently committed. As such this is a must fix before we do the release, since we can't break compatability once released. The first patch changes all the code to store UUIDs in raw format instead of printable format. This is important because it ensures that e3a9758f-b0c6-7a3a-ebb9-71a69c930289 is treated exactly the same as e3a9758fb0c67a3aebb971a69c930289, which is not the case with the currently committed code. It also makes the secrets and storage encryption XML parsers use the internal UUID handling APIs The second patch adds a new unique property to virSecretPtr. The "owner ID" is intended to be unique on a host wrt all secrets with matching usage type. This entails adding 2 APIs to querying the usage type, and another API to lookup a secret based on its usage. In testing the current code I frequently found myself getting into the situation where there were many secrets for the same volume which was not at all good. So if defining a secret to be used with a storage volume this ensures that you only ever have one secret associated with each storage volume path. The third patch ensures that when you query the XML for a qcow encrypted voluem, it will include the UUID of the secret. Previously if you created a volume, and then restarted libvirtd, the secret UUID would be lost. This patch is why we need the new API from the second patch virLookupSecretByUsage - without that it would be impossible to lookup the secret efficiently. THe final patch is a minor tweak to the RNG

3 13

[libvirt] [PATCH] Fix win32 platform build
by Daniel P. Berrange 14 Sep '09

14 Sep '09

* configure.in: Only define WITH_SECRETS if libvirtd is present * src/Makefile.am: Only build secrets driver if WITH_SECRETS is defined. Always add SECRET_DRIVER_SOURCES to EXTRA_DIST --- configure.in | 11 +++++++++++ src/Makefile.am | 3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 120f7e7..fad1297 100644 --- a/configure.in +++ b/configure.in @@ -1062,6 +1062,17 @@ AM_CONDITIONAL([WITH_NETCF], [test "$with_netcf" = "yes"]) AC_SUBST([NETCF_CFLAGS]) AC_SUBST([NETCF_LIBS]) + +with_secrets=yes +if test "$with_libvirtd" = "no"; then + with_secrets=no +fi +if test "$with_secrets" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_SECRETS], 1, [whether local secrets management driver is available]) +fi +AM_CONDITIONAL([WITH_SECRETS], [test "$with_secrets" = "yes"]) + + AC_ARG_WITH([storage-fs], [ --with-storage-fs with FileSystem backend for the storage driver (on)],[],[with_storage_fs=check]) AC_ARG_WITH([storage-lvm], diff --git a/src/Makefile.am b/src/Makefile.am index 14a3a63..69f5ee7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -461,6 +461,7 @@ endif libvirt_driver_interface_la_SOURCES = $(INTERFACE_DRIVER_SOURCES) endif +if WITH_SECRETS if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_secret.la else @@ -471,6 +472,7 @@ if WITH_DRIVER_MODULES libvirt_driver_secret_la_LDFLAGS = -module -avoid-version endif libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES) +endif # Needed to keep automake quiet about conditionals libvirt_driver_storage_la_SOURCES = @@ -574,6 +576,7 @@ EXTRA_DIST += \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_DEVKIT_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ + $(SECRET_DRIVER_SOURCES) \ $(VBOX_DRIVER_EXTRA_DIST) # -- 1.6.2.5

2 1

[libvirt] ESX [07/12]: Whitespace cleanup
by Matthias Bolte 14 Sep '09

14 Sep '09

Subject says it all.

2 1

[libvirt] ESX [05/12]: Also strip (C) and (TM) from the CPU model string
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_driver.c: also strip (C) and (TM) from the CPU model string

2 1

[libvirt] ESX [11/12]: Reorder some function calls to avoid potential virDomainPtr leaks
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_driver.c: avoid potential virDomainPtr leaks

2 1

[libvirt] [PATCH]: API Change patch for VBox 3.0.6
by Pritesh Kothari 14 Sep '09

14 Sep '09

Hi All, VirtualBox 3.0.6 was released few days ago and there were some minor API changes in it. I have created a patch for the same and posting it here. Regards, Pritesh

2 1

[libvirt] ESX [12/12]: Remove phantom mode
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_driver.c: remove phantom mode

1 0

[libvirt] ESX [10/12]: Replace esxUtil_EqualSuffix() with virFileHasSuffix()
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_util.[ch]: remove esxUtil_EqualSuffix() * src/esx/esx_driver.c, src/esx/esx_vmx.c: replace esxUtil_EqualSuffix() with virFileHasSuffix()

1 0

[libvirt] ESX [09/12]: Add esxDomainDefineXML()
by Matthias Bolte 14 Sep '09

14 Sep '09

A given domain XML gets converted to a VMX config, uploaded to the host and registered as new virtual machine. * src/esx/esx_driver.c: refactor datastore related path parsing into esxUtil_ParseDatastoreRelatedPath() * src/esx/esx_util.[ch]: add esxUtil_ParseDatastoreRelatedPath() * src/esx/esx_vi.[ch]: add esxVI_Context_UploadFile(), add datastores to the traversal in esxVI_BuildFullTraversalSpecList(), add esxVI_LookupDatastoreByName() * src/esx/esx_vi_methods.[ch]: add esxVI_RegisterVM_Task() * src/esx/esx_vi_types.c: make some error message more verbose * src/esx/esx_vmx.[ch]: add esxVMX_AbsolutePathToDatastoreRelatedPath() to convert a path into a datastore related path, add esxVMX_ParseFileName() to convert from VMX path format to domain XML path format, extend the other parsing function to be datastore aware, add esxVMX_FormatFileName() to convert from domain XML path format to VMX path format, fix VMX ethernet entry formating * tests/esxutilstest.c: add test for esxUtil_ParseDatastoreRelatedPath() * tests/vmx2xmldata/*: update domain XML files to use datastore related paths * tests/xml2vmxdata/*: update domain XML files to use datastore related paths, update VMX files to use absolute paths

1 0

[libvirt] ESX [08/12]: Add esxVI_Occurence enum to describe expected occurence of items
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_driver.c: update the use of esxVI_LookupVirtualMachineByUuid() * src/esx/esx_vi.c: add an esxVI_Occurence parameter to esxVI_LookupVirtualMachineByUuid() and take care if esxVI_FindByUuid() can't find anything for a given uuid * src/esx/esx_vi.h: add esxVI_Occurence enum * src/esx/esx_vi_methods.c: expect null or more items to be returned from esxVI_FindByUuid()

1 0

[libvirt] ESX [06/12]: Add x86_64 detection based on the CPUID
by Matthias Bolte 14 Sep '09

14 Sep '09

* src/esx/esx_driver.c: add esxSupportsLongMode() and update esxCapsInit() * src/esx/esx_vi.[ch]: Add AnyType handling for lists * src/esx/esx_vi_types.c: bind VI type HostCpuIdInfo

1 0

[libvirt] ESX [04/12]: Add tests for the VMX to/from domain XML mapping
by Matthias Bolte 14 Sep '09

14 Sep '09

* tests/.gitignore: ignore new test binaries * tests/Makefile.am: add new tests * tests/esxutilstest.c: test esxVMX_IndexToDiskName() * tests/vmx2xmldata/*: config files for the VMX to domain XML test * tests/vmx2xmltest.c: test the VMX to domain XML mapping * tests/xml2vmxdata/*: config files for the domain XML to VMX test * tests/xml2vmxtest.c: test the domain XML to VMX mapping

1 0

[libvirt] ESX [03/12]: Add esxDomainXMLToNative()
by Matthias Bolte 14 Sep '09

14 Sep '09

Extend and cleanup the VMX to domain XML mapping. Add the domain XML to VMX mapping functions. * src/esx/esx_driver.c: add esxDomainXMLToNative() * src/esx/esx_vmx.[ch]: add esxVMX_SCSIDiskNameToControllerAndID(), esxVMX_IDEDiskNameToControllerAndID(), esxVMX_FloppyDiskNameToController(), esxVMX_GatherSCSIControllers(), add basic handling for the VMX guestOS entry to distinguish between i686 and x86_64, make SCSI virtualDev VMX entry optional as it should be, map the VMX networkName entry to the domain XML interface bridge name, add basic mapping for serial devices in pipe mode, add several esxVMX_Format*() functions

1 0

[libvirt] ESX [02/12]: Set challenge for auth callback to hostname
by Matthias Bolte 14 Sep '09

14 Sep '09

This enables the auth callback to automatically distinguish between requests for ESX host and vCenter credentials. * src/esx/esx_util.[ch]: set challenge for auth callback to hostname

1 0

[libvirt] Interface driver and ESX support
by Shahar Klein 13 Sep '09

13 Sep '09

I'm trying to get a feel of the python binding and the esx driver Trying to get the number of interfaces hit(as anticipated) a non-support wall: Traceback (most recent call last): File "test.py", line 362, in ? vmm.refresh() File "test.py", line 189, in refresh print self.conn.numOfDefinedInterfaces() File "/usr/lib/python2.4/site-packages/libvirt.py", line 1347, in numOfDefinedInterfaces if ret == -1: raise libvirtError ('virConnectNumOfDefinedInterfaces() failed', conn=self) libvirt.libvirtError: this function is not supported by the hypervisor: virConnectNumOfDefinedInterfaces I'm wondering how to fix it can I register the esx driver as the interface driver? so I can use the ESX web-services to handle all the interface issues that normally(?) netcf would handle? if yes - how is it done? I thought that configure --without-netcf would do the trick(it didn't-I think) Thanks Shahar

4 14

[libvirt] Re: [PATCH 0/2] port over extboot from kvm
by Jan Kiszka 13 Sep '09

13 Sep '09

Gerd Hoffmann wrote: > On 09/08/09 15:47, Jan Kiszka wrote: > >> Before setting this definitely useful feature in stone, I have two >> questions though: >> >> - -drive ...,boot=on is logically in conflict with -boot. Yes, -boot >> for x86 currently cannot differentiate between multiple disks, only >> between boot media types. Still, this two-stage configuration is >> rather unintuitive and looks like a patchwork. Given that we have >> full control over all components, is it really the preferred >> approach? I already thought about, e.g., -boot c2 to select the >> second disk. Not that nice, but I would rather vote for a consistent >> configuration than a scattered one. > > Disk numbers are bad. Define "second hard disk". Especially for a > system with different kinds of disks (say one scsi and one virtio). One could use the specification order, but I agree it's not very handy. > > Drives have names though which can be used to reference the disks, so we > could use that instead. -boot cmd line syntax becomes a bit tricky then > though, we somehow have to figure whenever the user gave us names or > old-style letters. Something like this ... > > -drive if=virtio,id=sys,file=/path/to/disk.img > -cdrom /path/to/install.iso > -boot order=[sys],once=d,menu=off Yes, this looks powerful and clean. One could even still define probe orders like "-boot order=[sys][backup]d". > > ... might work out nicely. I suspect the libvirt folks will hate us for > that though. Does anyone from libvirt want to comment on this? > >> - This is just an implementation detail: Do we really need to implement >> booting from virtio and scsi via an extension rom? Isn't it possible >> to merge the corresponding support into the main bios? > > Well. There are quite a few. bochs pcbios, seabios, coreboot ... Ok, but that's only an argument to have extboot as a workaround for bioses not yet supporting scsi and virtio natively, isn't it? I'm thinking long-term here, not arguing against a extboot-based short-term solution. Jan -- Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux

4 6

[libvirt] vnet<X>'s & interfaceStats().. KVM device numbering confusion?
by r-c＠rocketmail.com 12 Sep '09

12 Sep '09

Hi libirt-list, I am attempting to migrate from Xen->KVM and am having a little trouble understanding the new vnet<X> interface numbering scheme and how to use it to collect statistics of the interface using the interfaceStats() function. In Xen, the ID for a given domain was know, and a corresponding vif<ID>.0 interface was brought up so it was easy to grab the stats (amongst other things). Under my new KVM config I've realised that vnet<X> is brought up in a 'first free' fashion as opposed to a counter in the Xen case. This leaves me scratching my head a little bit, say I have a domain which has ended up with ID = 8, but may for instance have network 'vnet1' associated with it. I'm not sure how I can determine any association between the domain & which interface belongs to it! (e.g. a call to domain.interfaceStats() requires the correct network interface as a parameter). Surely I must be missing something here? Anyone have any advice/workaround for this situation? Ideally I would like to either be able to hardcode vnet-labels in the XML description (tried but it's ignored), or otherwise keep vnet numbering in sync with domain ID. Thanks in advance, Ravi

2 2

[libvirt] [PATCH] Save vcpuinfo in status file
by Daniel P. Berrange 12 Sep '09

12 Sep '09

* src/qemu_driver.c: Don't trust monitor for vcpu PID info on restart * src/domain_conf.c: Save and load vCPU PID info from domain status file --- src/domain_conf.c | 35 +++++++++++++++++++++++++++++++++++ src/qemu_driver.c | 5 +---- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 050cf50..5ae0775 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -3061,6 +3061,8 @@ static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, xmlNodePtr oldnode; virDomainObjPtr obj; char *monitorpath; + xmlNodePtr *nodes = NULL; + int n, i; if (!(obj = virDomainObjNew(conn))) return NULL; @@ -3133,9 +3135,32 @@ static virDomainObjPtr virDomainObjParseXML(virConnectPtr conn, break; } + n = virXPathNodeSet(conn, "./vcpus/vcpu", ctxt, &nodes); + if (n < 0) + goto error; + if (n) { + obj->nvcpupids = n; + if (VIR_REALLOC_N(obj->vcpupids, obj->nvcpupids) < 0) + goto error; + + for (i = 0 ; i < n ; i++) { + char *pidstr = virXMLPropString(nodes[i], "pid"); + if (!pidstr) + goto error; + + if (virStrToLong_i(pidstr, NULL, 10, &(obj->vcpupids[i])) < 0) { + VIR_FREE(pidstr); + goto error; + } + VIR_FREE(pidstr); + } + VIR_FREE(nodes); + } + return obj; error: + VIR_FREE(nodes); virDomainChrDefFree(obj->monitor_chr); virDomainObjFree(obj); return NULL; @@ -4422,6 +4447,16 @@ char *virDomainObjFormat(virConnectPtr conn, virBufferVSprintf(&buf, " type='%s'/>\n", virDomainChrTypeToString(obj->monitor_chr->type)); + + if (obj->nvcpupids) { + int i; + virBufferAddLit(&buf, " <vcpus>\n"); + for (i = 0 ; i < obj->nvcpupids ; i++) { + virBufferVSprintf(&buf, " <vcpu pid='%d'/>\n", obj->vcpupids[i]); + } + virBufferAddLit(&buf, " </vcpus>\n"); + } + if (!(config_xml = virDomainDefFormat(conn, obj->def, flags))) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 0e7d8d4..a65334f 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -336,10 +336,6 @@ qemuReconnectDomain(struct qemud_driver *driver, goto error; } - if (qemudDetectVcpuPIDs(NULL, obj) < 0) { - goto error; - } - if (qemuUpdateActivePciHostdevs(driver, obj->def) < 0) { goto error; } @@ -2519,6 +2515,7 @@ qemudMonitorCommandWithHandler(const virDomainObjPtr vm, qemuMonitorDiscardPendingData(vm); + VIR_DEBUG("Send '%s'", cmd); if (qemudMonitorSend(vm, cmd, scm_fd) < 0) return -1; -- 1.6.2.5

2 1

[libvirt] Postponing 0.7.1 release by a couple of days
by Daniel Veillard 12 Sep '09

12 Sep '09

We still commited quite a bit in the last few days and I think taking a couple of extra days for testing is a bit safer, so I suggest to make the release only on Tuesday. So we have today and this week end for testing, push fixes if needed on Monday and I would make the release early on tuesday, 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] Restart libvirtd upon RPM upgrade
by Daniel P. Berrange 12 Sep '09

12 Sep '09

* libvirt.spec.in: Restart libvirtd in %post --- libvirt.spec.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0157eee..8d4c8cc 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -471,6 +471,9 @@ fi %endif /sbin/chkconfig --add libvirtd +if [ "$1" -ge "1" ]; then + /sbin/service libvirtd condrestart > /dev/null 2>&1 +fi %endif %preun -- 1.6.2.5

2 1

[libvirt][qemu] unable to start guest under kvm
by Anton Protopopov 11 Sep '09

11 Sep '09

Hi, all. I have the following problem: when I creating a guest, libvirt resolves <type ... machine="pc" ...> to <type ... machine="pc-0.11" ...> as provided by http://www.mail-archive.com/libvir-list@redhat.com/msg15014.html When <type ... machine="pc-0.11" ...> or <type ... machine="pc-0.10" ...> is set, I get two following errors (which would happend is unpredictable) # virsh -c qemu:///system start $d error: Failed to start domain Desktop error: internal error unable to start guest: Supported machines are: pc Standard PC (default) isapc ISA-only PC and # virsh -c qemu:///system start $d error: Failed to start domain Desktop error: monitor socket did not show up.: Connection refused When <type ... machine="pc" ...> is set, this guest starts successfully. The domain type of this machine is "kvm". But I have # qemu --version && kvm --help | head -1 QEMU PC emulator version 0.11.50, Copyright (c) 2003-2008 Fabrice Bellard QEMU PC emulator version 0.10.0 (kvm-devel), Copyright (c) 2003-2008 Fabrice Bellard on that HN. - why does libvirt sets machine to "pc-0.11" even if kvm qemu version is 0.10? - why does an error occure if I set <type ... machine="pc-0.10 ... ">

3 34

[libvirt] Volume encryption missing pieces
by Miloslav Trmač 11 Sep '09

11 Sep '09

Major changes since the previous submission: - Use one or two separate files per secret, using XML for metadata, instead of a single file for all secrets using a custom format. - Split <secret> XML handling from the local driver into secret_conf.[ch], use it when auto-generating secrets. - Use <usage type='volume'><volume/></usage> instead of <volume>. Also available at http://fedorapeople.org/gitweb?p=mitr/public_git/libvirt.git;a=summary .

4 22

[libvirt] [PATCH] Fix use of dlopen modules
by Daniel P. Berrange 11 Sep '09

11 Sep '09

Remove the bogus dependancy between node_device.c & storage_backend.c by moving the virWaitForDevices into util.h where it can be shared safely * src/storage_backend_disk.c, src/storage_backend_logical.c, src/storage_backend_mpath.c, src/storage_backend_scsi.c: Replace virStorageBackendWaitForDevices with virFileWaitForDevices * src/storage_backend.c, src/storage_backend.h: Remove virStorageBackendWaitForDevices, virWaitForDevices * src/util.h, src/util.c: Add virFileWaitForDevices * configure.in: Move xmlrpc check further down after pkgconfig is detected * src/Makefile.am: Add missing XMLRPC_CFLAGS/LIBS to opennebula * src/libvirt_private.syms: Add many missing exports --- configure.in | 6 +++--- src/Makefile.am | 4 ++-- src/libvirt_private.syms | 14 +++++++++++++- src/node_device.c | 4 ++-- src/storage_backend.c | 31 ------------------------------- src/storage_backend.h | 2 -- src/storage_backend_disk.c | 4 ++-- src/storage_backend_logical.c | 2 +- src/storage_backend_mpath.c | 2 +- src/storage_backend_scsi.c | 4 ++-- src/util.c | 27 +++++++++++++++++++++++++++ src/util.h | 2 ++ 12 files changed, 55 insertions(+), 47 deletions(-) diff --git a/configure.in b/configure.in index 060eb50..120f7e7 100644 --- a/configure.in +++ b/configure.in @@ -463,6 +463,9 @@ if test "$with_qemu" = "yes" -o "$with_lxc" = "yes" ; then fi +dnl Need to test if pkg-config exists +PKG_PROG_PKG_CONFIG + dnl OpenNebula driver Compilation setting dnl @@ -491,9 +494,6 @@ AC_SUBST([XMLRPC_CFLAGS]) AC_SUBST([XMLRPC_LIBS]) -dnl Need to test if pkg-config exists -PKG_PROG_PKG_CONFIG - dnl ========================================================================== dnl find libxml2 library, borrowed from xmlsec dnl ========================================================================== diff --git a/src/Makefile.am b/src/Makefile.am index 628edc5..02c1f74 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -396,8 +396,8 @@ noinst_LTLIBRARIES += libvirt_driver_one.la # Stateful, so linked to daemon instead #libvirt_la_LIBADD += libvirt_driver_one.la endif -libvirt_driver_one_la_CFLAGS = $(ONE_LIBS) -libvirt_driver_one_la_LDFLAGS = $(ONE_LIBS) +libvirt_driver_one_la_CFLAGS = $(XMLRPC_CFLAGS) +libvirt_driver_one_la_LDFLAGS = $(XMLRPC_LIBS) #libvirt_driver_one_la_CFLAGS = "-DWITH_ONE" if WITH_DRIVER_MODULES libvirt_driver_one_la_LDFLAGS += -module -avoid-version diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8dd279d..06192fc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -10,6 +10,7 @@ virBufferAdd; virBufferAddChar; virBufferContentAndReset; virBufferError; +virBufferURIEncodeString; # caps.h @@ -167,7 +168,16 @@ virHashSize; virInterfaceDefFormat; virInterfaceDefParseFile; virInterfaceDefParseString; +virInterfaceDefParseNode; virInterfaceDefFree; +virInterfaceFindByName; +virInterfaceFindByMACString; +virInterfaceAssignDef; +virInterfaceRemove; +virInterfaceObjLock; +virInterfaceObjUnlock; +virInterfaceObjListFree; + # interface_driver.h interfaceRegister; @@ -214,6 +224,7 @@ virRegisterNetworkDriver; virRegisterStateDriver; virRegisterStorageDriver; virRegisterDeviceMonitor; +virRegisterSecretDriver; # logging.h @@ -410,6 +421,7 @@ virGetUserName; virGetUserID; virGetGroupID; virFileFindMountPoint; +virFileWaitForDevices; # uuid.h @@ -421,7 +433,7 @@ virUUIDParse; # virterror_internal.h virReportErrorHelper; virErrorMsg; -virRaiseError; +virRaiseErrorFull; virReportSystemErrorFull; virReportOOMErrorFull; virStrerror; diff --git a/src/node_device.c b/src/node_device.c index ded203f..69e15b6 100644 --- a/src/node_device.c +++ b/src/node_device.c @@ -35,7 +35,7 @@ #include "node_device_conf.h" #include "node_device_hal.h" #include "node_device.h" -#include "storage_backend.h" /* For virWaitForDevices */ +#include "util.h" #define VIR_FROM_THIS VIR_FROM_NODEDEV @@ -599,7 +599,7 @@ find_new_device(virConnectPtr conn, const char *wwnn, const char *wwpn) while ((now - start) < LINUX_NEW_DEVICE_WAIT_TIME) { - virWaitForDevices(conn); + virFileWaitForDevices(conn); dev = nodeDeviceLookupByWWN(conn, wwnn, wwpn); diff --git a/src/storage_backend.c b/src/storage_backend.c index 5e04f35..0a20255 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -630,31 +630,6 @@ virStorageBackendGetBuildVolFromFunction(virConnectPtr conn, return virStorageBackendCreateRaw; } -#if defined(UDEVADM) || defined(UDEVSETTLE) -void virWaitForDevices(virConnectPtr conn) -{ -#ifdef UDEVADM - const char *const settleprog[] = { UDEVADM, "settle", NULL }; -#else - const char *const settleprog[] = { UDEVSETTLE, NULL }; -#endif - int exitstatus; - - if (access(settleprog[0], X_OK) != 0) - return; - - /* - * NOTE: we ignore errors here; this is just to make sure that any device - * nodes that are being created finish before we try to scan them. - * If this fails for any reason, we still have the backup of polling for - * 5 seconds for device nodes. - */ - virRun(conn, settleprog, &exitstatus); -} -#else -void virWaitForDevices(virConnectPtr conn ATTRIBUTE_UNUSED) {} -#endif - virStorageBackendPtr virStorageBackendForType(int type) { @@ -893,12 +868,6 @@ virStorageBackendUpdateVolTargetFormatFD(virConnectPtr conn, } -void virStorageBackendWaitForDevices(virConnectPtr conn) -{ - virWaitForDevices(conn); - return; -} - /* * Given a volume path directly in /dev/XXX, iterate over the * entries in the directory pool->def->target.path and find the diff --git a/src/storage_backend.h b/src/storage_backend.h index eb5bf87..88c6161 100644 --- a/src/storage_backend.h +++ b/src/storage_backend.h @@ -95,7 +95,6 @@ int virStorageBackendUpdateVolTargetFormatFD(virConnectPtr conn, virStorageVolTargetPtr target, int fd); -void virStorageBackendWaitForDevices(virConnectPtr conn); char *virStorageBackendStablePath(virConnectPtr conn, virStoragePoolObjPtr pool, @@ -128,6 +127,5 @@ int virStorageBackendRunProgNul(virConnectPtr conn, virStorageBackendListVolNulFunc func, void *data); -void virWaitForDevices(virConnectPtr conn); #endif /* __VIR_STORAGE_BACKEND_H__ */ diff --git a/src/storage_backend_disk.c b/src/storage_backend_disk.c index 6fdb566..e82959c 100644 --- a/src/storage_backend_disk.c +++ b/src/storage_backend_disk.c @@ -325,7 +325,7 @@ virStorageBackendDiskRefreshPool(virConnectPtr conn, VIR_FREE(pool->def->source.devices[0].freeExtents); pool->def->source.devices[0].nfreeExtent = 0; - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); if (virStorageBackendDiskReadGeometry(conn, pool) != 0) { return -1; @@ -583,7 +583,7 @@ virStorageBackendDiskCreateVol(virConnectPtr conn, return -1; /* wait for device node to show up */ - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); /* Blow away free extent info, as we're about to re-populate it */ VIR_FREE(pool->def->source.devices[0].freeExtents); diff --git a/src/storage_backend_logical.c b/src/storage_backend_logical.c index 43117e8..4389120 100644 --- a/src/storage_backend_logical.c +++ b/src/storage_backend_logical.c @@ -478,7 +478,7 @@ virStorageBackendLogicalRefreshPool(virConnectPtr conn, }; int exitstatus; - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); /* Get list of all logical volumes */ if (virStorageBackendLogicalFindLVs(conn, pool, NULL) < 0) { diff --git a/src/storage_backend_mpath.c b/src/storage_backend_mpath.c index ae02aac..fcc38ba 100644 --- a/src/storage_backend_mpath.c +++ b/src/storage_backend_mpath.c @@ -332,7 +332,7 @@ virStorageBackendMpathRefreshPool(virConnectPtr conn, pool->def->allocation = pool->def->capacity = pool->def->available = 0; - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); virStorageBackendGetMaps(conn, pool); diff --git a/src/storage_backend_scsi.c b/src/storage_backend_scsi.c index a09103f..c70b1ed 100644 --- a/src/storage_backend_scsi.c +++ b/src/storage_backend_scsi.c @@ -494,7 +494,7 @@ virStorageBackendSCSIFindLUs(virConnectPtr conn, VIR_DEBUG(_("Discovering LUs on host %u"), scanhost); - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); if (virAsprintf(&device_path, "/sys/bus/scsi/devices") < 0) { virReportOOMError(conn); @@ -542,7 +542,7 @@ virStorageBackendSCSIGetHostNumber(virConnectPtr conn, VIR_DEBUG(_("Finding host number from '%s'"), sysfs_path); - virStorageBackendWaitForDevices(conn); + virFileWaitForDevices(conn); sysdir = opendir(sysfs_path); diff --git a/src/util.c b/src/util.c index af50028..1878e33 100644 --- a/src/util.c +++ b/src/util.c @@ -2019,3 +2019,30 @@ cleanup: return ret; } #endif + +#ifndef PROXY +#if defined(UDEVADM) || defined(UDEVSETTLE) +void virFileWaitForDevices(virConnectPtr conn) +{ +#ifdef UDEVADM + const char *const settleprog[] = { UDEVADM, "settle", NULL }; +#else + const char *const settleprog[] = { UDEVSETTLE, NULL }; +#endif + int exitstatus; + + if (access(settleprog[0], X_OK) != 0) + return; + + /* + * NOTE: we ignore errors here; this is just to make sure that any device + * nodes that are being created finish before we try to scan them. + * If this fails for any reason, we still have the backup of polling for + * 5 seconds for device nodes. + */ + virRun(conn, settleprog, &exitstatus); +} +#else +void virFileWaitForDevices(virConnectPtr conn ATTRIBUTE_UNUSED) {} +#endif +#endif diff --git a/src/util.h b/src/util.h index 896e1b4..f9715ab 100644 --- a/src/util.h +++ b/src/util.h @@ -237,4 +237,6 @@ int virRandom(int max); char *virFileFindMountPoint(const char *type); #endif +void virFileWaitForDevices(virConnectPtr conn); + #endif /* __VIR_UTIL_H__ */ -- 1.6.2.5

2 2

[libvirt] libvir: QEMU error : remoteDomainProcessEvent: unmarshalling msg
by Kenneth Nagin 10 Sep '09

10 Sep '09

I am monitoring events using the example event monitor, event-test, but remoteDomainProcessEvent is outputing an "unmarshalling msg" error when creating a VM. I've installed libvirt 0.6.5. It is configured without XEN; otherwise it is the default configuration. Any suggestions on how to overcome the problem? Kenneth Nagin

3 3

[libvirt] [PATCH 1/5] Add esx and tcp migration uri transports to capabilities schema
by Mark McLoughlin 10 Sep '09

10 Sep '09

* docs/schemas/capabilities.rng: include esx and tcp uri_transport --- docs/schemas/capability.rng | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng index 1e3c5f3..dbfe1c5 100644 --- a/docs/schemas/capability.rng +++ b/docs/schemas/capability.rng @@ -79,6 +79,8 @@ <oneOrMore> <element name='uri_transport'> <choice> + <value>esx</value> + <value>tcp</value> <value>xenmigr</value> </choice> </element> -- 1.6.2.5

2 10

[libvirt] [PATCH] Fix regression from "Avoid polling on FDs with no events"
by Chris Lalancette 10 Sep '09

10 Sep '09

After the mentioned patch was applied, I noticed that shutting down a kvm guest from inside (i.e. poweroff) caused the guest to shutdown, but not removed from the list of active guests. DanB pointed out that the problem is that the virEventAddHandle() call in the qemu driver was asking to watch for 0 events, not HANGUP | ERROR as it should. Add these events so that shutdown works again. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 683fe20..996bfff 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -979,7 +979,8 @@ qemudOpenMonitorCommon(virConnectPtr conn, if (ret != 0) return ret; - if ((vm->monitorWatch = virEventAddHandle(vm->monitor, 0, + if ((vm->monitorWatch = virEventAddHandle(vm->monitor, + VIR_EVENT_HANDLE_HANGUP | VIR_EVENT_HANDLE_ERROR, qemudDispatchVMEvent, driver, NULL)) < 0) return -1; -- 1.6.0.6

2 2

[libvirt] [PATCH] Reintroduce lzop compression
by Charles Duffy 10 Sep '09

10 Sep '09

3 4

[libvirt] [PATCH] Close logfile fd after spawning qemu
by Ryota Ozaki 10 Sep '09

10 Sep '09

Hi, This patch closes logfile fd after spawing qemu in qemudStartVMDaemon. The fd seems to be closed in the error path, but not in the normal path. The fd is passed to virExecDaemonize though, but looks not being closed inside it. Eventually, the fd is never closed during libvirtd lifetime. Thanks, ozaki-r >From b3d3e0f24c5df5c7677e539bbc2598f2d7fbc3b8 Mon Sep 17 00:00:00 2001 From: Ryota Ozaki <ozaki.ryota(a)gmail.com> Date: Thu, 10 Sep 2009 12:53:56 +0900 Subject: [PATCH] Close logfile fd after spawning qemu --- src/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 8f16e72..f2182c4 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2187,6 +2187,7 @@ static int qemudStartVMDaemon(virConnectPtr conn, VIR_EXEC_NONBLOCK | VIR_EXEC_CLEAR_CAPS, qemudSecurityHook, &hookData, pidfile); + close(logfile); VIR_FREE(pidfile); /* wait for qemu process to to show up */ -- 1.6.0.6

3 5

[libvirt] 2 patches: dead increment and 4 useless (always-false) disjuncts
by Jim Meyering 10 Sep '09

10 Sep '09

>From 74f57af2010f9cbe2315d625c6502a0b259e6802 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 7 Sep 2009 10:03:22 +0200 Subject: [PATCH 1/2] xm_internal.c: remove dead increment of "data" * src/xm_internal.c (xenXMDomainConfigParse): Don't increment it. --- src/xm_internal.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index f206c8c..18613d4 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1314,7 +1314,6 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { if (!(data = strchr(key, '=')) || (data[0] == '\0')) break; - data++; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { if (STRPREFIX(key, "vncunused=")) { -- 1.6.4.2.419.gab238 >From d4db2dfaafbf827d1c8b8626a3dbdaa9f371e479 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 7 Sep 2009 10:09:20 +0200 Subject: [PATCH 2/2] xm_internal.c: remove four useless comparisons after strchr * src/xm_internal.c (xenXMDomainConfigParse): After t=strchr... don't test *t; it's known. This was *not* detected by clang, but I spotted it since once instance was in the vicinity of the dead increment of "data". --- src/xm_internal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index 18613d4..e7f6a55 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -862,7 +862,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { */ /* Extract the source file path*/ - if (!(offset = strchr(head, ',')) || offset[0] == '\0') + if (!(offset = strchr(head, ','))) goto skipdisk; if ((offset - head) >= (PATH_MAX-1)) goto skipdisk; @@ -882,7 +882,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { head = head + 6; /* Extract the dest device name */ - if (!(offset = strchr(head, ',')) || offset[0] == '\0') + if (!(offset = strchr(head, ','))) goto skipdisk; if (VIR_ALLOC_N(disk->dst, (offset - head) + 1) < 0) goto no_memory; @@ -1018,7 +1018,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { char *data; char *nextkey = strchr(key, ','); - if (!(data = strchr(key, '=')) || (data[0] == '\0')) + if (!(data = strchr(key, '='))) goto skipnic; data++; @@ -1312,7 +1312,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { nextkey++; } - if (!(data = strchr(key, '=')) || (data[0] == '\0')) + if (!(data = strchr(key, '='))) break; if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { -- 1.6.4.2.419.gab238

3 5

[libvirt] [PATCH] Fix misc thread locking bugs / bogus warnings
by Daniel P. Berrange 10 Sep '09

10 Sep '09

Fix all thread locking bugs reported by object-locking test case. NB, some of the driver locking is getting too coarse. Driver mutexes really need to be turned into RW locks instead to significantly increase concurrency. * src/lxc_driver.c: Fix useof driver when unlocked in the methods lxcDomainGetInfo, lxcSetSchedulerParameters, and lxcGetSchedulerParameters * src/opennebula/one_driver.c: Fix missing unlock in oneDomainUndefine. Fix use of driver when unlocked in oneDomainGetInfo, oneGetOSType, oneDomainShutdown * src/qemu_driver.c: Fix use of driver when unlocked in qemudDomainSavem, qemuGetSchedulerType, qemuSetSchedulerParameters and qemuGetSchedulerParameters * src/storage_driver.c: Re-work storagePoolCreate to avoid bogus lock checking warning. Re-work storageVolumeCreateXMLFrom to remove a potential NULL de-reference & avoid bogus lock check warnings * src/test.c: Remove testDomainAssignDef since it break lock chekc warnings. * tests/object-locking.ml: Add oneDriverLock, oneDriverUnlock and one_driver_t methods/types to allow lock checking on the OpenNebula drivers --- src/lxc_driver.c | 6 ++-- src/opennebula/one_driver.c | 35 +++++++++++++++--------- src/qemu_driver.c | 60 +++++++++++++++++++++++------------------- src/storage_driver.c | 35 ++++++++++++------------- src/test.c | 55 ++++++++++++++++++++------------------- tests/object-locking.ml | 7 +++- 6 files changed, 108 insertions(+), 90 deletions(-) diff --git a/src/lxc_driver.c b/src/lxc_driver.c index bd0cf0e..0ec1e92 100644 --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -439,7 +439,6 @@ static int lxcDomainGetInfo(virDomainPtr dom, lxcDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); - lxcDriverUnlock(driver); if (!vm) { lxcError(dom->conn, dom, VIR_ERR_INVALID_DOMAIN, @@ -470,6 +469,7 @@ static int lxcDomainGetInfo(virDomainPtr dom, ret = 0; cleanup: + lxcDriverUnlock(driver); if (cgroup) virCgroupFree(&cgroup); if (vm) @@ -1667,7 +1667,6 @@ static int lxcSetSchedulerParameters(virDomainPtr domain, lxcDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, domain->uuid); - lxcDriverUnlock(driver); if (vm == NULL) { lxcError(NULL, domain, VIR_ERR_INTERNAL_ERROR, @@ -1698,6 +1697,7 @@ static int lxcSetSchedulerParameters(virDomainPtr domain, ret = 0; cleanup: + lxcDriverUnlock(driver); virCgroupFree(&group); if (vm) virDomainObjUnlock(vm); @@ -1725,7 +1725,6 @@ static int lxcGetSchedulerParameters(virDomainPtr domain, lxcDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, domain->uuid); - lxcDriverUnlock(driver); if (vm == NULL) { lxcError(NULL, domain, VIR_ERR_INTERNAL_ERROR, @@ -1745,6 +1744,7 @@ static int lxcGetSchedulerParameters(virDomainPtr domain, ret = 0; cleanup: + lxcDriverUnlock(driver); virCgroupFree(&group); if (vm) virDomainObjUnlock(vm); diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c index 135397c..9587a2d 100644 --- a/src/opennebula/one_driver.c +++ b/src/opennebula/one_driver.c @@ -310,6 +310,8 @@ static int oneDomainUndefine(virDomainPtr dom) ret=0; return_point: + if (vm) + virDomainObjUnlock(vm); oneDriverUnlock(driver); return ret; } @@ -392,9 +394,9 @@ static int oneDomainGetInfo(virDomainPtr dom, static char *oneGetOSType(virDomainPtr dom) { - one_driver_t *driver = (one_driver_t *)dom->conn->privateData; virDomainObjPtr vm = NULL; + char *ret = NULL; oneDriverLock(driver); vm =virDomainFindByUUID(&driver->domains, dom->uuid); @@ -402,11 +404,17 @@ static char *oneGetOSType(virDomainPtr dom) if (!vm) { oneError(dom->conn,dom, VIR_ERR_INVALID_DOMAIN, "%s", _("no domain with matching uuid")); - return NULL; + goto cleanup; } - virDomainObjUnlock(vm); - return strdup(vm->def->os.type); + ret = strdup(vm->def->os.type); + if (!ret) + virReportOOMError(dom->conn); + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; } static int oneDomainStart(virDomainPtr dom) @@ -499,24 +507,25 @@ static int oneDomainShutdown(virDomainPtr dom) int ret=-1; oneDriverLock(driver); - if((vm=virDomainFindByID(&driver->domains, dom->id))) { - if(!(c_oneShutdown(vm->pid) ) ) { - vm->state=VIR_DOMAIN_SHUTDOWN; - ret= 0; - goto return_point; - } + if (!(vm=virDomainFindByID(&driver->domains, dom->id))) { + oneError(dom->conn,dom, VIR_ERR_INVALID_DOMAIN, + _("no domain with id %d"), dom->id); + goto return_point; + } + + if (c_oneShutdown(vm->pid)) { oneError(dom->conn, dom, VIR_ERR_OPERATION_INVALID, _("Wrong state to perform action")); goto return_point; } - oneError(dom->conn,dom, VIR_ERR_INVALID_DOMAIN, - _("no domain with id %d"), dom->id); - goto return_point; + vm->state=VIR_DOMAIN_SHUTDOWN; + ret= 0; if (!vm->persistent) { virDomainRemoveInactive(&driver->domains, vm); vm = NULL; } + return_point: if(vm) virDomainObjUnlock(vm); diff --git a/src/qemu_driver.c b/src/qemu_driver.c index d45d33a..b4cd63d 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -3575,24 +3575,6 @@ static int qemudDomainSave(virDomainPtr dom, memcpy(header.magic, QEMUD_SAVE_MAGIC, sizeof(header.magic)); header.version = QEMUD_SAVE_VERSION; - if (driver->saveImageFormat == NULL) - header.compressed = QEMUD_SAVE_FORMAT_RAW; - else if (STREQ(driver->saveImageFormat, "raw")) - header.compressed = QEMUD_SAVE_FORMAT_RAW; - else if (STREQ(driver->saveImageFormat, "gzip")) - header.compressed = QEMUD_SAVE_FORMAT_GZIP; - else if (STREQ(driver->saveImageFormat, "bzip2")) - header.compressed = QEMUD_SAVE_FORMAT_BZIP2; - else if (STREQ(driver->saveImageFormat, "lzma")) - header.compressed = QEMUD_SAVE_FORMAT_LZMA; - else if (STREQ(driver->saveImageFormat, "lzop")) - header.compressed = QEMUD_SAVE_FORMAT_LZOP; - else { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, - "%s", _("Invalid save image format specified in configuration file")); - return -1; - } - qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -3632,6 +3614,24 @@ static int qemudDomainSave(virDomainPtr dom, } header.xml_len = strlen(xml) + 1; + if (driver->saveImageFormat == NULL) + header.compressed = QEMUD_SAVE_FORMAT_RAW; + else if (STREQ(driver->saveImageFormat, "raw")) + header.compressed = QEMUD_SAVE_FORMAT_RAW; + else if (STREQ(driver->saveImageFormat, "gzip")) + header.compressed = QEMUD_SAVE_FORMAT_GZIP; + else if (STREQ(driver->saveImageFormat, "bzip2")) + header.compressed = QEMUD_SAVE_FORMAT_BZIP2; + else if (STREQ(driver->saveImageFormat, "lzma")) + header.compressed = QEMUD_SAVE_FORMAT_LZMA; + else if (STREQ(driver->saveImageFormat, "lzop")) + header.compressed = QEMUD_SAVE_FORMAT_LZOP; + else { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + "%s", _("Invalid save image format specified in configuration file")); + goto cleanup; + } + /* Write header to file, followed by XML */ if ((fd = open(path, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, @@ -4429,7 +4429,9 @@ static char *qemuDomainXMLFromNative(virConnectPtr conn, goto cleanup; } + qemuDriverLock(driver); def = qemuParseCommandLineString(conn, driver->caps, config); + qemuDriverUnlock(driver); if (!def) goto cleanup; @@ -6183,12 +6185,13 @@ static char *qemuGetSchedulerType(virDomainPtr dom, int *nparams) { struct qemud_driver *driver = dom->conn->privateData; - char *ret; + char *ret = NULL; + qemuDriverLock(driver); if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return NULL; + goto cleanup; } if (nparams) @@ -6197,6 +6200,9 @@ static char *qemuGetSchedulerType(virDomainPtr dom, ret = strdup("posix"); if (!ret) virReportOOMError(dom->conn); + +cleanup: + qemuDriverUnlock(driver); return ret; } @@ -6210,15 +6216,14 @@ static int qemuSetSchedulerParameters(virDomainPtr dom, virDomainObjPtr vm = NULL; int ret = -1; + qemuDriverLock(driver); if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return -1; + goto cleanup; } - qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); - qemuDriverUnlock(driver); if (vm == NULL) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, @@ -6261,6 +6266,7 @@ cleanup: virCgroupFree(&group); if (vm) virDomainObjUnlock(vm); + qemuDriverUnlock(driver); return ret; } @@ -6275,21 +6281,20 @@ static int qemuGetSchedulerParameters(virDomainPtr dom, int ret = -1; int rc; + qemuDriverLock(driver); if (!qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, __FUNCTION__); - return -1; + goto cleanup; } if ((*nparams) != 1) { qemudReportError(dom->conn, domain, NULL, VIR_ERR_INVALID_ARG, "%s", _("Invalid parameter count")); - return -1; + goto cleanup; } - qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); - qemuDriverUnlock(driver); if (vm == NULL) { qemudReportError(dom->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, @@ -6319,6 +6324,7 @@ cleanup: virCgroupFree(&group); if (vm) virDomainObjUnlock(vm); + qemuDriverUnlock(driver); return ret; } diff --git a/src/storage_driver.c b/src/storage_driver.c index e9ecb20..14e3bc2 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -489,24 +489,27 @@ storagePoolCreate(virConnectPtr conn, def = NULL; if (backend->startPool && - backend->startPool(conn, pool) < 0) + backend->startPool(conn, pool) < 0) { + virStoragePoolObjRemove(&driver->pools, pool); + pool = NULL; goto cleanup; + } if (backend->refreshPool(conn, pool) < 0) { if (backend->stopPool) backend->stopPool(conn, pool); + virStoragePoolObjRemove(&driver->pools, pool); + pool = NULL; goto cleanup; } pool->active = 1; ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid); - virStoragePoolObjUnlock(pool); - pool = NULL; cleanup: virStoragePoolDefFree(def); if (pool) - virStoragePoolObjRemove(&driver->pools, pool); + virStoragePoolObjUnlock(pool); storageDriverUnlock(driver); return ret; } @@ -1321,27 +1324,23 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, virStorageBackendPtr backend; virStorageVolDefPtr origvol = NULL, newvol = NULL; virStorageVolPtr ret = NULL, volobj = NULL; - int buildret, diffpool; - - diffpool = !STREQ(obj->name, vobj->pool); + int buildret; storageDriverLock(driver); pool = virStoragePoolObjFindByUUID(&driver->pools, obj->uuid); - if (diffpool) { + if (pool && STRNEQ(obj->name, vobj->pool)) { virStoragePoolObjUnlock(pool); origpool = virStoragePoolObjFindByName(&driver->pools, vobj->pool); virStoragePoolObjLock(pool); - } else - origpool = pool; + } storageDriverUnlock(driver); - if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, "%s", _("no storage pool with matching uuid")); goto cleanup; } - if (diffpool && !origpool) { + if (STRNEQ(obj->name, vobj->pool) && !origpool) { virStorageReportError(obj->conn, VIR_ERR_NO_STORAGE_POOL, _("no storage pool with matching name '%s'"), vobj->pool); @@ -1354,7 +1353,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } - if (diffpool && !virStoragePoolObjIsActive(origpool)) { + if (origpool && !virStoragePoolObjIsActive(origpool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, "%s", _("storage pool is not active")); goto cleanup; @@ -1363,7 +1362,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, if ((backend = virStorageBackendForType(pool->def->type)) == NULL) goto cleanup; - origvol = virStorageVolDefFindByName(origpool, vobj->name); + origvol = virStorageVolDefFindByName(origpool ? origpool : pool, vobj->name); if (!origvol) { virStorageReportError(obj->conn, VIR_ERR_NO_STORAGE_VOL, _("no storage vol with matching name '%s'"), @@ -1429,7 +1428,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, newvol->building = 1; virStoragePoolObjUnlock(pool); - if (diffpool) { + if (origpool) { origpool->asyncjobs++; virStoragePoolObjUnlock(origpool); } @@ -1438,7 +1437,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, storageDriverLock(driver); virStoragePoolObjLock(pool); - if (diffpool) + if (origpool) virStoragePoolObjLock(origpool); storageDriverUnlock(driver); @@ -1447,7 +1446,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, newvol = NULL; pool->asyncjobs--; - if (diffpool) { + if (origpool) { origpool->asyncjobs--; virStoragePoolObjUnlock(origpool); origpool = NULL; @@ -1469,7 +1468,7 @@ cleanup: virStorageVolDefFree(newvol); if (pool) virStoragePoolObjUnlock(pool); - if (diffpool && origpool) + if (origpool) virStoragePoolObjUnlock(origpool); return ret; } diff --git a/src/test.c b/src/test.c index 7c8f85b..0e4203e 100644 --- a/src/test.c +++ b/src/test.c @@ -261,12 +261,10 @@ testDomainGenerateIfname(virConnectPtr conn, return NULL; } -static virDomainObjPtr -testDomainAssignDef(virConnectPtr conn, - virDomainObjList *domlist, - virDomainDefPtr domdef) +static int +testDomainGenerateIfnames(virConnectPtr conn, + virDomainDefPtr domdef) { - virDomainObjPtr domobj = NULL; int i = 0; for (i = 0; i < domdef->nnets; i++) { @@ -276,18 +274,15 @@ testDomainAssignDef(virConnectPtr conn, ifname = testDomainGenerateIfname(conn, domdef); if (!ifname) - goto error; + return -1; domdef->nets[i]->ifname = ifname; } - if (!(domobj = virDomainAssignDef(conn, domlist, domdef))) - goto error; - -error: - return domobj; + return 0; } + static int testOpenDefault(virConnectPtr conn) { int u; struct timeval tv; @@ -342,10 +337,11 @@ static int testOpenDefault(virConnectPtr conn) { defaultDomainXML, VIR_DOMAIN_XML_INACTIVE))) goto error; - if (!(domobj = testDomainAssignDef(conn, &privconn->domains, domdef))) { - virDomainDefFree(domdef); + if (testDomainGenerateIfnames(conn, domdef) < 0) goto error; - } + if (!(domobj = virDomainAssignDef(conn, &privconn->domains, domdef))) + goto error; + domdef = NULL; domobj->def->id = privconn->nextDomID++; domobj->state = VIR_DOMAIN_RUNNING; domobj->persistent = 1; @@ -399,6 +395,7 @@ error: testDriverUnlock(privconn); conn->privateData = NULL; VIR_FREE(privconn); + virDomainDefFree(domdef); return VIR_DRV_OPEN_ERROR; } @@ -668,7 +665,8 @@ static int testOpenFromFile(virConnectPtr conn, goto error; } - if (!(dom = testDomainAssignDef(conn, &privconn->domains, def))) { + if (testDomainGenerateIfnames(conn, def) < 0 || + !(dom = virDomainAssignDef(conn, &privconn->domains, def))) { virDomainDefFree(def); goto error; } @@ -980,11 +978,11 @@ testDomainCreateXML(virConnectPtr conn, const char *xml, VIR_DOMAIN_XML_INACTIVE)) == NULL) goto cleanup; - if ((dom = testDomainAssignDef(conn, &privconn->domains, - def)) == NULL) { - virDomainDefFree(def); + if (testDomainGenerateIfnames(conn, def) < 0) goto cleanup; - } + if (!(dom = virDomainAssignDef(conn, &privconn->domains, def))) + goto cleanup; + def = NULL; dom->state = VIR_DOMAIN_RUNNING; dom->def->id = privconn->nextDomID++; @@ -992,15 +990,17 @@ testDomainCreateXML(virConnectPtr conn, const char *xml, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_BOOTED); - ret = virGetDomain(conn, def->name, def->uuid); + ret = virGetDomain(conn, dom->def->name, dom->def->uuid); if (ret) - ret->id = def->id; + ret->id = dom->def->id; cleanup: if (dom) virDomainObjUnlock(dom); if (event) testDomainEventQueue(privconn, event); + if (def) + virDomainDefFree(def); testDriverUnlock(privconn); return ret; } @@ -1531,13 +1531,14 @@ static int testDomainRestore(virConnectPtr conn, if (!def) goto cleanup; - if ((dom = testDomainAssignDef(conn, &privconn->domains, - def)) == NULL) + if (testDomainGenerateIfnames(conn, def) < 0) goto cleanup; + if (!(dom = virDomainAssignDef(conn, &privconn->domains, def))) + goto cleanup; + def = NULL; dom->state = VIR_DOMAIN_RUNNING; dom->def->id = privconn->nextDomID++; - def = NULL; event = virDomainEventNewFromObj(dom, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_RESTORED); @@ -1823,10 +1824,10 @@ static virDomainPtr testDomainDefineXML(virConnectPtr conn, VIR_DOMAIN_XML_INACTIVE)) == NULL) goto cleanup; - if ((dom = testDomainAssignDef(conn, &privconn->domains, - def)) == NULL) { + if (testDomainGenerateIfnames(conn, def) < 0) + goto cleanup; + if (!(dom = virDomainAssignDef(conn, &privconn->domains, def))) goto cleanup; - } def = NULL; dom->persistent = 1; diff --git a/tests/object-locking.ml b/tests/object-locking.ml index 215a2e5..0c66fc7 100644 --- a/tests/object-locking.ml +++ b/tests/object-locking.ml @@ -128,7 +128,8 @@ let driverLockMethods = [ "umlDriverLock"; "nodedevDriverLock"; "networkDriverLock"; - "storageDriverLock" + "storageDriverLock"; + "oneDriverLock" ] (* @@ -142,7 +143,8 @@ let driverUnlockMethods = [ "umlDriverUnlock"; "nodedevDriverUnlock"; "networkDriverUnlock"; - "storageDriverUnlock" + "storageDriverUnlock"; + "oneDriverUnlock" ] (* @@ -159,6 +161,7 @@ let lockableDrivers = [ "virStorageDriverStatePtr"; "network_driver"; "virDeviceMonitorState"; + "one_driver_t"; ] -- 1.6.2.5

2 2

[libvirt] [PATCH] Fix handling of Xen(ner) detection
by Daniel P. Berrange 10 Sep '09

10 Sep '09

Latest upstream QEMU can be built with Xen support, which introduces a -xen-domid argument. This was mistakenly detected as -domid due to old Xenner support. Adapt to cope with both syntax. Also only set domid if the virt type is xen, or the guest type is xen * src/qemu_conf.c, src/qemu_conf.h: Detect new -xen-domid flag in preference to -domid. * tests/qemuxml2argvdata/qemuxml2argv-bootloader.args, tests/qemuxml2argvdata/qemuxml2argv-input-xen.args: Add missing -domid param * tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args: Remove bogus -boot param. * tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml: Fix domain type to be xen * tests/qemuxml2argvtest.c: Add missing QEMUD_CMD_FLAG_DOMID params --- src/qemu_conf.c | 31 +++++++++++++++---- src/qemu_conf.h | 1 + .../qemuxml2argvdata/qemuxml2argv-bootloader.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-input-xen.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 3 +- tests/qemuxml2argvtest.c | 4 +- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 22f5edd..e8414c3 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -769,7 +769,9 @@ static unsigned int qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_NAME; if (strstr(help, "-uuid")) flags |= QEMUD_CMD_FLAG_UUID; - if (strstr(help, "-domid")) + if (strstr(help, "-xen-domid")) + flags |= QEMUD_CMD_FLAG_XEN_DOMID; + else if (strstr(help, "-domid")) flags |= QEMUD_CMD_FLAG_DOMID; if (strstr(help, "-drive")) { flags |= QEMUD_CMD_FLAG_DRIVE; @@ -1594,9 +1596,22 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-uuid"); ADD_ARG_LIT(uuid); } - if (qemuCmdFlags & QEMUD_CMD_FLAG_DOMID) { - ADD_ARG_LIT("-domid"); - ADD_ARG_LIT(domid); + if (def->virtType == VIR_DOMAIN_VIRT_XEN || + STREQ(def->os.type, "xen") || + STREQ(def->os.type, "linux")) { + if (qemuCmdFlags & QEMUD_CMD_FLAG_DOMID) { + ADD_ARG_LIT("-domid"); + ADD_ARG_LIT(domid); + } else if (qemuCmdFlags & QEMUD_CMD_FLAG_XEN_DOMID) { + ADD_ARG_LIT("-xen-attach"); + ADD_ARG_LIT("-xen-domid"); + ADD_ARG_LIT(domid); + } else { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("qemu emulator '%s' does not support xen"), + def->emulator); + goto error; + } } /* @@ -1649,9 +1664,11 @@ int qemudBuildCommandLine(virConnectPtr conn, break; } } - boot[def->os.nBootDevs] = '\0'; - ADD_ARG_LIT("-boot"); - ADD_ARG_LIT(boot); + if (def->os.nBootDevs) { + boot[def->os.nBootDevs] = '\0'; + ADD_ARG_LIT("-boot"); + ADD_ARG_LIT(boot); + } if (def->os.kernel) { ADD_ARG_LIT("-kernel"); diff --git a/src/qemu_conf.h b/src/qemu_conf.h index a126dac..99aac81 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -67,6 +67,7 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_HOST_NET_ADD = QEMUD_CMD_FLAG_0_10, /* host_net_add monitor command */ QEMUD_CMD_FLAG_PCIDEVICE = (1 << 17), /* PCI device assignment only supported by qemu-kvm */ + QEMUD_CMD_FLAG_XEN_DOMID = (1 << 18), /* -xen-domid (new style xen integration) */ }; /* Main driver state */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args index 8a15524..bcae18a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S -M xenner -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -bootloader /usr/bin/pygrub -cdrom /dev/cdrom -net none -serial none -parallel none -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S -M xenner -m 214 -smp 1 -domid 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -bootloader /usr/bin/pygrub -cdrom /dev/cdrom -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args index 64c0e1c..65fb073 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S -M xenner -m 214 -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -bootloader /foo -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3 +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/xenner -S -M xenner -m 214 -smp 1 -domid 6 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -bootloader /foo -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -vnc 127.0.0.1:3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args index c735dc7..c4df9ae 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -name QEMUGuest1 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 -domid 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -name QEMUGuest1 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 -domid 6 -nographic -monitor unix:/tmp/test-monitor,server,nowait -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml index 1b37bdc..7f77e01 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml @@ -5,8 +5,7 @@ <currentMemory>219200</currentMemory> <vcpu>1</vcpu> <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> + <type arch='x86_64' machine='pc'>xen</type> </os> <features> <acpi/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6f25e7d..ad7a690 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -186,7 +186,7 @@ mymain(int argc, char **argv) DO_TEST("boot-cdrom", 0); DO_TEST("boot-network", 0); DO_TEST("boot-floppy", 0); - DO_TEST("bootloader", 0); + DO_TEST("bootloader", QEMUD_CMD_FLAG_DOMID); DO_TEST("clock-utc", 0); DO_TEST("clock-localtime", 0); DO_TEST("disk-cdrom", 0); @@ -236,7 +236,7 @@ mymain(int argc, char **argv) DO_TEST("graphics-sdl-fullscreen", 0); DO_TEST("input-usbmouse", 0); DO_TEST("input-usbtablet", 0); - DO_TEST("input-xen", 0); + DO_TEST("input-xen", QEMUD_CMD_FLAG_DOMID); DO_TEST("misc-acpi", 0); DO_TEST("misc-no-reboot", 0); DO_TEST("misc-uuid", QEMUD_CMD_FLAG_NAME | -- 1.6.2.5

2 2

[libvirt] [PATCH] also allow use of XZ for Qemu image compression
by Jim Meyering 10 Sep '09

10 Sep '09

While this patch stays minimal by simply adding XZ/xz to the list, I think it would be better to remove lzma, since it uses an inferior format (which lacks an integrity check), and has been effectively subsumed by xz. Let me know if you'd like that, and I'll prepare the slightly more invasive patch. >From afb7275f14e8062e6d5eebf704e1fd0f582cb407 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 8 Sep 2009 20:52:37 +0200 Subject: [PATCH] also allow use of XZ for Qemu image compression * src/qemu_driver.c (enum qemud_save_formats) [QEMUD_SAVE_FORMAT_XZ]: New member. [QEMUD_SAVE_FORMAT_LZMA]: Mark as deprecated. (qemudDomainSave, qemudDomainRestore): Handle the new member. * src/qemu.conf: Mention xz, too. --- src/qemu.conf | 2 +- src/qemu_driver.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qemu.conf b/src/qemu.conf index 06babc4..342bb8a 100644 --- a/src/qemu.conf +++ b/src/qemu.conf @@ -134,7 +134,7 @@ # memory from the domain is dumped out directly to a file. If you have # guests with a large amount of memory, however, this can take up quite # a bit of space. If you would like to compress the images while they -# are being saved to disk, you can also set "gzip", "bzip2", "lzma" +# are being saved to disk, you can also set "gzip", "bzip2", "lzma", "xz", # or "lzop" for save_image_format. Note that this means you slow down # the process of saving a domain in order to save disk space. # diff --git a/src/qemu_driver.c b/src/qemu_driver.c index f64d70b..7b64712 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -3622,7 +3622,8 @@ enum qemud_save_formats { QEMUD_SAVE_FORMAT_RAW, QEMUD_SAVE_FORMAT_GZIP, QEMUD_SAVE_FORMAT_BZIP2, - QEMUD_SAVE_FORMAT_LZMA, + QEMUD_SAVE_FORMAT_LZMA, /* deprecated, in favor of xz */ + QEMUD_SAVE_FORMAT_XZ, QEMUD_SAVE_FORMAT_LZOP, }; @@ -3664,6 +3665,8 @@ static int qemudDomainSave(virDomainPtr dom, header.compressed = QEMUD_SAVE_FORMAT_BZIP2; else if (STREQ(driver->saveImageFormat, "lzma")) header.compressed = QEMUD_SAVE_FORMAT_LZMA; + else if (STREQ(driver->saveImageFormat, "xz")) + header.compressed = QEMUD_SAVE_FORMAT_XZ; else if (STREQ(driver->saveImageFormat, "lzop")) header.compressed = QEMUD_SAVE_FORMAT_LZOP; else { @@ -3758,6 +3761,9 @@ static int qemudDomainSave(virDomainPtr dom, else if (header.compressed == QEMUD_SAVE_FORMAT_LZMA) internalret = virAsprintf(&command, "migrate \"exec:" "lzma -c >> '%s' 2>/dev/null\"", safe_path); + else if (header.compressed == QEMUD_SAVE_FORMAT_XZ) + internalret = virAsprintf(&command, "migrate \"exec:" + "xz -c >> '%s' 2>/dev/null\"", safe_path); else if (header.compressed == QEMUD_SAVE_FORMAT_LZOP) internalret = virAsprintf(&command, "migrate \"exec:" "lzop -c >> '%s' 2>/dev/null\"", safe_path); @@ -4383,6 +4389,8 @@ static int qemudDomainRestore(virConnectPtr conn, intermediate_argv[0] = "bzip2"; else if (header.compressed == QEMUD_SAVE_FORMAT_LZMA) intermediate_argv[0] = "lzma"; + else if (header.compressed == QEMUD_SAVE_FORMAT_XZ) + intermediate_argv[0] = "xz"; else if (header.compressed == QEMUD_SAVE_FORMAT_LZOP) intermediate_argv[0] = "lzop"; else if (header.compressed != QEMUD_SAVE_FORMAT_RAW) { -- 1.6.5.rc0.164.g5f6b0

5 19

[libvirt] [PATCH] Automagically check if libssh2 is new enough for Phyp-support to be build
by Maximilian Wilhelm 10 Sep '09

10 Sep '09

Hi! My buildbot spotted a problem with the latest changes to Phyp, as the function libssh2_session_block_directions() only is available with libssh2 version 1.0 and later. At least on Debian Lenny there is an older one which prevents libVirt from building, so I updated the configure.in script to add another piece of magic (and thereby fixed the indenation of the Phypchecks). See attached patch. Ciao Max -- "really soon now": an unspecified period of time, likly to be greater than any reasonable definition of "soon".

3 6

[libvirt] HVM startup problem"unknown root elementi for storage pool"
by Andreas Sommer 09 Sep '09

09 Sep '09

Hi, I'm having a problem with starting a HVM virtual machine on Xen-3.4 with python-libvirt. This is the XML: <?xml version="1.0" encoding="utf-8"?> <domain type="xen"> <name>b07d6538-60f5-44a9-90e7-761304968e17</name> <uuid>b07d6538-60f5-44a9-90e7-761304968e17</uuid> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <memory>131072</memory> <vcpu>1</vcpu> <os> <type>hvm</type> <boot dev="hd" /> </os> <devices> <graphics type="vnc" /> <input type="tablet" /> <interface type="bridge"> <source bridge="eth0" /> </interface> <disk type="file"> <source file="/xen-hvm-test/disk0.img" /> <target dev="sda1" /> </disk> </devices> </domain> Then I call connection.createXML(libvirtXmlDescription, 0) which leads to an exception "unknown root elementi for storage pool". I'm using the Debian package "libvirt0" 0.4.6-10. I guess that's 0.6.4 actually, please tell me if that's a wrong assumption?? The 0.6.4 source code seems to have corrected "elementi" to "element" that's why I'm wondering which version I actually have. Why does this happen? Is there anything missing in my XML description? Best regards

1 1

[libvirt] [PATCH] openvz_conf.c: remove dead store to "p"; use strchrnul
by Jim Meyering 09 Sep '09

09 Sep '09

I may separate this into two commits. Currently we can't use the part that adds the strchrnul use, since gnulib's module lists its license as LGPL, which means LGPLv3+, and that conflicts with libvirt's LGPLv2+ requirement. However, since strchrnul is derived from glibc, it should be easy to adjust that. I've asked the maintainer of that module on the bug-gnulib list. We'll see later today when the US wakes up. >From b76bc73df65c793958ce646fd80763c19a9e4dbd Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 8 Sep 2009 11:07:32 +0200 Subject: [PATCH] openvz_conf.c: remove dead store to "p"; use strchrnul * src/openvz_conf.c (openvzReadNetworkConf): Replace open-coded while loop with equivalent use of strchrnul. * bootstrap (modules): Add strchrnul. --- bootstrap | 1 + src/openvz_conf.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap b/bootstrap index 8b81e0e..5560792 100755 --- a/bootstrap +++ b/bootstrap @@ -89,6 +89,7 @@ send setsockopt socket stpcpy +strchrnul strndup strerror strsep diff --git a/src/openvz_conf.c b/src/openvz_conf.c index ce4fc6e..be94b9e 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -239,15 +239,14 @@ openvzReadNetworkConf(virConnectPtr conn, net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - char *p = token, *next = token; + char *p = token; char cpy_temp[32]; int len; /*parse string*/ do { - while (*next != '\0' && *next != ',') next++; + char *next = strchrnul (token, ','); if (STRPREFIX(p, "ifname=")) { - p += 7; /* skip in libvirt */ } else if (STRPREFIX(p, "host_ifname=")) { p += 12; -- 1.6.5.rc0.164.g5f6b0

2 2

[libvirt] [PATCH] two syntax-check related updates
by Jim Meyering 09 Sep '09

09 Sep '09

These changes affect only "make syntax-check". The first patch is clearing out now-useless or unnecessary exclusions. The second enables one more test and fixes the few small violations it spotted. >From e4719bd092b03ef666d196ebc4b97086a7ecae98 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 8 Sep 2009 15:08:07 +0200 Subject: [PATCH 1/2] build: syntax-check: exclude fewer tests * cfg.mk (local-checks-to-skip): Don't skip tests that pass. Remove names of renamed or removed tests. --- cfg.mk | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/cfg.mk b/cfg.mk index 64bd26e..79dcb81 100644 --- a/cfg.mk +++ b/cfg.mk @@ -26,31 +26,17 @@ url_dir_list = \ # Tests not to run as part of "make distcheck". local-checks-to-skip = \ - changelog-check \ - check-AUTHORS \ - makefile-check \ - makefile_path_separator_check \ - patch-check \ sc_GPL_version \ - sc_always_defined_macros \ - sc_cast_of_alloca_return_value \ - sc_dd_max_sym_length \ sc_error_exit_success \ sc_file_system \ sc_immutable_NEWS \ sc_makefile_path_separator_check \ - sc_obsolete_symbols \ - sc_prohibit_S_IS_definition \ sc_prohibit_atoi_atof \ - sc_prohibit_jm_in_m4 \ sc_prohibit_quote_without_use \ sc_prohibit_quotearg_without_use \ sc_prohibit_stat_st_blocks \ - sc_root_tests \ sc_space_tab \ sc_sun_os_names \ - sc_system_h_headers \ - sc_tight_scope \ sc_two_space_separator_in_usage \ sc_error_message_uppercase \ sc_program_name \ -- 1.6.5.rc0.164.g5f6b0 >From 7bf84b60be8603f226af6244a3e63335586555d6 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 8 Sep 2009 15:24:46 +0200 Subject: [PATCH 2/2] build: no longer skip the makefile PATH separator check * cfg.mk (local-checks-to-skip): Remove sc_makefile_path_separator_check. * python/tests/Makefile.am (tests): Use $(PATH_SEPARATOR), not ":" in shell search PATH definitions. --- cfg.mk | 1 - python/tests/Makefile.am | 23 +++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/cfg.mk b/cfg.mk index 79dcb81..7e152f8 100644 --- a/cfg.mk +++ b/cfg.mk @@ -30,7 +30,6 @@ local-checks-to-skip = \ sc_error_exit_success \ sc_file_system \ sc_immutable_NEWS \ - sc_makefile_path_separator_check \ sc_prohibit_atoi_atof \ sc_prohibit_quote_without_use \ sc_prohibit_quotearg_without_use \ diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am index 6011fef..11218a8 100644 --- a/python/tests/Makefile.am +++ b/python/tests/Makefile.am @@ -12,14 +12,21 @@ EXTRA_DIST = $(PYTESTS) if WITH_PYTHON tests: $(PYTESTS) @echo "## running Python regression tests" - -@(PYTHONPATH="..:../.libs:../src/.libs:$(srcdir)/../src:$$PYTHONPATH";\ - export PYTHONPATH; \ - LD_LIBRARY_PATH="$(top_builddir)/src/.libs:$$LD_LIBRARY_PATH" ; \ - export LD_LIBRARY_PATH; \ - for test in $(PYTESTS) ; \ - do log=`$(PYTHON) $(srcdir)/$$test` ; \ - if [ "`echo $$log | grep OK`" = "" ] ; then \ - echo "-- $$test" ; echo "$$log" ; fi ; done) + -@(p=..; \ + -@(p="$$p$(PATH_SEPARATOR)../.libs"; \ + p="$$p$(PATH_SEPARATOR)../src/.libs"; \ + p="$$p$(PATH_SEPARATOR)$(srcdir)/../src"; \ + p="$$p$(PATH_SEPARATOR)$$PYTHONPATH"; \ + PYTHONPATH=$$p; export PYTHONPATH; \ + p="$(top_builddir)/src/.libs"; \ + p="$$p$(PATH_SEPARATOR)$$LD_LIBRARY_PATH"; \ + LD_LIBRARY_PATH=$$p; export LD_LIBRARY_PATH; \ + for test in $(PYTESTS); do \ + log=`$(PYTHON) $(srcdir)/$$test`; \ + if [ "`echo $$log | grep OK`" = "" ]; then \ + echo "-- $$test"; echo "$$log"; \ + fi; \ + done) else tests: endif -- 1.6.5.rc0.164.g5f6b0

1 0

[libvirt] Free name in xenDaemonLookupByID(), if virGetDomain() fails
by Matthias Bolte 09 Sep '09

09 Sep '09

Subject says it all. Matthias

2 3

[libvirt] rebased multipath patch
by Dave Allan 09 Sep '09

09 Sep '09

Here's the multipath patch, rebased against the current head. Dave >From 52cb0ff30dd5a52c5a246f3a2022f933cd2a0eab Mon Sep 17 00:00:00 2001 From: David Allan <dallan(a)redhat.com> Date: Tue, 21 Jul 2009 12:43:01 -0400 Subject: [PATCH] Add a simple pool type for multipath devices This pool type contains volumes for the multipath devices that are present on the host. It does not (yet) support any sort of multipath configuration, so that aspect of system administration must still be done at host build time. --- configure.in | 24 +++ po/POTFILES.in | 1 + src/Makefile.am | 9 + src/storage_backend.c | 82 ++++++++++ src/storage_backend.h | 5 +- src/storage_backend_mpath.c | 352 +++++++++++++++++++++++++++++++++++++++++++ src/storage_backend_mpath.h | 31 ++++ src/storage_conf.c | 7 +- src/storage_conf.h | 1 + 9 files changed, 510 insertions(+), 2 deletions(-) create mode 100644 src/storage_backend_mpath.c create mode 100644 src/storage_backend_mpath.h diff --git a/configure.in b/configure.in index d28c44a..7c93ab7 100644 --- a/configure.in +++ b/configure.in @@ -1046,6 +1046,8 @@ AC_ARG_WITH([storage-iscsi], [ --with-storage-iscsi with iSCSI backend for the storage driver (on)],[],[with_storage_iscsi=check]) AC_ARG_WITH([storage-scsi], [ --with-storage-scsi with SCSI backend for the storage driver (on)],[],[with_storage_scsi=check]) +AC_ARG_WITH([storage-mpath], +[ --with-storage-mpath with mpath backend for the storage driver (on)],[],[with_storage_mpath=check]) AC_ARG_WITH([storage-disk], [ --with-storage-disk with GPartd Disk backend for the storage driver (on)],[],[with_storage_disk=check]) @@ -1056,6 +1058,7 @@ if test "$with_libvirtd" = "no"; then with_storage_lvm=no with_storage_iscsi=no with_storage_scsi=no + with_storage_mpath=no with_storage_disk=no fi if test "$with_storage_dir" = "yes" ; then @@ -1177,6 +1180,26 @@ if test "$with_storage_scsi" = "check"; then fi AM_CONDITIONAL([WITH_STORAGE_SCSI], [test "$with_storage_scsi" = "yes"]) +if test "$with_storage_mpath" = "check"; then + with_storage_mpath=yes + + AC_DEFINE_UNQUOTED([WITH_STORAGE_MPATH], 1, + [whether mpath backend for storage driver is enabled]) +fi +AM_CONDITIONAL([WITH_STORAGE_MPATH], [test "$with_storage_mpath" = "yes"]) + +if test "$with_storage_mpath" = "yes"; then + DEVMAPPER_REQUIRED=0.0 + DEVMAPPER_CFLAGS= + DEVMAPPER_LIBS= + PKG_CHECK_MODULES(DEVMAPPER, devmapper >= $DEVMAPPER_REQUIRED, + [], [ + AC_MSG_ERROR( + [You must install device-mapper-devel >= $DEVMAPPER_REQUIRED to compile libvirt]) + ]) +fi +AC_SUBST([DEVMAPPER_CFLAGS]) +AC_SUBST([DEVMAPPER_LIBS]) LIBPARTED_CFLAGS= LIBPARTED_LIBS= @@ -1677,6 +1700,7 @@ AC_MSG_NOTICE([ NetFS: $with_storage_fs]) AC_MSG_NOTICE([ LVM: $with_storage_lvm]) AC_MSG_NOTICE([ iSCSI: $with_storage_iscsi]) AC_MSG_NOTICE([ SCSI: $with_storage_scsi]) +AC_MSG_NOTICE([ mpath: $with_storage_mpath]) AC_MSG_NOTICE([ Disk: $with_storage_disk]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Security Drivers]) diff --git a/po/POTFILES.in b/po/POTFILES.in index 0a53dab..1586368 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -38,6 +38,7 @@ src/storage_backend_fs.c src/storage_backend_iscsi.c src/storage_backend_logical.c src/storage_backend_scsi.c +src/storage_backend_mpath.c src/storage_conf.c src/storage_driver.c src/storage_encryption_conf.c diff --git a/src/Makefile.am b/src/Makefile.am index bedeb84..cf3420b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -199,6 +199,9 @@ STORAGE_DRIVER_ISCSI_SOURCES = \ STORAGE_DRIVER_SCSI_SOURCES = \ storage_backend_scsi.h storage_backend_scsi.c +STORAGE_DRIVER_MPATH_SOURCES = \ + storage_backend_mpath.h storage_backend_mpath.c + STORAGE_DRIVER_DISK_SOURCES = \ storage_backend_disk.h storage_backend_disk.c @@ -478,6 +481,10 @@ if WITH_STORAGE_SCSI libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES) endif +if WITH_STORAGE_MPATH +libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES) +endif + if WITH_STORAGE_DISK libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES) endif @@ -539,6 +546,7 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_LVM_SOURCES) \ $(STORAGE_DRIVER_ISCSI_SOURCES) \ $(STORAGE_DRIVER_SCSI_SOURCES) \ + $(STORAGE_DRIVER_MPATH_SOURCES) \ $(STORAGE_DRIVER_DISK_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ @@ -607,6 +615,7 @@ libvirt_la_LDFLAGS = $(VERSION_SCRIPT_FLAGS)libvirt.syms \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ $(LIBXML_LIBS) $(SELINUX_LIBS) \ $(XEN_LIBS) $(DRIVER_MODULE_LIBS) \ + $(DEVMAPPER_LIBS) \ @CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@ libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT libvirt_la_DEPENDENCIES = $(libvirt_la_LIBADD) libvirt.syms diff --git a/src/storage_backend.c b/src/storage_backend.c index c818142..4dec06b 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -59,6 +59,9 @@ #if WITH_STORAGE_SCSI #include "storage_backend_scsi.h" #endif +#if WITH_STORAGE_MPATH +#include "storage_backend_mpath.h" +#endif #if WITH_STORAGE_DISK #include "storage_backend_disk.h" #endif @@ -89,6 +92,9 @@ static virStorageBackendPtr backends[] = { #if WITH_STORAGE_SCSI &virStorageBackendSCSI, #endif +#if WITH_STORAGE_MPATH + &virStorageBackendMpath, +#endif #if WITH_STORAGE_DISK &virStorageBackendDisk, #endif @@ -812,6 +818,82 @@ virStorageBackendUpdateVolTargetInfoFD(virConnectPtr conn, return 0; } + +struct diskType { + int part_table_type; + unsigned short offset; + unsigned short length; + unsigned long long magic; +}; + + +static struct diskType const disk_types[] = { + { VIR_STORAGE_POOL_DISK_LVM2, 0x218, 8, 0x31303020324D564CULL }, + { VIR_STORAGE_POOL_DISK_GPT, 0x200, 8, 0x5452415020494645ULL }, + { VIR_STORAGE_POOL_DISK_DVH, 0x0, 4, 0x41A9E50BULL }, + { VIR_STORAGE_POOL_DISK_MAC, 0x0, 2, 0x5245ULL }, + { VIR_STORAGE_POOL_DISK_BSD, 0x40, 4, 0x82564557ULL }, + { VIR_STORAGE_POOL_DISK_SUN, 0x1fc, 2, 0xBEDAULL }, + /* + * NOTE: pc98 is funky; the actual signature is 0x55AA (just like dos), so + * we can't use that. At the moment I'm relying on the "dummy" IPL + * bootloader data that comes from parted. Luckily, the chances of running + * into a pc98 machine running libvirt are approximately nil. + */ + /*{ 0x1fe, 2, 0xAA55UL },*/ + { VIR_STORAGE_POOL_DISK_PC98, 0x0, 8, 0x314C5049000000CBULL }, + /* + * NOTE: the order is important here; some other disk types (like GPT and + * and PC98) also have 0x55AA at this offset. For that reason, the DOS + * one must be the last one. + */ + { VIR_STORAGE_POOL_DISK_DOS, 0x1fe, 2, 0xAA55ULL }, + { -1, 0x0, 0, 0x0ULL }, +}; + + +int +virStorageBackendUpdateVolTargetFormatFD(virConnectPtr conn, + virStorageVolTargetPtr target, + int fd) +{ + int i; + off_t start; + unsigned char buffer[1024]; + ssize_t bytes; + + /* make sure to set the target format "unknown" to begin with */ + target->format = VIR_STORAGE_POOL_DISK_UNKNOWN; + + start = lseek(fd, 0, SEEK_SET); + if (start < 0) { + virReportSystemError(conn, errno, + _("cannot seek to beginning of file '%s'"), + target->path); + return -1; + } + bytes = saferead(fd, buffer, sizeof(buffer)); + if (bytes < 0) { + virReportSystemError(conn, errno, + _("cannot read beginning of file '%s'"), + target->path); + return -1; + } + + for (i = 0; disk_types[i].part_table_type != -1; i++) { + if (disk_types[i].offset + disk_types[i].length > bytes) + continue; + if (memcmp(buffer+disk_types[i].offset, &disk_types[i].magic, + disk_types[i].length) == 0) { + target->format = disk_types[i].part_table_type; + break; + } + } + + return 0; +} + + void virStorageBackendWaitForDevices(virConnectPtr conn) { virWaitForDevices(conn); diff --git a/src/storage_backend.h b/src/storage_backend.h index e80b05d..eb5bf87 100644 --- a/src/storage_backend.h +++ b/src/storage_backend.h @@ -91,7 +91,10 @@ int virStorageBackendUpdateVolTargetInfoFD(virConnectPtr conn, int fd, unsigned long long *allocation, unsigned long long *capacity); - +int +virStorageBackendUpdateVolTargetFormatFD(virConnectPtr conn, + virStorageVolTargetPtr target, + int fd); void virStorageBackendWaitForDevices(virConnectPtr conn); char *virStorageBackendStablePath(virConnectPtr conn, diff --git a/src/storage_backend_mpath.c b/src/storage_backend_mpath.c new file mode 100644 index 0000000..41dadf1 --- /dev/null +++ b/src/storage_backend_mpath.c @@ -0,0 +1,352 @@ +/* + * storage_backend_mpath.c: storage backend for multipath handling + * + * Copyright (C) 2007-2008 Red Hat, Inc. + * Copyright (C) 2007-2008 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange redhat com> + */ + +#include <config.h> + +#include <unistd.h> +#include <stdio.h> +#include <dirent.h> +#include <fcntl.h> + +#include <libdevmapper.h> + +#include "virterror_internal.h" +#include "storage_conf.h" +#include "storage_backend.h" +#include "memory.h" +#include "logging.h" + +#define VIR_FROM_THIS VIR_FROM_STORAGE + +static int +virStorageBackendMpathUpdateVolTargetInfo(virConnectPtr conn, + virStorageVolTargetPtr target, + unsigned long long *allocation, + unsigned long long *capacity) +{ + int ret = 0; + int fd = -1; + + if ((fd = open(target->path, O_RDONLY)) < 0) { + virReportSystemError(conn, errno, + _("cannot open volume '%s'"), + target->path); + ret = -1; + goto out; + } + + if (virStorageBackendUpdateVolTargetInfoFD(conn, + target, + fd, + allocation, + capacity) < 0) { + + VIR_ERROR(_("Failed to update volume target info for %s"), + target->path); + + ret = -1; + goto out; + } + + if (virStorageBackendUpdateVolTargetFormatFD(conn, + target, + fd) < 0) { + VIR_ERROR(_("Failed to update volume target format for %s"), + target->path); + + ret = -1; + goto out; + } + +out: + if (fd != -1) { + close(fd); + } + return ret; +} + + +static int +virStorageBackendMpathNewVol(virConnectPtr conn, + virStoragePoolObjPtr pool, + const int devnum, + const char *dev) +{ + virStorageVolDefPtr vol; + int retval = 0; + + if (VIR_ALLOC(vol) < 0) { + virReportOOMError(conn); + retval = -1; + goto out; + } + + vol->type = VIR_STORAGE_VOL_BLOCK; + + if (virAsprintf(&(vol->name), "dm-%u", devnum) < 0) { + virReportOOMError(conn); + retval = -1; + goto free_vol; + } + + if (virAsprintf(&vol->target.path, "/dev/%s", dev) < 0) { + virReportOOMError(conn); + retval = -1; + goto free_vol; + } + + if (virStorageBackendMpathUpdateVolTargetInfo(conn, + &vol->target, + &vol->allocation, + &vol->capacity) < 0) { + + virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("Failed to update volume for '%s'"), + vol->target.path); + retval = -1; + goto free_vol; + } + + /* XXX should use logical unit's UUID instead */ + vol->key = strdup(vol->target.path); + if (vol->key == NULL) { + virReportOOMError(conn); + retval = -1; + goto free_vol; + } + + pool->def->capacity += vol->capacity; + pool->def->allocation += vol->allocation; + + if (VIR_REALLOC_N(pool->volumes.objs, + pool->volumes.count + 1) < 0) { + virReportOOMError(conn); + retval = -1; + goto free_vol; + } + pool->volumes.objs[pool->volumes.count++] = vol; + + goto out; + +free_vol: + virStorageVolDefFree(vol); +out: + return retval; +} + + +static int +virStorageBackendIsMultipath(const char *devname) +{ + int ret = 0; + struct dm_task *dmt = NULL; + void *next = NULL; + uint64_t start, length; + char *target_type = NULL; + char *params = NULL; + + dmt = dm_task_create(DM_DEVICE_TABLE); + if (dmt == NULL) { + ret = -1; + goto out; + } + + if (dm_task_set_name(dmt, devname) == 0) { + ret = -1; + goto out; + } + + dm_task_no_open_count(dmt); + + if (!dm_task_run(dmt)) { + ret = -1; + goto out; + } + + next = dm_get_next_target(dmt, next, &start, &length, + &target_type, &params); + + if (target_type == NULL) { + ret = -1; + goto out; + } + + if (!(strcmp(target_type, "multipath"))) { + ret = 1; + } + +out: + if (dmt != NULL) { + dm_task_destroy(dmt); + } + return ret; +} + + +static int +virStorageBackendGetMinorNumber(const char *devname, uint32_t *minor) +{ + int ret = -1; + struct dm_task *dmt; + struct dm_info info; + + if (!(dmt = dm_task_create(DM_DEVICE_INFO))) { + goto out; + } + + if (!dm_task_set_name(dmt, devname)) { + goto out; + } + + if (!dm_task_run(dmt)) { + goto out; + } + + if (!dm_task_get_info(dmt, &info)) { + goto out; + } + + *minor = info.minor; + ret = 0; + +out: + if (dmt != NULL) { + dm_task_destroy(dmt); + } + + return ret; +} + + +static int +virStorageBackendCreateVols(virConnectPtr conn, + virStoragePoolObjPtr pool, + struct dm_names *names) +{ + int retval = 0, is_mpath = 0; + char *map_device = NULL; + uint32_t minor = -1; + + do { + is_mpath = virStorageBackendIsMultipath(names->name); + + if (is_mpath < 0) { + retval = -1; + goto out; + } + + if (is_mpath == 1) { + + if (virAsprintf(&map_device, "mapper/%s", names->name) < 0) { + virReportOOMError(conn); + retval = -1; + goto out; + } + + if (virStorageBackendGetMinorNumber(names->name, &minor) < 0) { + retval = -1; + goto out; + } + + virStorageBackendMpathNewVol(conn, + pool, + minor, + map_device); + + VIR_FREE(map_device); + } + + /* Given the way libdevmapper returns its data, I don't see + * any way to avoid this series of casts. */ + names = (struct dm_names *)(((char *)names) + names->next); + + } while (names->next); + +out: + return retval; +} + + +static int +virStorageBackendGetMaps(virConnectPtr conn, + virStoragePoolObjPtr pool) +{ + int retval = 0; + struct dm_task *dmt = NULL; + struct dm_names *names = NULL; + + if (!(dmt = dm_task_create(DM_DEVICE_LIST))) { + retval = 1; + goto out; + } + + dm_task_no_open_count(dmt); + + if (!dm_task_run(dmt)) { + retval = 1; + goto out; + } + + if (!(names = dm_task_get_names(dmt))) { + retval = 1; + goto out; + } + + if (!names->dev) { + /* No devices found */ + goto out; + } + + virStorageBackendCreateVols(conn, pool, names); + +out: + if (dmt != NULL) { + dm_task_destroy (dmt); + } + return retval; +} + + +static int +virStorageBackendMpathRefreshPool(virConnectPtr conn, + virStoragePoolObjPtr pool) +{ + int retval = 0; + + VIR_ERROR(_("in %s"), __func__); + + pool->def->allocation = pool->def->capacity = pool->def->available = 0; + + virStorageBackendWaitForDevices(conn); + + virStorageBackendGetMaps(conn, pool); + + return retval; +} + + +virStorageBackend virStorageBackendMpath = { + .type = VIR_STORAGE_POOL_MPATH, + + .refreshPool = virStorageBackendMpathRefreshPool, +}; diff --git a/src/storage_backend_mpath.h b/src/storage_backend_mpath.h new file mode 100644 index 0000000..9de2b79 --- /dev/null +++ b/src/storage_backend_mpath.h @@ -0,0 +1,31 @@ +/* + * storage_backend_scsi.h: storage backend for SCSI handling + * + * Copyright (C) 2007-2008 Red Hat, Inc. + * Copyright (C) 2007-2008 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange redhat com> + */ + +#ifndef __VIR_STORAGE_BACKEND_MPATH_H__ +#define __VIR_STORAGE_BACKEND_MPATH_H__ + +#include "storage_backend.h" + +extern virStorageBackend virStorageBackendMpath; + +#endif /* __VIR_STORAGE_BACKEND_MPATH_H__ */ diff --git a/src/storage_conf.c b/src/storage_conf.c index c446069..af04080 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -53,7 +53,7 @@ VIR_ENUM_IMPL(virStoragePool, VIR_STORAGE_POOL_LAST, "dir", "fs", "netfs", "logical", "disk", "iscsi", - "scsi") + "scsi", "mpath") VIR_ENUM_IMPL(virStoragePoolFormatFileSystem, VIR_STORAGE_POOL_FS_LAST, @@ -198,6 +198,11 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { .formatToString = virStoragePoolFormatDiskTypeToString, } }, + { .poolType = VIR_STORAGE_POOL_MPATH, + .volOptions = { + .formatToString = virStoragePoolFormatDiskTypeToString, + } + }, { .poolType = VIR_STORAGE_POOL_DISK, .poolOptions = { .flags = (VIR_STORAGE_POOL_SOURCE_DEVICE), diff --git a/src/storage_conf.h b/src/storage_conf.h index bcf9b93..421d305 100644 --- a/src/storage_conf.h +++ b/src/storage_conf.h @@ -119,6 +119,7 @@ enum virStoragePoolType { VIR_STORAGE_POOL_DISK, /* Disk partitions */ VIR_STORAGE_POOL_ISCSI, /* iSCSI targets */ VIR_STORAGE_POOL_SCSI, /* SCSI HBA */ + VIR_STORAGE_POOL_MPATH, /* Multipath devices */ VIR_STORAGE_POOL_LAST, }; -- 1.6.0.6

3 3

Re: [libvirt] [PATCH 04/10] Secret manipulation step 7: Local driver
by Miloslav Trmac 08 Sep '09

08 Sep '09

----- "Daniel Veillard" <veillard(a)redhat.com> wrote: > On Mon, Sep 07, 2009 at 04:12:39PM +0200, Miloslav Trmač wrote: > > + if ((size_t)st.st_size != st.st_size) { > > shouldn't we chaeck against SECRET_MAX_XML_FILE instead ? No, this code reads the secret value, not the XML, and there's little reason to impose an arbitrary limit on the size. SECRET_MAX_XML_FILE is a left-over from an earlier version, the attached updated patch removes the definition. Mirek

1 0

Re: [libvirt] [PATCH 03/10] Add an internal <secret> XML handling API
by Miloslav Trmac 08 Sep '09

08 Sep '09

----- "Daniel Veillard" <veillard(a)redhat.com> wrote: > > + default: > > + VIR_ERROR(_("unexpected secret usage type %d"), def->usage_type); > > + break; > > Hum, since the virSecretDefPtr is allocated by our own code, it's > probably better to remove the default so that the compiler can tell us > we missed one enum case if new ones gets added. > > + type_str = virXPathString(conn, "string(./usage/@type)", ctxt); > > + if (type_str == NULL) { > > + virSecretReportError(conn, VIR_ERR_XML_ERROR, "%s", > > + _("unknown secret usage type")); > > _("missing secret usage type") would be more appropriate I guess > > + case VIR_SECRET_USAGE_TYPE_VOLUME: > > + def->usage.volume = virXPathString(conn, "string(./usage/volume)", > > + ctxt); > > + break; > > + > > + default: > > Again default: here means a mismatch between > virSecretUsageTypeTypeFromString and this function, best handled > statically IMHO. Thanks for the review, attached is an updated patch. Mirek

1 0

Re: [libvirt] [PATCH 02/10] Add VIR_SECRET_GET_VALUE_INTERNAL_CALL.
by Miloslav Trmac 08 Sep '09

08 Sep '09

----- "Daniel Veillard" <veillard(a)redhat.com> wrote: > > +/* Make sure ... INTERNAL_CALL can not be set by the caller */ > > +verify((VIR_SECRET_GET_VALUE_INTERNAL_CALL & > > + VIR_SECRET_GET_VALUE_FLAGS_MASK) == 0); > > ??? what's that ? an assert at compile time ? I don't know that construct > I would rather avoid it if it's not portable. Yes, a compile-time assert, provided by gnulib. The mechanism depends only on ISO C, and gnulib/lib/verify.h contains detailed comments about why the particular variant was chosen. It seems safe enough to me. Mirek

1 0

[libvirt] [PATCH]: Fixed minor bugs in display and added OOM checks.
by Pritesh Kothari 08 Sep '09

08 Sep '09

Hi All, There was a minor bug in selecting the graphics type. if the graphics type was desktop it was assumed that display is set for it, and thus crashed on strdup, so now checking if display is present before setting it. The second bug was while setting the 3d acceleration parameter, VIR_ALLOC() returns 0 or greater if success and not the other way round. Lastly added OOM checks in few places which were missed earlier. Regards, Pritesh

3 4

[libvirt] [PATCH] 6 dead-store patches
by Jim Meyering 08 Sep '09

08 Sep '09

>From 129dc57243df4e73daa24aac671087bcd25f51ad Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 16:49:37 +0200 Subject: [PATCH 1/6] xm_internal.c: remove dead stores of local, "type" * src/xm_internal.c (xenXMDomainConfigParse): Remove declaration and useless containing if-block, too. --- src/xm_internal.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index 9627ffb..661172b 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1,7 +1,7 @@ /* * xm_internal.h: helper routines for dealing with inactive domains * - * Copyright (C) 2006-2007 Red Hat + * Copyright (C) 2006-2007, 2009 Red Hat * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -995,7 +995,6 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { if (list && list->type == VIR_CONF_LIST) { list = list->list; while (list) { - int type = -1; char script[PATH_MAX]; char model[10]; char ip[16]; @@ -1031,7 +1030,6 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { mac[len] = '\0'; } else if (STRPREFIX(key, "bridge=")) { int len = nextkey ? (nextkey - data) : sizeof(bridge)-1; - type = 1; if (len > (sizeof(bridge)-1)) len = sizeof(bridge)-1; strncpy(bridge, data, len); @@ -1069,11 +1067,6 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { key = nextkey; } - /* XXX Forcing to pretend its a bridge */ - if (type == -1) { - type = 1; - } - if (VIR_ALLOC(net) < 0) goto cleanup; -- 1.6.4.2.419.gab238 >From b8b1ea4894ac9bf2a59472958a8bb0749526847f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 17:22:19 +0200 Subject: [PATCH 2/6] xm_internal.c: remove two ret=... dead stores * src/xm_internal.c (xenXMDomainCreate): Remove dead stores. --- src/xm_internal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index 661172b..de3aca9 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1850,10 +1850,10 @@ int xenXMDomainCreate(virDomainPtr domain) { goto error; domain->id = ret; - if ((ret = xend_wait_for_devices(domain->conn, domain->name)) < 0) + if (xend_wait_for_devices(domain->conn, domain->name) < 0) goto error; - if ((ret = xenDaemonDomainResume(domain)) < 0) + if (xenDaemonDomainResume(domain) < 0) goto error; xenUnifiedUnlock(priv); -- 1.6.4.2.419.gab238 >From a74d747d27bde38ece90df9a14acb648d83b9993 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 17:27:34 +0200 Subject: [PATCH 3/6] domain_conf.c: remove two dead stores * src/domain_conf.c (virDomainSaveXML): Remove use and decl of "err". (virDomainDefParseXML): Likewise. --- src/domain_conf.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 8dde5dd..050cf50 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -2520,8 +2520,7 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn, /* Extract domain uuid */ tmp = virXPathString(conn, "string(./uuid[1])", ctxt); if (!tmp) { - int err; - if ((err = virUUIDGenerate(def->uuid))) { + if (virUUIDGenerate(def->uuid)) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate UUID")); goto error; @@ -4456,12 +4455,11 @@ int virDomainSaveXML(virConnectPtr conn, char *configFile = NULL; int fd = -1, ret = -1; size_t towrite; - int err; if ((configFile = virDomainConfigFile(conn, configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { + if (virFileMakePath(configDir)) { virReportSystemError(conn, errno, _("cannot create config directory '%s'"), configDir); -- 1.6.4.2.419.gab238 >From b9c2d697d732b4c740fd9e1f87ad135c52e02c34 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 18:53:20 +0200 Subject: [PATCH 4/6] util.c: avoid dead store to "flag" * src/util.c (virExecDaemonize): Change flag |= VAR to "flag | VAR". --- src/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util.c b/src/util.c index 2529837..af50028 100644 --- a/src/util.c +++ b/src/util.c @@ -663,7 +663,7 @@ int virExecDaemonize(virConnectPtr conn, ret = virExecWithHook(conn, argv, envp, keepfd, retpid, infd, outfd, errfd, - flags |= VIR_EXEC_DAEMON, + flags | VIR_EXEC_DAEMON, hook, data, pidfile); /* __virExec should have set an error */ -- 1.6.4.2.419.gab238 >From 6470cb9312a13fd018fb83b79e66cb50190b1f4f Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:36:17 +0200 Subject: [PATCH 5/6] iptables.c: remove dead store to "s" * src/iptables.c (iptablesAddRemoveRule): Remove dead store. --- src/iptables.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/iptables.c b/src/iptables.c index 73b39d1..4562800 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -398,7 +398,7 @@ iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...) 1; /* arg */ va_start(args, arg); - while ((s = va_arg(args, const char *))) + while (va_arg(args, const char *)) n++; va_end(args); -- 1.6.4.2.419.gab238 >From 65c10b030fb43d6678be9bd5eeeb326a024d6902 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:37:37 +0200 Subject: [PATCH 6/6] network_driver.c: remove dead store to "err" * src/network_driver.c (networkSetAutostart): ...and its decl. --- src/network_driver.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/network_driver.c b/src/network_driver.c index 84910ab..49855bf 100644 --- a/src/network_driver.c +++ b/src/network_driver.c @@ -1428,9 +1428,7 @@ static int networkSetAutostart(virNetworkPtr net, goto cleanup; if (autostart) { - int err; - - if ((err = virFileMakePath(driver->networkAutostartDir))) { + if (virFileMakePath(driver->networkAutostartDir)) { virReportSystemError(net->conn, errno, _("cannot create autostart directory '%s'"), driver->networkAutostartDir); -- 1.6.4.2.419.gab238

2 3

[libvirt] [PATCH] xm_internal.c: remove dead store and associated leak
by Jim Meyering 08 Sep '09

08 Sep '09

This one took a little thinking. I'm not 100% sure that the comment in my log is sufficient justification for removing the virGetDomain call. If we leave it, we'll have to free it and remove the XXX comment. >From 324e07f17e6a2ed6df236af955adc693670d1b16 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:46:59 +0200 Subject: [PATCH] xm_internal.c: remove dead store and associated leak * src/xm_internal.c (xenXMDomainDefineXML): Dead store to "olddomain" -- and comment ;-) highlighted that the virGetDomain call represented a leak. It was also useless, seeing as how preceding call to virHashLookup(priv->nameConfigMap found def->name. --- src/xm_internal.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/src/xm_internal.c b/src/xm_internal.c index de3aca9..e7f6a55 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -2532,7 +2532,6 @@ cleanup: */ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { virDomainPtr ret; - virDomainPtr olddomain; char filename[PATH_MAX]; const char * oldfilename; virDomainDefPtr def = NULL; @@ -2578,10 +2577,6 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { goto error; } - /* XXX wtf.com is this line for - it appears to be amemory leak */ - if (!(olddomain = virGetDomain(conn, def->name, entry->def->uuid))) - goto error; - /* Remove the name -> filename mapping */ if (virHashRemoveEntry(priv->nameConfigMap, def->name, NULL) < 0) { xenXMError(conn, VIR_ERR_INTERNAL_ERROR, -- 1.6.4.2.419.gab238

2 1

[libvirt] [PATCH] network_conf.c: remove dead store to "err"
by Jim Meyering 08 Sep '09

08 Sep '09

>From 66133e3b9d80e9fadefd810786b0ff2f5c8e6875 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:15:51 +0200 Subject: [PATCH] network_conf.c: remove dead store to "err" * src/network_conf.c (virNetworkDefParseXML): ...and its decl. --- src/network_conf.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/network_conf.c b/src/network_conf.c index 58a4f32..3764bb4 100644 --- a/src/network_conf.c +++ b/src/network_conf.c @@ -1,7 +1,7 @@ /* * network_conf.c: network XML handling * - * Copyright (C) 2006-2008 Red Hat, Inc. + * Copyright (C) 2006-2009 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -329,8 +329,7 @@ virNetworkDefParseXML(virConnectPtr conn, /* Extract network uuid */ tmp = virXPathString(conn, "string(./uuid[1])", ctxt); if (!tmp) { - int err; - if ((err = virUUIDGenerate(def->uuid))) { + if (virUUIDGenerate(def->uuid)) { virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate UUID")); goto error; -- 1.6.4.2.409.g85dc3

2 1

[libvirt] merge-commit push prohibition now in place, for master
by Jim Meyering 08 Sep '09

08 Sep '09

Just today we noticed that it was possible to push accidental merge commits to "master". While the commit hook to prevent that was in place, the config setting to enable the hook for "master" was missing. I've just done this on the server: git --git-dir /git/libvirt.git config hooks.denymerge.master true so *now*, we should be protected from ourselves.

2 1

[libvirt] [PATCH] xend_internal.c: Remove two dead stores to "ret"
by Jim Meyering 08 Sep '09

08 Sep '09

>From 99610dd77b95914623bd78f2bcac5d15a6c87024 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:14:09 +0200 Subject: [PATCH] xend_internal.c: Remove two dead stores to "ret" * src/xend_internal.c (xenDaemonCreateXML): Don't set "ret" after last use. --- src/xend_internal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xend_internal.c b/src/xend_internal.c index cf45cd6..2fa08f1 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -4028,10 +4028,10 @@ xenDaemonCreateXML(virConnectPtr conn, const char *xmlDesc, if (!(dom = virDomainLookupByName(conn, def->name))) goto error; - if ((ret = xend_wait_for_devices(conn, def->name)) < 0) + if (xend_wait_for_devices(conn, def->name) < 0) goto error; - if ((ret = xenDaemonDomainResume(dom)) < 0) + if (xenDaemonDomainResume(dom) < 0) goto error; virDomainDefFree(def); -- 1.6.4.2.409.g85dc3

2 1

[libvirt] [PATCH] openvz_driver.c: avoid dead store to "err"
by Jim Meyering 08 Sep '09

08 Sep '09

>From 559c1ba31a89fd3a6ed54631d5d900fa16140187 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 19:11:31 +0200 Subject: [PATCH] openvz_driver.c: avoid dead store to "err" * src/openvz_driver.c (openvzGenerateContainerVethName): Remove use and decl of "err". --- src/openvz_driver.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/openvz_driver.c b/src/openvz_driver.c index 43d54f9..a8c24ba 100644 --- a/src/openvz_driver.c +++ b/src/openvz_driver.c @@ -504,11 +504,10 @@ openvzGenerateVethName(int veid, char *dev_name_ve) static char * openvzGenerateContainerVethName(int veid) { - int ret; char temp[1024]; /* try to get line "^NETIF=..." from config */ - if ( (ret = openvzReadVPSConfigParam(veid, "NETIF", temp, sizeof(temp))) <= 0) { + if (openvzReadVPSConfigParam(veid, "NETIF", temp, sizeof(temp)) <= 0) { snprintf(temp, sizeof(temp), "eth0"); } else { char *saveptr; -- 1.6.4.2.409.g85dc3

2 1

[libvirt] 3 more dead stores
by Jim Meyering 08 Sep '09

08 Sep '09

>From 7a2202539b6445017c420644e5327ce64eaf3bac Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 17:27:34 +0200 Subject: [PATCH 1/2] domain_conf.c: remove two dead stores * src/domain_conf.c (virDomainSaveXML): Remove use and decl of "err". (virDomainDefParseXML): Likewise. --- src/domain_conf.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/domain_conf.c b/src/domain_conf.c index 8dde5dd..050cf50 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -2520,8 +2520,7 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn, /* Extract domain uuid */ tmp = virXPathString(conn, "string(./uuid[1])", ctxt); if (!tmp) { - int err; - if ((err = virUUIDGenerate(def->uuid))) { + if (virUUIDGenerate(def->uuid)) { virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to generate UUID")); goto error; @@ -4456,12 +4455,11 @@ int virDomainSaveXML(virConnectPtr conn, char *configFile = NULL; int fd = -1, ret = -1; size_t towrite; - int err; if ((configFile = virDomainConfigFile(conn, configDir, def->name)) == NULL) goto cleanup; - if ((err = virFileMakePath(configDir))) { + if (virFileMakePath(configDir)) { virReportSystemError(conn, errno, _("cannot create config directory '%s'"), configDir); -- 1.6.4.2.409.g85dc3 >From 89e2837b4382690e4d434c086541da1dcd3d4c58 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 4 Sep 2009 18:53:20 +0200 Subject: [PATCH 2/2] util.c: avoid dead store to "flag" * src/util.c (virExecDaemonize): Change flag |= VAR to "flag | VAR". --- src/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util.c b/src/util.c index 2529837..af50028 100644 --- a/src/util.c +++ b/src/util.c @@ -663,7 +663,7 @@ int virExecDaemonize(virConnectPtr conn, ret = virExecWithHook(conn, argv, envp, keepfd, retpid, infd, outfd, errfd, - flags |= VIR_EXEC_DAEMON, + flags | VIR_EXEC_DAEMON, hook, data, pidfile); /* __virExec should have set an error */ -- 1.6.4.2.409.g85dc3

2 1

Re: [libvirt] [PATCH 0/6] sVirt AppArmor security driver
by Daniel Veillard 08 Sep '09

08 Sep '09

[ Sending again as my mail Sat, Sep 05, 2009 at 11:00:46AM +0200 didn't seem to have reach the list, Daniel ] On Fri, Sep 04, 2009 at 04:03:50PM -0500, Jamie Strandboge wrote: > On Fri, 04 Sep 2009, Daniel Veillard wrote: > > > On Fri, Sep 04, 2009 at 12:23:33PM -0500, Jamie Strandboge wrote: > > > This patch series implements the AppArmor security driver for sVirt. > > > This implementation was developed for the Ubuntu AppArmorLibvirtProfile > > > specification[1], but is general enough for any AppArmor deployment > > > (such as Ubuntu, *SUSE and Mandriva). > > > > > > This patch has seen quite a bit of real world testing in Ubuntu 9.10 > > > (our development release) in our 0.7.0-1ubuntu3 package. I did make a > > > few small changes after going through HACKING, but mostly I got the > > > tests going and added documentation. > > > > Could you triple check that the make syntax-check run clean with > > your patches applied, because a very quick glimpse shows up a number > > of malloc() which we don't allow for example. It may be because you > > didn't enter the files in the SCM but the checks should be done anyway > > on the new files please. > > > > I noticed that syntax-check wouldn't scan the new files unless I did a > git commit first. I did not run 'syntax-check' after adding the > documention examples, and just found that examples/apparmor/libvirt-qemu > had a trailing blank line (I was a bit surprised syntax-check checked > these files (attached is an updated docs patch)). okay > I can demonstrate that the files are being checked by removing the > '#include <config.h>' line in security_apparmor.c and virt-aa-helper.c > and syntax-check failing: [...] > I don't see that 'syntax-check' enforces not using *alloc, but I did > read in HACKING that *alloc are deprecated, though I had already written > the code before reading it. I do see other examples of *alloc in the I really though all cases of direct malloc or realloc had been eliminated, apparently it's not the case yet, and syntax-check doesn't enforce it... we need to do this. I note we also still have a few free() left around in the code base to cleanup too. > codebase, and I do properly check the return code of all calls to *alloc. > If you insist on those calls being replaced, I can do that, but I didn't > before submitting because I knew the current calls were correct and > didn't want to introduce bugs into the code. yeah, I think it's better to fix them before. In any case we have a week of bug fix only before the next release in a week, so best is to fix them now, wait for the actual reviews and then resubmit patches for inclusion. thanks, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Some close/fclose/closedir calls are missing
by Matthias Bolte 08 Sep '09

08 Sep '09

While debugging something that looked like an file descriptor leak, we (Maximilian Wilhelm and me) found some places where close/fclose/closedir calls are missing, mostly in error handling if-branches. See attached patch. Max and Matthias

3 2

[libvirt] [PATCH 0/6] sVirt AppArmor security driver
by Jamie Strandboge 08 Sep '09

08 Sep '09

This patch series implements the AppArmor security driver for sVirt. This implementation was developed for the Ubuntu AppArmorLibvirtProfile specification[1], but is general enough for any AppArmor deployment (such as Ubuntu, *SUSE and Mandriva). This patch has seen quite a bit of real world testing in Ubuntu 9.10 (our development release) in our 0.7.0-1ubuntu3 package. I did make a few small changes after going through HACKING, but mostly I got the tests going and added documentation. DESIGN ------ When a virtual machine is started, determine if a profile is currently defined for the machine, and use it if available. If not, generate a new profile for the machine based on a template, which is by default a very restrictive profile allowing access to disk files, and anything else needed to run, such as the pid, monitor and log files. Virtual machines should have a unique profile specific to that machine. To ensure uniqueness, the profile name will be derived from the UUID of the virtual machine. These profiles should be configurable, either by adjusting the profile template for new machines, creating/modifying the VM profile directly or through the use of AppArmor abstractions. This will allow for administrators to fine-tune confinement for individual machines if desired. If enabled at compile time, the sVirt security model will be activated if AppArmor is available on the host OS and a profile for the libvirtd daemon is loaded when libvirtd is started. libvirtd should not be allowed to create arbitrary profiles or modify profiles directly, so as to not allow libvirtd to potentially (ie via a security bug in libvirtd itself) bootstrap out of AppArmor confinement. Because root privileges are needed to manipulate AppArmor profiles, qemu:///session will not be supported at this time, but the implementation must allow for a confined libvirtd with qemu:///session guests running unconfined. This can be revisited when AppArmor supports per-user profiles. Please see the specification[1] for more details. PATCHES ------- The patches are all against trunk as of yesterday. Testing was done on trunk and there seem to be no regressions over the the 0.7.0-1ubuntu3 package in Ubuntu. [PATCH 1*] patch_1a_reenable-nonfile-labels.patch: When James Morris originally submitted his sVirt patches (as seen in libvirt 0.6.1), he did not require on disk labelling for virSecurityDomainRestoreImageLabel. A later commit[2] changed this behavior to assume on disk labelling, which halts implementations for path-based MAC systems such as AppArmor and TOMOYO where vm->def->seclabel is required to obtain the label. This patch simply adds the 'virDomainObjPtr vm' argument back to *RestoreImageLabel. patch_1b_optional.patch: Due to the above change, 'make syntax-check' fails because SELinuxRestoreSecurityImageLabel() does not use the 'virDomainObjPtr vm'. patch_1b_optional.patch is a simple patch to fix this by checking if vm->def->seclabel == NULL and returns with error if it does. I realize this may not be desired in the long term, but it should be harmless enough to include. [PATCH 2] patch_2_security_c.patch: Updates src/security.c for AppArmor [PATCH 3] patch_3_security_apparmor.patch: Adds security_apparmor.c, security_apparmor.h, virt-aa-helper.c and updates po/POTFILES.in. virt-aa-helper.c is a new binary which is used exclusively by the AppArmor security driver to manipulate AppArmor. These files compile without warning and pass syntax-check. [PATCH 4] patch_4_tests.patch: Adds tests for virt-aa-helper and the security driver. secaatest.c is identical to seclabeltest.c except it initializes the 'apparmor' driver instead of 'selinux'. These tests are integrated into 'make check' and pass. [PATCH 5] patch_5_docs.patch: Updates docs/drvqemu.html.in for AppArmor and adds profile examples to examples/apparmor. [PATCH 6] patch_6_autoconf.patch: Updates Makefile.am and configure.in for AppArmor. It is based on and should operate the same as the SELinux configuration. Caveats and known issues: 1. it does not take advantage of the recent host device labelling functionality yet 2. it does not properly handle hot-plugging of devices yet 3. qemu:///session runs unconfined (see above) Thanks! Jamie (jdstrand on Freenode and OFTC) [1] https://wiki.ubuntu.com/SecurityTeam/Specifications/AppArmorLibvirtProfile [2] http://libvirt.org/git/?p=libvirt.git;a=commit;h=c86afc85ee0d1ec6d76c2d254b… -- Jamie Strandboge | http://www.canonical.com

3 10

[libvirt] [PATCH 0/6] Automatic sVirt management of host device labelling
by Daniel P. Berrange 07 Sep '09

07 Sep '09

This patch series extends the libvirt security driver API, and sVirt implementation to cover management of host device labelling. Previously users would have to set a global boolean tunable virt_use_pci/usb to allow all domains access to all host devices. With this series applied libvirt will automatically relabel only the individual PCI/USB devices which are assigned to a guest. ie it should make host device assignment 'just work' when sVirt is enforcing, and improve security It also attempts to address a problem with restoration of disk labels. The current code uses matchpathcon() to find the defalt label for a path. This works fine for locations which have a defined label in the policy (eg like /var/lib/libvirt/images), but if storing disk images in non-defualt locations, eg a external USB drive mounted under a place like /media/myusbdisk/virtual-images/, matchpathcon() returns NULL. In this scenario the disk would remain labelled with the MCS level specific to the just stopped VM. Since MCS labels are allocated on demand on each boot, this could allow a future VMs to access disks that it ought not to be able to. Dan Walsh suggested that we default to using the label defined for matchpathcon("/var/libvirt/images/00-DEFAULT") in this case, but this doesn't work for restoring USB/PCI device labels[1]. In all the case I've had this problem so far, the files' original label matched that of the directory it was contained in, so this patch just uses the containing directory's label when restoring labels. Dan didn't like this idea when I first mentioned it in IRC though, so perhaps I need to implement different logic still... ? Regards, Daniel [1] PCI device access from VMs requires labelling /sys/bus/pci/devices/$DOMAIN:$BUS:$SLOT:FUNCTION/{config, resource*, rom} while USB device access requires labelling /dev/bus/usb/$BUS/$DEVICE

5 18