- Devel - libvirt List Archives

[libvirt] Segfault in libxl_osevent_occurred_timeout [Was: Re: [libvirt-users] About debugging of libvirt.]
by Dario Faggioli 20 Dec '13

20 Dec '13

[Moving this to libvir, libvir-users in Bcc. Also, added xen-devel] Jim, cooldharma06 reports having issues when destroying VMs with libvirt 1.2.0 and Xen 4.2.1 (is that the case, cooldharma06)? Look at the stack trace at the end of this message, or here: https://bugzilla.redhat.com/show_bug.cgi?id=1044838 Ian, since it looks like events are involved... Any idea? cooldharma06, about the Xen 4.2.1, thing, is there a specific reason why you use it instead, of, e.g., 4.3.x ? Since you are building from source anyway, could you at least try Xen 4.3, to see whether the issue could be a bug in 4.2's libxl? I'm asking because, with both Xen 4.3 and the curret git tip, I don't have issues destroying domains with virsh. Thanks and Regards, Dario On gio, 2013-12-19 at 15:42 +0530, cool dharma06 wrote: > i did the debugging as you said. Kindly refer the following logs: > > > (gdb) c > Continuing. > thread apply all bt > [New Thread 0x7fc337c6b700 (LWP 29520)] > > > Program received signal SIGSEGV, Segmentation fault. > 0x0000000000000000 in ?? () > (gdb) thread apply all bt > > > Thread 12 (Thread 0x7fc337c6b700 (LWP 29520)): > #0 0x00007fc33509f18d in read () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #1 0x00007fc32b1555c4 in read_all (fd=26, data=0x7fc3380e0a70, > data@entry=0x20, len=len@entry=16, nonblocking=nonblocking@entry=0) at > xs.c:365 > #2 0x00007fc32b1556d8 in read_message (h=h@entry=0x7fc324013ee0, > nonblocking=nonblocking@entry=0) at xs.c:1071 > #3 0x00007fc32b156005 in read_thread (arg=0x7fc324013ee0) at > xs.c:1137 > #4 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #5 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #6 0x0000000000000000 in ?? () > > > Thread 11 (Thread 0x7fc330e7f700 (LWP 29170)): > #0 0x00007fc33509c2d4 in pthread_cond_wait@@GLIBC_2.3.2 () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #1 0x00007fc3371ae9ea in virCondWait (c=c@entry=0x7fc3380dbd80, > m=m@entry=0x7fc3380dbd58) at util/virthreadpthread.c:117 > #2 0x00007fc3371af0cb in virThreadPoolWorker > (opaque=opaque@entry=0x7fc3380db870) at util/virthreadpool.c:103 > #3 0x00007fc3371ae686 in virThreadHelper (data=<optimized out>) at > util/virthreadpthread.c:161 > #4 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #5 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #6 0x0000000000000000 in ?? () > > > Thread 10 (Thread 0x7fc33067e700 (LWP 29171)): > #0 0x00007fc33509c2d4 in pthread_cond_wait@@GLIBC_2.3.2 () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #1 0x00007fc3371ae9ea in virCondWait (c=c@entry=0x7fc3380dbd80, > m=m@entry=0x7fc3380dbd58) at util/virthreadpthread.c:117 > #2 0x00007fc3371af0cb in virThreadPoolWorker > (opaque=opaque@entry=0x7fc3380db640) at util/virthreadpool.c:103 > #3 0x00007fc3371ae686 in virThreadHelper (data=<optimized out>) at > util/virthreadpthread.c:161 > #4 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #5 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #6 0x0000000000000000 in ?? () > > > Thread 9 (Thread 0x7fc32fe7d700 (LWP 29172)): > #0 0x00007fc33509c2d4 in pthread_cond_wait@@GLIBC_2.3.2 () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #1 0x00007fc3371ae9ea in virCondWait (c=c@entry=0x7fc3380dbd80, > m=m@entry=0x7fc3380dbd58) at util/virthreadpthread.c:117 > #2 0x00007fc3371af0cb in virThreadPoolWorker > (opaque=opaque@entry=0x7fc3380db870) at util/virthreadpool.c:103 > #3 0x00007fc3371ae686 in virThreadHelper (data=<optimized out>) at > util/virthreadpthread.c:161 > #4 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #5 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #6 0x0000000000000000 in ?? () > > > Thread 8 (Thread 0x7fc32f67c700 (LWP 29173)): > #0 0x00007fc33497cb9f in realloc () > from /lib/x86_64-linux-gnu/libc.so.6 > #1 0x00007fc3349eec85 in __vasprintf_chk () > from /lib/x86_64-linux-gnu/libc.so.6 > ---Type <return> to continue, or q <return> to quit--- > #2 0x00007fc3371aac0a in vasprintf (__ap=0x7fc32f67b6d0, > __fmt=0x7fc337391017 "%llu: %s : %s:%d : %s\n", __ptr=0x7fc32f67b830) > at /usr/include/x86_64-linux-gnu/bits/stdio2.h:199 > #3 virVasprintfInternal (report=report@entry=false, domcode=0, > filename=0x0, funcname=0x0, linenr=0, strp=0x7fc32f67b830, > fmt=fmt@entry=0x7fc337391017 "%llu: %s : %s:%d : %s\n", > list=list@entry=0x7fc32f67b6d0) at util/virstring.c:337 > #4 0x00007fc3371aad1b in virAsprintfInternal > (report=report@entry=false, domcode=domcode@entry=0, > filename=filename@entry=0x0, funcname=funcname@entry=0x0, > linenr=linenr@entry=0, strp=strp@entry=0x7fc32f67b830, > fmt=fmt@entry=0x7fc337391017 "%llu: %s : %s:%d : %s\n") at > util/virstring.c:358 > #5 0x00007fc33718cb59 in virLogFormatString (str=<optimized out>, > priority=VIR_LOG_DEBUG, funcname=0x7fc337394734 "virObjectRef", > linenr=293, msg=0x7fc32f67b830) > at util/virlog.c:719 > #6 virLogVMessage (source=VIR_LOG_FROM_TRACE, priority=VIR_LOG_DEBUG, > filename=0x7fc337394597 "util/virobject.c", linenr=293, > funcname=0x7fc337394734 "virObjectRef", > metadata=0x0, fmt=fmt@entry=0x7fc3373945f1 "OBJECT_REF: obj=%p", > vargs=vargs@entry=0x7fc32f67b8c0) at util/virlog.c:846 > #7 0x00007fc33718cfc7 in virLogMessage > (source=source@entry=VIR_LOG_FROM_TRACE, > priority=priority@entry=VIR_LOG_DEBUG, > filename=filename@entry=0x7fc337394597 "util/virobject.c", > linenr=linenr@entry=293, funcname=funcname@entry=0x7fc337394734 > "virObjectRef", > metadata=metadata@entry=0x0, fmt=fmt@entry=0x7fc3373945f1 > "OBJECT_REF: obj=%p") at util/virlog.c:778 > #8 0x00007fc33719c3d7 in virObjectRef (anyobj=0x7fc338102720) at > util/virobject.c:293 > #9 0x00007fc32af1824f in libxlDriverConfigGet > (driver=driver@entry=0x7fc338108930) at libxl/libxl_conf.c:1124 > #10 0x00007fc32af1a50e in libxlVmCleanup > (driver=driver@entry=0x7fc338108930, vm=vm@entry=0x7fc32400f530, > reason=reason@entry=VIR_DOMAIN_SHUTOFF_DESTROYED) > at libxl/libxl_driver.c:264 > #11 0x00007fc32af20274 in libxlVmReap (driver=0x7fc338108930, > vm=0x7fc32400f530, reason=VIR_DOMAIN_SHUTOFF_DESTROYED) at > libxl/libxl_driver.c:338 > #12 0x00007fc32af207de in libxlDomainDestroyFlags (dom=0x7fc3380e3770, > flags=<optimized out>) at libxl/libxl_driver.c:1507 > #13 0x00007fc33723cd37 in virDomainDestroy > (domain=domain@entry=0x7fc3380e3770) at libvirt.c:2342 > #14 0x00007fc337cb9ba4 in remoteDispatchDomainDestroy (args=<optimized > out>, rerr=0x7fc32f67bcd0, client=0x7fc32400ee60, server=<optimized > out>, msg=<optimized out>) > at remote_dispatch.h:3165 > #15 remoteDispatchDomainDestroyHelper (server=<optimized out>, > client=0x7fc32400ee60, msg=<optimized out>, rerr=0x7fc32f67bcd0, > args=<optimized out>, > ret=<optimized out>) at remote_dispatch.h:3143 > #16 0x00007fc3372b4d79 in virNetServerProgramDispatchCall > (msg=0x7fc324014070, client=0x7fc32400ee60, server=0x7fc3380dbba0, > prog=0x7fc324007750) > at rpc/virnetserverprogram.c:435 > #17 virNetServerProgramDispatch (prog=0x7fc324007750, > server=server@entry=0x7fc3380dbba0, client=0x7fc32400ee60, > msg=0x7fc324014070) at rpc/virnetserverprogram.c:305 > #18 0x00007fc3372aea78 in virNetServerProcessMsg (msg=<optimized out>, > prog=<optimized out>, client=<optimized out>, srv=0x7fc3380dbba0) at > rpc/virnetserver.c:165 > #19 virNetServerHandleJob (jobOpaque=<optimized out>, > opaque=0x7fc3380dbba0) at rpc/virnetserver.c:186 > #20 0x00007fc3371af02e in virThreadPoolWorker > (opaque=opaque@entry=0x7fc3380db640) at util/virthreadpool.c:144 > #21 0x00007fc3371ae686 in virThreadHelper (data=<optimized out>) at > util/virthreadpthread.c:161 > #22 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #23 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #24 0x0000000000000000 in ?? () > > > Thread 7 (Thread 0x7fc32ee7b700 (LWP 29174)): > #0 0x00007fc33509c2d4 in pthread_cond_wait@@GLIBC_2.3.2 () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #1 0x00007fc3371ae9ea in virCondWait (c=c@entry=0x7fc3380dbd80, > m=m@entry=0x7fc3380dbd58) at util/virthreadpthread.c:117 > #2 0x00007fc3371af0cb in virThreadPoolWorker > (opaque=opaque@entry=0x7fc3380db870) at util/virthreadpool.c:103 > #3 0x00007fc3371ae686 in virThreadHelper (data=<optimized out>) at > util/virthreadpthread.c:161 > ---Type <return> to continue, or q <return> to quit--- > #4 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #5 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #6 0x0000000000000000 in ?? () > > > Thread 6 (Thread 0x7fc32e67a700 (LWP 29175)): > #0 0x00007fc33509c2d4 in pthread_cond_wait@@GLIBC_2.3.2 () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #1 0x00007fc3371ae9ea in virCondWait (c=c@entry=0x7fc3380dbe18, > m=m@entry=0x7fc3380dbd58) at util/virthreadpthread.c:117 > #2 0x00007fc3371af0eb in virThreadPoolWorker > (opaque=opaque@entry=0x7fc3380db640) at util/virthreadpool.c:103 > #3 0x00007fc3371ae686 in virThreadHelper (data=<optimized out>) at > util/virthreadpthread.c:161 > #4 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #5 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #6 0x0000000000000000 in ?? () > > > Thread 5 (Thread 0x7fc32de79700 (LWP 29176)): > #0 0x00007fc33509c2d4 in pthread_cond_wait@@GLIBC_2.3.2 () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #1 0x00007fc3371ae9ea in virCondWait (c=c@entry=0x7fc3380dbe18, > m=m@entry=0x7fc3380dbd58) at util/virthreadpthread.c:117 > #2 0x00007fc3371af0eb in virThreadPoolWorker > (opaque=opaque@entry=0x7fc3380db870) at util/virthreadpool.c:103 > #3 0x00007fc3371ae686 in virThreadHelper (data=<optimized out>) at > util/virthreadpthread.c:161 > #4 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #5 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #6 0x0000000000000000 in ?? () > > > Thread 4 (Thread 0x7fc32d678700 (LWP 29177)): > #0 0x00007fc33509c2d4 in pthread_cond_wait@@GLIBC_2.3.2 () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #1 0x00007fc3371ae9ea in virCondWait (c=c@entry=0x7fc3380dbe18, > m=m@entry=0x7fc3380dbd58) at util/virthreadpthread.c:117 > #2 0x00007fc3371af0eb in virThreadPoolWorker > (opaque=opaque@entry=0x7fc3380db640) at util/virthreadpool.c:103 > #3 0x00007fc3371ae686 in virThreadHelper (data=<optimized out>) at > util/virthreadpthread.c:161 > #4 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #5 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #6 0x0000000000000000 in ?? () > > > Thread 3 (Thread 0x7fc32ce77700 (LWP 29178)): > #0 0x00007fc33509c2d4 in pthread_cond_wait@@GLIBC_2.3.2 () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #1 0x00007fc3371ae9ea in virCondWait (c=c@entry=0x7fc3380dbe18, > m=m@entry=0x7fc3380dbd58) at util/virthreadpthread.c:117 > #2 0x00007fc3371af0eb in virThreadPoolWorker > (opaque=opaque@entry=0x7fc3380db870) at util/virthreadpool.c:103 > #3 0x00007fc3371ae686 in virThreadHelper (data=<optimized out>) at > util/virthreadpthread.c:161 > #4 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #5 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #6 0x0000000000000000 in ?? () > > > ---Type <return> to continue, or q <return> to quit--- > Thread 2 (Thread 0x7fc32c676700 (LWP 29179)): > #0 0x00007fc33509c2d4 in pthread_cond_wait@@GLIBC_2.3.2 () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #1 0x00007fc3371ae9ea in virCondWait (c=c@entry=0x7fc3380dbe18, > m=m@entry=0x7fc3380dbd58) at util/virthreadpthread.c:117 > #2 0x00007fc3371af0eb in virThreadPoolWorker > (opaque=opaque@entry=0x7fc3380db640) at util/virthreadpool.c:103 > #3 0x00007fc3371ae686 in virThreadHelper (data=<optimized out>) at > util/virthreadpthread.c:161 > #4 0x00007fc335097b50 in start_thread () > from /lib/x86_64-linux-gnu/libpthread.so.0 > #5 0x00007fc3349daa3d in clone () > from /lib/x86_64-linux-gnu/libc.so.6 > #6 0x0000000000000000 in ?? () > > > Thread 1 (Thread 0x7fc337c4d7c0 (LWP 29169)): > #0 0x0000000000000000 in ?? () > #1 0x00007fc32ace881e in libxl_osevent_occurred_timeout > (ctx=<optimized out>, for_libxl=0x7fc3380edf38) at libxl_event.c:1039 > #2 0x00007fc32af199c7 in libxlDomainObjTimerCallback > (timer=<optimized out>, timer_info=0x7fc3380e3310) at > libxl/libxl_domain.c:216 > #3 0x00007fc33717cf7d in virEventPollDispatchTimeouts () at > util/vireventpoll.c:451 > #4 virEventPollRunOnce () at util/vireventpoll.c:644 > #5 0x00007fc33717b70b in virEventRunDefaultImpl () at > util/virevent.c:274 > #6 0x00007fc3372b0065 in virNetServerRun (srv=0x7fc3380dbba0) at > rpc/virnetserver.c:1112 > #7 0x00007fc337c9851c in main (argc=<optimized out>, argv=<optimized > out>) at libvirtd.c:1513 > (gdb) > (gdb) > > > **** > > > regards, > cooldharma06. > > > On Thu, Dec 19, 2013 at 3:30 PM, Daniel P. Berrange > <berrange(a)redhat.com> wrote: > On Thu, Dec 19, 2013 at 03:09:14PM +0530, cool dharma06 wrote: > > I am newbie to this gdb debugging. now i did the bt in the > debugging. In my > > side still it showing the error. Following are the > stacktrace which i got. > > Kindly refer the following logs for full information: > > > > **** > > [New Thread 0x7f8503695700 (LWP 20012)] > > > > Program received signal SIGSEGV, Segmentation fault. > > 0x0000000000000000 in ?? () > > (gdb) bt > > #0 0x0000000000000000 in ?? () > > #1 0x00007f84f671281e in libxl_osevent_occurred_timeout > (ctx=<optimized > > out>, for_libxl=0x7f8503bbbc38) at libxl_event.c:1039 > > #2 0x00007f84f69439c7 in libxlDomainObjTimerCallback > (timer=<optimized > > out>, timer_info=0x7f8503bb5930) at libxl/libxl_domain.c:216 > > #3 0x00007f8502ba6f7d in virEventPollDispatchTimeouts () at > > util/vireventpoll.c:451 > > #4 virEventPollRunOnce () at util/vireventpoll.c:644 > > #5 0x00007f8502ba570b in virEventRunDefaultImpl () at > util/virevent.c:274 > > #6 0x00007f8502cda065 in virNetServerRun > (srv=0x7f8503ba6ba0) at > > rpc/virnetserver.c:1112 > > #7 0x00007f85036c251c in main (argc=<optimized out>, > argv=<optimized out>) > > at libvirtd.c:1513 > > (gdb) > > > In this case, that stack trace looks like it ought to be > sufficient > to identify the problem - a clear NULL pointer reference. In > general > though you want to capture a stack trace of all threads in a > program > > eg instead of 'bt', do 'thread apply all bt' next time. > > Regards, > 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 :| > > -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

