- Devel - libvirt List Archives

[libvirt] [PATCH v2 00/15] Implement post-copy migration
by Jiri Denemark 22 Jan '16

22 Jan '16

(See "Add public APIs for post-copy migration" patch for more details about post-copy migration.) Post-copy support was originally written by Cristian Klein in 2014, but no one touched the series since then. Some patches in this series are modified versions of the old patches from Cristian, some patches had to be rewritten from scratch since libvirt code changed a lot (we started using migration events), and some patches are completely new. While post-copy migration is included in QEMU 2.5.0, it didn't support everything libvirt needs. Thus you need QEMU from git to use post-copy. Luckily, the QEMU migration capability we need to enable to use post-copy is still prefixed with "x-", which means it's still considered experimental. Once we are sure QEMU gives us all we need, the "x-" prefix will be removed. Seamless SPICE migration doesn't work with post-copy now, but I'll look at that. Fetching statistics of a completed post-copy migration does not work either (libvirt would report incorrect data). This series (VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY support) depends on "Introduce migration iteration event" series I sent yesterday. Version 2: - VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY flag dropped - --postcopy-after-precopy implemented entirely in virsh Cristian Klein (6): Add public APIs for post-copy migration qemu: Add QMP functions for post-copy migration qemu: Add support for VIR_MIGRATE_POSTCOPY flag qemu: Implement virDomainMigrateStartPostCopy virsh: Add support for post-copy migration virsh: Add --postcopy-after-precopy option to migrate Jiri Denemark (9): Add event and state details for post-copy qemu: Don't explicitly stop CPUs after migration qemu: Handle postcopy-active migration state virsh: Configurable migrate --timeout action qemu: Don't kill running migrated domain on daemon restart qemu: Refactor qemuProcessRecoverMigration qemu: Handle post-copy migration failures qemu: Refuse to abort migration in post-copy mode qemu: Add flags to qemuMigrationWaitForCompletion examples/object-events/event-test.c | 9 ++ include/libvirt/libvirt-domain.h | 11 ++ src/conf/domain_conf.c | 7 +- src/driver-hypervisor.h | 5 + src/libvirt-domain.c | 114 +++++++++++++++ src/libvirt_public.syms | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 72 ++++++++- src/qemu/qemu_migration.c | 283 ++++++++++++++++++++++++++++++------ src/qemu/qemu_migration.h | 6 +- src/qemu/qemu_monitor.c | 16 +- src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 23 +++ src/qemu/qemu_monitor_json.h | 3 + src/qemu/qemu_process.c | 249 +++++++++++++++++++------------ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 +- src/remote_protocol-structs | 5 + tools/virsh-domain-monitor.c | 7 +- tools/virsh-domain.c | 158 ++++++++++++++++++-- tools/virsh.pod | 31 +++- 22 files changed, 865 insertions(+), 160 deletions(-) -- 2.7.0

2 27

[libvirt] rbd: Add support for wiping and cloning images to storage driver
by Wido den Hollander 22 Jan '16

22 Jan '16

These two patches add support for buildVolFrom and wipeVol to the RBD storage driver. Wiping is done by discarding all blocks on the RBD image. Building a volume from a original is done leveraging the cloning mechanism RBD already supports.

3 14

[libvirt] [PATCH 0/4] lxc: fix 'free' usage on fedora 23
by Cole Robinson 22 Jan '16

22 Jan '16

We need to add a few bits to our /proc/meminfo virtualization to make 'free' work correctly on Fedora 23. https://bugzilla.redhat.com/show_bug.cgi?id=1300781 Cole Robinson (4): lxc: fuse: Unindent meminfo logic lxc: fuse: Fix /proc/meminfo size calculation lxc: fuse: Fill in MemAvailable for /proc/meminfo lxc: fuse: Stub out Slab bits in /proc/meminfo src/lxc/lxc_fuse.c | 141 +++++++++++++++++++++++++++++------------------------ 1 file changed, 76 insertions(+), 65 deletions(-) -- 2.5.0

2 6

[libvirt] parsing url with percent sign when user want to use iso disk via http
by Vasiliy Tolstov 22 Jan '16

22 Jan '16

I found a strange thing, when i specify url for iso in libvirt xml like: qemu gets invalid url in cmdline i think that problem is qemu/qemu_command.c:3430: ret = virURIFormat(uri); test string looks like https://alukardd.org/data/test?t=1 qemu gets url with percent urlencoded %3F , in this case http server get not test with param t=1 but filename test%3Ft=1 so this is not right. why libvirt try to fix contructed url ? does it safe to delete this line ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

3 2

[libvirt] An AB deadlock and libvirtd crash problem the other day with virsh console
by weifuqiang 22 Jan '16

22 Jan '16

Hi all: I encountered with an AB deadlock and libvirtd crash problem the other day. The process to generate the problems: 1 use the command "virsh create ***.xml" to create a vm 2 after vm is running , use the command "virsh console ***" to connect vm with console 3 after connection, use the command "virsh destroy ****" to destroy vm and delete it Then, an AB lock problem occurs, or libvirtd got crashed. AB LOCK stack: [Switching to thread 1 (Thread 0x7ff96bf3d7a0 (LWP 9772))] #0 0x00007ff967b49324 in __lll_lock_wait () from /lib64/libpthread.so.0 #0 0x00007ff967b49324 in __lll_lock_wait () from /lib64/libpthread.so.0 #1 0x00007ff967b44669 in _L_lock_1008 () from /lib64/libpthread.so.0 #2 0x00007ff967b4447e in pthread_mutex_lock () from /lib64/libpthread.so.0 #3 0x00007ff96b3bd96c in virChrdevFDStreamCloseCb () from /usr/lib64/libvirt.so.0 #4 0x00007ff96b3c9a34 in virFDStreamCloseInt () from /usr/lib64/libvirt.so.0 #5 0x00007ff96b40ac3e in virStreamAbort () from /usr/lib64/libvirt.so.0 #6 0x00007ff96bfa242a in daemonStreamHandleAbort () #7 0x00007ff96bfa2803 in daemonStreamEvent () #8 0x00007ff96b3c9bfc in virFDStreamEvent () from /usr/lib64/libvirt.so.0 #9 0x00007ff96b3083aa in virEventPollRunOnce () from /usr/lib64/libvirt.so.0 #10 0x00007ff96b307042 in virEventRunDefaultImpl () from /usr/lib64/libvirt.so.0 #11 0x00007ff96b4503dd in virNetDaemonRun () from /usr/lib64/libvirt.so.0 #12 0x00007ff96bf72528 in main () [Switching to thread 12 (Thread 0x7ff9640ff700 (LWP 9778))] #0 0x00007ff967b49324 in __lll_lock_wait () from /lib64/libpthread.so.0 #0 0x00007ff967b49324 in __lll_lock_wait () from /lib64/libpthread.so.0 #1 0x00007ff967b44669 in _L_lock_1008 () from /lib64/libpthread.so.0 #2 0x00007ff967b4447e in pthread_mutex_lock () from /lib64/libpthread.so.0 #3 0x00007ff96b3c8f26 in virFDStreamSetInternalCloseCb () from /usr/lib64/libvirt.so.0 #4 0x00007ff96b30f7b9 in virHashForEach () from /usr/lib64/libvirt.so.0 #5 0x00007ff96b3be1a2 in virChrdevFree () from /usr/lib64/libvirt.so.0 #6 0x00007ff96055980f in qemuDomainObjPrivateFree () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #7 0x00007ff96b367014 in virDomainObjDispose () from /usr/lib64/libvirt.so.0 #8 0x00007ff96b330c33 in virObjectUnref () from /usr/lib64/libvirt.so.0 #9 0x00007ff96b35edb9 in virDomainObjEndAPI () from /usr/lib64/libvirt.so.0 #10 0x00007ff9605c6e89 in qemuDomainUndefineFlags () from /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so #11 0x00007ff96b3e35ac in virDomainUndefine () from /usr/lib64/libvirt.so.0 #12 0x00007ff96bf996db in remoteDispatchDomainUndefineHelper () #13 0x00007ff96b4537ef in virNetServerProgramDispatch () from /usr/lib64/libvirt.so.0 #14 0x00007ff96b45205e in virNetServerProcessMsg () from /usr/lib64/libvirt.so.0 #15 0x00007ff96b4520e8 in virNetServerHandleJob () from /usr/lib64/libvirt.so.0 #16 0x00007ff96b349f94 in virThreadPoolWorker () from /usr/lib64/libvirt.so.0 #17 0x00007ff96b3494a8 in virThreadHelper () from /usr/lib64/libvirt.so.0 #18 0x00007ff967b42806 in start_thread () from /lib64/libpthread.so.0 #19 0x00007ff96789d67d in clone () from /lib64/libc.so.6 #20 0x0000000000000000 in ?? () coredump stack (gdb) f 1 #1 0x00007f1672a7c73f in virMutexLock (m=0x68) at util/virthread.c:89 89 pthread_mutex_lock(&m->lock); (gdb) bt #0 0x00007f1670ace444 in pthread_mutex_lock () from /lib64/libpthread.so.0 #1 0x00007f1672a7c73f in virMutexLock (m=0x68) at util/virthread.c:89 #2 0x00007f1672b2fda2 in virFDStreamSetInternalCloseCb (st=0x7f1673a1a370, cb=0x0, opaque=0x0, fcb=0x0) at fdstream.c:796 #3 0x00007f1672b1f5ad in virChrdevFreeClearCallbacks (payload=0x7f1673a1a370, name=0x7f1673a12520, data=0x0) at conf/virchrdev.c:301 #4 0x00007f1672a36c9b in virHashForEach (table=0x7f1673a0ba20, iter=0x7f1672b1f567 <virChrdevFreeClearCallbacks>, data=0x0) at util/virhash.c:521 #5 0x00007f1672b1f626 in virChrdevFree (devs=0x7f1673a2f820) at conf/virchrdev.c:316 #6 0x00007f1669cca988 in qemuDomainObjPrivateFree (data=0x7f1673a1afa0) at qemu/qemu_domain.c:496 #7 0x00007f1672a9e293 in virDomainObjDispose (obj=0x7f1673a16400) at conf/domain_conf.c:2545 #8 0x00007f1672a5b326 in virObjectUnref (anyobj=0x7f1673a16400) at util/virobject.c:265 #9 0x00007f1672a9e7a5 in virDomainObjEndAPI (vm=0x7f166b07d8d0) at conf/domain_conf.c:2684 #10 0x00007f1669d3ff00 in qemuDomainDestroyFlags (dom=0x7f16600017f0, flags=0) at qemu/qemu_driver.c:2264 #11 0x00007f1669d3ff69 in qemuDomainDestroy (dom=0x7f16600017f0) at qemu/qemu_driver.c:2273 #12 0x00007f1672b39333 in virDomainDestroy (domain=0x7f16600017f0) at libvirt-domain.c:483 #13 0x00007f16737167a5 in remoteDispatchDomainDestroy (server=0x7f167398f4f0, client=0x7f1673a172f0, msg=0x7f1673a2fc70, rerr=0x7f166b07db50, args=0x7f1673a2f9b0) at remote_dispatch.h:4002 #14 0x00007f1673716648 in remoteDispatchDomainDestroyHelper (server=0x7f167398f4f0, client=0x7f1673a172f0, msg=0x7f1673a2fc70, rerr=0x7f166b07db50, args=0x7f1673a2f9b0, ret= 0x7f1673a10e10) at remote_dispatch.h:3977 #15 0x00007f1672bd8a9b in virNetServerProgramDispatchCall (prog=0x7f167399c610, server=0x7f167398f4f0, client=0x7f1673a172f0, msg=0x7f1673a2fc70) at rpc/virnetserverprogram.c:437 #16 0x00007f1672bd85fd in virNetServerProgramDispatch (prog=0x7f167399c610, server=0x7f167398f4f0, client=0x7f1673a172f0, msg=0x7f1673a2fc70) at rpc/virnetserverprogram.c:307 #17 0x00007f1672bd2a08 in virNetServerProcessMsg (srv=0x7f167398f4f0, client=0x7f1673a172f0, prog=0x7f167399c610, msg=0x7f1673a2fc70) at rpc/virnetserver.c:136 #18 0x00007f1672bd2aed in virNetServerHandleJob (jobOpaque=0x7f1673a1d780, opaque=0x7f167398f4f0) at rpc/virnetserver.c:157 #19 0x00007f1672a7d833 in virThreadPoolWorker (opaque=0x7f167399bad0) at util/virthreadpool.c:145 #20 0x00007f1672a7cbec in virThreadHelper (data=0x7f167399c980) at util/virthread.c:206 #21 0x00007f1670acc806 in start_thread () from /lib64/libpthread.so.0 #22 0x00007f167082767d in clone () from /lib64/libc.so.6 #23 0x0000000000000000 in ?? () (gdb) bt #0 0x00007f1670ad3324 in __lll_lock_wait () from /lib64/libpthread.so.0 #1 0x00007f1670ace669 in _L_lock_1008 () from /lib64/libpthread.so.0 #2 0x00007f1670ace47e in pthread_mutex_lock () from /lib64/libpthread.so.0 #3 0x00007f1672a7c73f in virMutexLock (m=0x7f1673a2f820) at util/virthread.c:89 #4 0x00007f1672b1f3fe in virChrdevFDStreamCloseCb (st=0x7f1673a1a370, opaque=0x7f1673a149e0) at conf/virchrdev.c:254 #5 0x00007f1672b2e8a8 in virFDStreamCloseInt (st=0x7f1673a1a370, streamAbort=true) at fdstream.c:329 #6 0x00007f1672b2e9d5 in virFDStreamAbort (st=0x7f1673a1a370) at fdstream.c:355 #7 0x00007f1672b7d856 in virStreamAbort (stream=0x7f1673a1a370) at libvirt-stream.c:663 #8 0x00007f16737497e8 in daemonStreamHandleAbort (client=0x7f1673a1b1b0, stream=0x7f1673a1ec50, msg=0x7f1673a0d660) at stream.c:613 #9 0x00007f16737499fa in daemonStreamHandleWrite (client=0x7f1673a1b1b0, stream=0x7f1673a1ec50) at stream.c:662 #10 0x00007f167374866b in daemonStreamEvent (st=0x7f1673a1a370, events=14, opaque=0x7f1673a1b1b0) at stream.c:138 #11 0x00007f1672b2e17a in virFDStreamEvent (watch=18, fd=17, events=14, opaque=0x7f1673a1a370) at fdstream.c:173 #12 0x00007f1672a2c2cb in virEventPollDispatchHandles (nfds=12, fds=0x7f1673a2fda0) at util/vireventpoll.c:509 #13 0x00007f1672a2cb08 in virEventPollRunOnce () at util/vireventpoll.c:658 #14 0x00007f1672a2a9e0 in virEventRunDefaultImpl () at util/virevent.c:308 #15 0x00007f1672bd25d2 in virNetDaemonRun (dmn=0x7f1673990ed0) at rpc/virnetdaemon.c:707 #16 0x00007f167370cad4 in main (argc=3, argv=0x7ffd63276288) at libvirtd.c:1581 The reason of this problem is that fdstream abort event or close event occured at the same time, libvirtd doesn't deal with the synchronousness well enough. //ÄãÕâÀïÔÏÈÏë±í´ïµÄ¾ßÌåÒâË¼ÊÇ£¿ the flows about fdStream is bellow 1¡¢qemuDomainDefineXMLFlags -> virDomainObjListAdd -> qemuDomainObjPrivateAlloc -> virChrdevAlloc -> virHashCreate 2¡¢qemuDomainOpenConsole -> virChrdevOpen -> virHashAddEntry(devs->hash, path, st) 3¡¢virDomainObjDispose -> privateDataFreeFunc (qemuDomainObjPrivateFree) - > virChrdevFree(*dev locked*) -> virChrdevFreeClearCallbacks - > virFDStreamSetInternalCloseCb(*fdst locked*) 4¡¢virFDStreamCloseInt (*fdst locked*) -> icbFreeOpaque(virChrdevFDStreamCloseCb (*dev locked*)) -> virHashRemoveEntry The AB lock problem is obviouse: in step 3, it locks chardev before fdst, and in step 4, it's the opsite way. The reason of libvirtd crash is that: in virFDStreamCloseInt function we set fdst to NULL, while in virFDStreamSetInternalCloseCb we use fdst->lock, note that fdst has already been freed. another crash problem occurs because that when virChrdevFree was earlier finished, dev->hash freed and all date of hash is freed, but fdstream event flow use fdStream after hash free. Ahha~~£¬ libvirtd coredump. All of those problem is because clear vm flow and fdStream flow concurs synchronously. then I fix this problem by modify virChrdevFree() void virChrdevFree(virChrdevsPtr devs) { if (!devs || !devs->hash) return; for (;;) { virMutexLock(&devs->lock); if (0 == virHashSize(devs->hash)) { virMutexUnlock(&devs->lock); break; } virMutexUnlock(&devs->lock); usleep(10 * 1000); } virMutexLock(&devs->lock); virHashFree(devs->hash); virMutexUnlock(&devs->lock); virMutexDestroy(&devs->lock); VIR_FREE(devs); } If the chardev is removed by fdStream close or fdStream abort when vm destroy or shutdown, the modification works well. But I'm not sure is that all chardev would be removed when we clear vm, if not, it would always sleep here. Another solution is as follows: virMutexLock(vm); virChrdevFree(); virMutexUnlock(vm); virMutexLock(vm); virFDStreamCloseInt(); virMutexUnlock(vm); I lock vm before calling these 2 functions, which makes them run sequently. Do you have other better idea to solve this problem. thanks in advance. Best Regards David

