- Devel - libvirt List Archives

[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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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 09 Apr '13

09 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