4 5

[libvirt] JNA Error Callback could cause core dump.
by Benjamin Wang (gendwang) 20 Dec '13

20 Dec '13

Hi, When I changed code as following: public class Connect { // Load the native part static { Libvirt.INSTANCE.virInitialize(); try { ErrorHandler.processError(Libvirt.INSTANCE); } catch (Exception e) { e.printStackTrace(); } + Libvirt.INSTANCE.virSetErrorFunc(null, new ErrorCallback()); } The server will generate the following core dump: Program terminated with signal 6, Aborted. #0 0x0000003f9b030265 in raise () from /lib64/libc.so.6 (gdb) where #0 0x0000003f9b030265 in raise () from /lib64/libc.so.6 #1 0x0000003f9b031d10 in abort () from /lib64/libc.so.6 #2 0x0000003f9b06a84b in __libc_message () from /lib64/libc.so.6 #3 0x0000003f9b07230f in _int_free () from /lib64/libc.so.6 #4 0x0000003f9b07276b in free () from /lib64/libc.so.6 #5 0x00002aaaacf46868 in ?? () #6 0x0000000000000000 in ?? () The problem was caused that when JNA call setErrorFunc, it will create ErrorCallback object. But when GC is executed, the object is GCed. But even I change code as following. When GC is excuted, the callback object will be moved. Then C can't find this object. Both of scenarios will cause core dump. It seems that JNA mustn't provide ErrorCallback Class, Because nobody can use this. Please correct me. public class Connect { + private static final ErrorCallback callback = new ErrorCallback(); // Load the native part static { Libvirt.INSTANCE.virInitialize(); try { ErrorHandler.processError(Libvirt.INSTANCE); } catch (Exception e) { e.printStackTrace(); } + Libvirt.INSTANCE.virSetErrorFunc(null, callback); } B.R. Benjamin Wang

2 4

[libvirt] [PATCH] Block info query: Add flag to allow failure if not active
by John Ferlan 19 Dec '13

19 Dec '13

Currently the qemuDomainGetBlockInfo will return allocation == physical for most backing stores. For a qcow2 block backed device it's possible to return the highest lv extent allocated from qemu for an active guest. That is a value where allocation != physical and one would hope be less. However, if the guest is not running, then the code falls back to returning allocation == physical. This turns out to be problematic for rhev which monitors the size of the backing store. During a migration, before the VM has been started on the target and while it is deemed inactive on the source, allocation is returned as physical triggering the code to extend the file unnecessarily. Thus, this patch will check a new flag to the call to determine whether a failure should be returned to indicate to the caller that the code is unable to fetch the allocation value. This will allow the caller to decide how to proceed. Note that I chose not to return a failure as a more general rule mostly because of backwards compatability and current expectations reasons. Changing a default return action could be an unexpected action. Although returning allocation == physical perhaps is incorrect, it is how the code has been functioning. Having a 'virsh domblkinfo' return a failure for "some" inactive domains while succeeding for others could be confusing. A flag forces the caller to decide how to operate. As it turns out, there seems to be quite a bit of history regarding this. Details can be found in the BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1040507 Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NOTE: Trying to keep this as simple as possible since it needs to be backported. If someone has a better idea for a flag name - I'm open to suggestions... include/libvirt/libvirt.h.in | 23 ++++++++++++++++++++--- src/libvirt.c | 11 ++++++++++- src/qemu/qemu_driver.c | 33 +++++++++++++++++++++++++++------ 3 files changed, 57 insertions(+), 10 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 6f79c49..420642b 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2095,7 +2095,8 @@ int virDomainBlockResize (virDomainPtr dom, /** virDomainBlockInfo: * - * This struct provides information about the size of a block device backing store + * This struct provides information about the size of a block device + * backing store * * Examples: * @@ -2108,13 +2109,29 @@ int virDomainBlockResize (virDomainPtr dom, * * - qcow2 file in filesystem * * capacity: logical size from qcow2 header - * * allocation, physical: logical size of the file / highest qcow extent (identical) + * * allocation, physical: logical size of the file / + * highest qcow extent (identical) * * - qcow2 file in a block device * * capacity: logical size from qcow2 header - * * allocation: highest qcow extent written + * * allocation: highest qcow extent written for an active domain * * physical: size of the block device container */ + +/** + * virDomainGetBlockInfoFlags: + * + * Flags available for virDomainGetBlockInfo(). + */ +typedef enum { + VIR_DOMAIN_BLOCK_CHECK_ACTIVE = 1 << 0, /* If not active, then return + * failure when attempting to + * fetch data from an inactive + * domain, such as allocation + * from a qcow2 block device + */ +} virDomainGetBlockInfoFlags; + typedef struct _virDomainBlockInfo virDomainBlockInfo; typedef virDomainBlockInfo *virDomainBlockInfoPtr; struct _virDomainBlockInfo { diff --git a/src/libvirt.c b/src/libvirt.c index d15d617..2159eaf 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9027,7 +9027,7 @@ error: * @domain: a domain object * @disk: path to the block device, or device shorthand * @info: pointer to a virDomainBlockInfo structure allocated by the user - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise-OR of supported virDomainGetBlockInfoFlags * * Extract information about a domain's block device. * @@ -9038,6 +9038,15 @@ error: * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * + * If the VIR_DOMAIN_BLOCK_CHECK_ACTIVE flag is set, then for any block + * information data that could differ depending on whether the domain was + * active or not, the hypervisor will return a failure when the domain + * is deemed to be inactive or unable to provide the data, such as may be + * the case during a migration. For example, the 'allocation' value for + * a qcow2 block device backed storage can return the highest extent written. + * However, this can only be determined if the domain is active. For an + * inactive domain, the allocation and physical values would be returned + * as identical. * Returns 0 in case of success and -1 in case of failure. */ int diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45d11cd..6303ce2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9799,9 +9799,10 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, struct stat sb; int idx; int format; + int activeFail = false; virQEMUDriverConfigPtr cfg = NULL; - virCheckFlags(0, -1); + virCheckFlags(VIR_DOMAIN_BLOCK_CHECK_ACTIVE, -1); if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; @@ -9897,15 +9898,24 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, /* Set default value .. */ info->allocation = info->physical; - /* ..but if guest is running & not using raw - disk format and on a block device, then query - highest allocated extent from QEMU */ + /* ..but if guest is not using raw disk format and on a block device, + * then query highest allocated extent from QEMU + */ if (disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK && format != VIR_STORAGE_FILE_RAW && - S_ISBLK(sb.st_mode) && - virDomainObjIsActive(vm)) { + S_ISBLK(sb.st_mode)) { qemuDomainObjPrivatePtr priv = vm->privateData; + /* If the guest is not running, then success/failure return + * depends on whether the caller requested a failure on an + * inactive domain. + */ + if (!virDomainObjIsActive(vm)) { + activeFail = true; + ret = 0; + goto cleanup; + } + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; @@ -9916,6 +9926,7 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, &info->allocation); qemuDomainObjExitMonitor(driver, vm); } else { + activeFail = true; ret = 0; } @@ -9931,6 +9942,16 @@ cleanup: if (vm) virObjectUnlock(vm); virObjectUnref(cfg); + + /* If we failed to get data from a domain because it's inactive and + * this flag is set, then we'll return failure + */ + if (activeFail && (flags & VIR_DOMAIN_BLOCK_CHECK_ACTIVE)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("unable to get allocation, domain is not running")); + ret = -1; + } + return ret; } -- 1.8.3.1

3 4

[libvirt] [PATCH 0/2] event cleanup patches
by Eric Blake 19 Dec '13

19 Dec '13

Noticed these while working on another patch. Although it is mostly cosmetic, it is not small enough to push under the trivial rule, so I'll wait for a review. Eric Blake (2): docs: improve event-related documentation maint: improve debug of libvirt-{qemu,lxc} apis include/libvirt/libvirt.h.in | 36 +++++++++--- src/datatypes.c | 6 +- src/libvirt-lxc.c | 18 ++---- src/libvirt-qemu.c | 37 +++++-------- src/libvirt.c | 129 ++++--------------------------------------- src/libvirt_internal.h | 107 +++++++++++++++++++++++++++++++++++ 6 files changed, 168 insertions(+), 165 deletions(-) -- 1.8.4.2

2 8

[libvirt] [PATCH 1/3] Implementation deficiency in virInitctlSetRunLevel v2
by Reco 19 Dec '13

19 Dec '13

Hello, list. Refuse following symlinks in virInitctlSetRunLevel. A reasonable fallback for the next two patches, which apply fork-setns technique recommended on this list. --- src/util/virinitctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index 64bc23a..5cea992 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -139,7 +139,7 @@ int virInitctlSetRunLevel(virInitctlRunLevel level, return -1; } - if ((fd = open(path, O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY)) < 0) { + if ((fd = open(path, O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW)) < 0) { if (errno == ENOENT) { ret = 0; goto cleanup; -- 1.7.10.4

3 2

[libvirt] [PATCH] virkeycode: Allow ANSI_A
by Michal Privoznik 19 Dec '13

19 Dec '13

https://bugzilla.redhat.com/show_bug.cgi?id=1044806 Currently, sending the ANSI_A keycode from os_x codepage doesn't work as it has a special value of 0x0. Our internal code handles that no different to other not defined keycodes. Hence, in order to allow it we must change all the undefined keycodes from 0 to -1 and adapt some code too. # virsh send-key guestname --codeset os_x ANSI_A error: invalid keycode: 'ANSI_A' # virsh send-key guestname --codeset os_x ANSI_B # virsh send-key guestname --codeset os_x ANSI_C Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virkeycode-mapgen.py | 4 ++-- src/util/virkeycode.c | 4 ++-- tools/virsh-domain.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/virkeycode-mapgen.py b/src/util/virkeycode-mapgen.py index 22b21b4..8360bfe 100755 --- a/src/util/virkeycode-mapgen.py +++ b/src/util/virkeycode-mapgen.py @@ -86,12 +86,12 @@ for i in range(len(cols)): if isname: print "const char *virKeymapNames_" + name + "[] = {" else: - print "unsigned short virKeymapValues_" + name + "[] = {" + print "int virKeymapValues_" + name + "[] = {" for entry in keycodes: if isname: print " " + quotestring(entry[i] or "NULL") + "," else: - print " " + (entry[i] or "0") + "," + print " " + (entry[i] or "-1") + "," print "};\n" diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index 50594d6..7880a0a 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -50,7 +50,7 @@ static const char **virKeymapNames[] = { }; verify(ARRAY_CARDINALITY(virKeymapNames) == VIR_KEYCODE_SET_LAST); -static unsigned short *virKeymapValues[] = { +static int *virKeymapValues[] = { [VIR_KEYCODE_SET_LINUX] = virKeymapValues_linux, [VIR_KEYCODE_SET_XT] = @@ -113,7 +113,7 @@ int virKeycodeValueTranslate(virKeycodeSet from_codeset, { size_t i; - if (key_value <= 0) + if (key_value < 0) return -1; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 760dca5..b33b808 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7091,7 +7091,7 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd) } if ((keycode = vshKeyCodeGetInt(opt->data)) <= 0) { - if ((keycode = virKeycodeValueFromString(codeset, opt->data)) <= 0) { + if ((keycode = virKeycodeValueFromString(codeset, opt->data)) < 0) { vshError(ctl, _("invalid keycode: '%s'"), opt->data); goto cleanup; } -- 1.8.5.1

3 2

[libvirt] lvm storage pool destroy problem
by Umar Draz 19 Dec '13

19 Dec '13

Hi I am trying to stop the storage pool through php-libvirt api which is a LVM volume group. when I tried to stop it I got error error: internal error Child process (/sbin/vgchange -aln mylvmgrp) unexpected exit status 5: Can't deactivate volume group "mylvmgrp" with 4 open logical volume(s) Then I tried throggh virsh command but the result remain same. *root@kvm02:~# virsh pool-destroy vms* error: Failed to destroy pool vms error: internal error Child process (/sbin/vgchange -aln mylvmgrp) unexpected exit status 5: Can't deactivate volume group "mylvmgrp" with 4 open logical volume(s) The same error also occured if I use direct vgchange -aln on my kvm host, but then I tried *vgchange -aly mylvmgrp* this time its worked 14 logical volume(s) in volume group "mylvmgrp" now active 1) Now would you please help me? is this libvirt issue? or LVM? 2) Is this possible virsh pool-destroy pool also run the vgchange -aly instead of -aln Br. Umar

2 3

[libvirt] [PATCH 2/3] Implementation deficiency in virInitctlSetRunLevel v2
by Reco 19 Dec '13

19 Dec '13

Implement fork & setns for lxcDomainShutdownFlags --- src/lxc/lxc_driver.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c499182..9d200b2 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2619,6 +2619,50 @@ lxcDomainShutdownFlags(virDomainPtr dom, goto cleanup; } +#ifdef HAVE_SETNS + if (flags == 0 || flags & VIR_DOMAIN_SHUTDOWN_INITCTL) { + int pid = -1; + int status = -1; + int mfd = -1; + + if (virAsprintf(&vroot, "/proc/%llu/ns/mnt", + (unsigned long long)priv->initpid) < 0) { + goto cleanup; + } + + if ((mfd = open(vroot, O_RDONLY)) < 0) { + virReportSystemError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Kernel does not provide mount namespace")); + goto cleanup; + } + + switch (pid = fork()) { + case 0: + if (setns(mfd, 0) == -1) { + exit(-1); + } + rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_POWEROFF, NULL); + exit(rc); + break; + case -1: + virReportSystemError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Fork failed")); + goto cleanup; + default: + if (waitpid(pid, &status, 0) < 0 || status < 0) { + virReportSystemError(errno, + _("Sending shutdown failed with status %i"), + status); + rc = 0; + } else { + rc = status; + } + close(mfd); + } + } else { + rc = 0; + } +#else if (virAsprintf(&vroot, "/proc/%llu/root", (unsigned long long)priv->initpid) < 0) goto cleanup; @@ -2638,6 +2682,7 @@ lxcDomainShutdownFlags(virDomainPtr dom, } else { rc = 0; } +#endif if (rc == 0 && (flags == 0 || -- 1.7.10.4

2 1

[libvirt] [PATCH] storage: fix bogus target in gluster volume xml
by Eric Blake 19 Dec '13

19 Dec '13

Commit 6cd60b6 was flat out broken - it tried to print into the wrong variable. My testing was obviously too cursory (did the name get a slash added?); valgrind would have caught the error. Thankfully it didn't hit any release. Reported by Peter Krempa. * src/storage/storage_backend_gluster.c (virStorageBackendGlusterRefreshVol): Fix bogus code. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/storage/storage_backend_gluster.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 622526b..9aa692e 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -227,7 +227,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, goto cleanup; tmp = state->uri->path; - if (virAsprintf(&vol->key, "%s%s", state->uri->path, name) < 0) { + if (virAsprintf(&state->uri->path, "/%s", vol->key) < 0) { state->uri->path = tmp; goto cleanup; } -- 1.8.4.2

2 2

[libvirt] [PATCH 0/5] Fill qemucapabilitiesdata with some data
by Michal Privoznik 19 Dec '13

19 Dec '13

The actual patches are accessible at: git://gitorious.org/libvirt/michal-staging.git branch test_qemu_capabilities_data I'm not sending the actual patches as it's big junk of JSON qemu replies. The patches has from 35KiB to 59KiB. I don't want to overload the list. Michal Privoznik (5): qemucapabilitiesdata: Add qemu-1.2.2 data qemucapabilitiesdata: Add qemu-1.3.1 data qemucapabilitiesdata: Add qemu-1.4.2 data qemucapabilitiesdata: Add qemu-1.6.0 data qemucapabilitiesdata: Add qemu-1.6.50 data tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 114 + tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 1543 +++++++++++++ tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 128 ++ tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 1715 +++++++++++++++ tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 129 ++ tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 1765 +++++++++++++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 137 ++ tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 2499 ++++++++++++++++++++++ tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 136 ++ tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 2476 +++++++++++++++++++++ tests/qemucapabilitiestest.c | 5 + 11 files changed, 10647 insertions(+) create mode 100644 tests/qemucapabilitiesdata/caps_1.2.2-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_1.2.2-1.replies create mode 100644 tests/qemucapabilitiesdata/caps_1.3.1-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_1.3.1-1.replies create mode 100644 tests/qemucapabilitiesdata/caps_1.4.2-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_1.4.2-1.replies create mode 100644 tests/qemucapabilitiesdata/caps_1.6.0-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_1.6.0-1.replies create mode 100644 tests/qemucapabilitiesdata/caps_1.6.50-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_1.6.50-1.replies -- 1.8.1.5

3 9

[libvirt] [PATCH 3/3] Implementation deficiency in virInitctlSetRunLevel v2
by Reco 19 Dec '13

19 Dec '13

Implement fork & setns for lxcDomainShutdownFlags --- src/lxc/lxc_driver.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9d200b2..1227736 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2744,6 +2744,50 @@ lxcDomainReboot(virDomainPtr dom, goto cleanup; } +#ifdef HAVE_SETNS + if (flags == 0 || flags & VIR_DOMAIN_REBOOT_INITCTL) { + int pid = -1; + int status = -1; + int mfd = -1; + + if (virAsprintf(&vroot, "/proc/%llu/ns/mnt", + (unsigned long long)priv->initpid) < 0) { + goto cleanup; + } + + if ((mfd = open(vroot, O_RDONLY)) < 0) { + virReportSystemError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Kernel does not provide mount namespace")); + goto cleanup; + } + + switch (pid = fork()) { + case 0: + if (setns(mfd, 0) == -1) { + exit(-1); + } + rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_REBOOT, NULL); + exit(rc); + break; + case -1: + virReportSystemError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Fork failed")); + goto cleanup; + default: + if (waitpid(pid, &status, 0) < 0 || status < 0) { + virReportSystemError(errno, + _("Sending reboot failed with status %i"), + status); + rc = 0; + } else { + rc = status; + } + close(mfd); + } + } else { + rc = 0; + } +#else if (virAsprintf(&vroot, "/proc/%llu/root", (unsigned long long)priv->initpid) < 0) goto cleanup; @@ -2763,6 +2807,7 @@ lxcDomainReboot(virDomainPtr dom, } else { rc = 0; } +#endif if (rc == 0 && (flags == 0 || -- 1.7.10.4

1 0

[libvirt] [PATCH 1/3] Implementation deficiency in virInitctlSetRunLevel v2
by Reco 19 Dec '13

19 Dec '13

Hello, list. Refuse following symlinks in virInitctlSetRunLevel. A reasonable fallback for the next two patches, which apply fork-setns technique recommended on this list. --- src/util/virinitctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index 64bc23a..5cea992 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -139,7 +139,7 @@ int virInitctlSetRunLevel(virInitctlRunLevel level, return -1; } - if ((fd = open(path, O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY)) < 0) { + if ((fd = open(path, O_WRONLY|O_NONBLOCK|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW)) < 0) { if (errno == ENOENT) { ret = 0; goto cleanup; -- 1.7.10.4

1 0

[libvirt] [PATCH RFC 00/27] Native external gluster snapshots
by Peter Krempa 19 Dec '13

19 Dec '13

This series refactors and fixes stuff needed to support snapshots on gluster-backed vm's. The series is marked as RFC as docs for some of the changes are missing and I'd like to start code review while I'll figure out the docs. Peter Krempa (27): DO NOT APPLY UPSTREAM: Reproducer for disk snapshot crash qemu: snapshot: Avoid libvirtd crash when qemu crashes while snapshotting Revert "DO NOT APPLY UPSTREAM: Reproducer for disk snapshot crash" Revert "storage: fix omitted slash in gluster volume URI" storage: gluster: Properly fix missing slashes in volume paths snapshot: schema: Split out snapshot disk driver definition snapshot: Add support for specifying snapshot disk backing type snapshot: Test snapshot disk type specification storage: Add gluster pool filter and fix virsh pool listing storage: Avoid forward declaration of virStorageVolDelete storage: fs: Fix comment for virStorageBackendFileSystemDelete storage: Support deletion of volumes on gluster pools storage: lvm: Avoid forward decl of virStorageBackendLogicalDeleteVol storage: LVM: Separate creating of the volume from building storage: disk: Separate creating of the volume from building storage: RBD: Separate creating of the volume from building storage: Sheepdog: Separate creating of the volume from building storage: Introduce internal pool support storage: Add new argument for createVol backend API storage: gluster: Introduce dummy functions for creating a volume storage: Improve error message when a storage backend is missing maint: Fix messy include of libvirt_internal.h storage: Add internal API to create temporary storage pools and vols storage: Implement ephemeral storage APIs for local disk volumes storage: gluster: Support conversion of gluster volumes to temp volumes qemu: snapshot: Switch snapshot file deletion to the new storage API qemu: snapshot: Add support for external active snapshots on gluster docs/hvsupport.pl | 3 + docs/schemas/domainsnapshot.rng | 94 +++- include/libvirt/libvirt.h.in | 1 + src/Makefile.am | 3 +- src/check-aclrules.pl | 3 + src/check-drivername.pl | 1 + src/conf/snapshot_conf.c | 25 +- src/conf/snapshot_conf.h | 15 +- src/conf/storage_conf.c | 7 +- src/conf/storage_conf.h | 1 + src/driver.h | 14 + src/internal.h | 2 - src/libvirt_internal.c | 71 +++ src/libvirt_internal.h | 22 + src/libvirt_private.syms | 3 + src/libxl/libxl_conf.h | 1 + src/lxc/lxc_conf.h | 1 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 9 + src/qemu/qemu_driver.c | 274 +++++++++-- src/storage/storage_backend.c | 3 +- src/storage/storage_backend.h | 2 +- src/storage/storage_backend_disk.c | 47 +- src/storage/storage_backend_fs.c | 36 +- src/storage/storage_backend_gluster.c | 139 +++++- src/storage/storage_backend_logical.c | 129 ++--- src/storage/storage_backend_rbd.c | 42 +- src/storage/storage_backend_sheepdog.c | 32 +- src/storage/storage_driver.c | 597 +++++++++++++++++++---- src/uml/uml_conf.h | 1 + tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 18 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 18 + tools/virsh-pool.c | 9 +- 33 files changed, 1341 insertions(+), 284 deletions(-) create mode 100644 src/libvirt_internal.c -- 1.8.5.1

2 39

[libvirt] [PATCH] add --nocow option to vol-create and vol-clone
by Chunyan Liu 19 Dec '13

19 Dec '13

Btrfs has terrible performance when hosting VM images, even more when the guest in those VM are also using btrfs as file system. One way to mitigate this bad performance is to turn off COW attributes on VM files (since having copy on write for this kind of data is not useful). According to 'chattr' manpage, NOCOW could be set to new or empty file only on btrfs, so this patch tries to add a --nocow option to vol-create functions and vol-clone function, so that users could have a chance to set NOCOW to a new volume if that happens to create on a btrfs like file system. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- include/libvirt/libvirt.h.in | 1 + src/storage/storage_backend.c | 2 +- src/storage/storage_backend_fs.c | 49 ++++++++++++++++++++++++++++++++++++- src/storage/storage_driver.c | 6 +++- tools/virsh-volume.c | 26 ++++++++++++++++++- 5 files changed, 77 insertions(+), 7 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 5aad75c..0761ba6 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3151,6 +3151,7 @@ const char* virStorageVolGetKey (virStorageVolPtr vol); typedef enum { VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA = 1 << 0, + VIR_STORAGE_VOL_CREATE_NOCOW = 1 << 1, } virStorageVolCreateFlags; virStorageVolPtr virStorageVolCreateXML (virStoragePoolPtr pool, diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 57c1728..8ce7e99 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -423,7 +423,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED, operation_flags |= VIR_FILE_OPEN_FORK; if ((fd = virFileOpenAs(vol->target.path, - O_RDWR | O_CREAT | O_EXCL, + O_RDWR | O_CREAT, vol->target.perms.mode, vol->target.perms.uid, vol->target.perms.gid, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 11cf2df..d60b64c 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -51,6 +51,13 @@ #include "virfile.h" #include "virlog.h" #include "virstring.h" +#ifdef __linux__ +# include <sys/ioctl.h> +# include <linux/fs.h> +#ifndef FS_NOCOW_FL +#define FS_NOCOW_FL 0x00800000 /* Do not cow file */ +#endif +#endif #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -1090,6 +1097,42 @@ _virStorageBackendFileSystemVolBuild(virConnectPtr conn, return -1; } + if (flags & VIR_STORAGE_VOL_CREATE_NOCOW) { +#ifdef __linux__ + /* create an empty file and set nocow flag. + * This could optimize performance on file system like btrfs. + */ + int attr, fd; + int operation_flags = VIR_FILE_OPEN_FORCE_MODE | VIR_FILE_OPEN_FORCE_OWNER; + if (pool->def->type == VIR_STORAGE_POOL_NETFS) + operation_flags |= VIR_FILE_OPEN_FORK; + + if ((fd = virFileOpenAs(vol->target.path, + O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE, + vol->target.perms.mode, + vol->target.perms.uid, + vol->target.perms.gid, + operation_flags)) < 0) { + virReportSystemError(-fd, + _("Failed to create file '%s'"), + vol->target.path); + return -1; + } + + /* This is an optimisation. The FS_IOC_SETFLAGS ioctl return value will + * be ignored since any failure of this operation should not block the + * left work. + */ + if (ioctl(fd, FS_IOC_GETFLAGS, &attr) == 0) { + attr |= FS_NOCOW_FL; + ioctl(fd, FS_IOC_SETFLAGS, &attr); + } + + VIR_FORCE_CLOSE(fd); +#endif + flags &= ~VIR_STORAGE_VOL_CREATE_NOCOW; + } + if (create_func(conn, pool, vol, inputvol, flags) < 0) return -1; return 0; @@ -1106,7 +1149,8 @@ virStorageBackendFileSystemVolBuild(virConnectPtr conn, virStorageVolDefPtr vol, unsigned int flags) { - virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, -1); + virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA | + VIR_STORAGE_VOL_CREATE_NOCOW, -1); return _virStorageBackendFileSystemVolBuild(conn, pool, vol, NULL, flags); } @@ -1121,7 +1165,8 @@ virStorageBackendFileSystemVolBuildFrom(virConnectPtr conn, virStorageVolDefPtr inputvol, unsigned int flags) { - virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, -1); + virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA | + VIR_STORAGE_VOL_CREATE_NOCOW, -1); return _virStorageBackendFileSystemVolBuild(conn, pool, vol, inputvol, flags); } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 3b4715a..2aef1a7 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1509,7 +1509,8 @@ storageVolCreateXML(virStoragePoolPtr obj, virStorageVolPtr ret = NULL, volobj = NULL; virStorageVolDefPtr buildvoldef = NULL; - virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL); + virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA | + VIR_STORAGE_VOL_CREATE_NOCOW, NULL); storageDriverLock(driver); pool = virStoragePoolObjFindByUUID(&driver->pools, obj->uuid); @@ -1641,7 +1642,8 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, unsigned long long allocation; int buildret; - virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, NULL); + virCheckFlags(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA | + VIR_STORAGE_VOL_CREATE_NOCOW, NULL); storageDriverLock(driver); pool = virStoragePoolObjFindByUUID(&driver->pools, obj->uuid); diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 22b10d5..bfbcc1f 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -151,6 +151,10 @@ static const vshCmdOptDef opts_vol_create_as[] = { .type = VSH_OT_BOOL, .help = N_("preallocate metadata (for qcow2 instead of full allocation)") }, + {.name = "nocow", + .type = VSH_OT_BOOL, + .help = N_("turn off copy-on-write (for file on fs like btrfs)") + }, {.name = NULL} }; @@ -177,6 +181,8 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; + if (vshCommandOptBool(cmd, "nocow")) + flags |= VIR_STORAGE_VOL_CREATE_NOCOW; if (!(pool = vshCommandOptPool(ctl, cmd, "pool", NULL))) return false; @@ -330,6 +336,10 @@ static const vshCmdOptDef opts_vol_create[] = { .type = VSH_OT_BOOL, .help = N_("preallocate metadata (for qcow2 instead of full allocation)") }, + {.name = "nocow", + .type = VSH_OT_BOOL, + .help = N_("turn off copy-on-write (for file on fs like btrfs)") + }, {.name = NULL} }; @@ -345,6 +355,8 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; + if (vshCommandOptBool(cmd, "nocow")) + flags |= VIR_STORAGE_VOL_CREATE_NOCOW; if (!(pool = vshCommandOptPool(ctl, cmd, "pool", NULL))) return false; @@ -408,6 +420,10 @@ static const vshCmdOptDef opts_vol_create_from[] = { .type = VSH_OT_BOOL, .help = N_("preallocate metadata (for qcow2 instead of full allocation)") }, + {.name = "nocow", + .type = VSH_OT_BOOL, + .help = N_("turn off copy-on-write (for file on fs like btrfs)") + }, {.name = NULL} }; @@ -426,7 +442,8 @@ cmdVolCreateFrom(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; - + if (vshCommandOptBool(cmd, "nocow")) + flags |= VIR_STORAGE_VOL_CREATE_NOCOW; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) goto cleanup; @@ -521,6 +538,10 @@ static const vshCmdOptDef opts_vol_clone[] = { .type = VSH_OT_BOOL, .help = N_("preallocate metadata (for qcow2 instead of full allocation)") }, + {.name = "nocow", + .type = VSH_OT_BOOL, + .help = N_("turn off copy-on-write (for file on fs like btrfs)") + }, {.name = NULL} }; @@ -540,7 +561,8 @@ cmdVolClone(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "prealloc-metadata")) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; - + if (vshCommandOptBool(cmd, "nocow")) + flags |= VIR_STORAGE_VOL_CREATE_NOCOW; origpool = virStoragePoolLookupByVolume(origvol); if (!origpool) { vshError(ctl, "%s", _("failed to get parent pool")); -- 1.6.0.2

3 6

[libvirt] [v8 0/6]Write separate module for hostdev passthrough
by Chunyan Liu 19 Dec '13

19 Dec '13

These patches implements a separate module for hostdev passthrough so that it could be shared by different drivers and can maintain a global state of a host device. patch 1/6: extract hostdev passthrough function from qemu_hostdev.c and make it reusable by multiple drivers. patch 2/6: add a unit test for hostdev common library. patch 3/6: switch qemu driver to use the common library instead of its own hostdev passthrough APIs. patch 4/6: switch lxc driver to use the common library instead of its own hostdev passthrough APIs. patch 5/6: add a hostdev pci backend type for xen usage. patch 6/6: add pci passthrough to libxl driver. --- Changes: * fix v7 comments * reorganize order of patches * rebase to latest source code Chunyan Liu (6): add hostdev passthrough common library add a unit test for hostdev common library change qemu driver to use hostdev common library change lxc driver to use hostdev common library add hostdev pci backend type for xen add pci passthrough to libxl driver docs/schemas/domaincommon.rng | 1 + po/POTFILES.in | 3 +- src/Makefile.am | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 21 + src/libxl/libxl_conf.c | 63 + src/libxl/libxl_conf.h | 4 + src/libxl/libxl_domain.c | 9 + src/libxl/libxl_driver.c | 448 +++++- src/lxc/lxc_conf.h | 4 - src/lxc/lxc_driver.c | 47 +- src/lxc/lxc_hostdev.c | 413 ----- src/lxc/lxc_hostdev.h | 43 - src/lxc/lxc_process.c | 24 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_conf.h | 9 +- src/qemu/qemu_domain.c | 22 + src/qemu/qemu_driver.c | 81 +- src/qemu/qemu_hostdev.c | 1454 ----------------- src/qemu/qemu_hostdev.h | 76 - src/qemu/qemu_hotplug.c | 136 +- src/qemu/qemu_process.c | 40 +- src/util/virhostdev.c | 1703 ++++++++++++++++++++ src/util/virhostdev.h | 134 ++ src/util/virpci.c | 30 +- src/util/virpci.h | 9 +- src/util/virscsi.c | 28 +- src/util/virscsi.h | 8 +- src/util/virusb.c | 29 +- src/util/virusb.h | 8 +- tests/Makefile.am | 5 + .../qemuxml2argv-hostdev-pci-address.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 2 + tests/virhostdevtest.c | 481 ++++++ tests/virpcimock.c | 45 +- 37 files changed, 3181 insertions(+), 2212 deletions(-) delete mode 100644 src/lxc/lxc_hostdev.c delete mode 100644 src/lxc/lxc_hostdev.h delete mode 100644 src/qemu/qemu_hostdev.c delete mode 100644 src/qemu/qemu_hostdev.h create mode 100644 src/util/virhostdev.c create mode 100644 src/util/virhostdev.h create mode 100644 tests/virhostdevtest.c

1 6

[libvirt] [v7 0/6] Write separate module for hostdev passthrough
by Chunyan Liu 19 Dec '13

19 Dec '13

These patches implements a separate module for hostdev passthrough so that it could be shared by different drivers and can maintain a global state of a host device. patch 1/6: extract hostdev passthrough function from qemu_hostdev.c and make it reusable by multiple drivers. patch 2/6: switch qemu driver to use the common library instead of its own hostdev passthrough APIs. patch 3/6: switch lxc driver to use the common library instead of its own hostdev passthrough APIs. patch 4/6: add a unit test for hostdev common library, based on virpcimock. patch 5/6: add a hostdev pci backend type for xen usage. For xen, the default stub driver would be 'pciback'. patch 6/6: add pci passthrough to libxl driver. --- Changes: * fix v6 comments * rebase to latest source code * add unit test for hostdev common library Chunyan Liu (6): add hostdev passthrough common library change qemu driver to use hostdev common library change lxc driver to use hostdev common library add unit test for hostdev common library add hostdev pci backend type for xen add pci passthrough to libxl driver docs/schemas/domaincommon.rng | 1 + po/POTFILES.in | 3 +- src/Makefile.am | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 21 + src/libxl/libxl_conf.c | 63 ++ src/libxl/libxl_conf.h | 4 + src/libxl/libxl_domain.c | 9 + src/libxl/libxl_driver.c | 448 +++++++++++- src/lxc/lxc_conf.h | 4 - src/lxc/lxc_driver.c | 47 +- src/lxc/lxc_hostdev.c | 413 ---------- src/lxc/lxc_hostdev.h | 43 - src/lxc/lxc_process.c | 24 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_conf.h | 9 +- src/qemu/qemu_domain.c | 22 + src/qemu/qemu_driver.c | 81 +-- src/qemu/qemu_hostdev.c | 1454 ----------------------------------- src/qemu/qemu_hostdev.h | 76 -- src/qemu/qemu_hotplug.c | 136 ++-- src/qemu/qemu_process.c | 40 +- src/util/virhostdev.c | 1703 +++++++++++++++++++++++++++++++++++++++++ src/util/virhostdev.h | 134 ++++ src/util/virpci.c | 30 +- src/util/virpci.h | 9 +- src/util/virscsi.c | 28 +- src/util/virscsi.h | 8 +- src/util/virusb.c | 29 +- src/util/virusb.h | 8 +- tests/Makefile.am | 5 + tests/virhostdevtest.c | 481 ++++++++++++ tests/virpcimock.c | 45 ++- 34 files changed, 3177 insertions(+), 2212 deletions(-) delete mode 100644 src/lxc/lxc_hostdev.c delete mode 100644 src/lxc/lxc_hostdev.h delete mode 100644 src/qemu/qemu_hostdev.c delete mode 100644 src/qemu/qemu_hostdev.h create mode 100644 src/util/virhostdev.c create mode 100644 src/util/virhostdev.h create mode 100644 tests/virhostdevtest.c

2 11

[libvirt] Implementation deficiency in virInitctlSetRunLevel
by Reco 18 Dec '13

18 Dec '13

Hello, list. I was pointed here by maintainer of libvirt package in Debian, Guido Günther. For the sake of completeness, the original bug report can be viewed at this link: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732394 To sum up the bug report, current implementation of virInitctlSetRunLevel function (src/util/virinitctl.c) lacks any sanity checks before writing to container's /dev/initctl. In the absence of such checks, libvirtd can be easily tricked to write runlevel check request to an arbitrary main hosts' file (including hosts' /run/initctl, as described in the bug report). All it takes is one symlink in place of containers' /dev/initctl. I've checked current libvirtd's git, and it seems to me that the problem is still here. Attached to this letter is a patch which tries to mitigate the issue by checking whenever container's /dev/initctl is a pipe actually. Sincerely yours, Reco PS I'm not subscribed to this list, in case of further questions please CC me.

4 6

[libvirt] [PATCH] Remove stray semicolon after pragma macros
by Daniel P. Berrange 18 Dec '13

18 Dec '13

The VIR_WARNINGS_NO_CAST_ALIGN / VIR_WARNINGS_RESET should not have any trailing ';' since they are pragmas. The use of a ';' results in an empty statement which confuses CIL. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nwfilter/nwfilter_dhcpsnoop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index e8fcfef..a96a790 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -981,9 +981,9 @@ virNWFilterSnoopDHCPDecode(virNWFilterSnoopReqPtr req, /* go through the protocol headers */ switch (ntohs(pep->eh_type)) { case ETHERTYPE_IP: - VIR_WARNINGS_NO_CAST_ALIGN; + VIR_WARNINGS_NO_CAST_ALIGN pip = (struct iphdr *) pep->eh_data; - VIR_WARNINGS_RESET; + VIR_WARNINGS_RESET len -= offsetof(virNWFilterSnoopEthHdr, eh_data); break; default: -- 1.8.4.2

2 1

[libvirt] [PATCH 0/2] undefine with storage fixes
by Peter Krempa 18 Dec '13

18 Dec '13

Two fixes related to the virsh undefine --storage command. Peter Krempa (2): virsh: man: Mention that volumes need to be in storage pool for undefine virsh: domain: Fix undefine with storage of 'volume' disks tools/virsh-domain.c | 36 ++++++++++++++++++++++++++++++++++-- tools/virsh.pod | 3 ++- 2 files changed, 36 insertions(+), 3 deletions(-) -- 1.8.5.1

2 6

[libvirt] [PATCH] Fix crash in virsystemdtest with dbus 1.7.6
by Cédric Bosdonnat 18 Dec '13

18 Dec '13

D-bus introduced some changes in its locking code. Overriding the init function skips the new locking init and thus crashes later in libvirt test. Removing the function makes the test pass again. --- tests/virsystemdmock.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c index b8fc031..b3b82b4 100644 --- a/tests/virsystemdmock.c +++ b/tests/virsystemdmock.c @@ -31,11 +31,6 @@ void dbus_connection_set_change_sigpipe(dbus_bool_t will_modify_sigpipe ATTRIBUT { } -dbus_bool_t dbus_threads_init_default(void) -{ - return 1; -} - DBusConnection *dbus_bus_get(DBusBusType type ATTRIBUTE_UNUSED, DBusError *error ATTRIBUTE_UNUSED) { -- 1.8.4.4

3 3

[libvirt] python pypi package - backport older version?
by Jason Antman 18 Dec '13

18 Dec '13

Hello, First off, thanks for the wonderful project, and thanks even more for all of the excellent work on the Python bindings lately. I'm working on a small project to collect data on kvm hosts/guests via a python collector client and display the data in a web interface. It works beautifully when using my various distros' OS packages for libvirt-python, but I've hit a bit of a snag when trying to do automated testing. I'm quite happy to see libvirt-python packaged as a python package and on pypi, but the version there is 1.2.0, which requires libvirt >= 0.9.11. Unfortunately, I was planning to test my python app on travis-ci, which runs Ubuntu Precise (12.04 LTS), and the latest version of libvirt for that is 0.9.8 (package python-libvirt 0.9.8-2ubuntu17.13). If I were to submit a patch, would there be any interest in me backporting the setup.py/packaging work to an older version of the python bindings - say 0.9.8 - and getting it published on pypi? Thanks, Jason Antman CMGdigital Atlanta, GA

2 3

[libvirt] [PATCH v2] libxl: libxl_get_max_cpus returning a libxl error from 4.4 onward
by Dario Faggioli 18 Dec '13

18 Dec '13

Starting from commit 2e82c18c in Xen (will be included in Xen 4.4) both libxl_get_max_cpus() and libxl_get_max_ndoes() start returning a proper libxl error code, in case of failure. This patch fixes this in the libxl driver. Note that, although it is now basically impossible for them to return 0, that would, theoretically, still be wrong. Also, checking that the returned value is '<= 0' makes the code correct for both Xen 4.4 and Xen 4.3 (and 4.2), and that is why we go for it (rather than just '< 0'). Signed-off-by: Dario Faggioli <dario.faggioli(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> Cc: Ian Jackson <Ian.Jackson(a)eu.citrix.com> Cc: Martin Kletzander <mkletzan(a)redhat.com> --- Changes from v1: * taking care of libxl_get_max_nodes() too --- src/libxl/libxl_driver.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 692c3b7..29aa6c7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1101,9 +1101,11 @@ libxlConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) cfg = libxlDriverConfigGet(driver); ret = libxl_get_max_cpus(cfg->ctx); - /* libxl_get_max_cpus() will return 0 if there were any failures, - e.g. xc_physinfo() failing */ - if (ret == 0) + /* On failure, libxl_get_max_cpus() will return ERROR_FAIL from Xen 4.4 + * onward, but it ever returning 0 is obviously wrong too (and it is + * what happens, on failure, on Xen 4.3 and earlier). Therefore, a 'less + * or equal' is the catchall we want. */ + if (ret <= 0) ret = -1; virObjectUnref(cfg); @@ -3980,6 +3982,7 @@ libxlDomainGetNumaParameters(virDomainPtr dom, for (i = 0; i < LIBXL_NUMA_NPARAM && i < *nparams; i++) { virMemoryParameterPtr param = &params[i]; + int numnodes; switch (i) { case 0: @@ -3998,8 +4001,12 @@ libxlDomainGetNumaParameters(virDomainPtr dom, /* Node affinity */ /* Let's allocate both libxl and libvirt bitmaps */ + numnodes = libxl_get_max_nodes(priv->ctx); + if (numnodes <= 0) + goto cleanup; + if (libxl_node_bitmap_alloc(priv->ctx, &nodemap, 0) || - !(nodes = virBitmapNew(libxl_get_max_nodes(priv->ctx)))) { + !(nodes = virBitmapNew(numnodes))) { virReportOOMError(); goto cleanup; }

2 2

[libvirt] [PATCH] Remove redefinition of bool type when --enable-test-locking
by Daniel P. Berrange 18 Dec '13

18 Dec '13

Old versions of CIL did not understand the 'bool' data type, but at least 1.7.3 does now cope. We can remove the old hack which redefined bool and no longer compiles successfully. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5446634..675f1fc 100644 --- a/configure.ac +++ b/configure.ac @@ -2129,7 +2129,7 @@ AC_ARG_ENABLE([test-locking], enable_locking=$enableval if test "$enable_locking" = "yes"; then - LOCK_CHECKING_CFLAGS="-Dbool=char -D_Bool=char -save-temps" + LOCK_CHECKING_CFLAGS="-save-temps" AC_SUBST([LOCK_CHECKING_CFLAGS]) fi AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"]) -- 1.8.4.2

2 1

[libvirt] libxl: cannot connect to PV console
by Dario Faggioli 18 Dec '13

18 Dec '13

Hey Jim, I'm on libvirt.git's trunk and I see the following: [xen@ghoul3 libvirt.git]$ sudo ./tools/virsh list Id Name State ---------------------------------------------------- 3 debian_32 running 4 fedora20_64 running [xen@ghoul3 libvirt.git]$ sudo ./tools/virsh console debian_32 Connected to domain debian_32 Escape character is ^] error: internal error: cannot find character device (null) [xen@ghoul3 libvirt.git]$ sudo ./tools/virsh console fedora20_64 Connected to domain fedora20_64 Escape character is ^] error: internal error: cannot find character device (null) And this: [xen@ghoul3 libvirt.git]$ sudo ./daemon/libvirtd -v [sudo] password for xen: 2013-12-17 13:19:35.366+0000: 22124: info : libvirt version: 1.2.1 2013-12-17 14:00:06.587+0000: 22122: error : libxlDomainOpenConsole:3885 : internal error: cannot find character device (null) 2013-12-17 14:00:15.705+0000: 22125: error : libxlDomainOpenConsole:3885 : internal error: cannot find character device (null) What I have in /var/log/libvirt/libxl does not look useful, while below it comes my xenstore-ls. What is it that is going wrong? [xen@ghoul3 libvirt.git]$ sudo xenstore-ls tool = "" xenstored = "" local = "" domain = "" 0 = "" name = "Domain-0" domid = "0" device-model = "" 0 = "" state = "running" memory = "" target = "13118716" static-max = "4294967292" freemem-slack = "317576" libxl = "" disable_udev = "1" backend = "" vbd = "" 3 = "" 51712 = "" frontend = "/local/domain/3/device/vbd/51712" params = "/dev/fedora_ghoul3/debian_32" script = "/etc/xen/scripts/block" physical-device = "fd:2" frontend-id = "3" online = "1" removable = "1" bootable = "1" state = "4" dev = "xvda" type = "phy" mode = "w" device-type = "disk" feature-flush-cache = "1" feature-discard = "0" feature-barrier = "1" feature-persistent = "1" feature-max-indirect-segments = "256" sectors = "10485760" info = "0" sector-size = "512" physical-sector-size = "512" 4 = "" 51712 = "" frontend = "/local/domain/4/device/vbd/51712" params = "/dev/fedora_ghoul3/fedora20_64" script = "/etc/xen/scripts/block" physical-device = "fd:3" frontend-id = "4" online = "1" removable = "1" bootable = "1" state = "4" dev = "xvda" type = "phy" mode = "w" device-type = "disk" feature-flush-cache = "1" feature-discard = "0" feature-barrier = "1" feature-persistent = "1" feature-max-indirect-segments = "256" sectors = "10485760" info = "0" sector-size = "512" physical-sector-size = "512" console = "" 3 = "" 0 = "" frontend = "/local/domain/3/console" frontend-id = "3" online = "1" state = "1" domain = "debian_32" protocol = "vt100" 4 = "" 0 = "" frontend = "/local/domain/4/console" frontend-id = "4" online = "1" state = "1" domain = "fedora20_64" protocol = "vt100" vif = "" 3 = "" 0 = "" frontend = "/local/domain/3/device/vif/0" frontend-id = "3" online = "1" state = "4" script = "/etc/xen/scripts/vif-bridge" mac = "00:16:3e:9f:ea:e6" bridge = "virbr0" handle = "0" type = "vif" feature-sg = "1" feature-gso-tcpv4 = "1" feature-rx-copy = "1" feature-rx-flip = "0" feature-split-event-channels = "1" hotplug-status = "connected" 4 = "" 0 = "" frontend = "/local/domain/4/device/vif/0" frontend-id = "4" online = "1" state = "4" script = "/etc/xen/scripts/vif-bridge" mac = "00:16:3e:a8:fd:05" bridge = "virbr0" handle = "0" type = "vif" feature-sg = "1" feature-gso-tcpv4 = "1" feature-rx-copy = "1" feature-rx-flip = "0" feature-split-event-channels = "1" hotplug-status = "connected" 3 = "" vm = "/vm/d3c586b2-f26d-4671-a6b3-6782fa01f49f" name = "debian_32" cpu = "" 0 = "" availability = "online" 1 = "" availability = "online" memory = "" static-max = "1048576" target = "1048577" videoram = "-1" device = "" suspend = "" event-channel = "" vbd = "" 51712 = "" backend = "/local/domain/0/backend/vbd/3/51712" backend-id = "0" state = "4" virtual-device = "51712" device-type = "disk" protocol = "x86_32-abi" ring-ref = "8" event-channel = "15" feature-persistent = "1" vif = "" 0 = "" backend = "/local/domain/0/backend/vif/3/0" backend-id = "0" state = "4" handle = "0" mac = "00:16:3e:9f:ea:e6" tx-ring-ref = "9" rx-ring-ref = "10" event-channel-tx = "16" event-channel-rx = "17" request-rx-copy = "1" feature-rx-notify = "1" feature-sg = "1" feature-gso-tcpv4 = "1" control = "" shutdown = "" platform-feature-multiprocessor-suspend = "1" platform-feature-xs_reset_watches = "1" data = "" domid = "3" store = "" port = "1" ring-ref = "1353957" console = "" backend = "/local/domain/0/backend/console/3/0" backend-id = "0" limit = "1048576" type = "xenconsoled" output = "pty" tty = "/dev/pts/2" port = "2" ring-ref = "2366273" 4 = "" vm = "/vm/d02acb9a-e99e-42ca-b2a4-9e32a65b9a0f" name = "fedora20_64" cpu = "" 0 = "" availability = "online" 1 = "" availability = "online" memory = "" static-max = "2097152" target = "2097153" videoram = "-1" device = "" suspend = "" event-channel = "" vbd = "" 51712 = "" backend = "/local/domain/0/backend/vbd/4/51712" backend-id = "0" state = "4" virtual-device = "51712" device-type = "disk" protocol = "x86_64-abi" ring-ref = "8" event-channel = "15" feature-persistent = "1" vif = "" 0 = "" backend = "/local/domain/0/backend/vif/4/0" backend-id = "0" state = "4" handle = "0" mac = "00:16:3e:a8:fd:05" tx-ring-ref = "135" rx-ring-ref = "136" event-channel-tx = "16" event-channel-rx = "17" request-rx-copy = "1" feature-rx-notify = "1" feature-sg = "1" feature-gso-tcpv4 = "1" control = "" shutdown = "" platform-feature-multiprocessor-suspend = "1" platform-feature-xs_reset_watches = "1" data = "" domid = "4" store = "" port = "1" ring-ref = "2486615" console = "" backend = "/local/domain/0/backend/console/4/0" backend-id = "0" limit = "1048576" type = "xenconsoled" output = "pty" tty = "/dev/pts/4" port = "2" ring-ref = "1364170" vm = "" 00000000-0000-0000-0000-000000000000 = "" memory = "12811" d3c586b2-f26d-4671-a6b3-6782fa01f49f = "" uuid = "d3c586b2-f26d-4671-a6b3-6782fa01f49f" name = "debian_32" image = "" ostype = "linux" kernel = "/var/run/xen/bootloader.3.d/boot_kernel.eYl1YW" ramdisk = "/var/run/xen/bootloader.3.d/boot_ramdisk.BxZLo9" cmdline = "root=UUID=9df3cd14-ed12-4cee-a252-d0cd29f75b55 ro quiet" start_time = "1387288160.47" d02acb9a-e99e-42ca-b2a4-9e32a65b9a0f = "" uuid = "d02acb9a-e99e-42ca-b2a4-9e32a65b9a0f" name = "fedora20_64" image = "" ostype = "linux" kernel = "/var/run/xen/bootloader.4.d/boot_kernel.w1Ntxo" ramdisk = "/var/run/xen/bootloader.4.d/boot_ramdisk.XU7an0" cmdline = "root=/dev/mapper/fedora-root ro rd.lvm.lv=fedora/swap rd.lvm.lv=fedora/root vconsole.font=latarcyrheb-sun16 LANG=en_US.UTF-8" start_time = "1387288245.20" libxl = "" 3 = "" dm-version = "qemu_xen" 4 = "" dm-version = "qemu_xen" Regards, Dario -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

3 4

[libvirt] [PATCH] build: fix building with '--enable-test-locking'
by Martin Kletzander 18 Dec '13

18 Dec '13

When test-locking is enabled, CFLAGS have -Dbool=char, which makes pipefd[bool] fail (obviously). Forcing the subscript to be bool by double negation fixes the build breaker. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I still can't build with '--enable-test-locking' and I'm not sure this is the proper way to fix it. Also, the code wasn't touched for months, so I'm not pushing it as a build-breaker. src/util/virfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 631cd06..88674ec 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -262,7 +262,7 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) } VIR_FORCE_CLOSE(*fd); - *fd = pipefd[output]; + *fd = pipefd[!!output]; return ret; error: -- 1.8.5.1

3 6

[libvirt] libvirt live modify
by Umar Draz 18 Dec '13

18 Dec '13

Hi Can we modify a Virtual machine while its running, I want to update the <discription> and <title> Br. Umar

4 13

[libvirt] [PATCHv3] qemu: ask for -enable-fips when FIPS is required
by Eric Blake 18 Dec '13

18 Dec '13

On a system that is enforcing FIPS, most libraries honor the current mode by default. Qemu, on the other hand, refused to honor FIPS mode unless you add the '-enable-fips' command line option; worse, this option is not discoverable via QMP, and is only present on binaries built for Linux. So, if we detect FIPS mode, then we unconditionally ask for FIPS; either qemu is new enough to have the option and then correctly cripple insecure VNC passwords, or it is so old that we are correctly avoiding a FIPS violation by preventing qemu from starting. Meanwhile, if we don't detect FIPS mode, then omitting the argument is safe whether the qemu has the option (but it would do nothing because FIPS is disabled) or whether qemu lacks the option (including in the case where we are not running on Linux). The testsuite was a bit interesting: we don't want our test to depend on whether it is being run in FIPS mode, so I had to tweak things to set the capability bit outside of our normal interaction with capability parsing. This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1035474 * src/qemu/qemu_capabilities.h (QEMU_CAPS_ENABLE_FIPS): New bit. * src/qemu/qemu_capabilities.c (virQEMUCapsInitQMP): Conditionally set capability according to detection of FIPS mode. * src/qemu/qemu_command.c (qemuBuildCommandLine): Use it. * tests/qemucapabilitiestest.c (testQemuCaps): Conditionally set capability to test expected output. * tests/qemucapabilitiesdata/caps_1.2.2-1.caps: Update list. * tests/qemucapabilitiesdata/caps_1.6.0-1.caps: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v3: use virFileReadAll correctly src/qemu/qemu_capabilities.c | 27 ++++++++++++++++++++++++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 2 ++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiestest.c | 20 +++++++++++++++----- 6 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5e9c65e..4f64f87 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -245,7 +245,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "kvm-pit-lost-tick-policy", "boot-strict", /* 160 */ - "pvpanic", /* 161 */ + "pvpanic", + "enable-fips", ); struct _virQEMUCaps { @@ -2630,6 +2631,30 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, config.data.nix.path = monpath; config.data.nix.listen = false; + /* Qemu 1.2 and later have a binary flag -enable-fips that must be + * used for VNC auth to obey FIPS settings; but the flag only + * exists on Linux, and with no way to probe for it via QMP. Our + * solution: if FIPS mode is required, then unconditionally use + * the flag, regardless of qemu version, for the following matrix: + * + * old QEMU new QEMU + * FIPS enabled doesn't start VNC auth disabled + * FIPS disabled/missing VNC auth enabled VNC auth enabled + * + * Setting the flag here instead of in virQEMUCapsInitQMPMonitor + * or virQEMUCapsInitHelp also allows the testsuite to be + * independent of FIPS setting. + */ + if (virFileExists("/proc/sys/crypto/fips_enabled")) { + char *buf = NULL; + + if (virFileReadAll("/proc/sys/crypto/fips_enabled", 10, &buf) < 0) + goto cleanup; + if (STREQ(buf, "1\n")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_FIPS); + VIR_FREE(buf); + } + VIR_DEBUG("Try to get caps via QMP qemuCaps=%p", qemuCaps); /* diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index bbf4972..efb3f43 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -200,6 +200,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ QEMU_CAPS_DEVICE_PANIC = 161, /* -device pvpanic */ + QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a80559e..d723dc8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7747,6 +7747,8 @@ qemuBuildCommandLine(virConnectPtr conn, } } virCommandAddArg(cmd, "-S"); /* freeze CPU */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ENABLE_FIPS)) + virCommandAddArg(cmd, "-enable-fips"); if (qemuBuildMachineArgStr(cmd, def, qemuCaps) < 0) goto error; diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index 73a561d..c3ae814 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -112,4 +112,5 @@ <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index c7ce591..2d50cf9 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -138,4 +138,5 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='reboot-timeout'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index d912171..3b34f78 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -31,6 +31,7 @@ typedef testQemuData *testQemuDataPtr; struct _testQemuData { virDomainXMLOptionPtr xmlopt; const char *base; + bool fips; }; static qemuMonitorTestPtr @@ -192,6 +193,12 @@ testQemuCaps(const void *opaque) qemuMonitorTestGetMonitor(mon)) < 0) goto cleanup; + /* So that our test does not depend on the contents of /proc, we + * hoisted the setting of ENABLE_FIPS to virQEMUCapsInitQMP. But + * we do want to test the effect of that flag. */ + if (data->fips) + virQEMUCapsSet(capsComputed, QEMU_CAPS_ENABLE_FIPS); + if (testQemuCapsCompare(capsProvided, capsComputed) < 0) goto cleanup; @@ -227,16 +234,19 @@ mymain(void) data.xmlopt = xmlopt; -#define DO_TEST(name) \ - data.base = name; \ - if (virtTestRun(name, testQemuCaps, &data) < 0) \ +#define DO_TEST_FULL(name, use_fips) \ + data.base = name; \ + data.fips = use_fips; \ + if (virtTestRun(name, testQemuCaps, &data) < 0) \ ret = -1 - DO_TEST("caps_1.2.2-1"); +#define DO_TEST(name) DO_TEST_FULL(name, false) + + DO_TEST_FULL("caps_1.2.2-1", true); DO_TEST("caps_1.3.1-1"); DO_TEST("caps_1.4.2-1"); DO_TEST("caps_1.5.3-1"); - DO_TEST("caps_1.6.0-1"); + DO_TEST_FULL("caps_1.6.0-1", true); DO_TEST("caps_1.6.50-1"); virObjectUnref(xmlopt); -- 1.8.4.2

2 2

[libvirt] [PATCH] Fix race leading to crash when setting up dbus watches
by Daniel P. Berrange 18 Dec '13

18 Dec '13

Currently the virDBusAddWatch does virEventAddHandle(fd, flags, virDBusWatchCallback, watch, NULL); dbus_watch_set_data(watch, info, virDBusWatchFree); Unfortunately this is racy - since the event loop is in a different thread, the virDBusWatchCallback method may be run before we get to calling dbus_watch_set_data. We must reverse the order of these calls See https://bugzilla.redhat.com/show_bug.cgi?id=885445 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virdbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 4e4c267..a0cbbfe 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -238,15 +238,15 @@ static dbus_bool_t virDBusAddWatch(DBusWatch *watch, # else fd = dbus_watch_get_fd(watch); # endif + dbus_watch_set_data(watch, info, virDBusWatchFree); info->bus = (DBusConnection *)data; info->watch = virEventAddHandle(fd, flags, virDBusWatchCallback, watch, NULL); if (info->watch < 0) { - VIR_FREE(info); + dbus_watch_set_data(watch, NULL, NULL); return 0; } - dbus_watch_set_data(watch, info, virDBusWatchFree); return 1; } -- 1.8.4.2

2 1

[libvirt] [PATCH] configure: make --with-test-suite work
by Martin Kletzander 18 Dec '13

18 Dec '13

Our option '--with-test-suite' could have never worked since it was defined as AC_ARG_ENABLE([with-test-suite], ...), thus working only as '--enable-with-test-suite', but documented in configure.ac as AC_HELP_STRING([--with-test-suite], ...). In my optinion, the help string is as it should be, but the option is wrong. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- configure.ac | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 5446634..2ebb941 100644 --- a/configure.ac +++ b/configure.ac @@ -2035,14 +2035,14 @@ dnl Allow perl/python overrides AC_PATH_PROGS([PYTHON], [python2 python]) AC_PATH_PROG([PERL], [perl]) -AC_ARG_ENABLE([with-test-suite], - [AS_HELP_STRING([--with-test-suite], - [build test suite by default @<:@default=check@:>@])], - [case "${withval}" in - yes|no|check) ;; - *) AC_MSG_ERROR([bad value ${withval} for tests option]) ;; - esac], - [withval=check]) +AC_ARG_WITH([test-suite], + [AS_HELP_STRING([--with-test-suite], + [build test suite by default @<:@default=check@:>@])], + [case "${withval}" in + yes|no|check) ;; + *) AC_MSG_ERROR([bad value ${withval} for tests option]) ;; + esac], + [withval=check]) AC_MSG_CHECKING([Whether to build test suite by default]) if test "$withval" = "check" ; then -- 1.8.5.1

2 2

[libvirt] [PATCH] lxc: simplify command when connecting lxc multi console
by Chen Hanxiao 18 Dec '13

18 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we config more than one consoles for container, we always named them as "consoleN". We had to type a complex option "--devname consoleN". This patch enables option "--devname N" to be equal to "--devname consoleN". Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 61a90ca..13213a5 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2439,6 +2439,7 @@ lxcDomainOpenConsole(virDomainPtr dom, int ret = -1; virDomainChrDefPtr chr = NULL; size_t i; + char *tmp_name = NULL; virCheckFlags(0, -1); @@ -2455,9 +2456,17 @@ lxcDomainOpenConsole(virDomainPtr dom, } if (dev_name) { + if (STRPREFIX(dev_name, "console")) { + if (VIR_STRDUP(tmp_name, dev_name) < 0) + goto cleanup; + } else { + if (virAsprintf(&tmp_name, "console%s", dev_name) < 0) + goto cleanup; + } + for (i = 0; i < vm->def->nconsoles; i++) { if (vm->def->consoles[i]->info.alias && - STREQ(vm->def->consoles[i]->info.alias, dev_name)) { + STREQ(vm->def->consoles[i]->info.alias, tmp_name)) { chr = vm->def->consoles[i]; break; } @@ -2490,6 +2499,7 @@ lxcDomainOpenConsole(virDomainPtr dom, cleanup: if (vm) virObjectUnlock(vm); + VIR_FREE(tmp_name); return ret; } -- 1.8.2.1

3 4

[libvirt] [PATCH] libxl: libxl_get_max_cpus returning a libxl error from 4.4 onward
by Dario Faggioli 18 Dec '13

18 Dec '13

Starting from commit 2e82c18c in Xen (will be included in Xen 4.4) libxl_get_max_cpus() start returning a proper libxl error code, in case of failure. It returning 0 is now basically impossible but, theoretically, still wrong, not to mention that using '<= 0' makes this correct for both Xen 4.4 and Xen 4.3 (and 4.2). That's why we go for it (rather than just '< 0'). Signed-off-by: Dario Faggioli <dario.faggioli(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> Cc: Ian Jackson <Ian.Jackson(a)eu.citrix.com> --- src/libxl/libxl_driver.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 692c3b7..a31b094 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1101,9 +1101,11 @@ libxlConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) cfg = libxlDriverConfigGet(driver); ret = libxl_get_max_cpus(cfg->ctx); - /* libxl_get_max_cpus() will return 0 if there were any failures, - e.g. xc_physinfo() failing */ - if (ret == 0) + /* On failure, libxl_get_max_cpus() will return ERROR_FAIL from Xen 4.4 + * onward, but it ever returning 0 is obviously wrong too (and it is + * what happens, on failure, on Xen 4.3 and earlier). Therefore, a 'less + * or equal' is the catchall we want. */ + if (ret <= 0) ret = -1; virObjectUnref(cfg);

2 2

[libvirt] [PATCH] qemu: fix typo PCi => PCI
by Martin Kletzander 18 Dec '13

18 Dec '13

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd9546e..d0fde54 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3829,7 +3829,7 @@ int qemuProcessStart(virConnectPtr conn, * Normally PCI addresses are assigned in the virDomainCreate * or virDomainDefine methods. We might still need to assign * some here to cope with the question of upgrades. Regardless - * we also need to populate the PCi address set cache for later + * we also need to populate the PCI address set cache for later * use in hotplug */ if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { @@ -4560,7 +4560,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, * Normally PCI addresses are assigned in the virDomainCreate * or virDomainDefine methods. We might still need to assign * some here to cope with the question of upgrades. Regardless - * we also need to populate the PCi address set cache for later + * we also need to populate the PCI address set cache for later * use in hotplug */ if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { -- 1.8.5.1

4 4

[libvirt] [PATCH] qemu: add support for error messages greater than 1024 characters
by Michele Paolino 18 Dec '13

18 Dec '13

In libvirt, the default error message length is 1024 bytes. This is not enough for qemu to print long error messages such as the list of supported ARM machine models (more than 1700 chars). This is raised when the machine entry in the XML file is wrong, but there may be now or in future other verbose error messages. The above patch enables libvirt to print error messages >1024 for qemu. Signed-off-by: Michele Paolino <m.paolino(a)virtualopensystems.com> --- src/qemu/qemu_process.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bd9546e..c2e2136 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1904,10 +1904,25 @@ cleanup: * a possible read of the fd in the monitor code doesn't influence this * error delivery option */ ignore_value(lseek(logfd, pos, SEEK_SET)); - qemuProcessReadLog(logfd, buf + len, buf_size - len - 1, 0, true); - virReportError(VIR_ERR_INTERNAL_ERROR, - _("process exited while connecting to monitor: %s"), - buf); + len = qemuProcessReadLog(logfd, buf + len, buf_size - len - 1, 0, true); + + /* virReportError error buffer is limited to 1024 byte*/ + if (len < 1024){ + virReportError(VIR_ERR_INTERNAL_ERROR, + _("process exited while connecting to monitor: %s"), + buf); + } else { + if (STRPREFIX(buf, "Supported machines are:")) + virReportError(VIR_ERR_INTERNAL_ERROR, + _("process exited while connecting to monitor:" + "please check machine model")); + else + virReportError(VIR_ERR_INTERNAL_ERROR, + _("process exited while connecting to monitor")); + + VIR_ERROR("%s", buf); + } + ret = -1; } -- 1.7.9.5

5 9

[libvirt] [PATCH] tests: be more explicit on qcow2 versions in virstoragetest
by Eric Blake 18 Dec '13

18 Dec '13

While working on v1.0.5-maint (the branch in use on Fedora 19) with the host at Fedora 20, I got a failure in virstoragetest. I traced it to the fact that we were using qemu-img to create a qcow2 file, but qemu-img changed from creating v2 files by default in F19 to creating v3 files in F20. Rather than leaving it up to qemu-img, it is better to write the test to force testing of BOTH file formats (better code coverage and all). This patch alone does not fix all the failures in v1.0.5-maint; for that, we must decide to either teach the older branch to understand v3 files, or to reject them outright as unsupported. But for upstream, making the test less dependent on changing qemu-img defaults is always a good thing. * tests/virstoragetest.c (testPrepImages): Simplify creation of raw file; check if qemu supports compat and if so use it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tests/virstoragetest.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index e5c73f5..db0cf1c 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -87,6 +87,8 @@ testPrepImages(void) { int ret = EXIT_FAILURE; virCommandPtr cmd = NULL; + char *buf = NULL; + bool compat = false; qemuimg = virFindFileInPath("kvm-img"); if (!qemuimg) @@ -94,6 +96,18 @@ testPrepImages(void) if (!qemuimg) goto skip; + /* See if qemu-img supports '-o compat=xxx'. If so, we force the + * use of both v2 and v3 files; if not, it is v2 only but the test + * still works. */ + cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", + "-o?", "/dev/null", NULL); + virCommandSetOutputBuffer(cmd, &buf); + if (virCommandRun(cmd, NULL) < 0) + goto skip; + if (strstr(buf, "compat ")) + compat = true; + VIR_FREE(buf); + if (virAsprintf(&absraw, "%s/raw", datadir) < 0 || virAsprintf(&absqcow2, "%s/qcow2", datadir) < 0 || virAsprintf(&abswrap, "%s/wrap", datadir) < 0 || @@ -111,10 +125,8 @@ testPrepImages(void) goto cleanup; } - /* I'm lazy enough to use a shell one-liner instead of open/write/close */ - virCommandFree(cmd); - cmd = virCommandNewArgList("sh", "-c", "printf %1024d 0 > raw", NULL); - if (virCommandRun(cmd, NULL) < 0) { + if (virAsprintf(&buf, "%1024d", 0) < 0 || + virFileWriteStr("raw", buf, 0600) < 0) { fprintf(stderr, "unable to create raw file\n"); goto cleanup; } @@ -126,9 +138,10 @@ testPrepImages(void) /* Create a qcow2 wrapping relative raw; later on, we modify its * metadata to test other configurations */ virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", - "-obacking_file=raw,backing_fmt=raw", "qcow2", - NULL); + cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", NULL); + virCommandAddArgFormat(cmd, "-obacking_file=raw,backing_fmt=raw%s", + compat ? ",compat=0.10" : ""); + virCommandAddArg(cmd, "qcow2"); if (virCommandRun(cmd, NULL) < 0) goto skip; /* Make sure our later uses of 'qemu-img rebase' will work */ @@ -146,8 +159,8 @@ testPrepImages(void) * can correctly avoid insecure probing. */ virCommandFree(cmd); cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", NULL); - virCommandAddArgFormat(cmd, "-obacking_file=%s,backing_fmt=qcow2", - absqcow2); + virCommandAddArgFormat(cmd, "-obacking_file=%s,backing_fmt=qcow2%s", + absqcow2, compat ? ",compat=1.1" : ""); virCommandAddArg(cmd, "wrap"); if (virCommandRun(cmd, NULL) < 0) goto skip; @@ -172,6 +185,7 @@ testPrepImages(void) ret = 0; cleanup: + VIR_FREE(buf); virCommandFree(cmd); if (ret) testCleanupImages(); -- 1.8.4.2

1 0

[libvirt] [PATCH] Fix build when default python is python3
by Lénaïc Huard 17 Dec '13

17 Dec '13

As the python generator scripts are written in python2, the ./configure script must check for python2 before checking for python otherwise, on platforms where both python2 and python3 are available and on which the default python points to python3, ./configure will try to use the wrong one. Signed-off-by: Lénaïc Huard <lenaic(a)lhuard.fr.eu.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 10ce184..5446634 100644 --- a/configure.ac +++ b/configure.ac @@ -2032,7 +2032,7 @@ AM_CONDITIONAL([WITH_HYPERV], [test "$with_hyperv" = "yes"]) dnl Allow perl/python overrides -AC_PATH_PROG([PYTHON], [python]) +AC_PATH_PROGS([PYTHON], [python2 python]) AC_PATH_PROG([PERL], [perl]) AC_ARG_ENABLE([with-test-suite], -- 1.8.5.1

3 3

[libvirt] [PATCHV2] qemu: ask for -enable-fips when FIPS is required
by Eric Blake 17 Dec '13

17 Dec '13

On a system that is enforcing FIPS, most libraries honor the current mode by default. Qemu, on the other hand, refused to honor FIPS mode unless you add the '-enable-fips' command line option; worse, this option is not discoverable via QMP, and is only present on binaries built for Linux. So, if we detect FIPS mode, then we unconditionally ask for FIPS; either qemu is new enough to have the option and then correctly cripple insecure VNC passwords, or it is so old that we are correctly avoiding a FIPS violation by preventing qemu from starting. Meanwhile, if we don't detect FIPS mode, then omitting the argument is safe whether the qemu has the option (but it would do nothing because FIPS is disabled) or whether qemu lacks the option (including in the case where we are not running on Linux). The testsuite was a bit interesting: we don't want our test to depend on whether it is being run in FIPS mode, so I had to tweak things to set the capability bit outside of our normal interaction with capability parsing. This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1035474 * src/qemu/qemu_capabilities.h (QEMU_CAPS_ENABLE_FIPS): New bit. * src/qemu/qemu_capabilities.c (virQEMUCapsInitQMP): Conditionally set capability according to detection of FIPS mode. * src/qemu/qemu_command.c (qemuBuildCommandLine): Use it. * tests/qemucapabilitiestest.c (testQemuCaps): Conditionally set capability to test expected output. * tests/qemucapabilitiesdata/caps_1.2.2-1.caps: Update list. * tests/qemucapabilitiesdata/caps_1.6.0-1.caps: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_capabilities.c | 28 +++++++++++++++++++++++++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 2 ++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiestest.c | 20 +++++++++++++++----- 6 files changed, 47 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5e9c65e..9470814 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -245,7 +245,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "kvm-pit-lost-tick-policy", "boot-strict", /* 160 */ - "pvpanic", /* 161 */ + "pvpanic", + "enable-fips", ); struct _virQEMUCaps { @@ -2630,6 +2631,31 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, config.data.nix.path = monpath; config.data.nix.listen = false; + /* Qemu 1.2 and later have a binary flag -enable-fips that must be + * used for VNC auth to obey FIPS settings; but the flag only + * exists on Linux, and with no way to probe for it via QMP. Our + * solution: if FIPS mode is required, then unconditionally use + * the flag, regardless of qemu version, for the following matrix: + * + * old QEMU new QEMU + * FIPS enabled doesn't start VNC auth disabled + * FIPS disabled/missing VNC auth enabled VNC auth enabled + * + * Setting the flag here instead of in virQEMUCapsInitQMPMonitor + * or virQEMUCapsInitHelp also allows the testsuite to be + * independent of FIPS setting. + */ + if (virFileExists("/proc/sys/crypto/fips_enabled")) { + char buf[sizeof("1\n")]; + char *ptr = buf; + + if (virFileReadAll("/proc/sys/crypto/fips_enabled", + sizeof(buf), &ptr) < 0) + goto cleanup; + if (*buf == '1') + virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_FIPS); + } + VIR_DEBUG("Try to get caps via QMP qemuCaps=%p", qemuCaps); /* diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index bbf4972..efb3f43 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -200,6 +200,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ QEMU_CAPS_DEVICE_PANIC = 161, /* -device pvpanic */ + QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a80559e..d723dc8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7747,6 +7747,8 @@ qemuBuildCommandLine(virConnectPtr conn, } } virCommandAddArg(cmd, "-S"); /* freeze CPU */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ENABLE_FIPS)) + virCommandAddArg(cmd, "-enable-fips"); if (qemuBuildMachineArgStr(cmd, def, qemuCaps) < 0) goto error; diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index 73a561d..c3ae814 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -112,4 +112,5 @@ <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index c7ce591..2d50cf9 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -138,4 +138,5 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='reboot-timeout'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index d912171..3b34f78 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -31,6 +31,7 @@ typedef testQemuData *testQemuDataPtr; struct _testQemuData { virDomainXMLOptionPtr xmlopt; const char *base; + bool fips; }; static qemuMonitorTestPtr @@ -192,6 +193,12 @@ testQemuCaps(const void *opaque) qemuMonitorTestGetMonitor(mon)) < 0) goto cleanup; + /* So that our test does not depend on the contents of /proc, we + * hoisted the setting of ENABLE_FIPS to virQEMUCapsInitQMP. But + * we do want to test the effect of that flag. */ + if (data->fips) + virQEMUCapsSet(capsComputed, QEMU_CAPS_ENABLE_FIPS); + if (testQemuCapsCompare(capsProvided, capsComputed) < 0) goto cleanup; @@ -227,16 +234,19 @@ mymain(void) data.xmlopt = xmlopt; -#define DO_TEST(name) \ - data.base = name; \ - if (virtTestRun(name, testQemuCaps, &data) < 0) \ +#define DO_TEST_FULL(name, use_fips) \ + data.base = name; \ + data.fips = use_fips; \ + if (virtTestRun(name, testQemuCaps, &data) < 0) \ ret = -1 - DO_TEST("caps_1.2.2-1"); +#define DO_TEST(name) DO_TEST_FULL(name, false) + + DO_TEST_FULL("caps_1.2.2-1", true); DO_TEST("caps_1.3.1-1"); DO_TEST("caps_1.4.2-1"); DO_TEST("caps_1.5.3-1"); - DO_TEST("caps_1.6.0-1"); + DO_TEST_FULL("caps_1.6.0-1", true); DO_TEST("caps_1.6.50-1"); virObjectUnref(xmlopt); -- 1.8.4.2

2 2

[libvirt] [PATCHv2.5] specfile: fix make rpm when with_driver_modules is 1
by Laine Stump 17 Dec '13

17 Dec '13

Commit ff76566 moved around things in the specfiles to put driver-specific files into their appropriate sub-packages (when with_driver_modules == 1), but accidentally changed things so that the deamon-driver-network and daemon-config-network files were only included in a package when with_driver_modules == 0. This broke "make rpm" on fedora (where with_driver_modules == 1). This patch follows the pattern (already used for the files in other sub-modules) of duplicating the files for the main package (!with_driver_modules) and the sub-package (with_driver_modules). --- Changes from V1: realized that %{_datadir} is /usr/share, so %{_datadir}/libvirt/networks/default.xml should be installed as a part of daemon-driver-network (or the main package, if not building with driver modules). libvirt.spec.in | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 849ec80..015e627 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1894,11 +1894,6 @@ exit 0 %endif %endif # ! %{with_driver_modules} - %if %{with_network} -%files daemon-config-network -%defattr(-, root, root) - %endif - %if %{with_nwfilter} %files daemon-config-nwfilter %defattr(-, root, root) @@ -1915,6 +1910,14 @@ exit 0 %if %{with_network} %files daemon-driver-network %defattr(-, root, root) +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart +%dir %{_datadir}/libvirt/networks/ +%{_datadir}/libvirt/networks/default.xml +%ghost %dir %{_localstatedir}/run/libvirt/network/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ +%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so %endif -- 1.8.3.1

3 4

[libvirt] hindsight on qcow2v3 format
by Eric Blake 17 Dec '13

17 Dec '13

I spent a couple hours today debugging a bug in an older branch of libvirt (0.10.2) - one where libvirt only knew how to parse version 2 qcow2 images. Alas, that version of libvirt can be coerced into reading the header of a random file under the assumption that it is qcow2 data, and where it tries to find the backing format information in the header extensions without first validating that the file format actually matches qcow2 (that is, it looks for header extensions starting at offset 72 without first checking the version field (bytes 4-7) contains 2). So far, we've been lucky: since libvirt is trying to parse 72-75 as a version 2 extension header magic number, and the number is stored in big endian format, we end up reading the first 4 bytes of the version 3 incompatible_features field, which so far are always 0 (we don't have that many incompatible features yet), and that happens to be the magic number for end of extension headers; and thus libvirt quit trying to look for any further extension headers. Furthermore, since libvirt already refuses to probe backing file format unless explicitly allowed by user action (since mis-probing a raw file is CVE-worthy if done automatically), the damage stopped there, and the worst I could do (without intentionally bypassing the CVE safety valve) was fail a test in the libvirt testsuite when using version 3 files. But it DOES mean that libvirt fails to find the backing header format extension of a v3 file, even when one is present, because libvirt fails to start looking at the right offset. But it does raise a question: What happens if we eventually DO reach bit 32, so that bytes 72-75 is no longer all 0s and therefore no longer the end-of-extension marker? It might be possible to write a file that has one interpretation as a valid qcow2v3, while having a different interpretation by the older libvirt, such that libvirt tries to treat a backing file as an incorrect format if it is probing. Is it worth tweaking docs/specs/qcow2.txt to permanently change the incompatible_features field to be 4 bytes (76-79) and mandate that bytes 72-75 always be 0, as a conservative way to prevent other misbehavior of programs like libvirt 0.10.2 that have code paths that don't correctly validate for version 2 files? And if we ever really did hit a situation of having 31 or more incompatible features, I could envision using bit 31 as an incompatible_feature witness that tells new enough qemu to look at some other offset for remaining feature bits (thankfully, the semantics of the incompatible_feature field mean that older qemu that honors version 3 formats will reject a file with incompatible_feature bit 31 set), so this is no real loss in the number of potential incompatible features being added. If we had a time machine, I would suggest that we change 72-75 to have constant contents as a new magic number, and 76-79 encode the length of the remaining header, and delay the location of incompatible_features into the remaining header; such that this situation of libvirt looking for extensions would still find known could have still found the backing file format extension header. But that ship has sailed - all we can do now is decide to encode 72-75 as permanent 0s. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH v2] Set the 'container_ttys' env variable for LXC consoles
by Daniel P. Berrange 17 Dec '13

17 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Systemd specified that any /dev/pts/NNN device on which it is expected to spawn a agetty login, should be listed in the 'container_ttys' env variable. It should just contain the relative paths, eg 'pts/0' not '/dev/pts/0' and should be space separated. http://cgit.freedesktop.org/systemd/systemd/commit/?id=1d97ff7dd71902a5604c… In v2: - Rewrite loop with virBufferTrim - Don't include first pty in env - Only set env if at least one pty is listed Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 51fa1b3..c885782 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -196,10 +196,33 @@ int lxcContainerHasReboot(void) * * Returns a virCommandPtr */ -static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) +static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef, + char **ttyPaths, + size_t nttyPaths) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virCommandPtr cmd; + virBuffer buf = VIR_BUFFER_INITIALIZER; + size_t i; + + /* 'container_ptys' must exclude the PTY associated with + * the /dev/console device, hence start at 1 not 0 + */ + for (i = 1; i < nttyPaths; i++) { + if (!STRPREFIX(ttyPaths[0], "/dev/")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expected a /dev path for '%s'"), + ttyPaths[0]); + virBufferFreeAndReset(&buf); + return NULL; + } + virBufferAdd(&buf, ttyPaths[i] + 5, -1); + virBufferAddChar(&buf, ' '); + } + virBufferTrim(&buf, NULL, 1); + + if (virBufferError(&buf)) + return NULL; virUUIDFormat(vmDef->uuid, uuidstr); @@ -212,11 +235,14 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) virCommandAddEnvString(cmd, "TERM=linux"); virCommandAddEnvString(cmd, "container=lxc-libvirt"); virCommandAddEnvPair(cmd, "container_uuid", uuidstr); + if (nttyPaths > 1) + virCommandAddEnvPair(cmd, "container_ttys", virBufferCurrentContent(&buf)); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_UUID", uuidstr); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_NAME", vmDef->name); if (vmDef->os.cmdline) virCommandAddEnvPair(cmd, "LIBVIRT_LXC_CMDLINE", vmDef->os.cmdline); + virBufferFreeAndReset(&buf); return cmd; } @@ -1789,7 +1815,9 @@ static int lxcContainerChild(void *data) if ((hasReboot = lxcContainerHasReboot()) < 0) goto cleanup; - cmd = lxcContainerBuildInitCmd(vmDef); + cmd = lxcContainerBuildInitCmd(vmDef, + argv->ttyPaths, + argv->nttyPaths); virCommandWriteArgLog(cmd, 1); if (lxcContainerSetID(vmDef) < 0) -- 1.8.3.1

3 3

[libvirt] [PATCH] docs: fix address type for disks
by Martin Kletzander 17 Dec '13

17 Dec '13

Disks have type='drive', not type='disk'. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0067e8f..2b8bc8f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2355,7 +2355,7 @@ address to use for a given device is constrained in part by the device and the architecture of the guest. For example, a <code><disk></code> device - uses <code>type='disk'</code>, while + uses <code>type='drive'</code>, while a <code><console></code> device would use <code>type='pci'</code> on i686 or x86_64 guests, or <code>type='spapr-vio'</code> on PowerPC64 pseries guests. -- 1.8.5.1

2 2

[libvirt] [PATCH] storage: resize vol against real allocated size
by Michal Privoznik 17 Dec '13

17 Dec '13

From: Wang Sen <wangsen(a)linux.vnet.ibm.com> Currently, 'vol-resize --allocate' allocates new space at the vol->capacity offset. But the vol->capacity is not necessarily the same as vol->allocation. For instance:. [root@localhost ~]# virsh vol-list --pool tmp-pool --details Name Path Type Capacity Allocation ------------------------------------------------------------- tmp-vol /root/tmp-pool/tmp-vol file 1.00 GiB 1.00 GiB [root@localhost ~]# virsh vol-resize tmp-vol --pool tmp-pool 2G [root@localhost ~]# virsh vol-list --pool tmp-pool --details Name Path Type Capacity Allocation ------------------------------------------------------------- tmp-vol /root/tmp-pool/tmp-vol file 2.00 GiB 1.00 GiB So, if we want to allocate more bytes, so the file is say 3G big, the real allocated size is 2G actually: [root@localhost ~]# virsh vol-resize tmp-vol --pool tmp-pool 3G --allocate [root@localhost ~]# virsh vol-list --pool tmp-pool --details Name Path Type Capacity Allocation ------------------------------------------------------------- tmp-vol /root/tmp-pool/tmp-vol file 3.00 GiB 2.00 GiB This commit uses the correct vol->allocation instead of incorrect vol->capacity, so the output of the commands above looks like this: [root@localhost ~]# virsh vol-resize tmp-vol --pool tmp-pool 3G --allocate [root@localhost ~]# virsh vol-list --pool tmp-pool --details Name Path Type Capacity Allocation ------------------------------------------------------------- tmp-vol /root/tmp-pool/tmp-vol file 3.00 GiB 3.00 GiB Moreover, if the '--alocate' flag was used, we must update the vol->allocation member in storageVolResize API too, not just vol->capacity. Reported-by: Wang Sen <wangsen(a)linux.vnet.ibm.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_driver.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 11cf2df..95783be 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1267,7 +1267,7 @@ virStorageBackendFileSystemVolResize(virConnectPtr conn ATTRIBUTE_UNUSED, if (vol->target.format == VIR_STORAGE_FILE_RAW) { return virStorageFileResize(vol->target.path, capacity, - vol->capacity, pre_allocate); + vol->allocation, pre_allocate); } else { if (pre_allocate) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index f08255e..816efda 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2029,6 +2029,8 @@ storageVolResize(virStorageVolPtr obj, goto out; vol->capacity = abs_capacity; + if (flags & VIR_STORAGE_VOL_RESIZE_ALLOCATE) + vol->allocation = abs_capacity; /* Update pool metadata */ pool->def->allocation += (abs_capacity - vol->capacity); -- 1.8.5.1

3 2

[libvirt] non trivial question
by Vasiliy Tolstov 16 Dec '13

16 Dec '13

Hi all. I have very special task - i have some vps on kvm, that sometimes needs external support help (administration). But i can't trust external workers and need to known what files are changed. As i understand best of all - create backup before work and after. After that check it for difference and decide apply this work or not. Vps need to run all time. (no downtime for work). How can i do that and what tools i need to use? Is that possible? Thanks for all answers. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

1 0

[libvirt] [PATCH] examples: Resurrect domsuspend example
by Michal Privoznik 16 Dec '13

16 Dec '13

This partially reverts 5eb4b04211 and 62774afb6ba8. Rewrite the domsuspend example from scratch. This time do it right. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- .gitignore | 1 + Makefile.am | 4 +- cfg.mk | 2 +- configure.ac | 1 + examples/domsuspend/Makefile.am | 27 ++++ examples/domsuspend/suspend.c | 276 ++++++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 3 +- 7 files changed, 310 insertions(+), 4 deletions(-) create mode 100644 examples/domsuspend/Makefile.am create mode 100644 examples/domsuspend/suspend.c diff --git a/.gitignore b/.gitignore index 2d364dc..fbb2c01 100644 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,7 @@ /docs/todo.html.in /examples/domain-events/events-c/event-test /examples/dominfo/info1 +/examples/domsuspend/suspend /examples/hellolibvirt/hellolibvirt /examples/openauth/openauth /gnulib/lib/* diff --git a/Makefile.am b/Makefile.am index 2cbf71a..d7ddd9d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,8 @@ GENHTML = genhtml SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ tests po examples/domain-events/events-c examples/hellolibvirt \ - examples/dominfo examples/apparmor examples/xml/nwfilter \ - examples/openauth examples/systemtap + examples/dominfo examples/domsuspend examples/apparmor \ + examples/xml/nwfilter examples/openauth examples/systemtap ACLOCAL_AMFLAGS = -I m4 diff --git a/cfg.mk b/cfg.mk index fe760a9..67fc432 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1003,7 +1003,7 @@ exclude_file_name_regexp--sc_prohibit_sprintf = \ exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/virstring\.c$$ exclude_file_name_regexp--sc_prohibit_strtol = \ - ^src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c$$ + ^(src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c)|(examples/domsuspend/suspend.c)$$ exclude_file_name_regexp--sc_prohibit_xmlGetProp = ^src/util/virxml\.c$$ diff --git a/configure.ac b/configure.ac index bb92349..cc485d6 100644 --- a/configure.ac +++ b/configure.ac @@ -2555,6 +2555,7 @@ AC_CONFIG_FILES([\ tests/Makefile \ examples/apparmor/Makefile \ examples/domain-events/events-c/Makefile \ + examples/domsuspend/Makefile \ examples/dominfo/Makefile \ examples/openauth/Makefile \ examples/hellolibvirt/Makefile \ diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am new file mode 100644 index 0000000..b8e65f2 --- /dev/null +++ b/examples/domsuspend/Makefile.am @@ -0,0 +1,27 @@ +## Process this file with automake to produce Makefile.in + +## Copyright (C) 2013 Red Hat, Inc. +## +## This library is free software; you can redistribute it and/or +## modify it under the terms of the GNU Lesser General Public +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include +LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ + $(COVERAGE_LDFLAGS) + +noinst_PROGRAMS=suspend + +suspend_SOURCES=suspend.c +suspend_LDFLAGS= +suspend_LDADD= $(LDADDS) diff --git a/examples/domsuspend/suspend.c b/examples/domsuspend/suspend.c new file mode 100644 index 0000000..ba9dd6e --- /dev/null +++ b/examples/domsuspend/suspend.c @@ -0,0 +1,276 @@ +/* + * suspend.c: Demo program showing how to suspend a domain + * + * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ + +#include <errno.h> +#include <getopt.h> +#include <libvirt/libvirt.h> +#include <libvirt/virterror.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +int debug = 0; + +#define ERROR(...) \ +do { \ + fprintf(stderr, "ERROR %s:%d : ", __FUNCTION__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ +} while (0) + +#define DEBUG(...) \ +do { \ + if (!debug) \ + break; \ + fprintf(stderr, "DEBUG %s:%d : ", __FUNCTION__, __LINE__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ +} while (0) + +static void +print_usage(const char *progname) +{ + const char *unified_progname; + + if (!(unified_progname = strrchr(progname, '/'))) + unified_progname = progname; + else + unified_progname++; + + printf("\n%s [options] [domain name]\n\n" + " options:\n" + " -d | --debug enable debug printings\n" + " -h | --help print this help\n" + " -c | --connect=URI hypervisor connection URI\n" + " -s | --seconds=X suspend domain for X seconds (default 1)\n", + unified_progname); +} + +static int +parse_argv(int argc, char *argv[], + const char **uri, + const char **dom_name, + unsigned int *seconds) +{ + int ret = -1; + int arg; + unsigned long val; + char *p; + struct option opt[] = { + {"debug", no_argument, NULL, 'd'}, + {"help", no_argument, NULL, 'h'}, + {"connect", required_argument, NULL, 'c'}, + {"seconds", required_argument, NULL, 's'}, + {NULL, 0, NULL, 0} + }; + + while ((arg = getopt_long(argc, argv, "+:dhc:s:", opt, NULL)) != -1) { + switch (arg) { + case 'd': + debug = 1; + break; + case 'h': + print_usage(argv[0]); + exit(EXIT_SUCCESS); + break; + case 'c': + *uri = optarg; + break; + case 's': + /* strtoul man page suggest clearing errno prior to call */ + errno = 0; + val = strtoul(optarg, &p, 10); + if (errno || *p || p == optarg) { + ERROR("Invalid number: '%s'", optarg); + goto cleanup; + } + *seconds = val; + if (*seconds != val) { + ERROR("Integer overflow: %ld", val); + goto cleanup; + } + break; + case ':': + ERROR("option '-%c' requires an argument", optopt); + exit(EXIT_FAILURE); + case '?': + if (optopt) + ERROR("unsupported option '-%c'. See --help.", optopt); + else + ERROR("unsupported option '%s'. See --help.", argv[optind - 1]); + exit(EXIT_FAILURE); + default: + ERROR("unknown option"); + exit(EXIT_FAILURE); + } + } + + if (argc > optind) + *dom_name = argv[optind]; + + ret = 0; +cleanup: + return ret; +} + +static int +fetch_domains(virConnectPtr conn) +{ + int num_domains, ret = -1; + virDomainPtr *domains = NULL; + size_t i; + const int list_flags = VIR_CONNECT_LIST_DOMAINS_ACTIVE; + + DEBUG("Fetching list of running domains"); + num_domains = virConnectListAllDomains(conn, &domains, list_flags); + + DEBUG("num_domains=%d", num_domains); + if (num_domains < 0) { + ERROR("Unable to fetch list of running domains"); + goto cleanup; + } + + printf("Running domains:\n"); + printf("----------------\n"); + for (i = 0; i < num_domains; i++) { + virDomainPtr dom = domains[i]; + const char *dom_name = virDomainGetName(dom); + printf("%s\n", dom_name); + virDomainFree(dom); + } + + ret = 0; +cleanup: + free(domains); + return ret; +} + +static int +suspend_and_resume(virConnectPtr conn, + const char *dom_name, + unsigned int seconds) +{ + int ret = -1; + virDomainPtr dom; + virDomainInfo dom_info; + + if (!(dom = virDomainLookupByName(conn, dom_name))) { + ERROR("Unable to find domain '%s'", dom_name); + goto cleanup; + } + + if (virDomainGetInfo(dom, &dom_info) < 0) { + ERROR("Unable to get domain info"); + goto cleanup; + } + + DEBUG("Domain state %d", dom_info.state); + + switch (dom_info.state) { + case VIR_DOMAIN_NOSTATE: + case VIR_DOMAIN_RUNNING: + case VIR_DOMAIN_BLOCKED: + /* In these states the domain can be suspended */ + DEBUG("Suspending domain"); + if (virDomainSuspend(dom) < 0) { + ERROR("Unable to suspend domain"); + goto cleanup; + } + + DEBUG("Domain suspended. Entering sleep for %u seconds.", seconds); + sleep(seconds); + DEBUG("Sleeping done. Resuming the domain."); + + if (virDomainResume(dom) < 0) { + ERROR("Unable to resume domain"); + goto cleanup; + } + break; + + default: + /* In all other states domain can't be suspended */ + ERROR("Domain is not state where it can be suspended: %d", + dom_info.state); + goto cleanup; + } + + ret = 0; +cleanup: + if (dom) + virDomainFree(dom); + return ret; +} + +int +main(int argc, char *argv[]) +{ + int ret = EXIT_FAILURE; + virConnectPtr conn = NULL; + const char *uri = NULL; + const char *dom_name = NULL; + unsigned int seconds = 1; /* Suspend domain for this long */ + const int connect_flags = 0; /* No connect flags for now */ + + if (parse_argv(argc, argv, &uri, &dom_name, &seconds) < 0) + goto cleanup; + + DEBUG("Proceeding with uri=%s dom_name=%s seconds=%u", + uri, dom_name, seconds); + + if (!(conn = virConnectOpenAuth(uri, + virConnectAuthPtrDefault, + connect_flags))) { + ERROR("Failed to connect to hypervisor"); + goto cleanup; + } + + DEBUG("Successfully connected"); + + if (!dom_name) { + if (fetch_domains(conn) == 0) + ret = EXIT_SUCCESS; + goto cleanup; + } + + if (suspend_and_resume(conn, dom_name, seconds) < 0) + goto cleanup; + + ret = EXIT_SUCCESS; +cleanup: + if (conn) { + int tmp; + tmp = virConnectClose(conn); + if (tmp < 0) { + ERROR("Failed to disconnect from the hypervisor"); + ret = EXIT_FAILURE; + } else if (tmp > 0) { + ERROR("One or more references were leaked after " + "disconnect from the hypervisor"); + ret = EXIT_FAILURE; + } else { + DEBUG("Connection successfully closed"); + } + } + return ret; +} diff --git a/libvirt.spec.in b/libvirt.spec.in index f615c62..8867ebc 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1430,7 +1430,7 @@ rm -fr %{buildroot} # on RHEL 5, thus we need to expand it here. make install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} -for i in domain-events/events-c dominfo hellolibvirt openauth xml/nwfilter systemtap +for i in domain-events/events-c dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) done @@ -2134,6 +2134,7 @@ exit 0 %doc examples/hellolibvirt %doc examples/domain-events/events-c %doc examples/dominfo +%doc examples/domsuspend %doc examples/openauth %doc examples/xml %doc examples/systemtap -- 1.8.5.1

2 1

[libvirt] [PATCH 1/1] storage: resize vol against real allocated size when --allocate is specified
by Wang Sen 16 Dec '13

16 Dec '13

Currently, vol-resize allocates more bytes against vol->capacity, but vol->capacity may be different from the real allocated size because --allocate may not be specified. e.g. [root@localhost ~]# virsh vol-list --pool tmp-pool --details name path type Capacity allocated ------------------------------------------------------------- tmp-vol /root/tmp-pool/tmp-vol file 1.00 GiB 1.00 GiB [root@localhost ~]# virsh vol-resize tmp-vol --pool tmp-pool 2G [root@localhost ~]# virsh vol-list --pool tmp-pool --details name path type Capacity allocated ------------------------------------------------------------- tmp-vol /root/tmp-pool/tmp-vol file 2.00 GiB 1.00 GiB So, if we want to allocate more bytes to 3G, the real allocated size is 2G actually. [root@localhost ~]# virsh vol-resize tmp-vol --pool tmp-pool 3G --allocate [root@localhost ~]# virsh vol-list --pool tmp-pool --details name path type Capacity allocated ------------------------------------------------------------- tmp-vol /root/tmp-pool/tmp-vol file 3.00 GiB 2.00 GiB This patch enable resize vol against the real allocated size. After this patch is applied, the result of the last resize command become 3G. [root@localhost ~]# virsh vol-resize tmp-vol --pool tmp-pool 3G --allocate [root@localhost ~]# virsh vol-list --pool tmp-pool --details name path type Capacity allocated ------------------------------------------------------------- tmp-vol /root/tmp-pool/tmp-vol file 3.00 GiB 3.00 GiB Signed-off-by: Wang Sen <wangsen(a)linux.vnet.ibm.com> --- src/storage/storage_backend_fs.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 11cf2df..e75c57b 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1261,13 +1261,28 @@ virStorageBackendFileSystemVolResize(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long long capacity, unsigned int flags) { + int fd = -1; virCheckFlags(VIR_STORAGE_VOL_RESIZE_ALLOCATE, -1); + unsigned long long orig_capacity; + virStorageFileMetadataPtr meta = NULL; + + if ((fd = open(vol->target.path, O_RDWR)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Can not open file")); + } + + if (!(meta = virStorageFileGetMetadataFromFD(vol->target.path, fd, \ + vol->target.format))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Get meta data error!")); + } + orig_capacity = meta->capacity; + virStorageFileFreeMetadata(meta); + close(fd); bool pre_allocate = flags & VIR_STORAGE_VOL_RESIZE_ALLOCATE; if (vol->target.format == VIR_STORAGE_FILE_RAW) { return virStorageFileResize(vol->target.path, capacity, - vol->capacity, pre_allocate); + orig_capacity, pre_allocate); } else { if (pre_allocate) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", -- 1.8.3.1

2 2

[libvirt] [PATCH 0/2] Fix interface state transitions logic
by Michal Privoznik 16 Dec '13

16 Dec '13

Right now it's possible to start an interface that is already running, or destroy an interface multiple times. Such state transitions are not allowed and we check for such cases explicitly in other areas like qemu driver. Michal Privoznik (2): interface: Introduce netcfInterfaceObjIsActive interface: Take interface status into account when starting and destroying src/interface/interface_backend_netcf.c | 77 +++++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 24 deletions(-) -- 1.8.5.1

4 14

[libvirt] [PATCH] tools: Fix virsh connect man page
by Jiri Denemark 16 Dec '13

16 Dec '13

The URI parameter is optional and xen:/// is not the default connection URI. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index c6a8be3..677931f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -226,7 +226,7 @@ This command is only available in interactive mode. Will print the current directory. -=item B<connect> I<URI> [I<--readonly>] +=item B<connect> [I<URI>] [I<--readonly>] (Re)-Connect to the hypervisor. When the shell is first started, this is automatically run with the I<URI> parameter requested by the C<-c> @@ -239,7 +239,7 @@ common are: =item xen:/// -this is used to connect to the local Xen hypervisor, this is the default +this is used to connect to the local Xen hypervisor =item qemu:///system -- 1.8.5.1

2 2

[libvirt] [PATCHv5 0/4] Introduce APIs to extract DHCP leases info
by Nehal J Wani 16 Dec '13

16 Dec '13

This API returns the leases information stored in the DHCP leases file of dnsmasq for a given virtual network. It contacts the bridge network driver, which parses a custom leases file created by libvirt. It supports two methods: 1. Return info for all network interfaces connected to a given virtual network 2. Return information for a particular network interface in a given virtual network by providing its MAC Address v5 Created a helper file to generate custom leases for libvirt. Since dnsmasq doesn't provide the MAC Address in case of DHCPv6, the need for this file was proposed. The design of virNetworkDHCPLeases struct has been updated and the previous use of union has been removed. OOM errors have been taken care of in the remote driver and remote daemon. Discussion on struct design: https://www.redhat.com/archives/libvir-list/2013-October/msg00326.html Discussion on helper file: https://www.redhat.com/archives/libvir-list/2013-October/msg00989.html v4 * Added support for DHCPv6, updated lease file parsing method Refer: https://www.redhat.com/archives/libvir-list/2013-September/msg01554.html v3 * Mostly small nits, change in MACRO names, use of virSocketAddrGetIpPrefix to retrieve IP prefix from @dom XML. Refer: https://www.redhat.com/archives/libvir-list/2013-September/msg00832.html v2 * Since DHCPv6 is supposed to be suported in future, virNetworkGetDHCPLeasesForMAC changed, prefix and virIPAddrType added in virNetworkDHCPLeases struct. Refer: https://www.redhat.com/archives/libvir-list/2013-September/msg00732.html v1 * Refer: https://www.redhat.com/archives/libvir-list/2013-September/msg00620.html * The need for these APIs were result of a RFC was proposed on the list. Refer: http://www.redhat.com/archives/libvir-list/2013-July/msg01603.html Nehal J Wani (4): net-dhcp-leases: Implement the public APIs net-dhcp-leases: Implement the remote protocol net-dhcp-leases: Private implementation inside network driver net-dhcp-leases: Add virsh support daemon/remote.c | 176 ++++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 35 ++++++ src/Makefile.am | 21 ++++ src/driver.h | 13 +++ src/libvirt.c | 197 ++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 7 ++ src/network/bridge_driver.c | 248 +++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 187 ++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 54 +++++++++- src/remote_protocol-structs | 38 +++++++ src/rpc/gendispatch.pl | 1 + src/util/leaseshelper.c | 185 ++++++++++++++++++++++++++++++++ tools/virsh-network.c | 118 ++++++++++++++++++++ tools/virsh.pod | 6 ++ 14 files changed, 1285 insertions(+), 1 deletion(-) create mode 100644 src/util/leaseshelper.c -- 1.8.1.4

2 15

[libvirt] [PATCH] specfile: fix make rpm when with_driver_modules is 1
by Laine Stump 16 Dec '13

16 Dec '13

Commit ff76566 moved around things in the specfiles to put driver-specific files into their appropriate sub-packages (when with_driver_modules == 1), but accidentally changed things so that the deamon-driver-network and daemon-config-network files were only included in a package when with_driver_modules == 0. This broke "make rpm" on fedora (where with_driver_modules == 1). This patch follows the pattern (already used for the files in other sub-modules) of duplicating the files for the main package (!with_driver_modules) and the sub-package (with_driver_modules). I think this is asking for trouble, but the first priority is to fix the build, then worry about removing redundancy later. --- I would push this as a build breaker, but am unsure enough of my specfile knowledge to be certain that I'm not breaking something else (it does allow make rpm to complete successfully). Since I have to leave for the weekend *right now*, I would appreciate if someone else can push this for me if it's a proper fix. Thanks! libvirt.spec.in | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f615c62..d7d0e7e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1843,14 +1843,16 @@ exit 0 %if ! %{with_driver_modules} %if %{with_network} +# Files from the daemon-driver-network sub-package %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart %dir %{_datadir}/libvirt/networks/ -%{_datadir}/libvirt/networks/default.xml %ghost %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ +# File from the daemon-config-network sub-package +%{_datadir}/libvirt/networks/default.xml %endif %if %{with_storage_disk} %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper @@ -1894,11 +1896,6 @@ exit 0 %endif %endif # ! %{with_driver_modules} - %if %{with_network} -%files daemon-config-network -%defattr(-, root, root) - %endif - %if %{with_nwfilter} %files daemon-config-nwfilter %defattr(-, root, root) @@ -1913,8 +1910,19 @@ exit 0 %endif %if %{with_network} +%files daemon-config-network +%defattr(-, root, root) +%{_datadir}/libvirt/networks/default.xml + %files daemon-driver-network %defattr(-, root, root) +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart +%dir %{_datadir}/libvirt/networks/ +%ghost %dir %{_localstatedir}/run/libvirt/network/ +%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ +%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so %endif -- 1.8.3.1

2 2

[libvirt] [PATCH] libvirt-perl: Use correct free() in get_cpu_model_names
by Olaf Hering 16 Dec '13

16 Dec '13

Make check currently fails for me due to wrong free usage in get_cpu_model_names. names is allocated by libvirt, so it should be released with just free(). > t/100-connect..........panic: free from wrong pool at t/100-connect.t line 81. > # Looks like you planned 25 tests but only ran 24. > # Looks like your test died just after 24. > dubious > Test returned status 255 (wstat 65280, 0xff00) > DIED. FAILED test 25 > Failed 1/25 tests, 96.00% okay (less 1 skipped test: 23 okay, 92.00%) Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- Virt.xs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Virt.xs b/Virt.xs index 33758d1..27ca445 100644 --- a/Virt.xs +++ b/Virt.xs @@ -1925,7 +1925,7 @@ PREINIT: PUSHs(sv_2mortal(newSVpv(names[i], 0))); free(names[i]); } - Safefree(names); + free(names);

2 4

[libvirt] [PATCH 0/4] Support for integrating cgroups with systemd
by Daniel P. Berrange 16 Dec '13

16 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This is a much changed / expanded version of my previous work to create cgroups via systemd. The difference is that this time it actually works :-) I'm not proposing this for merge until after the 1.1.1 release. Daniel P. Berrange (4): Add APIs for formatting systemd slice/scope names Add support for systemd cgroup mount Cope with races while killing processes Enable support for systemd-machined in cgroups creation src/libvirt_private.syms | 2 + src/lxc/lxc_process.c | 10 +- src/qemu/qemu_cgroup.c | 1 + src/util/vircgroup.c | 270 +++++++++++++++++++++++++++++++++++++++++------ src/util/vircgroup.h | 2 + src/util/virsystemd.c | 96 ++++++++++++++++- src/util/virsystemd.h | 5 + tests/vircgrouptest.c | 9 ++ tests/virsystemdtest.c | 48 +++++++++ 9 files changed, 403 insertions(+), 40 deletions(-) -- 1.8.1.4

4 16