2 1

[libvirt] [PATCH 1/4] rbd: Add wiping RBD volumes by using rbd_discard() or rbd_write()
by Wido den Hollander 22 Jan '16

22 Jan '16

This allows user to use the volume wiping functionality of the libvirt storage driver. This patch also adds a new wiping algorithm VIR_STORAGE_VOL_WIPE_ALG_DISCARD By default the VIR_STORAGE_VOL_WIPE_ALG_ZERO algorithm is used and with RBD this will called rbd_write() in chunks of the underlying object size to completely zero out the volume. With VIR_STORAGE_VOL_WIPE_ALG_DISCARD it will call rbd_discard() in the same object size chunks which will trim/discard all underlying RADOS objects in the Ceph cluster. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- include/libvirt/libvirt-storage.h | 4 + src/storage/storage_backend_rbd.c | 157 +++++++++++++++++++++++++++++++++++++- tools/virsh-volume.c | 2 +- 3 files changed, 161 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 2c55c93..139add3 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -153,6 +153,10 @@ typedef enum { VIR_STORAGE_VOL_WIPE_ALG_RANDOM = 8, /* 1-pass random */ + VIR_STORAGE_VOL_WIPE_ALG_DISCARD = 9, /* 1-pass, discard all data on the + volume by using TRIM or + DISCARD */ + # ifdef VIR_ENUM_SENTINELS VIR_STORAGE_VOL_WIPE_ALG_LAST /* diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index e20a54d..c0001d0 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -32,6 +32,7 @@ #include "base64.h" #include "viruuid.h" #include "virstring.h" +#include "virutil.h" #include "rados/librados.h" #include "rbd/librbd.h" @@ -730,6 +731,159 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, return ret; } +static int virStorageBackendRBDVolWipeZero(rbd_image_t image, + char *imgname, + rbd_image_info_t info, + uint64_t stripe_count) +{ + int r = -1; + size_t offset = 0; + uint64_t length; + char *writebuf; + + if (VIR_ALLOC_N(writebuf, info.obj_size * stripe_count) < 0) + goto cleanup; + + while (offset < info.size) { + length = MIN((info.size - offset), (info.obj_size * stripe_count)); + + r = rbd_write(image, offset, length, writebuf); + if (r < 0) { + virReportSystemError(-r, _("writing %llu bytes failed on " + " RBD image %s at offset %llu"), + (unsigned long long)length, + imgname, + (unsigned long long)offset); + goto cleanup; + } + + VIR_DEBUG("Wrote %llu bytes to RBD image %s at offset %llu", + (unsigned long long)length, + imgname, (unsigned long long)offset); + + offset += length; + } + + cleanup: + VIR_FREE(writebuf); + + return r; +} + +static int virStorageBackendRBDVolWipeDiscard(rbd_image_t image, + char *imgname, + rbd_image_info_t info, + uint64_t stripe_count) +{ + int r = -1; + size_t offset = 0; + uint64_t length; + + VIR_DEBUG("Wiping RBD %s volume using discard)", imgname); + + while (offset < info.size) { + length = MIN((info.size - offset), (info.obj_size * stripe_count)); + + r = rbd_discard(image, offset, length); + if (r < 0) { + virReportSystemError(-r, _("discarding %llu bytes failed on " + " RBD image %s at offset %llu"), + (unsigned long long)length, + imgname, + (unsigned long long)offset); + goto cleanup; + } + + VIR_DEBUG("Discarded %llu bytes of RBD image %s at offset %llu", + (unsigned long long)length, + imgname, (unsigned long long)offset); + + offset += length; + } + + cleanup: + return r; +} + +static int virStorageBackendRBDVolWipe(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int algorithm, + unsigned int flags) +{ + virStorageBackendRBDState ptr; + ptr.cluster = NULL; + ptr.ioctx = NULL; + rbd_image_t image = NULL; + rbd_image_info_t info; + uint64_t stripe_count; + int r = -1; + + virCheckFlags(VIR_STORAGE_VOL_WIPE_ALG_ZERO | + VIR_STORAGE_VOL_WIPE_ALG_DISCARD, -1); + + VIR_DEBUG("Wiping RBD image %s/%s", pool->def->source.name, vol->name); + + if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) + goto cleanup; + + if (virStorageBackendRBDOpenIoCTX(&ptr, pool) < 0) + goto cleanup; + + r = rbd_open(ptr.ioctx, vol->name, &image, NULL); + if (r < 0) { + virReportSystemError(-r, _("failed to open the RBD image %s"), + vol->name); + goto cleanup; + } + + r = rbd_stat(image, &info, sizeof(info)); + if (r < 0) { + virReportSystemError(-r, _("failed to stat the RBD image %s"), + vol->name); + goto cleanup; + } + + r = rbd_get_stripe_count(image, &stripe_count); + if (r < 0) { + virReportSystemError(-r, _("failed to get stripe count of RBD image %s"), + vol->name); + goto cleanup; + } + + VIR_DEBUG("Need to wipe %llu bytes from RBD image %s/%s", + (unsigned long long)info.size, pool->def->source.name, vol->name); + + switch (algorithm) { + case VIR_STORAGE_VOL_WIPE_ALG_ZERO: + r = virStorageBackendRBDVolWipeZero(image, vol->name, + info, stripe_count); + break; + case VIR_STORAGE_VOL_WIPE_ALG_DISCARD: + r = virStorageBackendRBDVolWipeDiscard(image, vol->name, + info, stripe_count); + break; + default: + virReportError(VIR_ERR_INVALID_ARG, _("unsupported algorithm %d"), + algorithm); + r = -VIR_ERR_INVALID_ARG; + goto cleanup; + } + + if (r < 0) { + virReportSystemError(-r, _("failed to wipe RBD image %s"), + vol->name); + goto cleanup; + } + + cleanup: + if (image) + rbd_close(image); + + virStorageBackendRBDCloseRADOSConn(&ptr); + return r; +} + virStorageBackend virStorageBackendRBD = { .type = VIR_STORAGE_POOL_RBD, @@ -738,5 +892,6 @@ virStorageBackend virStorageBackendRBD = { .buildVol = virStorageBackendRBDBuildVol, .refreshVol = virStorageBackendRBDRefreshVol, .deleteVol = virStorageBackendRBDDeleteVol, - .resizeVol = virStorageBackendRBDResizeVol, + .wipeVol = virStorageBackendRBDVolWipe, + .resizeVol = virStorageBackendRBDResizeVol }; diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 661c876..f86980f 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -906,7 +906,7 @@ static const vshCmdOptDef opts_vol_wipe[] = { VIR_ENUM_DECL(virStorageVolWipeAlgorithm) VIR_ENUM_IMPL(virStorageVolWipeAlgorithm, VIR_STORAGE_VOL_WIPE_ALG_LAST, "zero", "nnsa", "dod", "bsi", "gutmann", "schneier", - "pfitzner7", "pfitzner33", "random"); + "pfitzner7", "pfitzner33", "random", "discard"); static bool cmdVolWipe(vshControl *ctl, const vshCmd *cmd) -- 1.9.1

2 2

[libvirt] [PATCH LIBVIRT v3] libxl: Support cmdline= in xl config files
by Ian Campbell 22 Jan '16

22 Jan '16

... and consolidate the cmdline/extra/root parsing to facilitate doing so. The logic is the same as xl's parse_cmdline from the current xen.git master branch (e6f0e099d2c17de47fd86e817b1998db903cab61). On the formatting side switch to producing cmdline= instead of extra=. Update a few tests and add serveral more. - test-cmdline is added to test the exclusive use of cmdline. - test-fullvirt-direct-kernel-boot.cfg is updated due to the switch on the formatting side and now tests the exclusive use of cmdline=. - Tests are added for both paravirt and fullvirt where the .cfg uses extra= and (paravirt only) root=. These are format (xl->xml) only since the inverse will generate cmdline= hence is not a round trip (which was already true if using root=, which used to generate extra= on the way back). - Tests are added for both paravirt and fullvirt where the .cfg declares cmdline= as well as bogus extra= and (paravirt only) root= entries which should be ignored. Again these are format only tests since the inverse won't include the bogus lines. The last two bullets here required splitting the DO_TEST macro into two halves, as is done in the xmconfigtest.c case. In order to introduce a use of VIR_WARN for logging I had to add virerror.h and VIR_LOG_INIT. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- v2: Use VIR_INFO (adding necessary infra) Don't initialise things to NULL when there is no need. v3: I know know the answer re VIR_FROM_THIS, because Jim fixed it. Initialise cmdline to NULL, since neither I nor gcc were smart enough to spot the uninitialised path I did this in preference to adding the else case, since that apparently won't be masking the compiler's ability to spot uninitialised vars in this function. Add tests Addjust xenFormatXLOS to produce cmdline= instead of extra=. --- src/xenconfig/xen_xl.c | 70 +++++++++++++--------- ...est-fullvirt-direct-kernel-boot-bogus-extra.cfg | 31 ++++++++++ ...est-fullvirt-direct-kernel-boot-bogus-extra.xml | 51 ++++++++++++++++ .../test-fullvirt-direct-kernel-boot-extra.cfg | 30 ++++++++++ .../test-fullvirt-direct-kernel-boot-extra.xml | 51 ++++++++++++++++ .../test-fullvirt-direct-kernel-boot.cfg | 2 +- .../test-paravirt-cmdline-bogus-extra-root.cfg | 13 ++++ .../test-paravirt-cmdline-bogus-extra-root.xml | 32 ++++++++++ .../test-paravirt-cmdline-extra-root.cfg | 15 +++++ .../test-paravirt-cmdline-extra-root.xml | 32 ++++++++++ tests/xlconfigdata/test-paravirt-cmdline.cfg | 14 +++++ tests/xlconfigdata/test-paravirt-cmdline.xml | 32 ++++++++++ tests/xlconfigtest.c | 24 ++++++-- 13 files changed, 365 insertions(+), 32 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml create mode 100644 tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml create mode 100644 tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.cfg create mode 100644 tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml create mode 100644 tests/xlconfigdata/test-paravirt-cmdline-extra-root.cfg create mode 100644 tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml create mode 100644 tests/xlconfigdata/test-paravirt-cmdline.cfg create mode 100644 tests/xlconfigdata/test-paravirt-cmdline.xml diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 026cbcc..be194e3 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -27,6 +27,7 @@ #include "virconf.h" #include "virerror.h" +#include "virlog.h" #include "domain_conf.h" #include "viralloc.h" #include "virstring.h" @@ -35,6 +36,8 @@ #define VIR_FROM_THIS VIR_FROM_XENXL +VIR_LOG_INIT("xen.xen_xl"); + /* * Xen provides a libxl utility library, with several useful functions, * specifically xlu_disk_parse for parsing xl disk config strings. @@ -58,11 +61,46 @@ extern int xlu_disk_parse(XLU_Config *cfg, libxl_device_disk *disk); #endif +static int xenParseCmdline(virConfPtr conf, char **r_cmdline) +{ + char *cmdline = NULL; + const char *root, *extra, *buf; + + if (xenConfigGetString(conf, "cmdline", &buf, NULL) < 0) + return -1; + + if (xenConfigGetString(conf, "root", &root, NULL) < 0) + return -1; + + if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) + return -1; + + if (buf) { + if (VIR_STRDUP(cmdline, buf) < 0) + return -1; + if (root || extra) + VIR_WARN("ignoring root= and extra= in favour of cmdline="); + } else { + if (root && extra) { + if (virAsprintf(&cmdline, "root=%s %s", root, extra) < 0) + return -1; + } else if (root) { + if (virAsprintf(&cmdline, "root=%s", root) < 0) + return -1; + } else if (extra) { + if (VIR_STRDUP(cmdline, extra) < 0) + return -1; + } + } + + *r_cmdline = cmdline; + return 0; +} + static int xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) { size_t i; - const char *extra, *root; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { const char *boot; @@ -84,19 +122,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0) return -1; - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) - return -1; - - if (xenConfigGetString(conf, "root", &root, NULL) < 0) + if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; - - if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; - } else { - if (VIR_STRDUP(def->os.cmdline, extra) < 0) - return -1; - } #endif if (xenConfigGetString(conf, "boot", &boot, "c") < 0) @@ -132,19 +159,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0) return -1; - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) - return -1; - - if (xenConfigGetString(conf, "root", &root, NULL) < 0) + if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; - - if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; - } else { - if (VIR_STRDUP(def->os.cmdline, extra) < 0) - return -1; - } } return 0; @@ -503,7 +519,7 @@ xenFormatXLOS(virConfPtr conf, virDomainDefPtr def) return -1; if (def->os.cmdline && - xenConfigSetString(conf, "extra", def->os.cmdline) < 0) + xenConfigSetString(conf, "cmdline", def->os.cmdline) < 0) return -1; #endif @@ -554,7 +570,7 @@ xenFormatXLOS(virConfPtr conf, virDomainDefPtr def) return -1; if (def->os.cmdline && - xenConfigSetString(conf, "extra", def->os.cmdline) < 0) + xenConfigSetString(conf, "cmdline", def->os.cmdline) < 0) return -1; } /* !hvm */ diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg new file mode 100644 index 0000000..83ab975 --- /dev/null +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.cfg @@ -0,0 +1,31 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +pae = 1 +acpi = 1 +apic = 1 +hap = 0 +viridian = 0 +rtc_timeoffset = 0 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +device_model = "/usr/lib/xen/bin/qemu-system-i386" +sdl = 0 +vnc = 1 +vncunused = 1 +vnclisten = "127.0.0.1" +vncpasswd = "123poi" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] +parallel = "none" +serial = "none" +builder = "hvm" +kernel = "/tmp/vmlinuz" +ramdisk = "/tmp/initrd" +cmdline = "ignore_loglvl" +extra = "SHOULD BE IGNORED" +boot = "d" +disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ] diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml new file mode 100644 index 0000000..f750e02 --- /dev/null +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml @@ -0,0 +1,51 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <kernel>/tmp/vmlinuz</kernel> + <initrd>/tmp/initrd</initrd> + <cmdline>ignore_loglvl</cmdline> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='variable' adjustment='0' basis='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> + <disk type='block' device='disk'> + <driver name='phy' type='raw'/> + <source dev='/dev/HostVG/XenGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + <model type='e1000'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> + <listen type='address' address='127.0.0.1'/> + </graphics> + </devices> +</domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg new file mode 100644 index 0000000..f452af6 --- /dev/null +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.cfg @@ -0,0 +1,30 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +pae = 1 +acpi = 1 +apic = 1 +hap = 0 +viridian = 0 +rtc_timeoffset = 0 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +device_model = "/usr/lib/xen/bin/qemu-system-i386" +sdl = 0 +vnc = 1 +vncunused = 1 +vnclisten = "127.0.0.1" +vncpasswd = "123poi" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000" ] +parallel = "none" +serial = "none" +builder = "hvm" +kernel = "/tmp/vmlinuz" +ramdisk = "/tmp/initrd" +extra = "ignore_loglvl" +boot = "d" +disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ] diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml new file mode 100644 index 0000000..f750e02 --- /dev/null +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml @@ -0,0 +1,51 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenfv'>hvm</type> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader> + <kernel>/tmp/vmlinuz</kernel> + <initrd>/tmp/initrd</initrd> + <cmdline>ignore_loglvl</cmdline> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='variable' adjustment='0' basis='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> + <disk type='block' device='disk'> + <driver name='phy' type='raw'/> + <source dev='/dev/HostVG/XenGuest2'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='qemu' type='raw'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + <model type='e1000'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> + <listen type='address' address='127.0.0.1'/> + </graphics> + </devices> +</domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg index f452af6..32b08e1 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.cfg @@ -25,6 +25,6 @@ serial = "none" builder = "hvm" kernel = "/tmp/vmlinuz" ramdisk = "/tmp/initrd" -extra = "ignore_loglvl" +cmdline = "ignore_loglvl" boot = "d" disk = [ "/dev/HostVG/XenGuest2,raw,hda,w,backendtype=phy", "/root/boot.iso,raw,hdc,r,backendtype=qdisk,devtype=cdrom" ] diff --git a/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.cfg b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.cfg new file mode 100644 index 0000000..c5b25af --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.cfg @@ -0,0 +1,13 @@ +localtime = 0 +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge" ] +kernel = "/tmp/vmlinuz" +ramdisk = "/tmp/initrd" +cmdline = "root=/dev/xvda1 console=hvc0" +extra = "SHOULD BE IGNORED" +root = "SHOULD BE IGNORED" +disk = [ "/dev/HostVG/XenGuest2,raw,xvda,w" ] diff --git a/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml new file mode 100644 index 0000000..f4ab9e6 --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml @@ -0,0 +1,32 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/tmp/vmlinuz</kernel> + <initrd>/tmp/initrd</initrd> + <cmdline>root=/dev/xvda1 console=hvc0</cmdline> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/dev/HostVG/XenGuest2'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlconfigdata/test-paravirt-cmdline-extra-root.cfg b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.cfg new file mode 100644 index 0000000..d0c503b --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.cfg @@ -0,0 +1,15 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge" ] +kernel = "/tmp/vmlinuz" +ramdisk = "/tmp/initrd" +root = "/dev/xvda1" +extra = "console=hvc0" +disk = [ "/dev/HostVG/XenGuest2,raw,xvda,w,backendtype=qdisk" ] diff --git a/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml new file mode 100644 index 0000000..f4ab9e6 --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml @@ -0,0 +1,32 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/tmp/vmlinuz</kernel> + <initrd>/tmp/initrd</initrd> + <cmdline>root=/dev/xvda1 console=hvc0</cmdline> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/dev/HostVG/XenGuest2'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlconfigdata/test-paravirt-cmdline.cfg b/tests/xlconfigdata/test-paravirt-cmdline.cfg new file mode 100644 index 0000000..c512a05 --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline.cfg @@ -0,0 +1,14 @@ +name = "XenGuest2" +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +vcpus = 1 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge" ] +kernel = "/tmp/vmlinuz" +ramdisk = "/tmp/initrd" +cmdline = "root=/dev/xvda1 console=hvc0" +disk = [ "/dev/HostVG/XenGuest2,raw,xvda,w,backendtype=qdisk" ] diff --git a/tests/xlconfigdata/test-paravirt-cmdline.xml b/tests/xlconfigdata/test-paravirt-cmdline.xml new file mode 100644 index 0000000..f4ab9e6 --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-cmdline.xml @@ -0,0 +1,32 @@ +<domain type='xen'> + <name>XenGuest2</name> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <kernel>/tmp/vmlinuz</kernel> + <initrd>/tmp/initrd</initrd> + <cmdline>root=/dev/xvda1 console=hvc0</cmdline> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> + <source file='/dev/HostVG/XenGuest2'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:92:9c'/> + <source bridge='xenbr1'/> + <script path='vif-bridge'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index e997009..bad69ca 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -180,29 +180,45 @@ mymain(void) if (!(xmlopt = libxlCreateXMLConf())) return EXIT_FAILURE; -#define DO_TEST(name) \ +#define DO_TEST_PARSE(name) \ do { \ struct testInfo info0 = { name, 0 }; \ - struct testInfo info1 = { name, 1 }; \ - if (virtTestRun("Xen XM-2-XML Parse " name, \ + if (virtTestRun("Xen XL-2-XML Parse " name, \ testCompareHelper, &info0) < 0) \ ret = -1; \ - if (virtTestRun("Xen XM-2-XML Format " name, \ + } while (0) + +#define DO_TEST_FORMAT(name) \ + do { \ + struct testInfo info1 = { name, 1 }; \ + if (virtTestRun("Xen XL-2-XML Format " name, \ testCompareHelper, &info1) < 0) \ ret = -1; \ } while (0) +#define DO_TEST(name) \ + do { \ + DO_TEST_PARSE(name); \ + DO_TEST_FORMAT(name); \ + } while (0) + DO_TEST("paravirt-maxvcpus"); DO_TEST("new-disk"); DO_TEST("spice"); DO_TEST("spice-features"); DO_TEST("vif-rate"); + DO_TEST("paravirt-cmdline"); + DO_TEST_FORMAT("paravirt-cmdline-extra-root"); + DO_TEST_FORMAT("paravirt-cmdline-bogus-extra-root"); + #ifdef LIBXL_HAVE_BUILDINFO_USBDEVICE_LIST DO_TEST("fullvirt-multiusb"); #endif #ifdef LIBXL_HAVE_BUILDINFO_KERNEL DO_TEST("fullvirt-direct-kernel-boot"); + DO_TEST_FORMAT("fullvirt-direct-kernel-boot-extra"); + DO_TEST_FORMAT("fullvirt-direct-kernel-boot-bogus-extra"); #endif virObjectUnref(caps); -- 2.1.4

