- Devel - libvirt List Archives

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 09 Apr '13

09 Apr '13

While this update doesn't address any reported problems in libvirt, doing a post-release update to latest gnulib makes it easier to stay in sync with best upstream practices. * .gnulib: Update to latest. * bootstrap: Resynchronize. --- Here's what changed in gnulib: * .gnulib 819b1c3...076ac82 (58): > stdalign: doc fix > stdalign: port to stricter ISO C11 > sys_select, sys_time: port 2013-01-30 Solaris 2.6 fix to Cygwin > check for (erroneous) ftp-upload.gnu.org > copy-file, rpmatch: fix problems found by cppcheck > prefix-gnulib-mk: give better diagnostics > putenv: port to Solaris 10 > mktime: fix configure typo > regex-tests: skip UTF-8 test on mingw > tests: make it easier to bypass alarm time in debugger > regex: port to mingw's recent addition of undeclared alarm > putenv: avoid compilation warning on mingw > unistd: don't prevent Tru64 Unix from using gnulib strtod. > autoupdate > vasprintf-posix-tests: allow rounding 1.51 to 1. > vasprintf-posix-tests: allow rounding 1.5 to 1. > autoupdate > vasnprintf-posix-tests: allow rounding 1.5 to 1 > bootstrap: port to FreeBSD > regex: rename remaining __attribute calls to __attribute__. > execute: Revert last change, but use a different condition. > execute: drop dead code > non-recursive-gnulib-prefix-hack: port coreutils 8.21 to HP NonStop > test-getsockopt: avoid compiler warning > sys_types: Avoid autoconf warning about gl_SYS_TYPES_H. > gettext: Update to version 0.18.2. > maint: restore gendocs.sh execute bit > regex: merge patches from libc > putenv: port better to native Windows > regex: ignore old-style-definition warnings > getcwd: support coreutils better > * lib/strtod.c (HAVE_RAW_DECL_STRTOD): Remove; no longer used. > strtod: support coreutils better > mountlist: port to HP NonStop > Fix typo in stdnoreturn documentation. > extern-inline: avoid compilation error with HP-UX cc > putenv: fix heap corruption with mixed putenv/_putenv > autoupdate > autoupdate > unsetenv etc.: port to Solaris 11 + GNU Emacs > secure_getenv: fix C++ declaration typo > careadlinkat: stop exporting careadlinkatcwd > extensions: port better to HP-UX > openpty: fix bug where HAVE_OPENPTY is mistakenly 1 > maint: fix misspelling of MINIX in ChangeLog > secure_getenv: fix include typo > secure_getenv: port better to FreeBSD and Solaris > extensions: port better to MINUX 3, HP-UX, autoheader 2.62 > unistd: avoid namespace pollution on non-glibc systems > autoupdate > tmpdir: use secure_getenv > tempname: use secure_getenv > secure_getenv: new module > autoupdate > getcwd: break fdopendir + save_cwd recursive loop (Bug#13516) > regex-tests, regex: fix bug: memset undeclared > regex-tests: fix link errors on older Solaris > update from texinfo .gnulib | 2 +- bootstrap | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index 819b1c3..076ac82 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 819b1c38b9abd94d7d1ca2a77bbe16053b75029c +Subproject commit 076ac82d1d7f4df54630f1b4917b3c14f227f032 diff --git a/bootstrap b/bootstrap index bee7765..96f1e76 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2013-01-20.16; # UTC +scriptversion=2013-03-08.16; # UTC # Bootstrap this package from checked-out sources. @@ -630,9 +630,13 @@ esac if $bootstrap_sync; then cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { echo "$0: updating bootstrap and restarting..." + case $(sh -c 'echo "$1"' -- a) in + a) ignored=--;; + *) ignored=ignored;; + esac exec sh -c \ 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ - -- "$GNULIB_SRCDIR/build-aux/bootstrap" \ + $ignored "$GNULIB_SRCDIR/build-aux/bootstrap" \ "$0" "$@" --no-bootstrap-sync } fi -- 1.8.1.4

2 3

[libvirt] [PATCH] Fix crash in virNetDevGetVirtualFunctions
by Laine Stump 09 Apr '13

09 Apr '13

Commit 9a3ff01d7f16cc280ce3176620c0714f55511a65 (which was ACKed at the end of January, but for some reason didn't get pushed until during the 1.0.4 freeze) fixed the logic in virPCIGetVirtualFunctions(). Unfortunately, a typo in the fix (replacing VIR_REALLOC_N with VIR_ALLOC_N during code movement) caused not only a memory leak, but also resulted in most of the elements of the result array being replaced with NULL. virNetDevGetVirtualFunctions() assumed (and I think rightly so) that virPCIGetVirtualFunctions() wouldn't return any NULL elements in the array, so it ended up segfaulting. This was found when attempting to use a virtual network with an auto-created pool of SRIOV VFs, e.g.: <forward mode='hostdev' managed='yes'> <pf dev='eth4'/> </forward> (the pool of PCI addresses is discovered by calling virNetDevGetVirtualFunctions() on the PF dev). --- src/util/virpci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index a0da1cd..85cd694 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2026,8 +2026,8 @@ virPCIGetVirtualFunctions(const char *sysfs_path, continue; } - if (VIR_ALLOC_N(*virtual_functions, - *num_virtual_functions + 1) < 0) { + if (VIR_REALLOC_N(*virtual_functions, + *num_virtual_functions + 1) < 0) { virReportOOMError(); VIR_FREE(config_addr); goto error; -- 1.7.11.7

2 4

[libvirt] [PATCHv3 0/6] Fix memory corruption/crash in the connection close callback
by Peter Krempa 09 Apr '13

09 Apr '13

This series fixes the crash resulting from a race condition in the connection close callback. To observe the crash apply the first patch only. To verify that the patchset fixes the crash please apply all but 2/6 and verify using virsh. 2/6 fixes the crash in a redundant way in case the close callback is used. In the case it isn't 2/6 itself can't fix the issue. For a better explanation of this problem please see the description in 6/6. Peter Krempa (4): DO NOT APPLY UPSTREAM: Close callback race corruption crash reproducer. virsh: Move cmdConnect from virsh-host.c to virsh.c virsh: Register and unregister the close callback also in cmdConnect rpc: Fix connection close callback race condition and memory corruption/crash Viktor Mihajlovski (2): libvirt: Increase connection reference count for callbacks virsh: Unregister the connection close notifier upon termination src/datatypes.c | 55 ++++++++++++++++++++---- src/datatypes.h | 22 +++++++--- src/libvirt.c | 30 ++++++++----- src/remote/remote_driver.c | 62 ++++++++++++++++----------- src/rpc/virnetclient.c | 9 +++- tools/virsh-host.c | 67 ----------------------------- tools/virsh.c | 102 ++++++++++++++++++++++++++++++++++++++++++--- 7 files changed, 225 insertions(+), 122 deletions(-) -- 1.8.1.5

3 24

[libvirt] [PATCH] docs: use MiB/s instead of Mbps for migration speed
by Ján Tomko 09 Apr '13

09 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=948821 --- src/libvirt.c | 24 ++++++++++++------------ tools/virsh.pod | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index cef9f1f..c5221f5 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -5116,7 +5116,7 @@ virDomainMigrateDirect(virDomainPtr domain, * @flags: bitwise-OR of virDomainMigrateFlags * @dname: (optional) rename domain to this at destination * @uri: (optional) dest hostname/URI as seen from the source host - * @bandwidth: (optional) specify migration bandwidth limit in Mbps + * @bandwidth: (optional) specify migration bandwidth limit in MiB/s * * Migrate the domain object from its current host to the destination * host given by dconn (a connection to the destination host). @@ -5169,7 +5169,7 @@ virDomainMigrateDirect(virDomainPtr domain, * URI if the destination host has multiple interfaces and a * specific interface is required to transmit migration data. * - * The maximum bandwidth (in Mbps) that will be used to do migration + * The maximum bandwidth (in MiB/s) that will be used to do migration * can be specified with the bandwidth parameter. If set to 0, * libvirt will choose a suitable default. Some hypervisors do * not support this feature and will return an error if bandwidth @@ -5343,7 +5343,7 @@ error: * @dxml: (optional) XML config for launching guest on target * @dname: (optional) rename domain to this at destination * @uri: (optional) dest hostname/URI as seen from the source host - * @bandwidth: (optional) specify migration bandwidth limit in Mbps + * @bandwidth: (optional) specify migration bandwidth limit in MiB/s * * Migrate the domain object from its current host to the destination * host given by dconn (a connection to the destination host). @@ -5396,7 +5396,7 @@ error: * URI if the destination host has multiple interfaces and a * specific interface is required to transmit migration data. * - * The maximum bandwidth (in Mbps) that will be used to do migration + * The maximum bandwidth (in MiB/s) that will be used to do migration * can be specified with the bandwidth parameter. If set to 0, * libvirt will choose a suitable default. Some hypervisors do * not support this feature and will return an error if bandwidth @@ -5588,7 +5588,7 @@ error: * @duri: mandatory URI for the destination host * @flags: bitwise-OR of virDomainMigrateFlags * @dname: (optional) rename domain to this at destination - * @bandwidth: (optional) specify migration bandwidth limit in Mbps + * @bandwidth: (optional) specify migration bandwidth limit in MiB/s * * Migrate the domain object from its current host to the destination * host given by duri. @@ -5637,7 +5637,7 @@ error: * renaming is not supported by the hypervisor, dname must be NULL or * else an error will be returned. * - * The maximum bandwidth (in Mbps) that will be used to do migration + * The maximum bandwidth (in MiB/s) that will be used to do migration * can be specified with the bandwidth parameter. If set to 0, * libvirt will choose a suitable default. Some hypervisors do * not support this feature and will return an error if bandwidth @@ -5740,7 +5740,7 @@ error: * @dxml: (optional) XML config for launching guest on target * @flags: bitwise-OR of virDomainMigrateFlags * @dname: (optional) rename domain to this at destination - * @bandwidth: (optional) specify migration bandwidth limit in Mbps + * @bandwidth: (optional) specify migration bandwidth limit in MiB/s * * Migrate the domain object from its current host to the destination * host given by duri. @@ -5799,7 +5799,7 @@ error: * renaming is not supported by the hypervisor, dname must be NULL or * else an error will be returned. * - * The maximum bandwidth (in Mbps) that will be used to do migration + * The maximum bandwidth (in MiB/s) that will be used to do migration * can be specified with the bandwidth parameter. If set to 0, * libvirt will choose a suitable default. Some hypervisors do * not support this feature and will return an error if bandwidth @@ -17702,10 +17702,10 @@ error: /** * virDomainMigrateSetMaxSpeed: * @domain: a domain object - * @bandwidth: migration bandwidth limit in Mbps + * @bandwidth: migration bandwidth limit in MiB/s * @flags: extra flags; not used yet, so callers should always pass 0 * - * The maximum bandwidth (in Mbps) that will be used to do migration + * The maximum bandwidth (in MiB/s) that will be used to do migration * can be specified with the bandwidth parameter. Not all hypervisors * will support a bandwidth cap * @@ -17749,10 +17749,10 @@ error: /** * virDomainMigrateGetMaxSpeed: * @domain: a domain object - * @bandwidth: return value of current migration bandwidth limit in Mbps + * @bandwidth: return value of current migration bandwidth limit in MiB/s * @flags: extra flags; not used yet, so callers should always pass 0 * - * Get the current maximum bandwidth (in Mbps) that will be used if the + * Get the current maximum bandwidth (in MiB/s) that will be used if the * domain is migrated. Not all hypervisors will support a bandwidth limit. * * Returns 0 in case of success, -1 otherwise. diff --git a/tools/virsh.pod b/tools/virsh.pod index 89467f6..1510d0d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1154,12 +1154,12 @@ obtained from domjobinfo. =item B<migrate-setspeed> I<domain> I<bandwidth> -Set the maximum migration bandwidth (in Mbps) for a domain which is being +Set the maximum migration bandwidth (in MiB/s) for a domain which is being migrated to another host. =item B<migrate-getspeed> I<domain> -Get the maximum migration bandwidth (in Mbps) for a domain. +Get the maximum migration bandwidth (in MiB/s) for a domain. =item B<numatune> I<domain> [I<--mode> B<mode>] [I<--nodeset> B<nodeset>] [[I<--config>] [I<--live>] | [I<--current>]] -- 1.8.1.5

2 2

[libvirt] [PATCH 0/3] Un-break s390 default network model and clean up obsolete
by Peter Krempa 09 Apr '13

09 Apr '13

This series fixes the default network model for s390 that was broken by the recent addition of post parse close callbacks and cleans up code obsoleted by that addition. Peter Krempa (2): qemu: Clean up network device CLI generator qemu: Remove now obsolete assignment of default netwokr card model for s390 hosts Viktor Mihajlovski (1): qemu: Use correct default model on s390 src/qemu/qemu_command.c | 24 +++++++----------------- src/qemu/qemu_domain.c | 12 +++++++++--- 2 files changed, 16 insertions(+), 20 deletions(-) -- 1.8.1.5

3 12

[libvirt] [PATCH] Tweak EOF handling of streams
by Daniel P. Berrange 09 Apr '13

09 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Typically when you get EOF on a stream, poll will return POLLIN|POLLHUP at the same time. Thus when we deal with stream reads, if we see EOF during the read, we can then clear the VIR_STREAM_EVENT_HANGUP & VIR_STREAM_EVENT_ERROR event bits. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/stream.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/daemon/stream.c b/daemon/stream.c index 4df1145..0fb5c85 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -148,6 +148,14 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque) virNetServerClientClose(client); goto cleanup; } + /* If we detected EOF during read processing, + * then clear hangup/error conditions, since + * we want the client to see the EOF message + * we just sent them + */ + if (stream->recvEOF) + events = events & ~(VIR_STREAM_EVENT_HANGUP | + VIR_STREAM_EVENT_ERROR); } /* If we have a completion/abort message, always process it */ -- 1.8.1.4

2 2

[libvirt] virsh list hangs
by wangxiaojun 09 Apr '13

09 Apr '13

please help me, i just installed libvirt-git and qemu-git to my gentoo os. when i start libvirtd, then type virsh list , it has no response. hangs forever. following is my typed cmd: $>LIBVIRT_DEBUG=1 libvirtd .................. 2013-04-09 08:39:03.649+0000: 17021: debug : virFileClose:72 : Closed fd 19 2013-04-09 08:39:03.649+0000: 17021: debug : virFileClose:72 : Closed fd 21 2013-04-09 08:39:03.649+0000: 17021: debug : virArchFromHost:174 : Mapped x86_64 to 28 (x86_64) 2013-04-09 08:39:03.649+0000: 17021: debug : virArchFromHost:174 : Mapped x86_64 to 28 (x86_64) 2013-04-09 08:39:03.649+0000: 17021: debug : virArchFromHost:174 : Mapped x86_64 to 28 (x86_64) 2013-04-09 08:39:03.649+0000: 17021: debug : virArchFromHost:174 : Mapped x86_64 to 28 (x86_64) 2013-04-09 08:39:03.649+0000: 17021: debug : virArchFromHost:174 : Mapped x86_64 to 28 (x86_64) 2013-04-09 08:39:03.649+0000: 17021: debug : virArchFromHost:174 : Mapped x86_64 to 28 (x86_64) 2013-04-09 08:39:03.649+0000: 17021: debug : virQEMUCapsCacheLookup:2620 : Creating capabilities for /usr/bin/qemu-system-x86_64 2013-04-09 08:39:03.649+0000: 17021: debug : virObjectNew:201 : OBJECT_NEW: obj=0x7fa398095cd0 classname=virQEMUCaps 2013-04-09 08:39:03.649+0000: 17021: debug : virQEMUCapsInitQMP:2357 : Try to get caps via QMP qemuCaps=0x7fa398095cd0 2013-04-09 08:39:03.649+0000: 17021: debug : virCommandRunAsync:2205 : About to run LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.7.2:/opt/nvidia-cg-toolkit/bin:/opt/cuda/bin HOME=/root USER=root LOGNAME=root /usr/bin/qemu-system-x86_64 -S -no-user-config -nodefaults -nographic -M none -qmp unix:/var/lib/libvirt/qemu/capabilities.monitor.sock,server,nowait -pidfile /var/lib/libvirt/qemu/capabilities.pidfile -daemonize 2013-04-09 08:39:03.650+0000: 17021: debug : virFileClose:72 : Closed fd 18 2013-04-09 08:39:03.650+0000: 17021: debug : virFileClose:72 : Closed fd 20 2013-04-09 08:39:03.650+0000: 17021: debug : virFileClose:72 : Closed fd 22 2013-04-09 08:39:03.650+0000: 17021: debug : virCommandRunAsync:2210 : Command result 0, with PID 17095 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 3 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 4 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 5 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 6 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 7 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 8 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 9 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 10 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 11 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 12 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 13 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 14 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 15 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 16 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 17 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 19 2013-04-09 08:39:03.650+0000: 17095: debug : virFileClose:72 : Closed fd 21 In another terminal i type : $>gdb virsh GNU gdb (Gentoo 7.5.1 vanilla) 7.5.1 Copyright (C) 2012 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-pc-linux-gnu". For bug reporting instructions, please see: <http://bugs.gentoo.org/>... Reading symbols from /usr/bin/virsh...done. (gdb) run -c qemu:///system Starting program: /usr/bin/virsh -c qemu:///system warning: no loadable sections found in added symbol-file system-supplied DSO at 0x7ffff7ffa000 warning: Could not load shared library symbols for linux-vdso.so.1. Do you need "set solib-search-path" or "set sysroot"? [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". [New Thread 0x7fffeffcf700 (LWP 17555)] Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # list ^C (hangs there..... ) Program received signal SIGINT, Interrupt. 0x00007ffff428691d in poll () from /lib64/libc.so.6 (gdb) bt #0 0x00007ffff428691d in poll () from /lib64/libc.so.6 #1 0x00007ffff7a32918 in virNetClientIOEventLoop (client=0x55555587a1c0, thiscall=0x55555587a150) at rpc/virnetclient.c:1527 #2 0x00007ffff7a33203 in virNetClientIO (client=0x55555587a1c0, thiscall=0x55555587a150) at rpc/virnetclient.c:1799 #3 0x00007ffff7a33af7 in virNetClientSendInternal (client=0x55555587a1c0, msg=0x55555587a9d0, expectReply=true, nonBlock=false) at rpc/virnetclient.c:1975 #4 0x00007ffff7a33b8b in virNetClientSendWithReply (client=0x55555587a1c0, msg=0x55555587a9d0) at rpc/virnetclient.c:2003 #5 0x00007ffff7a34a86 in virNetClientProgramCall (prog=0x55555587a440, client=0x55555587a1c0, serial=0, proc=66, noutfds=0, outfds=0x0, ninfds=0x0, infds=0x0, args_filter=0x7ffff42be510 <xdr_void>, args=0x0, ret_filter=0x7ffff7a277ba <xdr_remote_auth_list_ret>, ret=0x7fffffffd580) at rpc/virnetclientprogram.c:331 #6 0x00007ffff7a1da27 in callFull (conn=0x555555858610, priv=0x555555879cb0, flags=0, fdin=0x0, fdinlen=0, fdout=0x0, fdoutlen=0x0, proc_nr=66, args_filter=0x7ffff42be510 <xdr_void>, args=0x0, ret_filter=0x7ffff7a277ba <xdr_remote_auth_list_ret>, ret=0x7fffffffd580 "") at remote/remote_driver.c:5604 #7 0x00007ffff7a1daf4 in call (conn=0x555555858610, priv=0x555555879cb0, flags=0, proc_nr=66, args_filter=0x7ffff42be510 <xdr_void>, args=0x0, ret_filter=0x7ffff7a277ba <xdr_remote_auth_list_ret>, ret=0x7fffffffd580 "") at remote/remote_driver.c:5626 #8 0x00007ffff7a09618 in remoteAuthenticate (conn=0x555555858610, priv=0x555555879cb0, auth=0x7ffff7dd4640 <virConnectAuthDefault>, authtype=0x0) at remote/remote_driver.c:3483 #9 0x00007ffff7a029c2 in doRemoteOpen (conn=0x555555858610, priv=0x555555879cb0, auth=0x7ffff7dd4640 <virConnectAuthDefault>, flags=0) at remote/remote_driver.c:799 #10 0x00007ffff7a03302 in remoteOpen (conn=0x555555858610, auth=0x7ffff7dd4640 <virConnectAuthDefault>, flags=0) at remote/remote_driver.c:997 #11 0x00007ffff79b5a0a in do_open (name=0x555555850780 "qemu:///system", auth=0x7ffff7dd4640 <virConnectAuthDefault>, flags=0) at libvirt.c:1201 #12 0x00007ffff79b648e in virConnectOpenAuth (name=0x555555850780 "qemu:///system", auth=0x7ffff7dd4640 <virConnectAuthDefault>, flags=0) at libvirt.c:1441 #13 0x0000555555574975 in vshReconnect (ctl=0x7fffffffd9b0) at virsh.c:338 #14 0x0000555555577d48 in vshCommandRun (ctl=0x7fffffffd9b0, cmd=0x55555586a400) at virsh.c:1748 #15 0x000055555557b4c6 in main (argc=3, argv=0x7fffffffdb48) at virsh.c:3222 (gdb)

1 0

[libvirt] fail to convert qemu xml to args with libvirt-1.0.4: An error occurred, but the cause is unknown
by Yin Olivia-R63875 09 Apr '13

09 Apr '13

Hi, I used to convert qemu XML to args with libvirt-1.0.3. But it failed to convert with libvirt-1.0.4. # virsh domxml-to-native qemu-argv test.xml >test.sh error: An error occurred, but the cause is unknown Comparing the debug file as below: 1) lbvirt-1.0.3 <cut> 2013-04-09 03:23:47.296+0000: 2669: debug : virEventPollInterruptLocked:716 : Interrupting 2013-04-09 03:23:47.296+0000: 2669: debug : virNetClientIO:1807 : All done with our call head=(nil) call=0x100871c0 rv=0 2013-04-09 03:23:47.297+0000: 2670: debug : virEventPollRunOnce:640 : Poll got 1 event(s) 2013-04-09 03:23:47.297+0000: 2670: debug : virEventPollDispatchTimeouts:425 : Dispatch 0 2013-04-09 03:23:47.297+0000: 2669: debug : virNetMessageFree:73 : msg=0x10087500 nfds=0 cb=(nil) 2013-04-09 03:23:47.297+0000: 2670: debug : virEventPollDispatchHandles:470 : Dispatch 1 2013-04-09 03:23:47.297+0000: 2670: debug : virEventPollDispatchHandles:484 : i=0 w=1 2013-04-09 03:23:47.297+0000: 2669: debug : virConnectClose:1483 : conn=0x100878b8 <cut> 2) libvirt-1.0.4 <cut> 2013-04-09 03:07:58.012+0000: 2834: debug : virEventPollInterruptLocked:716 : Interrupting 2013-04-09 03:07:58.012+0000: 2834: debug : virNetClientIO:1810 : All done with our call head=(nil) call=0x10089db8 rv=0 2013-04-09 03:07:58.012+0000: 2835: debug : virEventPollRunOnce:640 : Poll got 1 event(s) 2013-04-09 03:07:58.012+0000: 2835: debug : virEventPollDispatchTimeouts:425 : Dispatch 0 2013-04-09 03:07:58.012+0000: 2834: error : virNetClientProgramDispatchError:175 : An error occurred, but the cause is unknown 2013-04-09 03:07:58.012+0000: 2835: debug : virEventPollDispatchHandles:470 : Dispatch 1 2013-04-09 03:07:58.012+0000: 2834: debug : virNetMessageFree:73 : msg=0x1008a0f8 nfds=0 cb=(nil) 2013-04-09 03:07:58.012+0000: 2835: debug : virEventPollDispatchHandles:484 : i=0 w=1 2013-04-09 03:07:58.012+0000: 2835: debug : virEventPollDispatchHandles:498 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2013-04-09 03:07:58.012+0000: 2835: debug : virEventPollCleanupTimeouts:516 : Cleanup 0 2013-04-09 03:07:58.013+0000: 2835: debug : virEventPollCleanupTimeouts:552 : Found 0 out of 0 timeout slots used, releasing 0 2013-04-09 03:07:58.013+0000: 2835: debug : virEventPollCleanupHandles:564 : Cleanup 2 2013-04-09 03:07:58.013+0000: 2834: debug : virConnectClose:1483 : conn=0x1008a4b0 <cut> How can I debug this cause unknown error? Best Regards, Olivia

1 0

[libvirt] [PATCH] sanlock: add missing test command in virt-sanlock-cleanup.in
by Alex Jia 09 Apr '13

09 Apr '13

RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=949483 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- In fact, the virt-sanlock-cleanup works well on RHEL6.4, but doesn't work on RHEL7.0, and got a error "line 14: x: command not found", It may be different bash version issue. tools/virt-sanlock-cleanup.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virt-sanlock-cleanup.in b/tools/virt-sanlock-cleanup.in index a9b7c2e..5389fc7 100644 --- a/tools/virt-sanlock-cleanup.in +++ b/tools/virt-sanlock-cleanup.in @@ -11,7 +11,7 @@ fi LOCKSPACE="__LIBVIRT__DISKS__" LOCKDIR=`augtool print '/files@sysconfdir@/libvirt/qemu-sanlock.conf/disk_lease_dir'` -if test $? != 0 || "x$LOCKDIR" = "x" ; then +if test $? != 0 || test "x$LOCKDIR" = "x" ; then LOCKDIR="@localstatedir@/lib/libvirt/sanlock" fi -- 1.7.1

2 2

[libvirt] remote connection issue 'virsh -c qemu+ssh:///root@localhost/system list'
by Yin Olivia-R63875 09 Apr '13

09 Apr '13

Hi, I'm trying remote connection with qemu hypervisor on FSL PPC board. The libvirt server is the PPC board. root@ppc:~# ifconfig eth0 10.193.20.109 root@ppc:~# libvirtd -d root@ppc:~# virsh -c qemu:///system define test.xml root@ppc:~# virsh -c qemu:///system start test root@ppc:~# virsh -c qemu:///system list --all Id Name State ---------------------------------------------------- 2 test running Connect from an X86 PC (Ubuntu 10.04) to the PPC board. user@x86:~$ virsh -c qemu+ssh://root@10.193.20.109/system list --all The authenticity of host '10.193.20.109 (10.193.20.109)' can't be established. RSA key fingerprint is 2f:56:07:08:da:7d:ac:41:45:57:d2:12:15:19:67:e0. Are you sure you want to continue connecting (yes/no)? yes root(a)10.193.20.109's password: error: failed to connect to the hypervisor error: End of file while reading data: Warning: Permanently added '10.193.20.109' (RSA) to the list of known hosts. nc: invalid option -- 'U' BusyBox v1.19.4 (2013-03-08 13:08:18 CST) multi-call binary. Usage: nc [-iN] [-wN] [-l] [-p PORT] [-f FILE|IPADDR PORT] [-e PROG]: Input/output error I tried to verify the remote connection on localhost. But it also failed as below: root@mpc8572ds:~# virsh -c qemu+ssh:///root@localhost/system list --all root@localhost's password: error: failed to connect to the hypervisor error: End of file while reading data: nc: invalid option -- 'U' BusyBox v1.19.4 (2013-03-08 13:08:18 CST) multi-call binary. Usage: nc [-iN] [-wN] [-l] [-p PORT] [-f FILE|IPADDR PORT] [-e PROG]: Input/output error Could anyone give suggestion on this issue? Best Regards, Olivia

2 3

[libvirt] images on NFS do not have MCS when selinux is on
by yue 08 Apr '13

08 Apr '13

hi,all i now test selinux(enforcing). i assign a nfs-image to a VM, then start it. at the beginning i set virt_use_nfs on, its image does not has a MCS corresponding to qemu-kvm process's MCS then i remount nfs with -o context="system_u:object_r:virt_image_t:s0" , restart VM, its image does not has a corresponding MCS. #ls -lZ ####system_u:object_r:virt_image_t:s0 803003d2-3a2b-4581-a7cb-dc7fac06e7af why this happen? if this is right for NFS? thanks

2 1

[libvirt] We've been accepted to Google Summer of Code 2013
by Stefan Hajnoczi 08 Apr '13

08 Apr '13

Good news! QEMU.org has been accepted to Google Summer of Code 2013. This means students can begin considering our list of QEMU, kvm kernel module, and libvirt project ideas: http://qemu-project.org/Google_Summer_of_Code_2013 Student applications open April 22 at 19:00 UTC. You can already view the application template here: http://www.google-melange.com/gsoc/org/google/gsoc2013/qemu If you are an interested student, please take a look at the project ideas and get in touch with the mentor for that project. They can help clarify the scope of the project and what skills are necessary. You are invited to join the #qemu-gsoc IRC channel on irc.oftc.net where questions about Google Summer of Code with QEMU.org are welcome. Stefan

1 0

[libvirt] [PATCH] Generate RFC4122 compliant UUIDs
by Milos Vyletel 08 Apr '13

08 Apr '13

Even though http://libvirt.org/formatdomain.html#elementsMetadata states that it requires RFC4122 compliance UUIDs that are generated by virUUIDGenerate() are not. Neither does virUUIDIsValid() check for RFC4122 compliance. Following patch modifies virUUIDGenerate() to generate valid UUIDs and adds check to virUUIDIsValid() to validate UUIDs. Signed-off-by: Milos Vyletel <milos.vyletel(a)sde.cz> --- src/util/viruuid.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 7250543..2dc9a56 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -114,6 +114,25 @@ virUUIDGenerate(unsigned char *uuid) err = virUUIDGeneratePseudoRandomBytes(uuid, VIR_UUID_BUFLEN); } + /* + * Make UUID RFC 4122 compliant. Following form will be used: + * + * xxxxxxxx-xxxx-Axxx-Bxxx-xxxxxxxxxxxx + * + * where + * A is version defined in 4.1.3 of RFC + * Msb0 Msb1 Msb2 Msb3 Version Description + * 0 1 0 0 4 The randomly or pseudo- + * randomly generated version + * specified in this document. + * + * B is variant defined in 4.1.1 of RFC + * Msb0 Msb1 Msb2 Description + * 1 0 x The variant specified in this document. + */ + uuid[6] = (uuid[6] & 0x0F) | (4 << 4); + uuid[8] = (uuid[8] & 0x3F) | (2 << 6); + return err; } @@ -209,6 +228,7 @@ virUUIDFormat(const unsigned char *uuid, char *uuidstr) * Do some basic tests to check whether the given UUID is * valid as a host UUID. * Basic tests: + * - Validate RFC4122 compliance * - Not all of the digits may be equal */ int @@ -216,10 +236,21 @@ virUUIDIsValid(unsigned char *uuid) { unsigned int i, ctr = 1; unsigned char c; + unsigned char version; + unsigned char variant; if (!uuid) return 0; + /* + * RFC4122 defines version 1 to 5 (section 4.1.3) + * RFC4122 defined variant is desribed in section 4.1.1 + */ + version = (uuid[6] >> 4); + variant = (uuid[8] >> 6); + if (!(version > 0 && version <= 5) || variant != 2) + return 0; + c = uuid[0]; for (i = 1; i < VIR_UUID_BUFLEN; i++) -- 1.7.1

3 5

[libvirt] [PATCH glib] Auto-generate AUTHORS file from GIT logs during make dist
by Daniel P. Berrange 08 Apr '13

08 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Instead of manually keeping the AUTHORS file in sync with GIT, auto-generate it during make dist phase Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- AUTHORS => AUTHORS.in | 9 +-------- ChangeLog | 0 Makefile.am | 13 +++++++++++-- autogen.sh | 5 +++++ cfg.mk | 15 --------------- 5 files changed, 17 insertions(+), 25 deletions(-) rename AUTHORS => AUTHORS.in (52%) delete mode 100644 ChangeLog diff --git a/AUTHORS b/AUTHORS.in similarity index 52% rename from AUTHORS rename to AUTHORS.in index db05f64..6ee6c9c 100644 --- a/AUTHORS +++ b/AUTHORS.in @@ -10,13 +10,6 @@ The primary maintainers of libvirt-glib are: Patches have been received from: - Guido G��nther <agx(a)sigxcpu.org> - Nirbheek Chauhan <nirbheek(a)gentoo.org> - Michal Privoznik <mprivozn(a)redhat.com> - Jovanka Gulicoska <jovanka.gulicoska(a)gmail.com> - Timo Juhani Lindfors <timo.lindfors(a)iki.fi> - Alexander Larsson <alexl(a)redhat.com> - Claudio Bley <cbley(a)av-test.de> - Stefano Facchini <stefano.facchini(a)gmail.com> +#authorslist# ... send patches to get your name added ... diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile.am b/Makefile.am index 9add74e..9101fdb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,17 +13,18 @@ EXTRA_DIST = $(PACKAGE).spec \ GNUmakefile \ maint.mk \ cfg.mk \ + AUTHORS.in \ $(NULL) DISTCLEAN_FILES = $(PACKAGE).spec $(pkgconfig_DATA) DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc=yes --enable-introspection=yes -dist-hook: gen-ChangeLog +dist-hook: gen-ChangeLog gen-AUTHORS # Generate the ChangeLog file (with all entries since the switch to git) # and insert it into the directory we're about to use to create a tarball. -.PHONY: gen-ChangeLog +.PHONY: gen-ChangeLog gen-AUTHORS gen-ChangeLog: if test -d .git || test -d ../.git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ @@ -31,3 +32,11 @@ gen-ChangeLog: rm -f $(distdir)/ChangeLog; \ mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi + +gen-AUTHORS: + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \ + perl -p -e "s/#authorslist#// and print '$$out'" \ + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + fi diff --git a/autogen.sh b/autogen.sh index bcec826..8030ab1 100755 --- a/autogen.sh +++ b/autogen.sh @@ -29,6 +29,11 @@ if test -z "$*"; then echo "the $0 command line." fi +# Real ChangeLog/AUTHORS is auto-generated from GIT logs at +# make dist time, but automake requires that it +# exists at all times :-( +touch ChangeLog AUTHORS + mkdir -p build-aux intltoolize --force autoreconf -if diff --git a/cfg.mk b/cfg.mk index 099ffa3..293d4e4 100644 --- a/cfg.mk +++ b/cfg.mk @@ -18,7 +18,6 @@ # 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 \ @@ -109,20 +108,6 @@ sc_copyright_format: # We don't use this feature of maint.mk. prev_version_file = /dev/null -# Give credit where due: -# Ensure that each commit author email address (possibly mapped via -# git log's .mailmap) appears in our AUTHORS file. -sc_check_author_list: - @fail=0; \ - for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \ - sanitized=$$(echo "$$i"|LC_ALL=C sed 's/$[^a-zA-Z0-9_@-]$/\\\1/g'); \ - grep -iq "<$$sanitized>" $(srcdir)/AUTHORS \ - || { printf '%s\n' "$$i" >&2; fail=1; }; \ - done; \ - test $$fail = 1 \ - && echo '$(ME): committer(s) not listed in AUTHORS' >&2; \ - test $$fail = 0 - exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-gconfig/tests|examples)/|libvirt-glib/libvirt-glib-event.c|libvirt-glib/libvirt-glib-main.c -- 1.8.1.4

2 1

[libvirt] [PATCH designer] Auto-generate AUTHORS file from GIT logs
by Daniel P. Berrange 08 Apr '13

08 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Rather than trying to manually keep track of authors, just auto-generate the list from GIT logs Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 2 ++ AUTHORS => AUTHORS.in | 4 +--- ChangeLog | 0 Makefile.am | 18 +++++++++++++++--- autogen.sh | 5 +++++ cfg.mk | 15 --------------- 6 files changed, 23 insertions(+), 21 deletions(-) rename AUTHORS => AUTHORS.in (61%) delete mode 100644 ChangeLog diff --git a/.gitignore b/.gitignore index 03b75ce..6b05db9 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,5 @@ docs/*.prerequisites docs/*.signals docs/*.types examples/*.1 +AUTHORS +ChangeLog diff --git a/AUTHORS b/AUTHORS.in similarity index 61% rename from AUTHORS rename to AUTHORS.in index 79812d7..334ed3e 100644 --- a/AUTHORS +++ b/AUTHORS.in @@ -7,8 +7,6 @@ The primary maintainers of libvirt-designer are: Patches have been received from: - Christophe Fergeau <cfergeau(a)redhat.com> - Michal Privoznik <mprivozn(a)redhat.com> - Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> +#authorslist# ... send patches to get your name added ... diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile.am b/Makefile.am index f5bcc47..7801b63 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,17 +6,21 @@ ACLOCAL_AMFLAGS = -I m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libvirt-designer-1.0.pc -EXTRA_DIST = $(PACKAGE).spec $(pkgconfig_DATA:%.pc=%.pc.in) +EXTRA_DIST = \ + $(PACKAGE).spec \ + $(pkgconfig_DATA:%.pc=%.pc.in) \ + AUTHORS.in \ + $(NULL) DISTCLEAN_FILES = $(PACKAGE).spec $(pkgconfig_DATA) DISTCHECK_CONFIGURE_FLAGS = --enable-introspection=yes --enable-gtk-doc=yes -dist-hook: gen-ChangeLog +dist-hook: gen-ChangeLog gen-AUTHORS # Generate the ChangeLog file (with all entries since the switch to git) # and insert it into the directory we're about to use to create a tarball. -.PHONY: gen-ChangeLog +.PHONY: gen-ChangeLog gen-AUTHORS gen-ChangeLog: if test -d .git || test -d ../.git; then \ $(top_srcdir)/build-aux/gitlog-to-changelog \ @@ -24,3 +28,11 @@ gen-ChangeLog: rm -f $(distdir)/ChangeLog; \ mv $(distdir)/cl-t $(distdir)/ChangeLog; \ fi + +gen-AUTHORS: + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ + out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \ + perl -p -e "s/#authorslist#// and print '$$out'" \ + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ + fi diff --git a/autogen.sh b/autogen.sh index cf89d7f..9a0c976 100755 --- a/autogen.sh +++ b/autogen.sh @@ -36,6 +36,11 @@ if test -z "$*"; then echo "the $0 command line." fi +# Real ChangeLog/AUTHORS is auto-generated from GIT logs at +# make dist time, but automake requires that it +# exists at all times :-( +touch ChangeLog AUTHORS + mkdir -p build-aux libtoolize --copy --force aclocal -I m4 diff --git a/cfg.mk b/cfg.mk index cf0f61f..54f62d4 100644 --- a/cfg.mk +++ b/cfg.mk @@ -18,7 +18,6 @@ # 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 \ @@ -104,20 +103,6 @@ sc_copyright_format: # We don't use this feature of maint.mk. prev_version_file = /dev/null -# Give credit where due: -# Ensure that each commit author email address (possibly mapped via -# git log's .mailmap) appears in our AUTHORS file. -sc_check_author_list: - @fail=0; \ - for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \ - sanitized=$$(echo "$$i"|LC_ALL=C sed 's/$[^a-zA-Z0-9_@-]$/\\\1/g'); \ - grep -iq "<$$sanitized>" $(srcdir)/AUTHORS \ - || { printf '%s\n' "$$i" >&2; fail=1; }; \ - done; \ - test $$fail = 1 \ - && echo '$(ME): committer(s) not listed in AUTHORS' >&2; \ - test $$fail = 0 - exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-designer/test)|(libvirt-designer/libvirt-designer-init-*)|(examples/virtxml.c) -- 1.8.1.4

2 1

[libvirt] 1.4.0 memballoon bug?
by Serge Hallyn 08 Apr '13

08 Apr '13

Hi, When I run virsh -c qemu:///system domxml-to-native qemu-argv /tmp/qatest.xml from 1.4.0 with the qatest.xml below (which has no memballoon device specified), I get an 'unspecified error'. Some printf debugging shows that virDomainDefParseXML is automatically adding a virtio memballoon device, but that its memballoon->info.type is 0, not the 1 or 8 which is required at qemuBuildMemballoonDevStr(). This didn't happen at 1.2.0, but I'm not sure where the error was introduced, as I don't see any suspicious changes around any of the relevant functions. So I was hoping to send a patch, but for now I'm just asking for help :) Anyone know what might be going on? thanks, -serge

2 3

[libvirt] [PATCH v2 0/2] libvirt_lxc: implement <hostdev caps=net> device isolation in containers
by Bogdan Purcareata 08 Apr '13

08 Apr '13

This set of patches implements <hostdev caps=net> interface isolation in containers, thus allowing an interface NIC to be assigned exclusively to a container-domain. This is done like moving veth devices in container namespaces, only this time it is actual host devices.

2 4

[libvirt] [libvirt-php PATCH 0/1] use LDFLAGS for libvirt-php.so
by stefan.kuhn＠foss-group.ch 08 Apr '13

08 Apr '13

I'm getting this warning: * QA Notice: Files built without respecting LDFLAGS have been detected * Please include the following list of files in your report: * /usr/lib64/php5.3/lib/extensions/no-debug-non-zts-20090626/libvirt-php.so The attached patch seems reasonable to me, please check it. Thank you very much for the quick responses and for adding me to the authors! :-) Stefan Stefan Kuhn (1): src/Makefile.am: use LDFLAGS for libvirt-php.so src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.7.12.4

2 2

[libvirt] [libvirt-php PATCH 0/1] Fix: mutlithreading compilation: set_error needs 2 params
by stefan.kuhn＠foss-group.ch 08 Apr '13

08 Apr '13

= Info = Someone reports errors withing "PHP_FUNCTION(libvirt_domain_migrate)" due to "set_error": libvirt-php.c: In function ‘zif_libvirt_domain_migrate’: libvirt-php.c:5456:3: error: too few arguments to function ‘set_error’ = Background = Michal Novotny already reacted to Gentoos bug: Bug 437624 - =dev-php/libvirt-php-0.4.6: too few arguments to function ‘set_error’ https://bugs.gentoo.org/show_bug.cgi?id=437624 with commit: bfca998ae921ab897f95025344fad71d9633ccf6 http://libvirt.org/git/?p=libvirt-php.git;a=commit;h=bfca998ae921ab897f9502… but some calls to "set_error" still lacked the 2nd param "TSRMLS_CC", especially in the "PHP_FUNCTION(libvirt_domain_migrate)". = Patch = Add 2nd param "TSRMLS_CC" to all calls of "set_error" where only 1 param was supplied. Stefan Kuhn (1): Fix: mutlithreading compilation: set_error needs 2 params src/libvirt-php.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 1.7.12.4

2 2

[libvirt] [libvirt-php PATCH 0/1] $(LIBS) must be at the end in the linker line
by stefan.kuhn＠foss-group.ch 08 Apr '13

08 Apr '13

Thanks to Tiziano Müller for pointing this out, please verify it ;) Explanation: $(LIBS) must be moved to the end in the linker line (like the other libs), otherwise gcc will most likely strip every symbol found in the libraries in $(LIBS) resulting in a linker error, see http://stackoverflow.com/questions/8140494/why-am-i-getting-a-gcc-undefined… Stefan Kuhn (1): $(LIBS) must be at the end in the linker line src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.7.12.4

2 2

[libvirt] [PATCH] Unmount existing filesystems under user specified mounts in LXC
by Daniel P. Berrange 08 Apr '13

08 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If the user requests a mount for /run, this may hide any existing mounts that are lower down in /run. The result is that the container still sees the mounts in /proc/mounts, but cannot access them sh-4.2# df df: '/run/user/501/gvfs': No such file or directory df: '/run/media/berrange/LIVE': No such file or directory df: '/run/media/berrange/SecureDiskA1': No such file or directory df: '/run/libvirt/lxc/sandbox': No such file or directory Filesystem 1K-blocks Used Available Use% Mounted on /dev/mapper/vg_t500wlan-lv_root 151476396 135390200 8384900 95% / tmpfs 1970888 3204 1967684 1% /run /dev/sda1 194241 155940 28061 85% /boot devfs 64 0 64 0% /dev tmpfs 64 0 64 0% /sys/fs/cgroup tmpfs 1970888 1200 1969688 1% /etc/libvirt-sandbox/scratch Before mounting any filesystem at a particular location, we must recursively unmount anything at or below the target mount point Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b4ad0c5..30738bb 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1361,6 +1361,10 @@ static int lxcContainerMountAllFS(virDomainDefPtr vmDef, STREQ(vmDef->fss[i]->dst, "/")) continue; + if (lxcContainerUnmountSubtree(vmDef->fss[i]->dst, + false) < 0) + return -1; + if (lxcContainerMountFS(vmDef->fss[i], dstprefix, sec_mount_options) < 0) return -1; } -- 1.8.1.4

2 1

[libvirt] [PATCH] Move lxcContainerUnmountSubtree further up in file
by Daniel P. Berrange 08 Apr '13

08 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Ensure lxcContainerUnmountSubtree is at the top of the lxc_container.c file so it is easily referenced from any other method. No functional change Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 214 ++++++++++++++++++++++++------------------------ 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index e59bfdf..b4ad0c5 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -409,6 +409,113 @@ static int lxcContainerChildMountSort(const void *a, const void *b) # define MS_SLAVE (1<<19) #endif +static int lxcContainerGetSubtree(const char *prefix, + char ***mountsret, + size_t *nmountsret) +{ + FILE *procmnt; + struct mntent mntent; + char mntbuf[1024]; + int ret = -1; + char **mounts = NULL; + size_t nmounts = 0; + + VIR_DEBUG("prefix=%s", prefix); + + *mountsret = NULL; + *nmountsret = 0; + + if (!(procmnt = setmntent("/proc/mounts", "r"))) { + virReportSystemError(errno, "%s", + _("Failed to read /proc/mounts")); + return -1; + } + + while (getmntent_r(procmnt, &mntent, mntbuf, sizeof(mntbuf)) != NULL) { + VIR_DEBUG("Got %s", mntent.mnt_dir); + if (!STRPREFIX(mntent.mnt_dir, prefix)) + continue; + + if (VIR_REALLOC_N(mounts, nmounts+1) < 0) { + virReportOOMError(); + goto cleanup; + } + if (!(mounts[nmounts] = strdup(mntent.mnt_dir))) { + virReportOOMError(); + goto cleanup; + } + nmounts++; + VIR_DEBUG("Grabbed %s", mntent.mnt_dir); + } + + if (mounts) + qsort(mounts, nmounts, sizeof(mounts[0]), + lxcContainerChildMountSort); + + ret = 0; +cleanup: + *mountsret = mounts; + *nmountsret = nmounts; + endmntent(procmnt); + return ret; +} + +static int lxcContainerUnmountSubtree(const char *prefix, + bool isOldRootFS) +{ + char **mounts = NULL; + size_t nmounts = 0; + size_t i; + int saveErrno; + const char *failedUmount = NULL; + int ret = -1; + + VIR_DEBUG("Unmount subtreee from %s", prefix); + + if (lxcContainerGetSubtree(prefix, &mounts, &nmounts) < 0) + goto cleanup; + for (i = 0 ; i < nmounts ; i++) { + VIR_DEBUG("Umount %s", mounts[i]); + if (umount(mounts[i]) < 0) { + char ebuf[1024]; + failedUmount = mounts[i]; + saveErrno = errno; + VIR_WARN("Failed to unmount '%s', trying to detach subtree '%s': %s", + failedUmount, mounts[nmounts-1], + virStrerror(errno, ebuf, sizeof(ebuf))); + break; + } + } + + if (failedUmount) { + /* This detaches the subtree */ + if (umount2(mounts[nmounts-1], MNT_DETACH) < 0) { + virReportSystemError(saveErrno, + _("Failed to unmount '%s' and could not detach subtree '%s'"), + failedUmount, mounts[nmounts-1]); + goto cleanup; + } + /* This unmounts the tmpfs on which the old root filesystem was hosted */ + if (isOldRootFS && + umount(mounts[nmounts-1]) < 0) { + virReportSystemError(saveErrno, + _("Failed to unmount '%s' and could not unmount old root '%s'"), + failedUmount, mounts[nmounts-1]); + goto cleanup; + } + } + + ret = 0; + +cleanup: + for (i = 0 ; i < nmounts ; i++) + VIR_FREE(mounts[i]); + VIR_FREE(mounts); + + return ret; +} + + static int lxcContainerPrepareRoot(virDomainDefPtr def, virDomainFSDefPtr root) { @@ -1624,113 +1731,6 @@ static int lxcContainerSetupAllHostdevs(virDomainDefPtr vmDef, } -static int lxcContainerGetSubtree(const char *prefix, - char ***mountsret, - size_t *nmountsret) -{ - FILE *procmnt; - struct mntent mntent; - char mntbuf[1024]; - int ret = -1; - char **mounts = NULL; - size_t nmounts = 0; - - VIR_DEBUG("prefix=%s", prefix); - - *mountsret = NULL; - *nmountsret = 0; - - if (!(procmnt = setmntent("/proc/mounts", "r"))) { - virReportSystemError(errno, "%s", - _("Failed to read /proc/mounts")); - return -1; - } - - while (getmntent_r(procmnt, &mntent, mntbuf, sizeof(mntbuf)) != NULL) { - VIR_DEBUG("Got %s", mntent.mnt_dir); - if (!STRPREFIX(mntent.mnt_dir, prefix)) - continue; - - if (VIR_REALLOC_N(mounts, nmounts+1) < 0) { - virReportOOMError(); - goto cleanup; - } - if (!(mounts[nmounts] = strdup(mntent.mnt_dir))) { - virReportOOMError(); - goto cleanup; - } - nmounts++; - VIR_DEBUG("Grabbed %s", mntent.mnt_dir); - } - - if (mounts) - qsort(mounts, nmounts, sizeof(mounts[0]), - lxcContainerChildMountSort); - - ret = 0; -cleanup: - *mountsret = mounts; - *nmountsret = nmounts; - endmntent(procmnt); - return ret; -} - -static int lxcContainerUnmountSubtree(const char *prefix, - bool isOldRootFS) -{ - char **mounts = NULL; - size_t nmounts = 0; - size_t i; - int saveErrno; - const char *failedUmount = NULL; - int ret = -1; - - VIR_DEBUG("Unmount subtreee from %s", prefix); - - if (lxcContainerGetSubtree(prefix, &mounts, &nmounts) < 0) - goto cleanup; - for (i = 0 ; i < nmounts ; i++) { - VIR_DEBUG("Umount %s", mounts[i]); - if (umount(mounts[i]) < 0) { - char ebuf[1024]; - failedUmount = mounts[i]; - saveErrno = errno; - VIR_WARN("Failed to unmount '%s', trying to detach subtree '%s': %s", - failedUmount, mounts[nmounts-1], - virStrerror(errno, ebuf, sizeof(ebuf))); - break; - } - } - - if (failedUmount) { - /* This detaches the subtree */ - if (umount2(mounts[nmounts-1], MNT_DETACH) < 0) { - virReportSystemError(saveErrno, - _("Failed to unmount '%s' and could not detach subtree '%s'"), - failedUmount, mounts[nmounts-1]); - goto cleanup; - } - /* This unmounts the tmpfs on which the old root filesystem was hosted */ - if (isOldRootFS && - umount(mounts[nmounts-1]) < 0) { - virReportSystemError(saveErrno, - _("Failed to unmount '%s' and could not unmount old root '%s'"), - failedUmount, mounts[nmounts-1]); - goto cleanup; - } - } - - ret = 0; - -cleanup: - for (i = 0 ; i < nmounts ; i++) - VIR_FREE(mounts[i]); - VIR_FREE(mounts); - - return ret; -} - - struct lxcContainerCGroup { const char *dir; const char *linkDest; -- 1.8.1.4

2 1

[libvirt] [PATCH] Unmount existing filesystems under user specified mounts in LXC
by Daniel P. Berrange 08 Apr '13

08 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If the user requests a mount for /run, this may hide any existing mounts that are lower down in /run. The result is that the container still sees the mounts in /proc/mounts, but cannot access them sh-4.2# df df: '/run/user/501/gvfs': No such file or directory df: '/run/media/berrange/LIVE': No such file or directory df: '/run/media/berrange/SecureDiskA1': No such file or directory df: '/run/libvirt/lxc/sandbox': No such file or directory Filesystem 1K-blocks Used Available Use% Mounted on /dev/mapper/vg_t500wlan-lv_root 151476396 135390200 8384900 95% / tmpfs 1970888 3204 1967684 1% /run /dev/sda1 194241 155940 28061 85% /boot devfs 64 0 64 0% /dev tmpfs 64 0 64 0% /sys/fs/cgroup tmpfs 1970888 1200 1969688 1% /etc/libvirt-sandbox/scratch Before mounting any filesystem at a particular location, we must recursively unmount anything at or below the target mount point Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 218 ++++++++++++++++++++++++------------------------ 1 file changed, 111 insertions(+), 107 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index e59bfdf..30738bb 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -409,6 +409,113 @@ static int lxcContainerChildMountSort(const void *a, const void *b) # define MS_SLAVE (1<<19) #endif +static int lxcContainerGetSubtree(const char *prefix, + char ***mountsret, + size_t *nmountsret) +{ + FILE *procmnt; + struct mntent mntent; + char mntbuf[1024]; + int ret = -1; + char **mounts = NULL; + size_t nmounts = 0; + + VIR_DEBUG("prefix=%s", prefix); + + *mountsret = NULL; + *nmountsret = 0; + + if (!(procmnt = setmntent("/proc/mounts", "r"))) { + virReportSystemError(errno, "%s", + _("Failed to read /proc/mounts")); + return -1; + } + + while (getmntent_r(procmnt, &mntent, mntbuf, sizeof(mntbuf)) != NULL) { + VIR_DEBUG("Got %s", mntent.mnt_dir); + if (!STRPREFIX(mntent.mnt_dir, prefix)) + continue; + + if (VIR_REALLOC_N(mounts, nmounts+1) < 0) { + virReportOOMError(); + goto cleanup; + } + if (!(mounts[nmounts] = strdup(mntent.mnt_dir))) { + virReportOOMError(); + goto cleanup; + } + nmounts++; + VIR_DEBUG("Grabbed %s", mntent.mnt_dir); + } + + if (mounts) + qsort(mounts, nmounts, sizeof(mounts[0]), + lxcContainerChildMountSort); + + ret = 0; +cleanup: + *mountsret = mounts; + *nmountsret = nmounts; + endmntent(procmnt); + return ret; +} + +static int lxcContainerUnmountSubtree(const char *prefix, + bool isOldRootFS) +{ + char **mounts = NULL; + size_t nmounts = 0; + size_t i; + int saveErrno; + const char *failedUmount = NULL; + int ret = -1; + + VIR_DEBUG("Unmount subtreee from %s", prefix); + + if (lxcContainerGetSubtree(prefix, &mounts, &nmounts) < 0) + goto cleanup; + for (i = 0 ; i < nmounts ; i++) { + VIR_DEBUG("Umount %s", mounts[i]); + if (umount(mounts[i]) < 0) { + char ebuf[1024]; + failedUmount = mounts[i]; + saveErrno = errno; + VIR_WARN("Failed to unmount '%s', trying to detach subtree '%s': %s", + failedUmount, mounts[nmounts-1], + virStrerror(errno, ebuf, sizeof(ebuf))); + break; + } + } + + if (failedUmount) { + /* This detaches the subtree */ + if (umount2(mounts[nmounts-1], MNT_DETACH) < 0) { + virReportSystemError(saveErrno, + _("Failed to unmount '%s' and could not detach subtree '%s'"), + failedUmount, mounts[nmounts-1]); + goto cleanup; + } + /* This unmounts the tmpfs on which the old root filesystem was hosted */ + if (isOldRootFS && + umount(mounts[nmounts-1]) < 0) { + virReportSystemError(saveErrno, + _("Failed to unmount '%s' and could not unmount old root '%s'"), + failedUmount, mounts[nmounts-1]); + goto cleanup; + } + } + + ret = 0; + +cleanup: + for (i = 0 ; i < nmounts ; i++) + VIR_FREE(mounts[i]); + VIR_FREE(mounts); + + return ret; +} + + static int lxcContainerPrepareRoot(virDomainDefPtr def, virDomainFSDefPtr root) { @@ -1254,6 +1361,10 @@ static int lxcContainerMountAllFS(virDomainDefPtr vmDef, STREQ(vmDef->fss[i]->dst, "/")) continue; + if (lxcContainerUnmountSubtree(vmDef->fss[i]->dst, + false) < 0) + return -1; + if (lxcContainerMountFS(vmDef->fss[i], dstprefix, sec_mount_options) < 0) return -1; } @@ -1624,113 +1735,6 @@ static int lxcContainerSetupAllHostdevs(virDomainDefPtr vmDef, } -static int lxcContainerGetSubtree(const char *prefix, - char ***mountsret, - size_t *nmountsret) -{ - FILE *procmnt; - struct mntent mntent; - char mntbuf[1024]; - int ret = -1; - char **mounts = NULL; - size_t nmounts = 0; - - VIR_DEBUG("prefix=%s", prefix); - - *mountsret = NULL; - *nmountsret = 0; - - if (!(procmnt = setmntent("/proc/mounts", "r"))) { - virReportSystemError(errno, "%s", - _("Failed to read /proc/mounts")); - return -1; - } - - while (getmntent_r(procmnt, &mntent, mntbuf, sizeof(mntbuf)) != NULL) { - VIR_DEBUG("Got %s", mntent.mnt_dir); - if (!STRPREFIX(mntent.mnt_dir, prefix)) - continue; - - if (VIR_REALLOC_N(mounts, nmounts+1) < 0) { - virReportOOMError(); - goto cleanup; - } - if (!(mounts[nmounts] = strdup(mntent.mnt_dir))) { - virReportOOMError(); - goto cleanup; - } - nmounts++; - VIR_DEBUG("Grabbed %s", mntent.mnt_dir); - } - - if (mounts) - qsort(mounts, nmounts, sizeof(mounts[0]), - lxcContainerChildMountSort); - - ret = 0; -cleanup: - *mountsret = mounts; - *nmountsret = nmounts; - endmntent(procmnt); - return ret; -} - -static int lxcContainerUnmountSubtree(const char *prefix, - bool isOldRootFS) -{ - char **mounts = NULL; - size_t nmounts = 0; - size_t i; - int saveErrno; - const char *failedUmount = NULL; - int ret = -1; - - VIR_DEBUG("Unmount subtreee from %s", prefix); - - if (lxcContainerGetSubtree(prefix, &mounts, &nmounts) < 0) - goto cleanup; - for (i = 0 ; i < nmounts ; i++) { - VIR_DEBUG("Umount %s", mounts[i]); - if (umount(mounts[i]) < 0) { - char ebuf[1024]; - failedUmount = mounts[i]; - saveErrno = errno; - VIR_WARN("Failed to unmount '%s', trying to detach subtree '%s': %s", - failedUmount, mounts[nmounts-1], - virStrerror(errno, ebuf, sizeof(ebuf))); - break; - } - } - - if (failedUmount) { - /* This detaches the subtree */ - if (umount2(mounts[nmounts-1], MNT_DETACH) < 0) { - virReportSystemError(saveErrno, - _("Failed to unmount '%s' and could not detach subtree '%s'"), - failedUmount, mounts[nmounts-1]); - goto cleanup; - } - /* This unmounts the tmpfs on which the old root filesystem was hosted */ - if (isOldRootFS && - umount(mounts[nmounts-1]) < 0) { - virReportSystemError(saveErrno, - _("Failed to unmount '%s' and could not unmount old root '%s'"), - failedUmount, mounts[nmounts-1]); - goto cleanup; - } - } - - ret = 0; - -cleanup: - for (i = 0 ; i < nmounts ; i++) - VIR_FREE(mounts[i]); - VIR_FREE(mounts); - - return ret; -} - - struct lxcContainerCGroup { const char *dir; const char *linkDest; -- 1.8.1.4

2 1

[libvirt] [PATCH 00/18] Re-arrange the way cgroups are setup
by Daniel P. Berrange 08 Apr '13

08 Apr '13

This is a greatly expanded version of a previous series I posted https://www.redhat.com/archives/libvir-list/2013-March/msg01373.html Currently libvirt creates a cgroups hiearchy at $LOCATION-OF-LIBVIRTD/libvirt/{qemu,lxc}/$GUEST-NAME eg /sys/fs/cgroup ├── blkio │ └── libvirt │ ├── lxc │ │ └── busy │ └── qemu │ └── vm1 ├── cpu,cpuacct │ ├── libvirt │ │ ├── lxc │ │ │ └── busy │ │ └── qemu │ │ └── vm1 │ │ ├── emulator │ │ └── vcpu0 │ └── system │ ├── abrtd.service │ ....snip.... │ └── upower.service ├── cpuset │ └── libvirt │ ├── lxc │ │ └── busy │ └── qemu │ └── vm1 │ ├── emulator │ └── vcpu0 ├── devices │ └── libvirt │ ├── lxc │ │ └── busy │ └── qemu │ └── vm1 ├── freezer │ └── libvirt │ ├── lxc │ │ └── busy │ └── qemu │ └── vm1 ├── memory │ └── libvirt │ ├── lxc │ │ └── busy │ └── qemu │ └── vm1 ├── net_cls ├── perf_event This series changes it so that libvirt creates cgroups at /system/$VMNAME.{qemu,lxc}.libvirt and allows configuration of the "resource partition" (ie the "/system" bit) via the XML. So we get a layout like this: /sys/fs/cgroup ├── blkio │ └── system │ ├── demo.lxc.libvirt │ └── vm1.qemu.libvirt ├── cpu,cpuacct │ └── system │ ├── abrtd.service │ ....snip.... │ ├── demo.lxc.libvirt │ ....snip.... │ └── vm1.qemu.libvirt │ ├── emulator │ └── vcpu0 ├── cpuset │ └── system │ ├── demo.lxc.libvirt │ └── vm1.qemu.libvirt │ ├── emulator │ └── vcpu0 ├── devices │ └── system │ ├── demo.lxc.libvirt │ └── vm1.qemu.libvirt ├── freezer │ └── system │ ├── demo.lxc.libvirt │ └── vm1.qemu.libvirt ├── memory │ └── system │ ├── demo.lxc.libvirt │ └── vm1.qemu.libvirt ├── net_cls ├── perf_event Flattening out the libvirt created hiearchy has serious performance wins, due to poor kernel scalability with deep hierarchies. It also makes it easier to configure system wide policy for resource usage across system services and virtual machines / containers, since they all live at the top level in comon resource partitions.

4 30

[libvirt] [libvirt-designer] Add myself to AUTHORS file
by Zeeshan Ali (Khattak) 08 Apr '13

08 Apr '13

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- Pushed under trivial rule. AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index db9d798..79812d7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,5 +9,6 @@ Patches have been received from: Christophe Fergeau <cfergeau(a)redhat.com> Michal Privoznik <mprivozn(a)redhat.com> + Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> ... send patches to get your name added ... -- 1.8.1.4

1 0

[libvirt] [PATCH v2 00/10] add support for scsi-generic for virtio-scsi
by Han Cheng 08 Apr '13

08 Apr '13

This patch series tried to add support for scsi-generic for virtio-scsi. Changes from v1: - Mv readonly to virDomainHostdevDef as Osier advises. - Use scsi adaper definition from storagepool. - Limit scsi hostdev to add one live guest. - Create some util function for scsi hostdev. - Add hotplug support for scsi hostdev. The v1 could be found at: https://www.redhat.com/archives/libvir-list/2013-March/msg00073.html We may do some code refactoring to reduce code in pci/usb/sci hostdev later. Han Cheng (10): conf: Introduce readonly to hostdev and change helper function docs/schemas: split storagepool.rng for scsi hostdev conf: Introduce scsi hostdev qemu: New cap flag for scsi-generic utils: util functions for scsi hostdev qemu: Build qemu command line for scsi-generic qemu: Basic management functions for scsi hostdev qemu: cgroup and selinux for scsi hostdev qemu: hotplug support for scsi hostdev tests: tests for scsi hostdev docs/formatdomain.html.in | 37 docs/schemas/domaincommon.rng | 35 docs/schemas/storagepool.rng | 18 docs/schemas/storagepoolcommon.rng | 21 po/POTFILES.in | 1 src/Makefile.am | 1 src/conf/domain_audit.c | 10 src/conf/domain_conf.c | 198 ++++ src/conf/domain_conf.h | 13 src/libvirt_private.syms | 24 src/qemu/qemu_capabilities.c | 15 src/qemu/qemu_capabilities.h | 2 src/qemu/qemu_cgroup.c | 67 + src/qemu/qemu_cgroup.h | 3 src/qemu/qemu_command.c | 133 +++ src/qemu/qemu_command.h | 6 src/qemu/qemu_conf.h | 2 src/qemu/qemu_driver.c | 3 src/qemu/qemu_hostdev.c | 227 +++++ src/qemu/qemu_hostdev.h | 10 src/qemu/qemu_hotplug.c | 211 ++++- src/qemu/qemu_process.c | 3 src/security/security_selinux.c | 56 + src/util/virscsi.c | 399 ++++++++++ src/util/virscsi.h | 83 ++ tests/qemuhelpdata/qemu-1.0-device | 10 tests/qemuhelpdata/qemu-1.1.0-device | 10 tests/qemuhelpdata/qemu-1.2.0-device | 5 tests/qemuhelpdata/qemu-kvm-1.2.0-device | 5 tests/qemuhelptest.c | 19 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.args | 10 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-boot.xml | 34 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args | 10 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.xml | 35 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi.args | 10 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi.xml | 34 tests/qemuxml2argvtest.c | 12 tests/qemuxml2xmltest.c | 4 38 files changed, 1677 insertions(+), 99 deletions(-)

6 47

[libvirt] [PATCH] spec: Require pod2man when running autoreconf
by Jiri Denemark 08 Apr '13

08 Apr '13

Since commit b8a32e0e94d75702714167539310f0df4d268e0f, all man pages depend on configure.ac so that they are properly regenerated whenever libvirt version changes. Thus libvirt.spec needs to have a build dependency on pod2man when %{enable_autotools} is set. --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 34b3f9c..328b009 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -392,10 +392,11 @@ Requires: libvirt-client = %{version}-%{release} %if 0%{?enable_autotools} BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool +BuildRequires: /usr/bin/pod2man %endif BuildRequires: python-devel %if %{with_systemd} BuildRequires: systemd-units %endif -- 1.8.1.5

2 2

[libvirt] [PATCH] fix compilation failure under tests/
by Serge Hallyn 08 Apr '13

08 Apr '13

Without this, I get errors like /usr/bin/ld: virnettlscontexttest.o: undefined reference to symbol 'gnutls_x509_crt_set_activation_time@@GNUTLS_1_4' /usr/bin/ld: note: 'gnutls_x509_crt_set_activation_time@@GNUTLS_1_4' is defined in DSO /usr/lib/x86_64-linux-gnu/libgnutls.so.26 so try adding it to the linker command line /usr/lib/x86_64-linux-gnu/libgnutls.so.26: could not read symbols: Invalid operation collect2: error: ld returned 1 exit status (and onward in sequence) - since at least 1.0.2 on Ubuntu systems. (Oddly, only if gnutls is installed - uninstalling it allows the compilation to complete, so it hasn't been crucial on our builders, just annoying when building by hand). Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- tests/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 3abd698..99d70d2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -36,7 +36,8 @@ PROBES_O += ../src/libvirt_probes.lo endif LDADDS = \ - $(WARN_CFLAGS) \ + $(GNUTLS_LIBS) $(LIBXML_LIBS) $(DBUS_LIBS) \ + $(WARN_CFLAGS) \ $(PROBES_O) \ ../src/libvirt.la \ ../gnulib/lib/libgnu.la -- 1.8.1.2

3 6

[libvirt] [PATCH] Add error handling to optional arguments in cmdCPUStats
by John Ferlan 08 Apr '13

08 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=907732 Also added informational message when count value is larger than number of CPUs present. Original code commit '31047e2b' quietly changes it and continues on. Prior to this patch, no errors were seen for following sequences virsh cpu-stats guest xyz virsh cpu-stats guest --start xyz virsh cpu-stats guest --count xyz virsh cpu-stats guest --count 99999999999 With this patch, the following errors are displayed error: Invalid value for start CPU error: Invalid value for start CPU error: Invalid value for number of CPUs to show error: Invalid value for number of CPUs to show Passing a value such as 9 to count will display the following: Only 4 CPUs available to show CPU0: cpu_time 19.860859202 seconds vcpu_time 17.551435620 seconds ... --- tools/virsh-domain.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c088468..3dbfa53 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6111,7 +6111,7 @@ static const vshCmdInfo info_cpu_stats[] = { {.name = "desc", .data = N_("Display per-CPU and total statistics about the domain's CPUs") }, - {.name = NULL}, + {.name = NULL} }; static const vshCmdOptDef opts_cpu_stats[] = { @@ -6132,7 +6132,7 @@ static const vshCmdOptDef opts_cpu_stats[] = { .type = VSH_OT_INT, .help = N_("Number of shown CPUs at most") }, - {.name = NULL}, + {.name = NULL} }; static bool @@ -6149,9 +6149,18 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) return false; show_total = vshCommandOptBool(cmd, "total"); - if (vshCommandOptInt(cmd, "start", &cpu) > 0) + if (vshCommandOptInt(cmd, "start", &cpu) < 0) { + vshError(ctl, "%s", _("Invalid value for start CPU")); + goto cleanup; + } + if (cpu >= 0) show_per_cpu = true; - if (vshCommandOptInt(cmd, "count", &show_count) > 0) + + if (vshCommandOptInt(cmd, "count", &show_count) < 0) { + vshError(ctl, "%s", _("Invalid value for number of CPUs to show")); + goto cleanup; + } + if (show_count >= 0) show_per_cpu = true; /* default show per_cpu and total */ @@ -6170,8 +6179,10 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) /* get number of cpus on the node */ if ((max_id = virDomainGetCPUStats(dom, NULL, 0, 0, 0, flags)) < 0) goto failed_stats; - if (show_count < 0 || show_count > max_id) + if (show_count < 0 || show_count > max_id) { + vshPrint(ctl, _("Only %d CPUs available to show\n"), max_id); show_count = max_id; + } /* get percpu information */ if ((nparams = virDomainGetCPUStats(dom, NULL, 0, 0, 1, flags)) < 0) -- 1.8.1.4

2 1

[libvirt] [libvirt-designer] build: No need to set PKG_CONFIG_PATH for g-ir-scanner
by Zeeshan Ali (Khattak) 08 Apr '13

08 Apr '13

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> I don't see any need for this and it actually breaks the build here: GEN LibvirtDesigner-1.0.gir Package libvirt-gconfig-1.0 was not found in the pkg-config search path. Perhaps you should add the directory containing `libvirt-gconfig-1.0.pc' to the PKG_CONFIG_PATH environment variable No package 'libvirt-gconfig-1.0' found In file included from <stdin>:4:0: /extra-data/checkout/gnome/libvirt-designer/libvirt-designer/libvirt-designer.h:27:45: fatal error: libvirt-gconfig/libvirt-gconfig.h: No such file or directory compilation terminated. Error while processing the source. make[3]: *** [LibvirtDesigner-1.0.gir] Error 1 --- libvirt-designer/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-designer/Makefile.am b/libvirt-designer/Makefile.am index 8f10c41..7becfd2 100644 --- a/libvirt-designer/Makefile.am +++ b/libvirt-designer/Makefile.am @@ -103,7 +103,7 @@ test_designer_domain_LDFLAGS = \ if WITH_INTROSPECTION LibvirtDesigner-1.0.gir: libvirt-designer-1.0.la $(G_IR_SCANNER) Makefile.am - $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) \ + $(AM_V_GEN) $(G_IR_SCANNER) \ --quiet \ --warn-all \ --namespace LibvirtDesigner \ -- 1.8.1.4

2 1

[libvirt] [PATCH] qemu: fix qemuCgroupControllerActive
by Ján Tomko 08 Apr '13

08 Apr '13

Since 56f27b3 it always returned false. --- src/qemu/qemu_cgroup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 2cdc2b7..9e11a05 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -58,6 +58,8 @@ bool qemuCgroupControllerActive(virQEMUDriverPtr driver, if (!virCgroupMounted(driver->cgroup, controller)) goto cleanup; + ret = true; + cleanup: virObjectUnref(cfg); return ret; -- 1.8.1.5

3 2

[libvirt] [PATCH 0/8 v2] Glue domain and storage
by Osier Yang 08 Apr '13

08 Apr '13

This is the 4th part to implement NPIV migration support [1]. Part 1 and part 2 are pushed. Part 3 (v3: pending for review): https://www.redhat.com/archives/libvir-list/2013-March/msg01440.html ====== This introduces new XMLs to specify the disk source with storage like <disk type='volume' device='disk'> <driver name='qemu' type='raw' cache='none'/> <source pool="$pool_name" volume='$vol_name'/> <seclabel relabel='no'/> </source> <target dev='vdb' bus='virtio'/> </disk> And before domain starting, and disk attaching/updating, the source represented by storage is translated into the real underlying storage volume. Future work: * Support network volume * Support disk backing chain? v1 - v2: * Invoke storage APIs to translate the source directly in qemu driver * 1/8 in v1 is pushed. * 2/8 in v1 is splitted (the code refactoring now is a standalone patch) * Support shared disk for volume type disk * Support sgio setting for volume type disk * No network volume support in v2 RFC - v1: * The XMLs are more simpler - only using pool name and volume name to specify disk source. * Support network pool (rbd, and sheepdog) * Support startupPolicy for volume type disk * Support seclabels for volume type disk * Fix bugs on disk source formating Osier Yang (8): conf: New helper virDomainDiskSourceDefFormat to format the disk source Introduce new XMLs to specify disk source using libvirt storage qemu: Translate the pool disk source when building drive string Support startupPolicy for 'volume' disk Support seclabels for volume type disk qemu: Translate the pool disk source earlier qemu: Support shareable volume type disk qemu: Support sgio setting for volume type disk docs/formatdomain.html.in | 28 ++- docs/schemas/domaincommon.rng | 24 ++ src/conf/domain_conf.c | 274 ++++++++++++++------- src/conf/domain_conf.h | 10 + src/qemu/qemu_command.c | 32 +++ src/qemu/qemu_command.h | 1 - src/qemu/qemu_conf.c | 68 ++++- src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_driver.c | 16 +- src/qemu/qemu_process.c | 14 +- .../qemuxml2argv-disk-source-pool.xml | 37 +++ tests/qemuxml2xmltest.c | 1 + 13 files changed, 406 insertions(+), 106 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml -- 1.8.1.4

4 34

[libvirt] [PATCH 0/7 v3] Persistent vHBA support in storage driver
by Osier Yang 08 Apr '13

08 Apr '13

v2: https://www.redhat.com/archives/libvir-list/2013-February/msg00118.html v2 - v3: * 6/8 of v1 is ACKed/pushed. * Use virStringToLong_ui instead of sscanf * Fixed various nits pointed out by John This is the 3rd part to implement NPIV migration support [1]. Part 1: (pushed) https://www.redhat.com/archives/libvir-list/2013-February/msg00112.html Part 2: (pushed) https://www.redhat.com/archives/libvir-list/2013-January/msg00859.html Osier Yang (7): New XML attributes for storage pool source adapter storage: Make the adapter name be consistent with node device driver storage: Move virStorageBackendSCSIGetHostNumber into iscsi backend phyp: Prohibit fc_host adapter for phyp driver util: Add helper to get the scsi host name by iterating over sysfs storage: Add startPool and stopPool for scsi backend storage: Guess the parent if it's not specified for vHBA docs/formatstorage.html.in | 17 +- docs/schemas/storagepool.rng | 33 +++- src/conf/storage_conf.c | 132 +++++++++++++- src/conf/storage_conf.h | 23 ++- src/libvirt_private.syms | 4 + src/phyp/phyp_driver.c | 15 +- src/storage/storage_backend_iscsi.c | 39 +++- src/storage/storage_backend_scsi.c | 202 +++++++++++++++------ src/storage/storage_backend_scsi.h | 3 - src/util/virutil.c | 202 +++++++++++++++++++++ src/util/virutil.h | 11 +- .../pool-scsi-type-fc-host.xml | 15 ++ .../pool-scsi-type-scsi-host.xml | 15 ++ .../pool-scsi-type-fc-host.xml | 18 ++ .../pool-scsi-type-scsi-host.xml | 18 ++ tests/storagepoolxml2xmlout/pool-scsi.xml | 2 +- tests/storagepoolxml2xmltest.c | 2 + 17 files changed, 669 insertions(+), 82 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-scsi-type-fc-host.xml create mode 100644 tests/storagepoolxml2xmlin/pool-scsi-type-scsi-host.xml create mode 100644 tests/storagepoolxml2xmlout/pool-scsi-type-fc-host.xml create mode 100644 tests/storagepoolxml2xmlout/pool-scsi-type-scsi-host.xml -- 1.8.0.1

3 23

[libvirt] [PATCH 1/2] cgroup: export virCgroupRemoveRecursively
by Gao feng 08 Apr '13

08 Apr '13

We will use virCgroupRemoveRecursively to remove cgroup directories in the coming patch. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/libvirt_private.syms | 1 + src/util/vircgroup.c | 4 ++-- src/util/vircgroup.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index dc01bfa..8cc50c4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1118,6 +1118,7 @@ virCgroupKillRecursive; virCgroupMounted; virCgroupMoveTask; virCgroupPathOfController; +virCgroupRemoveRecursively; virCgroupRemove; virCgroupSetBlkioDeviceWeight; virCgroupSetBlkioWeight; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 532e704..6998f13 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -686,7 +686,7 @@ cleanup: #endif #if defined _DIRENT_HAVE_D_TYPE -static int virCgroupRemoveRecursively(char *grppath) +int virCgroupRemoveRecursively(char *grppath) { DIR *grpdir; struct dirent *ent; @@ -735,7 +735,7 @@ static int virCgroupRemoveRecursively(char *grppath) return rc; } #else -static int virCgroupRemoveRecursively(char *grppath ATTRIBUTE_UNUSED) +int virCgroupRemoveRecursively(char *grppath ATTRIBUTE_UNUSED) { /* Claim no support */ return -ENXIO; diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 2ed6ff9..ea42fa2 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -157,6 +157,7 @@ int virCgroupGetCpusetMems(virCgroupPtr group, char **mems); int virCgroupSetCpusetCpus(virCgroupPtr group, const char *cpus); int virCgroupGetCpusetCpus(virCgroupPtr group, char **cpus); +int virCgroupRemoveRecursively(char *grppath); int virCgroupRemove(virCgroupPtr group); void virCgroupFree(virCgroupPtr *group); -- 1.7.11.7

5 10

[libvirt] [PATCH v3 1/2] Optimize machine option to set more options with it
by Li Zhang 07 Apr '13

07 Apr '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Currently, -machine option is used only when dump-guest-core is set. To use options defined in machine option for newer version of QEMU, it needs to use -machine xxx, and to be compatible with older version -M, this patch addes QEMU_CAPS_MACHINE_OPT capability for newer version which supports -machine option. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- v3 -> v2: * Set QEMU_CAPS_MACHINE_OPT with help string * Set QEMU_CAPS_DUMP_GUEST_CORE with QMP v2 -> v1: * Split the patch to 2 parts suggested by Daniel P.Berrange * Rename QEMU_CAPS_MACH_OPT to QEMU_CAPS_MACHINE_OPT * Remove version 1.1 assertion for QEMU_CAPS_MACHINE_OPT src/qemu/qemu_capabilities.c | 11 +++++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 32 ++++++++++++++++++-------------- tests/qemuhelptest.c | 4 ++++ tests/qemuxml2argvtest.c | 6 +++--- 5 files changed, 37 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 861d3c4..7d459db 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -213,6 +213,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio-ccw", "dtb", "megasas", + + "machine-opt", /* 135 */ ); struct _virQEMUCaps { @@ -1091,6 +1093,9 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-dtb")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB); + if (strstr(help, "-machine")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); + /* * Handling of -incoming arg with varying features * -incoming tcp (kvm >= 79, qemu >= 0.10.0) @@ -2442,6 +2447,12 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, virQEMUCapsInitQMPBasic(qemuCaps); + /* machine option is supported for newer version */ + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); + + /* -dump-guest-core is supported for newer version*/ + virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE); + if (!(archstr = qemuMonitorGetTargetArch(mon))) goto cleanup; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 7101f67..2595868 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -174,6 +174,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ QEMU_CAPS_DTB = 133, /* -dtb file */ QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ + QEMU_CAPS_MACHINE_OPT = 135, /* -machine xxxx*/ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a0c278f..0ee634b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5197,6 +5197,8 @@ qemuBuildMachineArgStr(virCommandPtr cmd, const virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + /* This should *never* be NULL, since we always provide * a machine in the capabilities data for QEMU. So this * check is just here as a safety in case the unexpected @@ -5204,27 +5206,29 @@ qemuBuildMachineArgStr(virCommandPtr cmd, if (!def->os.machine) return 0; - if (!def->mem.dump_core) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_OPT)) { /* if no parameter to the machine type is needed, we still use * '-M' to keep the most of the compatibility with older versions. */ virCommandAddArgList(cmd, "-M", def->os.machine, NULL); } else { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("dump-guest-core is not available " - " with this QEMU binary")); - return -1; - } - /* However, in case there is a parameter to be added, we need to - * use the "-machine" parameter because qemu is not parsing the - * "-M" correctly */ virCommandAddArg(cmd, "-machine"); - virCommandAddArgFormat(cmd, - "%s,dump-guest-core=%s", - def->os.machine, - virDomainMemDumpTypeToString(def->mem.dump_core)); + virBufferAsprintf(&buf, "%s", def->os.machine); + + if (def->mem.dump_core) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("dump-guest-core is not available " + " with this QEMU binary")); + return -1; + } + + virBufferAsprintf(&buf, ",dump-guest-core=%s", + virDomainMemDumpTypeToString(def->mem.dump_core)); + } + + virCommandAddArg(cmd, virBufferContentAndReset(&buf)); } return 0; diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index a28109a..0c7e607 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -718,6 +718,7 @@ mymain(void) QEMU_CAPS_SCSI_LSI, QEMU_CAPS_BLOCKIO, QEMU_CAPS_VNC, + QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_DEVICE_CIRRUS_VGA, @@ -806,6 +807,7 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_BLOCKIO, QEMU_CAPS_VNC, + QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_DEVICE_CIRRUS_VGA, @@ -903,6 +905,7 @@ mymain(void) QEMU_CAPS_SECCOMP_SANDBOX, QEMU_CAPS_DUMP_GUEST_CORE, QEMU_CAPS_VNC, + QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_USB_REDIR_BOOTINDEX, QEMU_CAPS_USB_HOST_BOOTINDEX, QEMU_CAPS_DEVICE_QXL, @@ -1009,6 +1012,7 @@ mymain(void) QEMU_CAPS_SECCOMP_SANDBOX, QEMU_CAPS_DUMP_GUEST_CORE, QEMU_CAPS_VNC, + QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_USB_REDIR_BOOTINDEX, QEMU_CAPS_USB_HOST_BOOTINDEX, QEMU_CAPS_DEVICE_QXL, diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 38787ac..4b45c55 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -363,9 +363,9 @@ mymain(void) DO_TEST("minimal-s390", QEMU_CAPS_NAME); DO_TEST("machine-aliases1", NONE); DO_TEST("machine-aliases2", QEMU_CAPS_KVM); - DO_TEST("machine-core-on", QEMU_CAPS_DUMP_GUEST_CORE); - DO_TEST("machine-core-off", QEMU_CAPS_DUMP_GUEST_CORE); - DO_TEST_FAILURE("machine-core-on", NONE); + DO_TEST("machine-core-on", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DUMP_GUEST_CORE); + DO_TEST("machine-core-off", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_DUMP_GUEST_CORE); + DO_TEST_FAILURE("machine-core-on", QEMU_CAPS_MACHINE_OPT, NONE); DO_TEST("boot-cdrom", NONE); DO_TEST("boot-network", NONE); DO_TEST("boot-floppy", NONE); -- 1.7.10.1

4 10

[libvirt] RFC: dhcp <option> element revisited
by Laine Stump 06 Apr '13

06 Apr '13

Before 1.0.3, Pieter Hollants kindly implemented the XML I had earlier suggested to support configure-by-number dhcp options in libvirt networks. https://www.redhat.com/archives/libvir-list/2013-February/msg01251.html I also posted a followup patch for a "force" attribute to options: https://www.redhat.com/archives/libvir-list/2013-February/msg01349.html I actually pushed a slightly fixed version of Pieter's patch, and was looking for an ACK to mine when Eric questioned whether it was all really ready to push since we hadn't implemented *named* options (although there is no official RFC standard for the names of options, dnsmasq uses a pretty good set of lowercase-dash-separated names that make sense, and would certainly make it easier to decode the config). At the time I had just started trying to write such a patch, and was realizing that the XML we'd come up with didn't have any provision to easily deal with an option that took a list of values (multiple IP addresses, multiple domain names, etc); for numbered options we could just punt on this and say "put the multiple values in the single 'value' attribute, separated by commas", but we all know that's a cop-out, so I decided to temporarily pull Pieter's patch to avoid regrets over getting something suboptimal in an official release. That's all the history. Now on to discussing how we should modify these patches to be exactly what we want. I tried digging down into the data of the options to try and make an exhaustive XML representation, with the results below (these would all go directly inside the <dhcp> element of a libvirt network). But it's starting to seem like the deeper I go, the deeper it gets (the classless-static-route option is the current "deepest", and I haven't even attempted to do anything about vendor-specific options), so I'm starting to wonder where to draw the line - see the "STEPPING BACK" section at the bottom. 1) numeric option, single value: <option code='119'> <value type='domain' data='a.example.com'/> </option> (Note that I changed "number" to "code" after seeing that suggestion in [1] because that's what it's called in the RFC). (Also note that the actual encoding of option 119's data is more complicated than described here [2], but it's complicated enough that I think whatever dhcp server implementation is underneath libvirt will need to know the details anyway and decided what we should go for with the "type" attribute is enough for libvirt to validate the input, not necessarily to encode it into a DHCP response packet; any translation from the validated input will be handled internally to the backend driver (currently bridge_driver.c which uses dnsmasq) (I'm actually wondering if type is needed in the XML at all, since the type of any piece of data is always either implicit, or unknown (in which case we just accept any text and pass it through to the backend driver).) 2) numeric option, multiple values: <option code='119' force='yes'> <value type='domain' data='a.example.com'/> <value type='domain' data='b.example.com'/> <value type='domain' data='c.example.com'/> </option> 3) named option, single simple value: <option name='ip-forward-enable'> <value type='boolean' data='yes'/> </option> 4) named option, multiple simple values: <option name='dns-server'> <value type='ipv4Addr' data='10.1.1.1'/> <value type='ipv4Addr' data='10.1.1.2'/> </option> <option (for all named options and known numeric options, the "type" field would be optional, as libvirt will already have an internal table associating option names/code with the type of data, as well as whether or not multiples are allowed) 5) named option, multiple compound values: <option name='classless-static-route'> <value type='compound'> <value type='ipv4Addr' data='1.2.3.0'/> <value type='ipv4Prefix' data='24'/> <value type='ipv4Addr' data='192.168.122.5'/> </value> <value type='compound'> <value type='ipv4Addr' data='1.2.4.0'/> <value type='ipv4Prefix' data='24'/> <value type='ipv4Addr' data='192,.168.122.6'/> </value> </option> (I suppose this could also be done as a flat list, since every static route needs all three) The types I can see that we need (to describe everything in RFC2132 (except vendor-specific options) and the other options I know about) are: ipv4Addr ipv4Prefix text path domain boolean number ANOTHER POSSIBILITY =================== Another way of dealing with options that permit lists of multiple values - just specify the option multiple times, e.g.: <option name='dnsServer' type='ipv4Addr' data='10.1.1.1'/> <option name='dnsServer' type='ipv4Addr' data='10.1.1.2'/> ============================ BTW - another point; I had earlier said that we didn't need to worry about an option number blacklist/whitelist. After looking through the options in RFC 2132, I've changed my mind - many of the option codes (particularly those in the 50's) aren't really general purpose options, but are used by dhcp as integral parts of implementing the exchange sequence between the server and client. So I think what we need to do is have a whitelist that has an entry for every dhcp option we are willing to accept. It would contain: uint8 code; const char *name; /* could be "", in which case we don't recognize a name for it */ unsigned int flags; /* whether or not multiple values are allowed, name recognized by dnsmasq */ /* some representation of type here - what to do about the "compound" type? */ STEPPING BACK ------------- So are we going too far with this? Or should we dial it back to the original proposal in Pieter's patch and just say that 1) if <option> is used, the data is passed through unqualified to the dhcp implementation 2) only "simple", known option types with a single no-repeating value can be specified this way (and data type is implied)(this would be enforced with the "whitelist") 3) then implement separate elements for the complicated/repeating options, e.g.: <route destination='1.2.3.0' prefix='24' nextHop='192.168.122.5'/> <route destination='1.2.4.0' prefix='24' nextHop='192.168.122.6'/> ... <dnsServer address='10.1.1.1'/> <dnsServer address='10.1.1.2'/> Or maybe to simplify the parser this would work as: <option name='classless-static-route' destination='1.2.3.0' prefix='24' nextHop='192.168.122.5'/> <option name='classless-static-route' destination='1.2.4.0' prefix='24' nextHop='192.168.122.6'/> ... <option name='dns-server address='10.1.1.1'/> <option name='dns-server address='10.1.1.2'/> Either of these definitely seems more compact and easy to understand than all that ranting and raving at the top of this message... Any other suggestions? === [1] https://bugzilla.redhat.com/show_bug.cgi?id=666556 [2] https://tools.ietf.org/rfc/rfc3397.txt

2 2

[libvirt] Patch set to add InteractiveContainer support to virt-sandbox
by Dan Walsh 06 Apr '13

06 Apr '13

Resend of patches with lots of cleanups. This patch set adds InteractiveContainer support to virt-sandbox-service command. This is needed if we want to support the OpenShift model of containers. There are also some bug fix patches in the set. [sandbox PATCH 01/15] virt-sandbox-service-util needs to free [sandbox PATCH 02/15] Add support for InteractiveContainers to [sandbox PATCH 03/15] Move virt-sandbox-service bash completion [sandbox PATCH 04/15] Add -u UNITFILE option to virt-sandbox-service [sandbox PATCH 05/15] Change virt-sandbox-service-create.pod to use [sandbox PATCH 06/15] Internationalize all output strings in [sandbox PATCH 07/15] Remove distinction from Internal vs External [sandbox PATCH 08/15] Make CONFIG_PATH external to the Container [sandbox PATCH 09/15] Add exception handler GlibGerror to [sandbox PATCH 10/15] Change variable config to config_path to avoid [sandbox PATCH 11/15] Refactor Container class into Container and [sandbox PATCH 12/15] Add support for InteractiveContainer [sandbox PATCH 13/15] Use args.uri rather then hard coding lxc:/// [sandbox PATCH 14/15] Check for LXC if virt-sandbox-service execute [sandbox PATCH 15/15] Create new /etc/rc.d directory to bind mount

3 31

[libvirt] [PATCH v3] util: Add a helper to check if all bits of a bitmap are clear
by Osier Yang 06 Apr '13

06 Apr '13

--- src/libvirt_private.syms | 1 + src/util/virbitmap.c | 17 +++++++++++++++++ src/util/virbitmap.h | 3 +++ tests/virbitmaptest.c | 33 ++++++++++++++++++++++++++++++++- 4 files changed, 53 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b7b9631..6b831b3 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1046,6 +1046,7 @@ virBitmapEqual; virBitmapFormat; virBitmapFree; virBitmapGetBit; +virBitmapIsAllClear; virBitmapIsAllSet; virBitmapNew; virBitmapNewCopy; diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 21509ac..998c302 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -591,6 +591,23 @@ bool virBitmapIsAllSet(virBitmapPtr bitmap) } /** + * virBitmapIsAllClear: + * @bitmap: the bitmap to check + * + * check if all bits in @bitmap are clear + */ +bool virBitmapIsAllClear(virBitmapPtr bitmap) +{ + int i; + + for (i = 0; i < bitmap->map_len; i++) + if (bitmap->map[i] != 0) + return false; + + return true; +} + +/** * virBitmapNextSetBit: * @bitmap: the bitmap * @pos: the position after which to search for a set bit diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index 044c7a6..b682523 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -100,6 +100,9 @@ void virBitmapClearAll(virBitmapPtr bitmap) bool virBitmapIsAllSet(virBitmapPtr bitmap) ATTRIBUTE_NONNULL(1); +bool virBitmapIsAllClear(virBitmapPtr bitmap) + ATTRIBUTE_NONNULL(1); + ssize_t virBitmapNextSetBit(virBitmapPtr bitmap, ssize_t pos) ATTRIBUTE_NONNULL(1); diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index 95d010a..3067f6e 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -125,6 +125,8 @@ static int test2(const void *data ATTRIBUTE_UNUSED) goto error; virBitmapClearAll(bitmap); + if (!virBitmapIsAllClear(bitmap)) + goto error; if (testBit(bitmap, 0, size - 1, false) < 0) goto error; if (virBitmapCountBits(bitmap) != 0) @@ -154,6 +156,9 @@ static int test3(const void *data ATTRIBUTE_UNUSED) if (!virBitmapIsAllSet(bitmap)) goto error; + virBitmapClearAll(bitmap); + if (!virBitmapIsAllClear(bitmap)) + goto error; ret = 0; error: @@ -196,6 +201,9 @@ static int test4(const void *data ATTRIBUTE_UNUSED) if (virBitmapNextClearBit(bitmap, i) != -1) goto error; + if (!virBitmapIsAllClear(bitmap)) + goto error; + virBitmapFree(bitmap); bitmap = NULL; @@ -406,6 +414,10 @@ static int test7(const void *v ATTRIBUTE_UNUSED) if (!virBitmapIsAllSet(bitmap)) goto error; + virBitmapClearAll(bitmap); + if (!virBitmapIsAllClear(bitmap)) + goto error; + virBitmapFree(bitmap); } @@ -416,6 +428,24 @@ error: return -1; } +static int test8(const void *v ATTRIBUTE_UNUSED) +{ + virBitmapPtr bitmap = NULL; + char data[108] = {0x00,}; + + bitmap = virBitmapNewData(data, sizeof(data)); + if (!bitmap) + goto error; + + if (!virBitmapIsAllClear(bitmap)) + goto error; + + return 0; +error: + virBitmapFree(bitmap); + return -1; +} + static int mymain(void) { @@ -435,7 +465,8 @@ mymain(void) ret = -1; if (virtTestRun("test7", 1, test7, NULL) < 0) ret = -1; - + if (virtTestRun("test8", 1, test8, NULL) < 0) + ret = -1; return ret; } -- 1.8.1.4

2 2

[libvirt] [PATCH v2] qemu: Support multiple queue virtio-scsi
by Osier Yang 06 Apr '13

06 Apr '13

This introduce a new attribute "num_queues" (same with the good name QEMU uses) for virtio-scsi controller. An example of the XML: <controller type='scsi' index='0' model='virtio-scsi' num_queues='8'/> The corresponding QEMU command line: -device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ --- docs/formatdomain.html.in | 18 +++++++++------ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 13 +++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 11 +++++++++ .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 8 +++++++ .../qemuxml2argv-disk-virtio-scsi-num_queues.xml | 26 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index cf382e8..2973ce2 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2092,13 +2092,17 @@ controller. A "scsi" controller has an optional attribute <code>model</code>, which is one of "auto", "buslogic", "ibmvscsi", "lsilogic", "lsisas1068", "lsisas1078", "virtio-scsi" or - "vmpvscsi". A "usb" controller has an optional attribute - <code>model</code>, which is one of "piix3-uhci", "piix4-uhci", "ehci", - "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3", - "vt82c686b-uhci", "pci-ohci" or "nec-xhci". Additionally, - since 0.10.0, if the USB bus needs to be - explicitly disabled for the guest, <code>model='none'</code> may be used. - The PowerPC64 "spapr-vio" addresses do not have an associated controller. + "vmpvscsi". The attribute <code>num_queues</code> + (1.0.5 (QEMU and KVM only)) is to specify + the number of queues for the controller, it's recommended to specify + the value matching the number of vCPUs for best performance. A "usb" + controller has an optional attribute <code>model</code>, which is one + of "piix3-uhci", "piix4-uhci", "ehci", "ich9-ehci1", "ich9-uhci1", + "ich9-uhci2", "ich9-uhci3", "vt82c686b-uhci", "pci-ohci" or "nec-xhci". + Additionally, since 0.10.0, if the USB bus + needs to be explicitly disabled for the guest, <code>model='none'</code> + may be used. The PowerPC64 "spapr-vio" addresses do not have an + associated controller. diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 63ba7d1..d486ae8 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1427,6 +1427,11 @@ </attribute> </optional> <optional> + <attribute name="num_queues"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> <ref name="usbmaster"/> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5ad3080..f50a964 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5034,6 +5034,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, char *type = NULL; char *idx = NULL; char *model = NULL; + char *num_queues = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -5069,6 +5070,14 @@ virDomainControllerDefParseXML(xmlNodePtr node, def->model = -1; } + if ((num_queues = virXMLPropString(node, "num_queues"))) { + if (virStrToLong_ui(num_queues, NULL, 10, &def->num_queues) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Malformed 'num_queues' value '%s'"), num_queues); + goto error; + } + } + if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; @@ -5146,6 +5155,7 @@ cleanup: VIR_FREE(type); VIR_FREE(idx); VIR_FREE(model); + VIR_FREE(num_queues); return def; @@ -13195,6 +13205,9 @@ virDomainControllerDefFormat(virBufferPtr buf, virBufferEscapeString(buf, " model='%s'", model); } + if (def->num_queues) + virBufferAsprintf(buf, " num_queues='%u'", def->num_queues); + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: if (def->opts.vioserial.ports != -1) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 700f03f..75e3f15 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -728,6 +728,7 @@ struct _virDomainControllerDef { int type; int idx; int model; /* -1 == undef */ + unsigned int num_queues; union { virDomainVirtioSerialOpts vioserial; } opts; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 493e5f8..53caba5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3533,6 +3533,14 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, virBuffer buf = VIR_BUFFER_INITIALIZER; int model; + if (def->num_queues && + !(def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && + def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'num_queues' is only supported by virtio-scsi controller")); + return NULL; + } + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: model = def->model; @@ -3616,6 +3624,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, goto error; } + if (def->num_queues) + virBufferAsprintf(&buf, ",num_queues=%u", def->num_queues); + if (qemuBuildDeviceAddressStr(&buf, &def->info, qemuCaps) < 0) goto error; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args new file mode 100644 index 0000000..8d46799 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args @@ -0,0 +1,8 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml new file mode 100644 index 0000000..dfa9cf1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml @@ -0,0 +1,26 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>8</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi' num_queues='8'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 099fb36..d6575e7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -553,6 +553,9 @@ mymain(void) DO_TEST("disk-scsi-virtio-scsi", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-virtio-scsi-num_queues", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-megasas", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index aa058bd..10a6ea2 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -179,6 +179,7 @@ mymain(void) DO_TEST("disk-scsi-device"); DO_TEST("disk-scsi-vscsi"); DO_TEST("disk-scsi-virtio-scsi"); + DO_TEST("disk-virtio-scsi-num_queues"); DO_TEST("disk-scsi-megasas"); DO_TEST_FULL("disk-mirror", false, WHEN_ACTIVE); DO_TEST_FULL("disk-mirror", true, WHEN_INACTIVE); -- 1.8.1.4

2 2

[libvirt] [PATCH 0/7] Fix multiple compiler warnings on ARMv7
by Daniel P. Berrange 05 Apr '13

05 Apr '13

The ARMv7 builds of libvirt generate a number of warnings, mostly about cast alignment http://arm.koji.fedoraproject.org/packages/libvirt/1.0.4/1.fc19/data/logs/a… this patch series fixes as many as possible, and then disables warnings for the rest using a pragma

3 17

[libvirt] [PATCH 0/3] Prohibit passing all clear cpumap for vcpupin/emulatorpin
by Osier Yang 05 Apr '13

05 Apr '13

*** NONE *** Osier Yang (3): util: Add a helper to check if all bits of a bitmap are clear qemu: Error out if the bitmap for pinning is all clear virsh: Prohibit all clear cpumap src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 12 ++++++++++++ src/util/virbitmap.c | 30 ++++++++++++++++++++++++++++++ src/util/virbitmap.h | 3 +++ tools/virsh-domain.c | 35 ++++++++++++++++++++++++++++++----- 5 files changed, 76 insertions(+), 5 deletions(-) -- 1.8.1.4

4 15

[libvirt] [PATCH] build: check correct protocol.o file
by Eric Blake 05 Apr '13

05 Apr '13

By default, libtool builds two .o files for every .lo rule: src/foo.o - static builds src/.libs/foo.o - shared library builds But since commit ad42b34b disabled static builds, src/foo.o is no longer built by default. On a fresh checkout, this means our protocol check rules using pdwtags were testing a missing file, and thanks a lousy behavior of pdwtags happily giving no output and 0 exit status (http://bugzilla.redhat.com/949034) we were merely claiming that "dwarves is too old" and skipping the test. However, if you swap between branches and do incremental builds, such as building v0.10.2-maint and then switching back to master, you end up with src/foo.o being leftover from its 0.10.2 state, and then 'make check' fails because the .o file does not match the protocol-structs file due to API additions in the meantime. A simpler fix would be to always look in .libs for the .o to be parsed; but since it is possible to pass ./configure options to tell libtool to do a static-only build with no shared .o, I went with the approach of finding the newest of the two files, whenever both exist. * src/Makefile.am (PDWTAGS): Ensure we test just-built file. --- Pushing under the build-breaker rule. src/Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 78b4ab6..5dc58f9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -341,9 +341,16 @@ r1 = /\* \d+ \*/ r2 = /\* <[[:xdigit:]]+> \S+:\d+ \*/ struct_prefix = (remote_|qemu_|lxc_|virNet|keepalive_) +# Depending on configure options, libtool creates one or both of +# {,.libs/}libvirt_remote_driver_la-remote_protocol.o. We want the +# newest of the two, in case configure options changed and a stale +# file is left around from an earlier build. PDWTAGS = \ $(AM_V_GEN)if (pdwtags --help) > /dev/null 2>&1; then \ - pdwtags --verbose $(<:.lo=.$(OBJEXT)) > $(@F)-t1 2> $(@F)-t2; \ + file=`ls -t $(<:.lo=.$(OBJEXT)) .libs/$(<:.lo=.$(OBJEXT)) \ + 2>/dev/null | sed -n 1p`; \ + test -f $$file || { echo ".o for $< not found" >&2; exit 1; };\ + pdwtags --verbose $$file > $(@F)-t1 2> $(@F)-t2; \ if test -s $(@F)-t2; then \ rm -rf $(@F)-t?; \ echo 'WARNING: pdwtags appears broken; skipping the $@ test' >&2;\ -- 1.8.1.4

1 0

[libvirt] [PATCH] Add a test suite for keycode mapping functions
by Daniel P. Berrange 05 Apr '13

05 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Validate that translations between different keycode sets are functioning. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/virkeycodetest.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 tests/virkeycodetest.c diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c new file mode 100644 index 0000000..d3c5975 --- /dev/null +++ b/tests/virkeycodetest.c @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2013 Red Hat, Inc. + * + * 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, see + * <http://www.gnu.org/licenses/>. + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include <stdlib.h> + +#include "testutils.h" + +#include "virkeycode.h" +#include "virutil.h" +#include "virerror.h" +#include "viralloc.h" +#include "virlog.h" + +#include "virlockspace.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + + +static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED) +{ + int ret = -1; + int got; + +#define TRANSLATE(from, to, val, want) \ + do { \ + if ((got = virKeycodeValueTranslate(VIR_KEYCODE_SET_##from, \ + VIR_KEYCODE_SET_##to, \ + val)) != want) { \ + fprintf(stderr, "Translating %d from %s to %s, got %d want %d\n", \ + val, #from, #to, got, want); \ + goto cleanup; \ + } \ + } while (0) + + TRANSLATE(LINUX, LINUX, 111, 111); + TRANSLATE(LINUX, USB, 111, 76); + TRANSLATE(LINUX, RFB, 88, 88); + TRANSLATE(LINUX, RFB, 160, 163); + TRANSLATE(ATSET2, ATSET3, 259, 55); + +#undef TRANSLATE + + ret = 0; +cleanup: + return ret; +} + + +static int testKeycodeStrings(const void *data ATTRIBUTE_UNUSED) +{ + int ret = -1; + int got; + +#define TRANSLATE(from, str, want) \ + do { \ + if ((got = virKeycodeValueFromString(VIR_KEYCODE_SET_##from, \ + str)) != want) { \ + fprintf(stderr, "Converting %s from %s, got %d want %d\n", \ + str, #from, got, want); \ + goto cleanup; \ + } \ + } while (0) + + TRANSLATE(LINUX, "KEY_DELETE", 111); + TRANSLATE(OSX, "Function", 0x3f); + TRANSLATE(WIN32, "VK_UP", 0x26); + +#undef TRANSLATE + + ret = 0; +cleanup: + return ret; +} + +static int +mymain(void) +{ + int ret = 0; + + if (virtTestRun("Keycode mapping ", 1, testKeycodeMapping, NULL) < 0) + ret = -1; + if (virtTestRun("Keycode strings ", 1, testKeycodeStrings, NULL) < 0) + ret = -1; + + return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) -- 1.8.1.4

2 2

[libvirt] [PATCH] build: use proper pod for nested bulleted VIRSH_DEBUG list
by Eric Blake 05 Apr '13

05 Apr '13

Newer pod (hello rawhide) complains if you attempt to mix bullets and non-bullets in the same list: virsh.pod around line 3177: Expected text after =item, not a bullet As our intent was to nest an inner list, we make that explicit to keep pod happy. * tools/virsh.pod (ENVIRONMENT): Use correct pod syntax. --- Pushing under the build-breaker rule. tools/virsh.pod | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 1c8f9ee..89467f6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3174,6 +3174,8 @@ of C<virsh> Turn on verbose debugging of virsh commands. Valid levels are +=over 4 + =item * VIRSH_DEBUG=0 DEBUG - Messages at ALL levels get logged @@ -3194,6 +3196,8 @@ WARNING - Logs messages at levels WARNING and ERROR ERROR - Messages at only ERROR level gets logged. +=back + =item VIRSH_LOG_FILE=C<LOGFILE> The file to log virsh debug messages. -- 1.8.1.4

1 0

[libvirt] [PATCH] qemu: Don't require a block or file when looking for an alias.
by Wido den Hollander 05 Apr '13

05 Apr '13

From: root <root(a)kvm01.(none)> This for example prohibits you to use iotune for Ceph or Sheepdog devices. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/qemu/qemu_driver.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 552a81b..464d30a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13032,10 +13032,6 @@ qemuDiskPathToAlias(virDomainObjPtr vm, const char *path, int *idx) if (idx) *idx = i; - if (disk->type != VIR_DOMAIN_DISK_TYPE_BLOCK && - disk->type != VIR_DOMAIN_DISK_TYPE_FILE) - goto cleanup; - if (disk->src) { if (virAsprintf(&ret, "drive-%s", disk->info.alias) < 0) { virReportOOMError(); -- 1.7.9.5

2 2

[libvirt] [PATCH] Make guest OS bootable when hardware failure happens in log disk
by Seiji Aguchi 05 Apr '13

05 Apr '13

[Problem] Currently, guest OS's messages can be logged to a local disk of host OS by creating chadevs with options below. -chardev file,id=charserial0,path=<log file's path> -device isa-serial,chardev=chardevserial0,id=serial0 When a hardware failure happens in the disk, qemu-kvm can't create the chardevs. In this case, guest OS doesn't boot up. Actually, there are users who don't desire that guest OS goes down due to a hardware failure of a log disk only.Therefore, libvirt should offer some way to boot guest OS up even if the log disk is broken. [Solution] This patch changes a destination to /dev/null in case a log file can't be opened. Signed-off-by: Seiji Aguchi <seiji.aguchi(a)hds.com> --- src/qemu/qemu_process.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8c4bfb7..fdf26ad 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2440,7 +2440,25 @@ qemuProcessPrepareChardevDevice(virDomainDefPtr def ATTRIBUTE_UNUSED, virReportSystemError(errno, _("Unable to pre-create chardev file '%s'"), dev->source.data.file.path); - return -1; + VIR_FREE(dev->source.data.file.path); + /* + * Change a destination to /dev/null to boot guest OS up + * even if a log disk is broken. + */ + dev->source.data.file.path = strdup("/dev/null"); + + if (!dev->source.data.file.path) { + virReportOOMError(); + return -1; + } + + if ((fd = open(dev->source.data.file.path, + O_CREAT | O_APPEND, S_IRUSR|S_IWUSR)) < 0) { + virReportSystemError(errno, + _("Unable to pre-create chardev file '%s'"), + dev->source.data.file.path); + return -1; + } } VIR_FORCE_CLOSE(fd); -- 1.7.1

2 2

[libvirt] [PATCH] qemu: Remove maximum cpu limit when setting processor count using the API
by Peter Krempa 05 Apr '13

05 Apr '13

When setting processor count for a domain using the API libvirt enforced a maximum processor count, while it isn't enforced when taking the XML path. This patch removes the check to match the API. --- src/qemu/qemu_driver.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3f62414..833bf7f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3737,8 +3737,6 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef; - const char * type; - int max; int ret = -1; bool maximum; virQEMUDriverConfigPtr cfg = NULL; @@ -3778,27 +3776,11 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto endjob; } - if (!(type = virDomainVirtTypeToString(vm->def->virtType))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown virt type in domain definition '%d'"), - vm->def->virtType); - goto endjob; - } - - if ((max = qemuGetMaxVCPUs(NULL, type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("could not determine max vcpus for the domain")); - goto endjob; - } - - if (!maximum && vm->def->maxvcpus < max) { - max = vm->def->maxvcpus; - } - - if (nvcpus > max) { + if (!maximum && nvcpus > vm->def->maxvcpus) { virReportError(VIR_ERR_INVALID_ARG, _("requested vcpus is greater than max allowable" - " vcpus for the domain: %d > %d"), nvcpus, max); + " vcpus for the domain: %d > %d"), + nvcpus, vm->def->maxvcpus); goto endjob; } -- 1.8.1.5

2 4

[libvirt] [PATCH 0/5] Drop virReportOOMReport from almost everywhere
by Michal Privoznik 05 Apr '13

05 Apr '13

3 13

[libvirt] [PATCH v2 2/2] Implement support for <hostdev caps=net>
by Bogdan Purcareata 05 Apr '13

05 Apr '13

This allows a container-type domain to have exclusive access to one of the host's NICs. Wire <hostdev caps=net> with the lxc_controller - when moving the newly created veth devices into a new namespace, also look for any hostdev devices that should be moved. Note: once the container domain has been destroyed, there is no code that moves the interfaces back to the original namespace. This does happen, though, probably due to default cleanup on namespace destruction. Signed-off-by: Bogdan Purcareata <bogdan.purcareata(a)freescale.com> --- src/lxc/lxc_container.c | 4 +++- src/lxc/lxc_controller.c | 16 ++++++++++++++++ src/lxc/lxc_hostdev.c | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 002ba9e..e59bfdf 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1551,7 +1551,6 @@ cleanup: return ret; } - static int lxcContainerSetupHostdevSubsys(virDomainDefPtr vmDef, virDomainHostdevDefPtr def, const char *dstprefix, @@ -1582,6 +1581,9 @@ static int lxcContainerSetupHostdevCaps(virDomainDefPtr vmDef, case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: return lxcContainerSetupHostdevCapsMisc(vmDef, def, dstprefix, securityDriver); + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: + return 0; // case is handled in virLXCControllerMoveInterfaces + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported host device mode %s"), diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index cede445..edd99bf 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1050,12 +1050,28 @@ cleanup2: static int virLXCControllerMoveInterfaces(virLXCControllerPtr ctrl) { size_t i; + virDomainDefPtr def = ctrl->def; for (i = 0 ; i < ctrl->nveths ; i++) { if (virNetDevSetNamespace(ctrl->veths[i], ctrl->initpid) < 0) return -1; } + for (i = 0; i < def->nhostdevs; i ++) { + virDomainHostdevDefPtr hdev = def->hostdevs[i]; + + if (hdev->mode != VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) + continue; + + virDomainHostdevCaps hdcaps = hdev->source.caps; + + if (hdcaps.type != VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET) + continue; + + if (virNetDevSetNamespace(hdcaps.u.net.iface, ctrl->initpid) < 0) + return -1; + } + return 0; } diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c index 33b0b60..53a1a31 100644 --- a/src/lxc/lxc_hostdev.c +++ b/src/lxc/lxc_hostdev.c @@ -307,6 +307,7 @@ int virLXCPrepareHostDevices(virLXCDriverPtr driver, switch (dev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC: + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.7.11.7

1 0

[libvirt] libvirt_lxc: implement <hostdev caps=net> device isolation in containers
by Bogdan Purcareata 05 Apr '13

05 Apr '13

This set of patches implements <hostdev caps=net> interface isolation in containers, thus allowing an interface NIC to be assigned exclusively to a container-domain. This is done like moving veth devices in container namespaces, only this time it is actual host devices.

2 4

[libvirt] [PATCH v5.1 00/11] Introduce driver specific XML parsing callbacks
by Peter Krempa 05 Apr '13

05 Apr '13

In this respin the renaming patch is moved to be first in the series. The argument rearrangement patch was too complicated to move. Unfortunately this rebase operation caused my "git notes" to be lost for the individual patches, so please see v5 for more specific comments. Patches 5 to 11 except for 10 were ACKed in previous versions. Peter Krempa (11): maint: Rename xmlconf to xmlopt and virDomainXMLConfing to virDomainXMLOption conf: Add post XML parse callbacks and prepare for cleaning of virCaps conf callback: Rearrange function parameters qemu: Record the default NIC model in the domain XML virCaps: get rid of "defaultInitPath" value in the virCaps struct virCaps: get rid of defaultDiskDriverName virCaps: get rid of emulatorRequired virCaps: get rid of defaultDiskDriverType virCaps: get rid of hasWideScsiBus virCaps: get rid of macPrefix field virCaps: get rid of defaultConsoleTargetType callback src/conf/capabilities.c | 24 - src/conf/capabilities.h | 23 - src/conf/domain_conf.c | 660 ++++++++++++--------- src/conf/domain_conf.h | 102 ++-- src/conf/snapshot_conf.c | 4 +- src/conf/snapshot_conf.h | 2 +- src/esx/esx_driver.c | 32 +- src/esx/esx_private.h | 2 +- src/libvirt_private.syms | 10 +- src/libvirt_vmx.syms | 1 + src/libxl/libxl_conf.c | 13 - src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_driver.c | 103 ++-- src/lxc/lxc_conf.c | 21 +- src/lxc/lxc_conf.h | 4 +- src/lxc/lxc_controller.c | 10 +- src/lxc/lxc_domain.c | 34 ++ src/lxc/lxc_domain.h | 1 + src/lxc/lxc_driver.c | 71 ++- src/lxc/lxc_process.c | 8 +- src/openvz/openvz_conf.c | 16 +- src/openvz/openvz_conf.h | 2 +- src/openvz/openvz_driver.c | 64 +- src/parallels/parallels_driver.c | 37 +- src/parallels/parallels_utils.h | 2 +- src/phyp/phyp_driver.c | 24 +- src/phyp/phyp_driver.h | 2 +- src/qemu/qemu_capabilities.c | 19 - src/qemu/qemu_command.c | 27 +- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_conf.c | 18 +- src/qemu/qemu_conf.h | 5 +- src/qemu/qemu_domain.c | 98 ++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 147 +++-- src/qemu/qemu_migration.c | 21 +- src/qemu/qemu_process.c | 34 +- src/security/virt-aa-helper.c | 19 +- src/test/test_driver.c | 67 +-- src/uml/uml_conf.c | 9 - src/uml/uml_conf.h | 2 +- src/uml/uml_driver.c | 69 ++- src/vbox/vbox_tmpl.c | 33 +- src/vmware/vmware_conf.c | 21 +- src/vmware/vmware_conf.h | 2 +- src/vmware/vmware_driver.c | 24 +- src/vmx/vmx.c | 39 +- src/vmx/vmx.h | 12 +- src/xen/xen_driver.c | 37 +- src/xen/xen_driver.h | 4 +- src/xen/xen_hypervisor.c | 13 - src/xen/xend_internal.c | 20 +- src/xen/xm_internal.c | 16 +- src/xenapi/xenapi_driver.c | 40 +- src/xenapi/xenapi_driver_private.h | 2 +- tests/domainsnapshotxml2xmltest.c | 6 +- tests/lxcxml2xmldata/lxc-hostdev.xml | 1 + tests/lxcxml2xmldata/lxc-systemd.xml | 1 + tests/lxcxml2xmltest.c | 8 +- tests/qemuargv2xmltest.c | 6 +- tests/qemumonitorjsontest.c | 28 +- tests/qemumonitortestutils.c | 4 +- tests/qemumonitortestutils.h | 2 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-export.xml | 1 + ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 3 +- ...xml2argv-disk-drive-network-nbd-ipv6-export.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd-unix.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-unix.xml | 1 + .../qemuxml2argv-disk-drive-network-nbd.args | 5 +- .../qemuxml2argv-disk-drive-network-nbd.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 1 + .../qemuxml2argv-disk-drive-network-rbd.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 1 + .../qemuxml2argv-disk-drive-network-sheepdog.args | 3 +- .../qemuxml2argv-disk-drive-network-sheepdog.xml | 1 + .../qemuxml2argv-net-bandwidth.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-client.args | 4 +- .../qemuxml2argv-net-eth-ifname.args | 4 +- .../qemuxml2argv-net-eth-ifname.xml | 1 + .../qemuxml2argv-net-eth-names.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 4 +- .../qemuxml2argv-net-openvswitch.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-server.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 1 + .../qemuxml2argv-net-virtio-network-portgroup.xml | 2 + tests/qemuxml2argvtest.c | 6 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 1 + tests/qemuxml2xmltest.c | 6 +- tests/qemuxmlnstest.c | 6 +- tests/securityselinuxlabeltest.c | 6 +- tests/testutilslxc.c | 9 - tests/testutilsqemu.c | 11 - tests/testutilsqemu.h | 2 +- tests/testutilsxen.c | 16 - tests/testutilsxen.h | 2 - tests/vmx2xmltest.c | 17 +- tests/xmconfigtest.c | 8 +- tests/xml2sexprtest.c | 9 +- tests/xml2vmxtest.c | 20 +- 108 files changed, 1275 insertions(+), 1052 deletions(-) -- 1.8.1.5

5 32

[libvirt] Device backend in another domain (xen)
by Marek Marczykowski 05 Apr '13

05 Apr '13

Hi all, Xen have (AFAIK unique) feature of having backend device in other domU (sometimes called driver domain) instead of dom0. Currently libxl support it for disk and network devices, but in general it is valid for any device (perhaps excluding PCI). Current implementation requires ID of backend domain to be specified during device attach/domain startup. There are some upcoming patches to allow also use domain name. I'd like to add support for it into libvirt. The question is how specify domain reference. The simplest approach is to use direct domain ID, logically it fits in <source/> tag, so something like: <disk type='file'> <source file='/path/to/file/inside/domain/7' domid='7'/> <target dev='xvdb'/> </disk> <interface type='bridge'> <source bridge='name-of-bridge-in-domiain-7' domid='7'/> </interface> This have obvious limitation that domain ID changes with each domain restart. But perhaps more correct approach is to use name or UUID? Extending <source/> tag is right thing to do? Or should I add a new tag (<backenddomain uuid='...'/> ? )? Regarding implementation I need some hints how to do the value verification (check if domain exists at least). If it has to be done in domain_conf.c (during XML parsing) it will require predetermined domain load order, which IMHO isn't acceptable. So perhaps the check should be done at domain startup/device attach (by driver)? In any case: is it possible at all to check if domain with given name/UUID exists in scope of domain_conf.c? It looks like it requires connection reference, which isn't passed to virDomain*DefParseXML. -- Best Regards, Marek Marczykowski Invisible Things Lab

2 1

[libvirt] [PATCH 1/3] Remove support for old kernels lacking private devpts
by Daniel P. Berrange 05 Apr '13

05 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Early on kernel support for private devpts was not widespread, so we had compatibiltiy codepaths. Such old kernels are not seriously used for LXC these days, so the compat code can go away Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_controller.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 1d1443c..cede445 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1252,8 +1252,9 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) } if (access(ctrl->devptmx, R_OK) < 0) { - VIR_WARN("Kernel does not support private devpts, using shared devpts"); - VIR_FREE(ctrl->devptmx); + virReportSystemError(ENOSYS, "%s", + _("Kernel does not support private devpts")); + goto cleanup; } ret = 0; @@ -1278,24 +1279,13 @@ virLXCControllerSetupConsoles(virLXCControllerPtr ctrl, size_t i; for (i = 0 ; i < ctrl->nconsoles ; i++) { - if (ctrl->devptmx) { - VIR_DEBUG("Opening tty on private %s", ctrl->devptmx); - if (lxcCreateTty(ctrl->devptmx, - &ctrl->consoles[i].contFd, - &containerTTYPaths[i]) < 0) { - virReportSystemError(errno, "%s", - _("Failed to allocate tty")); - return -1; - } - } else { - VIR_DEBUG("Opening tty on shared /dev/ptmx"); - if (virFileOpenTty(&ctrl->consoles[i].contFd, - &containerTTYPaths[i], - 0) < 0) { - virReportSystemError(errno, "%s", + VIR_DEBUG("Opening tty on private %s", ctrl->devptmx); + if (lxcCreateTty(ctrl->devptmx, + &ctrl->consoles[i].contFd, + &containerTTYPaths[i]) < 0) { + virReportSystemError(errno, "%s", _("Failed to allocate tty")); - return -1; - } + return -1; } } return 0; -- 1.7.11.7

3 11

[libvirt] [RFC] Per machine type qemu capability detection
by Peter Krempa 04 Apr '13

04 Apr '13

Hi, qemu recently added a qmp/hmp command ("get-cpu-max") to determine maximum number of supported CPUs for a VM. The output of this command depends on the machine type that is used when it is called. The problem here is that libvirt uses "-M none" while detecting capabilities and with that machine type the get-cpu-max command returns always 1. My question is: Is it worthwhile to do per machine type capability detection? It definitely isn't worth doing just for the get-cpu-max support, but it might be needed for Q35 or other stuff that may depend on the actual machine type used. Pros of this approach: ---------------------- - (possibly) more accurate capabilities Cons: ----- - ~10x more qemus started on libvirtd startup (one per machine type) Thanks for your opinions. Peter

4 6

[libvirt] [RFC 0/5] X86CPU "feature-words" & "filtered-features" properties (v2)
by Eduardo Habkost 04 Apr '13

04 Apr '13

Changes v2: * Added "filtered-features" properties * Removed the non-qapi version and kept only the qapi version of the code * Moved the new types to qapi-schema.json instead of creating cpu-qapi-schema.json * Rebased on top of "feature words array" series Git tree: https://github.com/ehabkost/qemu-hacks/tree/work/cpu-raw-feature-props-v2 git://github.com/ehabkost/qemu-hacks.git work/cpu-raw-feature-props-v2 Description: As the work to get X86CPU subclasses static properties defined is taking very long to get reviewed and we risk not getting it finished in 1.5, I am sending an alternative mechanism to allow libvirt to probe for CPU model information. It's interesting to note that this alternative solution is actually _easier_ to use for libvirt, because libvirt logic is already based on CPUID bit values, not "feature names", so it should be very easy to convert the current libvirt code that (incorrectly) query the host CPU directly for available features to instead start QEMU with "-cpu host" and use the "feature-words" array information to find out which CPU features are supported by the host. The "feature-words" property will have two main use cases: * Checking host capabilities, by checking the features of the "host" CPU model; * Checking which features are enabled on each CPU model. The "filtered-features" property will have two main use cases: * Allowing libvirt to emulate the "check" & "enforce" flags while collecting more detailted data about the missing features; * Allowing libvirt to probe for CPU model information even if host features are missing (it can simply combine the "feature-words" and "filtered-features" values to get the full CPU model definition) Example output: $ ./QMP/qmp --path=/tmp/m qom-get --path=/machine/unattached/device[1] --property=feature-words item[0].cpuid-register: EDX item[0].cpuid-input-eax: 1 item[0].features: 126614521 item[1].cpuid-register: ECX item[1].cpuid-input-eax: 1 item[1].features: 2155880449 item[2].cpuid-register: EBX item[2].cpuid-input-eax: 7 item[2].features: 0 item[2].cpuid-input-ecx: 0 item[3].cpuid-register: EDX item[3].cpuid-input-eax: 2147483649 item[3].features: 563346425 item[4].cpuid-register: ECX item[4].cpuid-input-eax: 2147483649 item[4].features: 101 item[5].cpuid-register: EDX item[5].cpuid-input-eax: 3221225473 item[5].features: 0 item[6].cpuid-register: EAX item[6].cpuid-input-eax: 1073741825 item[6].features: 0 item[7].cpuid-register: EDX item[7].cpuid-input-eax: 2147483658 item[7].features: 0 Eduardo Habkost (5): target-i386: Add ECX information to FeatureWordInfo target-i386: Add "feature-words" property target-i386: Use FeatureWord loop on filter_features_for_kvm() target-i386: Introduce X86CPU.filtered_features field target-i386: Add "filtered-features" property to X86CPU .gitignore | 2 + Makefile.objs | 7 +++- qapi-schema.json | 32 +++++++++++++++ target-i386/cpu-qom.h | 3 ++ target-i386/cpu.c | 110 +++++++++++++++++++++++++++++++++++--------------- 5 files changed, 121 insertions(+), 33 deletions(-) -- 1.8.1.4

1 5

[libvirt] libvirt_lxc: implement <hostdev caps=net> device isolation in containers
by Bogdan Purcareata 04 Apr '13

04 Apr '13

>From Bogdan Purcareata <bogdan.purcareata(a)freescale.com> # This line is ignored. From: Bogdan Purcareata <bogdan.purcareata(a)freescale.com> Subject: libvirt_lxc: implement <hostdev caps=net> device isolation in containers In-Reply-To:

1 2

[libvirt] language bindings
by Vasiliy Tolstov 04 Apr '13

04 Apr '13

Hello. I'm newbie in libvirt world and not able to find answer for my question in google. If i want to create binding for some language (for example go) is that possible do not use libvirt C library and talk to libvirtd via some rpc protocol? For example json or internal binary.. is that possible to talk to libvirtd not using C library? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

3 3

Re: [libvirt] [Qemu-devel] attaching disk to paused guest
by Stefan Hajnoczi 04 Apr '13

04 Apr '13

On Wed, Apr 3, 2013 at 1:05 PM, Liron Aravot <laravot(a)redhat.com> wrote: > does qemu support attaching disk to a paused guest? Does it makes sense to allow this operation? Yes, it works. I tested it via libvirt: $ virsh start vm $ cat >/tmp/disk.xml <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='path/to/new_disk.img'/> <target dev='vdb' bus='virtio'/> <alias name='virtio-disk1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </disk> ^D $ virsh suspend vm $ virsh list Id Name State ---------------------------------------------------- 1 vm paused $ virsh attach-device vm /tmp/disk.xml Device attached successfully $ virsh resume vm The issue with hotplug is that it may involve guest cooperation. This is not possible when the guest is paused, but attaching a new virtio-blk adapter is okay because we'll just have pending PCI hotplug notifications when the guest is resumed. Hot unplug is the nasty case because the guest OS isn't running and cannot terminate its guest driver for the device. Because of this, both network adapters and disks in QEMU try to clean up after themselves and libvirt does not need to wait for the guest to acknowledge hot unplug. I think both hotplug and hot unplug should work fine while the guest is paused. Stefan

1 0

[libvirt] [PATCH v3 00/11] Add support for guests with TPM passthrough device
by Stefan Berger 04 Apr '13

04 Apr '13

Hello! The following set of patches adds support to libvirt for adding a TPM passthrough device to a QEMU guest. Support for this was recently accepted into QEMU. This set of patches borrows a lot from the recently added support for rng's. Regards, Stefan --- v2->v3: - followed tree to 03122d7b - some bits fixed v1->v2: - Followed Daniel Berrange's comments (except for the one on de-consolidating the JSON monitor code)

4 23

[libvirt] [PATCH] storage: Fix volume cloning for logical volume.
by Atsushi Kumagai 04 Apr '13

04 Apr '13

When creating a logical volume with virStorageVolCreateXMLFrom, "qemu-img convert" is called internally if clonevol is a file volume. Then, vol->target.format is used as output_fmt parameter but the target.format of logical volumes is always 0 because logical volumes haven't the volume format type element. Fortunately, 0 was treated as RAW file format before commit f772b3d9, so there was no problem. But now, 0 is treated as the type of none, qemu-img fails with "Unknown file format 'none'". This patch fixes this issue by treating output block devices as RAW file format like for input block devices. Signed-off-by: Atsushi Kumagai <kumagai-atsushi(a)mxc.nes.nec.co.jp> diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index bb58d4a..2551f1f 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -652,7 +652,12 @@ virStorageBackendCreateQemuImgCmd(virConnectPtr conn, unsigned long long int size_arg; bool preallocate = false; - const char *type = virStorageFileFormatTypeToString(vol->target.format); + /* Treat output block devices as 'raw' format */ + const char *type = + virStorageFileFormatTypeToString(vol->type == VIR_STORAGE_VOL_BLOCK ? + VIR_STORAGE_FILE_RAW : + vol->target.format); + const char *backingType = vol->backingStore.path ? virStorageFileFormatTypeToString(vol->backingStore.format) : NULL; -- 1.7.1

2 1

[libvirt] [PATCH] Add support for SD cards in nodedev driver
by Daniel P. Berrange 03 Apr '13

03 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The nodedev driver currently only detects harddisk, cdrom and floppy devices. This adds support for SD cards, which are common storage for ARM devices, eg the Google ChromeBook <device> <name>block_mmcblk0_0xb1c7c08b</name> <parent>computer</parent> <capability type='storage'> <block>/dev/mmcblk0</block> <drive_type>sd</drive_type> <serial>0xb1c7c08b</serial> <size>15758000128</size> <logical_block_size>512</logical_block_size> <num_blocks>30777344</num_blocks> </capability> </device> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/node_device/node_device_udev.c | 41 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index cb11e5f..362a47f 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -952,6 +952,35 @@ static int udevProcessFloppy(struct udev_device *device, return udevProcessRemoveableMedia(device, def, has_media); } + +static int udevProcessSD(struct udev_device *device, + virNodeDeviceDefPtr def) +{ + union _virNodeDevCapData *data = &def->caps->data; + int ret = 0; + + if (udevGetUint64SysfsAttr(device, + "size", + &data->storage.num_blocks) == PROPERTY_ERROR) { + goto out; + } + + if (udevGetUint64SysfsAttr(device, + "queue/logical_block_size", + &data->storage.logical_block_size) + == PROPERTY_ERROR) { + goto out; + } + + data->storage.size = data->storage.num_blocks * + data->storage.logical_block_size; + +out: + return ret; +} + + + /* This function exists to deal with the case in which a driver does * not provide a device type in the usual place, but udev told us it's * a storage device, and we can make a good guess at what kind of @@ -1056,6 +1085,13 @@ static int udevProcessStorage(struct udev_device *device, data->storage.drive_type = strdup("floppy"); if (!data->storage.drive_type) goto out; + } else if ((udevGetIntProperty(device, "ID_DRIVE_FLASH_SD", + &tmp_int, 0) == PROPERTY_FOUND) && + (tmp_int == 1)) { + + data->storage.drive_type = strdup("sd"); + if (!data->storage.drive_type) + goto out; } else { /* If udev doesn't have it, perhaps we can guess it. */ @@ -1071,6 +1107,8 @@ static int udevProcessStorage(struct udev_device *device, ret = udevProcessDisk(device, def); } else if (STREQ(def->caps->data.storage.drive_type, "floppy")) { ret = udevProcessFloppy(device, def); + } else if (STREQ(def->caps->data.storage.drive_type, "sd")) { + ret = udevProcessSD(device, def); } else { VIR_DEBUG("Unsupported storage type '%s'", def->caps->data.storage.drive_type); @@ -1082,6 +1120,7 @@ static int udevProcessStorage(struct udev_device *device, } out: + VIR_DEBUG("Storage ret=%d", ret); return ret; } @@ -1338,6 +1377,8 @@ static int udevAddOneDevice(struct udev_device *device) out: if (ret != 0) { + VIR_DEBUG("Discarding device %d %p %s", ret, def, + def ? def->sysfs_path : ""); virNodeDeviceDefFree(def); } -- 1.8.1.4

2 1

[libvirt] [PATCH] security_manager: fix comparison
by Guido Günther 03 Apr '13

03 Apr '13

otherwise we crash later on if we don't find a match like: #0 0xb72c2b4f in virSecurityManagerGenLabel (mgr=0xb8e42d20, vm=0xb8ef40c0) at security/security_manager.c:424 #1 0xb18811f3 in qemuProcessStart (conn=conn@entry=0xb8eed880, driver=driver@entry=0xb8e3b1e0, vm=vm@entry=0xb8ef58f0, migrateFrom=migrateFrom@entry=0xb18f6088 "stdio", stdin_fd=18, stdin_path=stdin_path@entry=0xb8ea7798 "/var/lib/jenkins/jobs/libvirt-tck-build/workspace/tck.img", snapshot=snapshot@entry=0x0, vmop=vmop@entry=VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, flags=flags@entry=2) at qemu/qemu_process.c:3364 #2 0xb18d6cb2 in qemuDomainSaveImageStartVM (conn=conn@entry=0xb8eed880, driver=driver@entry=0xb8e3b1e0, vm=0xb8ef58f0, fd=fd@entry=0xb6bf3f98, header=header@entry=0xb6bf3fa0, path=path@entry=0xb8ea7798 "/var/lib/jenkins/jobs/libvirt-tck-build/workspace/tck.img", start_paused=start_paused@entry=false) at qemu/qemu_driver.c:4843 #3 0xb18d7eeb in qemuDomainRestoreFlags (conn=conn@entry=0xb8eed880, path=path@entry=0xb8ea7798 "/var/lib/jenkins/jobs/libvirt-tck-build/workspace/tck.img", dxml=dxml@entry=0x0, flags=flags@entry=0) at qemu/qemu_driver.c:4962 #4 0xb18d8123 in qemuDomainRestore (conn=0xb8eed880, path=0xb8ea7798 "/var/lib/jenkins/jobs/libvirt-tck-build/workspace/tck.img") at qemu/qemu_driver.c:4987 #5 0xb718d186 in virDomainRestore (conn=0xb8eed880, from=0xb8ea87d8 "/var/lib/jenkins/jobs/libvirt-tck-build/workspace/tck.img") at libvirt.c:2768 #6 0xb7736363 in remoteDispatchDomainRestore (args=<optimized out>, rerr=0xb6bf41f0, client=0xb8eedaf0, server=<optimized out>, msg=<optimized out>) at remote_dispatch.h:4679 #7 remoteDispatchDomainRestoreHelper (server=0xb8e1a3e0, client=0xb8eedaf0, msg=0xb8ee72c8, rerr=0xb6bf41f0, args=0xb8ea8968, ret=0xb8ef5330) at remote_dispatch.h:4661 #8 0xb720db01 in virNetServerProgramDispatchCall (msg=0xb8ee72c8, client=0xb8eedaf0, server=0xb8e1a3e0, prog=0xb8e216b0) at rpc/virnetserverprogram.c:439 #9 virNetServerProgramDispatch (prog=0xb8e216b0, server=server@entry=0xb8e1a3e0, client=0xb8eedaf0, msg=0xb8ee72c8) at rpc/virnetserverprogram.c:305 #10 0xb7206e97 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0xb8e1a3e0) at rpc/virnetserver.c:162 #11 virNetServerHandleJob (jobOpaque=0xb8ea7720, opaque=0xb8e1a3e0) at rpc/virnetserver.c:183 #12 0xb70f9f78 in virThreadPoolWorker (opaque=opaque@entry=0xb8e1a540) at util/virthreadpool.c:144 #13 0xb70f94a5 in virThreadHelper (data=0xb8e0e558) at util/virthreadpthread.c:161 #14 0xb705d954 in start_thread (arg=0xb6bf4b70) at pthread_create.c:304 #15 0xb6fd595e in clone () at ../sysdeps/unix/sysv/linux/i386/clone.S:130 This unbreaks libvirt-tck's domain/100-transient-save-restore.t with qemu:///session and selinux compiled in but disabled. Introduced by 8d68cbeaa8a64759323da1d64526e2a941eb93e1 --- src/security/security_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index 757fe28..f7c5c2e 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -437,7 +437,7 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, return ret; virObjectLock(mgr); - for (i = 0; vm->nseclabels; i++) { + for (i = 0; i < vm->nseclabels; i++) { for (j = 0; sec_managers[j]; j++) if (STREQ(vm->seclabels[i]->model, sec_managers[j]->drv->name)) break; -- 1.7.10.4

3 3

[libvirt] [PATCH] Create fake NUMA info if libnuma isn't available
by Daniel P. Berrange 03 Apr '13

03 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If libnuma is not compiled in, or numa_available() returns an error, stub out fake NUMA info consisting of one NUMA cell containing all CPUs and memory. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nodeinfo.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 111 insertions(+), 26 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 72ab394..34d9410 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1467,6 +1467,97 @@ cleanup: return ret; } +static int +nodeCapsInitNUMAFake(virCapsPtr caps ATTRIBUTE_UNUSED) +{ + virNodeInfo nodeinfo; + virCapsHostNUMACellCPUPtr cpus; + int ncpus; + int s, c, t; + int id; + + if (nodeGetInfo(NULL, &nodeinfo) < 0) + return -1; + + ncpus = VIR_NODEINFO_MAXCPUS(nodeinfo); + + if (VIR_ALLOC_N(cpus, ncpus) < 0) { + virReportOOMError(); + return -1; + } + + id = 0; + for (s = 0 ; s < nodeinfo.sockets ; s++) { + for (c = 0 ; c < nodeinfo.cores ; c++) { + for (t = 0 ; t < nodeinfo.threads ; t++) { + cpus[id].id = id; + cpus[id].socket_id = s; + cpus[id].core_id = c; + if (!(cpus[id].siblings = virBitmapNew(ncpus))) + goto error; + if (virBitmapSetBit(cpus[id].siblings, id) < 0) + goto error; + id++; + } + } + } + + if (virCapabilitiesAddHostNUMACell(caps, 0, + ncpus, + nodeinfo.memory, + cpus) < 0) + goto error; + + return 0; + + error: + for ( ; id >= 0 ; id--) + virBitmapFree(cpus[id].siblings); + VIR_FREE(cpus); + return -1; +} + +static int +nodeGetCellsFreeMemoryFake(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned long long *freeMems, + int startCell, + int maxCells ATTRIBUTE_UNUSED) +{ + double avail = physmem_available(); + + if (startCell != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("start cell %d out of range (0-%d)"), + startCell, 0); + return -1; + } + + freeMems[0] = (unsigned long long)avail; + + if (!freeMems[0]) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot determine free memory")); + return -1; + } + + return 1; +} + +static unsigned long long +nodeGetFreeMemoryFake(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + double avail = physmem_available(); + unsigned long long ret; + + if (!(ret = (unsigned long long)avail)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot determine free memory")); + return 0; + } + + return ret; +} + #if WITH_NUMACTL # if LIBNUMA_API_VERSION <= 1 # define NUMA_MAX_N_CPUS 4096 @@ -1547,7 +1638,7 @@ nodeCapsInitNUMA(virCapsPtr caps) bool topology_failed = false; if (numa_available() < 0) - return 0; + return nodeCapsInitNUMAFake(caps); int mask_n_bytes = max_n_cpus / 8; if (VIR_ALLOC_N(mask, mask_n_bytes / sizeof(*mask)) < 0) @@ -1610,7 +1701,7 @@ cleanup: int -nodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, +nodeGetCellsFreeMemory(virConnectPtr conn, unsigned long long *freeMems, int startCell, int maxCells) @@ -1619,11 +1710,10 @@ nodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, int ret = -1; int maxCell; - if (numa_available() < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("NUMA not supported on this host")); - goto cleanup; - } + if (numa_available() < 0) + return nodeGetCellsFreeMemoryFake(conn, freeMems, + startCell, maxCells); + maxCell = numa_max_node(); if (startCell > maxCell) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1652,16 +1742,14 @@ cleanup: } unsigned long long -nodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) +nodeGetFreeMemory(virConnectPtr conn) { unsigned long long freeMem = 0; int n; - if (numa_available() < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("NUMA not supported on this host")); - goto cleanup; - } + if (numa_available() < 0) + return nodeGetFreeMemoryFake(conn); + for (n = 0 ; n <= numa_max_node() ; n++) { long long mem; @@ -1720,24 +1808,21 @@ cleanup: #else -int nodeCapsInitNUMA(virCapsPtr caps ATTRIBUTE_UNUSED) { - return 0; +int nodeCapsInitNUMA(virCapsPtr caps) { + return nodeCapsInitNUMAFake(caps); } -int nodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, - unsigned long long *freeMems ATTRIBUTE_UNUSED, - int startCell ATTRIBUTE_UNUSED, - int maxCells ATTRIBUTE_UNUSED) +int nodeGetCellsFreeMemory(virConnectPtr conn, + unsigned long long *freeMems, + int startCell, + int maxCells) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("NUMA memory information not available on this platform")); - return -1; + return nodeGetCellsFreeMemoryFake(conn, freeMems, + startCell, maxCells); } -unsigned long long nodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) +unsigned long long nodeGetFreeMemory(virConnectPtr conn) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("NUMA memory information not available on this platform")); - return 0; + return nodeGetFreeMemoryFake(conn); } #endif -- 1.8.1.4

2 1

[libvirt] [PATCH] Cope with missing /sys/devices/system/cpu/cpu0/topology files
by Daniel P. Berrange 03 Apr '13

03 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Not all kernel builds have any entries under the location /sys/devices/system/cpu/cpu0/topology. We already cope with that being missing in some cases, but not all. Update the code which looks for thread_siblings to cope with the missing file Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nodeinfo.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 415c2e5..72ab394 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -168,6 +168,12 @@ virNodeCountThreadSiblings(const char *dir, unsigned int cpu) pathfp = fopen(path, "r"); if (pathfp == NULL) { + /* If file doesn't exist, then pretend our only + * sibling is ourself */ + if (errno == ENOENT) { + VIR_FREE(path); + return 1; + } virReportSystemError(errno, _("cannot open %s"), path); VIR_FREE(path); return 0; -- 1.8.1.4

2 1

[libvirt] [PATCH] Add armv6l architecture to list of valid arches
by Daniel P. Berrange 03 Apr '13

03 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The Raspberry Pi runs the armv6l architecture and apparently people are trying to run libvirt LXC on it. So we should allow that as a valid arch Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virarch.c | 1 + src/util/virarch.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/util/virarch.c b/src/util/virarch.c index ffd07dc..8585a78 100644 --- a/src/util/virarch.c +++ b/src/util/virarch.c @@ -35,6 +35,7 @@ static const struct virArchData { } virArchData[] = { { "none", 0, VIR_ARCH_LITTLE_ENDIAN }, { "alpha", 64, VIR_ARCH_BIG_ENDIAN }, + { "armv6l", 32, VIR_ARCH_LITTLE_ENDIAN }, { "armv7l", 32, VIR_ARCH_LITTLE_ENDIAN }, { "cris", 32, VIR_ARCH_LITTLE_ENDIAN }, { "i686", 32, VIR_ARCH_LITTLE_ENDIAN }, diff --git a/src/util/virarch.h b/src/util/virarch.h index 9cf6ce2..0d8ae25 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -27,6 +27,7 @@ typedef enum { VIR_ARCH_NONE, VIR_ARCH_ALPHA, /* Alpha 64 BE http://en.wikipedia.org/wiki/DEC_Alpha */ + VIR_ARCH_ARMV6L, /* ARMv6 32 LE http://en.wikipedia.org/wiki/ARM_architecture */ VIR_ARCH_ARMV7L, /* ARMv7 32 LE http://en.wikipedia.org/wiki/ARM_architecture */ VIR_ARCH_CRIS, /* ETRAX 32 LE http://en.wikipedia.org/wiki/ETRAX_CRIS */ VIR_ARCH_I686, /* x86 32 LE http://en.wikipedia.org/wiki/X86 */ -- 1.8.1.4

2 1

[libvirt] libvirtd segfault on latest git
by Luiz Capitulino 03 Apr '13

03 Apr '13

Hi, Libvirtd from latest git (HEAD fc8c1787) is segfaulting when I try to restore a previously saved domain (backtrace below). I was testing a custom QEMU when it happened first time, but it also happens with latest qemu.git (HEAD 162cbbd17). What I did to run libvirt from source was: 1. Build it $ ./autogen.sh --system --enable-compile-warnings=error $ ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr --libdir=/usr/lib (this was needed because I had to re-ran configure and it ended up overwriting --system) $ make -j4 2. Stop system's libvirtd # systemctl stop libvitd 3. Change /etc/libvirt/qemu/Fedora18.xml to use a custom QEMU binary 4. Run libvirtd # ./daemon/libvirtd 5. Reproduce the problem with virsh # ./tools/virsh virsh # save Fedora18 foobar virsh # restore foobar error: Failed to restore domain from foobar error: End of file while reading data: Input/output error error: Failed to reconnect to the hypervisor 6. Change to the libvirtd terminal [...] 2013-04-03 20:01:58.742+0000: 32334: debug : virNetServerAddShutdownInhibition:795 : srv=0x1ecf3f0 inhibitions=1 2013-04-03 20:01:58.742+0000: 32334: debug : qemuProcessStart:3351 : Preparing host devices 2013-04-03 20:01:58.742+0000: 32334: debug : qemuProcessStart:3355 : Preparing chr devices 2013-04-03 20:01:58.742+0000: 32334: debug : qemuProcessStart:3364 : Generating domain security label (if required) ====== end of log ===== Segmentation fault (core dumped) [root@doriath libvirt]# Here's the backtrace: Core was generated by `/home/lcapitulino/work/src/upstream/libvirt/daemon/.libs/lt-libvirtd'. Program terminated with signal 11, Segmentation fault. #0 0x00007f7623a4e79f in virSecurityManagerGenLabel (mgr=0x7f760c022380, vm=<optimized out>) at security/security_manager.c:424 424 int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, (gdb) bt #0 0x00007f7623a4e79f in virSecurityManagerGenLabel (mgr=0x7f760c022380, vm=<optimized out>) at security/security_manager.c:424 #1 0x00007f761467718c in qemuProcessStart (conn=conn@entry=0x7f7608000ad0, driver=driver@entry=0x7f760c009440, vm=vm@entry=0x7f760c2097d0, migrateFrom=migrateFrom@entry=0x7f76146dfeeb "stdio", stdin_fd=16, stdin_path=stdin_path@entry=0x7f7600000a90 "/home/lcapitulino/work/src/upstream/libvirt/foobar", snapshot=snapshot@entry=0x0, vmop=vmop@entry=VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, flags=flags@entry=2) at qemu/qemu_process.c:3365 #2 0x00007f76146c25a0 in qemuDomainSaveImageStartVM (conn=conn@entry=0x7f7608000ad0, driver=driver@entry=0x7f760c009440, vm=vm@entry=0x7f760c2097d0, fd=fd@entry=0x7f761882fa7c, header=header@entry=0x7f761882fa90, path=path@entry=0x7f7600000a90 "/home/lcapitulino/work/src/upstream/libvirt/foobar", start_paused=start_paused@entry=false) at qemu/qemu_driver.c:4843 #3 0x00007f76146c35c6 in qemuDomainRestoreFlags (conn=0x7f7608000ad0, path=0x7f7600000a90 "/home/lcapitulino/work/src/upstream/libvirt/foobar", dxml=<optimized out>, flags=<optimized out>) at qemu/qemu_driver.c:4962 #4 0x00007f762393923b in virDomainRestore (conn=0x7f7608000ad0, from=0x7f76000008c0 "/home/lcapitulino/work/src/upstream/libvirt/foobar") at libvirt.c:2768 #5 0x00007f7624365691 in remoteDispatchDomainRestore (server=<optimized out>, msg=<optimized out>, args=0x7f7600000900, rerr=0x7f761882fcd0, client=0x7f76253b9150) at remote_dispatch.h:4679 #6 remoteDispatchDomainRestoreHelper (server=<optimized out>, client=0x7f76253b9150, msg=<optimized out>, rerr=0x7f761882fcd0, args=0x7f7600000900, ret=<optimized out>) at remote_dispatch.h:4661 #7 0x00007f76239a4d56 in virNetServerProgramDispatchCall (msg=0x7f76253b8700, client=0x7f76253b9150, server=0x7f76253b23f0, prog=0x7f76253bd070) at rpc/virnetserverprogram.c:439 #8 virNetServerProgramDispatch (prog=0x7f76253bd070, server=server@entry=0x7f76253b23f0, client=0x7f76253b9150, msg=0x7f76253b8700) at rpc/virnetserverprogram.c:305 #9 0x00007f76239a0338 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x7f76253b23f0) at rpc/virnetserver.c:162 #10 virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x7f76253b23f0) at rpc/virnetserver.c:183 #11 0x00007f76238c20ee in virThreadPoolWorker (opaque=opaque@entry=0x7f76253bd230) at util/virthreadpool.c:144 #12 0x00007f76238c1766 in virThreadHelper (data=<optimized out>) at util/virthreadpthread.c:161 #13 0x00007f76227ffd15 in start_thread (arg=0x7f7618830700) at pthread_create.c:308 #14 0x00007f762212b48d in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:114

1 0

[libvirt] [PATCH] Implement minimal sysinfo for ARM platforms
by Daniel P. Berrange 03 Apr '13

03 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Implement the bare minimal sysinfo for ARM platforms by reading the CPU models from /proc/cpuinfo Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virsysinfo.c | 129 +++++++++++++++++++++++++++++++++++- tests/sysinfodata/armcpuinfo.data | 17 +++++ tests/sysinfodata/armsysinfo.expect | 10 +++ tests/sysinfotest.c | 15 ++++- 4 files changed, 169 insertions(+), 2 deletions(-) create mode 100644 tests/sysinfodata/armcpuinfo.data create mode 100644 tests/sysinfodata/armsysinfo.expect diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 83c445d..ba0c245 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -255,8 +255,134 @@ no_memory: return NULL; } -#elif defined(__s390__) || defined(__s390x__) +#elif defined(__arm__) +static int +virSysinfoParseSystem(const char *base, virSysinfoDefPtr ret) +{ + char *eol = NULL; + const char *cur; + + if ((cur = strstr(base, "platform")) == NULL) + return 0; + + base = cur; + /* Account for format 'platform : XXXX'*/ + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + virSkipSpaces(&cur); + if (eol && + ((ret->system_family = strndup(cur, eol - cur)) == NULL)) + goto no_memory; + + if ((cur = strstr(base, "model")) != NULL) { + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + virSkipSpaces(&cur); + if (eol && ((ret->system_serial = strndup(cur, eol - cur)) + == NULL)) + goto no_memory; + } + + if ((cur = strstr(base, "machine")) != NULL) { + cur = strchr(cur, ':') + 1; + eol = strchr(cur, '\n'); + virSkipSpaces(&cur); + if (eol && ((ret->system_version = strndup(cur, eol - cur)) + == NULL)) + goto no_memory; + } + return 0; + +no_memory: + return -1; +} + +static int +virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) +{ + const char *cur; + char *eol, *tmp_base; + virSysinfoProcessorDefPtr processor; + char *processor_type = NULL; + + if (!(tmp_base = strstr(base, "Processor"))) + return 0; + + base = tmp_base; + eol = strchr(base, '\n'); + cur = strchr(base, ':') + 1; + virSkipSpaces(&cur); + if (eol && + ((processor_type = strndup(cur, eol - cur)) + == NULL)) + goto no_memory; + base = cur; + + while ((tmp_base = strstr(base, "processor")) != NULL) { + base = tmp_base; + eol = strchr(base, '\n'); + cur = strchr(base, ':') + 1; + + if (VIR_EXPAND_N(ret->processor, ret->nprocessor, 1) < 0) { + goto no_memory; + } + processor = &ret->processor[ret->nprocessor - 1]; + + virSkipSpaces(&cur); + if (eol && + ((processor->processor_socket_destination = strndup + (cur, eol - cur)) == NULL)) + goto no_memory; + + if (processor_type && + !(processor->processor_type = strdup(processor_type))) + goto no_memory; + + base = cur; + } + + VIR_FREE(processor_type); + return 0; + +no_memory: + VIR_FREE(processor_type); + return -1; +} + +/* virSysinfoRead for ARMv7 + * Gathers sysinfo data from /proc/cpuinfo */ +virSysinfoDefPtr +virSysinfoRead(void) { + virSysinfoDefPtr ret = NULL; + char *outbuf = NULL; + + if (VIR_ALLOC(ret) < 0) + goto no_memory; + + if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to open %s"), CPUINFO); + return NULL; + } + + ret->nprocessor = 0; + ret->processor = NULL; + if (virSysinfoParseProcessor(outbuf, ret) < 0) + goto no_memory; + + if (virSysinfoParseSystem(outbuf, ret) < 0) + goto no_memory; + + return ret; + +no_memory: + VIR_FREE(outbuf); + return NULL; +} + + +#elif defined(__s390__) || defined(__s390x__) /* we need to ignore warnings about strchr caused by -Wlogical-op for some GCC versions. @@ -403,6 +529,7 @@ no_memory: !(defined(__x86_64__) || \ defined(__i386__) || \ defined(__amd64__) || \ + defined(__arm__) || \ defined(__powerpc__)) virSysinfoDefPtr virSysinfoRead(void) { diff --git a/tests/sysinfodata/armcpuinfo.data b/tests/sysinfodata/armcpuinfo.data new file mode 100644 index 0000000..6ef23ca --- /dev/null +++ b/tests/sysinfodata/armcpuinfo.data @@ -0,0 +1,17 @@ +Processor : ARMv7 Processor rev 4 (v7l) +processor : 0 +BogoMIPS : 1694.10 + +processor : 1 +BogoMIPS : 1694.10 + +Features : swp half thumb fastmult vfp edsp thumbee neon vfpv3 tls vfpv4 idiva idivt +CPU implementer : 0x41 +CPU architecture: 7 +CPU variant : 0x0 +CPU part : 0xc0f +CPU revision : 4 + +Hardware : SAMSUNG EXYNOS5 (Flattened Device Tree) +Revision : 0000 +Serial : 0000000000000000 diff --git a/tests/sysinfodata/armsysinfo.expect b/tests/sysinfodata/armsysinfo.expect new file mode 100644 index 0000000..1af9e6d --- /dev/null +++ b/tests/sysinfodata/armsysinfo.expect @@ -0,0 +1,10 @@ +<sysinfo type='smbios'> + <processor> + <entry name='socket_destination'>0</entry> + <entry name='type'>ARMv7 Processor rev 4 (v7l)</entry> + </processor> + <processor> + <entry name='socket_destination'>1</entry> + <entry name='type'>ARMv7 Processor rev 4 (v7l)</entry> + </processor> +</sysinfo> diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 94493a3..8955208 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -40,7 +40,8 @@ # if defined(__s390__) || defined(__s390x__) || \ defined(__powerpc__) || defined(__powerpc64__) || \ - defined(__i386__) || defined(__x86_64__) || defined(__amd64__) + defined(__i386__) || defined(__x86_64__) || defined(__amd64__) || \ + defined(__arm__) /* from sysinfo.c */ void virSysinfoSetup(const char *decoder, @@ -164,6 +165,18 @@ test_x86(void) } VIRT_TEST_MAIN(test_x86) +# elif defined(__arm__) +static int +test_arm(void) +{ + return sysinfotest_run("arm sysinfo", + NULL, + NULL, + "/sysinfodata/armcpuinfo.data", + "/sysinfodata/armsysinfo.expect"); +} + +VIRT_TEST_MAIN(test_arm) # else int main(void) -- 1.8.1.4

2 1

[libvirt] [PATCH] Wire up sysinfo for LXC driver
by Daniel P. Berrange 03 Apr '13

03 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The sysinfo code used by QEMU is trivially portable to the LXC driver --- src/lxc/lxc_conf.h | 3 +++ src/lxc/lxc_driver.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index b46dc32..f8f7c9a 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -35,6 +35,7 @@ # include "vircgroup.h" # include "security/security_manager.h" # include "configmake.h" +# include "virsysinfo.h" # include "virusb.h" # define LXC_DRIVER_NAME "LXC" @@ -55,6 +56,8 @@ struct _virLXCDriver { virCgroupPtr cgroup; + virSysinfoDefPtr hostsysinfo; + size_t nactive; virStateInhibitCallback inhibitCallback; void *inhibitOpaque; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ba14db7..17f01d5 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1457,6 +1457,8 @@ static int lxcStartup(bool privileged, if (!lxc_driver->domainEventState) goto cleanup; + lxc_driver->hostsysinfo = virSysinfoRead(); + lxc_driver->log_libvirtd = 0; /* by default log to container logfile */ lxc_driver->have_netns = lxcCheckNetNsSupport(); @@ -1574,6 +1576,8 @@ static int lxcShutdown(void) virLXCProcessAutoDestroyShutdown(lxc_driver); + virSysinfoDefFree(lxc_driver->hostsysinfo); + virObjectUnref(lxc_driver->activeUsbHostdevs); virObjectUnref(lxc_driver->caps); virObjectUnref(lxc_driver->securityManager); @@ -4547,6 +4551,30 @@ cleanup: } +static char * +lxcGetSysinfo(virConnectPtr conn, unsigned int flags) +{ + virLXCDriverPtr driver = conn->privateData; + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virCheckFlags(0, NULL); + + if (!driver->hostsysinfo) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Host SMBIOS information is not available")); + return NULL; + } + + if (virSysinfoFormat(&buf, driver->hostsysinfo) < 0) + return NULL; + if (virBufferError(&buf)) { + virReportOOMError(); + return NULL; + } + return virBufferContentAndReset(&buf); +} + + /* Function Tables */ static virDriver lxcDriver = { .no = VIR_DRV_LXC, @@ -4555,6 +4583,7 @@ static virDriver lxcDriver = { .close = lxcClose, /* 0.4.2 */ .version = lxcVersion, /* 0.4.6 */ .getHostname = virGetHostname, /* 0.6.3 */ + .getSysinfo = lxcGetSysinfo, /* 1.0.5 */ .nodeGetInfo = nodeGetInfo, /* 0.6.5 */ .getCapabilities = lxcGetCapabilities, /* 0.6.5 */ .listDomains = lxcListDomains, /* 0.4.2 */ -- 1.8.1.4

2 1

[libvirt] [PATCH] qemu: fix memory leak on -machine usage error
by Eric Blake 03 Apr '13

03 Apr '13

Commit f84b92ea introduced a memory leak on error; John Ferlan reported that valgrind caught it during 'make check'. * src/qemu/qemu_command.c (qemuBuildMachineArgStr): Plug leak. --- Pushing under the trivial rule. src/qemu/qemu_command.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 693d30d..29424d6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5228,6 +5228,7 @@ qemuBuildMachineArgStr(virCommandPtr cmd, virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("dump-guest-core is not available " "with this QEMU binary")); + virBufferFreeAndReset(&buf); return -1; } -- 1.8.1.4

1 0

[libvirt] how to use svirt
by yue 03 Apr '13

03 Apr '13

hi,all i know svirt is merged into libvirt upstream, but how to use them? thanks

1 0

[libvirt] (no subject)
by Dan Walsh 03 Apr '13

03 Apr '13

Most of them effect virt-sandbox-service, with the biggest change beeing the addition of InteractiveContainers. We want to be able to support OpenShift, which requres the abiltiy to run a command within a container environement but does not want to use the systemd/unitfiles. These containers will run a setup script and then a user process to actually run the application. >From Dan Walsh <dwalsh(a)redhat.com> # This line is ignored. From: Dan Walsh <dwalsh(a)redhat.com> Subject: In-Reply-To:

4 36

[libvirt] [PATCH 0/2] Fix numeric overflow in qemu block job handling
by Peter Krempa 03 Apr '13

03 Apr '13

The JSON generator and qemu QMP protocol limit numeric values to LLONG_MAX even for unsigned values. A bug in the code caused numeric overflow when passing through speed parameters to qemu block job commands. Background: https://bugzilla.redhat.com/show_bug.cgi?id=927156 Peter Krempa (2): qemu-JSON: Error out if number is out of range instead of overflowing to negative qemu-blockjob: Fix limit of bandwidth for block jobs to supported value src/qemu/qemu_monitor.c | 21 ++++++++++++--------- src/qemu/qemu_monitor_json.c | 10 ++++++++-- 2 files changed, 20 insertions(+), 11 deletions(-) -- 1.8.1.5

2 6

[libvirt] [PATCH 0/2] Improve security hardening of binaries
by Daniel P. Berrange 03 Apr '13

03 Apr '13

Fedora has a "hardened build" option in RPM specfiles: https://fedoraproject.org/wiki/Packaging:Guidelines#PIE While we could enable that in the RPM, this would only apply to Fedora. Thus these patches directly integrate it in libvirt's configure.ac / Makefile.am files. With these 2 patches all executables gain -fPIE and -z relro -z now. Using the checksec.sh script from http://www.trapkit.de/tools/checksec.html We can see the difference, before: $ ~/checksec.sh --file /usr/sbin/libvirtd 'RELRO STACK CANARY NX PIE RPATH RUNPATH FILE Partial RELRO Canary found NX enabled No PIE No RPATH No RUNPATH /usr/sbin/libvirtd After $ ~/checksec.sh --file /usr/sbin/libvirtd 'RELRO STACK CANARY NX PIE RPATH RUNPATH FILE Full RELRO Canary found NX enabled PIE enabled No RPATH No RUNPATH /usr/sbin/libvirtd

2 4

[libvirt] [libvirt-designer 0/3] A few more cleanups
by Christophe Fergeau 03 Apr '13

03 Apr '13

Hey, here are a few small patches for libvirt-designer to fix a few leaks/polish minor things. Christophe

2 7

[libvirt] [PATCH 1/1] Fix the crash when seclable is freed
by Li Zhang 03 Apr '13

03 Apr '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> When seclabel's type is VIR_DOMAIN_SECLABEL_NONE, virSecurityLabelDefPtr's members are not allocated. So it will cause crash when calling VIR_FREE. This problem is found when running autotest on PPC. Failed to remove cgroup for virt-tests-vm1 *** glibc detected *** /usr/sbin/libvirtd: free(): invalid pointer: 0x00003fff9c187510 *** ======= Backtrace: ========= /lib64/libc.so.6(+0xb89c4)[0x3fffa9bc89c4] /lib64/libvirt.so.0(virFree-0x3e2320)[0x3fffaa82e9c0] /lib64/libvirt.so.0(virSecurityLabelDefFree-0x378984)[0x3fffaa89d69c] /lib64/libvirt.so.0(virDomainDefFree-0x367c98)[0x3fffaa8ae968] /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so(qemuProcessStop-0xc85f8)[0x3fffa2899d58] /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so(+0xc3668)[0x3fffa28e3668] /lib64/libvirt.so.0(virDomainDestroy-0x309bd0)[0x3fffaa90f6f0] /usr/sbin/libvirtd[0x10035230] /lib64/libvirt.so.0(virNetServerProgramDispatch-0x289b50)[0x3fffaa995930] /lib64/libvirt.so.0(+0x20db18)[0x3fffaa98db18] /lib64/libvirt.so.0(+0xfbd24)[0x3fffaa87bd24] /lib64/libvirt.so.0(+0xfaec8)[0x3fffaa87aec8] /lib64/libpthread.so.0(+0xc604)[0x3fffa9d7c604] /lib64/libc.so.6(clone-0xb8fe4)[0x3fffa9c3f094] Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f3fca7f..2856660 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1006,6 +1006,8 @@ virSecurityLabelDefFree(virSecurityLabelDefPtr def) { if (!def) return; + if (def->type == VIR_DOMAIN_SECLABEL_NONE) + return; VIR_FREE(def->model); VIR_FREE(def->label); VIR_FREE(def->imagelabel); -- 1.7.5.4

4 10

[libvirt] Networking options in libvirt_lxc
by Purcareata Bogdan-B43198 03 Apr '13

03 Apr '13

Hello, I am doing some research on [subject] and I would like to find out some information regarding various scenarios. I've studied the official documentation at [1] and some of the mailing list archives. The configurations I have in mind are somewhat inspired by what the sf LXC package offers in terms of networking. What I've tested so far and works: - Shared networking - all host interfaces are present in the container if no <interface> tag has been specified in the domain configuration. I'm assuming this is because the container is started in the same network namespace like the host. Is it possible to make only a subset of these interfaces visible inside the container? - Bridge to LAN - connecting a domain interface to a host bridge; - Direct attachment through a Macvtap device - all 3 modes (vepa, bridge and private) work as expected, "passthrough" requires some capabilities in the physical device (SRIOV), which I don't have - assuming I have a device with this capability, is this configuration supported by (implemented in) the libvirt_lxc driver? What other scenarios I would be interested in: - host network interface private to the container - much like what lxc.network.phys is offering: "dedicated NIC from host passed through". I've read some documentation about <hostdev> and how to assign PCI devices to virtual machine, but I understand this is only possible with KVM - it's assigned from the kernel, it makes more sense, etc. However, I've also read a thread on the mailing list regarding <hostdev mode="capabilities">, which offers access from a container to a device, but it's currenly only applicable to block and character devices. Is there currently any way to make a host interface private to a container? Thank you very much! Best regards, Bogdan P. [1] http://libvirt.org

2 2

[libvirt] [PATCH] virsh: Fix typo in docs
by Peter Krempa 03 Apr '13

03 Apr '13

s/persitent/persistent/ --- Pushed under trivial rule. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 9ca4435..1c8f9ee 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2152,7 +2152,7 @@ Returns basic information about the I<network> object. Returns the list of active networks, if I<--all> is specified this will also include defined but inactive networks, if I<--inactive> is specified only the inactive ones will be listed. You may also want to filter the returned networks -by I<--persistent> to list the persitent ones, I<--transient> to list the +by I<--persistent> to list the persistent ones, I<--transient> to list the transient ones, I<--autostart> to list the ones with autostart enabled, and I<--no-autostart> to list the ones with autostart disabled. -- 1.8.1.5

1 0

[libvirt] [PATCH] sec_manager: Refuse to start domain with unsupported seclabel
by Michal Privoznik 03 Apr '13

03 Apr '13

https://bugzilla.redhat.com/show_bug.cgi?id=947387 If a user configures a domain to use a seclabel of a specific type, but the appropriate driver is not accessible, we should refuse to start the domain. For instance, if user requires selinux, but it is either non present in the system, or is just disabled, we should not start the domain. Moreover, since we are touching only those labels we have a security driver for, the other labels may confuse libvirt when reconnecting to a domain on libvirtd restart. In our selinux example, when starting up a domain, missing security label is okay, as we auto-generate one. But later, when libvirt is re-connecting to a live qemu instance, we parse a state XML, where security label is required and it is an error if missing: error : virSecurityLabelDefParseXML:3228 : XML error: security label is missing This results in a qemu process left behind without any libvirt control. --- src/security/security_manager.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index b671a91..757fe28 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -425,7 +425,7 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, virDomainDefPtr vm) { int ret = -1; - size_t i; + size_t i, j; virSecurityManagerPtr* sec_managers = NULL; virSecurityLabelDefPtr seclabel; bool generated = false; @@ -437,6 +437,19 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, return ret; virObjectLock(mgr); + for (i = 0; vm->nseclabels; i++) { + for (j = 0; sec_managers[j]; j++) + if (STREQ(vm->seclabels[i]->model, sec_managers[j]->drv->name)) + break; + + if (!sec_managers[j]) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unable to find security driver for label %s"), + vm->seclabels[i]->model); + goto cleanup; + } + } + for (i = 0; sec_managers[i]; i++) { generated = false; seclabel = virDomainDefGetSecurityLabelDef(vm, sec_managers[i]->drv->name); -- 1.8.1.5

2 2

[libvirt] [PATCH v2] Allow multiple parameters for schedinfo
by Martin Kletzander 03 Apr '13

03 Apr '13

virsh schedinfo was able to set only one parameter at a time (not counting the deprecated options), but it is useful to set more at once, so this patch adds the possibility to do stuff like this: virsh schedinfo <domain> cpu_shares=0 vcpu_period=0 vcpu_quota=0 \ emulator_period=0 emulator_quota=0 Invalid scheduler options are reported as well. These were previously reported only if the command hadn't updated any values (when cmdSchedInfoUpdate returned 0). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=810078 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=919372 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=919375 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - correctly report unsupported options - man page updated tests/virsh-schedinfo | 4 +- tools/virsh-domain.c | 119 ++++++++++++++++++++++++++++---------------------- tools/virsh.pod | 4 +- 3 files changed, 72 insertions(+), 55 deletions(-) diff --git a/tests/virsh-schedinfo b/tests/virsh-schedinfo index 4f462f8..37f7bd3 100755 --- a/tests/virsh-schedinfo +++ b/tests/virsh-schedinfo @@ -1,7 +1,7 @@ #!/bin/sh # Ensure that virsh schedinfo --set invalid=val fails -# Copyright (C) 2010-2011 Red Hat, Inc. +# Copyright (C) 2010-2011, 2013 Red Hat, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ fi . "$srcdir/test-lib.sh" printf 'Scheduler : fair\n\n' > exp-out || framework_failure -printf 'error: invalid scheduler option: j=k\n' > exp-err || framework_failure +printf 'error: invalid scheduler option: j\n' > exp-err || framework_failure fail=0 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 128e516..cc2eddc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3918,16 +3918,14 @@ static const vshCmdOptDef opts_schedinfo[] = { .flags = VSH_OFLAG_REQ, .help = N_("domain name, id or uuid") }, - {.name = "set", - .type = VSH_OT_STRING, - .help = N_("parameter=value") - }, {.name = "weight", .type = VSH_OT_INT, + .flags = VSH_OFLAG_REQ_OPT, .help = N_("weight for XEN_CREDIT") }, {.name = "cap", .type = VSH_OT_INT, + .flags = VSH_OFLAG_REQ_OPT, .help = N_("cap for XEN_CREDIT") }, {.name = "current", @@ -3942,72 +3940,100 @@ static const vshCmdOptDef opts_schedinfo[] = { .type = VSH_OT_BOOL, .help = N_("get/set value from running domain") }, + {.name = "set", + .type = VSH_OT_ARGV, + .flags = VSH_OFLAG_NONE, + .help = N_("parameter=value") + }, {.name = NULL} }; static int +cmdSchedInfoUpdateOne(vshControl *ctl, + virTypedParameterPtr src_params, int nsrc_params, + virTypedParameterPtr *params, + int *nparams, int *maxparams, + const char *field, const char *value) +{ + virTypedParameterPtr param; + int ret = -1; + int i; + + for (i = 0; i < nsrc_params; i++) { + param = &(src_params[i]); + + if (STRNEQ(field, param->field)) + continue; + + if (virTypedParamsAddFromString(params, nparams, maxparams, + field, param->type, + value) < 0) { + vshSaveLibvirtError(); + goto cleanup; + } + ret = 0; + break; + } + + if (ret < 0) + vshError(ctl, _("invalid scheduler option: %s"), field); + + cleanup: + return ret; +} + +static int cmdSchedInfoUpdate(vshControl *ctl, const vshCmd *cmd, virTypedParameterPtr src_params, int nsrc_params, virTypedParameterPtr *update_params) { - const char *set_arg; char *set_field = NULL; char *set_val = NULL; - virTypedParameterPtr param; + const char *val = NULL; + const vshCmdOpt *opt = NULL; virTypedParameterPtr params = NULL; int nparams = 0; int maxparams = 0; int ret = -1; int rv; - int val; - int i; - if (vshCommandOptString(cmd, "set", &set_arg) > 0) { - set_field = vshStrdup(ctl, set_arg); + while ((opt = vshCommandOptArgv(cmd, opt))) { + set_field = vshStrdup(ctl, opt->data); if (!(set_val = strchr(set_field, '='))) { - vshError(ctl, "%s", _("Invalid syntax for --set, expecting name=value")); + vshError(ctl, "%s", _("Invalid syntax for --set, " + "expecting name=value")); goto cleanup; } *set_val = '\0'; set_val++; - } - for (i = 0; i < nsrc_params; i++) { - param = &(src_params[i]); - - /* Legacy 'weight' and 'cap' parameter */ - if (param->type == VIR_TYPED_PARAM_UINT && - (STREQ(param->field, "weight") || STREQ(param->field, "cap")) && - (rv = vshCommandOptInt(cmd, param->field, &val)) != 0) { - if (rv < 0) { - vshError(ctl, _("Invalid value of %s"), param->field); - goto cleanup; - } - - if (virTypedParamsAddUInt(&params, &nparams, &maxparams, - param->field, val) < 0) { - vshSaveLibvirtError(); - goto cleanup; - } + if (cmdSchedInfoUpdateOne(ctl, src_params, nsrc_params, + &params, &nparams, &maxparams, + set_field, set_val) < 0) + goto cleanup; - continue; - } + VIR_FREE(set_field); + } - if (set_field && STREQ(set_field, param->field)) { - if (virTypedParamsAddFromString(&params, &nparams, &maxparams, - set_field, param->type, - set_val) < 0) { - vshSaveLibvirtError(); - goto cleanup; - } + rv = vshCommandOptStringReq(ctl, cmd, "cap", &val); + if (rv < 0 || + (val && + cmdSchedInfoUpdateOne(ctl, src_params, nsrc_params, + &params, &nparams, &maxparams, + "cap", val) < 0)) + goto cleanup; - continue; - } - } + rv = vshCommandOptStringReq(ctl, cmd, "weight", &val); + if (rv < 0 || + (val && + cmdSchedInfoUpdateOne(ctl, src_params, nsrc_params, + &params, &nparams, &maxparams, + "weight", val) < 0)) + goto cleanup; - *update_params = params; ret = nparams; + *update_params = params; params = NULL; cleanup: @@ -4102,15 +4128,6 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) if (ret == -1) goto cleanup; } else { - /* See if we've tried to --set var=val. If so, the fact that - we reach this point (with update == 0) means that "var" did - not match any of the settable parameters. Report the error. */ - const char *var_value_pair = NULL; - if (vshCommandOptString(cmd, "set", &var_value_pair) > 0) { - vshError(ctl, _("invalid scheduler option: %s"), - var_value_pair); - goto cleanup; - } /* When not doing --set, --live and --config do not mix. */ if (live && config) { vshError(ctl, "%s", diff --git a/tools/virsh.pod b/tools/virsh.pod index b5e632e..6111e58 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1281,8 +1281,8 @@ except that it does some error checking. The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment variables, and defaults to C<vi>. -=item B<schedinfo> [I<--set> B<parameter=value>] I<domain> [[I<--config>] -[I<--live>] | [I<--current>]] +=item B<schedinfo> I<domain> [[I<--config>] [I<--live>] | [I<--current>]] +[[I<--set>] B<parameter=value>]... =item B<schedinfo> [I<--weight> B<number>] [I<--cap> B<number>] I<domain> -- 1.8.1.5

2 3

[libvirt] mistake in libvirt-php document
by mahdi faryabi 03 Apr '13

03 Apr '13

hi, in libvirt-php you have a little mistake here : http://libvirt.org/php/api-reference.html#libvirt_image_remove "Function is used to create the image of desired name, size and format. The image will be created in the image path"

1 0

[libvirt] [PATCH v5 0/3] Keep original file label
by Michal Privoznik 03 Apr '13

03 Apr '13

Yet another rework of $subj. I am still not solving atomicity problem for now. See diff to the patches if you want to know what's changed. Michal Privoznik (3): virFile: Add APIs for extended attributes handling virfile: Introduce internal API for managing ACL security_dac: Favour ACLs over chown() configure.ac | 2 + libvirt.spec.in | 1 + m4/virt-acl.m4 | 9 ++ src/Makefile.am | 4 +- src/libvirt_private.syms | 6 + src/security/security_dac.c | 309 +++++++++++++++++++++++++++++++++++++++----- src/util/virfile.c | 295 ++++++++++++++++++++++++++++++++++++++++++ src/util/virfile.h | 28 ++++ 8 files changed, 623 insertions(+), 31 deletions(-) create mode 100644 m4/virt-acl.m4 -- 1.8.1.5

3 14

[libvirt] [PATCH] qemu: Fix crash when updating media with shared device
by Peter Krempa 02 Apr '13

02 Apr '13

Mimic the fix done in 02b9097274d1330c2e1dca7f598880e09b5c2aa0 to fix crash by accessing an already freed structure. Also copy the explaining comment why the pointer can't be accessed any more. --- src/qemu/qemu_driver.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 96bf235..552a81b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6073,14 +6073,17 @@ qemuDomainChangeDiskMediaLive(virDomainObjPtr vm, goto end; ret = qemuDomainChangeEjectableMedia(driver, vm, disk, orig_disk, force); + /* 'disk' must not be accessed now - it has been freed. + * 'orig_disk' now points to the new disk, while 'dev_copy' + * now points to the old disk */ + + /* Need to remove the shared disk entry for the original + * disk src if the operation is either ejecting or updating. + */ if (ret == 0) { dev->data.disk = NULL; - /* Need to remove the shared disk entry for the original - * disk src if the operation is either ejecting or updating. - */ - if (orig_disk->src && STRNEQ_NULLABLE(orig_disk->src, disk->src)) - ignore_value(qemuRemoveSharedDisk(driver, dev_copy->data.disk, - vm->def->name)); + ignore_value(qemuRemoveSharedDisk(driver, dev_copy->data.disk, + vm->def->name)); } break; default: -- 1.8.1.5

2 2

[libvirt] ANNOUNCE: libvirt 0.10.2.4 maintenance release
by Cole Robinson 02 Apr '13

02 Apr '13

libvirt 0.10.2.4 maintenance release is now available. This is libvirt 0.10.2 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.10.2.4.tar.gz Changes in this version: * esx: Fix and improve esxListAllDomains function * Fix parsing of SELinux ranges without a category * Separate MCS range parsing from MCS range checking * Fix memory leak on OOM in virSecuritySELinuxMCSFind * qemu: Set migration FD blocking * build: further fixes for broken if_bridge.h * build: work around broken kernel header * Fix SELinux security label test * libxl: Fix setting of disk backend * util: Fix mask for 172.16.0.0 private address range * conf: don't fail to parse <boot> when parsing a single device * Support custom 'svirt_tcg_t' context for TCG based guests * uml: Report error if inotify fails on driver startup (cherry picked from commit 7b97030ad430eb76fcc333652411208fb702e962) * daemon: Preface polkit error output with 'polkit:' * spec: Fix script warning when uninstalling libvirt-client For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [RFC 0/4] target-i386: Add "feature-words" CPU object property
by Eduardo Habkost 02 Apr '13

02 Apr '13

As the work to get X86CPU subclasses static properties defined is taking very long to get reviewed and we risk not getting it finished in 1.5, I am sending an alternative mechanism to allow libvirt to probe for CPU model information. It's interesting to note that this alternative solution is actually _easier_ to use for libvirt, because libvirt logic is already based on CPUID bit values, not "feature names", so it should be very easy to convert the current libvirt code that (incorrectly) query the host CPU directly for available features to instead start QEMU with "-cpu host" and use the "feature-words" array information to find out which CPU features are supported by the host. The property will have two main use cases: - Checking host capabilities, by checking the features of the "host" CPU model; - Checking which features are enabled on each CPU model. This series has two alternative implementations, so both approaches can get feedback: patch 3 has a non-qapi implementation, that simply builds the list and sets the struct fields manually. Patch 4 converts that implementation to a qapi- based implementation. (BTW, I really missed some documentation on the list-related visitor functions, when writing this code) Example output: $ ./QMP/qmp --path=/tmp/m qom-get --path=/machine/unattached/device[1] --property=feature-words item[0].cpuid-register: EDX item[0].cpuid-input-eax: 1 item[0].features: 126614521 item[1].cpuid-register: ECX item[1].cpuid-input-eax: 1 item[1].features: 2155880449 item[2].cpuid-register: EBX item[2].cpuid-input-eax: 7 item[2].features: 0 item[2].cpuid-input-ecx: 0 item[3].cpuid-register: EDX item[3].cpuid-input-eax: 2147483649 item[3].features: 563346425 item[4].cpuid-register: ECX item[4].cpuid-input-eax: 2147483649 item[4].features: 101 item[5].cpuid-register: EDX item[5].cpuid-input-eax: 3221225473 item[5].features: 0 item[6].cpuid-register: EAX item[6].cpuid-input-eax: 1073741825 item[6].features: 0 item[7].cpuid-register: EDX item[7].cpuid-input-eax: 2147483658 item[7].features: 0 I plan to send another RFC as followup soon, that will add: * "-cpu force" (or "nofilter", or something else; I haven't decided about the name, yet) flag, to disable feature filtering based on host capabilities. * "filtered-features" property, listing which features were filtered out because of missing host capabilities (to allow libvirt to implement "enforce" mode in a more reliable way). Eduardo Habkost (4): target-i386: Add ECX information to FeatureWordInfo target-i386: Move feature word array outside get_register_name_32() target-i386: Add "feature-words" property target-i386: Use qapi for x86_cpu_get_feature_words() .gitignore | 2 + Makefile | 11 +++++ Makefile.objs | 5 +++ cpu-qapi-schema.json | 31 ++++++++++++++ target-i386/Makefile.objs | 1 + target-i386/cpu-qapi-schema.json | 31 ++++++++++++++ target-i386/cpu.c | 92 +++++++++++++++++++++++++++++++++------- 7 files changed, 158 insertions(+), 15 deletions(-) create mode 100644 cpu-qapi-schema.json create mode 100644 target-i386/cpu-qapi-schema.json -- 1.8.1.4

1 5

[libvirt] [PATCH] Disable static libraries by default
by Daniel P. Berrange 02 Apr '13

02 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Every source file is currently built twice by libtool, once for the shared library and once for the static library. Static libs are not commonly packaged by distros and slow down compilation time by as more than 50% compared to a shared-only build time. Time for 'make -j 4': shared only: 2 mins 9 secs shared + static: 3 mins 26 secs Time for non-parallel make shared only: 3 mins 32 secs shared + static: 5 mins 41 secs Those few people who really want them, can pass --enable-static to configure Disabling them by default requires use of LT_INIT, but for compat with RHEL5 we can't rely on that. So we conditionally use LT_INIT, but fallback to AM_PROG_LIBTOOL if not present. --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 09e4ad9..0df9e5c 100644 --- a/configure.ac +++ b/configure.ac @@ -123,7 +123,11 @@ AC_TYPE_UID_T dnl Support building Win32 DLLs (must appear *before* AM_PROG_LIBTOOL) AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL +m4_ifndef([LT_INIT], [ + AM_PROG_LIBTOOL +], [ + LT_INIT([shared disable-static]) +]) AM_PROG_CC_C_O AM_PROG_LD -- 1.8.1.4

2 3

[libvirt] [PATCH libvirt-glib] Disable static libraries by default
by Daniel P. Berrange 02 Apr '13

02 Apr '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Every source file is currently built twice by libtool, once for the shared library and once for the static library. Static libs are not commonly packaged by distros and slow down compilation time by as more than 50% compared to a shared-only build time. Time for non-parallel make shared only: 52 secs shared + static: 1 min 26 secs Those few people who really want them, can pass --enable-static to configure Disabling them by default requires use of LT_INIT. We don't need to support older libtool, so drop use of AM_PROG_LIBTOOL entirely --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 96dbf5a..7b5a092 100644 --- a/configure.ac +++ b/configure.ac @@ -34,8 +34,7 @@ AC_SUBST([LIBVIRT_GLIB_VERSION_NUMBER]) AC_PROG_CC AM_PROG_CC_C_O -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL +LT_INIT([shared disable-static win32-dll]) dnl AC_CONFIG_LIBOBJ_DIR([src]) -- 1.8.1.4

2 1

[libvirt] [libvirt-glib] build: Replace obsolete macro in configure.ac
by Christophe Fergeau 02 Apr '13

02 Apr '13

From: Stefano Facchini <stefano.facchini(a)gmail.com> Fix the build for newer automake --- AUTHORS | 1 + configure.ac | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 6cec5d7..db05f64 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,5 +17,6 @@ Patches have been received from: Timo Juhani Lindfors <timo.lindfors(a)iki.fi> Alexander Larsson <alexl(a)redhat.com> Claudio Bley <cbley(a)av-test.de> + Stefano Facchini <stefano.facchini(a)gmail.com> ... send patches to get your name added ... diff --git a/configure.ac b/configure.ac index 96dbf5a..2bf9c1b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_INIT(libvirt-glib, 0.1.7) AC_CONFIG_SRCDIR(libvirt-glib/libvirt-glib-main.c) AC_CONFIG_AUX_DIR([build-aux]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([-Wno-portability]) -- 1.8.1.4

2 3

[libvirt] [PATCH] virsh: Call virDomainFree in cmdDomFSTrim
by Michal Privoznik 02 Apr '13

02 Apr '13

The virsh domfstrim command was not freeing allocated domain, leaving leaked references behind. --- tools/virsh-domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5ddcedc..5fbfeee 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10058,6 +10058,8 @@ cmdDomFSTrim(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: + if (dom) + virDomainFree(dom); return ret; } -- 1.8.1.5

5 6

[libvirt] [libvirt-glib] config: Fix 2 leaks in domain memory setters
by Christophe Fergeau 02 Apr '13

02 Apr '13

--- libvirt-gconfig/libvirt-gconfig-domain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index be572ab..7ef0be8 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -414,6 +414,7 @@ void gvir_config_domain_set_memory(GVirConfigDomain *domain, guint64 memory) gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(node), "unit", "KiB", NULL); + g_object_unref(G_OBJECT(node)); g_object_notify(G_OBJECT(domain), "memory"); } @@ -439,6 +440,7 @@ void gvir_config_domain_set_current_memory(GVirConfigDomain *domain, gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(node), "unit", "KiB", NULL); + g_object_unref(G_OBJECT(node)); g_object_notify(G_OBJECT(domain), "current-memory"); } -- 1.8.1.4

2 1

[libvirt] [libvirt-glib 1/4] gconfig: Add GVirConfigStoragePool getters
by Christophe Fergeau 02 Apr '13

02 Apr '13

--- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 143 +++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-storage-pool.h | 8 ++ libvirt-gconfig/libvirt-gconfig.sym | 12 +++ 3 files changed, 163 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.c b/libvirt-gconfig/libvirt-gconfig-storage-pool.c index 4ad9fc1..b06c24c 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.c +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.c @@ -74,6 +74,25 @@ GVirConfigStoragePool *gvir_config_storage_pool_new_from_xml(const gchar *xml, return GVIR_CONFIG_STORAGE_POOL(object); } +/** + * gvir_config_storage_pool_get_pool_type: + * @pool: a #GVirConfigStoragePool + * + * Gets the type of the pool. + * + * Returns: #Gname of @pool. + */ +GVirConfigStoragePoolType gvir_config_storage_pool_get_pool_type(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), + GVIR_CONFIG_STORAGE_POOL_TYPE_DIR); + + return gvir_config_object_get_attribute_genum(GVIR_CONFIG_OBJECT(pool), + NULL, "type", + GVIR_CONFIG_TYPE_STORAGE_POOL_TYPE, + GVIR_CONFIG_STORAGE_POOL_TYPE_DIR); +} + void gvir_config_storage_pool_set_pool_type(GVirConfigStoragePool *pool, GVirConfigStoragePoolType type) { @@ -87,6 +106,22 @@ void gvir_config_storage_pool_set_pool_type(GVirConfigStoragePool *pool, } /** + * gvir_config_storage_pool_get_name: + * @pool: a #GVirConfigStoragePool + * + * Gets the name of the pool. + * + * Returns: name of @pool. + */ +const char *gvir_config_storage_pool_get_name(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), NULL); + + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(pool), + "name"); +} + +/** * gvir_config_storage_pool_set_name: * @name: (allow-none): */ @@ -100,6 +135,22 @@ void gvir_config_storage_pool_set_name(GVirConfigStoragePool *pool, } /** + * gvir_config_storage_pool_get_uuid: + * @pool: a #GVirConfigStoragePool + * + * Gets the unique identifier for @pool. + * + * Returns: unique identifier for @pool. + */ +const char *gvir_config_storage_pool_get_uuid(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), NULL); + + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(pool), + "uuid"); +} + +/** * gvir_config_storage_pool_set_uuid: * @uuid: (allow-none): */ @@ -112,6 +163,22 @@ void gvir_config_storage_pool_set_uuid(GVirConfigStoragePool *pool, "uuid", uuid); } +/** + * gvir_config_storage_pool_get_capacity: + * @pool: a #GVirConfigStoragePool + * + * Gets the total storage capacity for the pool. + * + * Returns: total storage capacity in bytes. + */ +guint64 gvir_config_storage_pool_get_capacity(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), 0); + + return gvir_config_object_get_node_content_uint64(GVIR_CONFIG_OBJECT(pool), + "capacity"); +} + void gvir_config_storage_pool_set_capacity(GVirConfigStoragePool *pool, guint64 capacity) { @@ -121,6 +188,22 @@ void gvir_config_storage_pool_set_capacity(GVirConfigStoragePool *pool, "capacity", capacity); } +/** + * gvir_config_storage_pool_get_allocation: + * @pool: a #GVirConfigStoragePool + * + * Gets the total storage allocation for the pool. + * + * Returns: total storage allocation in bytes. + */ +guint64 gvir_config_storage_pool_get_allocation(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), 0); + + return gvir_config_object_get_node_content_uint64(GVIR_CONFIG_OBJECT(pool), + "allocation"); +} + void gvir_config_storage_pool_set_allocation(GVirConfigStoragePool *pool, guint64 allocation) { @@ -130,6 +213,22 @@ void gvir_config_storage_pool_set_allocation(GVirConfigStoragePool *pool, "allocation", allocation); } +/** + * gvir_config_storage_pool_get_available: + * @pool: a #GVirConfigStoragePool + * + * Gets the free space available for allocating new volumes in the pool. + * + * Returns: free space available in bytes. + */ +guint64 gvir_config_storage_pool_get_available(GVirConfigStoragePool *pool) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), 0); + + return gvir_config_object_get_node_content_uint64(GVIR_CONFIG_OBJECT(pool), + "available"); +} + void gvir_config_storage_pool_set_available(GVirConfigStoragePool *pool, guint64 available) { @@ -140,6 +239,28 @@ void gvir_config_storage_pool_set_available(GVirConfigStoragePool *pool, } /** + * gvir_config_storage_pool_get_source: + * @pool: a #GVirConfigStoragePool + * + * Gets the source for @pool + * + * Returns: (transfer full): a new #GVirConfigStoragePoolSource instance. + */ +GVirConfigStoragePoolSource *gvir_config_storage_pool_get_source(GVirConfigStoragePool *pool) +{ + GVirConfigObject *object; + + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), NULL); + + object = gvir_config_object_get_child_with_type + (GVIR_CONFIG_OBJECT(pool), + "source", + GVIR_CONFIG_TYPE_STORAGE_POOL_SOURCE); + + return GVIR_CONFIG_STORAGE_POOL_SOURCE(object); +} + +/** * gvir_config_storage_pool_set_source: * @source: (allow-none): */ @@ -156,6 +277,28 @@ void gvir_config_storage_pool_set_source(GVirConfigStoragePool *pool, } /** + * gvir_config_storage_pool_get_target: + * @pool: a #GVirConfigStoragePool + * + * Gets the target for @pool + * + * Returns: (transfer full): a new #GVirConfigStoragePoolTarget instance. + */ +GVirConfigStoragePoolTarget *gvir_config_storage_pool_get_target(GVirConfigStoragePool *pool) +{ + GVirConfigObject *object; + + g_return_val_if_fail(GVIR_CONFIG_IS_STORAGE_POOL(pool), NULL); + + object = gvir_config_object_get_child_with_type + (GVIR_CONFIG_OBJECT(pool), + "target", + GVIR_CONFIG_TYPE_STORAGE_POOL_TARGET); + + return GVIR_CONFIG_STORAGE_POOL_TARGET(object); +} + +/** * gvir_config_storage_pool_set_target: * @target: (allow-none): */ diff --git a/libvirt-gconfig/libvirt-gconfig-storage-pool.h b/libvirt-gconfig/libvirt-gconfig-storage-pool.h index 9005482..ac4141e 100644 --- a/libvirt-gconfig/libvirt-gconfig-storage-pool.h +++ b/libvirt-gconfig/libvirt-gconfig-storage-pool.h @@ -76,20 +76,28 @@ GVirConfigStoragePool *gvir_config_storage_pool_new(void); GVirConfigStoragePool *gvir_config_storage_pool_new_from_xml(const gchar *xml, GError **error); +guint64 gvir_config_storage_pool_get_allocation(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_allocation(GVirConfigStoragePool *pool, guint64 allocation); +guint64 gvir_config_storage_pool_get_available(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_available(GVirConfigStoragePool *pool, guint64 available); +guint64 gvir_config_storage_pool_get_capacity(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_capacity(GVirConfigStoragePool *pool, guint64 capacity); +const char *gvir_config_storage_pool_get_name(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_name(GVirConfigStoragePool *pool, const char *name); +GVirConfigStoragePoolType gvir_config_storage_pool_get_pool_type(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_pool_type(GVirConfigStoragePool *pool, GVirConfigStoragePoolType type); +GVirConfigStoragePoolSource *gvir_config_storage_pool_get_source(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_source(GVirConfigStoragePool *pool, GVirConfigStoragePoolSource *source); +GVirConfigStoragePoolTarget *gvir_config_storage_pool_get_target(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_target(GVirConfigStoragePool *pool, GVirConfigStoragePoolTarget *target); +const char *gvir_config_storage_pool_get_uuid(GVirConfigStoragePool *pool); void gvir_config_storage_pool_set_uuid(GVirConfigStoragePool *pool, const char *uuid); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index a1b2cc1..93b2e33 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -512,4 +512,16 @@ LIBVIRT_GCONFIG_0.1.6 { gvir_config_domain_graphics_spice_image_compression_get_type; } LIBVIRT_GCONFIG_0.1.5; +LIBVIRT_GCONFIG_0.1.7 { + global: + gvir_config_storage_pool_get_allocation; + gvir_config_storage_pool_get_available; + gvir_config_storage_pool_get_capacity; + gvir_config_storage_pool_get_name; + gvir_config_storage_pool_get_pool_type; + gvir_config_storage_pool_get_source; + gvir_config_storage_pool_get_target; + gvir_config_storage_pool_get_uuid; +} LIBVIRT_GCONFIG_0.1.6; + # .... define new API here using predicted next version number .... -- 1.8.1.4

2 7

[libvirt] [libvirt-glib] gconfig: Add calls to [gs]et_virt_type to domain tests
by Christophe Fergeau 02 Apr '13

02 Apr '13

Setting GVirConfigDomain::virt_type is required for a working domain configuration, using it in the test programs will be helpful if people are using this as a base when starting to use libvirt-gconfig --- examples/config-demo.py | 1 + libvirt-gconfig/tests/test-domain-create.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/examples/config-demo.py b/examples/config-demo.py index 508bbc5..268c439 100644 --- a/examples/config-demo.py +++ b/examples/config-demo.py @@ -3,6 +3,7 @@ from gi.repository import LibvirtGConfig; domain = LibvirtGConfig.Domain.new() +domain.set_virt_type(LibvirtGConfig.DomainVirtType.KVM) domain.set_name("foo") domain.set_memory(1024*1024) # 1 GB domain.set_vcpus(2) diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index 20fedc5..e30f643 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -111,6 +111,9 @@ int main(int argc, char **argv) domain = gvir_config_domain_new(); g_assert(domain != NULL); + + gvir_config_domain_set_virt_type(domain, GVIR_CONFIG_DOMAIN_VIRT_KVM); + g_assert(gvir_config_domain_get_virt_type(domain) == GVIR_CONFIG_DOMAIN_VIRT_KVM); gvir_config_domain_set_name(domain, "foo"); g_str_const_check(gvir_config_domain_get_name(domain), "foo"); -- 1.8.1.4

2 1

[libvirt] [PATCH 1/2] manual: Add info about migrateuri in virsh manual
by Martin Kletzander 02 Apr '13

02 Apr '13

The virsh(1) man page wasn't saying anything about the 'migrateuri' parameter other than it can be usually omitted. A patched version of docs/migrate.html.in is taken in this patch to fix that up in the man page. --- docs/migration.html.in | 4 ++-- tools/virsh.pod | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/docs/migration.html.in b/docs/migration.html.in index 2416275..aecef41 100644 --- a/docs/migration.html.in +++ b/docs/migration.html.in @@ -192,12 +192,12 @@ should specify the hypervisor specific URI, using an IP address associated with the network to be used.</li> <li>The firewall restricts what ports are available. When libvirt - generates a migration URI will pick a port number using hypervisor + generates a migration URI it will pick a port number using hypervisor specific rules. Some hypervisors only require a single port to be open in the firewalls, while others require a whole range of port numbers. In the latter case the management application may wish to choose a specific port number outside the default range in order - to comply with local firewall policies</li> + to comply with local firewall policies.</li> </ol> <h2><a name="config">Configuration file handling</a></h2> diff --git a/tools/virsh.pod b/tools/virsh.pod index e7e82e3..11447fe 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1080,7 +1080,7 @@ such as GFS2 or GPFS. If you are sure the migration is safe or you just do not care, use I<--unsafe> to force the migration. The I<desturi> is the connection URI of the destination host, and -I<migrateuri> is the migration URI, which usually can be omitted. +I<migrateuri> is the migration URI, which usually can be omitted (see below). I<dname> is used for renaming the domain to new name during migration, which also usually can be omitted. Likewise, I<--xml> B<file> is usually omitted, but can be used to supply an alternative XML file for use on @@ -1108,6 +1108,32 @@ seen from the source machine. =back +When I<migrateuri> is not specified, libvirt will automatically determine the +hypervisor specific URI, by looking up the target host's configured hostname. +There are a few scenarios where specifying I<migrateuri> may help: + +=over 4 + +=item * The configured hostname is incorrect, or DNS is broken. If a host has a +hostname which will not resolve to match one of its public IP addresses, then +libvirt will generate an incorrect URI. In this case I<migrateuri> should be +explicitly specified, using an IP address, or a correct hostname. + +=item * The host has multiple network interaces. If a host has multiple network +interfaces, it might be desirable for the migration data stream to be sent over +a specific interface for either security or performance reasons. In this case +I<migrateuri> should be explicitly specified, using an IP address associated +with the network to be used. + +=item * The firewall restricts what ports are available. When libvirt generates +a migration URI, it will pick a port number using hypervisor specific rules. +Some hypervisors only require a single port to be open in the firewalls, while +others require a whole range of port numbers. In the latter case I<migrateuri> +might be specified to choose a specific port number outside the default range in +order to comply with local firewall policies. + +=back + =item B<migrate-setmaxdowntime> I<domain> I<downtime> Set maximum tolerable downtime for a domain which is being live-migrated to -- 1.8.1.5

2 4

[libvirt] [PATCHv2 0/4] Add domain modification impact flags to hot-management commands
by Peter Krempa 02 Apr '13

02 Apr '13

A respin of the series that changes some virsh commands to handle flags more sanely. This version fixes comments by Martin, Laine and Eric. This series omits already acked patches. Peter Krempa (4): virsh: Fix semantics of --config for "update-device" command virsh-domain: Add --live, --config, --current logic to cmdDetachInterface virsh-domain: Add --live, --config, --current logic to cmdDetachDevice virsh-domain: Add --live, --config, --current logic to cmdDetachDisk tools/virsh-domain.c | 182 +++++++++++++++++++++++++++++++++++++-------------- tools/virsh.pod | 81 +++++++++++++++++------ 2 files changed, 194 insertions(+), 69 deletions(-) -- 1.8.1.5

3 10

[libvirt] [PATCH 0/3] Refactor formatting of MAC addresses and domif-getlink virsh command
by Peter Krempa 02 Apr '13

02 Apr '13

This series refactors libvirt XML code generator to create uniform mac addresses with lowercase hex characters and refactors the domif-getlink command to avoid a bug and too complex code. Peter Krempa (3): util: Change virMacAddrFormat to lowercase hex characters conf: Use virMacAddrFormat while generating domain XML files virsh-domain-monitor: Refactor cmdDomIfGetLink src/conf/domain_conf.c | 7 +- src/util/virmacaddr.c | 2 +- tests/networkxml2xmlout/bandwidth-network.xml | 2 +- .../networkxml2xmlout/dhcp6host-routed-network.xml | 2 +- tests/networkxml2xmlout/empty-allow-ipv6.xml | 2 +- tests/networkxml2xmlout/isolated-network.xml | 2 +- tests/networkxml2xmlout/routed-network.xml | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx | 4 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.vmx | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.vmx | 2 +- tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx | 2 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx | 4 +- tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx | 2 +- tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx | 2 +- tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx | 2 +- tools/virsh-domain-monitor.c | 100 ++++++++------------- 21 files changed, 62 insertions(+), 87 deletions(-) -- 1.8.1.5

3 11

[libvirt] Entering freeze for libvirt-1.0.4
by Daniel Veillard 02 Apr '13

02 Apr '13

Based on the discussions from last week, we are entering freeze now, I tagged v1.0.4-rc1 in git and pushed libvirt-1.0.4-rc1.tar.gz as well as rpms for F17 at the usual place: ftp://libvirt.org/libvirt/ This looks functional for my limited testing, but give it a try. Hopefully since 1.0.3 wasn't too long ago we should be mostly okay :) And of course a release on April Fool sounds like a good target ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

5 7

[libvirt] [PATCHv2] conf: Enforce ranges on cputune variables
by Peter Krempa 02 Apr '13

02 Apr '13

The limits are documented at http://libvirt.org/formatdomain.html#elementsCPUTuning . Enforce them when going through XML parsing in addition to being enforced by the API. --- Notes: Version 2: - split out from the conf callback series and applied separately to the parser code src/conf/domain_conf.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f3fca7f..371d80c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9677,6 +9677,14 @@ virDomainDefParseXML(virCapsPtr caps, goto error; } + if (def->cputune.period > 0 && + (def->cputune.period < 1000 || def->cputune.period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune period must be in range " + "[1000, 1000000]")); + goto error; + } + if (virXPathLongLong("string(./cputune/quota[1])", ctxt, &def->cputune.quota) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9684,6 +9692,15 @@ virDomainDefParseXML(virCapsPtr caps, goto error; } + if (def->cputune.quota > 0 && + (def->cputune.quota < 1000 || + def->cputune.quota > 18446744073709551)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune quota must be in range " + "[1000, 18446744073709551]")); + goto error; + } + if (virXPathULongLong("string(./cputune/emulator_period[1])", ctxt, &def->cputune.emulator_period) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9691,6 +9708,15 @@ virDomainDefParseXML(virCapsPtr caps, goto error; } + if (def->cputune.emulator_period > 0 && + (def->cputune.emulator_period < 1000 || + def->cputune.emulator_period > 1000000)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune emulator_period must be in range " + "[1000, 1000000]")); + goto error; + } + if (virXPathLongLong("string(./cputune/emulator_quota[1])", ctxt, &def->cputune.emulator_quota) < -1) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9698,6 +9724,15 @@ virDomainDefParseXML(virCapsPtr caps, goto error; } + if (def->cputune.emulator_quota > 0 && + (def->cputune.emulator_quota < 1000 || + def->cputune.emulator_quota > 18446744073709551)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Value of cputune emulator_quota must be in range " + "[1000, 18446744073709551]")); + goto error; + } + if ((n = virXPathNodeSet("./cputune/vcpupin", ctxt, &nodes)) < 0) goto error; -- 1.8.1.5

2 2

[libvirt] [PATCH v3] test: Return Libvirt logo as domain screenshot
by Michal Privoznik 02 Apr '13

02 Apr '13

This is just a bare Easter Egg. Whenever a user runs virDomainScreenshot over a domain in test driver, he'll get the Libvirt PNG logo in return. --- docs/Makefile.am | 1 + libvirt.spec.in | 1 + src/test/test_driver.c | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/docs/Makefile.am b/docs/Makefile.am index 7583772..b5d7575 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -287,6 +287,7 @@ install-data-local: for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ done + $(INSTALL_DATA) $(srcdir)/../docs/libvirtLogo.png $(DESTDIR)$(pkgdatadir) uninstall-local: for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done diff --git a/libvirt.spec.in b/libvirt.spec.in index 2da0558..34b3f9c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1941,6 +1941,7 @@ fi %{_datadir}/libvirt/schemas/storagevol.rng %{_datadir}/libvirt/cpu_map.xml +%{_datadir}/libvirt/libvirtLogo.png %if %{with_systemd} %{_unitdir}/libvirt-guests.service diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c5fffb9..4dbd775 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -39,11 +39,13 @@ #include "virutil.h" #include "viruuid.h" #include "capabilities.h" +#include "configmake.h" #include "viralloc.h" #include "network_conf.h" #include "interface_conf.h" #include "domain_conf.h" #include "domain_event.h" +#include "fdstream.h" #include "storage_conf.h" #include "node_device_conf.h" #include "virxml.h" @@ -5773,6 +5775,27 @@ cleanup: return ret; } +static char * +testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, + virStreamPtr st, + unsigned int screen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + char *ret = NULL; + + virCheckFlags(0, NULL); + + if (!(ret = strdup("image/png"))) { + virReportOOMError(); + return NULL; + } + + if (virFDStreamOpenFile(st, PKGDATADIR "/libvirtLogo.png", 0, 0, O_RDONLY < 0)) + VIR_FREE(ret); + + return ret; +} + static virDriver testDriver = { .no = VIR_DRV_TEST, @@ -5843,6 +5866,7 @@ static virDriver testDriver = { .domainEventDeregisterAny = testDomainEventDeregisterAny, /* 0.8.0 */ .isAlive = testIsAlive, /* 0.9.8 */ .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ + .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ }; static virNetworkDriver testNetworkDriver = { -- 1.8.1.5

3 3

[libvirt] [PATCH] smartcard: spell ccid-card-emulated qemu property correctly
by Eric Blake 02 Apr '13

02 Apr '13

Reported by Anthony Messina in https://bugzilla.redhat.com/show_bug.cgi?id=904692 Present since introduction of smartcard support in commit f5fd9baa * src/qemu/qemu_command.c (qemuBuildCommandLine): Match qemu spelling. --- No one has spotted my bug, latent since Feb 2011, until now. I guess smartcard use is not very common... src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a0c278f..59a6061 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6843,7 +6843,7 @@ qemuBuildCommandLine(virConnectPtr conn, } else { database = VIR_DOMAIN_SMARTCARD_DEFAULT_DATABASE; } - virBufferAsprintf(&opt, ",database=%s", database); + virBufferAsprintf(&opt, ",db=%s", database); break; case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: -- 1.8.1.4

2 2

[libvirt] [PATCH v5] qemu: Allow migration over IPv6
by Ján Tomko 02 Apr '13

02 Apr '13

Allow migration over IPv6 by listening on [::] instead of 0.0.0.0 when QEMU supports it (QEMU_CAPS_IPV6_MIGRATION) and there is at least one v6 address configured on the system. Use virURIParse in qemuMigrationPrepareDirect to allow parsing IPv6 addresses, which would cause an 'incorrect :port' error message before. Move setting of migrateFrom from qemuMigrationPrepare{Direct,Tunnel} after domain XML parsing, since we need the QEMU binary path from it to get its capabilities. Bug: https://bugzilla.redhat.com/show_bug.cgi?id=846013 --- diff to v4: Always listen on IPv6 if it's available. Don't add a migration flag. v4: https://www.redhat.com/archives/libvir-list/2013-March/msg01213.html discussion: https://www.redhat.com/archives/libvir-list/2013-March/msg00515.html src/qemu/qemu_capabilities.c | 6 +++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_migration.c | 104 +++++++++++++++++++++++++++++++++---------- tests/qemuhelptest.c | 9 ++-- 4 files changed, 93 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3840b41..1e1da4d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -213,6 +213,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio-ccw", "dtb", "megasas", + + "ipv6-migration", /* 135 */ ); struct _virQEMUCaps { @@ -1181,6 +1183,9 @@ virQEMUCapsComputeCmdFlags(const char *help, if (version >= 11000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_HOST); + if (version >= 1001000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); + if (version >= 1002000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); return 0; @@ -2317,6 +2322,7 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); virQEMUCapsSet(qemuCaps, QEMU_CAPS_DTB); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION); } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 7101f67..2ccc7c2 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -174,6 +174,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_VIRTIO_CCW = 132, /* -device virtio-*-ccw */ QEMU_CAPS_DTB = 133, /* -dtb file */ QEMU_CAPS_SCSI_MEGASAS = 134, /* -device megasas */ + QEMU_CAPS_IPV6_MIGRATION = 135, /* -incoming [::] */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 537b834..867c7f1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -22,6 +22,8 @@ #include <config.h> +#include <netdb.h> +#include <sys/socket.h> #include <sys/time.h> #ifdef WITH_GNUTLS # include <gnutls/gnutls.h> @@ -1104,12 +1106,12 @@ error: */ static int qemuMigrationStartNBDServer(virQEMUDriverPtr driver, - virDomainObjPtr vm) + virDomainObjPtr vm, + const char *listenAddr) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; unsigned short port = 0; - const char *listenAddr = "0.0.0.0"; char *diskAlias = NULL; size_t i; @@ -1980,8 +1982,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, int *cookieoutlen, const char *dname, const char *dom_xml, - const char *migrateFrom, virStreamPtr st, + unsigned int port, unsigned long flags) { virDomainDefPtr def = NULL; @@ -1997,6 +1999,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, char *xmlout = NULL; unsigned int cookieFlags; virCapsPtr caps = NULL; + const char *listenAddr = NULL; + char *migrateFrom = NULL; if (virTimeMillisNow(&now) < 0) return -1; @@ -2084,6 +2088,45 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, } } + if (tunnel) { + /* QEMU will be started with -incoming stdio + * (which qemu_command might convert to exec:cat or fd:n) + */ + if (!(migrateFrom = strdup("stdio"))) { + virReportOOMError(); + goto cleanup; + } + } else { + virQEMUCapsPtr qemuCaps = NULL; + struct addrinfo *info = NULL; + struct addrinfo hints = { .ai_flags = AI_ADDRCONFIG, + .ai_socktype = SOCK_STREAM }; + + if (!(qemuCaps = virQEMUCapsCacheLookupCopy(driver->qemuCapsCache, + def->emulator))) + goto cleanup; + + /* Listen on :: instead of 0.0.0.0 if QEMU understands it + * and there is at least one IPv6 address configured + */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_IPV6_MIGRATION) && + getaddrinfo("::", NULL, &hints, &info) == 0) { + freeaddrinfo(info); + listenAddr = "[::]"; + } else { + listenAddr = "0.0.0.0"; + } + virObjectUnref(qemuCaps); + + /* QEMU will be started with -incoming [::]:port + * or -incoming 0.0.0.0:port + */ + if (virAsprintf(&migrateFrom, "tcp:%s:%d", listenAddr, port) < 0) { + virReportOOMError(); + goto cleanup; + } + } + if (!(vm = virDomainObjListAdd(driver->domains, driver->xmlconf, def, @@ -2172,7 +2215,7 @@ done: if (flags & VIR_MIGRATE_TUNNELLED) VIR_DEBUG("NBD in tunnelled migration is currently not supported"); else { - if (qemuMigrationStartNBDServer(driver, vm) < 0) { + if (qemuMigrationStartNBDServer(driver, vm, listenAddr) < 0) { /* error already reported */ goto endjob; } @@ -2213,6 +2256,7 @@ done: ret = 0; cleanup: + VIR_FREE(migrateFrom); VIR_FREE(origname); VIR_FREE(xmlout); virDomainDefFree(def); @@ -2270,12 +2314,9 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, st, NULLSTR(dname), dom_xml, flags); - /* QEMU will be started with -incoming stdio (which qemu_command might - * convert to exec:cat or fd:n) - */ ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - "stdio", st, flags); + st, 0, flags); return ret; } @@ -2296,9 +2337,10 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, static int port = 0; int this_port; char *hostname = NULL; - char migrateFrom [64]; const char *p; + char *uri_str = NULL; int ret = -1; + virURIPtr uri; VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " @@ -2347,16 +2389,39 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * URI when passing it to the qemu monitor, so bad * characters in hostname part don't matter. */ - if (!STRPREFIX(uri_in, "tcp:")) { + if (!(p = STRSKIP(uri_in, "tcp:"))) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("only tcp URIs are supported for KVM/QEMU" " migrations")); goto cleanup; } - /* Get the port number. */ - p = strrchr(uri_in, ':'); - if (p == strchr(uri_in, ':')) { + /* Convert uri_in to well-formed URI with // after tcp: */ + if (!(STRPREFIX(uri_in, "tcp://"))) { + if (virAsprintf(&uri_str, "tcp://%s", p) < 0) { + virReportOOMError(); + goto cleanup; + } + } + + uri = virURIParse(uri_str ? uri_str : uri_in); + VIR_FREE(uri_str); + + if (uri == NULL) { + virReportError(VIR_ERR_INVALID_ARG, _("unable to parse URI: %s"), + uri_in); + goto cleanup; + } + + if (uri->server == NULL) { + virReportError(VIR_ERR_INVALID_ARG, _("missing host in migration" + " URI: %s"), uri_in); + goto cleanup; + } else { + hostname = uri->server; + } + + if (uri->port == 0) { /* Generate a port */ this_port = QEMUD_MIGRATION_FIRST_PORT + port++; if (port == QEMUD_MIGRATION_NUM_PORTS) @@ -2369,25 +2434,16 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, } } else { - p++; /* definitely has a ':' in it, see above */ - this_port = virParseNumber(&p); - if (this_port == -1 || p-uri_in != strlen(uri_in)) { - virReportError(VIR_ERR_INVALID_ARG, - "%s", _("URI ended with incorrect ':port'")); - goto cleanup; - } + this_port = uri->port; } } if (*uri_out) VIR_DEBUG("Generated uri_out=%s", *uri_out); - /* QEMU will be started with -incoming tcp:0.0.0.0:port */ - snprintf(migrateFrom, sizeof(migrateFrom), "tcp:0.0.0.0:%d", this_port); - ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, dname, dom_xml, - migrateFrom, NULL, flags); + NULL, this_port, flags); cleanup: VIR_FREE(hostname); if (ret != 0) diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index a28109a..05bb8a6 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -812,7 +812,8 @@ mymain(void) QEMU_CAPS_DEVICE_VMWARE_SVGA, QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, - QEMU_CAPS_DTB); + QEMU_CAPS_DTB, + QEMU_CAPS_IPV6_MIGRATION); DO_TEST("qemu-1.2.0", 1002000, 0, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -913,7 +914,8 @@ mymain(void) QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, QEMU_CAPS_DTB, - QEMU_CAPS_SCSI_MEGASAS); + QEMU_CAPS_SCSI_MEGASAS, + QEMU_CAPS_IPV6_MIGRATION); DO_TEST("qemu-kvm-1.2.0", 1002000, 1, 0, QEMU_CAPS_VNC_COLON, QEMU_CAPS_NO_REBOOT, @@ -1019,7 +1021,8 @@ mymain(void) QEMU_CAPS_DEVICE_USB_SERIAL, QEMU_CAPS_DEVICE_USB_NET, QEMU_CAPS_DTB, - QEMU_CAPS_SCSI_MEGASAS); + QEMU_CAPS_SCSI_MEGASAS, + QEMU_CAPS_IPV6_MIGRATION); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.1.5

2 2

[libvirt] [PATCH] qemu: Support multiple queue virtio-scsi
by Osier Yang 02 Apr '13

02 Apr '13

This introduce a new attribute "num_queues" (same with the good name QEMU uses) for virtio-scsi controller. An example of the XML: <controller type='scsi' index='0' model='virtio-scsi' num_queues='8'/> The corresponding QEMU command line: -device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ --- docs/formatdomain.html.in | 9 +++++--- docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 13 +++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 11 +++++++++ .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 8 +++++++ .../qemuxml2argv-disk-virtio-scsi-num_queues.xml | 26 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index cf382e8..262f1ac 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2092,10 +2092,13 @@ controller. A "scsi" controller has an optional attribute <code>model</code>, which is one of "auto", "buslogic", "ibmvscsi", "lsilogic", "lsisas1068", "lsisas1078", "virtio-scsi" or - "vmpvscsi". A "usb" controller has an optional attribute + "vmpvscsi". The attribute <code>num_queues</code> + (1.0.5 (QEMU and KVM only)) is to specify + the number of queues for the controller, it should match the number + of vCPUs. A "usb" controller has an optional attribute <code>model</code>, which is one of "piix3-uhci", "piix4-uhci", "ehci", - "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3", - "vt82c686b-uhci", "pci-ohci" or "nec-xhci". Additionally, + "ich9-ehci1", "ich9-uhci1", "ich9-uhci2", "ich9-uhci3", "vt82c686b-uhci", + "pci-ohci" or "nec-xhci". Additionally, since 0.10.0, if the USB bus needs to be explicitly disabled for the guest, <code>model='none'</code> may be used. The PowerPC64 "spapr-vio" addresses do not have an associated controller. diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8d7e6db..089be6c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1407,6 +1407,11 @@ </attribute> </optional> <optional> + <attribute name="num_queues"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> <ref name="usbmaster"/> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f3fca7f..e9d6b8b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4825,6 +4825,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, char *type = NULL; char *idx = NULL; char *model = NULL; + char *num_queues = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -4860,6 +4861,14 @@ virDomainControllerDefParseXML(xmlNodePtr node, def->model = -1; } + if ((num_queues = virXMLPropString(node, "num_queues"))) { + if (virStrToLong_ui(num_queues, NULL, 10, &def->num_queues) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Malformed 'num_queues' value '%s'"), num_queues); + goto error; + } + } + if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) goto error; @@ -4937,6 +4946,7 @@ cleanup: VIR_FREE(type); VIR_FREE(idx); VIR_FREE(model); + VIR_FREE(num_queues); return def; @@ -13037,6 +13047,9 @@ virDomainControllerDefFormat(virBufferPtr buf, virBufferEscapeString(buf, " model='%s'", model); } + if (def->num_queues) + virBufferAsprintf(buf, " num_queues='%u'", def->num_queues); + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: if (def->opts.vioserial.ports != -1) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index edddf25..8e79961 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -728,6 +728,7 @@ struct _virDomainControllerDef { int type; int idx; int model; /* -1 == undef */ + unsigned int num_queues; union { virDomainVirtioSerialOpts vioserial; } opts; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a0c278f..bc7beff 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3530,6 +3530,14 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, virBuffer buf = VIR_BUFFER_INITIALIZER; int model; + if (def->num_queues && + !(def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && + def->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'num_queues' is only supported by virtio-scsi controller")); + return NULL; + } + switch (def->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: model = def->model; @@ -3613,6 +3621,9 @@ qemuBuildControllerDevStr(virDomainDefPtr domainDef, goto error; } + if (def->num_queues) + virBufferAsprintf(&buf, ",num_queues=%u", def->num_queues); + if (qemuBuildDeviceAddressStr(&buf, &def->info, qemuCaps) < 0) goto error; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args new file mode 100644 index 0000000..8d46799 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args @@ -0,0 +1,8 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ +/usr/bin/qemu -S -M pc -m 214 -smp 8 -nographic -nodefconfig -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,num_queues=8,bus=pci.0,addr=0x3 \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml new file mode 100644 index 0000000..dfa9cf1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.xml @@ -0,0 +1,26 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>8</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='sdb' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='scsi' index='0' model='virtio-scsi' num_queues='8'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 38787ac..055d935 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -550,6 +550,9 @@ mymain(void) DO_TEST("disk-scsi-virtio-scsi", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST("disk-virtio-scsi-num_queues", + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-scsi-megasas", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_MEGASAS); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index ba9aa96..e5056f1 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -179,6 +179,7 @@ mymain(void) DO_TEST("disk-scsi-device"); DO_TEST("disk-scsi-vscsi"); DO_TEST("disk-scsi-virtio-scsi"); + DO_TEST("disk-virtio-scsi-num_queues"); DO_TEST("disk-scsi-megasas"); DO_TEST_FULL("disk-mirror", false, WHEN_ACTIVE); DO_TEST_FULL("disk-mirror", true, WHEN_INACTIVE); -- 1.8.1.4

3 4