- Devel - libvirt List Archives

[libvirt] [PATCH] domain:screenshot: fixed screen parameter
by Martin Kletzander 16 Apr '12

16 Apr '12

The screen parameter must be an integer. I also chnaged it to variable parameter with the reasonable default. --- repos/domain/screenshot.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/repos/domain/screenshot.py b/repos/domain/screenshot.py index d73e980..3e727a7 100644 --- a/repos/domain/screenshot.py +++ b/repos/domain/screenshot.py @@ -7,8 +7,8 @@ import mimetypes import libvirt -required_params = ('guestname', 'screen', 'filename',) -optional_params = () +required_params = ('guestname', 'filename',) +optional_params = ('screen',) def saver(stream, data, file_): return file_.write(data) @@ -24,7 +24,8 @@ def screenshot(params): dom = conn.lookupByName(params['guestname']) st = conn.newStream(0) - mime = dom.screenshot(st, params['screen'], 0) + screen = params.get('screen', 0) + mime = dom.screenshot(st, int('screen'), 0) ext = mimetypes.guess_extension(mime) or '.ppm' filename = params['filename'] + ext -- 1.7.8.5

2 2

[libvirt] libvirt slow responding after restart of service
by Anton Gorlov 15 Apr '12

15 Apr '12

after service libvirtd restarted has go slow responding (virsh,virt-install and some other tools) lsof /var/run/libvirt/libvirt-sock-ro and attach strace to this $PID always show futex(0x7d1f84, FUTEX_WAIT_PRIVATE, 3, NULL) = -1 EAGAIN (Resource temporarily unavailable) futex(0x7d1f84, FUTEX_WAIT_PRIVATE, 5, NULL <detached ...> in starce of any threds (strace -p $PID -ff -o /opt/virtdebug.log) gdb show only (gdb) bt #0 0x00007f938c1e3703 in __poll (fds=<value optimized out>, nfds=<value optimized out>, timeout=<value optimized out>) at ../sysdeps/unix/sysv/linux/poll.c:87 #1 0x00000000004fadd0 in virEventPollRunOnce () at util/event_poll.c:620 #2 0x00000000004f99e5 in virEventRunDefaultImpl () at util/event.c:247 #3 0x00007f938c9e76dd in virNetServerRun (srv=0x7d1e30) at rpc/virnetserver.c:736 #4 0x0000000000423f2c in main (argc=<value optimized out>, argv=<value optimized out>) at libvirtd.c:1609 LIBVIRT_DEFAULT_URI=qemu:///system time virsh -r list ID Имя Статус ---------------------------------------------------- 1 debian6.0 работает 0.00user 0.00system 0:28.29elapsed 0%CPU (0avgtext+0avgdata 21520maxresident)k 0inputs+0outputs (0major+1809minor)pagefaults 0swaps and with LIBVIRT_DEBUG=1 LIBVIRT_DEBUG=1 LIBVIRT_DEFAULT_URI=qemu:///system time virsh -r list 2012-04-14 21:21:45.185+0000: 21338: info : libvirt version: 0.9.11, package: alt3M60P1 2012-04-14 21:21:45.185+0000: 21338: debug : virInitialize:414 : register drivers 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22e8e0 name=Test 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering Test as driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering Test as network driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering Test as interface driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering Test as storage driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering Test as device driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering Test as secret driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering Test as network filter driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22fe20 name=Xen 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering Xen as driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb230de0 name=OPENVZ 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering OPENVZ as driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb231300 name=VMWARE 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering VMWARE as driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb2306c0 name=PHYP 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering PHYP as driver 4 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering PHYP as storage driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering PHYP as interface driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : vboxRegister:137 : VBoxCGlueInit failed, using dummy driver 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb231820 name=VBOX 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering VBOX as driver 5 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering VBOX as network driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering VBOX as storage driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb234800 name=ESX 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering ESX as driver 6 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering ESX as interface driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering ESX as network driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering ESX as storage driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering ESX as device driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering ESX as secret driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering ESX as network filter driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22f1c0 name=remote 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering remote as driver 7 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering remote as network driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering remote as interface driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering remote as storage driver 4 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering remote as device driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering remote as secret driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering remote as network filter driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virEventRegisterDefaultImpl:204 : registering default event implementation 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollAddHandle:116 : Used 0 handle slots, adding at least 10 more 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollInterruptLocked:702 : Skip interrupt, 0 0 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollAddHandle:141 : EVENT_POLL_ADD_HANDLE: watch=1 fd=4 events=1 cb=0x7f16fad71670 op 2012-04-14 21:21:45.185+0000: 21338: debug : virEventRegisterImpl:177 : addHandle=0x7f16fad72260 updateHandle=0x7f16fad72130 removeHandle=imeout=0x7f16fad71c50 updateTimeout=0x7f16fad71e20 removeTimeout=0x7f16fad71f50 2012-04-14 21:21:45.185+0000: 21338: debug : virConnectOpenAuth:1455 : name=(null), auth=0x7f16fb22e860, flags=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:542 : Found 0 out of 0 timeout slots used, releasing 0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 0 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=1 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virConnectGetDefaultURI:1105 : Using LIBVIRT_DEFAULT_URI 'qemu:///system' 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1182 : name "qemu:///system" to URI components: scheme qemu server (null) user (null) port 0 path /system 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 0 (Test) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 0 Test returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 1 (Xen) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 1 Xen returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 2 (OPENVZ) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 2 OPENVZ returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 3 (VMWARE) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 3 VMWARE returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 4 (PHYP) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 4 PHYP returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 5 (VBOX) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 5 VBOX returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 6 (ESX) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 6 ESX returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 7 (remote) ... 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:542 : proceeding with name = qemu:///system 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:552 : Connecting with transport 1 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:599 : Proceeding with sockname /var/run/libvirt/libvirt-sock-ro 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketNew:119 : localAddr=0x7fff75e552a0 remoteAddr=0x7fff75e55210 fd=6 errfd 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketNew:179 : RPC_SOCKET_NEW: sock=0x680f90 refs=1 fd=6 errfd=-1 pid=0 localAddr=127.=127.0.0.1;0 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketRef:709 : RPC_SOCKET_REF: sock=0x680f90 refs=2 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddHandle:141 : EVENT_POLL_ADD_HANDLE: watch=2 fd=6 events=1 cb=0x7f16fae700b0 op7f16fae707f0 2012-04-14 21:21:45.186+0000: 21338: debug : virKeepAliveNew:244 : client=0x7f16fb283010, interval=-1, count=0 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddTimeout:225 : Used 0 timeout slots, adding at least 10 more 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddTimeout:248 : EVENT_POLL_ADD_TIMEOUT: timer=1 frequency=-1 cb=0x7f16fae6c180 ox7f16fae6c3a0 2012-04-14 21:21:45.186+0000: 21338: debug : virKeepAliveNew:277 : RPC_KEEPALIVE_NEW: ka=0x680870 client=0x7f16fb283010 refs=2 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientNew:324 : RPC_CLIENT_NEW: client=0x7f16fb283010 refs=3 sock=0x680f9 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:684 : Trying authentication 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetMessageNew:48 : msg=0x7f16f43fb010 tracked=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetMessageEncodePayload:351 : Encode length as 28 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientSendInternal:1675 : RPC_CLIENT_MSG_TX_QUEUE: client=0x7f16fb283010 len=28 prog=53=66 type=0 status=0 serial=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=2 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientIO:1533 : Outgoing message prog=536903814 version=1 serial=0 proc=66 type=0 lengt 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientIO:1591 : We have the buck 0x6822d0 0x6822d0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollUpdateHandle:151 : EVENT_POLL_UPDATE_HANDLE: watch=2 events=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=1 w=2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=2 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=0 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=1 timeout=-1 uname -a Linux f37.local 3.3.1-std-def-alt1 #1 SMP Tue Apr 10 13:27:26 UTC 2012 x86_64 GNU/Linux libvirtd --version libvirtd (libvirt) 0.9.11

1 0

[libvirt] [PATCH] Fix macvtap detection by also checking for IFLA_VF_MAX
by Guido Günther 15 Apr '12

15 Apr '12

since this isn't available on older kernels such as Debian Squeeze's 2.6.32. This make --with-macvtap=check work as expected. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) O.k. to apply? Cheers, -- Guido diff --git a/configure.ac b/configure.ac index 3f5b3ff..53c9b34 100644 --- a/configure.ac +++ b/configure.ac @@ -2534,7 +2534,8 @@ AC_MSG_CHECKING([whether to compile with macvtap support]) if test "$with_macvtap" != "no" ; then AC_TRY_COMPILE([ #include <sys/socket.h> #include <linux/rtnetlink.h> ], - [ int x = MACVLAN_MODE_BRIDGE; ], + [ int x = MACVLAN_MODE_BRIDGE; + int y = IFLA_VF_MAX; ], [ with_macvtap=yes ], [ if test "$with_macvtap" = "yes" ; then AC_MSG_ERROR([Installed linux headers don't show support for macvtap device.]) -- 1.7.9.5

2 2

[libvirt] libvirt slow responding after restart of service
by Anton Gorlov 14 Apr '12

14 Apr '12

after service libvirtd restarted has go slow responding (virsh,virt-install and some other tools) lsof /var/run/libvirt/libvirt-sock-ro and attach strace to this $PID always show futex(0x7d1f84, FUTEX_WAIT_PRIVATE, 3, NULL) = -1 EAGAIN (Resource temporarily unavailable) futex(0x7d1f84, FUTEX_WAIT_PRIVATE, 5, NULL <detached ...> in starce of any threds (strace -p $PID -ff -o /opt/virtdebug.log) gdb show only (gdb) bt #0 0x00007f938c1e3703 in __poll (fds=<value optimized out>, nfds=<value optimized out>, timeout=<value optimized out>) at ../sysdeps/unix/sysv/linux/poll.c:87 #1 0x00000000004fadd0 in virEventPollRunOnce () at util/event_poll.c:620 #2 0x00000000004f99e5 in virEventRunDefaultImpl () at util/event.c:247 #3 0x00007f938c9e76dd in virNetServerRun (srv=0x7d1e30) at rpc/virnetserver.c:736 #4 0x0000000000423f2c in main (argc=<value optimized out>, argv=<value optimized out>) at libvirtd.c:1609 LIBVIRT_DEFAULT_URI=qemu:///system time virsh -r list ID Имя Статус ---------------------------------------------------- 1 debian6.0 работает 0.00user 0.00system 0:28.29elapsed 0%CPU (0avgtext+0avgdata 21520maxresident)k 0inputs+0outputs (0major+1809minor)pagefaults 0swaps and with LIBVIRT_DEBUG=1 LIBVIRT_DEBUG=1 LIBVIRT_DEFAULT_URI=qemu:///system time virsh -r list 2012-04-14 21:21:45.185+0000: 21338: info : libvirt version: 0.9.11, package: alt3M60P1 2012-04-14 21:21:45.185+0000: 21338: debug : virInitialize:414 : register drivers 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22e8e0 name=Test 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering Test as driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering Test as network driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering Test as interface driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering Test as storage driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering Test as device driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering Test as secret driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering Test as network filter driver 0 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22fe20 name=Xen 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering Xen as driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb230de0 name=OPENVZ 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering OPENVZ as driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb231300 name=VMWARE 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering VMWARE as driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb2306c0 name=PHYP 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering PHYP as driver 4 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering PHYP as storage driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering PHYP as interface driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : vboxRegister:137 : VBoxCGlueInit failed, using dummy driver 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb231820 name=VBOX 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering VBOX as driver 5 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering VBOX as network driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering VBOX as storage driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb234800 name=ESX 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering ESX as driver 6 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering ESX as interface driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering ESX as network driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering ESX as storage driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering ESX as device driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering ESX as secret driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering ESX as network filter driver 1 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:775 : driver=0x7f16fb22f1c0 name=remote 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDriver:799 : registering remote as driver 7 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNetworkDriver:592 : registering remote as network driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterInterfaceDriver:625 : registering remote as interface driver 3 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterStorageDriver:658 : registering remote as storage driver 4 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterDeviceMonitor:691 : registering remote as device driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterSecretDriver:724 : registering remote as secret driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virRegisterNWFilterDriver:757 : registering remote as network filter driver 2 2012-04-14 21:21:45.185+0000: 21338: debug : virEventRegisterDefaultImpl:204 : registering default event implementation 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollAddHandle:116 : Used 0 handle slots, adding at least 10 more 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollInterruptLocked:702 : Skip interrupt, 0 0 2012-04-14 21:21:45.185+0000: 21338: debug : virEventPollAddHandle:141 : EVENT_POLL_ADD_HANDLE: watch=1 fd=4 events=1 cb=0x7f16fad71670 op 2012-04-14 21:21:45.185+0000: 21338: debug : virEventRegisterImpl:177 : addHandle=0x7f16fad72260 updateHandle=0x7f16fad72130 removeHandle=imeout=0x7f16fad71c50 updateTimeout=0x7f16fad71e20 removeTimeout=0x7f16fad71f50 2012-04-14 21:21:45.185+0000: 21338: debug : virConnectOpenAuth:1455 : name=(null), auth=0x7f16fb22e860, flags=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:542 : Found 0 out of 0 timeout slots used, releasing 0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 0 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=1 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virConnectGetDefaultURI:1105 : Using LIBVIRT_DEFAULT_URI 'qemu:///system' 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1182 : name "qemu:///system" to URI components: scheme qemu server (null) user (null) port 0 path /system 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 0 (Test) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 0 Test returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 1 (Xen) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 1 Xen returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 2 (OPENVZ) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 2 OPENVZ returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 3 (VMWARE) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 3 VMWARE returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 4 (PHYP) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 4 PHYP returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 5 (VBOX) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 5 VBOX returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 6 (ESX) ... 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1232 : driver 6 ESX returned DECLINED 2012-04-14 21:21:45.186+0000: 21338: debug : do_open:1226 : trying driver 7 (remote) ... 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:542 : proceeding with name = qemu:///system 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:552 : Connecting with transport 1 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:599 : Proceeding with sockname /var/run/libvirt/libvirt-sock-ro 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketNew:119 : localAddr=0x7fff75e552a0 remoteAddr=0x7fff75e55210 fd=6 errfd 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketNew:179 : RPC_SOCKET_NEW: sock=0x680f90 refs=1 fd=6 errfd=-1 pid=0 localAddr=127.=127.0.0.1;0 2012-04-14 21:21:45.186+0000: 21338: debug : virNetSocketRef:709 : RPC_SOCKET_REF: sock=0x680f90 refs=2 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddHandle:141 : EVENT_POLL_ADD_HANDLE: watch=2 fd=6 events=1 cb=0x7f16fae700b0 op7f16fae707f0 2012-04-14 21:21:45.186+0000: 21338: debug : virKeepAliveNew:244 : client=0x7f16fb283010, interval=-1, count=0 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddTimeout:225 : Used 0 timeout slots, adding at least 10 more 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollAddTimeout:248 : EVENT_POLL_ADD_TIMEOUT: timer=1 frequency=-1 cb=0x7f16fae6c180 ox7f16fae6c3a0 2012-04-14 21:21:45.186+0000: 21338: debug : virKeepAliveNew:277 : RPC_KEEPALIVE_NEW: ka=0x680870 client=0x7f16fb283010 refs=2 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientNew:324 : RPC_CLIENT_NEW: client=0x7f16fb283010 refs=3 sock=0x680f9 2012-04-14 21:21:45.186+0000: 21338: debug : doRemoteOpen:684 : Trying authentication 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetMessageNew:48 : msg=0x7f16f43fb010 tracked=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetMessageEncodePayload:351 : Encode length as 28 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientSendInternal:1675 : RPC_CLIENT_MSG_TX_QUEUE: client=0x7f16fb283010 len=28 prog=53=66 type=0 status=0 serial=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=2 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientIO:1533 : Outgoing message prog=536903814 version=1 serial=0 proc=66 type=0 lengt 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21338: debug : virNetClientIO:1591 : We have the buck 0x6822d0 0x6822d0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollUpdateHandle:151 : EVENT_POLL_UPDATE_HANDLE: watch=2 events=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=1 w=2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=2 timeout=-1 2012-04-14 21:21:45.186+0000: 21338: debug : virEventPollInterruptLocked:706 : Interrupting 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:630 : Poll got 1 event(s) 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchTimeouts:415 : Dispatch 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:460 : Dispatch 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:474 : i=0 w=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollDispatchHandles:488 : EVENT_POLL_DISPATCH_HANDLE: watch=1 events=1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventRunDefaultImpl:244 : running default event implementation 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupTimeouts:506 : Cleanup 1 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCleanupHandles:554 : Cleanup 2 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=0 w=1, f=4 e=1 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollMakePollFDs:383 : Prepare n=1 w=2, f=6 e=0 d=0 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:325 : Calculate expiry of 1 timers 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollCalculateTimeout:351 : Timeout at 0 due in -1 ms 2012-04-14 21:21:45.186+0000: 21339: debug : virEventPollRunOnce:619 : EVENT_POLL_RUN: nhandles=1 timeout=-1 uname -a Linux f37.local 3.3.1-std-def-alt1 #1 SMP Tue Apr 10 13:27:26 UTC 2012 x86_64 GNU/Linux libvirtd --version libvirtd (libvirt) 0.9.11

1 0

[libvirt] [PATCH V9 0/6] Add DHCP snooping support to nwfilter
by Stefan Berger 14 Apr '12

14 Apr '12

This series of patches adds DHCP snooping support to libvirt's nwfilter subsystem. DHCP snooping detects DHCP leases obtained by a VM and automatically adjusts the network traffic filters to reflect the IP addresses with which a VM may send its traffic, thus for example preventing IP address spoofing. Once leases on IP addresses expire or if a VM gives up on a lease on an IP address, the filters are also adjusted. All leases are persisted and automatically applied upon a VM's restart. Leases are associated with the tuple of VM-UUID and interface MAC address. The following interface XML activates and uses the DHCP snooping: <interface type='bridge'> <source bridge='virbr0'/> <filterref filter='clean-traffic'> <parameter name='ip_learning' value='dhcp'/> </filterref> </interface> Regards, David and Stefan

2 8

Re: [libvirt] Start of freeze for libvirt-0.9.11 and availability of rc1
by Philipp Hahn 13 Apr '12

13 Apr '12

Hello Guido, Am Freitag 13 April 2012 15:10:49 schrieb Guido Günther: > könntest Du das als richtigen Patch schicken, dann apply ich das. [Guido asks me to send a full patch, so he can apply it.] Sure, see the attached patch. Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH be open. fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

2 1

[libvirt] [PATCH] blockjob: add virsh blockjob --wait
by Eric Blake 13 Apr '12

13 Apr '12

I'm tired of shell-scripting to wait for completion of a block pull, when virsh can be taught to do the same. I couldn't quite reuse vshWatchJob, as this is not a case of a long-running command where a second thread must be used to probe job status (at least, not unless I make virsh start doing blocking waits for an event to fire), but it served as inspiration for my simpler single-threaded loop. There is up to a half-second delay between sending SIGINT and the job being aborted, but I didn't think it worth the complexity of a second thread and use of poll() just to minimize that delay. * tools/virsh.c (cmdBlockPull): Add new options to wait for completion. (blockJobImpl): Add argument. (cmdBlockJob): Adjust caller. * tools/virsh.pod (blockjob): Document new mode. --- tools/virsh.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++----- tools/virsh.pod | 11 ++++- 2 files changed, 119 insertions(+), 14 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 8ef57e0..c54add9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -7274,11 +7274,11 @@ repoll: if (pollfd.revents & POLLIN && saferead(pipe_fd, &retchar, sizeof(retchar)) > 0 && retchar == '0') { - if (verbose) { - /* print [100 %] */ - print_job_progress(label, 0, 1); - } - break; + if (verbose) { + /* print [100 %] */ + print_job_progress(label, 0, 1); + } + break; } goto cleanup; } @@ -7295,8 +7295,9 @@ repoll: } GETTIMEOFDAY(&curr); - if ( timeout && ((int)(curr.tv_sec - start.tv_sec) * 1000 + \ - (int)(curr.tv_usec - start.tv_usec) / 1000) > timeout * 1000 ) { + if (timeout && (((int)(curr.tv_sec - start.tv_sec) * 1000 + + (int)(curr.tv_usec - start.tv_usec) / 1000) > + timeout * 1000)) { /* suspend the domain when migration timeouts. */ vshDebug(ctl, VSH_ERR_DEBUG, "%s timeout", label); if (timeout_func) @@ -7519,7 +7520,8 @@ typedef enum { static int blockJobImpl(vshControl *ctl, const vshCmd *cmd, - virDomainBlockJobInfoPtr info, int mode) + virDomainBlockJobInfoPtr info, int mode, + virDomainPtr *pdom) { virDomainPtr dom = NULL; const char *name, *path; @@ -7560,7 +7562,9 @@ blockJobImpl(vshControl *ctl, const vshCmd *cmd, } cleanup: - if (dom) + if (pdom && ret == 0) + *pdom = dom; + else if (dom) virDomainFree(dom); return ret; } @@ -7580,15 +7584,109 @@ static const vshCmdOptDef opts_block_pull[] = { {"bandwidth", VSH_OT_DATA, VSH_OFLAG_NONE, N_("Bandwidth limit in MB/s")}, {"base", VSH_OT_DATA, VSH_OFLAG_NONE, N_("path of backing file in chain for a partial pull")}, + {"wait", VSH_OT_BOOL, 0, N_("wait for job to finish")}, + {"verbose", VSH_OT_BOOL, 0, N_("with --wait, display the progress")}, + {"timeout", VSH_OT_INT, VSH_OFLAG_NONE, + N_("with --wait, abort if pull exceeds timeout (in seconds)")}, {NULL, 0, 0, NULL} }; static bool cmdBlockPull(vshControl *ctl, const vshCmd *cmd) { - if (blockJobImpl(ctl, cmd, NULL, VSH_CMD_BLOCK_JOB_PULL) != 0) + virDomainPtr dom = NULL; + bool ret = false; + bool blocking = vshCommandOptBool(cmd, "wait"); + bool verbose = vshCommandOptBool(cmd, "verbose"); + int timeout = 0; + struct sigaction sig_action; + struct sigaction old_sig_action; + sigset_t sigmask; + struct timeval start; + struct timeval curr; + const char *path = NULL; + bool quit = false; + + if (blocking) { + if (vshCommandOptInt(cmd, "timeout", &timeout) > 0) { + if (timeout < 1) { + vshError(ctl, "%s", _("migrate: Invalid timeout")); + return false; + } + + /* Ensure that we can multiply by 1000 without overflowing. */ + if (timeout > INT_MAX / 1000) { + vshError(ctl, "%s", _("migrate: Timeout is too big")); + return false; + } + } + if (vshCommandOptString(cmd, "path", &path) < 0) + return false; + + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGINT); + + intCaught = 0; + sig_action.sa_sigaction = vshCatchInt; + sigemptyset(&sig_action.sa_mask); + sigaction(SIGINT, &sig_action, &old_sig_action); + + GETTIMEOFDAY(&start); + } else if (verbose || vshCommandOptBool(cmd, "timeout")) { + vshError(ctl, "%s", _("blocking control options require --wait")); return false; - return true; + } + + if (blockJobImpl(ctl, cmd, NULL, VSH_CMD_BLOCK_JOB_PULL, + blocking ? &dom : NULL) != 0) + goto cleanup; + + while (blocking) { + virDomainBlockJobInfo info; + int result = virDomainGetBlockJobInfo(dom, path, &info, 0); + + if (result < 0) { + vshError(ctl, _("failed to query job for disk %s"), path); + goto cleanup; + } + if (result == 0) + break; + + if (verbose) + print_job_progress(_("Block Pull"), info.end - info.cur, info.end); + + GETTIMEOFDAY(&curr); + if (intCaught || (timeout && + (((int)(curr.tv_sec - start.tv_sec) * 1000 + + (int)(curr.tv_usec - start.tv_usec) / 1000) > + timeout * 1000))) { + vshDebug(ctl, VSH_ERR_DEBUG, + intCaught ? "interrupted" : "timeout"); + intCaught = 0; + timeout = 0; + quit = true; + if (virDomainBlockJobAbort(dom, path, 0) < 0) { + vshError(ctl, _("failed to abort job for disk %s"), path); + goto cleanup; + } + } + + usleep(500 * 1000); + } + + if (verbose && !quit) { + /* printf [100 %] */ + print_job_progress(_("Block Pull"), 0, 1); + } + vshPrint(ctl, "\n%s\n", quit ? _("Pull aborted") : _("Pull complete")); + + ret = true; +cleanup: + if (dom) + virDomainFree(dom); + if (blocking) + sigaction(SIGINT, &old_sig_action, NULL); + return ret; } /* @@ -7639,7 +7737,7 @@ cmdBlockJob(vshControl *ctl, const vshCmd *cmd) else mode = VSH_CMD_BLOCK_JOB_INFO; - ret = blockJobImpl(ctl, cmd, &info, mode); + ret = blockJobImpl(ctl, cmd, &info, mode, NULL); if (ret < 0) return false; diff --git a/tools/virsh.pod b/tools/virsh.pod index 5f3d9b1..fbc34f1 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -640,6 +640,7 @@ address of virtual interface (such as I<detach-interface> or I<domif-setlink>) will accept the MAC address printed by this command. =item B<blockpull> I<domain> I<path> [I<bandwidth>] [I<base>] +[I<--wait> [I<--verbose>] [I<--timeout> B<seconds>]] Populate a disk from its backing image chain. By default, this command flattens the entire chain; but if I<base> is specified, containing the @@ -647,8 +648,14 @@ name of one of the backing files in the chain, then that file becomes the new backing file and only the intermediate portion of the chain is pulled. Once all requested data from the backing image chain has been pulled, the disk no longer depends on that portion of the backing chain. -It pulls data for the entire disk in the background, the process of the -operation can be checked with B<blockjob>. + +By default, this command returns as soon as possible, and data for +the entire disk is pulled in the background; the process of the +operation can be checked with B<blockjob>. However, if I<--wait> is +specified, then this command will block until the operation completes, +or cancel the operation if the optional I<timeout> in seconds elapses +or SIGINT is sent (usually with C<Ctrl-C>). Using I<--verbose> along +with I<--wait> will produce periodic status updates. I<path> specifies fully-qualified path of the disk; it corresponds to a unique target name (<target dev='name'/>) or source file (<source -- 1.7.7.6

2 2

[libvirt] ANNOUNCE: Release of libvirt-sandbox version 0.0.3
by Daniel P. Berrange 13 Apr '12

13 Apr '12

I pleased to announce the a new public release of libvirt-sandbox, version 0.0.3, is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. The first release is able to run simple command line based programs. This release has focused on making the sandbox infrastructure more reliable and expanding the functionality available. Dan Walsh has also contributed a new tool called virt-sandbox-service which facilitates the creation of sandboxes for running system services like apache. - Ensure root/config filesystems are readonly in KVM - Add support for mounting host disk images in guests - Add support for binding guest filesystems to new locations - Add support for an optional interactive shell for debugging or administrative purposes - Add a virt-sandbox-service script for preparing sandboxes for system services, integrating with systemd - Misc compiler warning fixes - Replace invocation of insmod with direct syscalls - Refactor API to separate interactive sandbox functionality from base class & service sandbox functionality - Rewrite host/guest I/O handling to separate stdout from stderr correctly, improve reliability of startup/shutdown handshakes and propagate exit status back to host - Exec away the first hypervisor specific init process, so generic init process get PID 1 - Turn on reboot-on-panic in KVM to ensure guest exists on fatal problems Some examples $ virt-sandbox -c qemu:///session /bin/date Thu Jan 12 22:30:03 GMT 2012 $ virt-sandbox -c qemu:///session /bin/cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 6 model : 2 model name : QEMU Virtual CPU version 1.0 stepping : 3 cpu MHz : 2793.084 cache size : 4096 KB fpu : yes fpu_exception : yes cpuid level : 4 wp : yes flags : fpu de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pse36 clflush mmx fxsr sse sse2 syscall nx lm up rep_good nopl +pni cx16 hypervisor lahf_lm bogomips : 5586.16 clflush size : 64 cache_alignment : 64 address sizes : 40 bits physical, 48 bits virtual power management: $ virt-sandbox -c lxc:/// /bin/sh sh-4.2$ ps -axuwf USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND berrange 1 0.0 0.1 167680 4688 pts/0 S+ 22:31 0:00 libvirt-sandbox-init-common berrange 47 0.0 0.0 13852 1608 pts/1 Ss 22:31 0:00 \_ /bin/sh berrange 48 0.0 0.0 13124 996 pts/1 R+ 22:31 0:00 \_ ps -axuwf Feedback / patches / etc should be directed to the main libvirt development mailing list. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [libvirt-glib] Getter/setter for disk source's startupPolicy attribute
by Zeeshan Ali (Khattak) 13 Apr '12

13 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 26 +++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-disk.h | 9 ++++++++ libvirt-gconfig/libvirt-gconfig.sym | 5 +++- libvirt-gconfig/tests/test-domain-create.c | 2 + 4 files changed, 41 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index 5d0acb5..a29ea47 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -127,6 +127,18 @@ void gvir_config_domain_disk_set_snapshot_type(GVirConfigDomainDisk *disk, type, NULL); } +void gvir_config_domain_disk_set_startup_policy(GVirConfigDomainDisk *disk, + GVirConfigDomainDiskStartupPolicy policy) +{ + const char *str; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk)); + str = gvir_config_genum_get_nick(GVIR_CONFIG_TYPE_DOMAIN_DISK_STARTUP_POLICY, policy); + g_return_if_fail(str != NULL); + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), + "source", "startupPolicy", str); +} + void gvir_config_domain_disk_set_source(GVirConfigDomainDisk *disk, const char *source) { @@ -235,6 +247,19 @@ gvir_config_domain_disk_get_snapshot_type(GVirConfigDomainDisk *disk) GVIR_CONFIG_DOMAIN_DISK_SNAPSHOT_NO); } +GVirConfigDomainDiskStartupPolicy +gvir_config_domain_disk_get_startup_policy(GVirConfigDomainDisk *disk) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk), + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY); + + return gvir_config_object_get_attribute_genum + (GVIR_CONFIG_OBJECT(disk), + "source", "startupPolicy", + GVIR_CONFIG_TYPE_DOMAIN_DISK_STARTUP_POLICY, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY); +} + const char * gvir_config_domain_disk_get_source(GVirConfigDomainDisk *disk) { @@ -291,6 +316,7 @@ gvir_config_domain_disk_get_driver_cache(GVirConfigDomainDisk *disk) GVIR_CONFIG_TYPE_DOMAIN_DISK_CACHE_TYPE, GVIR_CONFIG_DOMAIN_DISK_CACHE_DEFAULT); } + GVirConfigDomainDiskBus gvir_config_domain_disk_get_target_bus(GVirConfigDomainDisk *disk) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.h b/libvirt-gconfig/libvirt-gconfig-domain-disk.h index 916421d..7e85d75 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.h @@ -95,6 +95,12 @@ typedef enum { GVIR_CONFIG_DOMAIN_DISK_SNAPSHOT_EXTERNAL } GVirConfigDomainDiskSnapshotType; +typedef enum { + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_REQUISITE, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_OPTIONAL +} GVirConfigDomainDiskStartupPolicy; + GType gvir_config_domain_disk_get_type(void); GVirConfigDomainDisk *gvir_config_domain_disk_new(void); @@ -107,6 +113,8 @@ void gvir_config_domain_disk_set_guest_device_type(GVirConfigDomainDisk *disk, GVirConfigDomainDiskGuestDeviceType type); void gvir_config_domain_disk_set_snapshot_type(GVirConfigDomainDisk *disk, GVirConfigDomainDiskSnapshotType type); +void gvir_config_domain_disk_set_startup_policy(GVirConfigDomainDisk *disk, + GVirConfigDomainDiskStartupPolicy policy); void gvir_config_domain_disk_set_source(GVirConfigDomainDisk *disk, const char *source); void gvir_config_domain_disk_set_driver_cache(GVirConfigDomainDisk *disk, @@ -123,6 +131,7 @@ void gvir_config_domain_disk_set_target_dev(GVirConfigDomainDisk *disk, GVirConfigDomainDiskType gvir_config_domain_disk_get_disk_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskGuestDeviceType gvir_config_domain_disk_get_guest_device_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskSnapshotType gvir_config_domain_disk_get_snapshot_type(GVirConfigDomainDisk *disk); +GVirConfigDomainDiskStartupPolicy gvir_config_domain_disk_get_startup_policy(GVirConfigDomainDisk *disk); const char *gvir_config_domain_disk_get_source(GVirConfigDomainDisk *disk); GVirConfigDomainDiskCacheType gvir_config_domain_disk_get_driver_cache(GVirConfigDomainDisk *disk); const char *gvir_config_domain_disk_get_driver_name(GVirConfigDomainDisk *disk); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 2378a3c..8dac83a 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -1,4 +1,4 @@ -LIBVIRT_GCONFIG_0.0.7 { +LIBVIRT_GCONFIG_0.0.8 { global: gvir_config_init_check; gvir_config_init; @@ -76,6 +76,7 @@ LIBVIRT_GCONFIG_0.0.7 { gvir_config_domain_disk_cache_type_get_type; gvir_config_domain_disk_guest_device_type_get_type; gvir_config_domain_disk_snapshot_type_get_type; + gvir_config_domain_disk_startup_policy_get_type; gvir_config_domain_disk_type_get_type; gvir_config_domain_disk_new; gvir_config_domain_disk_new_from_xml; @@ -91,6 +92,8 @@ LIBVIRT_GCONFIG_0.0.7 { gvir_config_domain_disk_set_snapshot_type; gvir_config_domain_disk_get_source; gvir_config_domain_disk_set_source; + gvir_config_domain_disk_get_startup_policy; + gvir_config_domain_disk_set_startup_policy; gvir_config_domain_disk_get_target_bus; gvir_config_domain_disk_set_target_bus; gvir_config_domain_disk_get_target_dev; diff --git a/libvirt-gconfig/tests/test-domain-create.c b/libvirt-gconfig/tests/test-domain-create.c index 4ee33aa..3d7efdc 100644 --- a/libvirt-gconfig/tests/test-domain-create.c +++ b/libvirt-gconfig/tests/test-domain-create.c @@ -106,6 +106,7 @@ int main(int argc, char **argv) gvir_config_domain_disk_set_type(disk, GVIR_CONFIG_DOMAIN_DISK_FILE); gvir_config_domain_disk_set_guest_device_type(disk, GVIR_CONFIG_DOMAIN_DISK_GUEST_DEVICE_DISK); gvir_config_domain_disk_set_source(disk, "/tmp/foo/bar"); + gvir_config_domain_disk_set_startup_policy (disk, GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_REQUISITE); gvir_config_domain_disk_set_driver_name(disk, "foo"); gvir_config_domain_disk_set_driver_type(disk, "bar"); gvir_config_domain_disk_set_driver_name(disk, "qemu"); @@ -117,6 +118,7 @@ int main(int argc, char **argv) g_assert(gvir_config_domain_disk_get_disk_type(disk) == GVIR_CONFIG_DOMAIN_DISK_FILE); g_assert(gvir_config_domain_disk_get_guest_device_type(disk) == GVIR_CONFIG_DOMAIN_DISK_GUEST_DEVICE_DISK); + g_assert(gvir_config_domain_disk_get_startup_policy (disk) == GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_REQUISITE); g_str_const_check(gvir_config_domain_disk_get_source(disk), "/tmp/foo/bar"); g_assert(gvir_config_domain_disk_get_driver_cache(disk) == GVIR_CONFIG_DOMAIN_DISK_CACHE_NONE); g_str_const_check(gvir_config_domain_disk_get_driver_name(disk), "qemu"); -- 1.7.7.6

2 3

[libvirt] [test-API PATCH 1/2] casecfgcheck: ignore flags defined in testcase flag
by Guannan Ren 13 Apr '12

13 Apr '12

When flag defined in testcase config file like as follows the casecfgcheck still trys to use flag 'clean' or 'sleep' as the key to get required_params, optional_params variables. so it reports 'KeyError' becuase no testcases named 'clean' or 'sleep' in case_params data format. The patch ignore the check for these flags. domain:start guestname fedora16 clean domain:shutdown guestname fedora16 sleep 6 domain:destroy guestname fedora16 --- casecfgcheck.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/casecfgcheck.py b/casecfgcheck.py index a88eb74..40d7c6e 100644 --- a/casecfgcheck.py +++ b/casecfgcheck.py @@ -33,14 +33,18 @@ class CaseCfgCheck(object): error_flag = 0 passed_testcase = [] for testcase in self.activity: - case_number += 1 if testcase in passed_testcase: continue testcase_name = testcase.keys()[0] - actual_params = testcase.values()[0] + if testcase_name == 'clean' or \ + testcase_name == 'sleep': + continue + actual_params = testcase.values()[0] required_params, optional_params = self.case_params[testcase_name] + + case_number += 1 ret = self._check_params(required_params, optional_params, actual_params) if ret: error_flag = 1 -- 1.7.7.5

2 3

[libvirt] [test-API PATCH] repo: Add test for console input and output operations
by Peter Krempa 13 Apr '12

13 Apr '12

This test checks if the console input and output work as desired. The test takes as an argument a filename, whose contents are sent to the console. The optional parameter 'expect' can be set to a filename that should contain expected output from the guest and is compared with the actual output. The optional parameter 'output' can be set to a filename where the test script saves the output of the host (useful for initial test setup). This test requires that the guest machine runs code that handles input and output on the serial console (programs such as agetty or something like that). --- repos/domain/console_io.py | 123 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) create mode 100644 repos/domain/console_io.py diff --git a/repos/domain/console_io.py b/repos/domain/console_io.py new file mode 100644 index 0000000..98fd5b6 --- /dev/null +++ b/repos/domain/console_io.py @@ -0,0 +1,123 @@ +#!/usr/bin/env python +# test console interactions +# This test sends contents of file 'input' to the guest's console +# and reads from the console the reply and compares it to 'expect' or +# writes the output to file 'output' + +import libvirt +import signal +import os + +from libvirt import libvirtError +from exception import TestError + +required_params = ('guestname',) +optional_params = ('device', 'timeout', 'input', 'output', 'expect',) + +def alarm_handler(signum, frame): + raise TestError("Timed out while waiting for console") + +def console_io(params): + """Attach to console""" + logger = params['logger'] + guest = params['guestname'] + device = params.get('device', 'serial0') + infile = params.get('input', None) + outfile = params.get('output', None) + expect = params.get('expect', None) + timeout = params.get('timeout', 5) + + uri = params['uri'] + + #store the old signal handler + oldhandler = signal.getsignal(signal.SIGALRM) + + try: + logger.info("Connecting to hypervisor: '%s'" % uri) + conn = libvirt.open(uri) + dom = conn.lookupByName(guest) + if not dom.isActive(): + raise TestError("Guest '%s' not active" % guest) + + logger.info("Creating stream object") + stream = conn.newStream(0) + + logger.info("Open a new console connection") + dom.openConsole(device, stream, libvirt.VIR_DOMAIN_CONSOLE_FORCE) + + if infile != None: + try: + f = open(infile, 'r') + instr = f.read() + f.close() + except e: + raise TestError("Can't read input file '%s': %s" % (infile, str(e))) + + logger.info("Sending %d bytes of contents of file '%s' to console '%s'" % (len(instr), infile, device)) + stream.send(instr) + + if expect != None or outfile != None: + logger.info("Recieving data from console device. Timeout %d seconds." % timeout) + + # register a new signal handler + logger.info("Registering custom SIGALRM handler") + signal.signal(signal.SIGALRM, alarm_handler) + signal.alarm(timeout) + + reply = "" + try: + while True: + recv = stream.recv(1024) + reply += recv + except TestError: + pass + + logger.info("Recieved %d bytes." % len(reply)) + + if outfile != None: + try: + f = open(outfile, 'w') + f.write(reply) + f.close() + except e: + raise TestError("Can't write output to file '%s': %s" % (outfile, str(e))) + + if expect != None: + try: + f = open(expect, 'r') + expectstr = f.read() + f.close() + except Exception, e: + raise TestError("Can't read expected output file '%s': '%s'" % (expect, str(e))) + + if reply.startswith(expectstr): + logger.info("Recieved expected output from the host") + else: + raise TestError("Reply from the guest doesn't match with expected reply") + + except libvirtError, e: + logger.error("Libvirt call failed: " + str(e)) + ret = 1 + + except TestError, e: + logger.error("Test failed: " + str(e)) + ret = 1 + + else: + logger.info("All tests succeeded") + ret = 0 + + finally: + logger.info("Restoring signal handler") + signal.signal(signal.SIGALRM, oldhandler) + logger.info("Closing hypervisor connection") + try: + stream.abort() + except: + pass + conn.close() + + logger.info("Done") + + return ret + -- 1.7.3.4

3 2

[libvirt] [test-API PATCH 0/4]Add feature to check case file before running
by Guannan Ren 13 Apr '12

13 Apr '12

The set of patches add a new feature to examine testcase config file before running it. The framework will do the job on behalf of testcase, so test writer will release from the work. Usage: In testcase, it only needs to define two global tuple variables required_params are the mandatory options to the testcase optional_params are the optional options ... required_params = ('networkname', 'autostart') optional_params = ('optparams1', 'optparas2') def testcase(params): ... Checking results: on success, it will run these testcases defined in testcase config file on error-detected, error as follows Unknown parameter 'whoami' the No.2 : domain:testb Parameter autostart is required the No.5 : domain:testa The idea and part of code in patches is from Osier:)

3 12

[libvirt] Start of freeze for libvirt-0.9.11 and availability of rc1
by Daniel Veillard 13 Apr '12

13 Apr '12

As scheduled, we are entering the freeze for 0.9.11. I think most API additions are now commited to git upstream (please raise your voice quickly if you see something missing !) I have made a release candidate 1 tarball (and associated rpms) at ftp://libvirt.org/libvirt/libvirt-0.9.11-rc1.tar.gz and the git tree is tagged. I think I will make an release candidate 2 tarball on Wednesday, and I'm hoping for a final release on Friday, or maybe Monday if there are issues found. Please give it a try ! Stability and portability feedback are really welcome as we didn't had a release in Feb and the risk of having something messed up is slightly higher than usual ! thanks in advance, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

10 21

[libvirt] [PATCH 0/3] Couple of cleanups in qemu code
by Michal Privoznik 13 Apr '12

13 Apr '12

Michal Privoznik (3): qemu: Fix mem leak in qemuProcessInitCpuAffinity gitignore: Reorder alphabetically qemu: Split if condition in qemuDomainSnapshotUndoSingleDiskActive .gitignore | 6 +++--- src/qemu/qemu_driver.c | 9 +++++++-- src/qemu/qemu_process.c | 23 +++++++++++++---------- 3 files changed, 23 insertions(+), 15 deletions(-) -- 1.7.8.5

4 12

[libvirt] [libvirt-glib] Getter/setter for disk source's startupPolicy attribute
by Zeeshan Ali (Khattak) 13 Apr '12

13 Apr '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain-disk.c | 26 +++++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-disk.h | 9 ++++++++ libvirt-gconfig/libvirt-gconfig.sym | 3 ++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.c b/libvirt-gconfig/libvirt-gconfig-domain-disk.c index 5d0acb5..a29ea47 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.c @@ -127,6 +127,18 @@ void gvir_config_domain_disk_set_snapshot_type(GVirConfigDomainDisk *disk, type, NULL); } +void gvir_config_domain_disk_set_startup_policy(GVirConfigDomainDisk *disk, + GVirConfigDomainDiskStartupPolicy policy) +{ + const char *str; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk)); + str = gvir_config_genum_get_nick(GVIR_CONFIG_TYPE_DOMAIN_DISK_STARTUP_POLICY, policy); + g_return_if_fail(str != NULL); + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(disk), + "source", "startupPolicy", str); +} + void gvir_config_domain_disk_set_source(GVirConfigDomainDisk *disk, const char *source) { @@ -235,6 +247,19 @@ gvir_config_domain_disk_get_snapshot_type(GVirConfigDomainDisk *disk) GVIR_CONFIG_DOMAIN_DISK_SNAPSHOT_NO); } +GVirConfigDomainDiskStartupPolicy +gvir_config_domain_disk_get_startup_policy(GVirConfigDomainDisk *disk) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_DISK(disk), + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY); + + return gvir_config_object_get_attribute_genum + (GVIR_CONFIG_OBJECT(disk), + "source", "startupPolicy", + GVIR_CONFIG_TYPE_DOMAIN_DISK_STARTUP_POLICY, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY); +} + const char * gvir_config_domain_disk_get_source(GVirConfigDomainDisk *disk) { @@ -291,6 +316,7 @@ gvir_config_domain_disk_get_driver_cache(GVirConfigDomainDisk *disk) GVIR_CONFIG_TYPE_DOMAIN_DISK_CACHE_TYPE, GVIR_CONFIG_DOMAIN_DISK_CACHE_DEFAULT); } + GVirConfigDomainDiskBus gvir_config_domain_disk_get_target_bus(GVirConfigDomainDisk *disk) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-disk.h b/libvirt-gconfig/libvirt-gconfig-domain-disk.h index 916421d..7e85d75 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-disk.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-disk.h @@ -95,6 +95,12 @@ typedef enum { GVIR_CONFIG_DOMAIN_DISK_SNAPSHOT_EXTERNAL } GVirConfigDomainDiskSnapshotType; +typedef enum { + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_MANDATORY, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_REQUISITE, + GVIR_CONFIG_DOMAIN_DISK_STARTUP_POLICY_OPTIONAL +} GVirConfigDomainDiskStartupPolicy; + GType gvir_config_domain_disk_get_type(void); GVirConfigDomainDisk *gvir_config_domain_disk_new(void); @@ -107,6 +113,8 @@ void gvir_config_domain_disk_set_guest_device_type(GVirConfigDomainDisk *disk, GVirConfigDomainDiskGuestDeviceType type); void gvir_config_domain_disk_set_snapshot_type(GVirConfigDomainDisk *disk, GVirConfigDomainDiskSnapshotType type); +void gvir_config_domain_disk_set_startup_policy(GVirConfigDomainDisk *disk, + GVirConfigDomainDiskStartupPolicy policy); void gvir_config_domain_disk_set_source(GVirConfigDomainDisk *disk, const char *source); void gvir_config_domain_disk_set_driver_cache(GVirConfigDomainDisk *disk, @@ -123,6 +131,7 @@ void gvir_config_domain_disk_set_target_dev(GVirConfigDomainDisk *disk, GVirConfigDomainDiskType gvir_config_domain_disk_get_disk_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskGuestDeviceType gvir_config_domain_disk_get_guest_device_type(GVirConfigDomainDisk *disk); GVirConfigDomainDiskSnapshotType gvir_config_domain_disk_get_snapshot_type(GVirConfigDomainDisk *disk); +GVirConfigDomainDiskStartupPolicy gvir_config_domain_disk_get_startup_policy(GVirConfigDomainDisk *disk); const char *gvir_config_domain_disk_get_source(GVirConfigDomainDisk *disk); GVirConfigDomainDiskCacheType gvir_config_domain_disk_get_driver_cache(GVirConfigDomainDisk *disk); const char *gvir_config_domain_disk_get_driver_name(GVirConfigDomainDisk *disk); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 2378a3c..f4e5fa3 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -76,6 +76,7 @@ LIBVIRT_GCONFIG_0.0.7 { gvir_config_domain_disk_cache_type_get_type; gvir_config_domain_disk_guest_device_type_get_type; gvir_config_domain_disk_snapshot_type_get_type; + gvir_config_domain_disk_startup_policy_get_type; gvir_config_domain_disk_type_get_type; gvir_config_domain_disk_new; gvir_config_domain_disk_new_from_xml; @@ -91,6 +92,8 @@ LIBVIRT_GCONFIG_0.0.7 { gvir_config_domain_disk_set_snapshot_type; gvir_config_domain_disk_get_source; gvir_config_domain_disk_set_source; + gvir_config_domain_disk_get_startup_policy; + gvir_config_domain_disk_set_startup_policy; gvir_config_domain_disk_get_target_bus; gvir_config_domain_disk_set_target_bus; gvir_config_domain_disk_get_target_dev; -- 1.7.7.6

3 3

Re: [libvirt] [Guidelines Change] Changes to the Packaging Guidelines
by Eric Blake 13 Apr '12

13 Apr '12

things we should be thinking about: On 04/12/2012 02:57 PM, Tom Callaway wrote: > Here is the latest set of changes to the Fedora Packaging Guidelines: > > --- > > Packages which have SysV initscripts that contain 'non-standard service > commands' (commands besides start, stop, reload, restart, or > try-restart) must convert those commands into standalone helper scripts. > Systemd does not support non-standard unit commands. > > https://fedoraproject.org/wiki/Packaging:Systemd#Unit_Files I think libvirt-guests falls into this category. > > --- > > The guidelines relating to PIE and Hardened Packages were updated. Now, > if your package meets the following critera you MUST enable the PIE > compiler flags: > > * Your package is long running. This means it's likely to be started and > keep running until the machine is rebooted, not start on demand and quit > on idle. > > * Your package has suid binaries, or binaries with capabilities. > > * Your package runs as root. > > https://fedoraproject.org/wiki/Packaging:Guidelines#PIE libvirtd definitely qualifies as one of these packages needing PIE compilation in our libvirt.spec file. > > --- > > Rules involving appropriate scripting within Fedora Package spec files > were added to the Guidelines: > > https://fedoraproject.org/wiki/Packaging:Guidelines#Scripting_inside_of_spe… Don't know if any of these changes impact us, but can't hurt to audit it. Plus, we still haven't converted our mingw specfile over to the mingw64 toolchain. Anyone up for some specfile maintenance? -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH v2] Pull DBus event code out into common area
by Daniel P. Berrange 13 Apr '12

13 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The policy kit and HAL node device drivers both require a DBus connection. The HAL device code further requires that the DBus connection is integrated with the event loop and provides such glue logic itself. The forthcoming FirewallD integration also requires a dbus connection with event loop integration. Thus we need to pull the current event loop glue out of the HAL driver. Thus we create src/util/virdbus.{c,h} files. This contains just one method virDBusGetSystemBus() which obtains a handle to the single shared system bus instance, with event glue automagically setup. --- .gitignore | 6 +- configure.ac | 37 ++++++- daemon/Makefile.am | 3 +- daemon/libvirtd.c | 4 - daemon/remote.c | 8 +- include/libvirt/virterror.h | 1 + src/Makefile.am | 13 +-- src/libvirt_dbus.syms | 2 - src/node_device/node_device_hal.c | 143 ++------------------------ src/rpc/virnetserver.c | 40 -------- src/rpc/virnetserver.h | 8 -- src/util/virdbus.c | 201 +++++++++++++++++++++++++++++++++++++ src/util/virdbus.h | 34 ++++++ src/util/virterror.c | 3 + 14 files changed, 296 insertions(+), 207 deletions(-) delete mode 100644 src/libvirt_dbus.syms create mode 100644 src/util/virdbus.c create mode 100644 src/util/virdbus.h diff --git a/.gitignore b/.gitignore index 5aa9c9b..14a21d0 100644 --- a/.gitignore +++ b/.gitignore @@ -48,12 +48,12 @@ /daemon/*_dispatch.h /daemon/libvirt_qemud /daemon/libvirtd -/daemon/libvirtd.init -/daemon/libvirtd.service /daemon/libvirtd*.logrotate /daemon/libvirtd.8 /daemon/libvirtd.8.in +/daemon/libvirtd.init /daemon/libvirtd.pod +/daemon/libvirtd.service /docs/devhelp/libvirt.devhelp /docs/hvsupport.html.in /docs/libvirt-api.xml @@ -118,6 +118,7 @@ /tests/eventtest /tests/hashtest /tests/jsontest +/tests/libvirtdconftest /tests/networkxml2argvtest /tests/nodeinfotest /tests/nwfilterxml2xmltest @@ -150,7 +151,6 @@ /tests/vmx2xmltest /tests/xencapstest /tests/xmconfigtest -/tests/libvirtdconftest /tools/*.[18] /tools/libvirt-guests.init /tools/virsh diff --git a/configure.ac b/configure.ac index 3f5b3ff..f49b620 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,7 @@ LIBPCAP_REQUIRED="1.0.0" LIBNL_REQUIRED="1.1" LIBSSH2_REQUIRED="1.0" LIBBLKID_REQUIRED="2.17" +DBUS_REQUIRED="1.0.0" dnl Checks for C compiler. AC_PROG_CC @@ -1099,6 +1100,36 @@ AC_SUBST([SANLOCK_CFLAGS]) AC_SUBST([SANLOCK_LIBS]) +dnl DBus library +DBUS_CFLAGS= +DBUS_LIBS= +AC_ARG_WITH([dbus], + AC_HELP_STRING([--with-dbus], [enable communication with DBus @<:@default=check@:>@]), + [], + [with_dbus=check]) +if test "$with_dbus" = "yes" || test "$with_dbus" = "check" ; then + PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED, + [with_dbus=yes], [ + if test "$with_dbus" = "check" ; then + with_dbus=no + else + AC_MSG_ERROR([You must install DBus >= $DBUS_REQUIRED to compile libvirt]) + fi]) +fi + +if test "$with_dbus" = "yes" ; then + AC_DEFINE_UNQUOTED([HAVE_DBUS], 1, [enable communication with DBus]) + + save_LIBS="$LIBS" + save_CFLAGS="$CFLAGS" + LIBS="$LIBS $DBUS_LIBS" + CFLAGS="$CFLAGS $DBUS_CFLAGS" + AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" +fi + + dnl PolicyKit library POLKIT_CFLAGS= POLKIT_LIBS= @@ -1109,7 +1140,6 @@ AC_ARG_WITH([polkit], [with_polkit=check]) with_polkit0=no -with_dbus=no with_polkit1=no if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then dnl Check for new polkit first - just a binary @@ -1138,8 +1168,6 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then [use PolicyKit for UNIX socket access checks]) AC_DEFINE_UNQUOTED([HAVE_POLKIT0], 1, [use PolicyKit for UNIX socket access checks]) - AC_DEFINE_UNQUOTED([HAVE_DBUS], 1, - [use DBus for PolicyKit]) old_CFLAGS=$CFLAGS old_LIBS=$LIBS @@ -1154,13 +1182,11 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then AC_DEFINE_UNQUOTED([POLKIT_AUTH],["$POLKIT_AUTH"],[Location of polkit-auth program]) fi with_polkit0="yes" - with_dbus="yes" fi fi fi AM_CONDITIONAL([HAVE_POLKIT], [test "x$with_polkit" = "xyes"]) AM_CONDITIONAL([HAVE_POLKIT0], [test "x$with_polkit0" = "xyes"]) -AM_CONDITIONAL([HAVE_DBUS], [test "x$with_dbus" = "xyes"]) AM_CONDITIONAL([HAVE_POLKIT1], [test "x$with_polkit1" = "xyes"]) AC_SUBST([POLKIT_CFLAGS]) AC_SUBST([POLKIT_LIBS]) @@ -2413,7 +2439,6 @@ if test "x$with_hal" = "xyes" || test "x$with_hal" = "xcheck"; then CFLAGS="$CFLAGS $HAL_CFLAGS" LIBS="$LIBS $HAL_LIBS" AC_CHECK_FUNCS([libhal_get_all_devices],,[with_hal=no]) - AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) CFLAGS="$old_CFLAGS" LIBS="$old_LIBS" fi diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 5d9f5d7..24cce8f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -94,7 +94,7 @@ libvirtd_SOURCES = $(DAEMON_SOURCES) #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirtd_CFLAGS = \ $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(XDR_CFLAGS) $(POLKIT_CFLAGS) \ + $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ $(WARN_CFLAGS) \ $(COVERAGE_CFLAGS) \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ @@ -108,6 +108,7 @@ libvirtd_LDADD = \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ + $(DBUS_LIBS) \ $(POLKIT_LIBS) if WITH_DTRACE_PROBES diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index ce931d4..b098f6a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -812,7 +812,6 @@ int main(int argc, char **argv) { struct daemonConfig *config; bool privileged = geteuid() == 0 ? true : false; bool implicit_conf = false; - bool use_polkit_dbus; char *run_dir = NULL; mode_t old_umask; @@ -1008,8 +1007,6 @@ int main(int argc, char **argv) { goto cleanup; } - use_polkit_dbus = config->auth_unix_rw == REMOTE_AUTH_POLKIT || - config->auth_unix_ro == REMOTE_AUTH_POLKIT; if (!(srv = virNetServerNew(config->min_workers, config->max_workers, config->prio_workers, @@ -1018,7 +1015,6 @@ int main(int argc, char **argv) { config->keepalive_count, !!config->keepalive_required, config->mdns_adv ? config->mdns_name : NULL, - use_polkit_dbus, remoteClientInitHook))) { ret = VIR_DAEMON_ERR_INIT; goto cleanup; diff --git a/daemon/remote.c b/daemon/remote.c index b71ffa2..16a8a05 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -45,7 +45,7 @@ #include "virnetserver.h" #include "virfile.h" #include "virtypedparam.h" - +#include "virdbus.h" #include "remote_protocol.h" #include "qemu_protocol.h" @@ -2672,6 +2672,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server, char *ident = NULL; struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); + DBusConnection *sysbus; virMutexLock(&priv->lock); @@ -2697,10 +2698,13 @@ remoteDispatchAuthPolkit(virNetServerPtr server, goto authfail; } + if (!(sysbus = virDBusGetSystemBus())) + goto authfail; + VIR_INFO("Checking PID %lld running as %d", (long long) callerPid, callerUid); dbus_error_init(&err); - if (!(pkcaller = polkit_caller_new_from_pid(virNetServerGetDBusConn(server), + if (!(pkcaller = polkit_caller_new_from_pid(sysbus, callerPid, &err))) { VIR_ERROR(_("Failed to lookup policy kit caller: %s"), err.message); dbus_error_free(&err); diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index e04d29e..cda15ff 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -87,6 +87,7 @@ typedef enum { VIR_FROM_CAPABILITIES = 44, /* Error from capabilities */ VIR_FROM_URI = 45, /* Error from URI handling */ VIR_FROM_AUTH = 46, /* Error from auth handling */ + VIR_FROM_DBUS = 47, /* Error from DBus */ } virErrorDomain; diff --git a/src/Makefile.am b/src/Makefile.am index a2aae9d..b8a19b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -88,6 +88,7 @@ UTIL_SOURCES = \ util/virtypedparam.c util/virtypedparam.h \ util/xml.c util/xml.h \ util/virterror.c util/virterror_internal.h \ + util/virdbus.c util/virdbus.h \ util/virhash.c util/virhash.h \ util/virhashcode.c util/virhashcode.h \ util/virkeycode.c util/virkeycode.h \ @@ -574,10 +575,11 @@ libvirt_la_BUILT_LIBADD = libvirt_util.la libvirt_util_la_SOURCES = \ $(UTIL_SOURCES) libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ - $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) + $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ + $(DBUS_CFLAGS) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ - $(RT_LIBS) + $(RT_LIBS) $(DBUS_LIBS) noinst_LTLIBRARIES += libvirt_conf.la @@ -1198,10 +1200,6 @@ if WITH_LINUX USED_SYM_FILES += libvirt_linux.syms endif -if HAVE_DBUS -USED_SYM_FILES += libvirt_dbus.syms -endif - if WITH_LIBVIRTD USED_SYM_FILES += libvirt_daemon.syms endif @@ -1525,7 +1523,7 @@ libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(LIBXML_LIBS) $(NUMACTL_LIBS) $(THREAD_LIBS) \ $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ - $(RT_LIBS) \ + $(RT_LIBS) $(DBUS_LIBS) \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES libvirt_lxc_LDADD += probes.o @@ -1542,6 +1540,7 @@ libvirt_lxc_CFLAGS = \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ $(AUDIT_CFLAGS) \ + $(DBUS_CFLAGS) \ -I$(top_srcdir)/src/conf \ $(AM_CFLAGS) if HAVE_LIBBLKID diff --git a/src/libvirt_dbus.syms b/src/libvirt_dbus.syms deleted file mode 100644 index a460ec5..0000000 --- a/src/libvirt_dbus.syms +++ /dev/null @@ -1,2 +0,0 @@ -# virnetserver.h -virNetServerGetDBusConn; diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index a028886..dd14271 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -39,6 +39,7 @@ #include "logging.h" #include "node_device_driver.h" #include "ignore-value.h" +#include "virdbus.h" #define VIR_FROM_THIS VIR_FROM_NODEDEV @@ -586,124 +587,15 @@ static void device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, } -static void dbus_watch_callback(int fdatch ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, - int events, void *opaque) -{ - DBusWatch *watch = opaque; - LibHalContext *hal_ctx; - DBusConnection *dbus_conn; - int dbus_flags = 0; - - if (events & VIR_EVENT_HANDLE_READABLE) - dbus_flags |= DBUS_WATCH_READABLE; - if (events & VIR_EVENT_HANDLE_WRITABLE) - dbus_flags |= DBUS_WATCH_WRITABLE; - if (events & VIR_EVENT_HANDLE_ERROR) - dbus_flags |= DBUS_WATCH_ERROR; - if (events & VIR_EVENT_HANDLE_HANGUP) - dbus_flags |= DBUS_WATCH_HANGUP; - - (void)dbus_watch_handle(watch, dbus_flags); - - nodeDeviceLock(driverState); - hal_ctx = DRV_STATE_HAL_CTX(driverState); - dbus_conn = libhal_ctx_get_dbus_connection(hal_ctx); - nodeDeviceUnlock(driverState); - while (dbus_connection_dispatch(dbus_conn) == DBUS_DISPATCH_DATA_REMAINS) - /* keep dispatching while data remains */; -} - - -static int xlate_dbus_watch_flags(int dbus_flags) -{ - unsigned int flags = 0; - if (dbus_flags & DBUS_WATCH_READABLE) - flags |= VIR_EVENT_HANDLE_READABLE; - if (dbus_flags & DBUS_WATCH_WRITABLE) - flags |= VIR_EVENT_HANDLE_WRITABLE; - if (dbus_flags & DBUS_WATCH_ERROR) - flags |= VIR_EVENT_HANDLE_ERROR; - if (dbus_flags & DBUS_WATCH_HANGUP) - flags |= VIR_EVENT_HANDLE_HANGUP; - return flags; -} - - -struct nodeDeviceWatchInfo -{ - int watch; -}; - -static void nodeDeviceWatchFree(void *data) { - struct nodeDeviceWatchInfo *info = data; - VIR_FREE(info); -} - -static dbus_bool_t add_dbus_watch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) -{ - int flags = 0; - int fd; - struct nodeDeviceWatchInfo *info; - - if (VIR_ALLOC(info) < 0) - return 0; - - if (dbus_watch_get_enabled(watch)) - flags = xlate_dbus_watch_flags(dbus_watch_get_flags(watch)); - -#if HAVE_DBUS_WATCH_GET_UNIX_FD - fd = dbus_watch_get_unix_fd(watch); -#else - fd = dbus_watch_get_fd(watch); -#endif - info->watch = virEventAddHandle(fd, flags, dbus_watch_callback, - watch, NULL); - if (info->watch < 0) { - VIR_FREE(info); - return 0; - } - dbus_watch_set_data(watch, info, nodeDeviceWatchFree); - - return 1; -} - - -static void remove_dbus_watch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) -{ - struct nodeDeviceWatchInfo *info; - - info = dbus_watch_get_data(watch); - - (void)virEventRemoveHandle(info->watch); -} - - -static void toggle_dbus_watch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) -{ - int flags = 0; - struct nodeDeviceWatchInfo *info; - - if (dbus_watch_get_enabled(watch)) - flags = xlate_dbus_watch_flags(dbus_watch_get_flags(watch)); - - info = dbus_watch_get_data(watch); - - (void)virEventUpdateHandle(info->watch, flags); -} static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) { LibHalContext *hal_ctx = NULL; - DBusConnection *dbus_conn = NULL; - DBusError err; char **udi = NULL; int num_devs, i; int ret = -1; + DBusConnection *sysbus; /* Ensure caps_tbl is sorted by capability name */ qsort(caps_tbl, ARRAY_CARDINALITY(caps_tbl), sizeof(caps_tbl[0]), @@ -718,26 +610,19 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) } nodeDeviceLock(driverState); - /* Allocate and initialize a new HAL context */ - dbus_connection_set_change_sigpipe(FALSE); - dbus_threads_init_default(); + if (!(sysbus == virDBusGetSystemBus())) { + virErrorPtr err = virGetLastError(); + VIR_ERROR(_("DBus not available, disabling HAL driver: %s", + err->message)); + ret = 0; + goto failure; + } - dbus_error_init(&err); hal_ctx = libhal_ctx_new(); if (hal_ctx == NULL) { VIR_ERROR(_("libhal_ctx_new returned NULL")); goto failure; } - dbus_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err); - if (dbus_conn == NULL) { - VIR_ERROR(_("dbus_bus_get failed")); - /* We don't want to show a fatal error here, - otherwise entire libvirtd shuts down when - D-Bus isn't running */ - ret = 0; - goto failure; - } - dbus_connection_set_exit_on_disconnect(dbus_conn, FALSE); if (!libhal_ctx_set_dbus_connection(hal_ctx, dbus_conn)) { VIR_ERROR(_("libhal_ctx_set_dbus_connection failed")); @@ -752,16 +637,6 @@ static int halDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) goto failure; } - /* Register dbus watch callbacks */ - if (!dbus_connection_set_watch_functions(dbus_conn, - add_dbus_watch, - remove_dbus_watch, - toggle_dbus_watch, - NULL, NULL)) { - VIR_ERROR(_("dbus_connection_set_watch_functions failed")); - goto failure; - } - /* Populate with known devices */ driverState->privateData = hal_ctx; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index f761e6b..3965fc2 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -39,9 +39,6 @@ #if HAVE_AVAHI # include "virnetservermdns.h" #endif -#if HAVE_DBUS -# include <dbus/dbus.h> -#endif #define VIR_FROM_THIS VIR_FROM_RPC #define virNetError(code, ...) \ @@ -88,10 +85,6 @@ struct _virNetServer { virNetServerMDNSGroupPtr mdnsGroup; #endif -#if HAVE_DBUS - DBusConnection *sysbus; -#endif - size_t nservices; virNetServerServicePtr *services; @@ -311,7 +304,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, unsigned int keepaliveCount, bool keepaliveRequired, const char *mdnsGroupName, - bool connectDBus ATTRIBUTE_UNUSED, virNetServerClientInitHook clientInitHook) { virNetServerPtr srv; @@ -353,25 +345,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, } #endif -#if HAVE_DBUS - if (connectDBus) { - DBusError derr; - - dbus_connection_set_change_sigpipe(FALSE); - dbus_threads_init_default(); - - dbus_error_init(&derr); - srv->sysbus = dbus_bus_get(DBUS_BUS_SYSTEM, &derr); - if (!(srv->sysbus)) { - VIR_ERROR(_("Failed to connect to system bus for PolicyKit auth: %s"), - derr.message); - dbus_error_free(&derr); - goto error; - } - dbus_connection_set_exit_on_disconnect(srv->sysbus, FALSE); - } -#endif - if (virMutexInit(&srv->lock) < 0) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize mutex")); @@ -429,14 +402,6 @@ bool virNetServerIsPrivileged(virNetServerPtr srv) } -#if HAVE_DBUS -DBusConnection* virNetServerGetDBusConn(virNetServerPtr srv) -{ - return srv->sysbus; -} -#endif - - void virNetServerAutoShutdown(virNetServerPtr srv, unsigned int timeout, virNetServerAutoShutdownFunc func, @@ -828,11 +793,6 @@ void virNetServerFree(virNetServerPtr srv) virNetServerMDNSFree(srv->mdns); #endif -#if HAVE_DBUS - if (srv->sysbus) - dbus_connection_unref(srv->sysbus); -#endif - virNetServerUnlock(srv); virMutexDestroy(&srv->lock); VIR_FREE(srv); diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index a04ffdd..0ebe00e 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -25,9 +25,6 @@ # define __VIR_NET_SERVER_H__ # include <signal.h> -# if HAVE_DBUS -# include <dbus/dbus.h> -# endif # include "virnettlscontext.h" # include "virnetserverprogram.h" @@ -45,7 +42,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, unsigned int keepaliveCount, bool keepaliveRequired, const char *mdnsGroupName, - bool connectDBus, virNetServerClientInitHook clientInitHook); typedef int (*virNetServerAutoShutdownFunc)(virNetServerPtr srv, void *opaque); @@ -54,10 +50,6 @@ void virNetServerRef(virNetServerPtr srv); bool virNetServerIsPrivileged(virNetServerPtr srv); -# if HAVE_DBUS -DBusConnection* virNetServerGetDBusConn(virNetServerPtr srv); -# endif - void virNetServerAutoShutdown(virNetServerPtr srv, unsigned int timeout, virNetServerAutoShutdownFunc func, diff --git a/src/util/virdbus.c b/src/util/virdbus.c new file mode 100644 index 0000000..badfe8c --- /dev/null +++ b/src/util/virdbus.c @@ -0,0 +1,201 @@ +/* + * virdbus.c: helper for using DBus + * + * Copyright (C) 2012 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include "virdbus.h" +#include "memory.h" +#include "virterror_internal.h" +#include "logging.h" +#include "threads.h" + +#define VIR_FROM_THIS VIR_FROM_DBUS + +#define virDBusReportError(code, ...) \ + virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \ + __FUNCTION__, __LINE__, __VA_ARGS__) + +#ifdef HAVE_DBUS + +static DBusConnection *systembus = NULL; +static virOnceControl once = VIR_ONCE_CONTROL_INITIALIZER; +static DBusError dbuserr; + +static dbus_bool_t virDBusAddWatch(DBusWatch *watch, void *data); +static void virDBusRemoveWatch(DBusWatch *watch, void *data); +static void virDBusToggleWatch(DBusWatch *watch, void *data); + +static void virDBusSystemBusInit(void) +{ + /* Allocate and initialize a new HAL context */ + dbus_connection_set_change_sigpipe(FALSE); + dbus_threads_init_default(); + + dbus_error_init(&dbuserr); + if (!(systembus = dbus_bus_get(DBUS_BUS_SYSTEM, &dbuserr))) + return; + + dbus_connection_set_exit_on_disconnect(systembus, FALSE); + + /* Register dbus watch callbacks */ + if (!dbus_connection_set_watch_functions(systembus, + virDBusAddWatch, + virDBusRemoveWatch, + virDBusToggleWatch, + NULL, NULL)) { + systembus = NULL; + return; + } +} + + +DBusConnection *virDBusGetSystemBus(void) +{ + if (virOnce(&once, virDBusSystemBusInit) < 0) { + virDBusReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to run one time DBus initializer")); + return NULL; + } + + if (!systembus) { + virDBusReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to get DBus system bus connection: %s"), + dbuserr.message ? dbuserr.message : "watch setup failed"); + return NULL; + } + + return systembus; +} + + +static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED, + int fd ATTRIBUTE_UNUSED, + int events, void *opaque) +{ + DBusWatch *watch = opaque; + int dbus_flags = 0; + + if (events & VIR_EVENT_HANDLE_READABLE) + dbus_flags |= DBUS_WATCH_READABLE; + if (events & VIR_EVENT_HANDLE_WRITABLE) + dbus_flags |= DBUS_WATCH_WRITABLE; + if (events & VIR_EVENT_HANDLE_ERROR) + dbus_flags |= DBUS_WATCH_ERROR; + if (events & VIR_EVENT_HANDLE_HANGUP) + dbus_flags |= DBUS_WATCH_HANGUP; + + (void)dbus_watch_handle(watch, dbus_flags); + + while (dbus_connection_dispatch(systembus) == DBUS_DISPATCH_DATA_REMAINS) + /* keep dispatching while data remains */; +} + + +static int virDBusTranslateWatchFlags(int dbus_flags) +{ + unsigned int flags = 0; + if (dbus_flags & DBUS_WATCH_READABLE) + flags |= VIR_EVENT_HANDLE_READABLE; + if (dbus_flags & DBUS_WATCH_WRITABLE) + flags |= VIR_EVENT_HANDLE_WRITABLE; + if (dbus_flags & DBUS_WATCH_ERROR) + flags |= VIR_EVENT_HANDLE_ERROR; + if (dbus_flags & DBUS_WATCH_HANGUP) + flags |= VIR_EVENT_HANDLE_HANGUP; + return flags; +} + + +struct virDBusWatch +{ + int watch; +}; + +static void virDBusWatchFree(void *data) { + struct virDBusWatch *info = data; + VIR_FREE(info); +} + +static dbus_bool_t virDBusAddWatch(DBusWatch *watch, + void *data ATTRIBUTE_UNUSED) +{ + int flags = 0; + int fd; + struct virDBusWatch *info; + + if (VIR_ALLOC(info) < 0) + return 0; + + if (dbus_watch_get_enabled(watch)) + flags = virDBusTranslateWatchFlags(dbus_watch_get_flags(watch)); + +# if HAVE_DBUS_WATCH_GET_UNIX_FD + fd = dbus_watch_get_unix_fd(watch); +# else + fd = dbus_watch_get_fd(watch); +# endif + info->watch = virEventAddHandle(fd, flags, + virDBusWatchCallback, + watch, NULL); + if (info->watch < 0) { + VIR_FREE(info); + return 0; + } + dbus_watch_set_data(watch, info, virDBusWatchFree); + + return 1; +} + + +static void virDBusRemoveWatch(DBusWatch *watch, + void *data ATTRIBUTE_UNUSED) +{ + struct virDBusWatch *info; + + info = dbus_watch_get_data(watch); + + (void)virEventRemoveHandle(info->watch); +} + + +static void virDBusToggleWatch(DBusWatch *watch, + void *data ATTRIBUTE_UNUSED) +{ + int flags = 0; + struct virDBusWatch *info; + + if (dbus_watch_get_enabled(watch)) + flags = virDBusTranslateWatchFlags(dbus_watch_get_flags(watch)); + + info = dbus_watch_get_data(watch); + + (void)virEventUpdateHandle(info->watch, flags); +} + +#else /* ! HAVE_DBUS */ +DBusConnection *virDBusGetSystemBus(void) +{ + virDBusReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("DBus support not compiled into this binary")); + return NULL; +} + +#endif /* ! HAVE_DBUS */ diff --git a/src/util/virdbus.h b/src/util/virdbus.h new file mode 100644 index 0000000..7d9ec8f --- /dev/null +++ b/src/util/virdbus.h @@ -0,0 +1,34 @@ +/* + * virdbus.h: helper for using DBus + * + * Copyright (C) 2012 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef __VIR_DBUS_H__ +# define __VIR_DBUS_H__ + +# ifdef HAVE_DBUS +# include <dbus/dbus.h> +# else +# define DBusConnection void +# endif +# include "internal.h" + +DBusConnection *virDBusGetSystemBus(void); + +#endif /* __VIR_DBUS_H__ */ diff --git a/src/util/virterror.c b/src/util/virterror.c index ff9a36f..de45bb0 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -184,6 +184,9 @@ static const char *virErrorDomainName(virErrorDomain domain) { case VIR_FROM_AUTH: dom = "Auth "; break; + case VIR_FROM_DBUS: + dom = "DBus "; + break; } return dom; } -- 1.7.7.6

2 2

[libvirt] [PATCH] xend_internal: Use domain/status for shutdown check
by Stefan Bader 12 Apr '12

12 Apr '12

As promised this version does keep the domid < 0 check in order to be clearly keeping the old behavior. -Stefan >From 18d398d98dc0dc2d9148ffb8673c651248d1bca5 Mon Sep 17 00:00:00 2001 From: Stefan Bader <stefan.bader(a)canonical.com> Date: Thu, 12 Apr 2012 09:59:56 +0000 Subject: [PATCH] xend_internal: Use domain/status for shutdown check On newer xend (v3.x and after) there is no state and domid reported for inactive domains. When initially creating connections this is handled in various places by assigning domain->id = -1. But once an instance has been running, the id is set to the current domain id. And it does not change when the instance is shut down. So when querying the domain info, the hypervisor driver, which gets asked first will indicate it cannot find information, then the xend driver is asked and will set the status to NOSTATE because it checks for the -1 domain id. Checking domain/status for 0 seems to be more reliable for that. One note: I am not sure whether the domain->id also should get set back to -1 whenever any sub-driver thinks the instance is no longer running. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=746007 BugLink: http://bugs.launchpad.net/bugs/929626 [v2: Keep old id check just in case] Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/xen/xend_internal.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 6526af4..f1aa9b6 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -989,9 +989,14 @@ sexpr_to_xend_domain_state(virDomainPtr domain, const struct sexpr *root) state = VIR_DOMAIN_BLOCKED; else if (strchr(flags, 'r')) state = VIR_DOMAIN_RUNNING; - } else if (domain->id < 0) { - /* Inactive domains don't have a state reported, so - mark them SHUTOFF, rather than NOSTATE */ + } else if (domain->id < 0 || sexpr_int(root, "domain/status") == 0) { + /* As far as I can see the domain->id is a bad sign for checking + * inactive domains as this is inaccurate after the domain has + * been running once. However domain/status from xend seems to + * be always present and 0 for inactive domains. + * (keeping the check for id < 0 to be extra safe about backward + * compatibility) + */ state = VIR_DOMAIN_SHUTOFF; } -- 1.7.9.5

3 2

[libvirt] [PATCH] Pull DBus event code out into common area
by Daniel P. Berrange 12 Apr '12

12 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The policy kit and HAL node device drivers both require a DBus connection. The HAL device code further requires that the DBus connection is integrated with the event loop and provides such glue logic itself. The forthcoming FirewallD integration also requires a dbus connection with event loop integration. Thus we need to pull the current event loop glue out of the HAL driver. Thus we create src/util/virdbus.{c,h} files. This contains just one method virDBusGetSystemBus() which obtains a handle to the single shared system bus instance, with event glue automagically setup. NB, I have not actually tested this on a system with HAL or PolicyKit-0 installed, so it may well not compile. Hopefully someone on list has a suitable system where they can test those two. If not, I'll install a VM next week to test it in. --- .gitignore | 6 ++-- configure.ac | 3 +- daemon/Makefile.am | 3 +- daemon/libvirtd.c | 4 --- src/Makefile.am | 3 +- src/rpc/virnetserver.c | 6 ---- src/rpc/virnetserver.h | 4 --- src/util/virdbus.c | 68 ++++++++++++++++++++++------------------------- 8 files changed, 40 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 5aa9c9b..14a21d0 100644 --- a/.gitignore +++ b/.gitignore @@ -48,12 +48,12 @@ /daemon/*_dispatch.h /daemon/libvirt_qemud /daemon/libvirtd -/daemon/libvirtd.init -/daemon/libvirtd.service /daemon/libvirtd*.logrotate /daemon/libvirtd.8 /daemon/libvirtd.8.in +/daemon/libvirtd.init /daemon/libvirtd.pod +/daemon/libvirtd.service /docs/devhelp/libvirt.devhelp /docs/hvsupport.html.in /docs/libvirt-api.xml @@ -118,6 +118,7 @@ /tests/eventtest /tests/hashtest /tests/jsontest +/tests/libvirtdconftest /tests/networkxml2argvtest /tests/nodeinfotest /tests/nwfilterxml2xmltest @@ -150,7 +151,6 @@ /tests/vmx2xmltest /tests/xencapstest /tests/xmconfigtest -/tests/libvirtdconftest /tools/*.[18] /tools/libvirt-guests.init /tools/virsh diff --git a/configure.ac b/configure.ac index 3863119..f49b620 100644 --- a/configure.ac +++ b/configure.ac @@ -1116,9 +1116,8 @@ if test "$with_dbus" = "yes" || test "$with_dbus" = "check" ; then AC_MSG_ERROR([You must install DBus >= $DBUS_REQUIRED to compile libvirt]) fi]) fi -echo ">>>>>>>>>> $with_dbus <<<<<<<<<<<<<<<<<" + if test "$with_dbus" = "yes" ; then -echo ">>>>>>>>>> $with_dbus <<<<<<<<<<<<<<<<<" AC_DEFINE_UNQUOTED([HAVE_DBUS], 1, [enable communication with DBus]) save_LIBS="$LIBS" diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 5d9f5d7..24cce8f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -94,7 +94,7 @@ libvirtd_SOURCES = $(DAEMON_SOURCES) #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirtd_CFLAGS = \ $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(XDR_CFLAGS) $(POLKIT_CFLAGS) \ + $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ $(WARN_CFLAGS) \ $(COVERAGE_CFLAGS) \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ @@ -108,6 +108,7 @@ libvirtd_LDADD = \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ + $(DBUS_LIBS) \ $(POLKIT_LIBS) if WITH_DTRACE_PROBES diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index ce931d4..b098f6a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -812,7 +812,6 @@ int main(int argc, char **argv) { struct daemonConfig *config; bool privileged = geteuid() == 0 ? true : false; bool implicit_conf = false; - bool use_polkit_dbus; char *run_dir = NULL; mode_t old_umask; @@ -1008,8 +1007,6 @@ int main(int argc, char **argv) { goto cleanup; } - use_polkit_dbus = config->auth_unix_rw == REMOTE_AUTH_POLKIT || - config->auth_unix_ro == REMOTE_AUTH_POLKIT; if (!(srv = virNetServerNew(config->min_workers, config->max_workers, config->prio_workers, @@ -1018,7 +1015,6 @@ int main(int argc, char **argv) { config->keepalive_count, !!config->keepalive_required, config->mdns_adv ? config->mdns_name : NULL, - use_polkit_dbus, remoteClientInitHook))) { ret = VIR_DAEMON_ERR_INIT; goto cleanup; diff --git a/src/Makefile.am b/src/Makefile.am index c6b7033..b8a19b4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1523,7 +1523,7 @@ libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(LIBXML_LIBS) $(NUMACTL_LIBS) $(THREAD_LIBS) \ $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ - $(RT_LIBS) \ + $(RT_LIBS) $(DBUS_LIBS) \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES libvirt_lxc_LDADD += probes.o @@ -1540,6 +1540,7 @@ libvirt_lxc_CFLAGS = \ $(CAPNG_CFLAGS) \ $(YAJL_CFLAGS) \ $(AUDIT_CFLAGS) \ + $(DBUS_CFLAGS) \ -I$(top_srcdir)/src/conf \ $(AM_CFLAGS) if HAVE_LIBBLKID diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 0e0edd3..3965fc2 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -304,7 +304,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, unsigned int keepaliveCount, bool keepaliveRequired, const char *mdnsGroupName, - bool connectDBus ATTRIBUTE_UNUSED, virNetServerClientInitHook clientInitHook) { virNetServerPtr srv; @@ -794,11 +793,6 @@ void virNetServerFree(virNetServerPtr srv) virNetServerMDNSFree(srv->mdns); #endif -#if HAVE_DBUS - if (srv->sysbus) - dbus_connection_unref(srv->sysbus); -#endif - virNetServerUnlock(srv); virMutexDestroy(&srv->lock); VIR_FREE(srv); diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index a9dec18..0ebe00e 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -25,9 +25,6 @@ # define __VIR_NET_SERVER_H__ # include <signal.h> -# if HAVE_DBUS -# include <dbus/dbus.h> -# endif # include "virnettlscontext.h" # include "virnetserverprogram.h" @@ -45,7 +42,6 @@ virNetServerPtr virNetServerNew(size_t min_workers, unsigned int keepaliveCount, bool keepaliveRequired, const char *mdnsGroupName, - bool connectDBus, virNetServerClientInitHook clientInitHook); typedef int (*virNetServerAutoShutdownFunc)(virNetServerPtr srv, void *opaque); diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 636cd45..badfe8c 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -22,6 +22,10 @@ #include <config.h> #include "virdbus.h" +#include "memory.h" +#include "virterror_internal.h" +#include "logging.h" +#include "threads.h" #define VIR_FROM_THIS VIR_FROM_DBUS @@ -33,7 +37,7 @@ static DBusConnection *systembus = NULL; static virOnceControl once = VIR_ONCE_CONTROL_INITIALIZER; -static DBusError err; +static DBusError dbuserr; static dbus_bool_t virDBusAddWatch(DBusWatch *watch, void *data); static void virDBusRemoveWatch(DBusWatch *watch, void *data); @@ -41,24 +45,21 @@ static void virDBusToggleWatch(DBusWatch *watch, void *data); static void virDBusSystemBusInit(void) { - DBusConnection *dbus_conn = NULL; - DBusError err; - /* Allocate and initialize a new HAL context */ dbus_connection_set_change_sigpipe(FALSE); dbus_threads_init_default(); - dbus_error_init(&err); - if (!(systembus = dbus_bus_get(DBUS_BUS_SYSTEM, &err))) + dbus_error_init(&dbuserr); + if (!(systembus = dbus_bus_get(DBUS_BUS_SYSTEM, &dbuserr))) return; dbus_connection_set_exit_on_disconnect(systembus, FALSE); /* Register dbus watch callbacks */ if (!dbus_connection_set_watch_functions(systembus, - add_dbus_watch, - remove_dbus_watch, - toggle_dbus_watch, + virDBusAddWatch, + virDBusRemoveWatch, + virDBusToggleWatch, NULL, NULL)) { systembus = NULL; return; @@ -77,7 +78,7 @@ DBusConnection *virDBusGetSystemBus(void) if (!systembus) { virDBusReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to get DBus system bus connection: %s"), - err->message ? err->message : "watch setup failed"); + dbuserr.message ? dbuserr.message : "watch setup failed"); return NULL; } @@ -85,13 +86,11 @@ DBusConnection *virDBusGetSystemBus(void) } -static void dbus_watch_callback(int fdatch ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, - int events, void *opaque) +static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED, + int fd ATTRIBUTE_UNUSED, + int events, void *opaque) { DBusWatch *watch = opaque; - LibHalContext *hal_ctx; - DBusConnection *dbus_conn; int dbus_flags = 0; if (events & VIR_EVENT_HANDLE_READABLE) @@ -105,16 +104,12 @@ static void dbus_watch_callback(int fdatch ATTRIBUTE_UNUSED, (void)dbus_watch_handle(watch, dbus_flags); - nodeDeviceLock(driverState); - hal_ctx = DRV_STATE_HAL_CTX(driverState); - dbus_conn = libhal_ctx_get_dbus_connection(hal_ctx); - nodeDeviceUnlock(driverState); - while (dbus_connection_dispatch(dbus_conn) == DBUS_DISPATCH_DATA_REMAINS) + while (dbus_connection_dispatch(systembus) == DBUS_DISPATCH_DATA_REMAINS) /* keep dispatching while data remains */; } -static int xlate_dbus_watch_flags(int dbus_flags) +static int virDBusTranslateWatchFlags(int dbus_flags) { unsigned int flags = 0; if (dbus_flags & DBUS_WATCH_READABLE) @@ -129,50 +124,51 @@ static int xlate_dbus_watch_flags(int dbus_flags) } -struct nodeDeviceWatchInfo +struct virDBusWatch { int watch; }; -static void nodeDeviceWatchFree(void *data) { - struct nodeDeviceWatchInfo *info = data; +static void virDBusWatchFree(void *data) { + struct virDBusWatch *info = data; VIR_FREE(info); } -static dbus_bool_t add_dbus_watch(DBusWatch *watch, +static dbus_bool_t virDBusAddWatch(DBusWatch *watch, void *data ATTRIBUTE_UNUSED) { int flags = 0; int fd; - struct nodeDeviceWatchInfo *info; + struct virDBusWatch *info; if (VIR_ALLOC(info) < 0) return 0; if (dbus_watch_get_enabled(watch)) - flags = xlate_dbus_watch_flags(dbus_watch_get_flags(watch)); + flags = virDBusTranslateWatchFlags(dbus_watch_get_flags(watch)); # if HAVE_DBUS_WATCH_GET_UNIX_FD fd = dbus_watch_get_unix_fd(watch); # else fd = dbus_watch_get_fd(watch); # endif - info->watch = virEventAddHandle(fd, flags, dbus_watch_callback, + info->watch = virEventAddHandle(fd, flags, + virDBusWatchCallback, watch, NULL); if (info->watch < 0) { VIR_FREE(info); return 0; } - dbus_watch_set_data(watch, info, nodeDeviceWatchFree); + dbus_watch_set_data(watch, info, virDBusWatchFree); return 1; } -static void remove_dbus_watch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) +static void virDBusRemoveWatch(DBusWatch *watch, + void *data ATTRIBUTE_UNUSED) { - struct nodeDeviceWatchInfo *info; + struct virDBusWatch *info; info = dbus_watch_get_data(watch); @@ -180,14 +176,14 @@ static void remove_dbus_watch(DBusWatch *watch, } -static void toggle_dbus_watch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) +static void virDBusToggleWatch(DBusWatch *watch, + void *data ATTRIBUTE_UNUSED) { int flags = 0; - struct nodeDeviceWatchInfo *info; + struct virDBusWatch *info; if (dbus_watch_get_enabled(watch)) - flags = xlate_dbus_watch_flags(dbus_watch_get_flags(watch)); + flags = virDBusTranslateWatchFlags(dbus_watch_get_flags(watch)); info = dbus_watch_get_data(watch); -- 1.7.7.6

2 2

[libvirt] Sys-Virt and libvirt, question
by Jason Helfman 12 Apr '12

12 Apr '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Hi, I was wondering if Sys-Virt needs to coincide with an update to libvirt? A fellow committer at FreeBSD is running the latest Sys-Virt against the latest libvirt and is getting this error: http://meatwad.mouf.net/tb/errors/9-STABLE-amd64-FreeBSD/p5-Sys-Virt-0.9.10… Thanks! - -jgh - -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iF4EAREIAAYFAk+HDfYACgkQXpKtZoyM+6UidQD8CKAsKrz9+W4iTFxf8SJOkgtz 8HTX8kWhuEPnA65CqeoA/0p4ncg3j08GWFNT+K66bk/8BaAXIzIpZifivuDN9bxM =CbDk -----END PGP SIGNATURE-----

2 1

[libvirt] [PATCH] qemu, util fix netlink callback registration for migration
by D. Herrendoerfer 12 Apr '12

12 Apr '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> This patch adds a netlink callback when migrating a VEPA enabled virtual machine. It fixes a Bug where a VM would not request a port association when it was cleared by lldpad. This patch requires the latest git version of lldpad to work. Signed-off-by: D. Herrendoerfer <d.herrendoerfer(a)herrendoerfer.name> --- src/qemu/qemu_migration.c | 6 ++++++ src/util/virnetdevmacvlan.c | 14 +++++++++++++- src/util/virnetdevmacvlan.h | 8 ++++++++ 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 77d40c0..7a8a7c4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2654,6 +2654,12 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) { def->uuid, VIR_NETDEV_VPORT_PROFILE_OP_MIGRATE_IN_FINISH, false) < 0) goto err_exit; + + if (virNetDevMacVLanVPortProfileRegisterCallback(net->ifname, net->mac, + virDomainNetGetActualDirectDev(net), def->uuid, + virDomainNetGetActualVirtPortProfile(net), + VIR_NETDEV_VPORT_PROFILE_OP_CREATE)) + goto err_exit; } last_good_net = i; } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 90888b0..b259e00 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -769,7 +769,7 @@ virNetDevMacVLanVPortProfileDestroyCallback(int watch ATTRIBUTE_UNUSED, virNetlinkCallbackDataFree((virNetlinkCallbackDataPtr)opaque); } -static int +int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, const unsigned char *macaddress, const char *linkdev, @@ -1125,4 +1125,16 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname ATTRIBUTE_UNUS _("Cannot create macvlan devices on this platform")); return -1; } + +int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIBUTE_UNUSED, + const unsigned char *macaddress ATTRIBUTE_UNUSED, + const char *linkdev ATTRIBUTE_UNUSED, + const unsigned char *vmuuid ATTRIBUTE_UNUSED, + virNetDevVPortProfilePtr virtPortProfile ATTRIBUTE_UNUSED, + enum virNetDevVPortProfileOp vmOp ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return -1; +} #endif /* ! WITH_MACVTAP */ diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 14640cf..2299f1d 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -84,4 +84,12 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; +int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, + const unsigned char *macaddress , + const char *linkdev, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + enum virNetDevVPortProfileOp vmOp) +ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) +ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; #endif /* __UTIL_MACVTAP_H__ */ -- 1.7.7.6

2 1

[libvirt] [PATCH] qemu_agent: Report error class at least
by Michal Privoznik 12 Apr '12

12 Apr '12

Currently, qemu GA is not providing 'desc' field for errors like we are used to from qemu monitor. Therefore, we fall back to this general 'unknown error' string. However, GA is reporting 'class' which is not perfect, but much more helpful than generic error string. Thus we should fall back to class firstly and if even no class is presented, then we can fall back to that generic string. Before this patch: virsh # dompmsuspend --target mem f16 error: Domain f16 could not be suspended error: internal error unable to execute QEMU command 'guest-suspend-ram': unknown QEMU command error After this patch: virsh # dompmsuspend --target mem f16 error: Domain f16 could not be suspended error: internal error unable to execute QEMU command 'guest-suspend-ram': CommandNotFound --- src/qemu/qemu_agent.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index b759b7f..decfd0e 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1035,19 +1035,17 @@ static const char * qemuAgentStringifyError(virJSONValuePtr error) { const char *klass = virJSONValueObjectGetString(error, "class"); - const char *detail = NULL; + const char *detail = virJSONValueObjectGetString(error, "desc"); /* The QMP 'desc' field is usually sufficient for our generic - * error reporting needs. + * error reporting needs. However, older agents did not provide + * any 'desc'. Reporting 'class' is not perfect but better + * than bare 'unknown error'. */ - if (klass) - detail = virJSONValueObjectGetString(error, "desc"); - - - if (!detail) + if (!detail && !klass) detail = "unknown QEMU command error"; - return detail; + return detail ? detail : klass; } static const char * -- 1.7.8.5

2 2

[libvirt] [PATCH] qemuOpenFile: Don't force chown on NFS
by Michal Privoznik 12 Apr '12

12 Apr '12

If dynamic_ownership is off and we are creating a file on NFS we force chown. This will fail as chown/chmod are not supported on NFS. However, with no dynamic_ownership we are not required to do any chown. --- src/qemu/qemu_driver.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d9e35be..1b55eb1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2429,6 +2429,7 @@ qemuOpenFile(struct qemud_driver *driver, const char *path, int oflags, bool bypass_security = false; unsigned int vfoflags = 0; int fd = -1; + int path_shared = virStorageFileIsSharedFS(path); uid_t uid = getuid(); gid_t gid = getgid(); @@ -2437,7 +2438,12 @@ qemuOpenFile(struct qemud_driver *driver, const char *path, int oflags, * in the failure case */ if (oflags & O_CREAT) { need_unlink = true; - vfoflags |= VIR_FILE_OPEN_FORCE_OWNER; + + /* Don't force chown on network-shared FS + * as it is likely to fail. */ + if (path_shared <= 0 || driver->dynamicOwnership) + vfoflags |= VIR_FILE_OPEN_FORCE_OWNER; + if (stat(path, &sb) == 0) { is_reg = !!S_ISREG(sb.st_mode); /* If the path is regular file which exists @@ -2475,7 +2481,7 @@ qemuOpenFile(struct qemud_driver *driver, const char *path, int oflags, } /* On Linux we can also verify the FS-type of the directory. */ - switch (virStorageFileIsSharedFS(path)) { + switch (path_shared) { case 1: /* it was on a network share, so we'll continue * as outlined above -- 1.7.8.5

3 5

[libvirt] [libvirt-glib] Explicitly link conn-test against libvirt-gconfig libvirt-glib
by Guido Günther 12 Apr '12

12 Apr '12

otherwise the build fails with: $ CCLD conn-test ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_set_error(a)LIBVIRT_GLIB_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_network_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_storage_pool_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_init_check(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_get_type(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_object_to_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_event_register(a)LIBVIRT_GLIB_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_init_check(a)LIBVIRT_GLIB_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_get_devices(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_storage_vol_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_secret_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_interface_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_disk_get_type(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_disk_get_target_dev(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_interface_get_type(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_node_device_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_device_get_type(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_object_get_type(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_error_new_literal(a)LIBVIRT_GLIB_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_snapshot_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_network_filter_new_from_xml(a)LIBVIRT_GCONFIG_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_set_error_literal(a)LIBVIRT_GLIB_0.0.4' ../libvirt-gobject/.libs/libvirt-gobject-1.0.so: undefined reference to `gvir_config_domain_interface_get_ifname(a)LIBVIRT_GCONFIG_0.0.4' collect2: ld returned 1 exit status --- examples/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index b77076d..37a8447 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -25,6 +25,8 @@ conn_test_SOURCES = \ conn-test.c conn_test_LDADD = \ ../libvirt-gobject/libvirt-gobject-1.0.la \ + ../libvirt-gconfig/libvirt-gconfig-1.0.la \ + ../libvirt-glib/libvirt-glib-1.0.la \ $(LIBVIRT_LIBS) \ $(GLIB2_LIBS) \ $(GOBJECT2_LIBS) -- 1.7.9.1

2 4

[libvirt] Add USB controller support
by Christophe Fergeau 12 Apr '12

12 Apr '12

Hey, Here is the second version of the patch series implementing USB controller support in libvirt-gconfig. There's a bug fixed in GVirConfigDomainAddressUsb creation (type="usb" was missing) as well as a few small bug fixes/changes in the test program. I also added an additional patch implementing a gvir_config_domain_setup_default_usb_controllers to make adding usb controllers easier following Marc-André's suggestion. Christophe

4 26

[libvirt] [PATCHv2] daemon: Plug memory leaks
by Alex Jia 12 Apr '12

12 Apr '12

* daemon/libvirtd-config.c (daemonConfigFree): fix memory leaks. How to reproduce? % make && make -C tests check TESTS=libvirtdconftest % cd tests && valgrind -v --leak-check=full ./libvirtdconftest actual result: ==11008== 185 bytes in 5 blocks are definitely lost in loss record 3 of 5 ==11008== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==11008== by 0x39CF07F6E1: strdup (strdup.c:43) ==11008== by 0x406626: daemonConfigLoadOptions (libvirtd-config.c:438) ==11008== by 0x406800: daemonConfigLoadData (libvirtd-config.c:492) ==11008== by 0x403CCF: testCorrupt (libvirtdconftest.c:110) ==11008== by 0x404FAD: virtTestRun (testutils.c:145) ==11008== by 0x403A34: mymain (libvirtdconftest.c:219) ==11008== by 0x404687: virtTestMain (testutils.c:700) ==11008== by 0x39CF01ECDC: (below main) (libc-start.c:226) ==11008== ==11008== LEAK SUMMARY: ==11008== definitely lost: 185 bytes in 5 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/libvirtd-config.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 4d041f0..471236c 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -358,6 +358,7 @@ daemonConfigFree(struct daemonConfig *data) VIR_FREE(data->cert_file); VIR_FREE(data->crl_file); + VIR_FREE(data->host_uuid); VIR_FREE(data->log_filters); VIR_FREE(data->log_outputs); -- 1.7.1

2 2

[libvirt] [PATCH] daemon: Plug memory leaks
by Alex Jia 12 Apr '12

12 Apr '12

Detected by valgrind. Leaks are introduced in commit 6e6e9be. * daemon/libvirtd-config.c (macro GET_CONF_STR): fix memory leaks. How to reproduce? % make && make -C tests check TESTS=libvirtdconftest % cd tests && valgrind -v --leak-check=full ./libvirtdconftest actual result: ==11008== 185 bytes in 5 blocks are definitely lost in loss record 3 of 5 ==11008== at 0x4A05FDE: malloc (vg_replace_malloc.c:236) ==11008== by 0x39CF07F6E1: strdup (strdup.c:43) ==11008== by 0x406626: daemonConfigLoadOptions (libvirtd-config.c:438) ==11008== by 0x406800: daemonConfigLoadData (libvirtd-config.c:492) ==11008== by 0x403CCF: testCorrupt (libvirtdconftest.c:110) ==11008== by 0x404FAD: virtTestRun (testutils.c:145) ==11008== by 0x403A34: mymain (libvirtdconftest.c:219) ==11008== by 0x404687: virtTestMain (testutils.c:700) ==11008== by 0x39CF01ECDC: (below main) (libc-start.c:226) ==11008== ==11008== LEAK SUMMARY: ==11008== definitely lost: 185 bytes in 5 blocks Signed-off-by: Alex Jia <ajia(a)redhat.com> --- daemon/libvirtd-config.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 4d041f0..0a4323a 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -152,6 +152,7 @@ checkType (virConfValuePtr p, const char *filename, virReportOOMError(); \ goto error; \ } \ + VIR_FREE(data->var_name); \ } \ } while (0) -- 1.7.1

2 2

[libvirt] [test-API PATCH 0/5] Destroy class definition in utils.py
by Osier Yang 12 Apr '12

12 Apr '12

These five patches are to change utils.py into a collection of functions. And cleanup all of existing testcase to use the functions in it directly. (1) Destroy Utils class definition (2) Remove "util = utils.Utils()" (3) Substitue "util." with "utils." (4) Remove useless utils import "from utils import utils" in testcases where none of functions in utils.py is called In testcase from utils import utils ... utils.functions(...) ...

2 10

[libvirt] [PATCH 0/5] fix block job bugs relative to upstream qemu
by Eric Blake 12 Apr '12

12 Apr '12

The following 5 patches are ready for review and application to libvirt now, since they correspond to features that are currently in the qemu 1.1 tree. (I've split these less-controversial parts from v4 of my larger storage migration series [1]; so that this series has no dependency on the yet-to-be-determined 'drive-mirror' semantics). [1]https://www.redhat.com/archives/libvir-list/2012-April/msg00330.html Patch 1 is new, and matches a qemu patch taken just today. Patch 2 matches 2/18 in the block migration series, with some tweaks to defer any qemu changes till later, as well as wording improvements in the documentation to match the behavior implemented by this series. Patch 3 matches an independent patch I sent earlier today, updated to resolve review comments from that version. Patch 4 matches 3/18 in the block migration series, with modifications to now account for both RHEL 6.2 and qemu 1.1 behaviors. I've altered this so much from Adam's original that I claimed authorship, although I've left his Signed-off-by for the initial implementation. Patch 5 matches 4/18 in the block migration series, with minor tweaks due to rebasing. Later, I will repost a v5 of my storage migration series based on top of this one. Adam Litke (1): blockjob: add API for async virDomainBlockJobAbort Eric Blake (4): blockjob: add qemu capabilities related to block pull jobs blockjob: optimize JSON event handler lookup blockjob: wire up qemu async virDomainBlockJobAbort blockjob: allow for fast-finishing job include/libvirt/libvirt.h.in | 10 +++ src/libvirt.c | 13 +++- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 106 ++++++++++++++++++++----- src/qemu/qemu_monitor.c | 11 ++- src/qemu/qemu_monitor.h | 8 +- src/qemu/qemu_monitor_json.c | 179 +++++++++++++++++++++++++++--------------- src/qemu/qemu_monitor_json.h | 4 +- tools/virsh.c | 51 ++++++++----- tools/virsh.pod | 35 ++++++--- 11 files changed, 300 insertions(+), 122 deletions(-) -- 1.7.7.6

2 14

[libvirt] [PATCH] qemu: optimize JSON event handler lookup
by Eric Blake 11 Apr '12

11 Apr '12

Probably in the noise, but this will let us scale more efficiently as we recognize ever more qemu events. * src/qemu/qemu_monitor_json.c (eventHandlers): Sort. (eventSearch): New helper function. (qemuMonitorJSONIOProcessEvent): Optimize event lookup. --- In reply to: https://www.redhat.com/archives/libvir-list/2012-April/msg00416.html src/qemu/qemu_monitor_json.c | 55 +++++++++++++++++++++++------------------ 1 files changed, 31 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7c893d4..d142517 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -67,37 +67,45 @@ static void qemuMonitorJSONHandlePMSuspend(qemuMonitorPtr mon, virJSONValuePtr d static void qemuMonitorJSONHandleBlockJobCompleted(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleBlockJobCanceled(qemuMonitorPtr mon, virJSONValuePtr data); -static struct { +typedef struct { const char *type; void (*handler)(qemuMonitorPtr mon, virJSONValuePtr data); -} eventHandlers[] = { - { "SHUTDOWN", qemuMonitorJSONHandleShutdown, }, - { "RESET", qemuMonitorJSONHandleReset, }, +} qemuEventHandler; +static qemuEventHandler eventHandlers[] = { + { "BLOCK_IO_ERROR", qemuMonitorJSONHandleIOError, }, + { "BLOCK_JOB_CANCELLED", qemuMonitorJSONHandleBlockJobCanceled, }, + { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJobCompleted, }, + { "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayChange, }, { "POWERDOWN", qemuMonitorJSONHandlePowerdown, }, - { "STOP", qemuMonitorJSONHandleStop, }, + { "RESET", qemuMonitorJSONHandleReset, }, { "RTC_CHANGE", qemuMonitorJSONHandleRTCChange, }, - { "WATCHDOG", qemuMonitorJSONHandleWatchdog, }, - { "BLOCK_IO_ERROR", qemuMonitorJSONHandleIOError, }, - { "VNC_CONNECTED", qemuMonitorJSONHandleVNCConnect, }, - { "VNC_INITIALIZED", qemuMonitorJSONHandleVNCInitialize, }, - { "VNC_DISCONNECTED", qemuMonitorJSONHandleVNCDisconnect, }, + { "SHUTDOWN", qemuMonitorJSONHandleShutdown, }, { "SPICE_CONNECTED", qemuMonitorJSONHandleSPICEConnect, }, - { "SPICE_INITIALIZED", qemuMonitorJSONHandleSPICEInitialize, }, { "SPICE_DISCONNECTED", qemuMonitorJSONHandleSPICEDisconnect, }, - { "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayChange, }, - { "WAKEUP", qemuMonitorJSONHandlePMWakeup, }, + { "SPICE_INITIALIZED", qemuMonitorJSONHandleSPICEInitialize, }, + { "STOP", qemuMonitorJSONHandleStop, }, { "SUSPEND", qemuMonitorJSONHandlePMSuspend, }, - { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJobCompleted, }, - { "BLOCK_JOB_CANCELLED", qemuMonitorJSONHandleBlockJobCanceled, }, + { "VNC_CONNECTED", qemuMonitorJSONHandleVNCConnect, }, + { "VNC_DISCONNECTED", qemuMonitorJSONHandleVNCDisconnect, }, + { "VNC_INITIALIZED", qemuMonitorJSONHandleVNCInitialize, }, + { "WAKEUP", qemuMonitorJSONHandlePMWakeup, }, + { "WATCHDOG", qemuMonitorJSONHandleWatchdog, }, + /* We use bsearch, so keep this list sorted. */ }; +static int +eventSearch(const void *key, const void *elt) { + const char *type = key; + const qemuEventHandler *handler = elt; + return strcmp(type, handler->type); +} static int qemuMonitorJSONIOProcessEvent(qemuMonitorPtr mon, virJSONValuePtr obj) { const char *type; - int i; + qemuEventHandler *handler; VIR_DEBUG("mon=%p obj=%p", mon, obj); type = virJSONValueObjectGetString(obj, "event"); @@ -107,14 +115,13 @@ qemuMonitorJSONIOProcessEvent(qemuMonitorPtr mon, return -1; } - for (i = 0 ; i < ARRAY_CARDINALITY(eventHandlers) ; i++) { - if (STREQ(eventHandlers[i].type, type)) { - virJSONValuePtr data = virJSONValueObjectGet(obj, "data"); - VIR_DEBUG("handle %s handler=%p data=%p", type, - eventHandlers[i].handler, data); - (eventHandlers[i].handler)(mon, data); - break; - } + handler = bsearch(type, eventHandlers, ARRAY_CARDINALITY(eventHandlers), + sizeof(eventHandlers[0]), eventSearch); + if (handler) { + virJSONValuePtr data = virJSONValueObjectGet(obj, "data"); + VIR_DEBUG("handle %s handler=%p data=%p", type, + handler->handler, data); + (handler->handler)(mon, data); } return 0; } -- 1.7.7.6

2 2

[libvirt] [libvirt-glib] libvirt-gconfig: Move symbols introduced post 0.0.4 to the correct versions
by Guido Günther 11 Apr '12

11 Apr '12

Triggered by http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667683 --- If this looks correct I'll have a look at libvirt-glib and libvirt-gobject too. -- Guido libvirt-gconfig/libvirt-gconfig.sym | 50 +++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 17 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 717c3c9..405ad98 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -14,10 +14,6 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_new; gvir_config_domain_new_from_xml; gvir_config_domain_set_clock; - gvir_config_domain_set_custom_xml; - gvir_config_domain_get_custom_xml; - gvir_config_domain_get_description; - gvir_config_domain_set_description; gvir_config_domain_get_devices; gvir_config_domain_set_devices; gvir_config_domain_get_features; @@ -51,10 +47,6 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_chardev_source_pty_new_from_xml; gvir_config_domain_source_pty_set_path; - gvir_config_domain_chardev_source_spicevmc_get_type; - gvir_config_domain_chardev_source_spicevmc_new; - gvir_config_domain_chardev_source_spicevmc_new_from_xml; - gvir_config_domain_clock_get_type; gvir_config_domain_clock_offset_get_type; gvir_config_domain_clock_new; @@ -79,8 +71,6 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_disk_type_get_type; gvir_config_domain_disk_new; gvir_config_domain_disk_new_from_xml; - gvir_config_domain_disk_get_driver_cache; - gvir_config_domain_disk_set_driver_cache; gvir_config_domain_disk_get_driver_name; gvir_config_domain_disk_set_driver_name; gvir_config_domain_disk_get_driver_type; @@ -96,7 +86,6 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_disk_get_target_dev; gvir_config_domain_disk_set_target_dev; gvir_config_domain_disk_get_disk_type; - gvir_config_domain_disk_set_readonly; gvir_config_domain_disk_set_type; gvir_config_domain_filesys_get_type; @@ -146,13 +135,9 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_domain_interface_get_type; gvir_config_domain_interface_link_state_get_type; gvir_config_domain_interface_set_ifname; - gvir_config_domain_interface_get_ifname; gvir_config_domain_interface_set_link_state; - gvir_config_domain_interface_get_link_state; gvir_config_domain_interface_set_mac; - gvir_config_domain_interface_get_mac; gvir_config_domain_interface_set_model; - gvir_config_domain_interface_get_model; gvir_config_domain_interface_bridge_get_type; gvir_config_domain_interface_bridge_new; @@ -327,8 +312,39 @@ LIBVIRT_GCONFIG_0.0.4 { gvir_config_xml_doc_get_type; gvir_config_xml_doc_new; - local: - *; }; +LIBVIRT_GCONFIG_0.0.5 { + global: + gvir_config_domain_disk_get_driver_cache; + gvir_config_domain_disk_set_driver_cache; + + gvir_config_domain_disk_set_readonly; + + gvir_config_domain_set_custom_xml; + gvir_config_domain_get_custom_xml; + gvir_config_domain_get_description; + gvir_config_domain_set_description; +} LIBVIRT_GCONFIG_0.0.4; + +LIBVIRT_GCONFIG_0.0.6 { + global: + gvir_config_domain_interface_get_ifname; + gvir_config_domain_interface_get_link_state; + gvir_config_domain_interface_get_mac; + gvir_config_domain_interface_get_model; +} LIBVIRT_GCONFIG_0.0.5; + +LIBVIRT_GCONFIG_0.0.7 { + global: + gvir_config_domain_chardev_source_spicevmc_get_type; + gvir_config_domain_chardev_source_spicevmc_new; + gvir_config_domain_chardev_source_spicevmc_new_from_xml; +} LIBVIRT_GCONFIG_0.0.6; + # .... define new API here using predicted next version number .... + +LIBVIRT_GCONFIG_PRIVATE_0.0.7 { + local: + *; +}; -- 1.7.9.1

3 9

[libvirt] USB redirection support
by Christophe Fergeau 11 Apr '12

11 Apr '12

Hey, This patch series adds the needed classes for apps to be able to use USB redirection. I've followed http://hansdegoede.livejournal.com/11084.html and added all the API needed to be able to get the same XML. However, I'm not 100% sure all these attributes are required, in particular the various addresses. Given that for now libvirt-gconfig users tend to reuse what test-domain-create does, it would be useful to know which parts are required and which are not to get working USB redirection. Thanks, Christophe

2 15

[libvirt] [PATCH] qemu: Fix deadlock when qemuDomainOpenConsole cleans up a connection
by Peter Krempa 11 Apr '12

11 Apr '12

The new safe console handling introduced a possibility to deadlock the qemu driver when a new console connection forcibly disconnects a previous console stream that belongs to an already closed connection. The virStreamFree function calls subsequently a the virReleaseConnect function that tries to lock the driver while discarding the connection, but the driver was already locked in qemuDomainOpenConsole. Backtrace of the deadlocked thread: 0 0x00007f66e5aa7f14 in __lll_lock_wait () from /lib64/libpthread.so.0 1 0x00007f66e5aa3411 in _L_lock_500 () from /lib64/libpthread.so.0 2 0x00007f66e5aa322a in pthread_mutex_lock () from/lib64/libpthread.so.0 3 0x0000000000462bbd in qemudClose () 4 0x00007f66e6e178eb in virReleaseConnect () from/usr/lib64/libvirt.so.0 5 0x00007f66e6e19c8c in virUnrefStream () from /usr/lib64/libvirt.so.0 6 0x00007f66e6e3d1de in virStreamFree () from /usr/lib64/libvirt.so.0 7 0x00007f66e6e09a5d in virConsoleHashEntryFree () from/usr/lib64/libvirt.so.0 8 0x00007f66e6db7282 in virHashRemoveEntry () from/usr/lib64/libvirt.so.0 9 0x00007f66e6e09c4e in virConsoleOpen () from /usr/lib64/libvirt.so.0 10 0x00000000004526e9 in qemuDomainOpenConsole () 11 0x00007f66e6e421f1 in virDomainOpenConsole () from/usr/lib64/libvirt.so.0 12 0x00000000004361e4 in remoteDispatchDomainOpenConsoleHelper () 13 0x00007f66e6e80375 in virNetServerProgramDispatch () from/usr/lib64/libvirt.so.0 14 0x00007f66e6e7ae11 in virNetServerHandleJob () from/usr/lib64/libvirt.so.0 15 0x00007f66e6da897d in virThreadPoolWorker () from/usr/lib64/libvirt.so.0 16 0x00007f66e6da7ff6 in virThreadHelper () from/usr/lib64/libvirt.so.0 17 0x00007f66e5aa0c5c in start_thread () from /lib64/libpthread.so.0 18 0x00007f66e57e7fcd in clone () from /lib64/libc.so.6 * src/qemu/qemu_driver.c: qemuDomainOpenConsole() -- unlock the qemu driver right after acquiring the domain object --- Found while writing tests for the libvirt-test-API, its 100% reproducible: 1: Start a domain with serial console and run "cat" on this console 2: download python reproducer: http://files.pipo.sk/console_deadlock.py 3: set guest name in the script 4: run the reproducer and "virsh console 'guestname' --force" after that 5: <deadlocked> src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d9e35be..e18e72d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11494,6 +11494,7 @@ qemuDomainOpenConsole(virDomainPtr dom, qemuDriverLock(driver); virUUIDFormat(dom->uuid, uuidstr); vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); if (!vm) { qemuReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching uuid '%s'"), uuidstr); @@ -11558,7 +11559,6 @@ qemuDomainOpenConsole(virDomainPtr dom, cleanup: if (vm) virDomainObjUnlock(vm); - qemuDriverUnlock(driver); return ret; } -- 1.7.3.4

2 2

[libvirt] Etsy uses Libvirt... :)
by Justin Clift 10 Apr '12

10 Apr '12

Hey everyone, Just noticed that Etsy uses libvirt: http://codeascraft.etsy.com/2012/03/13/making-it-virtually-easy-to-deploy-o… Of specific note, there's this bit: "Libvirt supports live migrations across non-shared storage (in QEMU 0.12.2+) with zero downtime which makes it easy to allocate and balance VM’s across hosts if adjustments need to be made throughout the pool." Seems like a win, eh? :) Regards and best wishes, Justin Clift -- Aeolus Community Manager http://www.aeolusproject.org

2 3

[libvirt] [PATCH 1/2] qemu: Track job owner for better debugging
by Jiri Denemark 10 Apr '12

10 Apr '12

In case an API fails with "cannot acquire state change lock", searching for the API that possibly forgot to end its job is not always easy. Let's keep track of the job owner and print it out for easier identification. --- src/qemu/qemu_domain.c | 53 +++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 4 +++ src/qemu/qemu_migration.c | 1 + src/qemu/qemu_process.c | 6 +--- 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index da1f57f..7f1f8ee 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -147,6 +147,7 @@ qemuDomainObjResetJob(qemuDomainObjPrivatePtr priv) struct qemuDomainJobObj *job = &priv->job; job->active = QEMU_JOB_NONE; + job->owner = 0; } static void @@ -155,6 +156,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv) struct qemuDomainJobObj *job = &priv->job; job->asyncJob = QEMU_ASYNC_JOB_NONE; + job->asyncOwner = 0; job->phase = 0; job->mask = DEFAULT_JOB_MASK; job->start = 0; @@ -169,13 +171,25 @@ qemuDomainObjRestoreJob(virDomainObjPtr obj, memset(job, 0, sizeof(*job)); job->active = priv->job.active; + job->owner = priv->job.owner; job->asyncJob = priv->job.asyncJob; + job->asyncOwner = priv->job.asyncOwner; job->phase = priv->job.phase; qemuDomainObjResetJob(priv); qemuDomainObjResetAsyncJob(priv); } +void +qemuDomainObjTransferJob(virDomainObjPtr obj) +{ + qemuDomainObjPrivatePtr priv = obj->privateData; + + VIR_DEBUG("Changing job owner from %d to %d", + priv->job.owner, virThreadSelfID()); + priv->job.owner = virThreadSelfID(); +} + static void qemuDomainObjFreeJob(qemuDomainObjPrivatePtr priv) { @@ -664,11 +678,23 @@ qemuDomainObjSetJobPhase(struct qemud_driver *driver, int phase) { qemuDomainObjPrivatePtr priv = obj->privateData; + int me = virThreadSelfID(); if (!priv->job.asyncJob) return; + VIR_DEBUG("Setting '%s' phase to '%s'", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, phase)); + + if (priv->job.asyncOwner && me != priv->job.asyncOwner) { + VIR_WARN("'%s' async job is owned by thread %d", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + priv->job.asyncOwner); + } + priv->job.phase = phase; + priv->job.asyncOwner = me; qemuDomainObjSaveJob(driver, obj); } @@ -695,6 +721,22 @@ qemuDomainObjDiscardAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj) qemuDomainObjSaveJob(driver, obj); } +void +qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj) +{ + qemuDomainObjPrivatePtr priv = obj->privateData; + + VIR_DEBUG("Releasing ownership of '%s' async job", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + + if (priv->job.asyncOwner != virThreadSelfID()) { + VIR_WARN("'%s' async job is owned by thread %d", + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + priv->job.asyncOwner); + } + priv->job.asyncOwner = 0; +} + static bool qemuDomainNestedJobAllowed(qemuDomainObjPrivatePtr priv, enum qemuDomainJob job) { @@ -764,11 +806,13 @@ retry: qemuDomainJobTypeToString(job), qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); priv->job.active = job; + priv->job.owner = virThreadSelfID(); } else { VIR_DEBUG("Starting async job: %s", qemuDomainAsyncJobTypeToString(asyncJob)); qemuDomainObjResetAsyncJob(priv); priv->job.asyncJob = asyncJob; + priv->job.asyncOwner = virThreadSelfID(); priv->job.start = now; } @@ -784,6 +828,15 @@ retry: return 0; error: + VIR_WARN("Cannot start job (%s, %s) for domain %s;" + " current job is (%s, %s) owned by (%d, %d)", + qemuDomainJobTypeToString(job), + qemuDomainAsyncJobTypeToString(asyncJob), + obj->def->name, + qemuDomainJobTypeToString(priv->job.active), + qemuDomainAsyncJobTypeToString(priv->job.asyncJob), + priv->job.owner, priv->job.asyncOwner); + if (errno == ETIMEDOUT) qemuReportError(VIR_ERR_OPERATION_TIMEOUT, "%s", _("cannot acquire state change lock")); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b3eecd3..ce52569 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -96,9 +96,11 @@ VIR_ENUM_DECL(qemuDomainAsyncJob) struct qemuDomainJobObj { virCond cond; /* Use to coordinate jobs */ enum qemuDomainJob active; /* Currently running job */ + int owner; /* Thread which set current job */ virCond asyncCond; /* Use to coordinate with async jobs */ enum qemuDomainAsyncJob asyncJob; /* Currently active async job */ + int asyncOwner; /* Thread which set current async job */ int phase; /* Job phase (mainly for migrations) */ unsigned long long mask; /* Jobs allowed during async job */ unsigned long long start; /* When the async job started */ @@ -203,8 +205,10 @@ void qemuDomainObjSetAsyncJobMask(virDomainObjPtr obj, unsigned long long allowedJobs); void qemuDomainObjRestoreJob(virDomainObjPtr obj, struct qemuDomainJobObj *job); +void qemuDomainObjTransferJob(virDomainObjPtr obj); void qemuDomainObjDiscardAsyncJob(struct qemud_driver *driver, virDomainObjPtr obj); +void qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj); void qemuDomainObjEnterMonitor(struct qemud_driver *driver, virDomainObjPtr obj) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ff6f273..c1bb93a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3242,6 +3242,7 @@ qemuMigrationJobStartPhase(struct qemud_driver *driver, int qemuMigrationJobContinue(virDomainObjPtr vm) { + qemuDomainObjReleaseAsyncJob(vm); return virDomainObjUnref(vm); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 96f39e8..19569cf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3038,8 +3038,8 @@ qemuProcessReconnect(void *opaque) priv = obj->privateData; - /* Set fake job so that EnterMonitor* doesn't want to start a new one */ - priv->job.active = QEMU_JOB_MODIFY; + /* Job was started by the caller for us */ + qemuDomainObjTransferJob(obj); /* Hold an extra reference because we can't allow 'vm' to be * deleted if qemuConnectMonitor() failed */ @@ -3119,8 +3119,6 @@ qemuProcessReconnect(void *opaque) if (qemuProcessRecoverJob(driver, obj, conn, &oldjob) < 0) goto error; - priv->job.active = QEMU_JOB_NONE; - /* update domain state XML with possibly updated state in virDomainObj */ if (virDomainSaveStatus(driver->caps, driver->stateDir, obj) < 0) goto error; -- 1.7.8.5

2 2

[libvirt] [PATCH] qemu: Avoid excessive calls to qemuDomainObjSaveJob()
by Jiri Denemark 10 Apr '12

10 Apr '12

As reported by Daniel Berrangé, we have a huge performance regression for virDomainGetInfo() due to the change which makes virDomainEndJob() save the XML status file every time it is called. Previous to that change, 2000 calls to virDomainGetInfo() took ~2.5 seconds. After that change, 2000 calls to virDomainGetInfo() take 2 *minutes* 45 secs. We made the change to be able to recover from libvirtd restart in the middle of a job. However, only destroy and async jobs are taken care of. Thus it makes more sense to only save domain state XML when these jobs are started/stopped. --- src/qemu/qemu_domain.c | 21 ++++++++++++++++++--- src/qemu/qemu_domain.h | 5 +++++ src/qemu/qemu_process.c | 4 ++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 69d9e6e..da1f57f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -183,6 +183,12 @@ qemuDomainObjFreeJob(qemuDomainObjPrivatePtr priv) ignore_value(virCondDestroy(&priv->job.asyncCond)); } +static bool +qemuDomainTrackJob(enum qemuDomainJob job) +{ + return (QEMU_DOMAIN_TRACK_JOBS & JOB_MASK(job)) != 0; +} + static void *qemuDomainObjPrivateAlloc(void) { @@ -239,6 +245,7 @@ static int qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) { qemuDomainObjPrivatePtr priv = data; const char *monitorpath; + enum qemuDomainJob job; /* priv->monitor_chr is set only for qemu */ if (priv->monConfig) { @@ -284,6 +291,10 @@ static int qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) if (priv->lockState) virBufferAsprintf(buf, " <lockstate>%s</lockstate>\n", priv->lockState); + job = priv->job.active; + if (!qemuDomainTrackJob(job)) + priv->job.active = QEMU_JOB_NONE; + if (priv->job.active || priv->job.asyncJob) { virBufferAsprintf(buf, " <job type='%s' async='%s'", qemuDomainJobTypeToString(priv->job.active), @@ -295,6 +306,7 @@ static int qemuDomainObjPrivateXMLFormat(virBufferPtr buf, void *data) } virBufferAddLit(buf, "/>\n"); } + priv->job.active = job; if (priv->fakeReboot) virBufferAsprintf(buf, " <fakereboot/>\n"); @@ -766,7 +778,8 @@ retry: virDomainObjLock(obj); } - qemuDomainObjSaveJob(driver, obj); + if (qemuDomainTrackJob(job)) + qemuDomainObjSaveJob(driver, obj); return 0; @@ -862,15 +875,17 @@ int qemuDomainObjBeginAsyncJobWithDriver(struct qemud_driver *driver, int qemuDomainObjEndJob(struct qemud_driver *driver, virDomainObjPtr obj) { qemuDomainObjPrivatePtr priv = obj->privateData; + enum qemuDomainJob job = priv->job.active; priv->jobs_queued--; VIR_DEBUG("Stopping job: %s (async=%s)", - qemuDomainJobTypeToString(priv->job.active), + qemuDomainJobTypeToString(job), qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); qemuDomainObjResetJob(priv); - qemuDomainObjSaveJob(driver, obj); + if (qemuDomainTrackJob(job)) + qemuDomainObjSaveJob(driver, obj); virCondSignal(&priv->job.cond); return virDomainObjUnref(obj); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index adccfed..b3eecd3 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -53,6 +53,11 @@ JOB_MASK(QEMU_JOB_DESTROY) | \ JOB_MASK(QEMU_JOB_ABORT)) +/* Jobs which have to be tracked in domain state XML. */ +# define QEMU_DOMAIN_TRACK_JOBS \ + (JOB_MASK(QEMU_JOB_DESTROY) | \ + JOB_MASK(QEMU_JOB_ASYNC)) + /* Only 1 job is allowed at any time * A job includes *all* monitor commands, even those just querying * information, not merely actions */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 481b4f3..96f39e8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2963,6 +2963,10 @@ qemuProcessRecoverJob(struct qemud_driver *driver, if (!virDomainObjIsActive(vm)) return -1; + /* In case any special handling is added for job type that has been ignored + * before, QEMU_DOMAIN_TRACK_JOBS (from qemu_domain.h) needs to be updated + * for the job to be properly tracked in domain state XML. + */ switch (job->active) { case QEMU_JOB_QUERY: /* harmless */ -- 1.7.8.5

2 1

[libvirt] [PATCH] build: avoid s390 compiler warnings
by Eric Blake 10 Apr '12

10 Apr '12

I noticed compiler warnings when building for the s390 architecture. * src/node_device/node_device_udev.c (udevDeviceMonitorStartup): Mark unused variable. * src/nodeinfo.c (linuxNodeInfoCPUPopulate): Avoid unused variable. --- Pushing under the trivial rule. src/node_device/node_device_udev.c | 4 ++-- src/nodeinfo.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 438c2eb..6418015 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1,7 +1,7 @@ /* * node_device_udev.c: node device enumeration - libudev implementation * - * Copyright (C) 2009-2011 Red Hat, Inc. + * Copyright (C) 2009-2012 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 @@ -1604,7 +1604,7 @@ out: return ret; } -static int udevDeviceMonitorStartup(int privileged) +static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) { udevPrivate *priv = NULL; struct udev *udev = NULL; diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 26f8dc1..7e993a9 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -231,10 +231,10 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, /* NOTE: hyperthreads are ignored here; they are parsed out of /sys */ while (fgets(line, sizeof(line), cpuinfo) != NULL) { - char *buf = line; # if defined(__x86_64__) || \ defined(__amd64__) || \ defined(__i386__) + char *buf = line; if (STRPREFIX(buf, "cpu MHz")) { char *p; unsigned int ui; @@ -253,6 +253,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, } # elif defined(__powerpc__) || \ defined(__powerpc64__) + char *buf = line; if (STRPREFIX(buf, "clock")) { char *p; unsigned int ui; -- 1.7.7.6

1 0

[libvirt] [PATCH] daemon: Add libvirtd-config.c to the list of files to translate
by Jiri Denemark 10 Apr '12

10 Apr '12

--- po/POTFILES.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 5d5739a..4c49200 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ +daemon/libvirtd-config.c daemon/libvirtd.c daemon/qemu_dispatch.h daemon/remote.c -- 1.7.8.5

2 1

[libvirt] [PATCH] virsh: Clean up usage of boolean flag variables
by Peter Krempa 10 Apr '12

10 Apr '12

This patch cleans up variables used to store boolean command flags that are inquired by vshCommandOptBool to use the bool data type instead of an integer. Additionaly this patch cleans up flag variables that are inferred from existing flags. --- tools/virsh.c | 120 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 60 insertions(+), 60 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index cfdd040..1a2e191 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -933,9 +933,9 @@ static const vshCmdOptDef opts_list[] = { static bool cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - int inactive = vshCommandOptBool(cmd, "inactive"); - int all = vshCommandOptBool(cmd, "all"); - int active = !inactive || all ? 1 : 0; + bool inactive = vshCommandOptBool(cmd, "inactive"); + bool all = vshCommandOptBool(cmd, "all"); + bool active = !inactive || all; int *ids = NULL, maxid = 0, i; char **names = NULL; int maxname = 0; @@ -1317,7 +1317,7 @@ cmdDomstate(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; bool ret = true; - int showReason = vshCommandOptBool(cmd, "reason"); + bool showReason = vshCommandOptBool(cmd, "reason"); int state, reason; if (!vshConnectionUsability(ctl, ctl->conn)) @@ -1966,9 +1966,9 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) int nparams = 0; virTypedParameterPtr params = NULL; bool ret = false; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); virNetDevBandwidthRate inbound, outbound; int i; @@ -2626,7 +2626,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) bool ret = true; char *buffer; #ifndef WIN32 - int console = vshCommandOptBool(cmd, "console"); + bool console = vshCommandOptBool(cmd, "console"); #endif unsigned int flags = VIR_DOMAIN_NONE; @@ -3094,7 +3094,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; bool ret = false; #ifndef WIN32 - int console = vshCommandOptBool(cmd, "console"); + bool console = vshCommandOptBool(cmd, "console"); #endif unsigned int flags = VIR_DOMAIN_NONE; int rc; @@ -3786,9 +3786,9 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) int i, ret; bool ret_val = false; unsigned int flags = 0; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); if (current) { if (live || config) { @@ -4921,11 +4921,11 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; bool ret = true; - int maximum = vshCommandOptBool(cmd, "maximum"); - int active = vshCommandOptBool(cmd, "active"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); - int current = vshCommandOptBool(cmd, "current"); + bool maximum = vshCommandOptBool(cmd, "maximum"); + bool active = vshCommandOptBool(cmd, "active"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); bool all = maximum + active + current + config + live == 0; int count; @@ -5246,9 +5246,9 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) int i, cpu, lastcpu, maxcpu, ncpus; bool unuse = false; const char *cur; - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); - int current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); bool query = false; /* Query mode if no cpulist */ unsigned int flags = 0; @@ -5479,10 +5479,10 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; int count = 0; bool ret = true; - int maximum = vshCommandOptBool(cmd, "maximum"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); - int current = vshCommandOptBool(cmd, "current"); + bool maximum = vshCommandOptBool(cmd, "maximum"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); unsigned int flags = 0; if (current) { @@ -5853,9 +5853,9 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) unsigned long long max; unsigned long kibibytes = 0; bool ret = true; - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); - int current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); unsigned int flags = 0; if (current) { @@ -5935,9 +5935,9 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) unsigned long long max; unsigned long kibibytes = 0; bool ret = true; - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); - int current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); unsigned int flags = VIR_DOMAIN_MEM_MAXIMUM; if (current) { @@ -6026,9 +6026,9 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) virTypedParameterPtr params = NULL, temp = NULL; bool ret = false; unsigned int flags = 0; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); if (current) { if (live || config) { @@ -6201,9 +6201,9 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) virTypedParameterPtr params = NULL, temp = NULL; bool ret = false; unsigned int flags = 0; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); if (current) { if (live || config) { @@ -6365,9 +6365,9 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) const char *nodeset = NULL; bool ret = false; unsigned int flags = 0; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); const char *mode = NULL; if (current) { @@ -6831,9 +6831,9 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) bool ret = true; char *dump; unsigned int flags = 0; - int inactive = vshCommandOptBool(cmd, "inactive"); - int secure = vshCommandOptBool(cmd, "security-info"); - int update = vshCommandOptBool(cmd, "update-cpu"); + bool inactive = vshCommandOptBool(cmd, "inactive"); + bool secure = vshCommandOptBool(cmd, "security-info"); + bool update = vshCommandOptBool(cmd, "update-cpu"); if (inactive) flags |= VIR_DOMAIN_XML_INACTIVE; @@ -7800,9 +7800,9 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) virTypedParameterPtr params = NULL, temp = NULL; unsigned int flags = 0, i = 0; int rv = 0; - int current = vshCommandOptBool(cmd, "current"); - int config = vshCommandOptBool(cmd, "config"); - int live = vshCommandOptBool(cmd, "live"); + bool current = vshCommandOptBool(cmd, "current"); + bool config = vshCommandOptBool(cmd, "config"); + bool live = vshCommandOptBool(cmd, "live"); bool ret = false; if (current) { @@ -8336,9 +8336,9 @@ static const vshCmdOptDef opts_network_list[] = { static bool cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - int inactive = vshCommandOptBool(cmd, "inactive"); - int all = vshCommandOptBool(cmd, "all"); - int active = !inactive || all ? 1 : 0; + bool inactive = vshCommandOptBool(cmd, "inactive"); + bool all = vshCommandOptBool(cmd, "all"); + bool active = !inactive || all; int maxactive = 0, maxinactive = 0, i; char **activeNames = NULL, **inactiveNames = NULL; inactive |= all; @@ -8609,9 +8609,9 @@ static const vshCmdOptDef opts_interface_list[] = { static bool cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) { - int inactive = vshCommandOptBool(cmd, "inactive"); - int all = vshCommandOptBool(cmd, "all"); - int active = !inactive || all ? 1 : 0; + bool inactive = vshCommandOptBool(cmd, "inactive"); + bool all = vshCommandOptBool(cmd, "all"); + bool active = !inactive || all; int maxactive = 0, maxinactive = 0, i; char **activeNames = NULL, **inactiveNames = NULL; inactive |= all; @@ -8786,7 +8786,7 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) bool ret = true; char *dump; unsigned int flags = 0; - int inactive = vshCommandOptBool(cmd, "inactive"); + bool inactive = vshCommandOptBool(cmd, "inactive"); if (inactive) flags |= VIR_INTERFACE_XML_INACTIVE; @@ -10038,7 +10038,7 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) virStoragePoolPtr pool; const char *name; char *xml; - int printXML = vshCommandOptBool(cmd, "print-xml"); + bool printXML = vshCommandOptBool(cmd, "print-xml"); if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -10126,7 +10126,7 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) virStoragePoolPtr pool; const char *name; char *xml; - int printXML = vshCommandOptBool(cmd, "print-xml"); + bool printXML = vshCommandOptBool(cmd, "print-xml"); if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -10400,10 +10400,10 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) struct poolInfoText *poolInfoTexts = NULL; /* Determine the options passed by the user */ - int all = vshCommandOptBool(cmd, "all"); - int details = vshCommandOptBool(cmd, "details"); - int inactive = vshCommandOptBool(cmd, "inactive"); - int active = !inactive || all ? 1 : 0; + bool all = vshCommandOptBool(cmd, "all"); + bool details = vshCommandOptBool(cmd, "details"); + bool inactive = vshCommandOptBool(cmd, "inactive"); + bool active = !inactive || all; inactive |= all; /* Check the connection to libvirtd daemon is still working */ @@ -12062,7 +12062,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) char *outputStr = NULL; const char *unit; double val; - int details = vshCommandOptBool(cmd, "details"); + bool details = vshCommandOptBool(cmd, "details"); int numVolumes = 0, i; int ret; bool functionReturn; @@ -13006,7 +13006,7 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) const char *cap = NULL; char **devices; int num_devices, i; - int tree = vshCommandOptBool(cmd, "tree"); + bool tree = vshCommandOptBool(cmd, "tree"); if (!vshConnectionUsability(ctl, ctl->conn)) return false; -- 1.7.3.4

2 2

[libvirt] [PATCH] virsh: Clarify use of the --managed-save flag for the list command
by Peter Krempa 10 Apr '12

10 Apr '12

The documentation for the flag doesn't clearly state that the flag only enhances the output and the user needs to specify other flags to list inactive domains, that are enhanced by this flag. --- tools/virsh.c | 2 +- tools/virsh.pod | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index cfdd040..7477d32 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -924,7 +924,7 @@ static const vshCmdOptDef opts_list[] = { {"name", VSH_OT_BOOL, 0, N_("list domain names only")}, {"table", VSH_OT_BOOL, 0, N_("list table (default)")}, {"managed-save", VSH_OT_BOOL, 0, - N_("mark domains with managed save state")}, + N_("mark inactive domains with managed save state")}, {"title", VSH_OT_BOOL, 0, N_("show short domain description")}, {NULL, 0, 0, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index a60e667..c6e0ff3 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -381,8 +381,9 @@ into s3 state. =back If I<--managed-save> is specified, then domains that have managed save -state (only possible if they are in the B<shut off> state) will -instead show as B<saved> in the listing. This flag is usable only with the +state (only possible if they are in the B<shut off> state, so you need to +specify I<--inactive> or I<--all> to actually list them) will instead +show as B<saved> in the listing. This flag is usable only with the default I<--table> output. If I<--name> is specified, domain names are printed instead of the table -- 1.7.3.4

2 2

[libvirt] [RESEND] libvirt: xen: Shutdown detection fixes (RH-BZ#746007)
by Stefan Bader 10 Apr '12

10 Apr '12

Resending this as there was no feedback overall and at least the first change fixes the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=746007 --- The issue is easy to observe when using virt-manager as a frontend. Its main window seems to open connections for the up/down main display once and then only repeats DomainGetInfo on the same connection to check whether the instance is up or shut down. The initial open on the connection sets the domain id to -1 for inactive managed domains. And once running, the hypervisor driver returns the status. But after shutdown, the domain cannot be found by the hypervisor driver and the domain info is obtained by the xend driver. However, that expects the domain id to be -1 for inactive domains. This is not true (anymore). In testing I found that domain/status seems to be always present and better suited to check whether a domain is running or not (0 for shutdown and 2 for running, there are probably other values, too). Beside the change, which does fix this problem, the question is whether there should be a mechanism that resets domain->id to -1 when the instance is found to be shut down. And if that should happen, should it be done by any sub-driver or by the unified driver. The second problem I observed when I shut down an instance from the vnc console provided by virt-manager. As soon as the instance was down, the log produced internal errors about every second. Found this again, to be related to the unified driver approach. The call that causes the many error messages is GetVcpus. While the instance is up, the hypervisor driver returns those. But after shutdown, the domain cannot be found by that driver. The xend driver works, though. So what happens is that the hypervisor driver logs an internal error but the call succeeds because the xend driver returns successful. This generally opens the question whether a sub-driver should log any errors (at least not on error level, maybe debug)? The second patch only quiets down the one message I saw repeated that often. There are some other errors logged without any obvious problems interacting with the instances, but those are by far less often. -Stefan Please cc: me on replies as I am (yeah still) not subscribed to this m-l. Thanks.

2 10

[libvirt] [PATCH] tests: Fix libvirtdconftest in VPATH build
by Jiri Denemark 10 Apr '12

10 Apr '12

Without this, libvirtdconftest fails to build with "fatal error: daemon/libvirtd-config.h: No such file or directory" --- tests/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 57358e9..c4d550f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,6 +6,7 @@ SHELL = $(PREFERABLY_POSIX_SHELL) INCLUDES = \ + -I$(top_builddir) -I$(top_srcdir) \ -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \ -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_builddir)/src -I$(top_srcdir)/src \ -- 1.7.8.5

2 1

[libvirt] libvirt starts KVM domain without -enable-kvm
by Reinier Schoof 10 Apr '12

10 Apr '12

Hey, we're running a VM-pool based on libvirt and QEMU/KVM. The host machines run debian 6 (squeeze). All VM's have a similar libvirt XML-definition. Since we've moved to the combination of Linux kernel 3.2.0-1 and libvirt 0.9.9 (installed from testing/wheezy repo's), we periodically notice poor performance of new(ly started) VM's and after inspection they turn out to be started without the qemu option -enable-kvm. In /var/log/libvirt/qemu/$VM-name.log a line like this is shown: 20529: error : qemuBuildCommandLine:3681 : unsupported configuration: the QEMU binary /usr/bin/kvm does not support kvm After a virsh destroy/start, using the same XML-definition, the VM is started WITH -enable-kvm. Looking at the libvirt source of 0.9.9, I can't imagine this being the result of a race condition or other strange circumstance: it simply parse 'qemu -help', which always give exactly the same output. I've tried reproducing the problem by continuously destroy, undefine, define and start the same VM and then grepping the kvm-commandline for the absence of -enable-kvm, without any result. The XML-definition includes <domain type='kvm'> and <emulator>/usr/bin/kvm</emulator> Does anyone recognize this behaviour of libvirt? Thanks, Reinier Schoof # virsh version Compiled against library: libvir 0.9.9 Using library: libvir 0.9.9 Using API: QEMU 0.9.9 Running hypervisor: QEMU 0.15.0 Linux 3.2.0-1-amd64 #1 SMP Fri Feb 17 05:17:36 UTC 2012 x86_64 GNU/Linux -- TransIP BV | https://www.transip.nl/

1 0

[libvirt] [PATCH] Fix comment about GNUTLS initialization/cleanup
by Daniel P. Berrange 10 Apr '12

10 Apr '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- src/rpc/virnettlscontext.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 74a61e0..7440c7a 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1423,9 +1423,13 @@ void virNetTLSSessionFree(virNetTLSSessionPtr sess) * virNetTLS* because it initializes * underlying GnuTLS library. According to * it's documentation, it's safe to be called - * many times, but is not thread safe. Each - * call SHOULD be later followed by - * virNetTLSContextDeinit. + * many times, but is not thread safe. + * + * There is no corresponding "Deinit" / "Cleanup" + * function because there is no safe way to call + * 'gnutls_global_deinit' from a multi-threaded + * library, where other libraries linked into the + * application may also be using gnutls. */ void virNetTLSInit(void) { -- 1.7.7.6

2 1

[libvirt] Memory leak in libvirt / gnutls
by Richard W.M. Jones 10 Apr '12

10 Apr '12

I'm trying to track down: https://bugzilla.redhat.com/show_bug.cgi?id=810613 I *think* this is a libvirt bug, but I can only reproduce it on one machine, not on another machine that has a virtually identical setup. Anyway, something is confusing me about libvirt. In this commit: ---------------------------------------------------------------------- commit 74c75671331d284e1f777f9692b72e9737520bf0 Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Thu Aug 18 10:44:08 2011 +0200 daemon: initialize GnuTLS When spice_tls is set but listen_tls is not, we don't initialize GnuTLS library. So any later gnutls call (e.g. during migration, where we initialize a certificate) will access uninitialized GnuTLS internal structs and throws an error. Although, we might now initialize GnuTLS twice, it is safe according to the documentation: This function can be called many times, but will only do something the first time. This patch creates 2 functions: virNetTLSInit and virNetTLSDeinit with respect to written above. ---------------------------------------------------------------------- ... a pair of functions called virNetTLSInit & virNetTLSDeinit are introduced, which would appear to do the right thing, calling first gnutls_global_init, then gnutls_global_deinit. This looks correct to me. However the above commit is later amended by this commit: ---------------------------------------------------------------------- commit eaddec976ef06457fee4a4ce86b8c7ee906183b7 Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Wed Aug 24 16:16:45 2011 +0200 daemon: Move TLS initialization to virInitialize My previous patch 74c75671331d284e1f777f9692b72e9737520bf0 introduced a regression by removing TLS initialization from client. ---------------------------------------------------------------------- which removes virNetTLSDeinit. This appears to be a mistake, or at least I can't see the logical reason for it, and according to the gnutls docs, it would introduce a memory leak looking exactly like the one I am chasing down. The current code mentions virNetTLSDeinit only in a comment, and never calls gnutls_global_deinit. Any ideas? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

3 3

[libvirt] [PATCH] Fix compilation error on 32bit
by Stefan Berger 10 Apr '12

10 Apr '12

Below code failed to compile on a 32 bit machine with error typewrappers.c: In function 'libvirt_intUnwrap': typewrappers.c:135:5: error: logical 'and' of mutually exclusive tests is always false [-Werror=logical-op] cc1: all warnings being treated as errors The patch fixes this error. Stefan --- python/typewrappers.c | 4 ++++ 1 file changed, 4 insertions(+) Index: libvirt-acl/python/typewrappers.c =================================================================== --- libvirt-acl.orig/python/typewrappers.c +++ libvirt-acl/python/typewrappers.c @@ -132,6 +132,7 @@ libvirt_intUnwrap(PyObject *obj, int *va if ((long_val == -1) && PyErr_Occurred()) return -1; +#if LONG_MAX != INT_MAX if (long_val >= INT_MIN && long_val <= INT_MAX) { *val = long_val; } else { @@ -139,6 +140,9 @@ libvirt_intUnwrap(PyObject *obj, int *va "Python int too large to convert to C int"); return -1; } +#else + *val = long_val; +#endif return 0; }

2 2

[libvirt] [PATCH 0/4] Replace daemon-conf test case
by Daniel P. Berrange 10 Apr '12

10 Apr '12

The daemon-conf test case is terminally broken by design, despite numerous patches over the years, due to its need to test functionality indirectly by running libvirtd. Replace it with a test case which directly unit tests the code in question.

2 9

[libvirt] [test-API PATCH 1/3] test-API: Get rid of utils/Python
by Osier Yang 10 Apr '12

10 Apr '12

test-API tends to only support testing via libvirt Python binding now, and moving it to utils makes sense. --- utils/{Python => }/XMLParser.py | 0 utils/{Python => }/check.py | 0 utils/{Python => }/env_parser.py | 0 utils/{Python => }/format.py | 0 utils/{Python => }/log.py | 0 utils/{Python => }/utils.py | 0 utils/{Python => }/xmlbuilder.py | 0 utils/{Python => }/xmlgenerator.py | 0 8 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 utils/Python/__init__.py rename utils/{Python => }/XMLParser.py (100%) rename utils/{Python => }/check.py (100%) rename utils/{Python => }/env_parser.py (100%) rename utils/{Python => }/format.py (100%) rename utils/{Python => }/log.py (100%) rename utils/{Python => }/utils.py (100%) rename utils/{Python => }/xmlbuilder.py (100%) rename utils/{Python => }/xmlgenerator.py (100%) diff --git a/utils/Python/__init__.py b/utils/Python/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/utils/Python/XMLParser.py b/utils/XMLParser.py similarity index 100% rename from utils/Python/XMLParser.py rename to utils/XMLParser.py diff --git a/utils/Python/check.py b/utils/check.py similarity index 100% rename from utils/Python/check.py rename to utils/check.py diff --git a/utils/Python/env_parser.py b/utils/env_parser.py similarity index 100% rename from utils/Python/env_parser.py rename to utils/env_parser.py diff --git a/utils/Python/format.py b/utils/format.py similarity index 100% rename from utils/Python/format.py rename to utils/format.py diff --git a/utils/Python/log.py b/utils/log.py similarity index 100% rename from utils/Python/log.py rename to utils/log.py diff --git a/utils/Python/utils.py b/utils/utils.py similarity index 100% rename from utils/Python/utils.py rename to utils/utils.py diff --git a/utils/Python/xmlbuilder.py b/utils/xmlbuilder.py similarity index 100% rename from utils/Python/xmlbuilder.py rename to utils/xmlbuilder.py diff --git a/utils/Python/xmlgenerator.py b/utils/xmlgenerator.py similarity index 100% rename from utils/Python/xmlgenerator.py rename to utils/xmlgenerator.py -- 1.7.7.5

2 5

[libvirt] help for libvirt0.9.8 compile
by hero 10 Apr '12

10 Apr '12

my redhat6.1 has a libvirt0.8.7, and I got a libvirt0.9.8.tar that I want to update the old one. when I use './configure --prefix=/usr --libdir=/usr/lib64 --localstatedir=/var --sysconfdir=/etc' it siad 'configure: error: You must install device-mapper-devel/libdevmapper >= 1.0.0 to compile libvirt' please tell me how to do if you know. thanks. best wishes! SunYongGang

3 2

Re: [libvirt] Fwd: Look what i found...
by dasari dakshina 10 Apr '12

10 Apr '12

<p>How to start an Online Business<br><a href="http://expertizaregion55.ru/breakingnews/48IanStewart/">http://expertizaregion55.ru/breakingnews/48IanStewart/</a></p>

1 0