2 1

[libvirt] [PATCH v2] libxl: dispose libxl_dominfo after libxl_domain_info()
by Joao Martins 22 Jan '16

22 Jan '16

As suggested in a previous thread [0] this patch adds some missing calls to libxl_dominfo_{init,dispose} when doing some of the libxl_domain_info operations which would otherwise lead to memory leaks. [0] https://www.redhat.com/archives/libvir-list/2015-September/msg00519.html Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- Changes since v1: - Add missing libxl_dominfo_init() on MemoryStats and GetInfo() --- src/libxl/libxl_driver.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 73ed448..560f2a6 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -358,6 +358,8 @@ libxlReconnectDomain(virDomainObjPtr vm, virObjectLock(vm); + libxl_dominfo_init(&d_info); + /* Does domain still exist? */ rc = libxl_domain_info(cfg->ctx, &d_info, vm->def->id); if (rc == ERROR_INVAL) { @@ -389,11 +391,13 @@ libxlReconnectDomain(virDomainObjPtr vm, /* Enable domain death events */ libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW); + libxl_dominfo_dispose(&d_info); virObjectUnlock(vm); virObjectUnref(cfg); return 0; out: + libxl_dominfo_dispose(&d_info); libxlDomainCleanup(driver, vm); if (!vm->persistent) virDomainObjListRemoveLocked(driver->domains, vm); @@ -1589,6 +1593,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->memory = vm->def->mem.cur_balloon; info->maxMem = virDomainDefGetMemoryActual(vm->def); } else { + libxl_dominfo_init(&d_info); + if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxl_domain_info failed for domain '%d'"), @@ -1598,6 +1604,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->cpuTime = d_info.cpu_time; info->memory = d_info.current_memkb; info->maxMem = d_info.max_memkb; + + libxl_dominfo_dispose(&d_info); } info->state = virDomainObjGetState(vm, NULL); @@ -4791,6 +4799,7 @@ libxlDomainMemoryStats(virDomainPtr dom, virCheckFlags(0, -1); + libxl_dominfo_init(&d_info); cfg = libxlDriverConfigGet(driver); if (!(vm = libxlDomObjFromDomain(dom))) @@ -4822,13 +4831,12 @@ libxlDomainMemoryStats(virDomainPtr dom, ret = i; - libxl_dominfo_dispose(&d_info); - endjob: if (!libxlDomainObjEndJob(driver, vm)) vm = NULL; cleanup: + libxl_dominfo_dispose(&d_info); if (vm) virObjectUnlock(vm); virObjectUnref(cfg); -- 2.1.4

2 1

[libvirt] [PATCH 0/2] Xen: cleanup use of virErrorDomain enum
by Jim Fehlig 22 Jan '16

22 Jan '16

While reviewing a patch from Ian Campbell, I noticed the various Xen-related elements in the virErrorDomain enum were not used correctly throughout the corresponding source files. Patch 1 fixes use of existing Xen-related elements in virErrorDomain. Patch 2 adds a new element for Xen XL config and uses it in src/xenconfig/xen_xl.c. Jim Fehlig (2): Xen: VIR_FROM_THIS cleanup Xen: add XENXL to virErrorDomain enum include/libvirt/virterror.h | 1 + src/util/virerror.c | 1 + src/xen/xs_internal.c | 2 +- src/xenconfig/xen_common.c | 1 + src/xenconfig/xen_sxpr.c | 2 ++ src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xm.c | 1 + src/xenconfig/xenxs_private.h | 2 -- 8 files changed, 8 insertions(+), 4 deletions(-) -- 2.6.1

2 5

[libvirt] [PATCH LIBVIRT v2] libxl: Support cmdline= in xl config files
by Ian Campbell 22 Jan '16

22 Jan '16

... and consolidate the cmdline/extra/root parsing to facilitate doing so. The logic is the same as xl's parse_cmdline from the current xen.git master branch (e6f0e099d2c17de47fd86e817b1998db903cab61). In order to introduce a use of VIR_WARN for logging I had to add virerror.h and VIR_LOG_INIT. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- NB: I was unsure if I was supposed to change VIR_FROM_NONE into VIR_FROM_XEN, so I didn't (but will on advice). v2: Use VIR_INFO (adding necessary infra) Don't initialise things to NULL when there is no need. --- src/xenconfig/xen_xl.c | 66 +++++++++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 25 deletions(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 91cdff6..3d820cc 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -27,6 +27,7 @@ #include "virconf.h" #include "virerror.h" +#include "virlog.h" #include "domain_conf.h" #include "viralloc.h" #include "virstring.h" @@ -35,6 +36,8 @@ #define VIR_FROM_THIS VIR_FROM_NONE +VIR_LOG_INIT("xen.xen_xl"); + /* * Xen provides a libxl utility library, with several useful functions, * specifically xlu_disk_parse for parsing xl disk config strings. @@ -58,11 +61,46 @@ extern int xlu_disk_parse(XLU_Config *cfg, libxl_device_disk *disk); #endif +static int xenParseCmdline(virConfPtr conf, char **r_cmdline) +{ + char *cmdline; + const char *root, *extra, *buf; + + if (xenConfigGetString(conf, "cmdline", &buf, NULL) < 0) + return -1; + + if (xenConfigGetString(conf, "root", &root, NULL) < 0) + return -1; + + if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) + return -1; + + if (buf) { + if (VIR_STRDUP(cmdline, buf) < 0) + return -1; + if (root || extra) + VIR_WARN("ignoring root= and extra= in favour of cmdline="); + } else { + if (root && extra) { + if (virAsprintf(&cmdline, "root=%s %s", root, extra) < 0) + return -1; + } else if (root) { + if (virAsprintf(&cmdline, "root=%s", root) < 0) + return -1; + } else if (extra) { + if (VIR_STRDUP(cmdline, extra) < 0) + return -1; + } + } + + *r_cmdline = cmdline; + return 0; +} + static int xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) { size_t i; - const char *extra, *root; if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { const char *boot; @@ -84,19 +122,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0) return -1; - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) - return -1; - - if (xenConfigGetString(conf, "root", &root, NULL) < 0) + if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; - - if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; - } else { - if (VIR_STRDUP(def->os.cmdline, extra) < 0) - return -1; - } #endif if (xenConfigGetString(conf, "boot", &boot, "c") < 0) @@ -132,19 +159,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < 0) return -1; - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) - return -1; - - if (xenConfigGetString(conf, "root", &root, NULL) < 0) + if (xenParseCmdline(conf, &def->os.cmdline) < 0) return -1; - - if (root) { - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) - return -1; - } else { - if (VIR_STRDUP(def->os.cmdline, extra) < 0) - return -1; - } } return 0; -- 2.1.4

2 3

[libvirt] [python PATCH] Add support for MIGRATION_ITERATION event
by Jiri Denemark 21 Jan '16

21 Jan '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- examples/event-test.py | 4 +++ libvirt-override-virConnect.py | 9 +++++++ libvirt-override.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/examples/event-test.py b/examples/event-test.py index 2c6ce7b..615f86c 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -530,6 +530,9 @@ def myDomainEventAgentLifecycleCallback(conn, dom, state, reason, opaque): def myDomainEventDeviceAddedCallback(conn, dom, dev, opaque): print("myDomainEventDeviceAddedCallback: Domain %s(%s) device added: %s" % ( dom.name(), dom.ID(), dev)) +def myDomainEventMigrationIteration(conn, dom, iteration, opaque): + print("myDomainEventMigrationIteration: Domain %s(%s) started migration iteration %d" % ( + dom.name(), dom.ID(), iteration)) ########################################################################## # Network events @@ -642,6 +645,7 @@ def main(): vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_TUNABLE, myDomainEventTunableCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE, myDomainEventAgentLifecycleCallback, None) vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, myDomainEventDeviceAddedCallback, None) + vc.domainEventRegisterAny(None, libvirt.VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION, myDomainEventMigrationIteration, None) vc.networkEventRegisterAny(None, libvirt.VIR_NETWORK_EVENT_ID_LIFECYCLE, myNetworkEventLifecycleCallback, None) diff --git a/libvirt-override-virConnect.py b/libvirt-override-virConnect.py index 821be87..4231195 100644 --- a/libvirt-override-virConnect.py +++ b/libvirt-override-virConnect.py @@ -216,6 +216,15 @@ cb(self, virDomain(self, _obj=dom), devAlias, opaque) return 0 + def _dispatchDomainEventMigrationIterationCallback(self, dom, iteration, cbData): + """Dispatches event to python user domain migration iteration event callbacks + """ + cb = cbData["cb"] + opaque = cbData["opaque"] + + cb(self, virDomain(self, _obj=dom), iteration, opaque) + return 0 + def domainEventDeregisterAny(self, callbackID): """Removes a Domain Event Callback. De-registering for a domain callback will disable delivery of this event type """ diff --git a/libvirt-override.c b/libvirt-override.c index 5f1c98f..a8c019b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -6783,6 +6783,58 @@ libvirt_virConnectDomainEventDeviceAddedCallback(virConnectPtr conn ATTRIBUTE_UN } #endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */ +#ifdef VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION +static int +libvirt_virConnectDomainEventMigrationIterationCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int iteration, + void *opaque) +{ + PyObject *pyobj_cbData = (PyObject*)opaque; + PyObject *pyobj_dom; + PyObject *pyobj_ret = NULL; + PyObject *pyobj_conn; + PyObject *dictKey; + int ret = -1; + + LIBVIRT_ENSURE_THREAD_STATE; + + if (!(dictKey = libvirt_constcharPtrWrap("conn"))) + goto cleanup; + pyobj_conn = PyDict_GetItem(pyobj_cbData, dictKey); + Py_DECREF(dictKey); + + /* Create a python instance of this virDomainPtr */ + virDomainRef(dom); + if (!(pyobj_dom = libvirt_virDomainPtrWrap(dom))) { + virDomainFree(dom); + goto cleanup; + } + Py_INCREF(pyobj_cbData); + + /* Call the Callback Dispatcher */ + pyobj_ret = PyObject_CallMethod(pyobj_conn, + (char*)"_dispatchDomainEventMigrationIterationCallback", + (char*)"OiO", + pyobj_dom, iteration, pyobj_cbData); + + Py_DECREF(pyobj_cbData); + Py_DECREF(pyobj_dom); + + cleanup: + if (!pyobj_ret) { + DEBUG("%s - ret:%p\n", __FUNCTION__, pyobj_ret); + PyErr_Print(); + } else { + Py_DECREF(pyobj_ret); + ret = 0; + } + + LIBVIRT_RELEASE_THREAD_STATE; + return ret; +} +#endif /* VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION */ + static PyObject * libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -6883,6 +6935,11 @@ libvirt_virConnectDomainEventRegisterAny(PyObject *self ATTRIBUTE_UNUSED, cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventDeviceAddedCallback); break; #endif /* VIR_DOMAIN_EVENT_ID_DEVICE_ADDED */ +#ifdef VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION + case VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION: + cb = VIR_DOMAIN_EVENT_CALLBACK(libvirt_virConnectDomainEventMigrationIterationCallback); + break; +#endif /* VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION */ case VIR_DOMAIN_EVENT_ID_LAST: break; } -- 2.7.0

