- Devel - libvirt List Archives

[libvirt] [libvirt-guests] New feature ALWAYS_START
by Marek Lukács 23 Sep '15

23 Sep '15

Hi, It will be nice feature to have configuration option ALWAYS_START="$uri:$name $uri:name ..." in libvirt-guests configuration file. If ON_BOOT is "start" and if ALWAYS_START is not empty, it iterates over the ALWAYS_START and starts guests with same conditions (delays etc.) before it starts guests from LISTFILE. Benefits: - guests are started with delays - guests are started after host failure - guests are started in specific order (for example complex environment, when DB should be started before other guest, etc.) Regards, Marek Lukács

3 7

[libvirt] [PATCH v2] virsh: Fix job status indicator for 0 length block jobs
by Peter Krempa 23 Sep '15

23 Sep '15

Although 0 length block jobs aren't entirely useful, the output of virsh blockjob is empty due to the condition that suppresses the output for migration jobs that did not start. Since the only place that actually uses the condition that suppresses the output is in migration, let's move the check there and thus add support for 0 of 0 equaling to 100%. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1196711 --- tools/virsh-domain.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 73c476d..fb138d5 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1700,10 +1700,6 @@ virshPrintJobProgress(const char *label, unsigned long long remaining, { int progress; - if (total == 0) - /* migration has not been started */ - return; - if (remaining == 0) { /* migration has completed */ progress = 100; @@ -4401,7 +4397,7 @@ virshWatchJob(vshControl *ctl, ret = virDomainGetJobInfo(dom, &jobinfo); pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); if (ret == 0) { - if (verbose) + if (verbose && jobinfo.dataTotal > 0) virshPrintJobProgress(label, jobinfo.dataRemaining, jobinfo.dataTotal); -- 2.4.5

2 2

[libvirt] [PATCH v2] qemu: Refresh memory size only on fresh starts
by Peter Krempa 23 Sep '15

23 Sep '15

Qemu unfortunately doesn't update internal state right after migration and so the actual balloon size as returned by 'query-balloon' are invalid for a while after the CPUs are started after migration. If we'd refresh our internal state at this point we would report invalid current memory size until the next balloon event would arrive. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1242940 --- Version 2: - completely different from original posting due to unexpected qemu behavior src/qemu/qemu_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7187dc1..b961f40 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5023,7 +5023,8 @@ int qemuProcessStart(virConnectPtr conn, /* Since CPUs were not started yet, the balloon could not return the memory * to the host and thus cur_balloon needs to be updated so that GetXMLdesc * and friends return the correct size in case they can't grab the job */ - if (qemuProcessRefreshBalloonState(driver, vm, asyncJob) < 0) + if (!migrateFrom && !snapshot && + qemuProcessRefreshBalloonState(driver, vm, asyncJob) < 0) goto cleanup; VIR_DEBUG("Detecting actual memory size for video device"); -- 2.4.5

2 2

[libvirt] [PATCH] qemu: Align memory module sizes to 2MiB
by Peter Krempa 23 Sep '15

23 Sep '15

My original implementation was based on a qemu version that still did not have all the checks in place. Using sizes that would align to odd megabyte increments will produce the following error: qemu-kvm: -device pc-dimm,node=0,memdev=memdimm0,id=dimm0: backend memory size must be multiple of 0x200000 qemu-kvm: -device pc-dimm,node=0,memdev=memdimm0,id=dimm0: Device 'pc-dimm' could not be initialized Introduce an alignment retrieval function for memory devices and use it to align the devices separately and modify a test case to verify it. --- src/qemu/qemu_domain.c | 19 ++++++++++++++++++- .../qemuxml2argv-memory-hotplug-dimm.xml | 2 +- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7d92f3a..7680c87 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3376,6 +3376,21 @@ qemuDomainGetMemorySizeAlignment(virDomainDefPtr def) } +static unsigned long long +qemuDomainGetMemoryModuleSizeAlignment(const virDomainDef *def, + const virDomainMemoryDef *mem ATTRIBUTE_UNUSED) +{ + /* PPC requires the memory sizes to be rounded to 256MiB increments, so + * round them to the size always. */ + if (ARCH_IS_PPC64(def->os.arch)) + return 256 * 1024; + + /* dimm memory modules require 2MiB alignment rather than the 1MiB we are + * using elsewhere. */ + return 2048; +} + + int qemuDomainAlignMemorySizes(virDomainDefPtr def) { @@ -3402,8 +3417,10 @@ qemuDomainAlignMemorySizes(virDomainDefPtr def) def->mem.max_memory = VIR_ROUND_UP(def->mem.max_memory, align); /* Align memory module sizes */ - for (i = 0; i < def->nmems; i++) + for (i = 0; i < def->nmems; i++) { + align = qemuDomainGetMemoryModuleSizeAlignment(def, def->mems[i]); def->mems[i]->size = VIR_ROUND_UP(def->mems[i]->size, align); + } return 0; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml index 3f468ec..fbcac84 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml @@ -36,7 +36,7 @@ <memballoon model='virtio'/> <memory model='dimm'> <target> - <size unit='KiB'>524287</size> + <size unit='KiB'>523264</size> <node>0</node> </target> </memory> -- 2.4.5

2 1

[libvirt] [PATCH 0/3] Improve keepalive timeout handling in clients
by Jiri Denemark 23 Sep '15

23 Sep '15

Jiri Denemark (3): client rpc: Report proper error for keepalive disconnections client rpc: Process pending data on error virsh: Notify users about disconnects src/rpc/virkeepalive.c | 10 +++++----- src/rpc/virnetclient.c | 30 +++++++++++++++++++++++++----- tools/virsh.c | 35 ++++++++++++++++++++++++++++++++--- 3 files changed, 62 insertions(+), 13 deletions(-) -- 2.5.2

2 6

[libvirt] [sandbox 00/11] Adding a virt-builder source
by Cédric Bosdonnat 23 Sep '15

23 Sep '15

Hi all, Here are a few patches to add a virt-builder source to virt-sandbox-image. There are also patches fixing a few issues here and there. Cédric Bosdonnat (11): Fix memory leak virt-sandbox-image: fix error string formatting. Make virt-sandbox-image executable virt-sandbox-image: remove undefined default_disk_format virt-sandbox-image: add a source post_run hook virt-sandbox-image: move DockerSource _format_disk to Source virt-sandbox-image: smarter source name computing virt-sandbox-image: add a virt-builder source virt-sandbox-image: automatically call download and create if needed virt-sandbox-image: fix exception catching virt-sandbox-image: add error handling for sources import bin/virt-sandbox-image | 0 libvirt-sandbox.spec.in | 1 + libvirt-sandbox/image/cli.py | 154 +++++++++++---------- libvirt-sandbox/image/sources/DockerSource.py | 32 +++-- libvirt-sandbox/image/sources/Makefile.am | 1 + libvirt-sandbox/image/sources/Source.py | 50 +++++++ libvirt-sandbox/image/sources/VirtBuilderSource.py | 143 +++++++++++++++++++ libvirt-sandbox/image/template.py | 24 +++- libvirt-sandbox/libvirt-sandbox-builder.c | 1 + 9 files changed, 311 insertions(+), 95 deletions(-) mode change 100644 => 100755 bin/virt-sandbox-image create mode 100644 libvirt-sandbox/image/sources/VirtBuilderSource.py -- 2.1.4

2 22

[libvirt] [PATCH] conf: escape string for disk driver name attribute
by Luyao Huang 23 Sep '15

23 Sep '15

Just like e92e5ba1, this attribute was missed. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a3b3ccb..85c2d0d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18867,8 +18867,7 @@ virDomainDiskDefFormat(virBufferPtr buf, def->ioeventfd || def->event_idx || def->copy_on_read || def->discard || def->iothread) { virBufferAddLit(buf, "<driver"); - if (def->src->driverName) - virBufferAsprintf(buf, " name='%s'", def->src->driverName); + virBufferEscapeString(buf, " name='%s'", def->src->driverName); if (def->src->format > 0) virBufferAsprintf(buf, " type='%s'", virStorageFileFormatTypeToString(def->src->format)); -- 1.8.3.1

3 2

[libvirt] [PATCH] Use VIR_DIV_UP macro where possible
by Martin Kletzander 23 Sep '15

23 Sep '15

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Will push as trivial in a second. src/rpc/virnetclientstream.c | 2 +- src/util/virbitmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 1cc9002b0ad7..64e9cd221be2 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -279,7 +279,7 @@ int virNetClientStreamQueuePacket(virNetClientStreamPtr st, goto end; } - pieces = (length + size - 1) / size; + pieces = VIR_DIV_UP(length, size); for (piece = 0; piece < pieces; piece++) { if (size > length - offset) size = length - offset; diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 4d270a910c19..57135a09f71e 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -71,7 +71,7 @@ virBitmapNewQuiet(size_t size) if (SIZE_MAX - VIR_BITMAP_BITS_PER_UNIT < size || size == 0) return NULL; - sz = (size + VIR_BITMAP_BITS_PER_UNIT - 1) / VIR_BITMAP_BITS_PER_UNIT; + sz = VIR_DIV_UP(size, VIR_BITMAP_BITS_PER_UNIT); if (VIR_ALLOC_QUIET(bitmap) < 0) return NULL; -- 2.5.3

1 0

[libvirt] [PATCH 0/5] Couple of 'virsh create' fixes
by Michal Privoznik 23 Sep '15

23 Sep '15

*** BLURB HERE *** Michal Privoznik (5): qemuDomainCreateXML: Don't remove persistent domains on error qemuDomainCreateXML: Make domain definition transient qemu: Move vm->persistent check into qemuDomainRemoveInactive lxcDomainCreateXMLWithFiles: Don't remove persistent domains on error lxcDomainCreateXMLWithFiles: Make domain definition transient src/lxc/lxc_driver.c | 7 +++++-- src/qemu/qemu_domain.c | 9 ++++++++- src/qemu/qemu_driver.c | 37 +++++++++++++++---------------------- src/qemu/qemu_migration.c | 14 +++++--------- src/qemu/qemu_process.c | 12 ++++-------- 5 files changed, 37 insertions(+), 42 deletions(-) -- 2.4.9

2 7

[libvirt] [PATCH] qemuDomainDeviceDefPostParse: Drop useless check
by Michal Privoznik 23 Sep '15

23 Sep '15

Now that virQEMUDriverCreateXMLConf is never called with NULL (after 086f37e97aab) we can safely drop useless check in qemuDomainDeviceDefPostParse as we are guaranteed to be always called with the driver initialized. Therefore checking if driver is NULL makes no sense. Moreover, if we mix it with direct driver dereference. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7d92f3a..8e3a7d3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1233,12 +1233,9 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, { virQEMUDriverPtr driver = opaque; virQEMUCapsPtr qemuCaps = NULL; - virQEMUDriverConfigPtr cfg = NULL; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = -1; - if (driver) - cfg = virQEMUDriverGetConfig(driver); - qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); if (dev->type == VIR_DOMAIN_DEVICE_NET && -- 2.4.9

2 1

[libvirt] [libvirt-sandbox][PATCH 0/4] Couple of coverity fixes
by Michal Privoznik 23 Sep '15

23 Sep '15

*** BLURB HERE *** Michal Privoznik (4): builder: Drop dead code in gvir_sandbox_builder_clean_post_stop libvirt-sandbox-init-common: Avoid calling fclose(NULL) libvirt-sandbox-config: Don't deref NULL libvirt-sandbox-init-qemu: Check for fopen() return value libvirt-sandbox/libvirt-sandbox-builder.c | 4 ---- libvirt-sandbox/libvirt-sandbox-config.c | 15 ++++++++------- libvirt-sandbox/libvirt-sandbox-init-common.c | 3 ++- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 11 ++++++++++- 4 files changed, 20 insertions(+), 13 deletions(-) -- 2.4.9

2 8

[libvirt] [PATCH] Makefile: fix build fail when make rpm
by Luyao Huang 23 Sep '15

23 Sep '15

Build fail and error like this: CC qemu/libvirt_driver_qemu_impl_la-qemu_command.lo qemu/qemu_capabilities.c:46:27: fatal error: qemu_capspriv.h: No such file or directory #include "qemu_capspriv.h" Add qemu_capspriv.h to source. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 060abe8..07d5879 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -763,7 +763,8 @@ QEMU_DRIVER_SOURCES = \ qemu/qemu_monitor_json.c \ qemu/qemu_monitor_json.h \ qemu/qemu_driver.c qemu/qemu_driver.h \ - qemu/qemu_interface.c qemu/qemu_interface.h + qemu/qemu_interface.c qemu/qemu_interface.h \ + qemu/qemu_capspriv.h XENAPI_DRIVER_SOURCES = \ xenapi/xenapi_driver.c xenapi/xenapi_driver.h \ -- 1.8.3.1

3 2

[libvirt] New software based on libvirt
by Gustav Fransson Nyvell 23 Sep '15

23 Sep '15

Hello, I'm introducing to you the decentralized cloud Cherrypop. Combining libvirt and LizardFS (as of now) it becomes a cloud completely without masters. Thus, any node is sufficient for the cloud to be up and therefore no wasted resources and no single point of failure. It's still pretty crude software but will work with some tinkering. Hope you try it and like it! For more information, source and binary: https://github.com/gustavfranssonnyvell/cherrypop //Gustav

4 4

[libvirt] [PATCH] add compress stream support
by Vasiliy Tolstov 23 Sep '15

23 Sep '15

use libarchive for compressed stream support Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- configure.ac | 11 ++++++-- include/libvirt/libvirt-stream.h | 6 +++++ m4/virt-archive.m4 | 26 +++++++++++++++++++ src/fdstream.c | 47 +++++++++++++++++++++++++++++++++ src/libvirt-stream.c | 56 +++++++++++++++++++++++++++++++++++++++- src/libvirt_public.syms | 7 +++++ 6 files changed, 150 insertions(+), 3 deletions(-) create mode 100644 m4/virt-archive.m4 diff --git a/configure.ac b/configure.ac index 03463b0..4018b49 100644 --- a/configure.ac +++ b/configure.ac @@ -250,6 +250,7 @@ LIBVIRT_CHECK_SANLOCK LIBVIRT_CHECK_SASL LIBVIRT_CHECK_SELINUX LIBVIRT_CHECK_SSH2 +LIBVIRT_CHECK_LIBARCHIVE LIBVIRT_CHECK_SYSTEMD_DAEMON LIBVIRT_CHECK_UDEV LIBVIRT_CHECK_WIRESHARK @@ -1603,8 +1604,6 @@ fi AC_SUBST([LIBPCAP_CFLAGS]) AC_SUBST([LIBPCAP_LIBS]) - - dnl dnl Checks for the UML driver dnl @@ -2097,6 +2096,13 @@ AM_CONDITIONAL([WITH_STORAGE_DISK], [test "$with_storage_disk" = "yes"]) AC_SUBST([LIBPARTED_CFLAGS]) AC_SUBST([LIBPARTED_LIBS]) +if test "$with_libarchive" = "yes" || test "$with_libarchive" = "check"; then + PKG_CHECK_MODULES([LIBARCHIVE], [libarchive >= 3.1.2], [], [LIBARCHIVE_FOUND=no]) +fi +AC_SUBST([LIBARCHIVE_CFLAGS]) +AC_SUBST([LIBARCHIVE_LIBS]) + + if test "$with_storage_mpath" = "yes" || test "$with_storage_disk" = "yes"; then DEVMAPPER_CFLAGS= @@ -2892,6 +2898,7 @@ LIBVIRT_RESULT_SANLOCK LIBVIRT_RESULT_SASL LIBVIRT_RESULT_SELINUX LIBVIRT_RESULT_SSH2 +LIBVIRT_RESULT_LIBARCHIVE LIBVIRT_RESULT_SYSTEMD_DAEMON LIBVIRT_RESULT_UDEV LIBVIRT_RESULT_WIRESHARK diff --git a/include/libvirt/libvirt-stream.h b/include/libvirt/libvirt-stream.h index 831640d..ac48fba 100644 --- a/include/libvirt/libvirt-stream.h +++ b/include/libvirt/libvirt-stream.h @@ -35,6 +35,12 @@ typedef enum { virStreamPtr virStreamNew(virConnectPtr conn, unsigned int flags); +virStreamPtr virStreamNewLz4(virConnectPtr conn, + unsigned int flags); +virStreamPtr virStreamNewGzip(virConnectPtr conn, + unsigned int flags); +virStreamPtr virStreamNewXz(virConnectPtr conn, + unsigned int flags); int virStreamRef(virStreamPtr st); int virStreamSend(virStreamPtr st, diff --git a/m4/virt-archive.m4 b/m4/virt-archive.m4 new file mode 100644 index 0000000..b550c41 --- /dev/null +++ b/m4/virt-archive.m4 @@ -0,0 +1,26 @@ +dnl The libarchive.so library +dnl +dnl Copyright (C) 2012-2013 Red Hat, Inc. +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl <http://www.gnu.org/licenses/>. +dnl + +AC_DEFUN([LIBVIRT_CHECK_LIBARCHIVE],[ + LIBVIRT_CHECK_PKG([LIBARCHIVE], [libarchive], [3.1.2]) +]) + +AC_DEFUN([LIBVIRT_RESULT_LIBARCHIVE],[ + LIBVIRT_RESULT_LIB([LIBARCHIVE]) +]) diff --git a/src/fdstream.c b/src/fdstream.c index b8ea86e..82f0e8c 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -33,6 +33,10 @@ #include <netinet/in.h> #include <termios.h> +#ifdef WITH_LIBARCHIVE +# include <archive.h> +#endif + #include "fdstream.h" #include "virerror.h" #include "datatypes.h" @@ -75,6 +79,9 @@ struct virFDStreamData { void *icbOpaque; virMutex lock; +#ifdef WITH_LIBARCHIVE + void *archive; +#endif }; @@ -319,6 +326,12 @@ virFDStreamCloseInt(virStreamPtr st, bool streamAbort) if (VIR_CLOSE(fdst->errfd) < 0) VIR_DEBUG("ignoring failed close on fd %d", fdst->errfd); +#ifdef WITH_LIBARCHIVE + if (fdst->archive != NULL) { + archive_write_free(fdst->archive); + archive_read_free(fdst->archive); + } +#endif st->privateData = NULL; /* call the internal stream closing callback */ @@ -385,7 +398,16 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) } retry: +#ifdef WITH_LIBARCHIVE + if (fdst->archive != NULL) { + archive_write_open_fd(fdst->archive, fdst->fd); + ret = archive_write_data(fdst->archive, bytes, nbytes); + } else { + ret = write(fdst->fd, bytes, nbytes); + } +#else ret = write(fdst->fd, bytes, nbytes); +#endif if (ret < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) { ret = -2; @@ -397,7 +419,15 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) _("cannot write to stream")); } } else if (fdst->length) { +#ifdef WITH_LIBARCHIVE + if (fdst->archive != NULL) { + fdst->offset += nbytes; + } else { + fdst->offset += ret; + } +#else fdst->offset += ret; +#endif } virMutexUnlock(&fdst->lock); @@ -435,7 +465,16 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes) } retry: +#ifdef WITH_LIBARCHIVE + if (fdst->archive != NULL) { + archive_read_open_fd(fdst->archive, fdst->fd, 4096); + ret = archive_read_data(fdst->archive, bytes, nbytes); + } else { + ret = read(fdst->fd, bytes, nbytes); + } +#else ret = read(fdst->fd, bytes, nbytes); +#endif if (ret < 0) { if (errno == EAGAIN || errno == EWOULDBLOCK) { ret = -2; @@ -447,7 +486,15 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes) _("cannot read from stream")); } } else if (fdst->length) { +#ifdef WITH_LIBARCHIVE + if (fdst->archive != NULL) { + fdst->offset += nbytes; + } else { + fdst->offset += ret; + } +#else fdst->offset += ret; +#endif } virMutexUnlock(&fdst->lock); diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c index c16f586..40702dc 100644 --- a/src/libvirt-stream.c +++ b/src/libvirt-stream.c @@ -23,12 +23,16 @@ #include "datatypes.h" #include "viralloc.h" #include "virlog.h" +#include "fdstream.h" + +#include <archive.h> + +struct virFDStreamData; VIR_LOG_INIT("libvirt.stream"); #define VIR_FROM_THIS VIR_FROM_STREAMS - /** * virStreamNew: * @conn: pointer to the connection @@ -69,6 +73,56 @@ virStreamNew(virConnectPtr conn, return st; } +virStreamPtr +virStreamNewLz4(virConnectPtr conn, + unsigned int flags) +{ + virStreamPtr st; + + st = virStreamNew(conn, flags); + if (st != NULL) { + struct virFDStreamData *fdst = st->privateData; + fdst->archive = archive_write_new(); + archive_write_add_filter(fdst->archive, ARCHIVE_FILTER_LZ4); + } + + return st; +} + +virStreamPtr +virStreamNewGzip(virConnectPtr conn, + unsigned int flags) +{ + virStreamPtr st; + + st = virStreamNew(conn, flags); + if (st != NULL) { + struct virFDStreamData *fdst = st->privateData; + fdst->archive = archive_write_new(); + archive_write_add_filter(fdst->archive, ARCHIVE_FILTER_GZIP); + } + + return st; +} + + +virStreamPtr +virStreamNewXz(virConnectPtr conn, + unsigned int flags) +{ + virStreamPtr st; + + st = virStreamNew(conn, flags); + if (st != NULL) { + struct virFDStreamData *fdst = st->privateData; + fdst->archive = archive_write_new(); + archive_write_add_filter(fdst->archive, ARCHIVE_FILTER_XZ); + } + + return st; +} + + /** * virStreamRef: diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index dd94191..46519ce 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -725,4 +725,11 @@ LIBVIRT_1.2.19 { virDomainRename; } LIBVIRT_1.2.17; +LIBVIRT_1.2.20 { + global: + virStreamNewLz4; + virStreamNewGzip; + virStreamNewXz; +} LIBVIRT_1.2.19; + # .... define new API here using predicted next version number .... -- 2.5.0

2 3

[libvirt] [PATCH] spec: Fix some warnings with latest rpmbuild
by Cole Robinson 22 Sep '15

22 Sep '15

$ rpmbuild -ba libvirt.spec warning: Macro expanded in comment on line 5: # If neither fedora nor rhel was defined, try to guess them from %{dist} warning: Macro %enable_autotools defined but not used within scope warning: Macro %client_only defined but not used within scope ... --- libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 48461e8..853d2ec 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2,7 +2,7 @@ # This spec file assumes you are building for Fedora 13 or newer, # or for RHEL 5 or newer. It may need some tweaks for other distros. -# If neither fedora nor rhel was defined, try to guess them from %{dist} +# If neither fedora nor rhel was defined, try to guess them from dist %if !0%{?rhel} && !0%{?fedora} %{expand:%(echo "%{?dist}" | \ sed -ne 's/^\.el$[0-9]\+$.*/%%define rhel \1/p')} @@ -13,13 +13,13 @@ # Default to skipping autoreconf. Distros can change just this one line # (or provide a command-line override) if they backport any patches that # touch configure.ac or Makefile.am. -%{!?enable_autotools:%define enable_autotools 0} +%{!?enable_autotools:%global enable_autotools 0} # A client only build will create a libvirt.so only containing # the generic RPC driver, and test driver and no libvirtd # Default to a full server + client build, but with the possibility # of a command-line or ~/.rpmmacros override for client-only. -%{!?client_only:%define client_only 0} +%{!?client_only:%global client_only 0} # Now turn off server build in certain cases -- 2.5.0

2 2

[libvirt] [PATCH 0/2] Couple of fixes after mockup patches
by Michal Privoznik 22 Sep '15

22 Sep '15

I've noticed a few tests failing strangely after [1] was merged. Here are the fixes. 1: https://www.redhat.com/archives/libvir-list/2015-September/msg00460.html Michal Privoznik (2): qemuTestDriverInit: init the driver lock too tests: Avoid use of virQEMUDriverCreateXMLConf(NULL) tests/qemucapabilitiestest.c | 9 +++++---- tests/qemumonitorjsontest.c | 19 ++++++++++--------- tests/qemumonitortest.c | 9 +++++---- tests/securityselinuxlabeltest.c | 8 +++++--- tests/testutilsqemu.c | 6 +++++- 5 files changed, 30 insertions(+), 21 deletions(-) -- 2.4.9

2 3

[libvirt] [PATCH] Revert "qemu: Fix integer/boolean logic in qemuSetUnprivSGIO"
by John Ferlan 22 Sep '15

22 Sep '15

This reverts commit 69b850fe2a19d0c32ae2f209e8d8463df6ead665. This change broke the ability to "clear" or reset unfiltered back to filtered. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- This is a <facepalm> event - have to wonder what I was thinking at the time. The patch pushed removes the ability to actually clear the value in the file. Although it's possible to check what's in the file first, it's still important to "attempt" the check if someone set sgio on a disk and unpriv_sgio isn't supported. So, just reverting this restores the former functionality of setting to either 0 or 1. src/qemu/qemu_conf.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 1ce459f..658a50e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1433,7 +1433,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) virDomainHostdevDefPtr hostdev = NULL; char *sysfs_path = NULL; const char *path = NULL; - bool val; + int val = -1; int ret = -1; /* "sgio" is only valid for block disk; cdrom @@ -1475,12 +1475,8 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev) * whitelist is enabled. But if requesting unfiltered access, always call * virSetDeviceUnprivSGIO, to report an error for unsupported unpriv_sgio. */ - if (!val || !virFileExists(sysfs_path)) { - ret = 0; - goto cleanup; - } - - if (virSetDeviceUnprivSGIO(path, NULL, 1) < 0) + if ((virFileExists(sysfs_path) || val == 1) && + virSetDeviceUnprivSGIO(path, NULL, val) < 0) goto cleanup; ret = 0; -- 2.1.0

2 1

[libvirt] ANNOUNCE: libvirt 1.2.18.1 maintenance release
by Cole Robinson 22 Sep '15

22 Sep '15

libvirt 1.2.18.1 is now available. This is a maintenance release of libvirt 1.2.18 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.2.18.1.tar.gz Changes in this version: * test driver: don't unlock pool after freeing it * libxl: fix AttachDeviceConfig on hostdev type * security_selinux: Take @privileged into account * selinux: fix compile errors * security_selinux: Add SetDirLabel support * security: Add virSecurityDomainSetDirLabel * security_selinux: Use proper structure to access socket data * security_selinux: Replace SELinuxSCSICallbackData with proper struct * virSecuritySELinuxSetSecurityAllLabel: drop useless virFileIsSharedFSType * virSecurityManager: Track if running as privileged * qemu: hotplug: Properly clean up drive backend if frontend hotplug fails * xen: fix race in refresh of config cache * libxl: don't end job for ephemeal domain on start failure * conf: fix crash when parsing a unordered NUMA <cell/> * qemu: Check virGetLastError return value for migration finish failure * libxl: don't overwrite error from virNetSocketNewConnectTCP() * domain-conf: escape string for socket attribute * src: Check for symbols ordering in ADMIN_SYM_FILES * src: Cleanup libvirt_admin.syms * src: Check libvirt_admin.syms for exported symbols * util: fallback to ioctl(SIOCBRDELBR) if netlink RTM_DELLINK fails * util: fallback to ioctl(SIOCBRADDBR) if netlink RTM_NEWLINK fails * libxl: acquire a job when receiving a migrating domain * libxl: don't attempt to resume domain when suspend fails * libxl: fix ref counting of libxlMigrationDstArgs * libvirt_lxc: Claim success for --help * virt-aa-helper: Improve valid_path * qemu: Emit correct audit message for memory hot unplug * qemu: Emit correct audit message for memory hot plug * hostdev: skip ACS check when using VFIO for device assignment * Start daemon only after filesystems are mounted * virt-aa-helper: add NVRAM store file for read/write * qemu: Update blkio.weight value after successful set * Eliminate incorrect and unnecessary check for changed IP address * virt-aa-helper: allow access to /usr/share/ovmf/ * virt-aa-helper: Simplify restriction logic * virt-aa-helper: document --probing and --dry-run * Add generated libvirt_admin.syms into .gitignore * libvirt-admin: Generate symbols file * daemon: Use $(NULL) for libvird_admin's flags * qemu: Add check for invalid iothread_id in qemuDomainChgIOThread * virsh: Reset global error after successfull domain lookup * build: fix mingw build * Detect location of qemu-bridge-helper * Check if qemu-bridge-helper exists and is executable * qemu: Use numad information when getting pin information * qemu: Keep numad hint after daemon restart * conf: Pass private data to Parse function of XML options * qemu: Fix segfault when parsing private domain data * domain: Fix crash if trying to live update disk <serial> * virNetSocketCheckProtocols: handle EAI_NONAME as IPv6 unavailable * util: don't overwrite stack when getting ethtool gfeatures * conf: Don't try formating non-existing addresses * admin: Drop 'internal.h' include from libvirt-admin.h * qemu: fail on attempts to use <filterref> for non-tap network connections * network: validate network NAT range * virNetDevBandwidthParseRate: Reject negative values * network: verify proper address family in updates to <host> and <range> * conf: more useful error message when pci function is out of range * virDomainDefParseXML: Check for malicious cpu ids in <numa/> * numa_conf: Introduce virDomainNumaGetMaxCPUID * Allow vfio hotplug of a device to the domain which owns the iommu * qemu: Forbid image pre-creation for non-shared storage migration * virsh: fix domfsinfo output in quiet mode * tests: extend workaround for gnutls private key loading failure * qemu: fix some api cannot work when disable cpuset in conf * storage: only run safezero if allocation is > 0 * qemu: command: Report stderr from qemu-bridge-helper * qemu: Fix reporting of physical capacity for block devices * remoteClientCloseFunc: Don't mangle connection object refcount * storage: Correct the 'mode' check * storage: Handle failure from refreshVol * virfile: Introduce virFileUnlink * Revert "LXC: show used memory as 0 when domain is not active" For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH 00/13] Memory alignment vs. migration fixes
by Peter Krempa 22 Sep '15

22 Sep '15

The refactorings that I've done in preparation for memory hotplug had the right idea in regards to handling of the various memory size fields in libvirt, but the execution of the refactors was suboptimal for migration compatibilty. This patchset fixes problems when migrating from older libvirt versions that allowed specifying a config where contents <memory> were not equal to the total size of all NUMA nodes. Additionally a few Patches 01-05/13 are small cleanups to various parts of the code. Patch 06/13 adds a XML parser flag that will be used later on. Patches 07-08 do a few more cleanups in the memory parsing code. Patch 12/13 in this series isn't entirely relevant to this series, but depends on 09-11/13 so I've included it here. The patch modifies the alignment for PPC machines that started requiring alignment to 256MiB in some cases. As we now have a way to keep migrations intact we can switch the alignment always. Patch 13/13 adds a test case based on an existing test to check that the sizing code did not regress (again ...). Peter Krempa (13): libxl: vz: Use accessor instead of direct access for max_balloon conf: Add helper to determine whether memory hotplug is enabled for a vm qemu: Make memory alignment helper more universal conf: Drop VIR_DOMAIN_DEF_PARSE_CLOCK_ADJUST flag conf: Document all VIR_DOMAIN_DEF_PARSE_* flags conf: Add XML parser flag that will allow us to do incompatible updates conf: Split memory related post parse stuff into separate function conf: Rename max_balloon to total_memory conf: Pre-calculate initial memory size instead of always calculating it conf: Don't always recalculate initial memory size from NUMA size totals qemu: command: Align memory sizes only on fresh starts qemu: ppc64: Align memory sizes to 256MiB blocks test: Add test to validate that memory sizes don't get updated on migration src/conf/domain_conf.c | 113 +++++++++++++++------ src/conf/domain_conf.h | 29 ++++-- src/hyperv/hyperv_driver.c | 2 +- src/libvirt_private.syms | 2 + src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_native.c | 4 +- src/phyp/phyp_driver.c | 2 +- src/qemu/qemu_command.c | 12 ++- src/qemu/qemu_domain.c | 44 +++++--- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_driver.c | 14 ++- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_migration.c | 8 +- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 2 +- src/vbox/vbox_common.c | 4 +- src/vmx/vmx.c | 2 +- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- src/xen/xm_internal.c | 2 +- src/xenapi/xenapi_driver.c | 2 +- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- .../qemuxml2argv-migrate-numa-unaligned.args | 13 +++ .../qemuxml2argv-migrate-numa-unaligned.xml | 33 ++++++ .../qemuxml2argv-pseries-cpu-compat.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-restore-v1.args | 2 +- tests/qemuxml2argvtest.c | 13 ++- tests/qemuxml2xmltest.c | 3 +- 30 files changed, 238 insertions(+), 93 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.xml -- 2.4.5

2 29

[libvirt] [PATCH 0/3] Rework our enum parsing
by Michal Privoznik 22 Sep '15

22 Sep '15

Only the first two patches are intended for review. The 3rd one is just an example to show how the code base will shrink in size. Michal Privoznik (3): virutil: Rename virEnum{From,To}String to virType{From,To}String virutil: Introduce virEnumFromString conf: Example for the new pattern src/conf/domain_conf.c | 34 ++++++++++--------------------- src/libvirt_private.syms | 3 ++- src/util/virutil.c | 53 ++++++++++++++++++++++++++++++++++++++---------- src/util/virutil.h | 40 +++++++++++++++++++++++++++++------- 4 files changed, 88 insertions(+), 42 deletions(-) -- 2.4.6

3 5

[libvirt] [PATCH v2 sandbox] virt-sandbox-image: switch to use URI to identify templates
by Daniel P. Berrange 22 Sep '15

22 Sep '15

Currently the CLI syntax is somewhat docker specific requiring inclusion of --registry arg to identify the docker download server. Other app containers have a notion of download server, but don't separate it from the template name. This patch removes that docker-ism by changing to use a URI for identifying the template image. So instead of virt-sandbox-image download \ --source docker --registry index.docker.io --username dan --password 123456 ubuntu:15.04 You can use virt-sandbox-image download docker://dan:123456@index.docker.io/ubuntu?tag=15.04 The only mandatory part is the source prefix and image name, so that can shorten to just virt-sandbox-image download docker:///ubuntu to pull down the latest ubuntu image, from the default registry using no authentication. --- Changed in v2: - Rebase against master, instead of (unpushed) docker volume patch libvirt-sandbox/image/cli.py | 71 +++++-------- libvirt-sandbox/image/sources/DockerSource.py | 142 ++++++++++++++------------ libvirt-sandbox/image/sources/Source.py | 29 +++--- libvirt-sandbox/image/template.py | 110 ++++++++++++++++++++ 4 files changed, 228 insertions(+), 124 deletions(-) create mode 100644 libvirt-sandbox/image/template.py diff --git a/libvirt-sandbox/image/cli.py b/libvirt-sandbox/image/cli.py index 1718cc5..4d02289 100755 --- a/libvirt-sandbox/image/cli.py +++ b/libvirt-sandbox/image/cli.py @@ -3,7 +3,7 @@ # Authors: Daniel P. Berrange <berrange(a)redhat.com> # Eren Yagdiran <erenyagdiran(a)gmail.com> # -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # Copyright (C) 2015 Universitat Politècnica de Catalunya. # # This program is free software; you can redistribute it and/or modify @@ -34,6 +34,8 @@ import subprocess import random import string +from libvirt_sandbox.image import template + if os.geteuid() == 0: default_template_dir = "/var/lib/libvirt/templates" default_image_dir = "/var/lib/libvirt/images" @@ -44,15 +46,6 @@ else: debug = False verbose = False -import importlib -def dynamic_source_loader(name): - name = name[0].upper() + name[1:] - modname = "libvirt_sandbox.image.sources." + name + "Source" - mod = importlib.import_module(modname) - classname = name + "Source" - classimpl = getattr(mod, classname) - return classimpl() - gettext.bindtextdomain("libvirt-sandbox", "/usr/share/locale") gettext.textdomain("libvirt-sandbox") try: @@ -73,11 +66,10 @@ def info(msg): def download(args): try: - dynamic_source_loader(args.source).download_template(templatename=args.template, - templatedir=args.template_dir, - registry=args.registry, - username=args.username, - password=args.password) + tmpl = template.Template.from_uri(args.template) + source = tmpl.get_source_impl() + source.download_template(template=tmpl, + templatedir=args.template_dir) except IOError,e: print "Source %s cannot be found in given path" %args.source except Exception,e: @@ -85,17 +77,21 @@ def download(args): def delete(args): try: - dynamic_source_loader(args.source).delete_template(templatename=args.template, - templatedir=args.template_dir) + tmpl = template.Template.from_uri(args.template) + source = tmpl.get_source_impl() + source.delete_template(template=tmpl, + templatedir=args.template_dir) except Exception,e: print "Delete Error %s", str(e) def create(args): try: - dynamic_source_loader(args.source).create_template(templatename=args.template, - templatedir=args.template_dir, - connect=args.connect, - format=args.format) + tmpl = template.Template.from_uri(args.template) + source = tmpl.get_source_impl() + source.create_template(template=tmpl, + templatedir=args.template_dir, + connect=args.connect, + format=args.format) except Exception,e: print "Create Error %s" % str(e) @@ -103,19 +99,22 @@ def run(args): try: if args.connect is not None: check_connect(args.connect) - source = dynamic_source_loader(args.source) + + tmpl = template.Template.from_uri(args.template) + source = tmpl.get_source_impl() + name = args.name if name is None: randomid = ''.join(random.choice(string.lowercase) for i in range(10)) - name = args.template + ":" + randomid + name = tmpl.path[1:] + ":" + randomid - diskfile = source.get_disk(templatename=args.template, + diskfile = source.get_disk(template=tmpl, templatedir=args.template_dir, imagedir=args.image_dir, sandboxname=name) format = "qcow2" - commandToRun = source.get_command(args.template, args.template_dir, args.args) + commandToRun = source.get_command(tmpl, args.template_dir, args.args) if len(commandToRun) == 0: commandToRun = ["/bin/sh"] cmd = ['virt-sandbox', '--name', name] @@ -129,7 +128,7 @@ def run(args): params.append('-N') params.append(networkArgs) - allEnvs = source.get_env(args.template, args.template_dir) + allEnvs = source.get_env(tmpl, args.template_dir) envArgs = args.env if envArgs is not None: allEnvs = allEnvs + envArgs @@ -151,7 +150,7 @@ def run(args): def requires_template(parser): parser.add_argument("template", - help=_("name of the template")) + help=_("URI of the template")) def requires_name(parser): parser.add_argument("-n","--name", @@ -163,23 +162,10 @@ def check_connect(connectstr): raise ValueError("URI '%s' is not supported by virt-sandbox-image" % connectstr) return True -def requires_source(parser): - parser.add_argument("-s","--source", - default="docker", - help=_("name of the template")) - def requires_connect(parser): parser.add_argument("-c","--connect", help=_("Connect string for libvirt")) -def requires_auth_conn(parser): - parser.add_argument("-r","--registry", - help=_("Url of the custom registry")) - parser.add_argument("-u","--username", - help=_("Username for the custom registry")) - parser.add_argument("-p","--password", - help=_("Password for the custom registry")) - def requires_template_dir(parser): global default_template_dir parser.add_argument("-t","--template-dir", @@ -196,8 +182,6 @@ def gen_download_args(subparser): parser = subparser.add_parser("download", help=_("Download template data")) requires_template(parser) - requires_source(parser) - requires_auth_conn(parser) requires_template_dir(parser) parser.set_defaults(func=download) @@ -205,7 +189,6 @@ def gen_delete_args(subparser): parser = subparser.add_parser("delete", help=_("Delete template data")) requires_template(parser) - requires_source(parser) requires_template_dir(parser) parser.set_defaults(func=delete) @@ -213,7 +196,6 @@ def gen_create_args(subparser): parser = subparser.add_parser("create", help=_("Create image from template data")) requires_template(parser) - requires_source(parser) requires_connect(parser) requires_template_dir(parser) parser.add_argument("-f","--format", @@ -226,7 +208,6 @@ def gen_run_args(subparser): help=_("Run an already built image")) requires_name(parser) requires_template(parser) - requires_source(parser) requires_connect(parser) requires_template_dir(parser) requires_image_dir(parser) diff --git a/libvirt-sandbox/image/sources/DockerSource.py b/libvirt-sandbox/image/sources/DockerSource.py index c374a0c..10f8537 100644 --- a/libvirt-sandbox/image/sources/DockerSource.py +++ b/libvirt-sandbox/image/sources/DockerSource.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- # # Copyright (C) 2015 Universitat Politècnica de Catalunya. +# Copyright (C) 2015 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 @@ -28,6 +29,8 @@ import traceback import os import subprocess import shutil +import urlparse + class DockerConfParser(): @@ -47,12 +50,6 @@ class DockerConfParser(): class DockerSource(Source): - www_auth_username = None - www_auth_password = None - - def __init__(self): - self.default_index_server = "index.docker.io" - def _check_cert_validate(self): major = sys.version_info.major SSL_WARNING = "SSL certificates couldn't be validated by default. You need to have 2.7.9/3.4.3 or higher" @@ -62,43 +59,38 @@ class DockerSource(Source): if (major == 2 and sys.hexversion < py2_7_9_hexversion) or (major == 3 and sys.hexversion < py3_4_3_hexversion): sys.stderr.write(SSL_WARNING) - def download_template(self, templatename, templatedir, - registry=None, username=None, password=None): - if registry is None: - registry = self.default_index_server - - if username is not None: - self.www_auth_username = username - self.www_auth_password = password - + def download_template(self, template, templatedir): self._check_cert_validate() - tag = "latest" - offset = templatename.find(':') - if offset != -1: - tag = templatename[offset + 1:] - templatename = templatename[0:offset] + try: - (data, res) = self._get_json(registry, "/v1/repositories/" + templatename + "/images", - {"X-Docker-Token": "true"}) + (data, res) = self._get_json(template, + None, + "/v1/repositories" + template.path + "/images", + {"X-Docker-Token": "true"}) except urllib2.HTTPError, e: - raise ValueError(["Image '%s' does not exist" % templatename]) + raise ValueError(["Image '%s' does not exist" % template]) registryendpoint = res.info().getheader('X-Docker-Endpoints') token = res.info().getheader('X-Docker-Token') checksums = {} for layer in data: pass - (data, res) = self._get_json(registryendpoint, "/v1/repositories/" + templatename + "/tags", - { "Authorization": "Token " + token }) + (data, res) = self._get_json(template, + registryendpoint, + "/v1/repositories" + template.path + "/tags", + { "Authorization": "Token " + token }) cookie = res.info().getheader('Set-Cookie') + tag = template.params.get("tag", "latest") if not tag in data: - raise ValueError(["Tag '%s' does not exist for image '%s'" % (tag, templatename)]) + raise ValueError(["Tag '%s' does not exist for image '%s'" % (tag, template)]) imagetagid = data[tag] - (data, res) = self._get_json(registryendpoint, "/v1/images/" + imagetagid + "/ancestry", - { "Authorization": "Token "+token }) + (data, res) = self._get_json(template, + registryendpoint, + "/v1/images/" + imagetagid + "/ancestry", + { "Authorization": "Token "+ token }) if data[0] != imagetagid: raise ValueError(["Expected first layer id '%s' to match image id '%s'", @@ -118,8 +110,11 @@ class DockerSource(Source): datafile = layerdir + "/template.tar.gz" if not os.path.exists(jsonfile) or not os.path.exists(datafile): - res = self._save_data(registryendpoint, "/v1/images/" + layerid + "/json", - { "Authorization": "Token " + token }, jsonfile) + res = self._save_data(template, + registryendpoint, + "/v1/images/" + layerid + "/json", + { "Authorization": "Token " + token }, + jsonfile) createdFiles.append(jsonfile) layersize = int(res.info().getheader("Content-Length")) @@ -128,12 +123,15 @@ class DockerSource(Source): if layerid in checksums: datacsum = checksums[layerid] - self._save_data(registryendpoint, "/v1/images/" + layerid + "/layer", - { "Authorization": "Token "+token }, datafile, datacsum, layersize) + self._save_data(template, + registryendpoint, + "/v1/images/" + layerid + "/layer", + { "Authorization": "Token "+token }, + datafile, datacsum, layersize) createdFiles.append(datafile) index = { - "name": templatename, + "name": template.path, } indexfile = templatedir + "/" + imagetagid + "/index.json" @@ -152,9 +150,11 @@ class DockerSource(Source): shutil.rmtree(d) except: pass - def _save_data(self,server, path, headers, dest, checksum=None, datalen=None): + + def _save_data(self, template, server, path, headers, + dest, checksum=None, datalen=None): try: - res = self._get_url(server, path, headers) + res = self._get_url(template, server, path, headers) csum = None if checksum is not None: @@ -193,8 +193,22 @@ class DockerSource(Source): debug("FAIL %s\n" % str(e)) raise - def _get_url(self,server, path, headers): - url = "https://" + server + path + def _get_url(self, template, server, path, headers): + if template.protocol is None: + protocol = "https" + else: + protocol = template.protocol + + if server is None: + if template.hostname is None: + server = "index.docker.io" + else: + if template.port is not None: + server = template.hostname + ":" + template.port + else: + server = template.hostname + + url = urlparse.urlunparse((protocol, server, path, None, None, None)) debug("Fetching %s..." % url) req = urllib2.Request(url=url) @@ -204,16 +218,18 @@ class DockerSource(Source): req.add_header(h, headers[h]) #www Auth header starts - if self.www_auth_username is not None: - base64string = base64.encodestring('%s:%s' % (self.www_auth_username, self.www_auth_password)).replace('\n', '') + if template.username and template.password: + base64string = base64.encodestring( + '%s:%s' % (template.username, + template.password)).replace('\n', '') req.add_header("Authorization", "Basic %s" % base64string) #www Auth header finish return urllib2.urlopen(req) - def _get_json(self,server, path, headers): + def _get_json(self, template, server, path, headers): try: - res = self._get_url(server, path, headers) + res = self._get_url(template, server, path, headers) data = json.loads(res.read()) debug("OK\n") return (data, res) @@ -221,11 +237,11 @@ class DockerSource(Source): debug("FAIL %s\n" % str(e)) raise - def create_template(self, templatename, templatedir, connect=None, format=None): + def create_template(self, template, templatedir, connect=None, format=None): if format is None: format = self.default_disk_format self._check_disk_format(format) - imagelist = self._get_image_list(templatename,templatedir) + imagelist = self._get_image_list(template, templatedir) imagelist.reverse() parentImage = None @@ -252,7 +268,7 @@ class DockerSource(Source): if not format in supportedFormats: raise ValueError(["Unsupported image format %s" % format]) - def _get_image_list(self,templatename,destdir): + def _get_image_list(self, template, destdir): imageparent = {} imagenames = {} imagedirs = os.listdir(destdir) @@ -265,13 +281,13 @@ class DockerSource(Source): jsonfile = destdir + "/" + imagetagid + "/template.json" if os.path.exists(jsonfile): with open(jsonfile,"r") as f: - template = json.load(f) - parent = template.get("parent",None) + data = json.load(f) + parent = data.get("parent",None) if parent: imageparent[imagetagid] = parent - if not templatename in imagenames: - raise ValueError(["Image %s does not exist locally" %templatename]) - imagetagid = imagenames[templatename] + if not template.path in imagenames: + raise ValueError(["Image %s does not exist locally" % template.path]) + imagetagid = imagenames[template.path] imagelist = [] while imagetagid != None: imagelist.append(imagetagid) @@ -310,7 +326,7 @@ class DockerSource(Source): cmd = cmd + params subprocess.call(cmd) - def delete_template(self, templatename, templatedir): + def delete_template(self, template, templatedir): imageusage = {} imageparent = {} imagenames = {} @@ -324,9 +340,9 @@ class DockerSource(Source): jsonfile = templatedir + "/" + imagetagid + "/template.json" if os.path.exists(jsonfile): with open(jsonfile,"r") as f: - template = json.load(f) + data = json.load(f) - parent = template.get("parent",None) + parent = data.get("parent",None) if parent: if parent not in imageusage: imageusage[parent] = [] @@ -334,10 +350,10 @@ class DockerSource(Source): imageparent[imagetagid] = parent - if not templatename in imagenames: - raise ValueError(["Image %s does not exist locally" %templatename]) + if not template.path in imagenames: + raise ValueError(["Image %s does not exist locally" % template.path]) - imagetagid = imagenames[templatename] + imagetagid = imagenames[template.path] while imagetagid != None: debug("Remove %s\n" % imagetagid) parent = imageparent.get(imagetagid,None) @@ -360,15 +376,15 @@ class DockerSource(Source): parent = None imagetagid = parent - def _get_template_data(self, templatename, templatedir): - imageList = self._get_image_list(templatename, templatedir) + def _get_template_data(self, template, templatedir): + imageList = self._get_image_list(template, templatedir) toplayer = imageList[0] diskfile = templatedir + "/" + toplayer + "/template.qcow2" configfile = templatedir + "/" + toplayer + "/template.json" return configfile, diskfile - def get_disk(self,templatename, templatedir, imagedir, sandboxname): - configfile, diskfile = self._get_template_data(templatename, templatedir) + def get_disk(self, template, templatedir, imagedir, sandboxname): + configfile, diskfile = self._get_template_data(template, templatedir) tempfile = imagedir + "/" + sandboxname + ".qcow2" if not os.path.exists(imagedir): os.makedirs(imagedir) @@ -379,8 +395,8 @@ class DockerSource(Source): subprocess.call(cmd) return tempfile - def get_command(self, templatename, templatedir, userargs): - configfile, diskfile = self._get_template_data(templatename, templatedir) + def get_command(self, template, templatedir, userargs): + configfile, diskfile = self._get_template_data(template, templatedir) configParser = DockerConfParser(configfile) cmd = configParser.getCommand() entrypoint = configParser.getEntrypoint() @@ -393,8 +409,8 @@ class DockerSource(Source): else: return entrypoint + cmd - def get_env(self, templatename, templatedir): - configfile, diskfile = self._get_template_data(templatename, templatedir) + def get_env(self, template, templatedir): + configfile, diskfile = self._get_template_data(template, templatedir) configParser = DockerConfParser(configfile) return configParser.getEnvs() diff --git a/libvirt-sandbox/image/sources/Source.py b/libvirt-sandbox/image/sources/Source.py index 8a21f90..597a7fb 100644 --- a/libvirt-sandbox/image/sources/Source.py +++ b/libvirt-sandbox/image/sources/Source.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- # # Copyright (C) 2015 Universitat Politècnica de Catalunya. +# Copyright (C) 2015 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 @@ -33,14 +34,10 @@ class Source(): pass @abstractmethod - def download_template(self, templatename, templatedir, - registry=None, username=None, password=None): + def download_template(self, template, templatedir): """ - :param templatename: name of the template image to download + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which to store the template - :param registry: optional hostname of image registry server - :param username: optional username to authenticate against registry server - :param password: optional password to authenticate against registry server Download a template from the registry, storing it in the local filesystem @@ -48,10 +45,10 @@ class Source(): pass @abstractmethod - def create_template(self, templatename, templatedir, + def create_template(self, template, templatedir, connect=None, format=None): """ - :param templatename: name of the template image to create + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which to store the template :param connect: libvirt connection URI :param format: disk image format @@ -63,9 +60,9 @@ class Source(): pass @abstractmethod - def delete_template(self, templatename, templatedir): + def delete_template(self, template, templatedir): """ - :param templatename: name of the template image to delete + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path from which to delete template Delete all local files associated with the template @@ -73,9 +70,9 @@ class Source(): pass @abstractmethod - def get_command(self, templatename, templatedir, userargs): + def get_command(self, template, templatedir, userargs): """ - :param templatename: name of the template image to query + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which templates are stored :param userargs: user specified arguments to run @@ -85,9 +82,9 @@ class Source(): pass @abstractmethod - def get_disk(self,templatename, templatedir, imagedir, sandboxname): + def get_disk(self, template, templatedir, imagedir, sandboxname): """ - :param templatename: name of the template image to download + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which to find template :param imagedir: local directory in which to storage disk image @@ -97,9 +94,9 @@ class Source(): pass @abstractmethod - def get_env(self,templatename, templatedir): + def get_env(self, template, templatedir): """ - :param templatename: name of the template image to download + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which to find template Get the dict of environment variables to set diff --git a/libvirt-sandbox/image/template.py b/libvirt-sandbox/image/template.py new file mode 100644 index 0000000..0ad767b --- /dev/null +++ b/libvirt-sandbox/image/template.py @@ -0,0 +1,110 @@ +# +# -*- coding: utf-8 -*- +# Authors: Daniel P. Berrange <berrange(a)redhat.com> +# +# Copyright (C) 2015 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +import urlparse +import importlib + +class Template(object): + + def __init__(self, + source, protocol, + hostname, port, + username, password, + path, params): + """ + :param source: template source name + :param protocol: network transport protocol or None + :param hostname: registry hostname or None + :param port: registry port or None + :param username: username or None + :param password: password or None + :param path: template path identifier + :param params: template parameters + + docker:///ubuntu + + docker+https://index.docker.io/ubuntu?tag=latest + """ + + self.source = source + self.protocol = protocol + self.hostname = hostname + self.port = port + self.username = username + self.password = password + self.path = path + self.params = params + if self.params is None: + self.params = {} + + def get_source_impl(self): + mod = importlib.import_module( + "libvirt_sandbox.image.sources." + + self.source.capitalize() + "Source") + classname = self.source.capitalize() + "Source" + classimpl = getattr(mod, classname) + return classimpl() + + def __repr__(self): + if self.protocol is not None: + scheme = self.source + "+" + self.protocol + else: + scheme = self.source + if self.hostname: + if self.port: + netloc = self.hostname + ":" + self.port + else: + netloc = self.hostname + + if self.username: + if self.password: + auth = self.username + ":" + self.password + else: + auth = self.username + netloc = auth + "@" + netloc + else: + netloc = None + + query = "&".join([key + "=" + self.params[key] for key in self.params.keys()]) + return urlparse.urlunparse((scheme, netloc, self.path, None, query, None)) + + @classmethod + def from_uri(klass, uri): + o = urlparse.urlparse(uri) + + idx = o.scheme.find("+") + if idx == -1: + source = o.scheme + protocol = None + else: + source = o.scheme[0:idx] + protocol = o.schema[idx + 1:] + + query = {} + if o.query is not None and o.query != "": + for param in o.query.split("&"): + (key, val) = param.split("=") + query[key] = val + return klass(source, protocol, + o.hostname, o.port, + o.username, o.password, + o.path, query) + -- 2.4.3

2 8

[libvirt] [PATCH sandbox] docker: don't assume X-Docker-Token is set
by Daniel P. Berrange 22 Sep '15

22 Sep '15

The Red Hat docker registry (registry.access.redhat.com) does not set any X-Docker-Token HTTP header in its responses. Change the code so it only passes around this header if it is actually present. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-sandbox/image/sources/DockerSource.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libvirt-sandbox/image/sources/DockerSource.py b/libvirt-sandbox/image/sources/DockerSource.py index f367c8f..78b2a53 100644 --- a/libvirt-sandbox/image/sources/DockerSource.py +++ b/libvirt-sandbox/image/sources/DockerSource.py @@ -83,10 +83,14 @@ class DockerSource(Source): checksums = {} for layer in data: pass + + headers = {} + if token is not None: + headers["Authorization"] = "Token" + token (data, res) = self._get_json(template, registryendpoint, "/v1/repositories" + template.path + "/tags", - { "Authorization": "Token " + token }) + headers) cookie = res.info().getheader('Set-Cookie') @@ -98,7 +102,7 @@ class DockerSource(Source): (data, res) = self._get_json(template, registryendpoint, "/v1/images/" + imagetagid + "/ancestry", - { "Authorization": "Token "+ token }) + headers) if data[0] != imagetagid: raise ValueError(["Expected first layer id '%s' to match image id '%s'", @@ -121,7 +125,7 @@ class DockerSource(Source): res = self._save_data(template, registryendpoint, "/v1/images/" + layerid + "/json", - { "Authorization": "Token " + token }, + headers, jsonfile) createdFiles.append(jsonfile) @@ -134,7 +138,7 @@ class DockerSource(Source): self._save_data(template, registryendpoint, "/v1/images/" + layerid + "/layer", - { "Authorization": "Token "+token }, + headers, datafile, datacsum, layersize) createdFiles.append(datafile) -- 2.4.3

2 4

[libvirt] [libvirt-python][PATCH] generator: fix build fail with old xml lib
by Luyao Huang 22 Sep '15

22 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1222795#c6 if build libvirt-python with some old xml lib (python-pyxml), build will fail and error like this: File "generator.py", line 139, in start if "string" in attrs: File "/usr/local/lib/python2.7/site-packages/_xmlplus/sax/xmlreader.py" \ , line 316, in __getitem__ return self._attrs[name] KeyError: 0 This is an old issue and have been mentioned in commit 3ae0a76d. There is no __contains__ in class AttributesImpl, python will use __getitem__ in this place, so we will get error. Let's use 'YYY in XXX.keys()' to avoid this issue. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator.py b/generator.py index 2fc838c..d9ae17e 100755 --- a/generator.py +++ b/generator.py @@ -136,7 +136,7 @@ class docParser(xml.sax.handler.ContentHandler): elif attrs['file'] == "libvirt-qemu": qemu_enum(attrs['type'],attrs['name'],attrs['value']) elif tag == "macro": - if "string" in attrs: + if "string" in attrs.keys(): params.append((attrs['name'], attrs['string'])) def end(self, tag): -- 1.8.3.1

3 2

[libvirt] [PATCH 0/4] Implement mockup capabilities cache in QEMU tests
by Ján Tomko 22 Sep '15

22 Sep '15

v2: https://www.redhat.com/archives/libvir-list/2015-September/msg00374.html v3: * split out the movement of existing initialization code to qemuTestDriverInit from the cache addition * qemuTestDriverInit now adds an empty capability cache, so most tests are unchanged * renamed 'cleanup' to 'error' in qemuTestDriverInit, since it's only called on error paths * fixed indentation issues to pass syntax-check * removed mode changes to 755 Pavel Fedin (4): tests: split out common qemu driver initialization Implement infrastracture for mocking up QEMU capabilities cache Use mockup cache Removed unneeded check src/qemu/qemu_capabilities.c | 16 ++++----- src/qemu/qemu_capspriv.h | 36 ++++++++++++++++++++ src/qemu/qemu_domain.c | 10 ++---- tests/domainsnapshotxml2xmltest.c | 10 ++---- tests/qemuagenttest.c | 11 +++--- tests/qemuargv2xmltest.c | 12 ++----- tests/qemuhotplugtest.c | 32 +++++++++--------- tests/qemuxml2argvtest.c | 17 +++++----- tests/qemuxml2xmltest.c | 8 ++--- tests/qemuxmlnstest.c | 17 +++++----- tests/testutilsqemu.c | 70 +++++++++++++++++++++++++++++++++++++++ tests/testutilsqemu.h | 7 ++++ 12 files changed, 170 insertions(+), 76 deletions(-) create mode 100644 src/qemu/qemu_capspriv.h -- 2.4.6

3 14

[libvirt] [PATCH] test driver: don't unlock pool after freeing it
by David Mansfield 21 Sep '15

21 Sep '15

The attached patch (taken from my modified Fedora 22 source rpm, 1.2.13.1-2.fc22, sorry), fixes a case where, in the test driver, memory is accessed after it's freed. Patch applies to latest git with: Hunk #1 succeeded at 4395 (offset -469 lines). The illegal access was found using valgrind. The function testStoragePoolUndefine() calls virStoragePoolObjRemove() (which seems to free the memory for that pool structure) and then in the cleanup stanza calls virStoragePoolObjUnlock() which tampers with the freed structure. -- Thanks, David Mansfield

2 3

[libvirt] [PATCH sandbox] virt-sandbox-image: switch to use URI to identify templates
by Daniel P. Berrange 21 Sep '15

21 Sep '15

Currently the CLI syntax is somewhat docker specific requiring inclusion of --registry arg to identify the docker download server. Other app containers have a notion of download server, but don't separate it from the template name. This patch removes that docker-ism by changing to use a URI for identifying the template image. So instead of virt-sandbox-image download \ --source docker --registry index.docker.io --username dan --password 123456 ubuntu:15.04 You can use virt-sandbox-image download docker://dan@123456:index.docker.io/ubuntu?tag=15.04 The only mandatory part is the source prefix and image name, so that can shorten to just virt-sandbox-image download docker:///ubuntu to pull down the latest ubuntu image, from the default registry using no authentication. --- libvirt-sandbox/image/cli.py | 73 +++++-------- libvirt-sandbox/image/sources/DockerSource.py | 146 ++++++++++++++------------ libvirt-sandbox/image/sources/Source.py | 33 +++--- libvirt-sandbox/image/template.py | 109 +++++++++++++++++++ 4 files changed, 232 insertions(+), 129 deletions(-) create mode 100644 libvirt-sandbox/image/template.py diff --git a/libvirt-sandbox/image/cli.py b/libvirt-sandbox/image/cli.py index c8b5ba5..dd109a8 100755 --- a/libvirt-sandbox/image/cli.py +++ b/libvirt-sandbox/image/cli.py @@ -3,7 +3,7 @@ # Authors: Daniel P. Berrange <berrange(a)redhat.com> # Eren Yagdiran <erenyagdiran(a)gmail.com> # -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # Copyright (C) 2015 Universitat Politècnica de Catalunya. # # This program is free software; you can redistribute it and/or modify @@ -34,6 +34,8 @@ import subprocess import random import string +from libvirt_sandbox.image import template + if os.geteuid() == 0: default_template_dir = "/var/lib/libvirt/templates" default_image_dir = "/var/lib/libvirt/images" @@ -44,15 +46,6 @@ else: debug = False verbose = False -import importlib -def dynamic_source_loader(name): - name = name[0].upper() + name[1:] - modname = "libvirt_sandbox.image.sources." + name + "Source" - mod = importlib.import_module(modname) - classname = name + "Source" - classimpl = getattr(mod, classname) - return classimpl() - gettext.bindtextdomain("libvirt-sandbox", "/usr/share/locale") gettext.textdomain("libvirt-sandbox") try: @@ -73,11 +66,10 @@ def info(msg): def download(args): try: - dynamic_source_loader(args.source).download_template(templatename=args.template, - templatedir=args.template_dir, - registry=args.registry, - username=args.username, - password=args.password) + tmpl = template.Template.from_uri(args.template) + source = tmpl.get_source_impl() + source.download_template(template=tmpl, + templatedir=args.template_dir) except IOError,e: print "Source %s cannot be found in given path" %args.source except Exception,e: @@ -85,17 +77,21 @@ def download(args): def delete(args): try: - dynamic_source_loader(args.source).delete_template(templatename=args.template, - templatedir=args.template_dir) + tmpl = template.Template.from_uri(args.template) + source = tmpl.get_source_impl() + source.delete_template(template=tmpl, + templatedir=args.template_dir) except Exception,e: print "Delete Error %s", str(e) def create(args): try: - dynamic_source_loader(args.source).create_template(templatename=args.template, - templatedir=args.template_dir, - connect=args.connect, - format=args.format) + tmpl = template.Template.from_uri(args.template) + source = tmpl.get_source_impl() + source.create_template(template=tmpl, + templatedir=args.template_dir, + connect=args.connect, + format=args.format) except Exception,e: print "Create Error %s" % str(e) @@ -104,19 +100,22 @@ def run(args): global image_dir if args.connect is not None: check_connect(args.connect) - source = dynamic_source_loader(args.source) + + tmpl = template.Template.from_uri(args.template) + source = tmpl.get_source_impl() + name = args.name if name is None: randomid = ''.join(random.choice(string.lowercase) for i in range(10)) - name = args.template + ":" + randomid + name = tmpl.path[1:] + ":" + randomid - diskfile = source.get_disk(templatename=args.template, + diskfile = source.get_disk(template=tmpl, templatedir=args.template_dir, imagedir=args.image_dir, sandboxname=name) format = "qcow2" - commandToRun = source.get_command(args.template, args.template_dir, args.args) + commandToRun = source.get_command(tmpl, args.template_dir, args.args) if len(commandToRun) == 0: commandToRun = ["/bin/sh"] cmd = ['virt-sandbox', '--name', name] @@ -130,7 +129,7 @@ def run(args): params.append('-N') params.append(networkArgs) - allEnvs = source.get_env(args.template, args.template_dir) + allEnvs = source.get_env(tmpl, args.template_dir) envArgs = args.env if envArgs is not None: allEnvs = allEnvs + envArgs @@ -143,7 +142,7 @@ def run(args): else: pass - allVolumes = source.get_volumes(args.template, args.template_dir) + allVolumes = source.get_volumes(tmpl, args.template_dir) volumeArgs = args.volume if volumeArgs is not None: allVolumes = allVolumes + volumeArgs @@ -172,7 +171,7 @@ def run(args): def requires_template(parser): parser.add_argument("template", - help=_("name of the template")) + help=_("URI of the template")) def requires_name(parser): parser.add_argument("-n","--name", @@ -184,23 +183,10 @@ def check_connect(connectstr): raise ValueError("URI '%s' is not supported by virt-sandbox-image" % connectstr) return True -def requires_source(parser): - parser.add_argument("-s","--source", - default="docker", - help=_("name of the template")) - def requires_connect(parser): parser.add_argument("-c","--connect", help=_("Connect string for libvirt")) -def requires_auth_conn(parser): - parser.add_argument("-r","--registry", - help=_("Url of the custom registry")) - parser.add_argument("-u","--username", - help=_("Username for the custom registry")) - parser.add_argument("-p","--password", - help=_("Password for the custom registry")) - def requires_template_dir(parser): global default_template_dir parser.add_argument("-t","--template-dir", @@ -217,8 +203,6 @@ def gen_download_args(subparser): parser = subparser.add_parser("download", help=_("Download template data")) requires_template(parser) - requires_source(parser) - requires_auth_conn(parser) requires_template_dir(parser) parser.set_defaults(func=download) @@ -226,7 +210,6 @@ def gen_delete_args(subparser): parser = subparser.add_parser("delete", help=_("Delete template data")) requires_template(parser) - requires_source(parser) requires_template_dir(parser) parser.set_defaults(func=delete) @@ -234,7 +217,6 @@ def gen_create_args(subparser): parser = subparser.add_parser("create", help=_("Create image from template data")) requires_template(parser) - requires_source(parser) requires_connect(parser) requires_template_dir(parser) parser.add_argument("-f","--format", @@ -247,7 +229,6 @@ def gen_run_args(subparser): help=_("Run an already built image")) requires_name(parser) requires_template(parser) - requires_source(parser) requires_connect(parser) requires_template_dir(parser) requires_image_dir(parser) diff --git a/libvirt-sandbox/image/sources/DockerSource.py b/libvirt-sandbox/image/sources/DockerSource.py index ff950ce..f367c8f 100644 --- a/libvirt-sandbox/image/sources/DockerSource.py +++ b/libvirt-sandbox/image/sources/DockerSource.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- # # Copyright (C) 2015 Universitat Politècnica de Catalunya. +# Copyright (C) 2015 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 @@ -29,6 +30,8 @@ import os import subprocess import shutil import collections +import urlparse + class DockerConfParser(): @@ -55,12 +58,6 @@ class DockerConfParser(): class DockerSource(Source): - www_auth_username = None - www_auth_password = None - - def __init__(self): - self.default_index_server = "index.docker.io" - def _check_cert_validate(self): major = sys.version_info.major SSL_WARNING = "SSL certificates couldn't be validated by default. You need to have 2.7.9/3.4.3 or higher" @@ -70,43 +67,38 @@ class DockerSource(Source): if (major == 2 and sys.hexversion < py2_7_9_hexversion) or (major == 3 and sys.hexversion < py3_4_3_hexversion): sys.stderr.write(SSL_WARNING) - def download_template(self, templatename, templatedir, - registry=None, username=None, password=None): - if registry is None: - registry = self.default_index_server - - if username is not None: - self.www_auth_username = username - self.www_auth_password = password - + def download_template(self, template, templatedir): self._check_cert_validate() - tag = "latest" - offset = templatename.find(':') - if offset != -1: - tag = templatename[offset + 1:] - templatename = templatename[0:offset] + try: - (data, res) = self._get_json(registry, "/v1/repositories/" + templatename + "/images", - {"X-Docker-Token": "true"}) + (data, res) = self._get_json(template, + None, + "/v1/repositories" + template.path + "/images", + {"X-Docker-Token": "true"}) except urllib2.HTTPError, e: - raise ValueError(["Image '%s' does not exist" % templatename]) + raise ValueError(["Image '%s' does not exist" % template]) registryendpoint = res.info().getheader('X-Docker-Endpoints') token = res.info().getheader('X-Docker-Token') checksums = {} for layer in data: pass - (data, res) = self._get_json(registryendpoint, "/v1/repositories/" + templatename + "/tags", - { "Authorization": "Token " + token }) + (data, res) = self._get_json(template, + registryendpoint, + "/v1/repositories" + template.path + "/tags", + { "Authorization": "Token " + token }) cookie = res.info().getheader('Set-Cookie') + tag = template.params.get("tag", "latest") if not tag in data: - raise ValueError(["Tag '%s' does not exist for image '%s'" % (tag, templatename)]) + raise ValueError(["Tag '%s' does not exist for image '%s'" % (tag, template)]) imagetagid = data[tag] - (data, res) = self._get_json(registryendpoint, "/v1/images/" + imagetagid + "/ancestry", - { "Authorization": "Token "+token }) + (data, res) = self._get_json(template, + registryendpoint, + "/v1/images/" + imagetagid + "/ancestry", + { "Authorization": "Token "+ token }) if data[0] != imagetagid: raise ValueError(["Expected first layer id '%s' to match image id '%s'", @@ -126,8 +118,11 @@ class DockerSource(Source): datafile = layerdir + "/template.tar.gz" if not os.path.exists(jsonfile) or not os.path.exists(datafile): - res = self._save_data(registryendpoint, "/v1/images/" + layerid + "/json", - { "Authorization": "Token " + token }, jsonfile) + res = self._save_data(template, + registryendpoint, + "/v1/images/" + layerid + "/json", + { "Authorization": "Token " + token }, + jsonfile) createdFiles.append(jsonfile) layersize = int(res.info().getheader("Content-Length")) @@ -136,12 +131,15 @@ class DockerSource(Source): if layerid in checksums: datacsum = checksums[layerid] - self._save_data(registryendpoint, "/v1/images/" + layerid + "/layer", - { "Authorization": "Token "+token }, datafile, datacsum, layersize) + self._save_data(template, + registryendpoint, + "/v1/images/" + layerid + "/layer", + { "Authorization": "Token "+token }, + datafile, datacsum, layersize) createdFiles.append(datafile) index = { - "name": templatename, + "name": template.path, } indexfile = templatedir + "/" + imagetagid + "/index.json" @@ -160,9 +158,11 @@ class DockerSource(Source): shutil.rmtree(d) except: pass - def _save_data(self,server, path, headers, dest, checksum=None, datalen=None): + + def _save_data(self, template, server, path, headers, + dest, checksum=None, datalen=None): try: - res = self._get_url(server, path, headers) + res = self._get_url(template, server, path, headers) csum = None if checksum is not None: @@ -201,8 +201,22 @@ class DockerSource(Source): debug("FAIL %s\n" % str(e)) raise - def _get_url(self,server, path, headers): - url = "https://" + server + path + def _get_url(self, template, server, path, headers): + if template.protocol is None: + protocol = "https" + else: + protocol = template.protocol + + if server is None: + if template.hostname is None: + server = "index.docker.io" + else: + if template.port is not None: + server = template.hostname + ":" + template.port + else: + server = template.hostname + + url = urlparse.urlunparse((protocol, server, path, None, None, None)) debug("Fetching %s..." % url) req = urllib2.Request(url=url) @@ -212,16 +226,18 @@ class DockerSource(Source): req.add_header(h, headers[h]) #www Auth header starts - if self.www_auth_username is not None: - base64string = base64.encodestring('%s:%s' % (self.www_auth_username, self.www_auth_password)).replace('\n', '') + if template.username and template.password: + base64string = base64.encodestring( + '%s:%s' % (template.username, + template.password)).replace('\n', '') req.add_header("Authorization", "Basic %s" % base64string) #www Auth header finish return urllib2.urlopen(req) - def _get_json(self,server, path, headers): + def _get_json(self, template, server, path, headers): try: - res = self._get_url(server, path, headers) + res = self._get_url(template, server, path, headers) data = json.loads(res.read()) debug("OK\n") return (data, res) @@ -229,11 +245,11 @@ class DockerSource(Source): debug("FAIL %s\n" % str(e)) raise - def create_template(self, templatename, templatedir, connect=None, format=None): + def create_template(self, template, templatedir, connect=None, format=None): if format is None: format = self.default_disk_format self._check_disk_format(format) - imagelist = self._get_image_list(templatename,templatedir) + imagelist = self._get_image_list(template, templatedir) imagelist.reverse() parentImage = None @@ -260,7 +276,7 @@ class DockerSource(Source): if not format in supportedFormats: raise ValueError(["Unsupported image format %s" % format]) - def _get_image_list(self,templatename,destdir): + def _get_image_list(self, template, destdir): imageparent = {} imagenames = {} imagedirs = os.listdir(destdir) @@ -273,13 +289,13 @@ class DockerSource(Source): jsonfile = destdir + "/" + imagetagid + "/template.json" if os.path.exists(jsonfile): with open(jsonfile,"r") as f: - template = json.load(f) - parent = template.get("parent",None) + data = json.load(f) + parent = data.get("parent",None) if parent: imageparent[imagetagid] = parent - if not templatename in imagenames: - raise ValueError(["Image %s does not exist locally" %templatename]) - imagetagid = imagenames[templatename] + if not template.path in imagenames: + raise ValueError(["Image %s does not exist locally" % template.path]) + imagetagid = imagenames[template.path] imagelist = [] while imagetagid != None: imagelist.append(imagetagid) @@ -318,7 +334,7 @@ class DockerSource(Source): cmd = cmd + params subprocess.call(cmd) - def delete_template(self, templatename, templatedir): + def delete_template(self, template, templatedir): imageusage = {} imageparent = {} imagenames = {} @@ -332,9 +348,9 @@ class DockerSource(Source): jsonfile = templatedir + "/" + imagetagid + "/template.json" if os.path.exists(jsonfile): with open(jsonfile,"r") as f: - template = json.load(f) + data = json.load(f) - parent = template.get("parent",None) + parent = data.get("parent",None) if parent: if parent not in imageusage: imageusage[parent] = [] @@ -342,10 +358,10 @@ class DockerSource(Source): imageparent[imagetagid] = parent - if not templatename in imagenames: - raise ValueError(["Image %s does not exist locally" %templatename]) + if not template.path in imagenames: + raise ValueError(["Image %s does not exist locally" % template.path]) - imagetagid = imagenames[templatename] + imagetagid = imagenames[template.path] while imagetagid != None: debug("Remove %s\n" % imagetagid) parent = imageparent.get(imagetagid,None) @@ -368,15 +384,15 @@ class DockerSource(Source): parent = None imagetagid = parent - def _get_template_data(self, templatename, templatedir): - imageList = self._get_image_list(templatename, templatedir) + def _get_template_data(self, template, templatedir): + imageList = self._get_image_list(template, templatedir) toplayer = imageList[0] diskfile = templatedir + "/" + toplayer + "/template.qcow2" configfile = templatedir + "/" + toplayer + "/template.json" return configfile, diskfile - def get_disk(self,templatename, templatedir, imagedir, sandboxname): - configfile, diskfile = self._get_template_data(templatename, templatedir) + def get_disk(self, template, templatedir, imagedir, sandboxname): + configfile, diskfile = self._get_template_data(template, templatedir) tempfile = imagedir + "/" + sandboxname + ".qcow2" if not os.path.exists(imagedir): os.makedirs(imagedir) @@ -387,8 +403,8 @@ class DockerSource(Source): subprocess.call(cmd) return tempfile - def get_command(self, templatename, templatedir, userargs): - configfile, diskfile = self._get_template_data(templatename, templatedir) + def get_command(self, template, templatedir, userargs): + configfile, diskfile = self._get_template_data(template, templatedir) configParser = DockerConfParser(configfile) cmd = configParser.getCommand() entrypoint = configParser.getEntrypoint() @@ -401,13 +417,13 @@ class DockerSource(Source): else: return entrypoint + cmd - def get_env(self, templatename, templatedir): - configfile, diskfile = self._get_template_data(templatename, templatedir) + def get_env(self, template, templatedir): + configfile, diskfile = self._get_template_data(template, templatedir) configParser = DockerConfParser(configfile) return configParser.getEnvs() - def get_volumes(self, templatename, templatedir): - configfile, diskfile = self._get_template_data(templatename, templatedir) + def get_volumes(self, template, templatedir): + configfile, diskfile = self._get_template_data(template, templatedir) configParser = DockerConfParser(configfile) return configParser.getVolumes() diff --git a/libvirt-sandbox/image/sources/Source.py b/libvirt-sandbox/image/sources/Source.py index f1dd3e7..bb69682 100644 --- a/libvirt-sandbox/image/sources/Source.py +++ b/libvirt-sandbox/image/sources/Source.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- # # Copyright (C) 2015 Universitat Politècnica de Catalunya. +# Copyright (C) 2015 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 @@ -33,14 +34,10 @@ class Source(): pass @abstractmethod - def download_template(self, templatename, templatedir, - registry=None, username=None, password=None): + def download_template(self, template, templatedir): """ - :param templatename: name of the template image to download + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which to store the template - :param registry: optional hostname of image registry server - :param username: optional username to authenticate against registry server - :param password: optional password to authenticate against registry server Download a template from the registry, storing it in the local filesystem @@ -48,10 +45,10 @@ class Source(): pass @abstractmethod - def create_template(self, templatename, templatedir, + def create_template(self, template, templatedir, connect=None, format=None): """ - :param templatename: name of the template image to create + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which to store the template :param connect: libvirt connection URI :param format: disk image format @@ -63,9 +60,9 @@ class Source(): pass @abstractmethod - def delete_template(self, templatename, templatedir): + def delete_template(self, template, templatedir): """ - :param templatename: name of the template image to delete + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path from which to delete template Delete all local files associated with the template @@ -73,9 +70,9 @@ class Source(): pass @abstractmethod - def get_command(self, templatename, templatedir, userargs): + def get_command(self, template, templatedir, userargs): """ - :param templatename: name of the template image to query + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which templates are stored :param userargs: user specified arguments to run @@ -85,9 +82,9 @@ class Source(): pass @abstractmethod - def get_disk(self,templatename, templatedir, imagedir, sandboxname): + def get_disk(self, template, templatedir, imagedir, sandboxname): """ - :param templatename: name of the template image to download + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which to find template :param imagedir: local directory in which to storage disk image @@ -97,9 +94,9 @@ class Source(): pass @abstractmethod - def get_env(self,templatename, templatedir): + def get_env(self, template, templatedir): """ - :param templatename: name of the template image to download + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which to find template Get the dict of environment variables to set @@ -107,9 +104,9 @@ class Source(): pass @abstractmethod - def get_volumes(self,templatename, templatedir): + def get_volumes(self, template, templatedir): """ - :param templatename: name of the template image to download + :param template: libvirt_sandbox.template.Template object :param templatedir: local directory path in which to find template Get the list of volumes associated with the template diff --git a/libvirt-sandbox/image/template.py b/libvirt-sandbox/image/template.py new file mode 100644 index 0000000..9021242 --- /dev/null +++ b/libvirt-sandbox/image/template.py @@ -0,0 +1,109 @@ +# +# -*- coding: utf-8 -*- +# Authors: Daniel P. Berrange <berrange(a)redhat.com> +# +# Copyright (C) 2015 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + +import urlparse +import importlib + +class Template(object): + + def __init__(self, + source, protocol, + hostname, port, + username, password, + path, params): + """ + :param source: template source name + :param protocol: network transport protocol or None + :param hostname: registry hostname or None + :param port: registry port or None + :param username: username or None + :param password: password or None + :param path: template path identifier + :param params: template parameters + + docker:///ubuntu + + docker+https://index.docker.io/ubuntu?tag=latest + """ + + self.source = source + self.protocol = protocol + self.hostname = hostname + self.port = port + self.username = username + self.password = password + self.path = path + self.params = params + if self.params is None: + self.params = {} + + def get_source_impl(self): + mod = importlib.import_module( + "libvirt_sandbox.image.sources." + + self.source.capitalize() + "Source") + classname = self.source.capitalize() + "Source" + classimpl = getattr(mod, classname) + return classimpl() + + def __repr__(self): + if self.protocol is not None: + scheme = self.source + "+" + self.protocol + else: + scheme = self.source + if self.hostname: + if self.port: + netloc = self.hostname + ":" + self.port + else: + netloc = self.hostname + + if self.username: + if self.password: + auth = self.username + ":" + self.password + else: + auth = self.username + netloc = auth + "@" + netloc + else: + netloc = None + + query = "&".join([key + "=" + self.params[key] for key in self.params.keys()]) + return urlparse.urlunparse((scheme, netloc, self.path, None, query, None)) + + @classmethod + def from_uri(klass, uri): + o = urlparse.urlparse(uri) + + idx = o.scheme.find("+") + if idx == -1: + source = o.scheme + protocol = None + else: + source = o.scheme[0:idx] + protocol = o.schema[idx + 1:] + + query = {} + for param in o.query.split("&"): + (key, val) = param.split("=") + query[key] = val + return klass(source, protocol, + o.hostname, o.port, + o.username, o.password, + o.path, query) + -- 2.4.3

1 0

[libvirt] [PATCH] qemu: Update balloon state after migration finishes
by Peter Krempa 21 Sep '15

21 Sep '15

Since qemu doesn't know at the beginning of migration what the actual balloon size is until the migration stream transfers the appropriate fields we also need to update the balloon size unconditionally in the finish phase of the migration. --- src/qemu/qemu_migration.c | 4 ++++ src/qemu/qemu_process.c | 2 +- src/qemu/qemu_process.h | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 903612b..38649ed 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5701,6 +5701,10 @@ qemuMigrationFinish(virQEMUDriverPtr driver, if (qemuMigrationStopNBDServer(driver, vm, mig) < 0) goto endjob; + if (qemuProcessRefreshBalloonState(driver, vm, + QEMU_ASYNC_JOB_MIGRATION_IN) < 0) + goto endjob; + if (flags & VIR_MIGRATE_PERSIST_DEST) { if (qemuMigrationPersist(driver, vm, mig, !v3proto) < 0) { /* Hmpf. Migration was successful, but making it persistent diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7187dc1..f14582b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2091,7 +2091,7 @@ qemuProcessReconnectRefreshChannelVirtioState(virQEMUDriverPtr driver, } -static int +int qemuProcessRefreshBalloonState(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob) diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index d40f68d..b198c2b 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -115,4 +115,8 @@ virDomainDiskDefPtr qemuProcessFindDomainDiskByAlias(virDomainObjPtr vm, int qemuConnectAgent(virQEMUDriverPtr driver, virDomainObjPtr vm); +int qemuProcessRefreshBalloonState(virQEMUDriverPtr driver, + virDomainObjPtr vm, + int asyncJob); + #endif /* __QEMU_PROCESS_H__ */ -- 2.4.5

2 1

[libvirt] [PATCH 0/4] Remove open coding virProcessWait for root-squash
by John Ferlan 21 Sep '15

21 Sep '15

A followup of sorts to recently pushed patches regarding NFS root-squash. During libvirt-security list review it was pointed out that the new code was essentially open coding what virProcessWait does. However, since the model being used also was open coded and there was a time element, the change was allowed as is with the expectation that a cleanup patch would follow. Which is what leads into this series.... The series started out purely as removing the open code and replacing with the call to virProcessWait, but during that exercise I also realized that it was possible to create a 'netdir' in a NFS root-squash environment (eg, virDirCreate); however, the corrollary to remove the directory using a fork/exec didn't exist - in fact all that was called was rmdir, which failed to delete in the NFS root-squash environment. Rather than having a whole new interface, the first patch reworks virFileUnlink to check whether the target is a directory or a file and either call rmdir or unlink appropriately. The one common thread amongst the 3 API's changed here is they each looked to return an errno value, while typically virProcessWait consumers only return -1 and errno. Determining which failure in virProcessWait returns -1 is possible because one exit path uses virReportSystemError to report the error that caused the waitpid() to fail, while the other error path either receives the errno from the child process or if not present had already "assumed" EACCES, so these changes follow that model, except that if it's determined the waitpid failed, EINTR is returned similar to how virFileAccessibleAs sets errno and returns -1. John Ferlan (4): storage: Use virFileUnlink instead of rmdir virfile: Use virProcessWait in virFileOpenForked virfile: Use virProcessWait in virFileUnlink virfile: Use virProcessWait in virDirCreate src/storage/storage_backend_fs.c | 20 +++-- src/util/virfile.c | 153 ++++++++++++++++----------------------- 2 files changed, 71 insertions(+), 102 deletions(-) -- 2.1.0

2 9

[libvirt] [PATCH] vz: remove error logging from prlsdkUUIDParse
by Maxim Nestratov 21 Sep '15

21 Sep '15

From: Maxim Nestratov <mnestratov(a)virtuozzo.com> As far as not every call of prlsdkUUIDParse assume correct UUID supplied, there is no use to complain about wrong format in it. Otherwise our log is flooded with false error messages. For instance, calling prlsdkUUIDParse from prlsdkEventsHandler works as a filter and in case of uuid absence for event issuer, we simply know that we shouldn't continue further processing. Instead of error logging for all calls we should explicitly take into accaunt where it is called from. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_sdk.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 744b58a..32ca1ef 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -329,8 +329,6 @@ prlsdkUUIDParse(const char *uuidstr, unsigned char *uuid) /* trim curly braces */ if (virUUIDParse(tmp + 1, uuid) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("UUID in config file malformed")); ret = -1; goto error; } @@ -365,8 +363,11 @@ prlsdkGetDomainIds(PRL_HANDLE sdkdom, PrlVmCfg_GetUuid(sdkdom, uuidstr, &len); prlsdkCheckRetGoto(pret, error); - if (prlsdkUUIDParse(uuidstr, uuid) < 0) + if (prlsdkUUIDParse(uuidstr, uuid) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Domain UUID is malformed or empty")); goto error; + } return 0; @@ -1724,8 +1725,10 @@ prlsdkEventsHandler(PRL_HANDLE prlEvent, PRL_VOID_PTR opaque) pret = PrlEvent_GetType(prlEvent, &prlEventType); prlsdkCheckRetGoto(pret, cleanup); - if (prlsdkUUIDParse(uuidstr, uuid) < 0) + if (prlsdkUUIDParse(uuidstr, uuid) < 0) { + VIR_DEBUG("Skipping event type %d", prlEventType); goto cleanup; + } switch (prlEventType) { case PET_DSP_EVT_VM_STATE_CHANGED: -- 1.7.1

4 4

[libvirt] [PATCH] vz: set mount point for container image-based disks
by Maxim Nestratov 21 Sep '15

21 Sep '15

From: Maxim Nestratov <mnestratov(a)virtuozzo.com> In order to support not only root disks with type=file for containers, we need to specify mount points for them. For instance, if a secondary disk is added by the following record in xml: <disk type='file' device='disk'> <driver type='ploop' cache='writeback'/> <source file='/vz/some_path_to_image_dir'/> <target bus='sata' dev='sdb'/> </disk> we are going to add it to container mounted to '/mnt/sdb' path. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_sdk.c | 35 +++++++++++++++++++++++++++++++---- 1 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 744b58a..6642933 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -3292,21 +3292,48 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, goto cleanup; } - if (bootDisk == true) { + if (bootDisk) { pret = PrlVmDev_GetIndex(sdkdisk, &devIndex); prlsdkCheckRetGoto(pret, cleanup); if (prlsdkAddDeviceToBootList(sdkdom, devIndex, devType, 0) < 0) goto cleanup; - /* If we add physical device as a boot disk to container - * we have to specify mount point for it */ - if (isCt) { + } + + if (isCt) { + + /* If we add a disk as a boot disk to a container + * (it doesn't matter whether it has image or real device backend) + * we have to specify the root mount point for it */ + if (bootDisk) { pret = PrlVmDevHd_SetMountPoint(sdkdisk, "/"); prlsdkCheckRetGoto(pret, cleanup); + } else { + + /* In case of image we need to specify a mount point + * to make it usable within a container */ + if (disk->src->type == VIR_STORAGE_TYPE_FILE) { + char *mount_point; + char *dev_name = strrchr(disk->dst, '/'); + + if (!dev_name) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Unexpected format of disk destination '%s'.")); + goto cleanup; + } + + if (virAsprintf(&mount_point, "/mnt%s", dev_name) < 0) + goto cleanup; + + pret = PrlVmDevHd_SetMountPoint(sdkdisk, mount_point); + VIR_FREE(mount_point); + prlsdkCheckRetGoto(pret, cleanup); + } } } + return 0; cleanup: PrlHandle_Free(sdkdisk); -- 1.7.1

3 4

[libvirt] [PATCH] Add a new test case for setUserPassword
by Luyao Huang 21 Sep '15

21 Sep '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/linux_domain.conf | 22 ++++++++ repos/domain/set_user_passwd.py | 111 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 repos/domain/set_user_passwd.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 19daded..9a65cf3 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -299,6 +299,28 @@ domain:info_iothread conn qemu:///system +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + +domain:set_user_passwd + guestname + $defaultname + username + $username + userpassword + $password + conn + qemu:///system + flags + encrypted + domain:destroy guestname $defaultname diff --git a/repos/domain/set_user_passwd.py b/repos/domain/set_user_passwd.py new file mode 100644 index 0000000..bf9bd06 --- /dev/null +++ b/repos/domain/set_user_passwd.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree +import crypt +from utils import utils + +required_params = ('guestname', 'username', 'userpassword',) +optional_params = {'conn': 'qemu:///system', 'flags': '',} + +def get_guest_mac(vm): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + set = tree.xpath("/domain/devices/interface/mac") + + for n in set: + return n.attrib['address'] + + return False + + +def check_agent_status(vm): + """ make sure agent is okay to use """ + + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + + set = tree.xpath("//channel[@type='unix']/target[@name='org.qemu.guest_agent.0']") + for n in set: + if n.attrib['state'] == 'connected': + return True + + return False + +def create_new_user(ipaddr, newusername, username, userpasswd, logger): + cmd = "useradd %s" % newusername + ret, retinfo = utils.remote_exec_pexpect(ipaddr, username, userpasswd, cmd) + if ret == 0 or "already exists" in retinfo: + return 0 + else: + logger.error("Fail: cannot create a new user: %s" % retinfo) + return 1 + +def verify_cur_user(ipaddr, username, userpasswd): + cmd = "whoami" + ret, retinfo = utils.remote_exec_pexpect(ipaddr, username, userpasswd, cmd) + + return ret + +def set_user_passwd(params): + """ + test API for setUserPassword in class virDomain + """ + + logger = params['logger'] + guest = params['guestname'] + username = params['username'] + userpasswd = params['userpassword'] + + if 'flags' in params: + if params['flags'] == 'encrypted': + flags = libvirt.VIR_DOMAIN_PASSWORD_ENCRYPTED + else: + flags = 0 + else: + flags = 0 + + try: + if 'conn' in params: + conn = libvirt.open(params['conn']) + else: + conn = libvirt.open(optional_params['conn']) + + logger.info("get connection to libvirtd") + vm = conn.lookupByName(guest) + logger.info("test guest name: %s" % guest) + + if not check_agent_status(vm): + logger.error("guest agent is not connected") + return 1 + + mac = get_guest_mac(vm) + if not mac: + logger.error("cannot get guest interface mac") + return 1 + + ipaddr = utils.mac_to_ip(mac, 180) + if not ipaddr: + logger.error("cannot get guest IP") + return 1 + + if flags > 0: + passwd = crypt.crypt("123456", crypt.mksalt(crypt.METHOD_SHA512)) + else: + passwd = "123456" + + + if create_new_user(ipaddr, "usertestapi", username, userpasswd, logger) != 0: + return 1 + + vm.setUserPassword("usertestapi", passwd, flags) + + if verify_cur_user(ipaddr, "usertestapi", "123456") != 0: + logger.error("cannot login guest via new user") + return 1 + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 + + return 0 -- 1.8.3.1

1 1

[libvirt] [PATCH v2 0/7] Allow startupPolicy change on update-device
by Michal Privoznik 21 Sep '15

21 Sep '15

So, as Peter pointed out, we may want to updated startupPolicy for live domains too. That's what patches 2/7-7/7 do. Michal Privoznik (7): qemuDomainUpdateDeviceConfig: Allow startupPolicy update, yet again qemu: s/qemuDomainChangeDiskMediaLive/qemuDomainChangeDiskLive/ qemu_domain: Introduce qemuDomainDiskSourceDiffers qemuDomainChangeDiskLive: rework slightly qemu: s/virDomainDiskDiffersSourceOnly/qemuDomainDiskChangeSupported/ qemuDomainDiskChangeSupported: Fill in missing checks qemuDomainChangeDiskLive: Allow startupPolicy change src/conf/domain_conf.c | 127 ---------------------------------- src/conf/domain_conf.h | 2 - src/libvirt_private.syms | 1 - src/qemu/qemu_domain.c | 176 +++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 7 ++ src/qemu/qemu_driver.c | 80 ++++++++++++--------- 6 files changed, 232 insertions(+), 161 deletions(-) -- 2.4.6

2 10

[libvirt] [libvirt-php] error compiling on OS X 10.11 GM
by Andy Blyler 19 Sep '15

19 Sep '15

I’m attempting to compile the HEAD of the git repo on OS X 10.11 GM and I’m getting the following error: /Applications/Xcode.app/Contents/Developer/usr/bin/make all-recursive Making all in src /bin/sh ../libtool --tag=CC --mode=link clang -I/usr/local/Cellar/php56/5.6.13_2/include/php -I/usr/local/Cellar/php56/5.6.13_2/include/php/main -I/usr/local/Cellar/php56/5.6.13_2/include/php/TSRM -I/usr/local/Cellar/php56/5.6.13_2/include/php/Zend -I/usr/local/Cellar/php56/5.6.13_2/include/php/ext -I/usr/local/Cellar/php56/5.6.13_2/include/php/ext/date/lib -I/usr/local/Cellar/libxml2/2.9.2/include/libxml2 -I/usr/local/Cellar/libvirt/1.2.19/include -I/usr/local/Cellar/libvirt/1.2.19/include -DHAVE_CONFIG_H -I../winsrc -DCOMPILE_DL_LIBVIRT=1 -g -O2 -L/usr/local/Cellar/libxml2/2.9.2/lib -lxml2 -L/usr/local/Cellar/libvirt/1.2.19/lib -lvirt -L/usr/local/Cellar/libvirt/1.2.19/lib -lvirt-qemu -lvirt -o libvirt-php.la -rpath /usr/local/Cellar/php56-libvirt/HEAD/lib libvirt_php_la-vncfunc.lo libvirt_php_la-sockets.lo libvirt_php_la-libvirt-php.lo libtool: link: clang -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -o .libs/libvirt-php.0.dylib .libs/libvirt_php_la-vncfunc.o .libs/libvirt_php_la-sockets.o .libs/libvirt_php_la-libvirt-php.o -L/usr/local/Cellar/libxml2/2.9.2/lib -lxml2 -L/usr/local/Cellar/libvirt/1.2.19/lib -lvirt-qemu -lvirt -g -O2 -install_name /usr/local/Cellar/php56-libvirt/HEAD/lib/libvirt-php.0.dylib -compatibility_version 1 -current_version 1.0 -Wl,-single_module duplicate symbol _gdebug in: .libs/libvirt_php_la-vncfunc.o .libs/libvirt_php_la-sockets.o duplicate symbol _gdebug in: .libs/libvirt_php_la-vncfunc.o .libs/libvirt_php_la-libvirt-php.o ld: 2 duplicate symbols for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) My environment is: OS X: 10.11-x86_64 Xcode: 7.0 CLT: 7.0.0.0.1.1441394355 Clang: 7.0 build 700 X11: N/A

1 0

[libvirt] [libvirt-php] error compiling on OS X 10.11 GM
by Andy Blyler 19 Sep '15

19 Sep '15

I’m attempting to compile the HEAD of the git repo on OS X 10.11 GM and I’m getting the following error: /Applications/Xcode.app/Contents/Developer/usr/bin/make all-recursive Making all in src /bin/sh ../libtool --tag=CC --mode=link clang -I/usr/local/Cellar/php56/5.6.13_2/include/php -I/usr/local/Cellar/php56/5.6.13_2/include/php/main -I/usr/local/Cellar/php56/5.6.13_2/include/php/TSRM -I/usr/local/Cellar/php56/5.6.13_2/include/php/Zend -I/usr/local/Cellar/php56/5.6.13_2/include/php/ext -I/usr/local/Cellar/php56/5.6.13_2/include/php/ext/date/lib -I/usr/local/Cellar/libxml2/2.9.2/include/libxml2 -I/usr/local/Cellar/libvirt/1.2.19/include -I/usr/local/Cellar/libvirt/1.2.19/include -DHAVE_CONFIG_H -I../winsrc -DCOMPILE_DL_LIBVIRT=1 -g -O2 -L/usr/local/Cellar/libxml2/2.9.2/lib -lxml2 -L/usr/local/Cellar/libvirt/1.2.19/lib -lvirt -L/usr/local/Cellar/libvirt/1.2.19/lib -lvirt-qemu -lvirt -o libvirt-php.la -rpath /usr/local/Cellar/php56-libvirt/HEAD/lib libvirt_php_la-vncfunc.lo libvirt_php_la-sockets.lo libvirt_php_la-libvirt-php.lo libtool: link: clang -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -o .libs/libvirt-php.0.dylib .libs/libvirt_php_la-vncfunc.o .libs/libvirt_php_la-sockets.o .libs/libvirt_php_la-libvirt-php.o -L/usr/local/Cellar/libxml2/2.9.2/lib -lxml2 -L/usr/local/Cellar/libvirt/1.2.19/lib -lvirt-qemu -lvirt -g -O2 -install_name /usr/local/Cellar/php56-libvirt/HEAD/lib/libvirt-php.0.dylib -compatibility_version 1 -current_version 1.0 -Wl,-single_module duplicate symbol _gdebug in: .libs/libvirt_php_la-vncfunc.o .libs/libvirt_php_la-sockets.o duplicate symbol _gdebug in: .libs/libvirt_php_la-vncfunc.o .libs/libvirt_php_la-libvirt-php.o ld: 2 duplicate symbols for architecture x86_64 clang: error: linker command failed with exit code 1 (use -v to see invocation) My environment is: OS X: 10.11-x86_64 Xcode: 7.0 CLT: 7.0.0.0.1.1441394355 Clang: 7.0 build 700 X11: N/A

1 0

[libvirt] [PATCH] libxl: fix AttachDeviceConfig on hostdev type
by Chunyan Liu 18 Sep '15

18 Sep '15

After attach-device a <hostdev> with --config, new device doesn't show up in dumpxml and in guest. To fix that, set dev->data.hostdev = NULL after work so that the pointer is not freed, since vmdef has the pointer and still need it. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- src/libxl/libxl_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e2797d5..8087c27 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3312,6 +3312,7 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) if (virDomainHostdevInsert(vmdef, hostdev) < 0) return -1; + dev->data.hostdev = NULL; break; default: -- 1.8.5.6

3 2

[libvirt] [PATCH v2 0/8] Simplify and fix qemuMigrationFinish
by Jiri Denemark 18 Sep '15

18 Sep '15

While hacking qemuMigrationFinish I found it pretty hard to follow and revealed few bugs (patches 3 to 5, and 8) in the code. Version 2: - rebased and review comments addressed - new patch "qemu: Fix some corner cases in persistent migration" Jiri Denemark (8): qemu: Split qemuMigrationFinish qemu: Simplify qemuMigrationFinish qemu: Don't fail migration on save status failure qemu: Kill domain when migration finish fails qemu: Don't report false errors in migration protocol v2 qemuDomainEventQueue: Check if event is non-NULL qemu: Queue events in migration Finish phase ASAP qemu: Fix some corner cases in persistent migration src/qemu/qemu_blockjob.c | 6 +- src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_driver.c | 87 +++++++----------- src/qemu/qemu_hotplug.c | 26 +++--- src/qemu/qemu_migration.c | 223 ++++++++++++++++++++++++---------------------- src/qemu/qemu_process.c | 72 +++++---------- 7 files changed, 187 insertions(+), 236 deletions(-) -- 2.5.1

2 22

[libvirt] [PATCH v2 0/12] migration: support all toURI and proto combos
by Nikolay Shirokovskiy 18 Sep '15

18 Sep '15

Current implementation of 'toURI' migration interfaces does not support all combinations of interface versions and protocol versions. For example 'toURI2' with p2p flag will not migrate if driver supports only v3params proto. This is not convinient as drivers that starts to support migration have to manually support older versions of protocol. I guess this should be done in one place, namely here. Another issue is that there are a lot of code duplication in implementation of toURI interfaces and it is not obvious from code how are they related. This implementation uses extensible parameters as intermediate parameters representation. This is possible as interfaces are done backward compatible in terms of parameters and later versions supports all parameters of former versions. = Changes from version1 Patch is splitted into a set. Quite a big one as a result of the following strategy: 1. each change in behaviour even subtle one deserves a separate patch. One patch changes one aspect in behaviour. 2. separate pure refactoring steps into patches too as rather simple refactor steps could introduce many line changes. Mark such patches with 'refactor:' Now every patch is easy to grasp I think. The resulted cumulative patch is slightly different from first in behaviour but I'm not going to describe the differece here as original patch was not reviewed in details by anyone anyway ) src/libvirt-domain.c | 520 +++++++++++++++++++++----------------------------- 1 files changed, 216 insertions(+), 304 deletions(-)

4 47

Re: [libvirt] [Qemu-devel] internal snapshots with sheepdog
by Kevin Wolf 18 Sep '15

18 Sep '15

Am 18.09.2015 um 11:03 hat Vasiliy Tolstov geschrieben: > 2015-09-18 12:02 GMT+03:00 Kevin Wolf <kwolf(a)redhat.com>: > > Doesn't sheepdog already support storing snapshots in the same image? > > I thought it would just work; at least, there's some code there for it. > > Yes, qemu and sheepdog have ability to create internal snapshot, i > miss that, but when i'm try in libvirt create live snapshot - libvirt > says, that this is not possible with raw image. Then I guess your mail should be directed to the libvirt list instead (CCed). Kevin

2 1

[libvirt] [java] [PATCH] add missing virDomainSetMemoryStatsPeriod API
by Wei Mingzhi 18 Sep '15

18 Sep '15

Hi, The attached patch adds the missing virDomainSetMemoryStatsPeriod API, which was introduced since around 2013. Cheers, Wei Mingzhi -- "The best way to predict the future is to invent it." -Alan Kay

1 0

[libvirt] [PATCH] libxl: fix AttachDeviceConfig on hostdev type
by Chunyan Liu 17 Sep '15

17 Sep '15

After attach-device a <hostdev> with --config, new device doesn't show up in dumpxml and in guest. To fix that, set dev->data.hostdev = NULL after work so that the pointer is not freed, since vmdef has the pointer and still need it. Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- src/libxl/libxl_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e2797d5..8087c27 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3312,6 +3312,7 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) if (virDomainHostdevInsert(vmdef, hostdev) < 0) return -1; + dev->data.hostdev = NULL; break; default: -- 1.8.5.6

2 1

[libvirt] VMware: Map vpx:// to dcPath
by Richard W.M. Jones 17 Sep '15

17 Sep '15

vpx:// paths looks like this: vpx://vcenter.example.com/MyFolder/MyDatacenter/MyCluster/esxi but to connect to the datastore to read the underlying disk image, libguestfs must form a URL like this: https://vcenter.example.com/folder/data/guest/guest-flat.vmdk?dcPath=MyFold… All parts of this URL can be worked out from the URL or the libvirt XML *except* the ?dcPath=... parameter. The problem is that dcPath isn't a straight mapping from the vpx:// path. The particular problem is that if there is a cluster name in the path (eg 'MyCluster') it appears that we have to remove it. ie: dcPath=MyFolder/MyDatacenter/MyCluster - does not work dcPath=MyFolder/MyDatacenter - works That would be OK if there was always a cluster name at the end of the path, but there isn't. Clusters are completely optional, and AFAIK you can't tell if something is a cluster path element just by examining the name, since clusters can be given arbitrary names by the vCenter admin. So: (1) Is there something I'm missing here? Maybe the libvirt VMware driver presents this information already and I'm just missing it? (2) Can we add some way to more easily map from vpx:// paths to datastore URLs? The whole process is very complex even without the ambiguity - it takes a couple of pages of code to do the mapping. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top

3 8

[libvirt] [PATCH v3] qemu: Validate address type when attaching a disk device.
by Ruifeng Bian 17 Sep '15

17 Sep '15

Bug fix for: https://bugzilla.redhat.com/show_bug.cgi?id=1257844 Attach-device can hotplug a virtio disk device with any address type now, it need to validate the address type before the attachment. Attaching a disk device with --config option need to check address type. Otherwise, the domain cloudn't be started normally. This patch add a basic check for address type. Detaching a disk device with --config also need to check disk options, add qemuCheckDiskConfig() method in qemuDomainDetachDeviceConfig(). --- src/qemu/qemu_command.c | 44 +++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_driver.c | 2 ++ src/qemu/qemu_hotplug.c | 22 ++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ec5e3d4..a2c7483 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3579,12 +3579,54 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk) goto error; } } + + if (disk->info.type) { + switch (disk->bus) { + case VIR_DOMAIN_DISK_BUS_IDE: + case VIR_DOMAIN_DISK_BUS_SCSI: + case VIR_DOMAIN_DISK_BUS_SATA: + case VIR_DOMAIN_DISK_BUS_FDC: + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk cannot have an address of type '%s'"), + virDomainDeviceAddressTypeToString(disk->info.type)); + goto error; + } + break; + case VIR_DOMAIN_DISK_BUS_USB: + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("usb disk cannot have an address of type '%s'"), + virDomainDeviceAddressTypeToString(disk->info.type)); + goto error; + } + break; + case VIR_DOMAIN_DISK_BUS_VIRTIO: + if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO && + disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("virtio disk cannot have an address of type '%s'"), + virDomainDeviceAddressTypeToString(disk->info.type)); + goto error; + } + break; + case VIR_DOMAIN_DISK_BUS_XEN: + case VIR_DOMAIN_DISK_BUS_UML: + case VIR_DOMAIN_DISK_BUS_SD: + /* no address type currently, return false if address provided */ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("disk cannot have an address of type '%s'"), + virDomainDeviceAddressTypeToString(disk->info.type)); + goto error; + } + } return 0; error: return -1; } - /* Check whether the device address is using either 'ccw' or default s390 * address format and whether that's "legal" for the current qemu and/or * guest os.machine type. This is the corollary to the code which doesn't diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 91eb661..61424b0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8205,6 +8205,8 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, switch ((virDomainDeviceType) dev->type) { case VIR_DOMAIN_DEVICE_DISK: disk = dev->data.disk; + if (qemuCheckDiskConfig(disk) < 0) + return -1; if (!(det_disk = virDomainDiskRemoveByName(vmdef, disk->dst))) { virReportError(VIR_ERR_INVALID_ARG, _("no target device %s"), disk->dst); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 63fafa6..1f46647 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -335,6 +335,28 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (!qemuCheckCCWS390AddressSupport(vm->def, disk->info, priv->qemuCaps, disk->dst)) goto cleanup; + + if (qemuDomainMachineIsS390CCW(vm->def) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid CCW address")); + goto cleanup; + } + } else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid S390 address")); + goto cleanup; + } + } else if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid PCI address")); + goto cleanup; + } } for (i = 0; i < vm->def->ndisks; i++) { -- 2.4.3

2 2

[libvirt] [PATCH v2] virfile: Check for existence of dir in virFileDeleteTree
by John Ferlan 16 Sep '15

16 Sep '15

Commit id 'f1f68ca33' added code to remove the directory paths for auto-generated sockets, but that code could be called before the paths were created resulting in generating error messages from virFileDeleteTree indicating that the file doesn't exist. Rather than "enforce" all callers to make the non-NULL and existence checks, modify the virFileDeleteTree API to silently ignore NULL on input and non-existent directory trees. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Difference over v1: Add checks in virFileDeleteTree src/qemu/qemu_process.c | 6 ++---- src/util/virfile.c | 8 ++++++-- tests/virhostdevtest.c | 2 +- tests/virscsitest.c | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ce2c70c..155846e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5269,14 +5269,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, ignore_value(virAsprintf(&tmppath, "%s/domain-%s", cfg->libDir, vm->def->name)); - if (tmppath) - virFileDeleteTree(tmppath); + virFileDeleteTree(tmppath); VIR_FREE(tmppath); ignore_value(virAsprintf(&tmppath, "%s/domain-%s", cfg->channelTargetDir, vm->def->name)); - if (tmppath) - virFileDeleteTree(tmppath); + virFileDeleteTree(tmppath); VIR_FREE(tmppath); ignore_value(virDomainChrDefForeach(vm->def, diff --git a/src/util/virfile.c b/src/util/virfile.c index 75819d9..fe9f8d4 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -934,13 +934,17 @@ int virFileNBDDeviceAssociate(const char *file, */ int virFileDeleteTree(const char *dir) { - DIR *dh = opendir(dir); + DIR *dh; struct dirent *de; char *filepath = NULL; int ret = -1; int direrr; - if (!dh) { + /* Silently return 0 if passed NULL or directory doesn't exist */ + if (!dir || !virFileExists(dir)) + return 0; + + if (!(dh = opendir(dir))) { virReportSystemError(errno, _("Cannot open dir '%s'"), dir); return -1; diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 1e93819..065b825 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -65,7 +65,7 @@ myCleanup(void) } if (mgr) { - if (mgr->stateDir && !getenv("LIBVIRT_SKIP_CLEANUP")) + if (!getenv("LIBVIRT_SKIP_CLEANUP")) virFileDeleteTree(mgr->stateDir); virObjectUnref(mgr->activePCIHostdevs); diff --git a/tests/virscsitest.c b/tests/virscsitest.c index a86ca28..88286f1 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -241,7 +241,7 @@ mymain(void) ret = -1; cleanup: - if (tmpdir && getenv("LIBVIRT_SKIP_CLEANUP") == NULL) + if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(tmpdir); VIR_FREE(virscsi_prefix); return ret; -- 2.1.0

2 1

[libvirt] [PATCH] qemu: Check for existence of auto-generated socket path before removing
by John Ferlan 16 Sep '15

16 Sep '15

Commit id 'f1f68ca33' added code to remove the directory paths for auto-generated sockets, but that code could be called before the paths were created resulting in generating error messages from virFileDeleteTree indicating that the file doesn't exist. So just add a check before attemping the directory delete for existence. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ce2c70c..b55eb52 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5269,13 +5269,13 @@ void qemuProcessStop(virQEMUDriverPtr driver, ignore_value(virAsprintf(&tmppath, "%s/domain-%s", cfg->libDir, vm->def->name)); - if (tmppath) + if (tmppath && virFileExists(tmppath)) virFileDeleteTree(tmppath); VIR_FREE(tmppath); ignore_value(virAsprintf(&tmppath, "%s/domain-%s", cfg->channelTargetDir, vm->def->name)); - if (tmppath) + if (tmppath && virFileExists(tmppath)) virFileDeleteTree(tmppath); VIR_FREE(tmppath); -- 2.1.0

3 3

[libvirt] [PATCH v2] virsh: Teach attach-interface to --print-xml
by Michal Privoznik 16 Sep '15

16 Sep '15

We have the same argument to many other commands that produce an XML based on what user typed. But unfortunately attach-interface was missing it. Maybe nobody had needed it yet. Well, I did just now. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Diff to v1: - Commit message grammar fix - Fixed usage of virDomain tools/virsh-domain.c | 28 ++++++++++++++++++++-------- tools/virsh.pod | 4 ++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b029b65..ce84930 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -862,6 +862,10 @@ static const vshCmdOptDef opts_attach_interface[] = { .type = VSH_OT_BOOL, .help = N_("affect current domain") }, + {.name = "print-xml", + .type = VSH_OT_BOOL, + .help = N_("print XML document rather than attach the interface") + }, {.name = NULL} }; @@ -938,13 +942,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) - return false; - - if (persistent && - virDomainIsActive(dom) == 1) - flags |= VIR_DOMAIN_AFFECT_LIVE; - if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0 || vshCommandOptStringReq(ctl, cmd, "source", &source) < 0 || vshCommandOptStringReq(ctl, cmd, "target", &target) < 0 || @@ -1051,6 +1048,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) virBufferAddLit(&buf, "</bandwidth>\n"); } + virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</interface>\n"); if (virBufferError(&buf)) { @@ -1060,6 +1058,19 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) xml = virBufferContentAndReset(&buf); + if (vshCommandOptBool(cmd, "print-xml")) { + vshPrint(ctl, "%s", xml); + functionReturn = true; + goto cleanup; + } + + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + goto cleanup; + + if (persistent && + virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_AFFECT_LIVE; + if (flags || current) ret = virDomainAttachDeviceFlags(dom, xml, flags); else @@ -1075,7 +1086,8 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) } cleanup: - virDomainFree(dom); + if (dom) + virDomainFree(dom); virBufferFreeAndReset(&buf); return functionReturn; } diff --git a/tools/virsh.pod b/tools/virsh.pod index 83c445d3..0212e7a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2507,6 +2507,7 @@ Likewise, I<--shareable> is an alias for I<--mode shareable>. [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] [I<--inbound average,peak,burst,floor>] [I<--outbound average,peak,burst>] +[I<--print-xml>] Attach a new network interface to the domain. I<type> can be I<network> to indicate connection via a libvirt virtual network, or @@ -2536,6 +2537,9 @@ kilobytes in a single burst at I<peak> speed as described in the Network XML documentation at L<http://libvirt.org/formatnetwork.html#elementQoS>. +If I<--print-xml> is specified, then the XML of the interface that would be +attached is printed instead. + If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. If I<--current> is specified, affect the current domain state. -- 2.4.6

2 1

[libvirt] [PATCH v3] qemu: Fix using guest architecture as lookup key
by Andrea Bolognani 16 Sep '15

16 Sep '15

When looking for a QEMU binary suitable for running ppc64le guests we have to take into account the fact that we use the QEMU target as key for the hash, so direct comparison is not good enough. Factor out the logic from virQEMUCapsFindBinaryForArch() to a new virQEMUCapsFindTarget() function and use that both when looking for QEMU binaries available on the system and when looking up QEMU capabilities later. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1260753 --- src/qemu/qemu_capabilities.c | 105 +++++++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4ad1bdb..01fbd65 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -386,6 +386,28 @@ static const char *virQEMUCapsArchToString(virArch arch) return virArchToString(arch); } +/* Given a host and guest architectures, find a suitable QEMU target. + * + * This is meant to be used as a second attempt if qemu-system-$guestarch + * can't be found, eg. on a x86_64 host you want to use qemu-system-i386, + * if available, instead of qemu-system-x86_64 to run i686 guests */ +static virArch +virQEMUCapsFindTarget(virArch hostarch, + virArch guestarch) +{ + /* Both ppc64 and ppc64le guests can use the ppc64 target */ + if (ARCH_IS_PPC64(guestarch)) + guestarch = VIR_ARCH_PPC64; + + /* armv7l guests on aarch64 hosts can use the aarch64 target + * i686 guests on x86_64 hosts can use the x86_64 target */ + if ((guestarch == VIR_ARCH_ARMV7L && hostarch == VIR_ARCH_AARCH64) || + (guestarch == VIR_ARCH_I686 && hostarch == VIR_ARCH_X86_64)) { + return hostarch; + } + + return guestarch; +} static virCommandPtr virQEMUCapsProbeCommand(const char *qemu, @@ -690,51 +712,55 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid) return ret; } - static char * -virQEMUCapsFindBinaryForArch(virArch hostarch, - virArch guestarch) +virQEMUCapsFindBinary(const char *format, + const char *archstr) { - char *ret; - const char *archstr; - char *binary; - - if (ARCH_IS_PPC64(guestarch)) - archstr = virQEMUCapsArchToString(VIR_ARCH_PPC64); - else - archstr = virQEMUCapsArchToString(guestarch); + char *ret = NULL; + char *binary = NULL; - if (virAsprintf(&binary, "qemu-system-%s", archstr) < 0) - return NULL; + if (virAsprintf(&binary, format, archstr) < 0) + goto out; ret = virFindFileInPath(binary); VIR_FREE(binary); - if (ret && !virFileIsExecutable(ret)) - VIR_FREE(ret); + if (ret && virFileIsExecutable(ret)) + goto out; - if (guestarch == VIR_ARCH_ARMV7L && - !ret && - hostarch == VIR_ARCH_AARCH64) { - ret = virFindFileInPath("qemu-system-aarch64"); - if (ret && !virFileIsExecutable(ret)) - VIR_FREE(ret); - } + VIR_FREE(ret); - if (guestarch == VIR_ARCH_I686 && - !ret && - hostarch == VIR_ARCH_X86_64) { - ret = virFindFileInPath("qemu-system-x86_64"); - if (ret && !virFileIsExecutable(ret)) - VIR_FREE(ret); + out: + return ret; +} + +static char * +virQEMUCapsFindBinaryForArch(virArch hostarch, + virArch guestarch) +{ + char *ret = NULL; + const char *archstr; + virArch target; + + /* First attempt: try the guest architecture as it is */ + archstr = virQEMUCapsArchToString(guestarch); + if ((ret = virQEMUCapsFindBinary("qemu-system-%s", archstr)) != NULL) + goto out; + + /* Second attempt: try looking up by target instead */ + target = virQEMUCapsFindTarget(hostarch, guestarch); + if (target != guestarch) { + archstr = virQEMUCapsArchToString(target); + if ((ret = virQEMUCapsFindBinary("qemu-system-%s", archstr)) != NULL) + goto out; } - if (guestarch == VIR_ARCH_I686 && - !ret) { - ret = virFindFileInPath("qemu"); - if (ret && !virFileIsExecutable(ret)) - VIR_FREE(ret); + /* Third attempt, i686 only: try 'qemu' */ + if (guestarch == VIR_ARCH_I686) { + if ((ret = virQEMUCapsFindBinary("%s", "qemu")) != NULL) + goto out; } + out: return ret; } @@ -3789,14 +3815,25 @@ virQEMUCapsCacheLookupByArch(virQEMUCapsCachePtr cache, virArch arch) { virQEMUCapsPtr ret = NULL; + virArch target; struct virQEMUCapsSearchData data = { .arch = arch }; virMutexLock(&cache->lock); ret = virHashSearch(cache->binaries, virQEMUCapsCompareArch, &data); - VIR_DEBUG("Returning caps %p for arch %s", ret, virArchToString(arch)); + if (!ret) { + /* If the first attempt at finding capabilities has failed, try + * again using the QEMU target as lookup key instead */ + target = virQEMUCapsFindTarget(virArchFromHost(), data.arch); + if (target != data.arch) { + data.arch = target; + ret = virHashSearch(cache->binaries, virQEMUCapsCompareArch, &data); + } + } virObjectRef(ret); virMutexUnlock(&cache->lock); + VIR_DEBUG("Returning caps %p for arch %s", ret, virArchToString(arch)); + return ret; } -- 2.4.3

2 2

[libvirt] [PATCH v2] qemu: Fix using guest architecture as lookup key
by Andrea Bolognani 16 Sep '15

16 Sep '15

When looking for a QEMU binary suitable for running ppc64le guests we have to take into account the fact that we use the QEMU target as key for the hash, so direct comparison is not good enough. Factor out the logic from virQEMUCapsFindBinaryForArch() to a new virQEMUCapsFindTarget() function and use that both when looking for QEMU binaries available on the system and when looking up QEMU capabilities later. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1260753 --- src/qemu/qemu_capabilities.c | 100 ++++++++++++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 35 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4ad1bdb..6757907 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -386,6 +386,28 @@ static const char *virQEMUCapsArchToString(virArch arch) return virArchToString(arch); } +/* Given a host and guest architectures, find a suitable QEMU target. + * + * This is meant to be used as a second attempt if qemu-system-$guestarch + * can't be found, eg. on a x86_64 host you want to use qemu-system-i386, + * if available, instead of qemu-system-x86_64 to run i686 guests */ +static virArch +virQEMUCapsFindTarget(virArch hostarch, + virArch guestarch) +{ + /* Both ppc64 and ppc64le guests can use the ppc64 target */ + if (ARCH_IS_PPC64(guestarch)) + guestarch = VIR_ARCH_PPC64; + + /* armv7l guests on aarch64 hosts can use the aarch64 target + * i686 guests on x86_64 hosts can use the x86_64 target */ + if ((guestarch == VIR_ARCH_ARMV7L && hostarch == VIR_ARCH_AARCH64) || + (guestarch == VIR_ARCH_I686 && hostarch == VIR_ARCH_X86_64)) { + return hostarch; + } + + return guestarch; +} static virCommandPtr virQEMUCapsProbeCommand(const char *qemu, @@ -690,51 +712,52 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid) return ret; } - static char * -virQEMUCapsFindBinaryForArch(virArch hostarch, - virArch guestarch) +virQEMUCapsFindBinary(const char *format, + const char *archstr) { - char *ret; - const char *archstr; - char *binary; - - if (ARCH_IS_PPC64(guestarch)) - archstr = virQEMUCapsArchToString(VIR_ARCH_PPC64); - else - archstr = virQEMUCapsArchToString(guestarch); + char *ret = NULL; + char *binary = NULL; - if (virAsprintf(&binary, "qemu-system-%s", archstr) < 0) - return NULL; + if (virAsprintf(&binary, format, archstr) < 0) + goto out; ret = virFindFileInPath(binary); VIR_FREE(binary); - if (ret && !virFileIsExecutable(ret)) - VIR_FREE(ret); + if (ret && virFileIsExecutable(ret)) + goto out; - if (guestarch == VIR_ARCH_ARMV7L && - !ret && - hostarch == VIR_ARCH_AARCH64) { - ret = virFindFileInPath("qemu-system-aarch64"); - if (ret && !virFileIsExecutable(ret)) - VIR_FREE(ret); - } + VIR_FREE(ret); - if (guestarch == VIR_ARCH_I686 && - !ret && - hostarch == VIR_ARCH_X86_64) { - ret = virFindFileInPath("qemu-system-x86_64"); - if (ret && !virFileIsExecutable(ret)) - VIR_FREE(ret); - } + out: + return ret; +} + +static char * +virQEMUCapsFindBinaryForArch(virArch hostarch, + virArch guestarch) +{ + char *ret = NULL; + const char *archstr; + + /* First attempt: try the guest architecture as it is */ + archstr = virQEMUCapsArchToString(guestarch); + if ((ret = virQEMUCapsFindBinary("qemu-system-%s", archstr)) != NULL) + goto out; - if (guestarch == VIR_ARCH_I686 && - !ret) { - ret = virFindFileInPath("qemu"); - if (ret && !virFileIsExecutable(ret)) - VIR_FREE(ret); + /* Second attempt: use some arch-specific rules */ + archstr = virQEMUCapsArchToString(virQEMUCapsFindTarget(hostarch, + guestarch)); + if ((ret = virQEMUCapsFindBinary("qemu-system-%s", archstr)) != NULL) + goto out; + + /* Third attempt, i686 only: try 'qemu' */ + if (guestarch == VIR_ARCH_I686) { + if ((ret = virQEMUCapsFindBinary("%s", "qemu")) != NULL) + goto out; } + out: return ret; } @@ -3793,10 +3816,17 @@ virQEMUCapsCacheLookupByArch(virQEMUCapsCachePtr cache, virMutexLock(&cache->lock); ret = virHashSearch(cache->binaries, virQEMUCapsCompareArch, &data); - VIR_DEBUG("Returning caps %p for arch %s", ret, virArchToString(arch)); + if (!ret) { + /* If the first attempt at findind capabilities has failed, try + * again using the QEMU target as lookup key instead */ + data.arch = virQEMUCapsFindTarget(virArchFromHost(), data.arch); + ret = virHashSearch(cache->binaries, virQEMUCapsCompareArch, &data); + } virObjectRef(ret); virMutexUnlock(&cache->lock); + VIR_DEBUG("Returning caps %p for arch %s", ret, virArchToString(arch)); + return ret; } -- 2.4.3

2 2

[libvirt] [PATCH] libxl: fix compiler error introduced by commit ba25c214
by Jim Fehlig 16 Sep '15

16 Sep '15

libxl/libxl_conf.c: In function 'libxlDriverConfigNew': libxl/libxl_conf.c:1560:30: error: 'log_level' may be used uninitialized in this function [-Werror=maybe-uninitialized] Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing under the build-breaker rule. src/libxl/libxl_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 40fa4b5..35fd495 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1496,7 +1496,7 @@ libxlDriverConfigNew(void) { libxlDriverConfigPtr cfg; char *log_file = NULL; - xentoollog_level log_level; + xentoollog_level log_level = XTL_DEBUG; char ebuf[1024]; unsigned int free_mem; -- 2.5.0

1 0

[libvirt] [PATCH] qemu: The ppc64 target can run both ppc64 and ppc64le guests
by Andrea Bolognani 15 Sep '15

15 Sep '15

When looking for a QEMU binary suitable for running ppc64le guests we have to take into account the fact that we use the QEMU target as key for the hash, so direct comparison is not good enough: normalize everything that can run on the ppc64 target to VIR_ARCH_PPC64 instead. This approach was already used in virQEMUCapsFindBinaryForArch(), and I've added a comment there to clarify why it's needed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1260753 --- src/qemu/qemu_capabilities.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4ad1bdb..a06141e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -699,6 +699,7 @@ virQEMUCapsFindBinaryForArch(virArch hostarch, const char *archstr; char *binary; + /* qemu-system-ppc64 can run both ppc64 and ppc64le guests */ if (ARCH_IS_PPC64(guestarch)) archstr = virQEMUCapsArchToString(VIR_ARCH_PPC64); else @@ -3791,6 +3792,10 @@ virQEMUCapsCacheLookupByArch(virQEMUCapsCachePtr cache, virQEMUCapsPtr ret = NULL; struct virQEMUCapsSearchData data = { .arch = arch }; + /* QEMU's ppc64 target can run both ppc64 and ppc64le guests */ + if (ARCH_IS_PPC64(data.arch)) + data.arch = VIR_ARCH_PPC64; + virMutexLock(&cache->lock); ret = virHashSearch(cache->binaries, virQEMUCapsCompareArch, &data); VIR_DEBUG("Returning caps %p for arch %s", ret, virArchToString(arch)); -- 2.4.3

2 2

[libvirt] [PATCH v3] Ignore virtio-mmio disks in qemuAssignDevicePCISlots()
by Pavel Fedin 15 Sep '15

15 Sep '15

Fixes the following error when attempting to add a disk with bus='virtio' to a machine which actually supports virtio-mmio (caught with ARM virt): virtio disk cannot have an address of type 'virtio-mmio' The problem has been likely introduced by e8d55172544c1fafe31a9e09346bdebca4f0d6f9. Before that qemuAssignDevicePCISlots() was never called for ARM "virt" machine. Signed-off-by: Pavel Fedin <p.fedin(a)samsung.com> --- v2 => v3 - Bring back qemuCaps to qemuAssignDevicePCISlots(), was lost in a3ecd63e928ff39d73c1c14b0fb3be8addbc977b - Swap conditions so as not to call virQEMUCapsGet() every time v1 => v2 - Added check for QEMU_CAPS_DEVICE_VIRTIO_MMIO, this leaves the error message for machines which actually do not support virtio-mmio. In this case the user may still attempt to add such a disk manually. --- src/qemu/qemu_command.c | 11 +++++++++-- src/qemu/qemu_command.h | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ec5e3d4..ea1bb28 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2241,7 +2241,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, virDomainPCIAddressReserveNextSlot(addrs, &info, flags) < 0) goto cleanup; - if (qemuAssignDevicePCISlots(def, addrs) < 0) + if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0) goto cleanup; for (i = 1; i < addrs->nbuses; i++) { @@ -2274,7 +2274,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, if (qemuValidateDevicePCISlotsChipsets(def, qemuCaps, addrs) < 0) goto cleanup; - if (qemuAssignDevicePCISlots(def, addrs) < 0) + if (qemuAssignDevicePCISlots(def, qemuCaps, addrs) < 0) goto cleanup; for (i = 0; i < def->ncontrollers; i++) { @@ -2406,6 +2406,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, */ int qemuAssignDevicePCISlots(virDomainDefPtr def, + virQEMUCapsPtr qemuCaps, virDomainPCIAddressSetPtr addrs) { size_t i, j; @@ -2598,6 +2599,12 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) continue; + /* Also ignore virtio-mmio disks if our machine allows them */ + if (def->disks[i]->info.type == + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) + continue; + if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("virtio disk cannot have an address of type '%s'"), diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 767d31f..4aa7f2d 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -284,6 +284,7 @@ virDomainPCIAddressSetPtr qemuDomainPCIAddressSetCreate(virDomainDefPtr def, bool dryRun); int qemuAssignDevicePCISlots(virDomainDefPtr def, + virQEMUCapsPtr qemuCaps, virDomainPCIAddressSetPtr addrs); int qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps); -- 1.9.5.msysgit.0

2 1

[libvirt] [PATCH] Minor typo fixes in documentation
by Christian Loehle 15 Sep '15

15 Sep '15

Signed-off-by: Christian Loehle <cloehle(a)linutronix.de>

2 1

[libvirt] [PATCH 0/3] Implement mockup capabilities cache in QEMU tests
by Pavel Fedin 15 Sep '15

15 Sep '15

Since commit e8d55172544c1fafe31a9e09346bdebca4f0d6f9 qemu driver checks emulator capabilities during domain XML post-parse. However, test suite does not initialize it, therefore a condition to skip all checks if there is no cache supplied was added. This is actually a hack, whose sole purpose is to make existing test suite working. Additionally, it prevents from writing new tests for this particular functionality. This series solves this problem by implementing proper cache mockup in test suite. The main idea is to create a cache in standard way and put there pre-defined capabilities sets (which tests already have). In this implementation we introduce "test capability sets", which are named entities. virQEMUCapsCacheLookup() now has a test mode, which is enabled by setting qemuTestCapsName variable to the name of capability set which we want to use in current test. This is based on Martin Kletzander's idea to implement test mode with assertions. Currently, since name of capability set is different from /usr/bin/something, we will get errors if we try to do something with the host filesystem. This is achieved by setting cacheDir and libDir of our mockup cache to "/dev/null". The concept of using named capability sets allows us to further improve the test suite. Now it is possibe to get rid of hardcoded capability sets and replace them with XML files, readable by virQEMUCapsInitCached(). This will allow us to better exercise our capabilities parser. Taking this into account, qemuTestCapsCacheInsert() is actually temporary. It will not be needed any more when capabilities are moved to XML files. Additionally, some small refactoring is done, and common driver initialization and cleanup sequence is put into two functions: qemuTestDriverInit() and qemuTestDriverFree(). I don't include changelist because this is a major rework of the RFC, almost everything has been changed. Pavel Fedin (3): Implement infrastracture for mocking up QEMU capabilities cache Use mockup cache Removed unneeded check src/qemu/qemu_capabilities.c | 16 +++++------- src/qemu/qemu_capspriv.h | 36 +++++++++++++++++++++++++ src/qemu/qemu_domain.c | 5 +--- tests/qemuagenttest.c | 18 +++++++++---- tests/qemuargv2xmltest.c | 19 +++++++------- tests/qemuhotplugtest.c | 32 ++++++++++++----------- tests/qemuxml2argvtest.c | 17 ++++++------ tests/qemuxml2xmltest.c | 16 ++++++++---- tests/qemuxmlnstest.c | 17 ++++++------ tests/testutilsqemu.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ tests/testutilsqemu.h | 9 +++++++ 11 files changed, 182 insertions(+), 65 deletions(-) mode change 100644 => 100755 src/qemu/qemu_capabilities.c create mode 100644 src/qemu/qemu_capspriv.h mode change 100644 => 100755 tests/qemuagenttest.c mode change 100644 => 100755 tests/qemuargv2xmltest.c mode change 100644 => 100755 tests/qemuhotplugtest.c mode change 100644 => 100755 tests/qemuxml2argvtest.c mode change 100644 => 100755 tests/qemuxml2xmltest.c mode change 100644 => 100755 tests/qemuxmlnstest.c mode change 100644 => 100755 tests/testutilsqemu.c mode change 100644 => 100755 tests/testutilsqemu.h -- 2.1.4

2 7

[libvirt] [PATCH] conf/qemu: enforce NUMA nodes only for x86 memory hotplug
by Nikunj A Dadhania 15 Sep '15

15 Sep '15

libvirt enforces at least one NUMA node for memory hotplug support on all architectures. While it might be required for some x86 guest, PowerPC can hotplug memory on non-NUMA system. The generic checks are replaced with arch specific check and xml validation too does not enforce "node" for non-x86 arch. CC: Peter Krempa <pkrempa(a)redhat.com> Signed-off-by: Nikunj A Dadhania <nikunj(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 9 ++++++--- src/qemu/qemu_command.c | 28 +++++++++++++++++----------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fd0450f..4cb2d4a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12430,6 +12430,7 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node, static int virDomainMemoryTargetDefParseXML(xmlNodePtr node, + const virDomainDef *domDef, xmlXPathContextPtr ctxt, virDomainMemoryDefPtr def) { @@ -12437,7 +12438,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, xmlNodePtr save = ctxt->node; ctxt->node = node; - if (virXPathUInt("string(./node)", ctxt, &def->targetNode) < 0) { + if (virXPathUInt("string(./node)", ctxt, &def->targetNode) < 0 && ARCH_IS_X86(domDef->os.arch)) { virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid or missing value of memory device node")); goto cleanup; @@ -12457,6 +12458,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node, static virDomainMemoryDefPtr virDomainMemoryDefParseXML(xmlNodePtr memdevNode, + const virDomainDef *domDef, xmlXPathContextPtr ctxt, unsigned int flags) { @@ -12495,7 +12497,7 @@ virDomainMemoryDefParseXML(xmlNodePtr memdevNode, goto error; } - if (virDomainMemoryTargetDefParseXML(node, ctxt, def) < 0) + if (virDomainMemoryTargetDefParseXML(node, domDef, ctxt, def) < 0) goto error; if (virDomainDeviceInfoParseXML(memdevNode, NULL, &def->info, flags) < 0) @@ -12647,7 +12649,7 @@ virDomainDeviceDefParse(const char *xmlStr, goto error; break; case VIR_DOMAIN_DEVICE_MEMORY: - if (!(dev->data.memory = virDomainMemoryDefParseXML(node, ctxt, flags))) + if (!(dev->data.memory = virDomainMemoryDefParseXML(node, def, ctxt, flags))) goto error; break; case VIR_DOMAIN_DEVICE_NONE: @@ -16328,6 +16330,7 @@ virDomainDefParseXML(xmlDocPtr xml, for (i = 0; i < n; i++) { virDomainMemoryDefPtr mem = virDomainMemoryDefParseXML(nodes[i], + def, ctxt, flags); if (!mem) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ae03618..51160e7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4979,8 +4979,12 @@ qemuBuildMemoryBackendStr(unsigned long long size, *backendProps = NULL; *backendType = NULL; - /* memory devices could provide a invalid guest node */ - if (guestNode >= virDomainNumaGetNodeCount(def->numa)) { + /* memory devices could provide a invalid guest node. Moreover, + * x86 guests needs at least one numa node to support memory + * hotplug + */ + if ((virDomainNumaGetNodeCount(def->numa) == 0 && ARCH_IS_X86(def->os.arch)) || + guestNode > virDomainNumaGetNodeCount(def->numa)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("can't add memory backend for guest node '%d' as " "the guest has only '%zu' NUMA nodes configured"), @@ -4991,10 +4995,12 @@ qemuBuildMemoryBackendStr(unsigned long long size, if (!(props = virJSONValueNewObject())) return -1; - memAccess = virDomainNumaGetNodeMemoryAccessMode(def->numa, guestNode); - if (virDomainNumatuneGetMode(def->numa, guestNode, &mode) < 0 && - virDomainNumatuneGetMode(def->numa, -1, &mode) < 0) - mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + if (virDomainNumaGetNodeCount(def->numa)) { + memAccess = virDomainNumaGetNodeMemoryAccessMode(def->numa, guestNode); + if (virDomainNumatuneGetMode(def->numa, guestNode, &mode) < 0 && + virDomainNumatuneGetMode(def->numa, -1, &mode) < 0) + mode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; + } if (pagesize == 0) { /* Find the huge page size we want to use */ @@ -9238,11 +9244,11 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; } - /* due to guest support, qemu would silently enable NUMA with one node - * once the memory hotplug backend is enabled. To avoid possible - * confusion we will enforce user originated numa configuration along - * with memory hotplug. */ - if (virDomainNumaGetNodeCount(def->numa) == 0) { + /* x86 windows guest needs at least one numa node to be + * present. While its not possible to detect what guest os is + * running, enforce this limitation only to x86 architecture. + */ + if (ARCH_IS_X86(def->os.arch) && virDomainNumaGetNodeCount(def->numa) == 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("At least one numa node has to be configured when " "enabling memory hotplug")); -- 2.4.3

3 5

[libvirt] [PATCH] rbd: Remove snapshots if the FORCED flag has been provided
by Wido den Hollander 14 Sep '15

14 Sep '15

When a RBD volume has snapshots it can not be removed. This patch introduces a new flag to force volume removal, VIR_STORAGE_VOL_DELETE_FORCED. With this flag any existing snapshots will be removed prior to removing the volume. No existing mechanism in libvirt allowed us to pass such information, so that's why a new flag was introduced. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- include/libvirt/libvirt-storage.h | 1 + src/storage/storage_backend_rbd.c | 58 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 453089e..36ff979 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -115,6 +115,7 @@ typedef enum { typedef enum { VIR_STORAGE_VOL_DELETE_NORMAL = 0, /* Delete metadata only (fast) */ VIR_STORAGE_VOL_DELETE_ZEROED = 1 << 0, /* Clear all data to zeros (slow) */ + VIR_STORAGE_VOL_DELETE_FORCED = 2, /* Force removal of volume, even if in use */ } virStorageVolDeleteFlags; typedef enum { diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index ac5085a..ca5e802 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -428,9 +428,13 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, { int ret = -1; int r = 0; + int max_snaps = 128; + int i, snap_count, protected; virStorageBackendRBDState ptr; ptr.cluster = NULL; ptr.ioctx = NULL; + rbd_snap_info_t *snaps; + rbd_image_t image = NULL; VIR_DEBUG("Removing RBD image %s/%s", pool->def->source.name, vol->name); @@ -443,6 +447,59 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, 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; + } + + do { + if (VIR_ALLOC_N(snaps, max_snaps)) + goto cleanup; + + snap_count = rbd_snap_list(image, snaps, &max_snaps); + if (snap_count <= 0) { + VIR_FREE(snaps); + } + } while (snap_count == -ERANGE); + + VIR_DEBUG("Found %d snapshots for volume %s/%s", snap_count, + pool->def->source.name, vol->name); + + if (snap_count > 0 && (flags & VIR_STORAGE_VOL_DELETE_FORCED)) { + for (i = 0; i < snap_count; i++) { + if (rbd_snap_is_protected(image, snaps[i].name, &protected)) + goto cleanup; + + if (protected == 1) { + VIR_DEBUG("Snapshot %s/%s@%s is protected needs to be " + "unprotected", pool->def->source.name, vol->name, + snaps[i].name); + + if (rbd_snap_unprotect(image, snaps[i].name) < 0) + goto cleanup; + } + + VIR_DEBUG("Removing snapshot %s/%s@%s", pool->def->source.name, + vol->name, snaps[i].name); + + if (rbd_snap_remove(image, snaps[i].name) < 0) { + virReportSystemError(-r, _("failed to remove snapshot '%s/%s@%s'"), + pool->def->source.name, vol->name, + snaps[i].name); + goto cleanup; + } + } + + rbd_snap_list_end(snaps); + } + + if (rbd_close(image) < 0) + goto cleanup; + + VIR_DEBUG("Removing volume %s/%s", pool->def->source.name, vol->name); + r = rbd_remove(ptr.ioctx, vol->name); if (r < 0 && (-r) != ENOENT) { virReportSystemError(-r, _("failed to remove volume '%s/%s'"), @@ -453,6 +510,7 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn, ret = 0; cleanup: + VIR_FREE(snaps); virStorageBackendRBDCloseRADOSConn(&ptr); return ret; } -- 1.9.1

1 0

[libvirt] [PATCH] qemuDomainUpdateDeviceConfig: Allow startupPolicy update, yet again
by Michal Privoznik 14 Sep '15

14 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1159219 So, in 11e058ca589808bd I've tried to make UpdateDevice update startupPolicy too. And it worked well until somebody came around and pushed d0dc6c036914da which accidentally removed my contribution. Redo my commit. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 91eb661..03ef972 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8353,6 +8353,7 @@ qemuDomainUpdateDeviceConfig(virQEMUCapsPtr qemuCaps, * We allow updating src/type//driverType/cachemode/ */ orig->cachemode = disk->cachemode; + orig->startupPolicy = disk->startupPolicy; virStorageSourceFree(orig->src); orig->src = disk->src; -- 2.4.6

2 3

[libvirt] [PATCH] util: Add space before comment end marker
by Andrea Bolognani 14 Sep '15

14 Sep '15

This allows the Wikipedia link to be recognized correctly by eg. gnome-terminal's Open Link and Copy Link Address features. --- Pushed as trivial src/util/virarch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virarch.h b/src/util/virarch.h index 3206ce2..af5ff83 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -45,7 +45,7 @@ typedef enum { VIR_ARCH_MIPS64, /* MIPS 64 BE http://en.wikipedia.org/wiki/MIPS_architecture */ VIR_ARCH_MIPS64EL, /* MIPS 64 LE http://en.wikipedia.org/wiki/MIPS_architecture */ - VIR_ARCH_OR32, /* OpenRisc 32 BE http://en.wikipedia.org/wiki/OpenRISC#QEMU_support*/ + VIR_ARCH_OR32, /* OpenRisc 32 BE http://en.wikipedia.org/wiki/OpenRISC#QEMU_support */ VIR_ARCH_PARISC, /* PA-Risc 32 BE http://en.wikipedia.org/wiki/PA-RISC */ VIR_ARCH_PARISC64, /* PA-Risc 64 BE http://en.wikipedia.org/wiki/PA-RISC */ -- 2.4.3

1 0

[libvirt] [PATCH] virsh: Fix job status indicator for 0 length block jobs
by Peter Krempa 14 Sep '15

14 Sep '15

Although 0 length block jobs aren't entirely useful, the output of virsh blockjob is empty due to the condition that suppresses the output for migration jobs that did not start. Add a flag for virshPrintJobProgress that specifies that the job was started so that the function can be used both in migration where the job starts delayed and for block jobs where we already know that the job was started. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1196711 --- tools/virsh-domain.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b029b65..7837974 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1683,13 +1683,23 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) } +/** + * virshPrintJobProgress: + * @label: name of the block job + * @remaining: amount of remaining work + * @total: amount of total work + * @started: The block job was started already + * + * Prints a human friendly percentage string decribing the state of the given + * job. The output is omitted if the job was not started. + */ static void virshPrintJobProgress(const char *label, unsigned long long remaining, - unsigned long long total) + unsigned long long total, bool started) { int progress; - if (total == 0) + if (total == 0 && !started) /* migration has not been started */ return; @@ -1921,7 +1931,7 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) if (data->verbose) virshPrintJobProgress(data->job_name, info.end - info.cur, - info.end); + info.end, true); if (data->timeout && virTimeMillisNow(&curr) < 0) { vshSaveLibvirtError(); @@ -1949,7 +1959,7 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) if (data->verbose && (ret == VIR_DOMAIN_BLOCK_JOB_COMPLETED || ret == VIR_DOMAIN_BLOCK_JOB_READY)) - virshPrintJobProgress(data->job_name, 0, 1); + virshPrintJobProgress(data->job_name, 0, 1, true); sigaction(SIGINT, &old_sig_action, NULL); return ret; @@ -2621,7 +2631,7 @@ virshBlockJobInfo(vshControl *ctl, info.bandwidth, info.cur, info.end); } else { virshPrintJobProgress(virshDomainBlockJobToString(info.type), - info.end - info.cur, info.end); + info.end - info.cur, info.end, true); if (speed) { const char *unit; double val = vshPrettyCapacity(speed, &unit); @@ -4356,7 +4366,7 @@ virshWatchJob(vshControl *ctl, retchar == '0') { if (verbose) { /* print [100 %] */ - virshPrintJobProgress(label, 0, 1); + virshPrintJobProgress(label, 0, 1, true); } break; } @@ -4392,7 +4402,7 @@ virshWatchJob(vshControl *ctl, if (ret == 0) { if (verbose) virshPrintJobProgress(label, jobinfo.dataRemaining, - jobinfo.dataTotal); + jobinfo.dataTotal, false); if (!jobStarted && (jobinfo.type == VIR_DOMAIN_JOB_BOUNDED || -- 2.4.5

2 1

[libvirt] [PATCH 0/2] Fix permissions for per-VM and qemu directories
by Martin Kletzander 14 Sep '15

14 Sep '15

This is basically v2 of: https://www.redhat.com/archives/libvir-list/2015-September/msg00295.html with some changes: - permissions for per-VM dirs are fixed as well - permissions for the /var/lib/libvirt/qemu directory are fixed in the install phase of Makefile.am in addition to the spec file We could also fix the permissions in qemuStateInitialize, but I chose to do it this way. Bear in mind, that both approaches have their pros and cons, of course. Martin Kletzander (2): qemu: Do not allow others into per-VM subdirectories qemu: Allow others to browse /var/lib/libvirt/qemu libvirt.spec.in | 4 ++-- src/Makefile.am | 2 +- src/qemu/qemu_process.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.5.2

2 3

[libvirt] [PATCH] qemu: hotplug: Properly clean up drive backend if frontend hotplug fails
by Peter Krempa 14 Sep '15

14 Sep '15

Commit 8125113c added code that should remove the disk backend if the fronted hotplug failed for any reason. The code had a bug though as it used the disk string for unplug rather than the backend alias. Fix the code by pre-creating an alias string and using it instead of the disk string. In cases where qemu does not support QEMU_CAPS_DEVICE, we ignore the unplug of the backend since we can't really create an alias in that case. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1262399 --- src/qemu/qemu_hotplug.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 63fafa6..c956e8c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -321,6 +321,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, qemuDomainObjPrivatePtr priv = vm->privateData; char *devstr = NULL; char *drivestr = NULL; + char *drivealias = NULL; bool releaseaddr = false; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); const char *src = virDomainDiskGetSource(disk); @@ -365,6 +366,10 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps))) goto error; + if (virAsprintf(&drivealias, "%s%s", QEMU_DRIVE_HOST_PREFIX, + disk->info.alias) < 0) + goto error; + if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps))) goto error; } @@ -379,7 +384,8 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, ret = qemuMonitorAddDevice(priv->mon, devstr); if (ret < 0) { virErrorPtr orig_err = virSaveLastError(); - if (qemuMonitorDriveDel(priv->mon, drivestr) < 0) { + if (!drivealias || + qemuMonitorDriveDel(priv->mon, drivealias) < 0) { VIR_WARN("Unable to remove drive %s (%s) after failed " "qemuMonitorAddDevice", drivestr, devstr); @@ -415,6 +421,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, cleanup: VIR_FREE(devstr); VIR_FREE(drivestr); + VIR_FREE(drivealias); virObjectUnref(cfg); return ret; -- 2.4.5

2 2

[libvirt] LSN-2015-0003: CVE-2015-5247 denial of service through root-squash NFS storage pools
by Eric Blake 12 Sep '15

12 Sep '15

Libvirt Security Notice: LSN-2015-0003 ====================================== Summary: denial of service through root-squash NFS storage pools Reported on: 20150814 Published on: 20150903 Fixed on: 20150903 Reported by: Han Han <hhan(a)redhat.com> Patched by: John Ferlan <jferlan(a)redhat.com> See also: CVE-2015-5247 Description ----------- The virStorageVolCreateXML API had a bug where it could create a volume on a root-squash NFS mount, but then fail to remove that volume if later steps during the API encountered problems. This was further compounded by code which used a wrong conditional on whether the new volume needed to have permissions changed, making it more likely to trigger the failed unlink attempt. Poor error handling after a failed unlink left libvirt with an inconsistent view of the storage volume that could then result in a libvirtd crash. While the libvirtd crash might be delayed until by subsequent actions from a read-only connection, the conditions that set up the crash can only be triggered by a client with a read-write connection. Impact ------ When using fine-grained Access Control Lists (ACL), the virStorageVolCreateXML API only requires the storage_vol:create permission. A client with this privilege but lacking the more-powerful domain:write permission could exploit the API bugs to cause a denial-of-service attack by taking down libvirtd through a crash. It can also be argued that the ability to cause libvirt to create files which it cannot delete can be used as a denial-of-service attack on storage resources. Workaround ---------- The problems with libvirt creating a file which it does not then clean up on error is specific to root-squash NFS, so one mitigation is avoiding the use of the root-squash option when exporting NFS volumes for use by libvirt storage pools. Note that in general, the use of root-squash NFS does not add any real security (it makes certain tasks harder for a root user, but the root user can trivially change ids to another user to still perform those tasks). Furthermore, it is possible to prevent the denial of service attacks by stopping the use of the fine grained access control mechanism (while this does not prevent a crash, such a crash is no longer a security problem as there is no longer a privilege boundary between a user creating a volume and a user with full system access). Affected product ---------------- Name: libvirt Repository: git://libvirt.org/git/libvirt.git http://libvirt.org/git/?p=libvirt.git Branch: master Broken in: v1.2.14 Broken in: v1.2.15 Broken in: v1.2.16 Broken in: v1.2.17 Broken in: v1.2.18 Broken in: v1.2.19 Broken by: 155ca616eb231181f6978efc9e3a1eb0eb60af8a Broken by: 7c2d65dde2595c07d56aad1e043f7b1836592d89 Fixed by: db9277a39bc364806e8d3e08a08fc128d59b7094 Fixed by: 691dd388aee99f8b06177540303b690586d5f5b3 Fixed by: 35847860f65f92e444db9730e00cdaef45198e0c Branch: v1.2.14-maint Broken by: 155ca616eb231181f6978efc9e3a1eb0eb60af8a Fixed by: 605b12068392d29beb44a8ab7d6ec176d6b05237 Fixed by: 454cb7c40dbcff84192094963d71369ac7d94546 Branch: v1.2.15-maint Broken by: 155ca616eb231181f6978efc9e3a1eb0eb60af8a Fixed by: 3c41b3ea5e68f391b8ff901082608bda5f7f3fbc Fixed by: fe2cf73800e3be87d1d4d811facb3f2be48126e5 Branch: v1.2.16-maint Broken by: 155ca616eb231181f6978efc9e3a1eb0eb60af8a Broken by: 7c2d65dde2595c07d56aad1e043f7b1836592d89 Fixed by: 9e48400f4606bac16b7e4db195f610928c3d5a04 Fixed by: 2f4b41861c1729ff4b754986782d7428ccdca455 Fixed by: 7f0505705c70f7eb1e435a2e7732d1a74abfadfd Branch: v1.2.17-maint Broken by: 155ca616eb231181f6978efc9e3a1eb0eb60af8a Broken by: 7c2d65dde2595c07d56aad1e043f7b1836592d89 Fixed by: d055989083df4bf68eb1388d327ebffb3501bb83 Fixed by: 98242f94cd181f0257535479369054f07f951b21 Fixed by: a3ee6885d95a2ce6fb7e58bb0737cfb1612e0fb7 Branch: v1.2.18-maint Broken by: 155ca616eb231181f6978efc9e3a1eb0eb60af8a Broken by: 7c2d65dde2595c07d56aad1e043f7b1836592d89 Fixed by: e63b32e22dafd99547f82f5383fdbf58b5f651a1 Fixed by: 075eb526c9817d9d8e3a759e3fbe180d8d326dcf Fixed by: 966cc922221be2b8cc6a9842ed0dc4cf1568a7b3 Branch: v1.2.19-maint Broken by: 155ca616eb231181f6978efc9e3a1eb0eb60af8a Broken by: 7c2d65dde2595c07d56aad1e043f7b1836592d89 Fixed by: e0025d2967bbe3f283937216c9e2c12b6e9d1010 Fixed by: 8b1d84e640f1a6e6ebb47caf23a664e2f651b32d Fixed by: 3468542f06f6f5dc94defa1603c6a6adea3e2da8 -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] qemu: command: Report stderr from qemu-bridge-helper
by Cole Robinson 11 Sep '15

11 Sep '15

There's a couple reports of things failing in this area (bug 1259070), but it's tough to tell what's going wrong without stderr from qemu-bridge-helper. So let's report stderr in the error message Couple new examples: virbr0 is inactive: internal error: /usr/libexec/qemu-bridge-helper --use-vnet --br=virbr0 --fd=21: failed to retrieve file descriptor: Transport endpoint is not connected stderr=failed to get mtu of bridge `virbr0': No such device bridge isn't on the ACL: internal error: /usr/libexec/qemu-bridge-helper --use-vnet --br=br0 --fd=21: failed to retrieve file descriptor: Transport endpoint is not connected stderr=access denied by acl file --- src/qemu/qemu_command.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ec5e3d4..fc22f36 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -285,6 +285,7 @@ static int qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, unsigned int flags) { virCommandPtr cmd; + char *errbuf = NULL, *cmdstr = NULL; int pair[2] = { -1, -1 }; if ((flags & ~VIR_NETDEV_TAP_CREATE_VNET_HDR) != VIR_NETDEV_TAP_CREATE_IFUP) @@ -306,6 +307,8 @@ static int qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, virCommandAddArgFormat(cmd, "--use-vnet"); virCommandAddArgFormat(cmd, "--br=%s", brname); virCommandAddArgFormat(cmd, "--fd=%d", pair[1]); + virCommandSetErrorBuffer(cmd, &errbuf); + virCommandDoAsyncIO(cmd); virCommandPassFD(cmd, pair[1], VIR_COMMAND_PASS_FD_CLOSE_PARENT); virCommandClearCaps(cmd); @@ -320,9 +323,24 @@ static int qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, do { *tapfd = recvfd(pair[0], 0); } while (*tapfd < 0 && errno == EINTR); + if (*tapfd < 0) { - virReportSystemError(errno, "%s", - _("failed to retrieve file descriptor for interface")); + char ebuf[1024]; + char *errstr = NULL; + + if (!(cmdstr = virCommandToString(cmd))) + goto cleanup; + virCommandAbort(cmd); + + if (errbuf && *errbuf && + virAsprintf(&errstr, "\nstderr=%s", errbuf) < 0) + goto cleanup; + + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s: failed to retrieve file descriptor: %s%s"), + cmdstr, virStrerror(errno, ebuf, sizeof(ebuf)), + errstr ? errstr : ""); + VIR_FREE(errstr); goto cleanup; } @@ -333,6 +351,8 @@ static int qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, } cleanup: + VIR_FREE(cmdstr); + VIR_FREE(errbuf); virCommandFree(cmd); VIR_FORCE_CLOSE(pair[0]); return *tapfd < 0 ? -1 : 0; -- 2.5.0

2 2

[libvirt] [PATCH LIBVIRT] libxl: don't end job for ephemeal domain on start failure
by Ian Campbell 11 Sep '15

11 Sep '15

commit 4b53d0d4ac9c "libxl: don't remove persistent domain on start failure" cleans up the vm object and sets it to NULL if the vm is not persistent, however at end job vm (now NULL) is dereferenced via the call to libxlDomainObjEndJob. Avoid this by skipping "endjob" and going straight to "cleanup" in this case. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- src/libxl/libxl_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 5f69b49..e2797d5 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -992,6 +992,7 @@ libxlDomainCreateXML(virConnectPtr conn, const char *xml, if (!vm->persistent) { virDomainObjListRemove(driver->domains, vm); vm = NULL; + goto cleanup; } goto endjob; } -- 2.1.4

3 2

[libvirt] [PATCH] xen: fix race in refresh of config cache
by Daniel P. Berrange 11 Sep '15

11 Sep '15

The xenXMConfigCacheRefresh method scans /etc/xen and loads all config files it finds. It then scans its internal hash table and purges any (previously) loaded config files whose refresh timestamp does not match the timestamp recorded at the start of xenXMConfigCacheRefresh(). There is unfortunately a subtle flaw in this, because if loading the config files takes longer than 1 second, some of the config files will have a refresh timestamp that is 1 or more seconds different (newer) than is checked for. So we immediately purge a bunch of valid config files we just loaded. To avoid this flaw, we must pass the timestamp we record at the start of xenXMConfigCacheRefresh() into the xenXMConfigCacheAddFile() method, instead of letting the latter call time(NULL) again. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/xen/xen_inotify.c | 10 ++++++---- src/xen/xm_internal.c | 7 +++---- src/xen/xm_internal.h | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index cd1e2df..d81a35d 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -217,11 +217,11 @@ xenInotifyRemoveDomainConfigInfo(virConnectPtr conn, const char *fname) } static int -xenInotifyAddDomainConfigInfo(virConnectPtr conn, const char *fname) +xenInotifyAddDomainConfigInfo(virConnectPtr conn, const char *fname, time_t now) { xenUnifiedPrivatePtr priv = conn->privateData; return priv->useXenConfigCache ? - xenXMConfigCacheAddFile(conn, fname) : + xenXMConfigCacheAddFile(conn, fname, now) : xenInotifyXendDomainsDirAddEntry(conn, fname); } @@ -238,6 +238,7 @@ xenInotifyEvent(int watch ATTRIBUTE_UNUSED, char *tmp, *name; virConnectPtr conn = data; xenUnifiedPrivatePtr priv = NULL; + time_t now = time(NULL); VIR_DEBUG("got inotify event"); @@ -300,7 +301,7 @@ xenInotifyEvent(int watch ATTRIBUTE_UNUSED, } } else if (e->mask & (IN_CREATE | IN_CLOSE_WRITE | IN_MOVED_TO)) { virObjectEventPtr event; - if (xenInotifyAddDomainConfigInfo(conn, fname) < 0) { + if (xenInotifyAddDomainConfigInfo(conn, fname, now) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error adding file to config cache")); goto cleanup; @@ -344,6 +345,7 @@ xenInotifyOpen(virConnectPtr conn, char *path; xenUnifiedPrivatePtr priv = conn->privateData; int direrr; + time_t now = time(NULL); virCheckFlags(VIR_CONNECT_RO, -1); @@ -374,7 +376,7 @@ xenInotifyOpen(virConnectPtr conn, return -1; } - if (xenInotifyAddDomainConfigInfo(conn, path) < 0) { + if (xenInotifyAddDomainConfigInfo(conn, path, now) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error adding file to config list")); closedir(dh); diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 59b1cd4..07b9eb4 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -191,15 +191,14 @@ xenXMConfigCacheRemoveFile(virConnectPtr conn, const char *filename) * calling this function */ int -xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename) +xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename, time_t now) { xenUnifiedPrivatePtr priv = conn->privateData; xenXMConfCachePtr entry; struct stat st; int newborn = 0; - time_t now = time(NULL); - VIR_DEBUG("Adding file %s", filename); + VIR_DEBUG("Adding file %s %lld", filename, (long long)now); /* Get modified time */ if ((stat(filename, &st) < 0)) { @@ -373,7 +372,7 @@ xenXMConfigCacheRefresh(virConnectPtr conn) /* If we already have a matching entry and it is not modified, then carry on to next one*/ - if (xenXMConfigCacheAddFile(conn, path) < 0) { + if (xenXMConfigCacheAddFile(conn, path, now) < 0) { /* Ignoring errors, since a lot of stuff goes wrong in /etc/xen */ } diff --git a/src/xen/xm_internal.h b/src/xen/xm_internal.h index 25b4fd5..0246895 100644 --- a/src/xen/xm_internal.h +++ b/src/xen/xm_internal.h @@ -31,7 +31,7 @@ # include "domain_conf.h" int xenXMConfigCacheRefresh (virConnectPtr conn); -int xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename); +int xenXMConfigCacheAddFile(virConnectPtr conn, const char *filename, time_t now); int xenXMConfigCacheRemoveFile(virConnectPtr conn, const char *filename); int xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags); -- 2.4.3

2 1

[libvirt] [PATCH] tests: Don't use testutils in mock libraries
by Martin Kletzander 11 Sep '15

11 Sep '15

Mock libraries are not built with testutils.c, but there's one which uses VIR_TEST_DEBUG. But because that debug should be an error, if we change it, then it will not only be more semantically correct, but mingw compiler will be happier as well. It also follows suit with all other mock libraries. For few other things, used in this file, need libvirt.la to be added into LIBADD for mingw as well. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/Makefile.am | 1 + tests/virportallocatortest.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index bde7f5baf1fe..4af38fe9c14b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1020,6 +1020,7 @@ libvirportallocatormock_la_SOURCES = \ virportallocatortest.c libvirportallocatormock_la_CFLAGS = $(AM_CFLAGS) -DMOCK_HELPER=1 libvirportallocatormock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) +libvirportallocatormock_la_LIBADD = ../src/libvirt.la vircgrouptest_SOURCES = \ vircgrouptest.c testutils.h testutils.c diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 1125b0aeedda..58b2155994f9 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -49,7 +49,7 @@ static void init_syms(void) realsocket = dlsym(RTLD_NEXT, "socket"); if (!realsocket) { - VIR_TEST_DEBUG("Unable to find 'socket' symbol\n"); + fprintf(stderr, "Unable to find 'socket' symbol\n"); abort(); } -- 2.5.1

2 1

[libvirt] (no subject)
by Wido den Hollander 10 Sep '15

10 Sep '15

The current code of libvirt-java does not build with Java 7. This patch updates the build.properties and INSTALL that we require Java 8 to build libvirt-java.

3 8

[libvirt] [java] [PATCH 0/2] Fix a few compilation problems
by Claudio Bley 10 Sep '15

10 Sep '15

Initially reported by Wido den Hollander here[1]. [1]: http://www.redhat.com/archives/libvir-list/2015-September/msg00052.html Claudio Bley (2): Fix compilation error for unreported exceptions Fix compilation error when using -source 1.x src/main/java/org/libvirt/Library.java | 2 +- src/main/java/org/libvirt/event/DomainEvent.java | 4 +++- src/main/java/org/libvirt/event/DomainEventType.java | 7 ------- 3 files changed, 4 insertions(+), 9 deletions(-) -- 2.5.1

1 2

[libvirt] [PATCH] docs: Update devguide.html to point to the new Python dev guide
by Daniel P. Berrange 10 Sep '15

10 Sep '15

We have a new libvirt-appdev-guide-python which we need to promote to users. Rewrite the existing page to mention it too. Also use the new URL location which is automatically refreshed once a day. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/devguide.html.in | 56 +++++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/docs/devguide.html.in b/docs/devguide.html.in index 122fe24..639e495 100644 --- a/docs/devguide.html.in +++ b/docs/devguide.html.in @@ -2,55 +2,41 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - <h1>libvirt Application Development Guide</h1> - - <ul id="toc"></ul> - - <p> - The guide is both a learning tool for developing with libvirt and an - API reference document. It is a work in progress, composed by a - professional author from contributions written by members of the - libvirt team. - </p> + <h1>libvirt Application Development Guides</h1> <p> - Contributions to the guide are <b>VERY</b> welcome. If you'd like to get - your name on this and demonstrate your virtualisation prowess, a solid - contribution to the content here will do it. :) + The libvirt API is accessible from a number of programming languages. + At this time, there are application development guides available + which cover the C API and the Python API. Of the two, the Python guide + is currently the more comprehensive document. </p> - <h2><a name="online">Browsable online</a></h2> - <ul> - <li><a href="http://libvirt.org/guide/html/"> - HTML format using multiple pages</a></li> - <li><a href="http://libvirt.org/guide/html-single/"> - HTML format using one big page</a></li> - <li><a href="http://libvirt.org/guide/pdf/Application_Development_Guide.pdf"> - PDF format</a></li> - <li><a href="http://libvirt.org/guide/libvirt-0.7.5-Application_Development_Guide-en-US.…"> - ePub format</a></li> - <li><a href="http://libvirt.org/guide/txt/Application_Development_Guide.txt"> - Plain text format</a></li> - <li><a href="http://libvirt.org/guide/libvirt-Application_Development_Guide-0.7.5-web-en…"> - Source RPM format</a></li> + <li><a href="http://libvirt.org/docs/libvirt-appdev-guide/en-US/html/">Application Development Guide (C language) HTML</a></li> + <li><a href="http://libvirt.org/docs/libvirt-appdev-guide/en-US/pdf/">Application Development Guide (C language) PDF</a></li> + <li><a href="http://libvirt.org/docs/libvirt-appdev-guide-python/en-US/html/">Application Development Guide (Python language) HTML</a></li> + <li><a href="http://libvirt.org/docs/libvirt-appdev-guide-python/en-US/pdf/">Application Development Guide (Python language) PDF</a></li> </ul> - <h2><a name="git">GIT source repository</a></h2> + <h2>Contributing content</h2> <p> - The source is in a git repository: + These guides are written in DocBook and published with the + publican tool, which is also used for Fedora and Red Hat + documentation. The original content is provided in GIT and + any contributions to the guide are welcome. </p> <pre> - git clone git://libvirt.org/libvirt-appdev-guide.git</pre> + # C language + $ git clone <a href="http://libvirt.org/git/?p=libvirt-appdev-guide.git">git://libvirt.org/libvirt-appdev-guide.git</a> - <p> - Browsable here: - </p> + # Python language + $ git clone <a href="http://libvirt.org/git/?p=libvirt-appdev-guide-python.git">git://libvirt.org/libvirt-appdev-guide-python.git</a> - <pre> - <a href="http://libvirt.org/git/?p=libvirt-appdev-guide.git;a=summary">http://libvirt.org/git/?p=libvirt-appdev-guide.git;a=summary</a></pre> + # Publican Style/Theme + $ git clone <a href="http://libvirt.org/git/?p=libvirt-publican.git">git://libvirt.org/libvirt-publican.git</a> + </pre> </body> </html> -- 2.4.3

2 1

[libvirt] [PATCH v3 0/4] Try several possible default network devices
by Andrea Bolognani 10 Sep '15

10 Sep '15

Changes in v3: * detect rtl8139 and e1000 availability as well * don't try to use virtio-net based on availability alone: try rtl8139, e1000 and virtio-net in this order instead * patch 4/4 contains an ugly bit we'll be able to get rid of once capabilities can be properly mocked in the test suite Changes in v2[1]: * detect virtio-net availability * try to user it if available Cheers. [1] https://www.redhat.com/archives/libvir-list/2015-September/msg00058.html Andrea Bolognani (4): qemu: Introduce QEMU_CAPS_DEVICE_RTL8139 qemu: Introduce QEMU_CAPS_DEVICE_E1000 qemu: Introduce QEMU_CAPS_DEVICE_VIRTIO_NET qemu: Try several network devices when looking for a default src/qemu/qemu_capabilities.c | 12 +++++++++- src/qemu/qemu_capabilities.h | 3 +++ src/qemu/qemu_domain.c | 32 +++++++++++++++++++++++---- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 3 +++ tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 3 +++ tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 3 +++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 3 +++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 3 +++ tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 3 +++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 3 +++ tests/qemuhelptest.c | 30 ++++++++++++++++++++----- 11 files changed, 87 insertions(+), 11 deletions(-) -- 2.4.3

2 8

[libvirt] [PATCH sandbox v5 00/20] Docker image support
by Daniel P. Berrange 10 Sep '15

10 Sep '15

This is an update of Eren's v4 patch series to provide Docker image support. In this v5 I have incorporated fixes for all of the feedback I gave Eren against the v4, so I think this series is ready for merging now. One thing I still want to look at separately is how applicable this design is to other container formats, in particular the 'appc' specification https://github.com/appc/spec/blob/master/spec/discovery.md Before we make a release containing the docker impl, I want to be confident we've not done anything silly which will cause us compat problems if we want to extend to cover appc later. Daniel P Berrange (1): Add virt-sandbox-image Daniel P. Berrange (1): Rename 'name' to 'template' to disambiguate Eren Yagdiran (18): Fix docker authentication handling Image: Add Hooking Mechanism Image: virt-sandbox-image default dir constants Image: Add download function Image: Refactor create function Image: Add delete function Image: Add get_command function to Source Image: Add run args Image: Add check_connect function Image: Add get_disk function to Source Image: Add run function Image: Add network support Image: man file for virt-sandbox-image Add config for environment variables Add environment parameter to virt-sandbox init-common: Exporting custom environment variables Image: Add custom environment support Image: Add Volume Support .gitignore | 1 + bin/Makefile.am | 8 +- bin/virt-sandbox-image | 8 + bin/virt-sandbox-image.pod | 169 +++++++++++ bin/virt-sandbox.c | 14 + configure.ac | 3 + libvirt-sandbox.spec.in | 3 + libvirt-sandbox/Makefile.am | 2 +- libvirt-sandbox/image/Makefile.am | 10 + libvirt-sandbox/image/__init__.py | 0 libvirt-sandbox/image/cli.py | 293 ++++++++++++++++++ libvirt-sandbox/image/sources/DockerSource.py | 416 ++++++++++++++++++++++++++ libvirt-sandbox/image/sources/Makefile.am | 9 + libvirt-sandbox/image/sources/Source.py | 117 ++++++++ libvirt-sandbox/image/sources/__init__.py | 0 libvirt-sandbox/libvirt-sandbox-config.c | 171 ++++++++++- libvirt-sandbox/libvirt-sandbox-config.h | 13 + libvirt-sandbox/libvirt-sandbox-init-common.c | 18 ++ libvirt-sandbox/libvirt-sandbox.sym | 9 + libvirt-sandbox/tests/test-config.c | 10 + po/POTFILES.in | 1 + 21 files changed, 1272 insertions(+), 3 deletions(-) create mode 100644 bin/virt-sandbox-image create mode 100644 bin/virt-sandbox-image.pod create mode 100644 libvirt-sandbox/image/Makefile.am create mode 100644 libvirt-sandbox/image/__init__.py create mode 100755 libvirt-sandbox/image/cli.py create mode 100644 libvirt-sandbox/image/sources/DockerSource.py create mode 100644 libvirt-sandbox/image/sources/Makefile.am create mode 100644 libvirt-sandbox/image/sources/Source.py create mode 100644 libvirt-sandbox/image/sources/__init__.py -- 2.4.3

3 48

[libvirt] [PATCH] target-i386: Enable "check" mode by default
by Eduardo Habkost 09 Sep '15

09 Sep '15

Current default behavior of QEMU is to silently disable features that are not supported by the host when a CPU model is requested in the command-line. This means that in addition to risking breaking guest ABI by default, we are silent about it. I would like to enable "enforce" by default, but this can easily break existing production systems because of the way libvirt makes assumptions about CPU models today (this will change in the future, once QEMU provide a proper interface for checking if a CPU model is runnable). But there's no reason we should be silent about it. So, change target-i386 to enable "check" mode by default so at least we have some warning printed to stderr (and hopefully logged somewhere) when QEMU disables a feature that is not supported by the host system. Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- target-i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index cfb8aa7..32fee00 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3121,7 +3121,7 @@ static Property x86_cpu_properties[] = { DEFINE_PROP_BOOL("hv-relaxed", X86CPU, hyperv_relaxed_timing, false), DEFINE_PROP_BOOL("hv-vapic", X86CPU, hyperv_vapic, false), DEFINE_PROP_BOOL("hv-time", X86CPU, hyperv_time, false), - DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, false), + DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true), DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false), DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true), DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0), -- 2.1.0

3 4

[libvirt] [PATCH RFC 0/2] libxl: migration v3 and p2p support
by Joao Martins 09 Sep '15

09 Sep '15

Hey Jim, These series introduce support for peer2peer and plain v3 migration without extensible parameters. This patch series is organized as follows: The first patch introduces the P2P where the source host must take care of connection handling with destination libvirtd and is responsible for performing the migration. I introduced an additional method for the P2P Perform phase since the default Perform of libxl is then reused. The sequence is the same as v3 so it is possible to migrate to non-P2P host. libxlDoMigrateP2P actually does the migration using a virConnectPtr to the destination and thus The second patch is mostly mechanical, and functional wise is very much the same as the Params variant. The added value of introducing plain v3 is having access to older APIs such virDomainMigrateToURI2 and virDomainMigrate (in P2P mode) which are currently in use by Openstack/virt-manager. My testing was performed in xen stable-4.5 and 4.4.3 (with the added patches in the Xen CI loop) plus Openstack Kilo. In addition I backported the patches and tested also on libvirt 1.2.14 (whic is also ran by the Xen CI Openstack loop). Any comments or suggestions are welcome, Thanks! Joao Joao Martins (2): libxl: add p2p migration libxl: add v3 migration w/o params src/libxl/libxl_driver.c | 226 +++++++++++++++++++++++++++++++++++++++++++- src/libxl/libxl_migration.c | 220 ++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_migration.h | 11 +++ 3 files changed, 454 insertions(+), 3 deletions(-) -- 2.1.4

2 6

[libvirt] [PATCH] migration: support all toURI and proto combos
by Nikolay Shirokovskiy 09 Sep '15

09 Sep '15

Current implementation of 'toURI' migration interfaces does not support all combinations of interface versions and protocol versions. For example 'toURI2' with p2p flag will not migrate if driver supports only v3params proto. This is not convinient as drivers that starts to support migration have to manually support older versions of protocol. I guess this should be done in one place, namely here. Another issue is that there are a lot of code duplication in implementation of toURI interfaces and it is not obvious from code how are they related. This implementation uses extensible parameters as intermediate parameters representation. This is possible as interfaces are done backward compatible in terms of parameters and later versions supports all parameters of former versions. Another change that is convinient to add here is reusing the code for p2p and direct migration. The only major difference between them is how URIs are passed in places that supports both connection and migration uri. Now this difference is plain in code. See comments in code for details. Minor p2p vs direct difference is that direct not support proto with extensible parameters. This behaviour is saved. Unobvious check of migration dconnuri in case of p2p migration is actually protection from migration to localhost (from cover letter to patch 59d13aae that introduced it). So reformat this check to make it goal obvious. ==Behaviour changes Previous implementation of direct migration demands that proto v1 is implemented even if proto v3 is used. As this is somewhat against the purpuse of this patch this behaviour is dropped. Another behavior change that introduced is that now offline flag examined against driver migration capabilities for all api version not only for toURI1. It was odd taking into account that all toURI uses common peer2peer and direct implementation. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/libvirt-domain.c | 564 +++++++++++++++++++++----------------------------- 1 files changed, 232 insertions(+), 332 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index cbf08fc..721d820 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3291,181 +3291,209 @@ virDomainMigrateVersion3Params(virDomainPtr domain, params, nparams, true, flags); } - -/* - * In normal migration, the libvirt client co-ordinates communication - * between the 2 libvirtd instances on source & dest hosts. - * - * In this peer-2-peer migration alternative, the libvirt client - * only talks to the source libvirtd instance. The source libvirtd - * then opens its own connection to the destination and co-ordinates - * migration itself. - * - * If useParams is true, params and nparams contain migration parameters and - * we know it's safe to call the API which supports extensible parameters. - * Otherwise, we have to use xmlin, dname, uri, and bandwidth and pass them - * to the old-style APIs. - */ static int -virDomainMigratePeer2PeerFull(virDomainPtr domain, - const char *dconnuri, - const char *xmlin, - const char *dname, - const char *uri, - unsigned long long bandwidth, - virTypedParameterPtr params, - int nparams, - bool useParams, - unsigned int flags) +virDomainMigrateURIproto3(virDomainPtr domain, + const char *dconnuri, + virTypedParameterPtr params, + int nparams, + unsigned int flags) { - virURIPtr tempuri = NULL; + const char *compatParams[] = { VIR_MIGRATE_PARAM_URI, + VIR_MIGRATE_PARAM_DEST_NAME, + VIR_MIGRATE_PARAM_DEST_XML, + VIR_MIGRATE_PARAM_BANDWIDTH }; + const char *uri = NULL; + const char *dname = NULL; + const char *dxml = NULL; + unsigned long long bandwidth = 0; - VIR_DOMAIN_DEBUG(domain, - "dconnuri=%s, xmlin=%s, dname=%s, uri=%s, bandwidth=%llu " - "params=%p, nparams=%d, useParams=%d, flags=%x", - dconnuri, NULLSTR(xmlin), NULLSTR(dname), NULLSTR(uri), - bandwidth, params, nparams, useParams, flags); - VIR_TYPED_PARAMS_DEBUG(params, nparams); + if (!virTypedParamsCheck(params, nparams, compatParams, + ARRAY_CARDINALITY(compatParams))) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("Migration does not support some of parameters.")); + return -1; + } - if ((useParams && !domain->conn->driver->domainMigratePerform3Params) || - (!useParams && - !domain->conn->driver->domainMigratePerform && - !domain->conn->driver->domainMigratePerform3)) { - virReportUnsupportedError(); + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, &uri) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, &dxml) < 0 || + virTypedParamsGetULLong(params, nparams, + VIR_MIGRATE_PARAM_BANDWIDTH, &bandwidth) < 0) { return -1; } - if (!(tempuri = virURIParse(dconnuri))) + VIR_DEBUG("Using migration protocol 3"); + return domain->conn->driver->domainMigratePerform3 + (domain, dxml, + NULL, /* cookiein */ + 0, /* cookieinlen */ + NULL, /* cookieoutlen */ + NULL, /* cookieoutlen */ + dconnuri, uri, flags, dname, bandwidth); +} + +static int +virDomainMigrateURIproto1(virDomainPtr domain, + const char *dconnuri, + virTypedParameterPtr params, + int nparams, + unsigned int flags) +{ + /* uri parameter is added for direct case */ + const char *compatParams[] = { VIR_MIGRATE_PARAM_DEST_NAME, + VIR_MIGRATE_PARAM_BANDWIDTH, + VIR_MIGRATE_PARAM_URI }; + const char *dname = NULL; + const char *miguri = NULL; + unsigned long long bandwidth = 0; + const char *duri = NULL; + + if (!virTypedParamsCheck(params, nparams, compatParams, + ARRAY_CARDINALITY(compatParams))) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("Migration does not support some of parameters.")); return -1; - if (!tempuri->server || STRPREFIX(tempuri->server, "localhost")) { - virReportInvalidArg(dconnuri, "%s", - _("unable to parse server from dconnuri")); - virURIFree(tempuri); + } + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || + virTypedParamsGetULLong(params, nparams, + VIR_MIGRATE_PARAM_BANDWIDTH, &bandwidth) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, &miguri) < 0) { return -1; } - virURIFree(tempuri); - if (useParams) { - VIR_DEBUG("Using migration protocol 3 with extensible parameters"); - return domain->conn->driver->domainMigratePerform3Params - (domain, dconnuri, params, nparams, - NULL, 0, NULL, NULL, flags); - } else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_V3)) { - VIR_DEBUG("Using migration protocol 3"); - return domain->conn->driver->domainMigratePerform3 - (domain, xmlin, NULL, 0, NULL, NULL, dconnuri, - uri, flags, dname, bandwidth); - } else { - VIR_DEBUG("Using migration protocol 2"); - if (xmlin) { + /* see explanation in correspondent part of virDomainMigrateToURI */ + if ((flags & VIR_MIGRATE_PEER2PEER)) { + if (miguri) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("Unable to change target guest XML during " - "migration")); + _("Migration does not support some of parameters.")); return -1; } - if (uri) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to override peer2peer migration URI")); - return -1; - } - return domain->conn->driver->domainMigratePerform - (domain, NULL, 0, dconnuri, flags, dname, bandwidth); + duri = dconnuri; + } else { + duri = miguri; } -} + VIR_DEBUG("Using migration protocol 2"); + return domain->conn->driver->domainMigratePerform + (domain, + NULL, /* cookie */ + 0, /* cookielen */ + duri, flags, dname, bandwidth); +} static int -virDomainMigratePeer2Peer(virDomainPtr domain, - const char *xmlin, - unsigned long flags, - const char *dname, - const char *dconnuri, - const char *uri, - unsigned long bandwidth) +virDomainMigrateCheckNotLocal(const char *dconnuri) { - return virDomainMigratePeer2PeerFull(domain, dconnuri, xmlin, dname, uri, - bandwidth, NULL, 0, false, flags); -} + virURIPtr tempuri = NULL; + int ret = -1; + + if (!(tempuri = virURIParse(dconnuri))) + goto cleanup; + if (!tempuri->server || STRPREFIX(tempuri->server, "localhost")) { + virReportInvalidArg(dconnuri, "%s", + _("Attempt to migrate guest to the same host %s")); + goto cleanup; + } + ret = 0; + cleanup: -static int -virDomainMigratePeer2PeerParams(virDomainPtr domain, - const char *dconnuri, - virTypedParameterPtr params, - int nparams, - unsigned int flags) -{ - return virDomainMigratePeer2PeerFull(domain, dconnuri, NULL, NULL, NULL, 0, - params, nparams, true, flags); + virURIFree(tempuri); + return ret; } - /* * In normal migration, the libvirt client co-ordinates communication * between the 2 libvirtd instances on source & dest hosts. * - * Some hypervisors support an alternative, direct migration where - * there is no requirement for a libvirtd instance on the dest host. - * In this case - * - * eg, XenD can talk direct to XenD, so libvirtd on dest does not - * need to be involved at all, or even running + * In this peer-2-peer migration alternative, the libvirt client + * only talks to the source libvirtd instance. The source libvirtd + * then opens its own connection to the destination and co-ordinates + * migration itself. */ static int -virDomainMigrateDirect(virDomainPtr domain, - const char *xmlin, - unsigned long flags, - const char *dname, - const char *uri, - unsigned long bandwidth) +virDomainMigrateToURI_(virDomainPtr domain, + const char *dconnuri, + virTypedParameterPtr params, + int nparams, + unsigned int flags) { - VIR_DOMAIN_DEBUG(domain, - "xmlin=%s, flags=%lx, dname=%s, uri=%s, bandwidth=%lu", - NULLSTR(xmlin), flags, NULLSTR(dname), NULLSTR(uri), - bandwidth); + int ret = -1; - if (!domain->conn->driver->domainMigratePerform) { - virReportUnsupportedError(); - return -1; + /* First checkout the source */ + virCheckDomainReturn(domain, -1); + virCheckReadOnlyGoto(domain->conn->flags, cleanup); + + VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_NON_SHARED_DISK, + VIR_MIGRATE_NON_SHARED_INC, + cleanup); + + if (flags & VIR_MIGRATE_OFFLINE && + !VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("offline migration is not supported by " + "the source host")); + goto cleanup; } - /* Perform the migration. The driver isn't supposed to return - * until the migration is complete. - */ - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_V3)) { - VIR_DEBUG("Using migration protocol 3"); - /* dconn URI not relevant in direct migration, since no - * target libvirtd is involved */ - return domain->conn->driver->domainMigratePerform3(domain, - xmlin, - NULL, /* cookiein */ - 0, /* cookieinlen */ - NULL, /* cookieoutlen */ - NULL, /* cookieoutlen */ - NULL, /* dconnuri */ - uri, - flags, - dname, - bandwidth); + if (flags & VIR_MIGRATE_PEER2PEER) { + if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_P2P)) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Peer-to-peer migration is not supported by " + "the connection driver")); + goto cleanup; + } + if (virDomainMigrateCheckNotLocal(dconnuri)) + goto cleanup; + } else { - VIR_DEBUG("Using migration protocol 2"); - if (xmlin) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("Unable to change target guest XML during migration")); - return -1; + if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_DIRECT)) { + /* Cannot do a migration with only the perform step */ + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("Direct migration is not supported by the" + " connection driver")); + goto cleanup; } - return domain->conn->driver->domainMigratePerform(domain, - NULL, /* cookie */ - 0, /* cookielen */ - uri, - flags, - dname, - bandwidth); + + VIR_DEBUG("Using direct migration"); } -} + /* for some reason direct migration is not supported thru migration + with extensible parameters */ + if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_PARAMS) && + domain->conn->driver->domainMigratePerform3Params && + (flags & VIR_MIGRATE_PEER2PEER)) { + VIR_DEBUG("Using migration protocol 3 with extensible parameters"); + ret = domain->conn->driver->domainMigratePerform3Params + (domain, dconnuri, params, nparams, + NULL, /* cookiein */ + 0, /* cookieinlen */ + NULL, /* cookieoutlen */ + NULL, /* cookieoutlen */ + flags); + } else if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, + VIR_DRV_FEATURE_MIGRATION_V3) && + domain->conn->driver->domainMigratePerform3) { + ret = virDomainMigrateURIproto3(domain, dconnuri, params, nparams, flags); + } else if (domain->conn->driver->domainMigratePerform) { + ret = virDomainMigrateURIproto1(domain, dconnuri, params, nparams, flags); + } else { + virReportUnsupportedError(); + } + + cleanup: + return ret; +} /** * virDomainMigrate: @@ -3594,29 +3622,22 @@ virDomainMigrate(virDomainPtr domain, } if (flags & VIR_MIGRATE_PEER2PEER) { - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_P2P)) { - char *dstURI = NULL; - if (uri == NULL) { - dstURI = virConnectGetURI(dconn); - if (!dstURI) - return NULL; - } + char *dstURI = NULL; + if (uri == NULL) { + dstURI = virConnectGetURI(dconn); + if (!dstURI) + return NULL; + } - VIR_DEBUG("Using peer2peer migration"); - if (virDomainMigratePeer2Peer(domain, NULL, flags, dname, - uri ? uri : dstURI, NULL, bandwidth) < 0) { - VIR_FREE(dstURI); - goto error; - } + VIR_DEBUG("Using peer2peer migration"); + if (virDomainMigrateToURI(domain, uri ? uri : dstURI, flags, + dname, bandwidth) < 0) { VIR_FREE(dstURI); - - ddomain = virDomainLookupByName(dconn, dname ? dname : domain->name); - } else { - /* This driver does not support peer to peer migration */ - virReportUnsupportedError(); goto error; } + VIR_FREE(dstURI); + + ddomain = virDomainLookupByName(dconn, dname ? dname : domain->name); } else { /* Change protection requires support only on source side, and * is only needed in v3 migration, which automatically re-adds @@ -3825,8 +3846,8 @@ virDomainMigrate2(virDomainPtr domain, return NULL; VIR_DEBUG("Using peer2peer migration"); - if (virDomainMigratePeer2Peer(domain, dxml, flags, dname, - dstURI, uri, bandwidth) < 0) { + if (virDomainMigrateToURI2(domain, dstURI, uri, dxml, flags, dname, + bandwidth) < 0) { VIR_FREE(dstURI); goto error; } @@ -4099,7 +4120,6 @@ virDomainMigrate3(virDomainPtr domain, return NULL; } - /** * virDomainMigrateToURI: * @domain: a domain object @@ -4178,65 +4198,45 @@ virDomainMigrateToURI(virDomainPtr domain, const char *dname, unsigned long bandwidth) { + virTypedParameterPtr params = NULL; + int nparams = 0; + int maxparams = 0; + int ret = -1; + const char *dconnuri = NULL; + VIR_DOMAIN_DEBUG(domain, "duri=%p, flags=%lx, dname=%s, bandwidth=%lu", NULLSTR(duri), flags, NULLSTR(dname), bandwidth); virResetLastError(); - /* First checkout the source */ - virCheckDomainReturn(domain, -1); - virCheckReadOnlyGoto(domain->conn->flags, error); - - virCheckNonNullArgGoto(duri, error); - - VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_NON_SHARED_DISK, - VIR_MIGRATE_NON_SHARED_INC, - error); - - if (flags & VIR_MIGRATE_OFFLINE && - !VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_OFFLINE)) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("offline migration is not supported by " - "the source host")); - goto error; - } + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_DEST_NAME, dname) < 0 || + virTypedParamsAddULLong(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_BANDWIDTH, bandwidth) < 0) + goto cleanup; + /* Later versions of migration to uri interface use 2 uris, dconnuri and miguri. + And they have different meaning in p2p and direct case. In p2p case + dconnuri has meaining of duri and must be set while miguri is optional. + In direct case miguri has meaning of duri and dconnuri is not used. We follow + this conventions here. */ if (flags & VIR_MIGRATE_PEER2PEER) { - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_P2P)) { - VIR_DEBUG("Using peer2peer migration"); - if (virDomainMigratePeer2Peer(domain, NULL, flags, - dname, duri, NULL, bandwidth) < 0) - goto error; - } else { - /* No peer to peer migration supported */ - virReportUnsupportedError(); - goto error; - } + dconnuri = duri; } else { - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_DIRECT)) { - VIR_DEBUG("Using direct migration"); - if (virDomainMigrateDirect(domain, NULL, flags, - dname, duri, bandwidth) < 0) - goto error; - } else { - /* Cannot do a migration with only the perform step */ - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("direct migration is not supported by the" - " connection driver")); - goto error; - } + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_URI, duri) < 0) + goto cleanup; } - return 0; + ret = virDomainMigrateToURI_(domain, dconnuri, params, nparams, flags); - error: - virDispatchError(domain->conn); - return -1; -} + cleanup: + virTypedParamsFree(params, nparams); + if (ret) + virDispatchError(domain->conn); + return ret; +} /** * virDomainMigrateToURI2: @@ -4333,6 +4333,11 @@ virDomainMigrateToURI2(virDomainPtr domain, const char *dname, unsigned long bandwidth) { + int ret = -1; + virTypedParameterPtr params = NULL; + int nparams = 0; + int maxparams = 0; + VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, miguri=%s, dxml=%s, " "flags=%lx, dname=%s, bandwidth=%lu", NULLSTR(dconnuri), NULLSTR(miguri), NULLSTR(dxml), @@ -4340,47 +4345,25 @@ virDomainMigrateToURI2(virDomainPtr domain, virResetLastError(); - /* First checkout the source */ - virCheckDomainReturn(domain, -1); - virCheckReadOnlyGoto(domain->conn->flags, error); + if (virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_URI, miguri) < 0 || + virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_DEST_NAME, dname) < 0 || + virTypedParamsAddString(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_DEST_XML, dxml) < 0 || + virTypedParamsAddULLong(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_BANDWIDTH, bandwidth) < 0) + goto cleanup; - VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_NON_SHARED_DISK, - VIR_MIGRATE_NON_SHARED_INC, - error); + ret = virDomainMigrateToURI_(domain, dconnuri, params, nparams, flags); - if (flags & VIR_MIGRATE_PEER2PEER) { - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_P2P)) { - VIR_DEBUG("Using peer2peer migration"); - if (virDomainMigratePeer2Peer(domain, dxml, flags, - dname, dconnuri, miguri, bandwidth) < 0) - goto error; - } else { - /* No peer to peer migration supported */ - virReportUnsupportedError(); - goto error; - } - } else { - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_DIRECT)) { - VIR_DEBUG("Using direct migration"); - if (virDomainMigrateDirect(domain, dxml, flags, - dname, miguri, bandwidth) < 0) - goto error; - } else { - /* Cannot do a migration with only the perform step */ - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("direct migration is not supported by the" - " connection driver")); - goto error; - } - } + cleanup: + virTypedParamsFree(params, nparams); - return 0; + if (ret) + virDispatchError(domain->conn); - error: - virDispatchError(domain->conn); - return -1; + return ret; } @@ -4428,99 +4411,16 @@ virDomainMigrateToURI3(virDomainPtr domain, unsigned int nparams, unsigned int flags) { - bool compat; - const char *compatParams[] = { VIR_MIGRATE_PARAM_URI, - VIR_MIGRATE_PARAM_DEST_NAME, - VIR_MIGRATE_PARAM_DEST_XML, - VIR_MIGRATE_PARAM_BANDWIDTH }; - const char *uri = NULL; - const char *dname = NULL; - const char *dxml = NULL; - unsigned long long bandwidth = 0; - + int ret = -1; VIR_DOMAIN_DEBUG(domain, "dconnuri=%s, params=%p, nparms=%u flags=%x", NULLSTR(dconnuri), params, nparams, flags); VIR_TYPED_PARAMS_DEBUG(params, nparams); virResetLastError(); + if ((ret = virDomainMigrateToURI_(domain, dconnuri, params, nparams, flags)) < 0) + virDispatchError(domain->conn); - /* First checkout the source */ - virCheckDomainReturn(domain, -1); - virCheckReadOnlyGoto(domain->conn->flags, error); - - VIR_EXCLUSIVE_FLAGS_GOTO(VIR_MIGRATE_NON_SHARED_DISK, - VIR_MIGRATE_NON_SHARED_INC, - error); - - compat = virTypedParamsCheck(params, nparams, compatParams, - ARRAY_CARDINALITY(compatParams)); - - if (virTypedParamsGetString(params, nparams, - VIR_MIGRATE_PARAM_URI, &uri) < 0 || - virTypedParamsGetString(params, nparams, - VIR_MIGRATE_PARAM_DEST_NAME, &dname) < 0 || - virTypedParamsGetString(params, nparams, - VIR_MIGRATE_PARAM_DEST_XML, &dxml) < 0 || - virTypedParamsGetULLong(params, nparams, - VIR_MIGRATE_PARAM_BANDWIDTH, &bandwidth) < 0) { - goto error; - } - - if (flags & VIR_MIGRATE_PEER2PEER) { - if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_P2P)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("Peer-to-peer migration is not supported by " - "the connection driver")); - goto error; - } - - if (VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_PARAMS)) { - VIR_DEBUG("Using peer2peer migration with extensible parameters"); - if (virDomainMigratePeer2PeerParams(domain, dconnuri, params, - nparams, flags) < 0) - goto error; - } else if (compat) { - VIR_DEBUG("Using peer2peer migration"); - if (virDomainMigratePeer2Peer(domain, dxml, flags, dname, - dconnuri, uri, bandwidth) < 0) - goto error; - } else { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("Peer-to-peer migration with extensible " - "parameters is not supported but extended " - "parameters were passed")); - goto error; - } - } else { - if (!VIR_DRV_SUPPORTS_FEATURE(domain->conn->driver, domain->conn, - VIR_DRV_FEATURE_MIGRATION_DIRECT)) { - /* Cannot do a migration with only the perform step */ - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("Direct migration is not supported by the" - " connection driver")); - goto error; - } - - if (!compat) { - virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", - _("Direct migration does not support extensible " - "parameters")); - goto error; - } - - VIR_DEBUG("Using direct migration"); - if (virDomainMigrateDirect(domain, dxml, flags, - dname, uri, bandwidth) < 0) - goto error; - } - - return 0; - - error: - virDispatchError(domain->conn); - return -1; + return ret; } -- 1.7.1

4 4

[libvirt] [PATCH v2 0/3] Implement mockup capabilities cache in QEMU tests
by Pavel Fedin 09 Sep '15

09 Sep '15

Since commit e8d55172544c1fafe31a9e09346bdebca4f0d6f9 qemu driver checks emulator capabilities during domain XML post-parse. However, test suite does not initialize it, therefore a condition to skip all checks if there is no cache supplied was added. This is actually a hack, whose sole purpose is to make existing test suite working. Additionally, it prevents from writing new tests for this particular functionality. This series solves this problem by implementing proper cache mockup in test suite. The main idea is to create a cache in standard way and put there pre-defined capabilities sets (which tests already have). In this implementation we introduce "test capability sets", which are named entities. virQEMUCapsCacheLookup() now has a test mode, which is enabled by setting qemuTestCapsName variable to the name of capability set which we want to use in current test. This is based on Martin Kletzander's idea to implement test mode with assertions. Currently, since name of capability set is different from /usr/bin/something, we will get errors if we try to do something with the host filesystem. This is achieved by setting cacheDir and libDir of our mockup cache to "/dev/null". The concept of using named capability sets allows us to further improve the test suite. Now it is possibe to get rid of hardcoded capability sets and replace them with XML files, readable by virQEMUCapsInitCached(). This will allow us to better exercise our capabilities parser. Taking this into account, qemuTestCapsCacheInsert() is actually temporary. It will not be needed any more when capabilities are moved to XML files. Additionally, some small refactoring is done, and common driver initialization and cleanup sequence is put into two functions: qemuTestDriverInit() and qemuTestDriverFree(). V1 => V2 - Fix also domainsnapshotxml2xmltest RFC => v1 - Major rework, almost everything changed. Pavel Fedin (3): Implement infrastracture for mocking up QEMU capabilities cache Use mockup cache Removed unneeded check src/qemu/qemu_capabilities.c | 16 +++++----- src/qemu/qemu_capspriv.h | 36 +++++++++++++++++++++++ src/qemu/qemu_domain.c | 5 +--- tests/domainsnapshotxml2xmltest.c | 15 +++++----- tests/qemuagenttest.c | 18 ++++++++---- tests/qemuargv2xmltest.c | 19 ++++++------ tests/qemuhotplugtest.c | 32 ++++++++++---------- tests/qemuxml2argvtest.c | 17 +++++------ tests/qemuxml2xmltest.c | 16 ++++++---- tests/qemuxmlnstest.c | 17 ++++++----- tests/testutilsqemu.c | 62 +++++++++++++++++++++++++++++++++++++++ tests/testutilsqemu.h | 9 ++++++ 12 files changed, 190 insertions(+), 72 deletions(-) mode change 100644 => 100755 src/qemu/qemu_capabilities.c create mode 100644 src/qemu/qemu_capspriv.h mode change 100644 => 100755 tests/qemuagenttest.c mode change 100644 => 100755 tests/qemuargv2xmltest.c mode change 100644 => 100755 tests/qemuhotplugtest.c mode change 100644 => 100755 tests/qemuxml2argvtest.c mode change 100644 => 100755 tests/qemuxml2xmltest.c mode change 100644 => 100755 tests/qemuxmlnstest.c mode change 100644 => 100755 tests/testutilsqemu.c mode change 100644 => 100755 tests/testutilsqemu.h -- 2.1.4

1 3

[libvirt] [PATCH 0/2] Recursively lock backing chain
by Michal Privoznik 09 Sep '15

09 Sep '15

This is how I tested the feature: Create couple of disks: qemu-img create -f qcow2 /var/lib/libvirt/images/test1.qcow2 1G qemu-img create -f qcow2 /var/lib/libvirt/images/test2.qcow2 -b /var/lib/libvirt/images/test1.qcow2 qemu-img create -f qcow2 /var/lib/libvirt/images/test3.qcow2 -b /var/lib/libvirt/images/test1.qcow2 Then adjust configuration of two domains: virsh # domblklist gentoo Target Source ------------------------------------------------ fda /var/lib/libvirt/images/fd.img vda /var/lib/libvirt/images/gentoo.qcow2 vdb /var/lib/libvirt/images/test1.qcow2 hdc /home/zippy/tmp/install-amd64-minimal-20150402.iso virsh # domblklist fedora Target Source ------------------------------------------------ sda /var/lib/libvirt/images/fedora.qcow2 sdb /var/lib/libvirt/images/test2.qcow2 hda - With this configuration, fedora and gentoo should not be able to run at the same time: virsh # start fedora Domain fedora started virsh # start gentoo error: Failed to start domain gentoo error: resource busy: Lockspace resource '/var/lib/libvirt/images/test1.qcow2' is locked Cool! But with slight change, gentoo should be able to run: virsh # domblklist gentoo Target Source ------------------------------------------------ fda /var/lib/libvirt/images/fd.img vda /var/lib/libvirt/images/gentoo.qcow2 vdb /var/lib/libvirt/images/test3.qcow2 hdc /home/zippy/tmp/install-amd64-minimal-20150402.iso virsh # start gentoo Domain gentoo started virsh # list Id Name State ---------------------------------------------------- 10 fedora running 11 gentoo running Awesome! Michal Privoznik (2): qemuProcessStart: Parse backingStore for all disks virDomainLockManagerAddImage: Recursively lock backing chain src/locking/domain_lock.c | 53 +++++++++++++++++++++++++++++------------------ src/qemu/qemu_domain.c | 11 +++------- src/qemu/qemu_process.c | 6 +++++- 3 files changed, 41 insertions(+), 29 deletions(-) -- 2.4.6

4 10

[libvirt] Who wants to mentor for Outreachy Dec-Mar?
by Stefan Hajnoczi 09 Sep '15

09 Sep '15

We are now looking for mentors for the next round of Outreachy running from December 7, 2015 to March 7, 2016. I have set up a wiki page here: http://qemu-project.org/Outreachy_2015_DecemberMarch Our communities have participated in previous years to mentor people from underrepresented groups and help them get involved in open source software. To learn more, see the Outreachy website: https://www.gnome.org/outreachy/ If you are a regular contributor to QEMU, libvirt, or the KVM kernel module then you can become an Outreachy mentor. Information on what's involved is here: https://wiki.gnome.org/Outreachy/Admin/InfoForMentors Mentoring summary: 1. Post your project ideas here: http://qemu-project.org/Outreachy_2015_DecemberMarch 2. You give each applicant a different small task so they can submit a patch upstream. You also interview promising candidates on IRC to get a better picture. Then you select a candidate you wish to work with (or none). 3. Requires 5 hours/week from December 2015 to March 2016 to mentor your intern, review their code, answer their questions, etc. If you'd like to become a mentor, please let me know. We are also looking for sponsors who wish to fund Outreachy interns for QEMU, libvirt, and the KVM kernel module. The sponsorship for one intern is $6,500. Learn more about sponsorship: https://wiki.gnome.org/Outreachy/Admin/InfoForOrgs Stefan

2 2

[libvirt] [PATCH] Revert "docs: Drop unused rule for internals/%.html.tmp target"
by Martin Kletzander 09 Sep '15

09 Sep '15

This reverts commit e5470dd0e0a5be02cbf18a882cfc676b39d1c1a5. This has been ACK'd by the original author in the original mail thread: https://www.redhat.com/archives/libvir-list/2015-September/msg00310.html The reason to revert this is due to the patch breaking the generation of internal subsites. The original issue still needs to be dealt with, though. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- configure.ac | 1 - docs/Makefile.am | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ef7fbdbed32c..03463b048c3c 100644 --- a/configure.ac +++ b/configure.ac @@ -2777,7 +2777,6 @@ AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash] AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash]) AC_DEFINE_UNQUOTED([base64_encode_alloc],[libvirt_gl_base64_encode_alloc],[Hack to avoid symbol clash]) -AC_CONFIG_COMMANDS([mkdir], [$MKDIR_P docs/internals]) AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ diff --git a/docs/Makefile.am b/docs/Makefile.am index 263daae448ca..bfae35e0ddba 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -218,6 +218,15 @@ $(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 + @if [ -x $(XSLTPROC) ] ; then \ + echo "Generating $@"; \ + $(MKDIR_P) internals; \ + name=`echo $@ | sed -e 's/.tmp//'`; \ + $(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 $@"; \ -- 2.5.1

1 0

[libvirt] [PATCH v2] Ignore virtio-mmio disks in qemuAssignDevicePCISlots()
by Pavel Fedin 09 Sep '15

09 Sep '15

Fixes the following error when attempting to add a disk with bus='virtio' to a machine which actually supports virtio-mmio (caught with ARM virt): virtio disk cannot have an address of type 'virtio-mmio' The problem has been likely introduced by e8d55172544c1fafe31a9e09346bdebca4f0d6f9. Before that qemuAssignDevicePCISlots() was never called for ARM "virt" machine. Signed-off-by: Pavel Fedin <p.fedin(a)samsung.com> --- v1 => v2 - Added check for QEMU_CAPS_DEVICE_VIRTIO_MMIO, this leaves the error message for machines which actually do not support virtio-mmio. In this case the user may still attempt to add such a disk manually. --- src/qemu/qemu_command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ec5e3d4..db21ee9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2598,6 +2598,12 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) continue; + /* Also ignore virtio-mmio disks if our machine allows them */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO) && + def->disks[i]->info.type == + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) + continue; + if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("virtio disk cannot have an address of type '%s'"), -- 1.9.5.msysgit.0

3 4

[libvirt] [sandbox PATCH v4 00/21] *** virt-sandbox-image v4 ***
by Eren Yagdiran 09 Sep '15

09 Sep '15

Hi, Running sandbox now has its own disk layer. virt-sandbox now using GHashMap to store key value pairs for environment variables and some minor changes. Daniel P Berrange (1): Add virt-sandbox-image Eren Yagdiran (20): Fix virt-sandbox-image Image: Add Hooking Mechanism Image: virt-sandbox-image default dir constants Image: Discard caching bytecode Image: Add check_writable and runtime resolver Image: Add download function Image: Refactor create function Image: Add delete function Image: Add get_command function to Source Image: Add run args Image: Add check_connect function Image: Add get_disk function to Source Image: Add run function Image: Add network support Image: Add Volume Support Image: man file for virt-sandbox-image Add config for environment variables Add environment parameter to virt-sandbox init-common: Exporting custom environment variables Image: Add custom environment support .gitignore | 1 + bin/Makefile.am | 21 +- bin/virt-sandbox-image.in | 3 + bin/virt-sandbox-image.pod | 172 +++++++++++ bin/virt-sandbox.c | 14 + configure.ac | 2 + libvirt-sandbox/libvirt-sandbox-config.c | 171 ++++++++++- libvirt-sandbox/libvirt-sandbox-config.h | 13 + libvirt-sandbox/libvirt-sandbox-init-common.c | 18 ++ libvirt-sandbox/libvirt-sandbox.sym | 6 + libvirt-sandbox/tests/test-config.c | 10 + po/POTFILES.in | 1 + virt-sandbox-image/Makefile.am | 14 + virt-sandbox-image/sources/DockerSource.py | 419 ++++++++++++++++++++++++++ virt-sandbox-image/sources/Source.py | 55 ++++ virt-sandbox-image/sources/__init__.py | 26 ++ virt-sandbox-image/virt-sandbox-image.py | 306 +++++++++++++++++++ 17 files changed, 1247 insertions(+), 5 deletions(-) create mode 100644 bin/virt-sandbox-image.in create mode 100644 bin/virt-sandbox-image.pod create mode 100644 virt-sandbox-image/Makefile.am create mode 100644 virt-sandbox-image/sources/DockerSource.py create mode 100644 virt-sandbox-image/sources/Source.py create mode 100644 virt-sandbox-image/sources/__init__.py create mode 100755 virt-sandbox-image/virt-sandbox-image.py -- 2.1.0

3 44

[libvirt] [PATCH v2 0/2] Improve domblklist for network disks
by Michal Privoznik 09 Sep '15

09 Sep '15

This is a v2 to original proposal: https://www.redhat.com/archives/libvir-list/2015-August/msg01021.html Lin Ma (1): virsh: Enhance the detailed output of domblklist for networked source Michal Privoznik (1): virsh: Slightly rework cmdDomblklist tools/virsh-domain-monitor.c | 93 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 73 insertions(+), 20 deletions(-) -- 2.4.6

5 16

[libvirt] [PATCH] qemu: migration: Relax enforcement of memory hotplug support
by Peter Krempa 09 Sep '15

09 Sep '15

If the current live definition does not have memory hotplug enabled, but the persistent one does libvirt would reject migration if the destination does not support memory hotplug even if the user didn't want to persist the VM at the destination and thus the XML containing the memory hotplug definition would not be used. To fix this corner case the code will check for memory hotplug in the newDef only if VIR_MIGRATE_PERSIST_DEST was used. --- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d50d367..1846239 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2989,7 +2989,8 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, } if (vm->def->mem.max_memory || - (vm->newDef && + ((flags & VIR_MIGRATE_PERSIST_DEST) && + vm->newDef && vm->newDef->mem.max_memory)) cookieFlags |= QEMU_MIGRATION_COOKIE_MEMORY_HOTPLUG; -- 2.4.5

2 2

[libvirt] [PATCH] docs: Drop unused rule for internals/%.html.tmp target
by Guido Günther 09 Sep '15

09 Sep '15

We're using the %.html.tmp for all html files now so drop the unused one and rather make sure the needed directory exists. This fixes build failures as described in https://www.redhat.com/archives/libvir-list/2015-August/msg00603.html --- configure.ac | 1 + docs/Makefile.am | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 9066ed6..749dbb7 100644 --- a/configure.ac +++ b/configure.ac @@ -2774,6 +2774,7 @@ AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash] AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash]) AC_DEFINE_UNQUOTED([base64_encode_alloc],[libvirt_gl_base64_encode_alloc],[Hack to avoid symbol clash]) +AC_CONFIG_COMMANDS([mkdir], [$MKDIR_P docs/internals]) AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_CONFIG_FILES([\ diff --git a/docs/Makefile.am b/docs/Makefile.am index daf37b6..563baca 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -218,15 +218,6 @@ $(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 - @if [ -x $(XSLTPROC) ] ; then \ - echo "Generating $@"; \ - $(MKDIR_P) internals; \ - name=`echo $@ | sed -e 's/.tmp//'`; \ - $(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 $@"; \ -- 2.1.4

3 12

[libvirt] [PATCH] Ignore virtio-mmio disks in qemuAssignDevicePCISlots()
by Pavel Fedin 09 Sep '15

09 Sep '15

Fixes the following error when attempting to add a disk with bus='virtio': virtio only support device address type 'PCI' Signed-off-by: Pavel Fedin <p.fedin(a)samsung.com> --- src/qemu/qemu_command.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 38104da..408b249 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2189,12 +2189,14 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, if (def->disks[i]->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) continue; - /* don't touch s390 devices */ + /* don't touch s390 and virtio-mmio devices */ if (def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI || def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 || def->disks[i]->info.type == - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW || + def->disks[i]->info.type == + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) continue; if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { -- 1.9.5.msysgit.0

2 4

[libvirt] [PATCHv2] qemu: Validate address type when attaching a disk device.
by Ruifeng Bian 09 Sep '15

09 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1257844 Attach-device can hotplug a virtio disk device with any address type now, it need to validate the address type before the attachment. Coldplug a scsi disk device without checking the address type in current version, this patch also fix the scsi disk problem. --- src/qemu/qemu_driver.c | 8 ++++++++ src/qemu/qemu_hotplug.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 91eb661..af926fc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8050,6 +8050,14 @@ qemuDomainAttachDeviceConfig(virQEMUCapsPtr qemuCaps, if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) if (virDomainDefAddImplicitControllers(vmdef) < 0) return -1; + /* scsi disk should have an address type of driver */ + if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && + (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("scsi disk cannot have an address of type '%s'"), + virDomainDeviceAddressTypeToString(disk->info.type)); + return -1; + } if (qemuDomainAssignAddresses(vmdef, qemuCaps, NULL) < 0) return -1; break; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 63fafa6..4226650 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -335,6 +335,24 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (!qemuCheckCCWS390AddressSupport(vm->def, disk->info, priv->qemuCaps, disk->dst)) goto cleanup; + + /* virtio device should either have a ccw or pci address */ + if (qemuDomainMachineIsS390CCW(vm->def) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid CCW address")); + goto cleanup; + } + } else { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid PCI address")); + goto cleaup; + } + } } for (i = 0; i < vm->def->ndisks; i++) { -- 2.4.3

2 2

[libvirt] [PATCH] Allow execute access to /var/lib/libvirt/qemu/ for others
by Martin Kletzander 09 Sep '15

09 Sep '15

Commit f1f68ca33433 tried fixing running multiple domains under various users, but if the user can't browse the directory, it's hard for the qemu running under that user to create the monitor socket. The permissions need to be fixed in two places due to support for both installations with and without driver modules. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1146886 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- This is not a problem for non-rpm installs because normal make install will not change the permissions, it will just create the directory, so it has 0755, but that difference is not something I'm trying to fix in this patch. libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index bb8bfc3c25c1..48461e865dc8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2002,7 +2002,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug @@ -2110,7 +2110,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu %ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ -%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ +%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug -- 2.5.1

2 2

[libvirt] [PATCH] qemu: Report error if per-VM directory cannot be created
by Martin Kletzander 08 Sep '15

08 Sep '15

Commit f1f68ca33433 did not report an error if virFileMakePath() returned -1. Well, who would've guessed function with name starting with 'vir' sets an errno instead of reporting an error the libvirt way. Anyway, let's fix it, so the output changes from: $ virsh start arm error: Failed to start domain arm error: An error occurred, but the cause is unknown to: $ virsh start arm error: Failed to start domain arm error: Cannot create directory '/var/lib/libvirt/qemu/domain-arm': Not a directory Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1146886 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_process.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f7eb2b609437..d9a0942c4dfd 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4734,8 +4734,10 @@ int qemuProcessStart(virConnectPtr conn, if (virAsprintf(&tmppath, "%s/domain-%s", cfg->libDir, vm->def->name) < 0) goto cleanup; - if (virFileMakePath(tmppath) < 0) + if (virFileMakePath(tmppath) < 0) { + virReportSystemError(errno, _("Cannot create directory '%s'"), tmppath); goto cleanup; + } if (virSecurityManagerDomainSetDirLabel(driver->securityManager, vm->def, tmppath) < 0) @@ -4747,8 +4749,10 @@ int qemuProcessStart(virConnectPtr conn, cfg->channelTargetDir, vm->def->name) < 0) goto cleanup; - if (virFileMakePath(tmppath) < 0) + if (virFileMakePath(tmppath) < 0) { + virReportSystemError(errno, _("Cannot create directory '%s'"), tmppath); goto cleanup; + } if (virSecurityManagerDomainSetDirLabel(driver->securityManager, vm->def, tmppath) < 0) -- 2.5.1

2 1

[libvirt] [PATCH] Distribute only generated virkeymaps.h
by Martin Kletzander 08 Sep '15

08 Sep '15

We are distributing virkeymaps.h and all the tools needed to rebuild that file. On top of that, we are generating that file into the $(srcdir) and that sometimes fails for me when trying to do make dist in VPATH on rawhide fedora. And we don't clean the file when maintainer-clean make target is requested. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 429137561c6f..c2784af299dc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -173,15 +173,13 @@ UTIL_SOURCES = \ $(NULL) -EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \ - $(srcdir)/util/virkeycode-mapgen.py - BUILT_SOURCES += util/virkeymaps.h +MAINTAINERCLEANFILES += util/virkeymaps.h util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ - <$(srcdir)/util/keymaps.csv >$(srcdir)/util/virkeymaps.h + <$(srcdir)/util/keymaps.csv >util/virkeymaps.h # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c nodeinfopriv.h -- 2.5.1

2 3

[libvirt] [PATCH] util: Add win32 version of virFileUnlink
by Martin Kletzander 08 Sep '15

08 Sep '15

Commit 35847860f65f Added the virFileUnlink function, but failed to add a version for mingw build, causing the following error: Cannot export virFileUnlink: symbol not defined Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virfile.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index 408d2d912f13..75819d9c8bd7 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2637,6 +2637,20 @@ virDirCreate(const char *path ATTRIBUTE_UNUSED, return -ENOSYS; } + +int +virFileUnlink(const char *path, + uid_t uid ATTRIBUTE_UNUSED, + gid_t gid ATTRIBUTE_UNUSED) +{ + if (unlink(path) < 0) { + virReportSystemError(errno, _("Unable to unlink path '%s'"), + path); + return -1; + } + + return 0; +} #endif /* WIN32 */ /** -- 2.5.1

3 3

[libvirt] [PATCH] docs: Remove last use of double semicolon in Makefile
by Martin Kletzander 08 Sep '15

08 Sep '15

Double semicolons have special meaning in makefiles, but they would have to be combined with other rules witch such separators in order to be used as intended. Since there are no other rules like that, let's clean it up. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index daf37b6b95de..bfae35e0ddba 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -204,7 +204,7 @@ todo: rm -f todo.html.in $(MAKE) todo.html -hvsupport.html:: $(srcdir)/hvsupport.html.in +hvsupport.html: $(srcdir)/hvsupport.html.in $(srcdir)/hvsupport.html.in: $(srcdir)/hvsupport.pl $(api_DATA) \ $(top_srcdir)/src/libvirt_public.syms \ -- 2.5.1

2 1

[libvirt] [PATCH] conf: fix crash when parse a disordered numa settings
by Luyao Huang 08 Sep '15

08 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1260846 Introduced by 8fedbbdb, if we parse the disordered numa cell, will get segfault. This is because we allow parse the numa cell not in order and we alloc them before the parse loop, the cpumask maybe NULL when parse each numa cell. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/numa_conf.c | 10 +++++--- .../qemuxml2argv-cpu-numa-disordered.xml | 26 +++++++++++++++++++ .../qemuxml2xmlout-cpu-numa-disordered.xml | 29 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 5c123b9..b5963ac 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -759,11 +759,15 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def, } VIR_FREE(tmp); - for (j = 0; j < i; j++) { + for (j = 0; j < n; j++) { + if (j == cur_cell || !def->mem_nodes[j].cpumask) + continue; + if (virBitmapOverlaps(def->mem_nodes[j].cpumask, - def->mem_nodes[i].cpumask)) { + def->mem_nodes[cur_cell].cpumask)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("NUMA cells %zu and %zu have overlapping vCPU ids"), i, j); + _("NUMA cells %u and %zu have overlapping vCPU ids"), + cur_cell, j); goto cleanup; } } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml new file mode 100644 index 0000000..ad31607 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disordered.xml @@ -0,0 +1,26 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>328650</memory> + <currentMemory unit='KiB'>328650</currentMemory> + <vcpu placement='static'>16</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu> + <topology sockets='2' cores='4' threads='2'/> + <numa> + <cell id='0' cpus='0-5' memory='109550' unit='KiB'/> + <cell id='2' cpus='6-10' memory='109550' unit='KiB'/> + <cell id='1' cpus='11-15' memory='109550' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml new file mode 100644 index 0000000..0a76f12 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disordered.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>328650</memory> + <currentMemory unit='KiB'>328650</currentMemory> + <vcpu placement='static'>16</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu> + <topology sockets='2' cores='4' threads='2'/> + <numa> + <cell id='0' cpus='0-5' memory='109550' unit='KiB'/> + <cell id='1' cpus='11-15' memory='109550' unit='KiB'/> + <cell id='2' cpus='6-10' memory='109550' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d41954e..5a20ebc 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -608,6 +608,7 @@ mymain(void) DO_TEST_DIFFERENT("cpu-numa1"); DO_TEST_DIFFERENT("cpu-numa2"); DO_TEST_DIFFERENT("cpu-numa-no-memory-element"); + DO_TEST_DIFFERENT("cpu-numa-disordered"); DO_TEST("cpu-numa-disjoint"); DO_TEST("cpu-numa-memshared"); -- 1.8.3.1

3 2

[libvirt] [PATCH] admin: Resolve leaked reference to private data
by Erik Skultety 08 Sep '15

08 Sep '15

Running valgrind on a very simplistic program consisting only from opening and closing admin connection (virAdmConnect{Open,Close}) shows a leak in remoteAdminPrivNew, because the last reference to privateData is not decremented, thus the object won't be disposed. This patch unrefs the privateData object once we closed the active connection to daemon, making further use of this connection useless. ==24577== at 0x4A089C7: calloc (in /usr/lib64/valgrind/vgpreload_***linux.so) ==24577== by 0x4E8835F: virAllocVar (viralloc.c:560) ==24577== by 0x4EDFA5C: virObjectNew (virobject.c:193) ==24577== by 0x4EDFBD4: virObjectLockableNew (virobject.c:219) ==24577== by 0x4C14DAF: remoteAdminPrivNew (libvirt-admin.c:152) ==24577== by 0x4C1537E: virAdmConnectOpen (libvirt-admin.c:308) ==24577== by 0x400BAD: main (listservers.c:39) ==24577== LEAK SUMMARY: ==24577== definitely lost: 80 bytes in 1 blocks ==24577== indirectly lost: 840 bytes in 6 blocks ==24577== possibly lost: 0 bytes in 0 blocks ==24577== still reachable: 12,179 bytes in 199 blocks ==24577== suppressed: 0 bytes in 0 blocks --- src/libvirt-admin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index b3fd0b3..5a4fc48 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -132,6 +132,7 @@ remoteAdminPrivFree(void *opaque) virAdmConnectPtr conn = opaque; remoteAdminConnectClose(conn); + virObjectUnref(conn->privateData); } static remoteAdminPrivPtr -- 2.4.3

2 2

[libvirt] [PATCH 0/3] vmx: Add handling for CDROM devices with SCSI passthru and other minor fixes
by Matthias Bolte 07 Sep '15

07 Sep '15

This patch series addresses this bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1172544 It's mean as a replacement for this patch: https://www.redhat.com/archives/libvir-list/2015-August/msg00970.html Matthias Bolte (3): vmx: Some whitespace cleanup vmx: The virVMXParseDisk deviceType can be NULL, add some missing checks vmx: Add handling for CDROM devices with SCSI passthru src/vmx/vmx.c | 81 ++++++++++++++------- tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.vmx | 6 ++ tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml | 24 +++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.vmx | 85 +++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml | 35 ++++++++++ tests/vmx2xmltest.c | 2 + tests/xml2vmxdata/xml2vmx-cdrom-scsi-passthru.vmx | 14 ++++ tests/xml2vmxdata/xml2vmx-cdrom-scsi-passthru.xml | 14 ++++ tests/xml2vmxdata/xml2vmx-esx-in-the-wild-7.vmx | 25 +++++++ tests/xml2vmxdata/xml2vmx-esx-in-the-wild-7.xml | 35 ++++++++++ tests/xml2vmxtest.c | 2 + 11 files changed, 296 insertions(+), 27 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-passthru.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-passthru.xml create mode 100644 tests/xml2vmxdata/xml2vmx-esx-in-the-wild-7.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-esx-in-the-wild-7.xml -- 1.9.1

2 9

[libvirt] [PATCH] virsh: Teach attach-interface to --print-xml
by Michal Privoznik 07 Sep '15

07 Sep '15

We have the same argument to many other commands that produce an XML based on what user typed. But unfortunately attach-interface was missing it. Maybe nobody hasn't needed it yet. Well, I did just now. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain.c | 20 ++++++++++++++++---- tools/virsh.pod | 4 ++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b029b65..516a51e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -862,6 +862,10 @@ static const vshCmdOptDef opts_attach_interface[] = { .type = VSH_OT_BOOL, .help = N_("affect current domain") }, + {.name = "print-xml", + .type = VSH_OT_BOOL, + .help = N_("print XML document rather than attach the interface") + }, {.name = NULL} }; @@ -938,9 +942,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) - return false; - if (persistent && virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_AFFECT_LIVE; @@ -1051,6 +1052,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) virBufferAddLit(&buf, "</bandwidth>\n"); } + virBufferAdjustIndent(&buf, -2); virBufferAddLit(&buf, "</interface>\n"); if (virBufferError(&buf)) { @@ -1060,6 +1062,15 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) xml = virBufferContentAndReset(&buf); + if (vshCommandOptBool(cmd, "print-xml")) { + vshPrint(ctl, "%s", xml); + functionReturn = true; + goto cleanup; + } + + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + goto cleanup; + if (flags || current) ret = virDomainAttachDeviceFlags(dom, xml, flags); else @@ -1075,7 +1086,8 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) } cleanup: - virDomainFree(dom); + if (dom) + virDomainFree(dom); virBufferFreeAndReset(&buf); return functionReturn; } diff --git a/tools/virsh.pod b/tools/virsh.pod index 83c445d3..0212e7a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2507,6 +2507,7 @@ Likewise, I<--shareable> is an alias for I<--mode shareable>. [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] [I<--inbound average,peak,burst,floor>] [I<--outbound average,peak,burst>] +[I<--print-xml>] Attach a new network interface to the domain. I<type> can be I<network> to indicate connection via a libvirt virtual network, or @@ -2536,6 +2537,9 @@ kilobytes in a single burst at I<peak> speed as described in the Network XML documentation at L<http://libvirt.org/formatnetwork.html#elementQoS>. +If I<--print-xml> is specified, then the XML of the interface that would be +attached is printed instead. + If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. If I<--current> is specified, affect the current domain state. -- 2.4.6

2 1

[libvirt] [PATCH sandbox 0/4] Fix data retention with QEMU sandboxes
by Daniel P. Berrange 07 Sep '15

07 Sep '15

In testing the docker sandbox patches I found that with QEMU sandboxes, we would randomly loose data written to the block device. This meant that after untar'ing the image contents into the qcow2 the filesystem was left empty! Eventually I realized that there was no where we are calling sync() to flush data out to disk. We never noticed this before because the sandbox code mostly used 9p filesystems with QEMU which do not need this sync(). Daniel P. Berrange (4): push changing of user ID down into child process Sync and unmount filesystems during shutdown Fix passing of strace option to guest kernel Don't close immediately when getting EOF on RPC console bin/virt-sandbox.c | 23 ++- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 7 +- libvirt-sandbox/libvirt-sandbox-init-common.c | 226 +++++++++++++++++++--- libvirt-sandbox/libvirt-sandbox-init-qemu.c | 3 +- 4 files changed, 225 insertions(+), 34 deletions(-) -- 2.4.3

2 8

[libvirt] [PATCHv3 0/2] Added waiting for DAD to finish for bridge address.
by Maxim Perevedentsev 07 Sep '15

07 Sep '15

This is a fix for commit db488c79173b240459c7754f38c3c6af9b432970 dnsmasq main process which is relied on when waiting for DAD to complete exits without actually waiting for DAD. This is dnsmasq daemon's task. It seems to be a race that DAD finished before dnsmasq main process exited. The above commit needs the execution to block until DAD finishes for bridge IPv6 address because then it closes dummy tap device. Thus we need to ensure this ourselves. So we periodically poll the kernel using netlink and check whether there are any IPv6 addresses assigned to bridge which have 'tentative' state. After DAD is finished, execution continues. I guess that is what dnsmasq was assumed to do. We use netlink to dump information about existing IPv6 addresses. Netlink's response is a multi-part message. Unfortunately, the current implementation of virNetlink treats such messages as faulty and throws an error. So the patch 2/2 adds multi-part nelink response support. Update v2: fixed syntax. Update v3: moved to virnetdev. Maxim Perevedentsev (2): network: added waiting for DAD to finish for bridge address. Add support for multi-part netlink messages. src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 35 +++++++++- src/util/virnetdev.c | 160 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdev.h | 2 + src/util/virnetlink.c | 4 +- 5 files changed, 200 insertions(+), 2 deletions(-) -- Sincerely, Maxim Perevedentsev

3 12

[libvirt] [PATCH] cpu: Introduce IvyBridge CPU model
by Jiri Denemark 07 Sep '15

07 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1254420 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_map.xml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index d2469ee..51aa899 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -869,6 +869,55 @@ <feature name='xsave'/> </model> + <model name='IvyBridge'> + <vendor name='Intel'/> + <feature name='aes'/> + <feature name='apic'/> + <feature name='avx'/> + <feature name='clflush'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fxsr'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mmx'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pclmuldq'/> + <feature name='pge'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdrand'/> + <feature name='rdtscp'/> + <feature name='sep'/> + <feature name='smep'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='vme'/> + <feature name='x2apic'/> + <feature name='xsave'/> + <feature name='xsaveopt'/> + </model> + <model name='Haswell-noTSX'> <vendor name='Intel'/> <feature name='aes'/> -- 2.5.1

2 2

[libvirt] [PATCH] .gitignore: Ignore the correct rename example binary
by Michal Privoznik 07 Sep '15

07 Sep '15

In e755186c5c305a9 we tried to introduce an example demonstrating new virDomainRename API. Unfortunately, in the .gitignore we had a different binary listed. It's 'rename' binary which we want git to ignore, not 'test'. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 19402f5..2d52a8f 100644 --- a/.gitignore +++ b/.gitignore @@ -83,7 +83,7 @@ /examples/domtop/domtop /examples/hellolibvirt/hellolibvirt /examples/openauth/openauth -/examples/rename/test +/examples/rename/rename /gnulib/lib/* /gnulib/m4/* /gnulib/tests/* -- 2.4.6

1 0

[libvirt] [PATCH] examples: Add missing build data for 'rename'
by Martin Kletzander 07 Sep '15

07 Sep '15

Commit e755186c5c30 added the rename example, but forgot to build some essential files in there as well as add it to the spec file. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule. Makefile.am | 2 +- libvirt.spec.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index d338d5a220c1..6f217bc08595 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ examples/dominfo examples/domsuspend examples/apparmor \ examples/xml/nwfilter examples/openauth examples/systemtap \ tools/wireshark examples/dommigrate examples/polkit \ - examples/lxcconvert examples/domtop + examples/lxcconvert examples/domtop examples/rename ACLOCAL_AMFLAGS = -I m4 diff --git a/libvirt.spec.in b/libvirt.spec.in index 6f6b191ee61d..bb8bfc3c25c1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1546,7 +1546,7 @@ rm -fr %{buildroot} # on RHEL 5, thus we need to expand it here. make install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} -for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap dommigrate domtop +for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap dommigrate domtop rename do (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) done @@ -2330,6 +2330,7 @@ exit 0 %doc examples/dommigrate %doc examples/openauth %doc examples/xml +%doc examples/rename %doc examples/systemtap %changelog -- 2.5.1

1 0

[libvirt] [PATCH] qemu: Check address when attaching a virtio disk with an invalid address.
by rbian 06 Sep '15

06 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1257844 Attach-device can hotplug a virtio disk device with any address now. It need to validate the address before the attachment. This patch fix the problem. Signed-off-by: rbian <rbian(a)redhat.com> --- src/qemu/qemu_hotplug.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e71a204..be24993 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -331,6 +331,23 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390; + } else { + if (STREQLEN(vm->def->os.machine, "s390-ccw", 8) && + virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid CCW address")); + goto error; + } + } else { + if (!virDomainDeviceAddressIsValid(&disk->info, + VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("device cannot be attached without a valid PCI address")); + goto error; + } + } } for (i = 0; i < vm->def->ndisks; i++) { -- 2.4.3

4 3

[libvirt] [PATCH libvirt master] interface type: add udp socket support
by Jonathan Toppins 05 Sep '15

05 Sep '15

Adds a new interface type using UDP sockets, this seems only applicable to QEMU but have edited tree-wide to support the new interface type. The interface type required the addition of a "destaddr" (destination address), this then maps into the following xml and qemu call. <interface type='udp'> <mac address='52:54:00:5c:67:56'/> <source address='127.0.0.1' port='11112'/> <model type='virtio'/> <dest address="127.0.0.1' port='22222'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> ... QEMU call: -netdev socket,udp=127.0.0.1:22222,localaddr=127.0.0.1:11112 Notice the xml "source" entry becomes the "localaddr" for the qemu call. reference: http://lists.gnu.org/archive/html/qemu-devel/2011-11/msg00629.html Signed-off-by: Jonathan Toppins <jtoppins(a)cumulusnetworks.com> --- docs/formatdomain.html.in | 17 ++++++++++++ src/conf/domain_conf.c | 56 +++++++++++++++++++++++++++++++++++++--- src/conf/domain_conf.h | 3 +++ src/conf/netdev_bandwidth_conf.h | 1 + src/libxl/libxl_conf.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_process.c | 1 + src/qemu/qemu_command.c | 12 +++++++++ src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_interface.c | 2 ++ src/uml/uml_conf.c | 5 ++++ src/xenconfig/xen_sxpr.c | 1 + tools/virsh-domain.c | 1 + 13 files changed, 99 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c0a265a..95f7f5d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4165,6 +4165,23 @@ </devices> ...</pre> + <h5><a name="elementsNICSUDP">UDP unicast tunnel</a></h5> + + <p> + A UDP unicast architecture provides a virtual network which enables + connections between Qemu instances using Qemu's UDP infrastructure.</p> + +<pre> + ... + <devices> + <interface type='udp'> + <mac address='52:54:00:22:c9:42'/> + <source address='127.0.0.1' port='11115'/> + <dest address='127.0.0.1' port='11116'/> + </interface> + </devices> + ...</pre> + <h5><a name="elementsNICSModel">Setting the NIC model</a></h5> <pre> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e4114f8..11961ea 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -385,7 +385,8 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "bridge", "internal", "direct", - "hostdev") + "hostdev", + "udp") VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST, "default", @@ -1629,7 +1630,9 @@ void virDomainNetDefFree(virDomainNetDefPtr def) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: VIR_FREE(def->data.socket.address); + VIR_FREE(def->data.socket.destaddr); break; case VIR_DOMAIN_NET_TYPE_NETWORK: @@ -8398,6 +8401,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *script = NULL; char *address = NULL; char *port = NULL; + char *destaddr = NULL; + char *destport = NULL; char *model = NULL; char *backend = NULL; char *txmode = NULL; @@ -8510,10 +8515,15 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } else if (!address && (def->type == VIR_DOMAIN_NET_TYPE_SERVER || def->type == VIR_DOMAIN_NET_TYPE_CLIENT || - def->type == VIR_DOMAIN_NET_TYPE_MCAST) && + def->type == VIR_DOMAIN_NET_TYPE_MCAST || + def->type == VIR_DOMAIN_NET_TYPE_UDP) && xmlStrEqual(cur->name, BAD_CAST "source")) { address = virXMLPropString(cur, "address"); port = virXMLPropString(cur, "port"); + } else if (!destaddr && def->type == VIR_DOMAIN_NET_TYPE_UDP && + xmlStrEqual(cur->name, BAD_CAST "dest")) { + destaddr = virXMLPropString(cur, "address"); + destport = virXMLPropString(cur, "port"); } else if (xmlStrEqual(cur->name, BAD_CAST "ip")) { virDomainNetIpDefPtr ip = NULL; @@ -8751,6 +8761,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: if (port == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No <source> 'port' attribute " @@ -8766,7 +8777,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (address == NULL) { if (def->type == VIR_DOMAIN_NET_TYPE_CLIENT || - def->type == VIR_DOMAIN_NET_TYPE_MCAST) { + def->type == VIR_DOMAIN_NET_TYPE_MCAST || + def->type == VIR_DOMAIN_NET_TYPE_UDP) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No <source> 'address' attribute " "specified with socket interface")); @@ -8776,6 +8788,32 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->data.socket.address = address; address = NULL; } + + if (def->type != VIR_DOMAIN_NET_TYPE_UDP) + break; + + if (destport == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No <dest> 'port' attribute " + "specified with socket interface")); + goto error; + } + if (virStrToLong_i(destport, NULL, 10, &def->data.socket.destport) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot parse <dest> 'port' attribute " + "with socket interface")); + goto error; + } + + if (destport == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No <dest> 'address' attribute " + "specified with socket interface")); + goto error; + } else { + def->data.socket.destaddr = destaddr; + address = NULL; + } break; case VIR_DOMAIN_NET_TYPE_INTERNAL: @@ -19732,6 +19770,7 @@ virDomainNetDefFormat(virBufferPtr buf, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: if (def->data.socket.address) { virBufferAsprintf(buf, "<source address='%s' port='%d'/>\n", def->data.socket.address, def->data.socket.port); @@ -19739,6 +19778,17 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAsprintf(buf, "<source port='%d'/>\n", def->data.socket.port); } + + if (def->type != VIR_DOMAIN_NET_TYPE_UDP) + break; + + if (def->data.socket.destaddr) { + virBufferAsprintf(buf, "<dest address='%s' port='%d'/>\n", + def->data.socket.destaddr, def->data.socket.destport); + } else { + virBufferAsprintf(buf, "<dest port='%d'/>\n", + def->data.socket.destport); + } break; case VIR_DOMAIN_NET_TYPE_INTERNAL: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 698a4d2..e96fece 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -889,6 +889,7 @@ typedef enum { VIR_DOMAIN_NET_TYPE_INTERNAL, VIR_DOMAIN_NET_TYPE_DIRECT, VIR_DOMAIN_NET_TYPE_HOSTDEV, + VIR_DOMAIN_NET_TYPE_UDP, VIR_DOMAIN_NET_TYPE_LAST } virDomainNetType; @@ -991,6 +992,8 @@ struct _virDomainNetDef { struct { char *address; int port; + char *destaddr; + int destport; } socket; /* any of NET_CLIENT or NET_SERVER or NET_MCAST */ struct { char *name; diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h index 6cbf4ae..cdeac09 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -53,6 +53,7 @@ static inline bool virNetDevSupportBandwidth(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_LAST: diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index e845759..a76ad5a 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1177,6 +1177,7 @@ libxlMakeNic(virDomainDefPtr def, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 110a556..03d6311 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -382,6 +382,7 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index e99b039..04fbb0a 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -429,6 +429,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_LAST: case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index eb00f0f..2dac923 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5354,6 +5354,17 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, type_sep = ','; break; + case VIR_DOMAIN_NET_TYPE_UDP: + virBufferAsprintf(&buf, "socket%cudp=%s:%d%clocaladdr=%s:%d", + type_sep, + net->data.socket.destaddr, + net->data.socket.destport, + type_sep, + net->data.socket.address, + net->data.socket.port); + type_sep = ','; + break; + case VIR_DOMAIN_NET_TYPE_USER: default: virBufferAddLit(&buf, "user"); @@ -8416,6 +8427,7 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_LAST: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1ea397f..e6c20e9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2394,6 +2394,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: if (STRNEQ_NULLABLE(olddev->data.socket.address, newdev->data.socket.address) || olddev->data.socket.port != newdev->data.socket.port) { diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 01226ac..4d55e4d 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -100,6 +100,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_LAST: @@ -187,6 +188,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_LAST: diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 90deb2a..afc0375 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -195,6 +195,11 @@ umlBuildCommandLineNet(virConnectPtr conn, _("TCP client networking type not supported")); goto error; + case VIR_DOMAIN_NET_TYPE_UDP: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("UDP networking type not supported")); + goto error; + case VIR_DOMAIN_NET_TYPE_MCAST: /* ethNNN=tuntap,macaddr,ipaddr,port */ virBufferAddLit(&buf, "mcast"); diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 05e938a..1d43ec1 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1962,6 +1962,7 @@ xenFormatSxprNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4988ba2..fc23ee1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -993,6 +993,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: + case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_LAST: -- 1.9.1

6 20

[libvirt] [PATCH 0/5] Resolve some Coverity related errors
by John Ferlan 04 Sep '15

04 Sep '15

Patches 1, 3, & 4 show up periodically in my Coverity runs, but not always. Usually only when some sort of self inflicted build error only gets a partial build followed by a complete analysis phase. Patch 2 is related to a Coverity error seen in private integration testing as well. Although it could be deemed Coverity noise - it's just easier to adjust our code to use the right type than try to generate a reproducer or figure out exactly what the error is. Patch 5 is based on some investigation I started in July to remove some sa_asserts. I could split into two patches if really desired, but it was just easier to keep as one. John Ferlan (5): qemu: Check virGetLastError return value for migration finish failure lxc: Avoid Coverity SIZEOF_MISMATCH virfile: Avoid Coverity IDENTICAL_BRANCHES error util: Avoid Coverity FORWARD_NULL conf: Remove need for a couple of sa_asserts src/conf/domain_conf.c | 9 +++++---- src/libvirt-domain.c | 3 ++- src/lxc/lxc_container.c | 4 ++-- src/qemu/qemu_migration.c | 3 ++- src/util/virdbus.c | 4 ++++ src/util/virfile.c | 3 +-- 6 files changed, 16 insertions(+), 10 deletions(-) -- 2.1.0

2 11