- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Fix crash handling memory parameters in LXC
by Daniel P. Berrange 20 Dec '13

20 Dec '13

The first of these 2 issues is a security issue CVE-2013-6436 Both patches have been pushed to GIT master. Martin Kletzander (2): CVE-2013-6436: fix crash in lxcDomainGetMemoryParameters Fix crash in lxcDomainSetMemoryParameters src/lxc/lxc_driver.c | 153 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 130 insertions(+), 23 deletions(-) -- 1.8.4.2

1 2

[libvirt] [PATCH] Fix explicit usage of default video PCI slots
by Ján Tomko 20 Dec '13

20 Dec '13

Don't set the PCI address of primary video to the default if it's already occupied by another device. Without this, a primary video card that doesn't have an address gets the default one on the 1st pass of PCI address allocation, even if it's occupied. This address gets picked up by the second pass, and a conflict occurs: XML error: Attempted double use of PCI slot 0000:00:02.0 (may need "multifunction='on'" for device on function 0) Also fix the test that was supposed to catch this. --- src/qemu/qemu_command.c | 50 +++++++++++++++++++++--------------------------- tests/qemuxml2argvtest.c | 3 ++- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d723dc8..2a64cd1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2379,7 +2379,6 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, size_t i; virDevicePCIAddress tmp_addr; bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); - virDevicePCIAddressPtr addrptr; char *addrStr = NULL; qemuDomainPCIConnectFlags flags = QEMU_PCI_CONNECT_HOTPLUGGABLE | QEMU_PCI_CONNECT_TYPE_PCI; @@ -2446,22 +2445,17 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, */ virDomainVideoDefPtr primaryVideo = def->videos[0]; if (primaryVideo->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - primaryVideo->info.addr.pci.domain = 0; - primaryVideo->info.addr.pci.bus = 0; - primaryVideo->info.addr.pci.slot = 2; - primaryVideo->info.addr.pci.function = 0; - addrptr = &primaryVideo->info.addr.pci; - - if (!(addrStr = qemuDomainPCIAddressAsString(addrptr))) + memset(&tmp_addr, 0, sizeof(tmp_addr)); + tmp_addr.slot = 2; + + if (!(addrStr = qemuDomainPCIAddressAsString(&tmp_addr))) goto cleanup; - if (!qemuDomainPCIAddressValidate(addrs, addrptr, + if (!qemuDomainPCIAddressValidate(addrs, &tmp_addr, addrStr, flags, false)) goto cleanup; - if (qemuDomainPCIAddressSlotInUse(addrs, addrptr)) { + if (qemuDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { if (qemuDeviceVideoUsable) { - virResetLastError(); if (qemuDomainPCIAddressReserveNextSlot(addrs, &primaryVideo->info, flags) < 0) @@ -2472,8 +2466,11 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, "QEMU needs it for primary video")); goto cleanup; } - } else if (qemuDomainPCIAddressReserveSlot(addrs, addrptr, flags) < 0) { - goto cleanup; + } else { + if (qemuDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) + goto cleanup; + primaryVideo->info.addr.pci = tmp_addr; + primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } } else if (!qemuDeviceVideoUsable) { if (primaryVideo->info.addr.pci.domain != 0 || @@ -2535,7 +2532,6 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, size_t i; virDevicePCIAddress tmp_addr; bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); - virDevicePCIAddressPtr addrptr; char *addrStr = NULL; qemuDomainPCIConnectFlags flags = QEMU_PCI_CONNECT_TYPE_PCIE; @@ -2619,22 +2615,17 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, */ virDomainVideoDefPtr primaryVideo = def->videos[0]; if (primaryVideo->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - primaryVideo->info.addr.pci.domain = 0; - primaryVideo->info.addr.pci.bus = 0; - primaryVideo->info.addr.pci.slot = 1; - primaryVideo->info.addr.pci.function = 0; - addrptr = &primaryVideo->info.addr.pci; - - if (!(addrStr = qemuDomainPCIAddressAsString(addrptr))) + memset(&tmp_addr, 0, sizeof(tmp_addr)); + tmp_addr.slot = 1; + + if (!(addrStr = qemuDomainPCIAddressAsString(&tmp_addr))) goto cleanup; - if (!qemuDomainPCIAddressValidate(addrs, addrptr, + if (!qemuDomainPCIAddressValidate(addrs, &tmp_addr, addrStr, flags, false)) goto cleanup; - if (qemuDomainPCIAddressSlotInUse(addrs, addrptr)) { + if (qemuDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { if (qemuDeviceVideoUsable) { - virResetLastError(); if (qemuDomainPCIAddressReserveNextSlot(addrs, &primaryVideo->info, flags) < 0) @@ -2645,8 +2636,11 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, "QEMU needs it for primary video")); goto cleanup; } - } else if (qemuDomainPCIAddressReserveSlot(addrs, addrptr, flags) < 0) { - goto cleanup; + } else { + if (qemuDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) + goto cleanup; + primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + primaryVideo->info.addr.pci = tmp_addr; } } else if (!qemuDeviceVideoUsable) { if (primaryVideo->info.addr.pci.domain != 0 || diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 847e96f..5a2bfcc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1193,7 +1193,8 @@ mymain(void) DO_TEST("video-device-pciaddr-default", QEMU_CAPS_KVM, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA); + QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA, + QEMU_CAPS_DEVICE_PCI_BRIDGE); DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); -- 1.8.3.2

4 5

[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