2 1

[libvirt] [PATCH 0/2] Introduce migration iteration event
by Jiri Denemark 21 Jan '16

21 Jan '16

Jiri Denemark (2): Introduce migration iteration event qemu: Add support for migration iteration event daemon/remote.c | 32 ++++++++++++++++++ include/libvirt/libvirt-domain.h | 22 +++++++++++++ src/conf/domain_event.c | 71 ++++++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 8 +++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_monitor.c | 13 ++++++++ src/qemu/qemu_monitor.h | 8 +++++ src/qemu/qemu_monitor_json.c | 17 ++++++++++ src/qemu/qemu_process.c | 30 +++++++++++++++++ src/remote/remote_driver.c | 33 +++++++++++++++++++ src/remote/remote_protocol.x | 14 +++++++- src/remote_protocol-structs | 6 ++++ tools/virsh-domain.c | 18 ++++++++++ 13 files changed, 273 insertions(+), 1 deletion(-) -- 2.7.0

2 5

[libvirt] [PATCH v3 0/6] admin: Introduce server listing API
by Erik Skultety 21 Jan '16

21 Jan '16

Since v2: - static names of daemons are passed to virNetServerNew directly, instead of creating an array of names like the previous version did - dropped client-side server identification through ID, only name is used - adjusted naming of some methods (prefixes again...) - converted the server listing example to virt-admin command (finally) Erik Skultety (6): rpc: Introduce new element 'name' to virnetserver structure virnetdaemon: Add post exec restart support for multiple servers admin: Move admin_server.{h,c} to admin.{h,c} admin: Introduce virAdmServer structure admin: Introduce adminDaemonConnectListServers API virt-admin: Introduce cmdSrvList daemon/Makefile.am | 6 +- daemon/admin.c | 181 +++++++++++++++++++++ daemon/admin.h | 36 ++++ daemon/admin_server.c | 121 +++++--------- daemon/admin_server.h | 23 ++- daemon/libvirtd.c | 4 +- include/libvirt/libvirt-admin.h | 11 ++ po/POTFILES.in | 2 +- src/admin/admin_protocol.x | 26 ++- src/admin_protocol-structs | 15 ++ src/datatypes.c | 36 ++++ src/datatypes.h | 34 ++++ src/libvirt-admin.c | 148 +++++++++++++++++ src/libvirt_admin_private.syms | 5 + src/libvirt_admin_public.syms | 3 + src/locking/lock_daemon.c | 3 +- src/logging/log_daemon.c | 3 +- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetdaemon.c | 15 ++ src/rpc/virnetdaemon.h | 3 + src/rpc/virnetserver.c | 32 +++- src/rpc/virnetserver.h | 5 + .../input-data-admin-server-names.json | 128 +++++++++++++++ .../virnetdaemondata/output-data-admin-nomdns.json | 2 + .../output-data-admin-server-names.json | 128 +++++++++++++++ .../virnetdaemondata/output-data-anon-clients.json | 1 + .../output-data-initial-nomdns.json | 1 + tests/virnetdaemondata/output-data-initial.json | 1 + tests/virnetdaemontest.c | 40 ++--- tools/virt-admin.c | 62 +++++++ 30 files changed, 946 insertions(+), 131 deletions(-) create mode 100644 daemon/admin.c create mode 100644 daemon/admin.h create mode 100644 tests/virnetdaemondata/input-data-admin-server-names.json create mode 100644 tests/virnetdaemondata/output-data-admin-server-names.json -- 2.4.3

2 12

[libvirt] [PATCH] security_selinux: Fix crash in virSecuritySELinuxRestoreFileLabel
by Shanzhi Yu 21 Jan '16

21 Jan '16

when failed to boot a guest, virSecuritySELinuxRestoreFileLabel will be called eventually to reset security label, which will lead a crash if pass null to virFileResolveLink(path, &newpath). https://bugzilla.redhat.com/show_bug.cgi?id=1300532 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/security/security_selinux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 9e98635..c8a7553 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1026,7 +1026,7 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManagerPtr mgr, VIR_INFO("Restoring SELinux context on '%s'", path); - if (virFileResolveLink(path, &newpath) < 0) { + if (path && virFileResolveLink(path, &newpath) < 0) { VIR_WARN("cannot resolve symlink %s: %s", path, virStrerror(errno, ebuf, sizeof(ebuf))); goto err; -- 1.8.3.1

2 1

[libvirt] [PATCH] libxl: dispose libxl_dominfo after libxl_domain_info()
by Joao Martins 21 Jan '16

21 Jan '16

As suggested in a previous thread [0] this patch adds some missing calls to libxl_dominfo_dispose when doing some of the libxl_domain_info operations which would otherwise lead to memory leaks. [0] https://www.redhat.com/archives/libvir-list/2015-September/msg00519.html Signed-off-by: Joao Martins <joao.m.martins(a)oracle.com> --- src/libxl/libxl_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 73ed448..a449730 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -358,6 +358,8 @@ libxlReconnectDomain(virDomainObjPtr vm, virObjectLock(vm); + libxl_dominfo_init(&d_info); + /* Does domain still exist? */ rc = libxl_domain_info(cfg->ctx, &d_info, vm->def->id); if (rc == ERROR_INVAL) { @@ -389,11 +391,13 @@ libxlReconnectDomain(virDomainObjPtr vm, /* Enable domain death events */ libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW); + libxl_dominfo_dispose(&d_info); virObjectUnlock(vm); virObjectUnref(cfg); return 0; out: + libxl_dominfo_dispose(&d_info); libxlDomainCleanup(driver, vm); if (!vm->persistent) virDomainObjListRemoveLocked(driver->domains, vm); @@ -1598,6 +1602,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->cpuTime = d_info.cpu_time; info->memory = d_info.current_memkb; info->maxMem = d_info.max_memkb; + + libxl_dominfo_dispose(&d_info); } info->state = virDomainObjGetState(vm, NULL); -- 2.1.4

2 2

[libvirt] [PATCH] virsh: Don't fetch status for all domains in cmdList
by Michal Privoznik 21 Jan '16

21 Jan '16

We are getting the list of domains and after that we iterate over the list and try to get status for each domain hoping it will skip over domains that disappeared meanwhile. However, this solution to race is bogus - domain may disappear right after we have checked its state and before we exec another API over it (e.g. virDomainHasManagedSaveImage()). Also, when printing just names or uuids (list --name / --uuid) we issue APIs to obtain the values, however these require no RPC call as all requested info is in virDomain object that client already has. Therefore move the status obtaining only to the place that really needs it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain-monitor.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 7eb387d..7dcbc5c 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1876,17 +1876,17 @@ cmdList(vshControl *ctl, const vshCmd *cmd) else ignore_value(virStrcpyStatic(id_buf, "-")); - state = virshDomainState(ctl, dom, NULL); - - /* Domain could've been removed in the meantime */ - if (state < 0) - continue; - - if (optTable && managed && state == VIR_DOMAIN_SHUTOFF && - virDomainHasManagedSaveImage(dom, 0) > 0) - state = -2; - if (optTable) { + state = virshDomainState(ctl, dom, NULL); + + /* Domain could've been removed in the meantime */ + if (state < 0) + continue; + + if (managed && state == VIR_DOMAIN_SHUTOFF && + virDomainHasManagedSaveImage(dom, 0) > 0) + state = -2; + if (optTitle) { if (!(title = virshGetDomainDescription(ctl, dom, true, 0))) goto cleanup; -- 2.4.10

2 1

[libvirt] [PATCH] build: predictably generate systemtap tapsets (bz 1173641)
by Cole Robinson 20 Jan '16

20 Jan '16

The generated output is dependent on perl hashtable ordering, which gives different results for i686 and x86_64. Fix this by sorting the hash keys before iterating over them https://bugzilla.redhat.com/show_bug.cgi?id=1173641 --- src/rpc/gensystemtap.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl index 2467300..7b80fbf 100755 --- a/src/rpc/gensystemtap.pl +++ b/src/rpc/gensystemtap.pl @@ -72,7 +72,7 @@ function libvirt_rpc_auth_name(type, verbose) { EOF my $first = 1; -foreach my $type (keys %auth) { +foreach my $type (sort(keys %auth)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (type == ", $type, ") {\n"; @@ -95,7 +95,7 @@ function libvirt_rpc_type_name(type, verbose) { EOF $first = 1; -foreach my $type (keys %type) { +foreach my $type (sort(keys %type)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (type == ", $type, ") {\n"; @@ -118,7 +118,7 @@ function libvirt_rpc_status_name(status, verbose) { EOF $first = 1; -foreach my $status (keys %status) { +foreach my $status (sort(keys %status)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (status == ", $status, ") {\n"; @@ -141,7 +141,7 @@ function libvirt_rpc_program_name(program, verbose) { EOF $first = 1; -foreach my $prog (keys %funcs) { +foreach my $prog (sort(keys %funcs)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (program == ", $funcs{$prog}->{id}, ") {\n"; @@ -165,7 +165,7 @@ function libvirt_rpc_procedure_name(program, version, proc, verbose) { EOF $first = 1; -foreach my $prog (keys %funcs) { +foreach my $prog (sort(keys %funcs)) { my $cond = $first ? "if" : "} else if"; $first = 0; print " $cond (program == ", $funcs{$prog}->{id}, " && version == ", $funcs{$prog}->{version}, ") {\n"; -- 2.5.0

2 2

[libvirt] [PATCH] docs: fix syntax-check long line error
by Cole Robinson 20 Jan '16

20 Jan '16

--- Pushed as trivial docs/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 231aa4e..02eca64 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -220,7 +220,8 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ %.png: %.fig convert -rotate 90 $< $@ -%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl sitemap.html.in $(acl_generated) +%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ + sitemap.html.in $(acl_generated) @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ -- 2.5.0

1 0

[libvirt] [PATCH v3] libvirtd: Increase NL buffer size for lots of interface
by Leno Hou 20 Jan '16

20 Jan '16

1. When switching CPUs to offline/online in a system more than 128 cpus 2. When using virsh to destroy domain in a system with more interface All of above happens nl_recv returned with error: No buffer space available. This patch sets the socket buffer size to 128K and turns on message peeking for nl_recv,as this would solve this problem totally and permanetly. Signed-off-by: Leno Hou <houqy(a)linux.vnet.ibm.com> Cc: Wenyi Gao <wenyi(a)linux.vnet.ibm.com> CC: Laine Stump <laine(a)laine.org> CC: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetlink.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 679b48e..ea65cbc 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -65,10 +65,12 @@ struct virNetlinkEventHandle { # ifdef HAVE_LIBNL1 # define virNetlinkAlloc nl_handle_alloc +# define virSocketSetBufferSize nl_set_buffer_size # define virNetlinkFree nl_handle_destroy typedef struct nl_handle virNetlinkHandle; # else # define virNetlinkAlloc nl_socket_alloc +# define virSocketSetBufferSize nl_socket_set_buffer_size # define virNetlinkFree nl_socket_free typedef struct nl_sock virNetlinkHandle; # endif @@ -696,6 +698,14 @@ virNetlinkEventServiceStart(unsigned int protocol, unsigned int groups) goto error_server; } + if (virSocketSetBufferSize(srv->netlinknh, 131702, 0) < 0) { + virReportSystemError(errno, + "%s",_("cannot set netlink socket buffer size to 128k")); + goto error_server; + } + + nl_socket_enable_msg_peek(srv->netlinknh); + if ((srv->eventwatch = virEventAddHandle(fd, VIR_EVENT_HANDLE_READABLE, virNetlinkEventCallback, -- 1.9.1

3 6

[libvirt] [PATCH] qemuDomainReboot: use fakeReboot=true only for acpi mode
by Dmitry Andreev 20 Jan '16

20 Jan '16

When acpi is used to reboot/shutdown qemu domain, qemu emits SHUTDOWN event. Libvirt uses fakeReboot variable in order to differentiate reboot or shutdown. fakeReboot value is reseted to false after domain restart/reset. When mode=agent is used to reboot qemu domain, qemu doesn't emit SHUTDOWN event and libvirt doesn't reset fakeReboot value to false. In this case next 'shutdown -h now' performs reboot. That's why we don't need to set fakeReboot=true for mode=agent. --- src/qemu/qemu_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8ccf68b..e46404b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2068,8 +2068,6 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) goto endjob; } - qemuDomainSetFakeReboot(driver, vm, isReboot); - if (useAgent) { qemuDomainObjEnterAgent(vm); ret = qemuAgentShutdown(priv->agent, agentFlag); @@ -2096,6 +2094,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) #if WITH_YAJL } #endif + qemuDomainSetFakeReboot(driver, vm, isReboot); qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSystemPowerdown(priv->mon); if (qemuDomainObjExitMonitor(driver, vm) < 0) -- 1.8.3.1

2 1

[libvirt] [PATCH] docs: fix generation of docs from VPATH build
by Daniel P. Berrange 20 Jan '16

20 Jan '16

When generating docs in a VPATH build we get a failure to create a file due to the 'internals' subdir not existing: Generating internals/locking.html.tmp /bin/sh: line 3: internals/locking.html.tmp: No such file or directory rm: cannot remove ‘internals/locking.html.tmp’: No such file or directory Makefile:2229: recipe for target 'internals/locking.html.tmp' failed make: *** [internals/locking.html.tmp] Error 1 For some reason, make has decided to run the target %.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated) instead of the target internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in Removing '$(acl_generated)' from the first target, inexplicably causes make to now run the correct target for the internals/ files. Rather than figure this out, lets just combine the two targets into one. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/Makefile.am | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index fb53a45..231aa4e 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -220,21 +220,20 @@ $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ %.png: %.fig convert -rotate 90 $< $@ -internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in +%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl sitemap.html.in $(acl_generated) @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ - $(MKDIR_P) internals; \ name=`echo $@ | sed -e 's/.tmp//'`; \ + dir=`dirname $@` ; \ + if test "$$dir" = "."; \ + then \ + style=site.xsl; \ + else \ + $(MKDIR_P) $$dir; \ + style=subsite.xsl; \ + fi; \ $(XSLTPROC) --stringparam pagename $$name --nonet \ - $(top_srcdir)/docs/subsite.xsl $< > $@ \ - || { rm $@ && exit 1; }; fi - -%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated) - @if [ -x $(XSLTPROC) ] ; then \ - echo "Generating $@"; \ - name=`echo $@ | sed -e 's/.tmp//'`; \ - $(XSLTPROC) --stringparam pagename $$name --nonet \ - $(top_srcdir)/docs/site.xsl $< > $@ \ + $(top_srcdir)/docs/$$style $< > $@ \ || { rm $@ && exit 1; }; fi %.html: %.html.tmp -- 2.5.0

2 1

Re: [libvirt] [PATCH LIBVIRT] libxl: Support cmdline= in xl config files
by Ian Campbell 20 Jan '16

20 Jan '16

I went to ping this but noticed that I had sent it to "jimfehlig" (i.e. no domain), so no wonder there was no reply! To: line fixed here, let me know if you would prefer a resend. Ian. On Wed, 2015-12-16 at 12:09 +0000, Ian Campbell wrote: > ... and consolidate the cmdline/extra/root parsing to facilitate doing > so. > > The logic is the same as xl's parse_cmdline from the current xen.git master > branch (e6f0e099d2c17de47fd86e817b1998db903cab61), except I was unable > to figure out how/where to route the warning about ignoring > root+extra if cmdline was specified. > > Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> > --- > src/xenconfig/xen_xl.c | 62 ++++++++++++++++++++++++++++++------------ > -------- > 1 file changed, 37 insertions(+), 25 deletions(-) > > diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c > index 91cdff6..ba8b938 100644 > --- a/src/xenconfig/xen_xl.c > +++ b/src/xenconfig/xen_xl.c > @@ -58,11 +58,45 @@ extern int xlu_disk_parse(XLU_Config *cfg, > libxl_device_disk *disk); > #endif > > +static int xenParseCmdline(virConfPtr conf, char **r_cmdline) > +{ > + char *cmdline = NULL; > + const char *root = NULL, *extra = NULL, *buf = NULL; > + > + if (xenConfigGetString(conf, "cmdline", &buf, NULL) < 0) > + return -1; > + > + if (xenConfigGetString(conf, "root", &root, NULL) < 0) > + return -1; > + > + if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) > + return -1; > + > + if (buf) { > + if (VIR_STRDUP(cmdline, buf) < 0) > + return -1; > + /* root or extra are ignored in this case. */ > + } else { > + if (root && extra) { > + if (virAsprintf(&cmdline, "root=%s %s", root, extra) < 0) > + return -1; > + } else if (root) { > + if (virAsprintf(&cmdline, "root=%s", root) < 0) > + return -1; > + } else if (extra) { > + if (VIR_STRDUP(cmdline, extra) < 0) > + return -1; > + } > + } > + > + *r_cmdline = cmdline; > + return 0; > +} > + > static int > xenParseXLOS(virConfPtr conf, virDomainDefPtr def, virCapsPtr caps) > { > size_t i; > - const char *extra, *root; > > if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { > const char *boot; > @@ -84,19 +118,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, > virCapsPtr caps) > if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < > 0) > return -1; > > - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) > - return -1; > - > - if (xenConfigGetString(conf, "root", &root, NULL) < 0) > + if (xenParseCmdline(conf, &def->os.cmdline) < 0) > return -1; > - > - if (root) { > - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) > < 0) > - return -1; > - } else { > - if (VIR_STRDUP(def->os.cmdline, extra) < 0) > - return -1; > - } > #endif > > if (xenConfigGetString(conf, "boot", &boot, "c") < 0) > @@ -132,19 +155,8 @@ xenParseXLOS(virConfPtr conf, virDomainDefPtr def, > virCapsPtr caps) > if (xenConfigCopyStringOpt(conf, "ramdisk", &def->os.initrd) < > 0) > return -1; > > - if (xenConfigGetString(conf, "extra", &extra, NULL) < 0) > - return -1; > - > - if (xenConfigGetString(conf, "root", &root, NULL) < 0) > + if (xenParseCmdline(conf, &def->os.cmdline) < 0) > return -1; > - > - if (root) { > - if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) > < 0) > - return -1; > - } else { > - if (VIR_STRDUP(def->os.cmdline, extra) < 0) > - return -1; > - } > } > > return 0;

2 2

[libvirt] [PATCH 0/2] Fix problem generating partition names for multipath device
by John Ferlan 20 Jan '16

20 Jan '16

Originally posted as an RFC: http://www.redhat.com/archives/libvir-list/2015-December/msg00200.html I've made further adjustments/changes and actually tested in a multipath environment configured with the issue. For these patches, rather than making a "general" flag for the pool, I chose to add an attribute to the <source> 'device'. This way it was much more clear what the attribute was affecting. Additionally, it turned out that the issue was showing up for both 'user_friendly_names' and for custom 'alias' name entries in the /etc/multipath.conf file so rather than being a user_friendly_name type flag - I just chose to specific state what it was - a way to not have the partition separator flag "p" added to the generated name. Also it was a bit more difficult to describe the use of the flag especially when it was so specific to one backing store type. John Ferlan (2): conf: Add storage pool device attribute part_separator storage: Add new flag for libvirt_parthelper docs/formatstorage.html.in | 30 ++++++++++++++++++++-- docs/schemas/storagepool.rng | 5 ++++ src/conf/storage_conf.c | 26 +++++++++++++++++-- src/conf/storage_conf.h | 3 ++- src/storage/parthelper.c | 15 ++++++++--- src/storage/storage_backend_disk.c | 11 +++++++- .../pool-disk-device-nopartsep.xml | 14 ++++++++++ .../pool-disk-device-nopartsep.xml | 14 ++++++++++ tests/storagepoolxml2xmltest.c | 1 + 9 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-disk-device-nopartsep.xml create mode 100644 tests/storagepoolxml2xmlout/pool-disk-device-nopartsep.xml -- 2.5.0

2 4

[libvirt] [PATCH libguestfs v3] lib: Handle slow USB devices more gracefully.
by Richard W.M. Jones 20 Jan '16

20 Jan '16

Libvirt has a fixed 15 second timeout for qemu to exit. If qemu is writing to a slow USB key, it can hang (in D state) for much longer than this - many minutes usually. The solution is to check specifically for the libvirt EBUSY error when this happens, and retry the virDomainDestroyFlags operation (indefinitely). See also the description here: https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html Similar to the following OpenStack Nova commit: http://git.openstack.org/cgit/openstack/nova/commit/?id=3907867 Thanks: Kashyap Chamarthy and Daniel Berrange. --- src/launch-libvirt.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c index 8215e02..90b6c49 100644 --- a/src/launch-libvirt.c +++ b/src/launch-libvirt.c @@ -25,6 +25,7 @@ #include <unistd.h> #include <fcntl.h> #include <grp.h> +#include <errno.h> #include <sys/types.h> #include <sys/stat.h> #include <assert.h> @@ -2015,6 +2016,8 @@ ignore_errors (void *ignore, virErrorPtr ignore2) /* empty */ } +static int destroy_domain (guestfs_h *g, virDomainPtr dom, int check_for_errors); + static int shutdown_libvirt (guestfs_h *g, void *datav, int check_for_errors) { @@ -2023,23 +2026,14 @@ shutdown_libvirt (guestfs_h *g, void *datav, int check_for_errors) virDomainPtr dom = data->dom; size_t i; int ret = 0; - int flags; /* Note that we can be called back very early in launch (specifically * from launch_libvirt itself), when conn and dom might be NULL. */ - if (dom != NULL) { - flags = check_for_errors ? VIR_DOMAIN_DESTROY_GRACEFUL : 0; - debug (g, "calling virDomainDestroy \"%s\" flags=%s", - data->name, check_for_errors ? "VIR_DOMAIN_DESTROY_GRACEFUL" : "0"); - if (virDomainDestroyFlags (dom, flags) == -1) { - libvirt_error (g, _("could not destroy libvirt domain")); - ret = -1; - } + ret = destroy_domain (g, dom, check_for_errors); virDomainFree (dom); } - if (conn != NULL) virConnectClose (conn); @@ -2068,6 +2062,37 @@ shutdown_libvirt (guestfs_h *g, void *datav, int check_for_errors) return ret; } +/* Wrapper around virDomainDestroy which handles errors and retries.. */ +static int +destroy_domain (guestfs_h *g, virDomainPtr dom, int check_for_errors) +{ + const int flags = check_for_errors ? VIR_DOMAIN_DESTROY_GRACEFUL : 0; + virErrorPtr err; + + again: + debug (g, "calling virDomainDestroy flags=%s", + check_for_errors ? "VIR_DOMAIN_DESTROY_GRACEFUL" : "0"); + if (virDomainDestroyFlags (dom, flags) == -1) { + err = virGetLastError (); + + /* Second chance if we're just waiting for qemu to shut down. See: + * https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html + */ + if ((flags & VIR_DOMAIN_DESTROY_GRACEFUL) && + err && err->code == VIR_ERR_SYSTEM_ERROR && err->int1 == EBUSY) + goto again; + + /* "Domain not found" is not treated as an error. */ + if (err && err->code == VIR_ERR_NO_DOMAIN) + return 0; + + libvirt_error (g, _("could not destroy libvirt domain")); + return -1; + } + + return 0; +} + /* Wrapper around error() which produces better errors for * libvirt functions. */ -- 2.5.0

2 3

[libvirt] Failed to terminate process 1275 with SIGTERM: Device or resource busy
by Richard W.M. Jones 20 Jan '16

20 Jan '16

I didn't file a bug about this because it's not really clear what the bug is. Anyway, here goes ... $ virt-builder fedora-23 -o /dev/sdX [ 2.3] Downloading: http://libguestfs.org/download/builder/fedora-23.xz [ 3.0] Planning how to build this image [ 3.0] Uncompressing [ 18.1] Resizing (using virt-resize) to expand the disk to 14.9G virt-resize: error: libguestfs error: could not destroy libvirt domain: Failed to terminate process 1275 with SIGTERM: Device or resource busy [code=38 domain=0] $ ps ax | grep qemu 1275 ? Dl 0:49 /usr/bin/qemu-system-x86_64 -machine accel=kvm [...] What's actually happening here is that /dev/sdX is an incredibly slow[1] USB key. The virt-resize operation completes successfully, but qemu is blocked writing/fsyncing to the USB key, and takes a few minutes to exit. libvirt has a loop (src/util/virprocess.c:virProcessKillPainfully) which waits 15 seconds [comment says 10 seconds], and this wait is not configurable. There seem to be several possible solutions, none of them very nice: - Hard-code a longer wait in libvirt. - Make the wait in libvirt configurable. - If the process is in 'D' state, wait indefinitely. I tried another workaround which was to get virt-resize to fsync the output file before closing the libvirt connection, but that doesn't work for reasons I don't understand so far - still studying this. Rich. [1] "Incredibly slow" ... but it's just a regular USB key, they are all very slow! -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

3 8

[libvirt] [PATCH 00/16] Implement post-copy migration
by Jiri Denemark 19 Jan '16

19 Jan '16

(See "Add public APIs for post-copy migration" patch for more details about post-copy migration.) Post-copy support was originally written by Cristian Klein in 2014, but no one touched the series since then. Some patches in this series are modified versions of the old patches from Cristian, some patches had to be rewritten from scratch since libvirt code changed a lot (we started using migration events), and some patches are completely new. While post-copy migration is included in QEMU 2.5.0, it didn't support everything libvirt needs. Thus you need QEMU from git to use post-copy. Luckily, the QEMU migration capability we need to enable to use post-copy is still prefixed with "x-", which means it's still considered experimental. Once we are sure QEMU gives us all we need, the "x-" prefix will be removed. Seamless SPICE migration doesn't work with post-copy now, but I'll look at that. This series (VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY support) depends on "Introduce migration iteration event" series I sent yesterday. Cristian Klein (6): Add public APIs for post-copy migration qemu: Add QMP functions for post-copy migration qemu: Add support for VIR_MIGRATE_POSTCOPY flag qemu: Implement virDomainMigrateStartPostCopy virsh: Add support for post-copy migration virsh: Add --postcopy-after-precopy option to migrate Jiri Denemark (10): Add event and state details for post-copy qemu: Don't explicitly stop CPUs after migration qemu: Handle postcopy-active migration state qemu: Add flags to qemuMigrationWaitForCompletion qemu: Add support for VIR_MIGRATE_POSTCOPY_AFTER_PRECOPY flag virsh: Configurable migrate --timeout action qemu: Don't kill running migrated domain on daemon restart qemu: Refactor qemuProcessRecoverMigration qemu: Handle post-copy migration failures qemu: Refuse to abort migration in post-copy mode examples/object-events/event-test.c | 9 ++ include/libvirt/libvirt-domain.h | 12 ++ src/conf/domain_conf.c | 7 +- src/driver-hypervisor.h | 5 + src/libvirt-domain.c | 140 +++++++++++++++++ src/libvirt_public.syms | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 72 ++++++++- src/qemu/qemu_migration.c | 299 +++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 7 +- src/qemu/qemu_monitor.c | 16 +- src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 23 +++ src/qemu/qemu_monitor_json.h | 3 + src/qemu/qemu_process.c | 252 +++++++++++++++++++----------- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 +- src/remote_protocol-structs | 5 + tools/virsh-domain-monitor.c | 7 +- tools/virsh-domain.c | 131 ++++++++++++++-- tools/virsh.pod | 31 +++- 22 files changed, 884 insertions(+), 161 deletions(-) -- 2.7.0

2 18

[libvirt] [PATCH] leaseshelper: fix crash when no mac is specified
by Ján Tomko 19 Jan '16

19 Jan '16

If dnsmasq specified DNSMASQ_IAID (so we're dealing with an IPv6 lease) but no DNSMASQ_MAC, we skip creation of the new lease object. Also skip adding it to the leases array. https://bugzilla.redhat.com/show_bug.cgi?id=1202350 https://bugzilla.redhat.com/show_bug.cgi?id=1292941 --- src/network/leaseshelper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 2d528f7..6930310 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -439,7 +439,7 @@ main(int argc, char **argv) case VIR_LEASE_ACTION_OLD: case VIR_LEASE_ACTION_ADD: - if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { + if (lease_new && virJSONValueArrayAppend(leases_array_new, lease_new) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create json")); goto cleanup; -- 2.4.6

2 1

[libvirt] [PATCH 0/6] Refactor leaseshelper
by Ján Tomko 19 Jan '16

19 Jan '16

Split out some functions to make main() more readable. May depend on https://www.redhat.com/archives/libvir-list/2016-January/msg00595.html No functional change intented. Ján Tomko (6): leaseshelper: store server_duid as an allocated string leaseshelper: split out custom leases file read leaseshelper: split out virLeasePrintLeases leaseshelper: remove useless comparison leaseshelper: split out virLeaseNewFromArgv leaseshelper: reduce indentation level in virLeaseReadCustomLeaseFile src/network/leaseshelper.c | 500 +++++++++++++++++++++++++-------------------- 1 file changed, 284 insertions(+), 216 deletions(-) -- 2.4.6

2 12

[libvirt] [PATCH] cpu_map.xml: Expose svm flag for nested kvm on AMD CPU model
by Lin Ma 19 Jan '16

19 Jan '16

QEMU commit 75d373e disables svm by default since PC machine 2.2. So with PC machine version > 2.1, When a user wants to expose the svm flag to a guest, says: ...... <feature policy='require' name='svm'/> ...... The svm flag wont be passed to qemu command line, This patch fixes it. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/cpu/cpu_map.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 0b6d424..8f96843 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -686,7 +686,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1195,7 +1194,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1257,7 +1255,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1295,7 +1292,6 @@ <feature name='sse'/> <feature name='sse2'/> <feature name='sse4a'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1341,7 +1337,6 @@ <feature name='sse4.2'/> <feature name='sse4a'/> <feature name='ssse3'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> <feature name='xop'/> @@ -1391,7 +1386,6 @@ <feature name='sse4.2'/> <feature name='sse4a'/> <feature name='ssse3'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tbm'/> <feature name='tsc'/> -- 2.1.4

2 1

[libvirt] [PATCH v2] resize, builder: fsync the output file before closing the libvirt connection.
by Richard W.M. Jones 19 Jan '16

19 Jan '16

Libvirt has a fixed 15 second timeout for qemu to exit. If qemu is writing to a slow USB key, it can hang (in D state) for much longer than this - many minutes usually. To work around this, fsync the output file before closing the libvirt connection so that qemu shouldn't have anything (much) to write. We have to do this in a few places in the code. This is a hack - it would be better to find a way to fix this in libvirt. See also the description here: https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html --- builder/builder.ml | 8 +++++++- resize/resize.ml | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/builder/builder.ml b/builder/builder.ml index 1f9a472..093982d 100644 --- a/builder/builder.ml +++ b/builder/builder.ml @@ -722,7 +722,13 @@ let main () = (* Unmount everything and we're done! *) message (f_"Finishing off"); - g#umount_all (); + if cmdline.sync then ( + (* Work around libvirt 15 second timeout waiting for qemu + https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html *) + g#sync (); + Fsync.file output_filename + ); + g#shutdown (); g#close (); diff --git a/resize/resize.ml b/resize/resize.ml index d6dd9a5..84e38be 100644 --- a/resize/resize.ml +++ b/resize/resize.ml @@ -1283,6 +1283,11 @@ read the man page virt-resize(1). let g = if to_be_expanded then ( + (* Work around libvirt 15 second timeout waiting for qemu + https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html *) + g#sync (); + Fsync.file outfile; + g#shutdown (); g#close (); @@ -1354,6 +1359,11 @@ read the man page virt-resize(1). ) lvs ); + (* Work around libvirt 15 second timeout waiting for qemu + https://www.redhat.com/archives/libvir-list/2016-January/msg00767.html *) + g#sync (); + Fsync.file outfile; + (* Finished. Unmount disks and exit. *) g#shutdown (); g#close (); -- 2.5.0

1 0

[libvirt] [PATCH 0/2] Fix log related crasher
by Michal Privoznik 18 Jan '16

18 Jan '16

*** BLURB HERE *** Michal Privoznik (2): qemuProcessReadLog: Fix memcpy arguments virLogManagerDomainReadLogFile: Don't do dummy allocs src/logging/log_manager.c | 4 +--- src/qemu/qemu_process.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.4.10

3 6

[libvirt] [PATCH v2] qemuTestDriverInit: fill driver with zeroes
by Michal Privoznik 18 Jan '16

18 Jan '16

In the commit aea47e48c473a we have fixed a single pointer within driver structure. Since all callers pass statically allocated driver on stack other pointers within driver may contain random values too. Before touching it lets overwrite it with zeroes and thus fix all dangling pointers. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -Jirka's review worked in tests/testutilsqemu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index f2eacdd..ae69a18 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -555,11 +555,11 @@ int qemuTestCapsCacheInsert(virQEMUCapsCachePtr cache, const char *binary, int qemuTestDriverInit(virQEMUDriver *driver) { + memset(driver, 0, sizeof(*driver)); + if (virMutexInit(&driver->lock) < 0) return -1; - driver->securityManager = NULL; - driver->config = virQEMUDriverConfigNew(false); if (!driver->config) goto error; -- 2.4.10

3 2

[libvirt] [python PATCH v2] setup: Use cflags and ldflags properly
by Jiri Denemark 18 Jan '16

18 Jan '16

The setup.py script reads cflags and ldflags from pkg-config and uses them when compiling/linking C modules. Since both cflags and ldflags may include multiple compiler arguments we need to split them rather than concatenating them into a single argument. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: Version 2: - fix all modules I'm surprised it ever worked. setup.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/setup.py b/setup.py index 9bf583b..c44f84a 100755 --- a/setup.py +++ b/setup.py @@ -88,17 +88,15 @@ def get_module_lists(): c_modules = [] py_modules = [] - ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False) - cflags = get_pkgconfig_data(["--cflags"], "libvirt", False) + ldflags = get_pkgconfig_data(["--libs-only-L"], "libvirt", False).split() + cflags = get_pkgconfig_data(["--cflags"], "libvirt", False).split() module = Extension('libvirtmod', sources = ['libvirt-override.c', 'build/libvirt.c', 'typewrappers.c', 'libvirt-utils.c'], libraries = [ "virt" ], include_dirs = [ "." ]) - if cflags != "": - module.extra_compile_args.append(cflags) - if ldflags != "": - module.extra_link_args.append(ldflags) + module.extra_compile_args.extend(cflags) + module.extra_link_args.extend(ldflags) c_modules.append(module) py_modules.append("libvirt") @@ -107,10 +105,8 @@ def get_module_lists(): sources = ['libvirt-qemu-override.c', 'build/libvirt-qemu.c', 'typewrappers.c', 'libvirt-utils.c'], libraries = [ "virt-qemu" ], include_dirs = [ "." ]) - if cflags != "": - moduleqemu.extra_compile_args.append(cflags) - if ldflags != "": - moduleqemu.extra_link_args.append(ldflags) + moduleqemu.extra_compile_args.extend(cflags) + moduleqemu.extra_link_args.extend(ldflags) c_modules.append(moduleqemu) py_modules.append("libvirt_qemu") @@ -120,10 +116,8 @@ def get_module_lists(): sources = ['libvirt-lxc-override.c', 'build/libvirt-lxc.c', 'typewrappers.c', 'libvirt-utils.c'], libraries = [ "virt-lxc" ], include_dirs = [ "." ]) - if cflags != "": - modulelxc.extra_compile_args.append(cflags) - if ldflags != "": - modulelxc.extra_link_args.append(ldflags) + modulelxc.extra_compile_args.extend(cflags) + modulelxc.extra_link_args.extend(ldflags) c_modules.append(modulelxc) py_modules.append("libvirt_lxc") -- 2.7.0

2 1

[libvirt] [python PATCH] setup: Use cflags and ldflags properly
by Jiri Denemark 18 Jan '16

18 Jan '16

The setup.py script reads cflags and ldflags from pkg-config and uses them when compiling/linking C modules. Since both cflags and ldflags may include multiple compiler arguments we need to split them rather than concatenating them into a single argument. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 9bf583b..6994e75 100755 --- a/setup.py +++ b/setup.py @@ -96,9 +96,9 @@ def get_module_lists(): libraries = [ "virt" ], include_dirs = [ "." ]) if cflags != "": - module.extra_compile_args.append(cflags) + module.extra_compile_args.extend(cflags.split()) if ldflags != "": - module.extra_link_args.append(ldflags) + module.extra_link_args.extend(ldflags.split()) c_modules.append(module) py_modules.append("libvirt") -- 2.7.0

2 1

[libvirt] [python PATCH] Post-release version bump to 1.3.2
by Jiri Denemark 18 Jan '16

18 Jan '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d2beece..9bf583b 100755 --- a/setup.py +++ b/setup.py @@ -311,7 +311,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '1.3.1', + version = '1.3.2', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.7.0

1 1

[libvirt] [PATCH 0/2] qemu: Properly detect if qemu is unable to do snapshot due to AHCI
by Peter Krempa 18 Jan '16

18 Jan '16

Peter Krempa (2): qemu: monitor: Refactor error handling for 'savevm' qemu: snapshot: Correctly report qemu error on 'savevm' src/qemu/qemu_monitor_text.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) -- 2.6.2

2 3

[libvirt] [PATCH] rbd: Set r variable so it can be returned should an error occur
by Wido den Hollander 18 Jan '16

18 Jan '16

This was reported in bug #1298024 where r would be filled with the return code of rbd_open(). Should rbd_snap_unprotect() fail for any reason the virReportSystemError call would return 'Success' since rbd_open() succeeded. https://bugzilla.redhat.com/show_bug.cgi?id=1298024 Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/storage/storage_backend_rbd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index e20a54d..8c7a80d 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -473,7 +473,8 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, if (snap_count > 0) { for (i = 0; i < snap_count; i++) { - if (rbd_snap_is_protected(image, snaps[i].name, &protected)) { + r = rbd_snap_is_protected(image, snaps[i].name, &protected); + if (r < 0) { virReportSystemError(-r, _("failed to verify if snapshot '%s/%s@%s' is protected"), source->name, vol->name, snaps[i].name); @@ -485,7 +486,8 @@ static int virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioctx, "unprotected", source->name, vol->name, snaps[i].name); - if (rbd_snap_unprotect(image, snaps[i].name) < 0) { + r = rbd_snap_unprotect(image, snaps[i].name); + if (r < 0) { virReportSystemError(-r, _("failed to unprotect snapshot '%s/%s@%s'"), source->name, vol->name, snaps[i].name); -- 1.9.1

2 1

[libvirt] [PATCH 0/3] make containers memory settings API consistent
by Nikolay Shirokovskiy 18 Jan '16

18 Jan '16

Typical HVM hypervisor has 2 memory settings - maximum and current memory. (there could be more memory options of course but let's consider these two and their correlation). Current limit is implemented via ballooning and is not greater than maximum. Containers are different, we need only one parameter to control their memory consumption - current memory. Memory settings API, domain XML schema and domain internal representation arises obviously for HVMs where we have 2 different parameters. How one should adopt it for containers? This patch series makes these 2 parameters synonyms for containers. 1. API - make maximum memory API behaviour same to just memory. 2. internally keep cur_balloon and initial (or total) the same. 3. ignore cur_ballon in XML (we do it already, just keep internal representation consistent) Nikolay Shirokovskiy (3): lxc: make maximum and current settings same conf: keep cur_balloon and initial_memory the same docs: update memory setting descripitons docs/formatdomain.html.in | 6 ++--- src/conf/domain_conf.c | 8 +++++-- src/libvirt-domain.c | 6 ++++- src/lxc/lxc_driver.c | 58 ++++++++++++----------------------------------- tools/virsh.pod | 6 +++++ 5 files changed, 34 insertions(+), 50 deletions(-) -- 1.8.3.1

1 3

[libvirt] [PATCH 0/3] NEWS: Update for 2016
by Andrea Bolognani 18 Jan '16

18 Jan '16

Move all entries made in 2015 to a separate file and perform some minor cleanups while we're at it. Patch 1/3 is kinda big, so it might need to be explicitly allowed out of the moderation queue. Cheers. Andrea Bolognani (3): NEWS: Move 2015 entries to a separate file NEWS: Fix whitespace issues NEWS: Don't prefix version numbers with 'v' docs/{news.html.in => news-2015.html.in} | 325 +--- docs/news.html.in | 2852 +----------------------------- 2 files changed, 6 insertions(+), 3171 deletions(-) copy docs/{news.html.in => news-2015.html.in} (89%) -- 2.5.0

2 5

[libvirt] [PATCH] qemuTestDriverInit: fill driver with zeroes
by Michal Privoznik 18 Jan '16

18 Jan '16

In the commit aea47e48c473a we have fixed a single pointer within driver structure. Since all callers pass statically allocated driver on stack other pointers within driver may contain random values too. Before touching it lets overwrite it with zeroes and thus fix all dangling pointers. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/testutilsqemu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index f2eacdd..6c52b96 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -558,7 +558,7 @@ int qemuTestDriverInit(virQEMUDriver *driver) if (virMutexInit(&driver->lock) < 0) return -1; - driver->securityManager = NULL; + memset(driver, 0, sizeof(*driver)); driver->config = virQEMUDriverConfigNew(false); if (!driver->config) -- 2.4.10

2 2

[libvirt] [PATCH V2 0/9] support multi-thread compress migration.
by ShaoHe Feng 18 Jan '16

18 Jan '16

These series patches support multi-thread compress during live migration. Eli Qiao (4): Add test cases for qemuMonitorJSONGetMigrationParameter remote: Add support for set and get multil thread migration parameters qemu_driver: Add support to set/get migration parameters. virsh: Add set and get multi-thread migration parameters commands ShaoHe Feng (5): qemu_migration: Add support for mutil-thread compressed migration enable qemu: Add monitor API for get/set migration parameters set multi-thread compress params for Migrate3 during live migration virsh: add multi-thread migration option for live migrate command Implement the public APIs for multi-thread compress parameters. .gnulib | 2 +- daemon/remote.c | 62 +++++++++++ include/libvirt/libvirt-domain.h | 31 ++++++ src/driver-hypervisor.h | 14 +++ src/libvirt-domain.c | 110 +++++++++++++++++++ src/libvirt_public.syms | 5 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 186 ++++++++++++++++++++++++++++++++ src/qemu/qemu_migration.c | 105 ++++++++++++++++++ src/qemu/qemu_migration.h | 32 ++++-- src/qemu/qemu_monitor.c | 40 ++++++- src/qemu/qemu_monitor.h | 11 ++ src/qemu/qemu_monitor_json.c | 93 ++++++++++++++++ src/qemu/qemu_monitor_json.h | 9 ++ src/qemu/qemu_monitor_text.c | 95 +++++++++++++++++ src/qemu/qemu_monitor_text.h | 10 ++ src/remote/remote_driver.c | 54 ++++++++++ src/remote/remote_protocol.x | 30 +++++- src/remote_protocol-structs | 26 +++++ tests/qemumonitorjsontest.c | 53 ++++++++++ tools/virsh-domain.c | 223 ++++++++++++++++++++++++++++++++++++++- tools/virsh.pod | 37 +++++-- 22 files changed, 1212 insertions(+), 19 deletions(-) -- 2.1.4

4 19

[libvirt] [PATCH] Avoid wild securityManager pointer in tests
by Martin Kletzander 18 Jan '16

18 Jan '16

For some reason we are not setting the driver with memset() to zeros. But since commit 74abc3deac6e14ffa9151e425c6e6cd2b075aac5 driver->securityManager is being accessed and qemuagenttest started crashing due to that. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- I chose to just clear the pointer instead of clearing the whole driver with memset() and opening another can of worms. But I would rather do memset() to zeros. however, that can be done after a discussion. This needs to be pushed under the build-breaker rule... Done! tests/testutilsqemu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8a4f567b0b2a..f2eacdded53d 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -558,6 +558,8 @@ int qemuTestDriverInit(virQEMUDriver *driver) if (virMutexInit(&driver->lock) < 0) return -1; + driver->securityManager = NULL; + driver->config = virQEMUDriverConfigNew(false); if (!driver->config) goto error; -- 2.7.0

3 4

[libvirt] Release of libvirt-1.3.1
by Daniel Veillard 18 Jan '16

18 Jan '16

As planned I just tagged the release in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ I also tagged and pushed a python release though there is no change from 1.3.0: ftp://libvirt.org/libvirt/python/ This is a moderately large release with close to 300 commits packed in, one security patch for CVE-2015-5313, and some user visible feature improvement. There is also a lot of refactoring in code, makefiles etc along with other improvements and the usual flow of bug fixes: Features: - Various improvements for the Xen libxl driver (Jim Fehlig) - rbd: Add support for wiping and cloning images to storage driver (Wido den Hollander) - PCI hostdev improvements and fixes (Andrea Bolognani) Security: - CVE-2015-5313: storage: don't allow '/' in filesystem volume names (Eric Blake) Documentation: - virsh: Update description of lxc-enter-namespace (Guido Günther) - virsh: Document the --timestamp option (Andrea Bolognani) - docs: update to properly reflect meaning of fields in log filter (Laine Stump) - virStorageVolWipe: Document that wiping journaled FS is useless (Michal Privoznik) - storage: Add comments for backend APIs (John Ferlan) Portability: - build: fix distdir with wireshark disabled (Cole Robinson) - wireshark: Install into DESTDIR (Michal Privoznik) - cgroup: don't include sys/mount.h if not needed (Jasper Lievisse Adriaanse) - tools: Disable virt-login-shell on mingw (Michal Privoznik) - sysconf: Include unistd.h (Michal Privoznik) - Allow building lxc without virt-login-shell (Cédric Bosdonnat) - build: disable vbox on cygwin (Eric Blake) - virNetDevMacVLanTapSetup: Work around older systems (Michal Privoznik) Bug Fixes: - security: Do not restore labels on device tree binary (Jiri Denemark) - security: Do not restore kernel and initrd labels (Jiri Denemark) - cgroup: Fix possible bug as a result of code motion for vcpu cgroup setup (John Ferlan) - Revert "lxc_cgroup: Add check for NULL cgroup before AddTask call" (John Ferlan) - Revert "util: cgroups do not implicitly add task to new machine cgroup" (John Ferlan) - Revert "qemu: do not put a task into machine cgroup" (John Ferlan) - virt-aa-helper: don't deny writes to readonly mounts (Cédric Bosdonnat) - conf: Initialize 'deflate' for balloon parse XML (John Ferlan) - wireshark: Drop DESTDIR from install path (Michal Privoznik) - qemuProcessCleanupChardevDevice: Don't unlink NULL paths (Michal Privoznik) - xenconfig: check return value of regcomp (Jim Fehlig) - Xen: use correct domctl version in domaininfolist union (Jim Fehlig) - testutils: Fix coverity warning with REGENERATE_OUTPUT (Cole Robinson) - rpc: socket: Don't repeatedly attempt to launch daemon (Cole Robinson) - rpc: socket: Explicitly error if we exceed retry count (Cole Robinson) - rpc: Don't rewrite msg->fds on every read dispatch (Ben Gray) - util: eliminate bogus error log in virNetDevVPortProfileGetStatus (Laine Stump) - qemu: Set virtio channel state sooner (Michal Privoznik) - virDomainGetTime: Deny on RO connections (Michal Privoznik) - virDomainInterfaceAddresses: Allow API on RO connection too (Michal Privoznik) - Don't clear libvirt-internal paths when parsing status XML (Martin Kletzander) - virDomainMigrateUnmanagedParams: Don't blindly dereference @dconnuri (Michal Privoznik) - Fix USB model defaults for ppc64 (Martin Kletzander) - Avoid wild securityManager pointer in tests (Martin Kletzander) - tests: Fix running schematests directly from topdir (Cole Robinson) - qemu: Fix crash when defining XML with bogus emulator (Cole Robinson) - tests.nwfilterebiptablestest: swap actual and expected (Pavel Hrdina) - qemu: Fix NBD migration with default listenAddress (Jiri Denemark) - virLogVMessage: Don't leak rawinitmsg (Michal Privoznik) - virLogHostnameString: Don't leak hostname (Michal Privoznik) - virsh: Interrupt *event --loop on disconnect (Jiri Denemark) - virsh: Pass ctl to virshCatchDisconnect (Jiri Denemark) - qemu: Don't bother user with libvirt-internal paths (Martin Kletzander) - rbd: Do not append Ceph monitor port number 6789 if not provided (Wido den Hollander) - rbd: Do not error out on a single image during pool refresh (Wido den Hollander) - rbd: Only close RBD image if it has been opened (Wido den Hollander) - fix LSB part of virtlogd runlevel script (Olaf Hering) - virtlogd: fix lock file path in initscript (Michael Chapman) - spec: chkconfig(8) and service(8) are in /sbin/, not /bin/ (Michael Chapman) - spec: dbus-devel is needed as build dependency if polkit support is enabled (Michael Chapman) - storage: Clean up error path for create buildPool failure (John Ferlan) - libvirt-domain: fix dxml passing in virDomainMigrateToURI2 (Ján Tomko) - schema: interleave domain name and uuid with other elements (Ján Tomko) - qemu: Fix return value of qemuDomainGetBlockJobInfo (Michal Privoznik) - storage: do not leak storage pool XML filename (Michael Chapman) - qemu: do not leak NBD disk data in migration cookie (Michael Chapman) - qemu: do not copy out non-existent block job info (Michael Chapman) - vz: BUG: fix connecting hang in case of init failure (Maxim Nestratov) - storage: Fix startup issue for logical pool (John Ferlan) - qemu: Fix event generated for qemuDomainRevertToSnapshot (pause->run) (John Ferlan) - storage: Check FS pool source during virStorageBackendFileSystemIsMounted (John Ferlan) - qemuMonitorJSONEjectMedia: Don't leak stringified reply (Michal Privoznik) - virNetDevMacVLanTapSetup: Drop @multiqueue argument (Michal Privoznik) - qemu: Warn when using vhost-user without shared memory (Martin Kletzander) - storage: Ignore block devices that fail format detection (John Ferlan) - storage: Set ret = -1 on failures in virStorageBackendUpdateVolTargetInfo (John Ferlan) - qemu: cgroup: Don't use priv->ncpupids to iterate domain vCPUs (Peter Krempa) - qemu: cpu hotplug: Fix error handling logic (Peter Krempa) - qemu: qemuDomainSetVcpusAgent: re-check agent before calling it the again (Peter Krempa) - libxl: copy persistent domain definition while starting a guest (Pavel Hrdina) - xen: fix timer bug found by updated test (Pavel Hrdina) Improvements: - qemu: Print better warning in qemuAgentNotifyEvent (Yaniv Kaul) - build: Kill tools/wireshark Makefiles (Cole Robinson) - Expand $(wildcard) correctly (Michal Privoznik) - qemu: add support of optional 'autodeflate' attribute (Dmitry Andreev) - qemu: add capability check for memballoon 'deflate-on-oom' feature (Dmitry Andreev) - conf: introduce 'autodeflate' attribute for memballoon device (Dmitry Andreev) - rpc: socket: Minor cleanups (Cole Robinson) - Add missing virxdrdefs.h include to log_protocol (Roman Bogorodskiy) - virsh: Fix alignment in VIRSH_COMMON_OPT_CONFIG definition (Andrea Bolognani) - virsh: Create macro for common "interface" option (John Ferlan) - virsh: Create macro for common "network" option (John Ferlan) - virsh: Create macros for common "vol" options (John Ferlan) - virsh: Create macro for common "file" option (John Ferlan) - virsh: Create macro for common "current" option (John Ferlan) - virsh: Create macro for common "live" option (John Ferlan) - virsh: Create macro for common "config" option (John Ferlan) - virsh: Create macro for common "persistent" option (John Ferlan) - virsh: Create macro for common "domain" option (John Ferlan) - virsh: Adjustments for the VIRSH_COMMON_OPT_POOL (John Ferlan) - virsh: Convert VSH_POOL_ macro to VIRSH_COMMON_OPT_ (John Ferlan) - qemu: use enum when setting PCI "multi" value, not 0 or 1 (Laine Stump) - qemu: auto-add a USB2 controller set for Q35 machines (Laine Stump) - qemu: define virDomainDevAddUSBController() (Laine Stump) - conf: add virDomainDefAddController() (Laine Stump) - qemu: prefer 00:1D.x and 00:1A.x for USB2 controllers on Q35 (Laine Stump) - qemu: don't assume slot 0 is unused/reserved. (Laine Stump) - Unify int types handling in protocol files (Jasper Lievisse Adriaanse) - Use struct sockpeercred when available (Jasper Lievisse Adriaanse) - build: Kill docs/schemas/Makefile.am (Cole Robinson) - build: Kill include/libvirt/Makefile.am (Cole Robinson) - wireshark: Fix header of get_message_len() (Michal Privoznik) - wireshark: Replace WIRESHARK_COMPAT with actual version comparison (Michal Privoznik) - wireshark: s/tvb_length/tvb_captured_length/ (Michal Privoznik) - wireshark: s/ep_alloc/wmem_alloc/ (Michal Privoznik) - wireshark: s/proto_tree_add_text/proto_tree_add_item/ (Michal Privoznik) - qemu: Introduce QEMU_CAPS_VSERPORT_CHANGE (Michal Privoznik) - qemu: change qemuFindAgentConfig return type (Michal Privoznik) - Fix LSB requirements in service script and sync them (Martin Kletzander) - virsh: Add timestamps to network events (Andrea Bolognani) - virsh: Add timestamps to QEMU monitor events (Andrea Bolognani) - Provide parse flags to PostParse functions (Martin Kletzander) - qemu: command: wire up usage of q35/ich9 disable s3/s4 (Cole Robinson) - qemu: caps: check for q35/ICH9 disable S3/S4 (Cole Robinson) - qemu: caps: Rename CAPS_DISABLE_S[34] to CAPS_PIIX_DISABLE_S[34] (Cole Robinson) - qemu: capabilities: s/Pixx/Piix/g (Cole Robinson) - examples: Use one top level makefile (Cole Robinson) - cfg.mk: Drop period after filename for indent failures (Cole Robinson) - virt-host-validate-common: Print warning on missing IOMMU (Michal Privoznik) - tests: qemuxml2xml: Wire up QEMUCaps usage (Cole Robinson) - tests: add genericxml2xmltest (Cole Robinson) - tests: qemuxml2xml: drop early file loading (Cole Robinson) - tests: Share domain XML2XML compare helper (Cole Robinson) - tests: Add newlines with VIR_TEST_REGENERATE_OUTPUT (Cole Robinson) - libxl: support vif outgoing bandwidth QoS (Jim Fehlig) - xenconfig: support vif bandwidth in xm and xl parser and formatter (Jim Fehlig) - xenconfig: support vif bandwidth in sexpr parser and formatter (Jim Fehlig) - util: add missing newline (Laine Stump) - tests: qemuxml2argv: Add tests for USB controller on q35 (Andrea Bolognani) - tests: qemuxml2xml: Convert fprintf to VIR_TEST_DEBUG (Cole Robinson) - qemu: Handle SecurityManagerVerify in post parse (Cole Robinson) - qemu: Handle CanonicalizeMachine in post parse (Cole Robinson) - qemu: domain: split out post parse default device handling (Cole Robinson) - domain: separate out function for post parse timer validation (Cole Robinson) - domain: separate out function for post parse console compat (Cole Robinson) - qemu: Refactor qemuMigrationFinish (Jiri Denemark) - qemu: Report more migration statistics (Jiri Denemark) - qemu: Create a proper type for migration status enum (Jiri Denemark) - qemu: Rename qemuMonitorMigrationStatus struct (Jiri Denemark) - qemu: Reorder migration status enum (Jiri Denemark) - tests.testutils: use virTestDifferenceFull in virtTestCompareToFile (Pavel Hrdina) - tests.testutils: use VIR_TEST_REGENERATE_OUTPUT for virTestDifferenceFull (Pavel Hrdina) - tests: add helper for VIR_TEST_REGENERATE_OUTPUT flag (Pavel Hrdina) - xen: move virDomainDefPostParse to xenParseSxpr (Pavel Hrdina) - Remove non-breaking space in comment (Martin Kletzander) - virsh: Add timestamps to events (Jiri Denemark) - virsh: Refactor event printing (Jiri Denemark) - pci: Log debug messages when manipulating the inactive list (Andrea Bolognani) - qemu: Add debug message to spice migration (Jiri Denemark) - qemu: snapshot: Skip 'transaction' command when no disks are selected (Peter Krempa) - qemu: Specify format= iff disk source is not empty (Michal Privoznik) - conf: Rework code around 'append' attribute (Dmitry Mishin) - Use tristate constants for new 'append' field (Dmitry Mishin) - docs: Describe new 'append' attribute for chardevs source (Dmitry Mishin) - Fix formatting for virDomainGetCPUStats docstring (Martin Kletzander) - maint: update to latest gnulib (Eric Blake) - util: reduce debug log in virPCIGetVirtualFunctions() (Laine Stump) - util: improve error reporting in virNetDevVPortProfileGetStatus (Laine Stump) - util: report the MAC address that couldn't be set (Laine Stump) - rbd: Return VIR_STORAGE_FILE_RAW as format for RBD volumes (Wido den Hollander) - tests: Make test-wrap-argv.pl executable (Michal Privoznik) - tools: Include PIE_LDFLAGS at the correct place (Michal Privoznik) - qemu: Process new 'append' attribute for char dev with output to a file (Dmitry Mishin) - conf: Add new 'append' attribute for chardevs with file source (Dmitry Mishin) - tests: add qemu 2.6 caps test (Dmitry Mishin) - vz: support additional flags in domain undefine (Maxim Nestratov) - vz: move prlsdkCleanupBridgedNet after domain deletion (Maxim Nestratov) - vz: delete domains when undefine is called (Maxim Nestratov) - hostdev: Emit debug messages while handling PCI hostdevs (Andrea Bolognani) - hostdev: Only rollback detach of managed devices on error (Andrea Bolognani) - hostdev: Mark PCI devices as inactive as they're detached (Andrea Bolognani) - pci: Introduce virPCIStubDriver enumeration (Andrea Bolognani) - pci: Remove 'reprobe' parameter from virPCIDeviceUnbind() (Andrea Bolognani) - pci: Remove redundant parameter from virPCIDeviceBindToStub() (Andrea Bolognani) - Revert "admin: Rename virAdmConnect to virAdmDaemon" (Erik Skultety) - Xen: support maxvcpus in xm and xl config (Jim Fehlig) - virsh: Add --delete-snapshots flag for undefine and vol-delete (John Ferlan) - libvirt: Add virStorageVolDeleteFlags to virStorageVolDelete (John Ferlan) - storage: Add virCheckFlags to virStorageBackendRBDDeleteVol (John Ferlan) - lxc_cgroup: Add check for NULL cgroup before AddTask call (John Ferlan) - Xen: remove xendConfigVersion from driver private struct (Jim Fehlig) - Xen: xenconfig: remove xendConfigVersion from public sexpr functions (Jim Fehlig) - Xen: xend: remove use of XEND_CONFIG_VERSION (Jim Fehlig) - Xen: xen_driver: remove use of XEND_CONFIG_VERSION (Jim Fehlig) - Xen: xenconfig: remove use of XEND_CONFIG_VERSION in xen_sxpr (Jim Fehlig) - Xen: tests: use latest XEND_CONFIG_VERSION in xml2sexpr tests (Jim Fehlig) - Xen: xenconfig: remove disks from '(image)' sexpr (Jim Fehlig) - Xen: tests: use latest XEND_CONFIG_VERSION in sexpr2xml tests (Jim Fehlig) - Xen: xenconfig: remove xendConfigVersion from public functions (Jim Fehlig) - Xen: xenconfig: remove use of XEND_CONFIG_VERSION in xen_xm (Jim Fehlig) - Xen: xenconfig: remove XEND_CONFIG_VERSION in common code (Jim Fehlig) - Xen: tests: use latest XEND_CONFIG_VERSION in xm/xl tests (Jim Fehlig) - Xen: tests: remove old xml2sexpr tests (Jim Fehlig) - Xen: tests: remove old sexpr2xml tests (Jim Fehlig) - Xen: tests: remove net-ioemu xm config test (Jim Fehlig) - Xen: tests: remove old xm config tests (Jim Fehlig) - virsh: Add build flags to pool-create[-as] and pool-start (John Ferlan) - virsh: Create a macro for pool-define-as and pool-create-as options (John Ferlan) - virsh: Create macro for "overwrite" and no-overwrite" options (John Ferlan) - virsh: Create macro for "file" option (John Ferlan) - virsh: Create macro for "pool" option (John Ferlan) - storage: Add flags to allow building pool during create processing (John Ferlan) - mark virDomainVirtioSerialAddrSetAddController as static. (Ján Tomko) - Remove dead code from qemuDomainAttachControllerDevice (Ján Tomko) - qemu_hotplug: remove qemuDomainAttachDeviceControllerLive (Ján Tomko) - storage: Attempt to refresh volume after successful wipe volume (John Ferlan) - virStorageBackendWipeLocal: remove bytes_wiped argument (Ján Tomko) - storage: drop 'Extent' from virStorageBackendWipeExtentLocal (Ján Tomko) - storage: move buffer allocation inside virStorageBackendWipeExtentLocal (Ján Tomko) - storage: fix return values of virStorageBackendWipeExtentLocal (Ján Tomko) - qemu: Replace Mlock with MemLock in function names (Andrea Bolognani) - qemu: Allow qemuDomainAdjustMaxMemLock() to restore previous value (Andrea Bolognani) - qemu: Reduce memlock limit after detaching PCI hostdev (Andrea Bolognani) - qemu: Use qemuDomainAdjustMaxMemLock() (Andrea Bolognani) - qemu: Add qemuDomainAdjustMaxMemLock() (Andrea Bolognani) - process: Add virProcessGetMaxMemLock() (Andrea Bolognani) - process: Allow virProcessPrLimit() to get current limit (Andrea Bolognani) - qemu: Search all nodes for shared memory access (Martin Kletzander) - pci: Use virPCIDeviceAddress in virPCIDevice (Andrea Bolognani) - libxl: Use libxentoollog in preference to libxenctrl if available. (Ian Campbell) - libxl: implement virDomainGetJobStats (Joao Martins) - libxl: implement virDomainGetJobInfo (Joao Martins) - storage: Add helper to compare logical pool def against pvs output (John Ferlan) - storage: Create helper for virStorageBackendLogicalFindPoolSources (John Ferlan) - storage: Refactor virStorageBackendFileSystemGetPoolSource (John Ferlan) - storage: Create helper to generate FS pool source value (John Ferlan) - qemu: add bootindex option to hostdev network interface commandline (Laine Stump) - security_stack: remove extra Security from function names (Ján Tomko) - security_selinux: remove extra Security from function names (Ján Tomko) - security_dac: remove extra Security from function names (Ján Tomko) - qemuMonitorJSONEjectMedia: don't stringify the replay at all (Pavel Hrdina) - pci: Use 'addr' instead of 'dev' for virPCIDeviceAddressPtr (Andrea Bolognani) - qemu cgroups: move new threads to new cgroup after cpuset is set up (Henning Schild) - qemu: do not put a task into machine cgroup (Henning Schild) - util: cgroups do not implicitly add task to new machine cgroup (Henning Schild) - util: Fixup virnetdevmacvlan.h ATTRIBUTE_NONNULL's (John Ferlan) - test: qemuxml2argv: Mock virMemoryMaxValue to remove 32/64 bit difference (Peter Krempa) - qemu: Enable multiqueue for macvtaps (Michal Privoznik) - virNetDevMacVLanCreateWithVPortProfile: Rework to support multiple FDs (Michal Privoznik) - virNetDevMacVLanTapSetup: Allow enabling of IFF_MULTI_QUEUE (Michal Privoznik) - virNetDevMacVLanTapSetup: Rework to support multiple FDs (Michal Privoznik) - virNetDevMacVLanTapOpen: Rework to support multiple FDs (Michal Privoznik) - virNetDevMacVLanTapOpen: Slightly rework (Michal Privoznik) - virNetDevMacVLanCreateWithVPortProfile: Turn vnet_hdr into flag (Michal Privoznik) - log: include hostname in initial log message (Daniel P. Berrange) - storage: Add debug message (John Ferlan) - storage: Handle readflags errors (John Ferlan) - storage: Add readflags for backend error processing (John Ferlan) - tests: scsihost: Use fakerootdir instead of fakesysfsdir (Andrea Bolognani) - tests: Use more specific names for variables (Andrea Bolognani) - tests: Rename LIBVIRT_FAKE_SYSFS_DIR to LIBVIRT_FAKE_ROOT_DIR (Andrea Bolognani) - tests: cgroupmock: Use the temporary directory as fake root (Andrea Bolognani) - tests: pcimock: Use the temporary directory as fake root (Andrea Bolognani) - tests: pcimock: Remove check for fakesysfsdir (Andrea Bolognani) - tests: scsihost: Don't set LIBVIRT_FAKE_SYSFS_DIR (Andrea Bolognani) - qemu: driver: Refactor qemuDomainHelperGetVcpus (Peter Krempa) - qemu: Add helper to retrieve vCPU pid (Peter Krempa) - qemu: Replace checking for vcpu<->pid mapping availability with a helper (Peter Krempa) - qemu: Drop checking vcpu threads in emulator bandwidth getter/setter (Peter Krempa) - qemu: cgroup: Remove now unreachable check (Peter Krempa) - conf: Add helper to get pointer to a certain vCPU definition (Peter Krempa) - conf: ABI: Split up and improve vcpu info ABI checking (Peter Krempa) - conf: turn def->vcpus into a structure (Peter Krempa) - qemu: refactor qemuDomainHotunplugVcpus (Peter Krempa) - qemu: Refactor qemuDomainHotplugVcpus (Peter Krempa) - qemu: cpu hotplug: Move loops to qemuDomainSetVcpusFlags (Peter Krempa) - qemu: monitor: Remove weird return values from qemuMonitorSetCPU (Peter Krempa) - qemu: Split up vCPU hotplug and hotunplug (Peter Krempa) - qemu: Extract vCPU onlining/offlining via agent into a separate function (Peter Krempa) - qemu: domain: Add helper to access vm->privateData->agent (Peter Krempa) - conf: Turn def->maxvcpus into size_t (Peter Krempa) - conf: Replace read accesses to def->vcpus with accessor (Peter Krempa) - conf: Move vcpu count check into helper (Peter Krempa) - conf: Replace writes to def->vcpus with accessor (Peter Krempa) - conf: Replace read access to def->maxvcpus with accessor (Peter Krempa) - conf: Add helper to check whether domain has offline vCPUs (Peter Krempa) - conf: Extract update of vcpu count if maxvcpus is decreased (Peter Krempa) - conf: Use local copy of maxvcpus in virDomainVcpuParse (Peter Krempa) - conf: Replace writes to def->maxvcpus with accessor (Peter Krempa) - xen: use virDomainDefPostParse for parsing XM/XL/SEXPR cofings (Pavel Hrdina) - lxc: use virDomainDefPostParse for parsing LXC config string (Pavel Hrdina) - vmware/vmx: use virDomainDefPostParse after parsing vmx config (Pavel Hrdina) - virsh: rename vshCommandOptString to vshCommandOptStringQuiet (Ján Tomko) - security_selinux: fix indentation (Ján Tomko) - security_dac: check if virSecurityDACGetIds returns negative (Ján Tomko) Thanks everybody for helping with this release, be it with bug reports patches, reviews, documentation and ideas ! Enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] Trying to debug "Received unexpected event 3" from libvirt
by Yaniv Kaul 17 Jan '16

17 Jan '16

Hi, I'm trying to debug this issue, which may be affecting my inability to perform live snapshot. 1. I'm not sure what 'Waking up a tragedian" in the debug log means - what exactly is a tragedian? 2. In any case, it'd be great if the WARN would mention mon->await_event - is it the event libvirt is actually waiting for? (Both from qemu/qemu_agent.c) 3. I reckon event 3 is QEMU_AGENT_EVENT_RESET ? (from qemu/qemu_agent.h) 4. I'm also getting 'End of file while reading data: Input/output error' messages, not sure what they mean yet. (using 1.2.18.2-1 on FC23, trying to live-snapshot VMs (with Centos 6 & 7 in them, all with qemu guest agent, AFAIK). TIA, Y.

2 5

[libvirt] [PATCH 0/3] Misc fixes
by Cédric Bosdonnat 16 Jan '16

16 Jan '16

Hi all, Here are a few patches without strong connection together. The first one only allows us not to package virt-login-shell even with lxc driver enabled. The other ones are related to mounts security. I'm wondering if changing the default dropped capabilities in the lxc driver is acceptable... dropping sys_admin makes sense, but it can introduce incompatibilities for users needing it as they will need to explicitely enable it. Cédric Bosdonnat (3): Allow building lxc without virt-login-shell virt-aa-helper: don't deny writes to readonly mounts lxc: drop sys_admin caps by default configure.ac | 14 ++++++++++++++ src/lxc/lxc_container.c | 1 + src/security/virt-aa-helper.c | 5 ++++- tools/Makefile.am | 12 ++++++------ 4 files changed, 25 insertions(+), 7 deletions(-) -- 2.1.4

5 8

[libvirt] [PATCH v2 0/4] Adjustment to recent cgroup/cpuset changes (for 1.3.1)
by John Ferlan 16 Jan '16

16 Jan '16

v1: http://www.redhat.com/archives/libvir-list/2016-January/msg00511.html As discussed during the replies of the v1 - revert Henning's first two patches, plus the one I made as a result of those. Patch 4/4 is already ACK'd John Ferlan (4): Revert "qemu: do not put a task into machine cgroup" Revert "util: cgroups do not implicitly add task to new machine cgroup" Revert "lxc_cgroup: Add check for NULL cgroup before AddTask call" cgroup: Fix possible bug as a result of code motion for vcpu cgroup setup src/lxc/lxc_cgroup.c | 13 +------------ src/qemu/qemu_cgroup.c | 9 +-------- src/qemu/qemu_process.c | 12 ++++++------ src/util/vircgroup.c | 22 ++++++++++++++++++++++ 4 files changed, 30 insertions(+), 26 deletions(-) -- 2.5.0

3 8

[libvirt] [PATCH] security: Do not restore labels on device tree binary
by Jiri Denemark 15 Jan '16

15 Jan '16

A device tree binary file specified by /domain/os/dtb element is a read-only resource similar to kernel and initrd files. We shouldn't restore its label when destroying a domain to avoid breaking other domains configure with the same device tree. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/security/security_dac.c | 4 ---- src/security/security_selinux.c | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 378b922..a09aba5 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1128,10 +1128,6 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr, virSecurityDACRestoreFileLabel(priv, def->os.loader->nvram) < 0) rc = -1; - if (def->os.dtb && - virSecurityDACRestoreFileLabel(priv, def->os.dtb) < 0) - rc = -1; - return rc; } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 475cdbc..9e98635 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2034,10 +2034,6 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManagerPtr mgr, virSecuritySELinuxRestoreFileLabel(mgr, def->os.loader->nvram) < 0) rc = -1; - if (def->os.dtb && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.dtb) < 0) - rc = -1; - return rc; } -- 2.7.0

2 1

[libvirt] [PATCH] Fix make check with gcc version 5
by Martin Kletzander 15 Jan '16

15 Jan '16

When building with gcc-5 (particularly gcc-5.3.0 now) and having pdwtags installed (package dwarves) make check fails with the following error: $ make lock_protocol-struct GEN lock_protocol-struct --- lock_protocol-structs 2016-01-13 15:04:59.318809607 +0100 +++ lock_protocol-struct-t3 2016-01-13 15:05:17.703501234 +0100 @@ -26,10 +26,6 @@ virLockSpaceProtocolNonNullString name; u_int flags; }; -enum virLockSpaceProtocolAcquireResourceFlags { - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = 1, - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = 2, -}; struct virLockSpaceProtocolAcquireResourceArgs { virLockSpaceProtocolNonNullString path; virLockSpaceProtocolNonNullString name; Makefile:10415: recipe for target 'lock_protocol-struct' failed make: *** [lock_protocol-struct] Error 1 That happens because without any specific options gcc doesn't keep enum information in the resulting binary object. I managed to isolate the parameters of gcc that caused this issue to disappear, however I remember that they influenced the resulting binaries quite a bit and were definitely not something we would want to add as mandatory to the build process. So to deal with this cleanly, let's take that enum and separate it out to its own header file. Since it is only used in the lockd driver and the protocol, lock_driver_lockd.h feels like a suitable name. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/Makefile.am | 1 + src/lock_protocol-structs | 4 ---- src/locking/lock_driver_lockd.c | 2 ++ src/locking/lock_driver_lockd.h | 30 ++++++++++++++++++++++++++++++ src/locking/lock_protocol.x | 6 +----- 5 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 src/locking/lock_driver_lockd.h diff --git a/src/Makefile.am b/src/Makefile.am index aa5ab6929b91..0e0db9bac6da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -249,6 +249,7 @@ MAINTAINERCLEANFILES += $(LOCK_DAEMON_GENERATED) LOCK_DRIVER_LOCKD_SOURCES = \ locking/lock_driver_lockd.c \ + locking/lock_driver_lockd.h \ $(NULL) LOCK_DAEMON_SOURCES = \ diff --git a/src/lock_protocol-structs b/src/lock_protocol-structs index 8e8b84fb3b50..41be9ce34717 100644 --- a/src/lock_protocol-structs +++ b/src/lock_protocol-structs @@ -26,10 +26,6 @@ struct virLockSpaceProtocolDeleteResourceArgs { virLockSpaceProtocolNonNullString name; u_int flags; }; -enum virLockSpaceProtocolAcquireResourceFlags { - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = 1, - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = 2, -}; struct virLockSpaceProtocolAcquireResourceArgs { virLockSpaceProtocolNonNullString path; virLockSpaceProtocolNonNullString name; diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 5b89ca142b0b..181261170506 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -34,6 +34,8 @@ #include "configmake.h" #include "virstring.h" +#include "lock_driver_lockd.h" + #define VIR_FROM_THIS VIR_FROM_LOCKING VIR_LOG_INIT("locking.lock_driver_lockd"); diff --git a/src/locking/lock_driver_lockd.h b/src/locking/lock_driver_lockd.h new file mode 100644 index 000000000000..baf346adaf6c --- /dev/null +++ b/src/locking/lock_driver_lockd.h @@ -0,0 +1,30 @@ +/* + * lock_driver_lockd.h: Locking for domain lifecycle operations + * + * Copyright (C) 2010-2011 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/>. + * + */ + +#ifndef __VIR_LOCK_DRIVER_LOCKD_H__ +# define __VIR_LOCK_DRIVER_LOCKD_H__ + +enum virLockSpaceProtocolAcquireResourceFlags { + VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = 1, + VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = 2, +}; + +#endif /* __VIR_LOCK_DRIVER_LOCKD_H__ */ diff --git a/src/locking/lock_protocol.x b/src/locking/lock_protocol.x index a77a78490cb6..6d4cec39e244 100644 --- a/src/locking/lock_protocol.x +++ b/src/locking/lock_protocol.x @@ -2,6 +2,7 @@ */ %#include "internal.h" +%#include "lock_driver_lockd.h" typedef opaque virLockSpaceProtocolUUID[VIR_UUID_BUFLEN]; @@ -50,11 +51,6 @@ struct virLockSpaceProtocolDeleteResourceArgs { unsigned int flags; }; -enum virLockSpaceProtocolAcquireResourceFlags { - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = 1, - VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = 2 -}; - struct virLockSpaceProtocolAcquireResourceArgs { virLockSpaceProtocolNonNullString path; virLockSpaceProtocolNonNullString name; -- 2.7.0

2 1

[libvirt] [PATCH] security: Do not restore kernel and initrd labels
by Jiri Denemark 15 Jan '16

15 Jan '16

Kernel/initrd files are essentially read-only shareable images and thus should be handled in the same way. We already use the appropriate label for kernel/initrd files when starting a domain, but when a domain gets destroyed we would remove the labels which would make other running domains using the same files very unhappy. https://bugzilla.redhat.com/show_bug.cgi?id=921135 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/security/security_dac.c | 8 -------- src/security/security_selinux.c | 8 -------- 2 files changed, 16 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 80709fe..378b922 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1128,14 +1128,6 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr, virSecurityDACRestoreFileLabel(priv, def->os.loader->nvram) < 0) rc = -1; - if (def->os.kernel && - virSecurityDACRestoreFileLabel(priv, def->os.kernel) < 0) - rc = -1; - - if (def->os.initrd && - virSecurityDACRestoreFileLabel(priv, def->os.initrd) < 0) - rc = -1; - if (def->os.dtb && virSecurityDACRestoreFileLabel(priv, def->os.dtb) < 0) rc = -1; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 721c451..475cdbc 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2034,14 +2034,6 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManagerPtr mgr, virSecuritySELinuxRestoreFileLabel(mgr, def->os.loader->nvram) < 0) rc = -1; - if (def->os.kernel && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.kernel) < 0) - rc = -1; - - if (def->os.initrd && - virSecuritySELinuxRestoreFileLabel(mgr, def->os.initrd) < 0) - rc = -1; - if (def->os.dtb && virSecuritySELinuxRestoreFileLabel(mgr, def->os.dtb) < 0) rc = -1; -- 2.7.0

4 5

[libvirt] Entering freeze for libvirt-1.3.1
by Daniel Veillard 15 Jan '16

15 Jan '16

As suggested this w.e., I just tagged the release candidate 1 in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ This works fine with my limited testing, but obviously more people need to give it some trial especially on other platforms. The output from CentOS CI is mostly green which is a good sign with just libvirt-daemon-rpm and virt-manager-test in the red, someone probably need to have a look before we release. The rc2 should come in 2 days on Thursday, and unless there is some blocker I plan to push 1.3.1 over the week-end, so please give it some testing ! Thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 9