- Devel - libvirt List Archives

[libvirt] [PATCH v5 0/4] Loadparm support
by Farhan Ali 15 Jun '17

15 Jun '17

This patch series introduces the support for new s390x 'loadparm' feature. The 'loadparm' can be used to select the boot entry to boot from, for a boot device. Here is a link to the QEMU patches: https://lists.nongnu.org/archive/html/qemu-devel/2017-05/msg00192.html ChangeLog --------- v4 -> v5: - Separated qemu capabilities data into a separate patch. (patch 3) - Add formatdomain.html.in to patch 1 v3 -> v4 - Break news and documentation updates to a separate patch (patch 3) - Merge test cases with qemu patch (patch 2) - Add xml2xml test case (patch 2) - Add qemucapabilities test (patch 2) - Rebased the patch series on master commit 5970b13 udev: Fix build on older platforms v2 -> v3: - Updated news.xml and formatdomain.html.in with a more architectural description of loadparm (patch 1) v1 -> v2: - Rebased the patch series on the latest master, commit 2f69dd3 virfiletest: include linux/falloc.h Thanks Farhan Ali Farhan Ali (4): conf : Add loadparm boot option for a boot device qemu : Add loadparm to qemu command line string qemu: capabilities: Add data for qemu capabilities for s390x news: Update news for loadparm feature docs/formatdomain.html.in | 9 +- docs/news.xml | 11 + docs/schemas/domaincommon.rng | 7 + src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 69 +- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 33 + .../qemucapabilitiesdata/caps_2.9.50.s390x.replies | 14587 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml | 302 + ...-machine-loadparm-multiple-disks-nets-s390.args | 28 + ...v-machine-loadparm-multiple-disks-nets-s390.xml | 43 + .../qemuxml2argv-machine-loadparm-net-s390.args | 20 + .../qemuxml2argv-machine-loadparm-net-s390.xml | 26 + ...xml2argv-machine-loadparm-s390-char-invalid.xml | 26 + ...uxml2argv-machine-loadparm-s390-len-invalid.xml | 26 + .../qemuxml2argv-machine-loadparm-s390.args | 20 + .../qemuxml2argv-machine-loadparm-s390.xml | 26 + tests/qemuxml2argvtest.c | 19 + ...t-machine-loadparm-multiple-disks-nets-s390.xml | 44 + tests/qemuxml2xmltest.c | 4 + 21 files changed, 15303 insertions(+), 4 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.9.50.s390x.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.9.50.s390x.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-multiple-disks-nets-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-net-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-char-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390-len-invalid.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-loadparm-s390.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-loadparm-multiple-disks-nets-s390.xml -- 1.9.1

2 10

[libvirt] [PATCH] Disable the -Wduplicated-branches warning
by Daniel P. Berrange 15 Jun '17

15 Jun '17

Depending on the platform/architecture, a number of conditionals in libvirt code expand the same on both branches. This is expected behaviour and harmless, so disable the warning to avoid creating unexpected build failures Two examples, mingw32: ../../src/util/vircommand.c: In function 'virCommandWait': ../../src/util/vircommand.c:2562:51: error: this condition has identical branches [-Werror=duplicated-branches] *exitstatus = cmd->rawStatus ? status : WEXITSTATUS(status); ^ and gcc7.1 In file included from util/virobject.c:28:0: util/virobject.c: In function 'virClassNew': util/viratomic.h:176:46: error: this condition has identical branches [-Werror=duplicated-branches] (void)(0 ? *(atomic) ^ *(atomic) : 0); \ ^ util/virobject.c:144:20: note: in expansion of macro 'virAtomicIntInc' klass->magic = virAtomicIntInc(&magicCounter); ^~~~~~~~~~~~~~~ Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- m4/virt-compile-warnings.m4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 768a5c8..d7bb172 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -61,6 +61,9 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Wenum-compare" # gcc 5.1 -Wformat-signedness mishandles enums, not ready for prime time dontwarn="$dontwarn -Wformat-signedness" + # Several conditionals expand the same on both branches + # depending on the particular platform/architecture + dontwarn="$dontwarn -Wduplicated-branches" # gcc 4.2 treats attribute(format) as an implicit attribute(nonnull), # which triggers spurious warnings for our usage -- 2.9.3

2 1

[libvirt] [PATCH] qemu: Pass the number of heads even with -vga qxl
by Martin Kletzander 15 Jun '17

15 Jun '17

When added in multiple previous commits, it was used only with -device qxl(-vga), but for some QEMUs (< 1.6) we need to add this functionality when using -vga qxl as well. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1283207 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 8 ++++ .../qemuxml2argv-video-vga-qxl-heads.args | 30 ++++++++++++++ .../qemuxml2argv-video-vga-qxl-heads.xml | 47 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 4 files changed, 88 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3e1552a1b593..9687d367a6d4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4613,6 +4613,14 @@ qemuBuildVgaVideoCommand(virCommandPtr cmd, virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u", dev, vgamem / 1024); } + + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS)) + video->heads = 0; + if (video->heads) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.max_outputs=%u", + dev, video->heads); + } } if (video->vram && diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args new file mode 100644 index 000000000000..411a2eedbc4b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.args @@ -0,0 +1,30 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=67108864 \ +-global qxl-vga.max_outputs=1 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,max_outputs=3,\ +bus=pci.0,addr=0x4 \ +-device qxl,id=video2,ram_size=67108864,vram_size=67108864,max_outputs=7,\ +bus=pci.0,addr=0x5 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml new file mode 100644 index 000000000000..d878ddcd6d2e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-vga-qxl-heads.xml @@ -0,0 +1,47 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <video> + <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='3'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='7'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </video> + <video> + <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 43d3f1bd3973..ea8403122feb 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1734,6 +1734,9 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_QXL_MAX_OUTPUTS); + DO_TEST("video-vga-qxl-heads", + QEMU_CAPS_DEVICE_QXL, + QEMU_CAPS_QXL_MAX_OUTPUTS); DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, -- 2.13.1

2 2

[libvirt] [PATCH] qemu: Avoid parsing empty nodeset string
by Nitesh Konkar 14 Jun '17

14 Jun '17

The advisory nodeset from numad is parsed irrespective of the string being empty or not. Avoid parsing an empty nodeset string. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/qemu/qemu_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 85b800d..1c49fa6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5456,7 +5456,7 @@ qemuProcessPrepareDomain(virConnectPtr conn, if (virDomainDefNeedsPlacementAdvice(vm->def)) { nodeset = virNumaGetAutoPlacementAdvice(virDomainDefGetVcpus(vm->def), virDomainDefGetMemoryTotal(vm->def)); - if (!nodeset) + if (virStringIsEmpty(nodeset)) goto cleanup; VIR_DEBUG("Nodeset returned from numad: %s", nodeset); -- 2.9.4

2 1

[libvirt] [PATCH 0/4] Fix regression in migration with custom XML
by Jiri Denemark 14 Jun '17

14 Jun '17

When making ABI stability checks for an active domain, we need to make sure we use the same migratable definition which virDomainGetXMLDesc with the MIGRATABLE flag provides, otherwise the ABI check will fail. https://bugzilla.redhat.com/show_bug.cgi?id=1460952 Jiri Denemark (4): qemu: Introduce qemuDomainDefFromXML helper qemu: Add qemuDomainMigratableDefCheckABIStability qemu: Add qemuDomainCheckABIStability qemu: Use qemuDomainCheckABIStability where needed src/qemu/qemu_domain.c | 108 ++++++++++++++++++++++++++++++++++------------ src/qemu/qemu_domain.h | 4 ++ src/qemu/qemu_driver.c | 71 +++++++++++++++++------------- src/qemu/qemu_migration.c | 2 +- 4 files changed, 126 insertions(+), 59 deletions(-) -- 2.13.1

2 8

[libvirt] [PATCH] qemu: Don't try to use hugepages if not enabled
by Michal Privoznik 14 Jun '17

14 Jun '17

https://bugzilla.redhat.com/show_bug.cgi?id=1214369 My fix 671d18594f4 was incomplete. If domain doesn't have hugepages enalbed, because of missing condition we would still be putting hugepages path onto qemu cmd line. Clean up the conditions so that it's more visible next time. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 12 +++++----- .../qemuxml2argv-cpu-numa-memshared.args | 26 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.args diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3e1552a1b..8c12b2be0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3408,23 +3408,23 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, if (pagesize || mem->nvdimmPath || memAccess || def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { *backendType = "memory-backend-file"; - if (mem->nvdimmPath) { + if (pagesize) { + if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0) + goto cleanup; + prealloc = true; + } else if (mem->nvdimmPath) { if (VIR_STRDUP(memPath, mem->nvdimmPath) < 0) goto cleanup; prealloc = true; - } else if (!pagesize && def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { + } else { /* We can have both pagesize and mem source. If that's the case, * prefer hugepages as those are more specific. */ if (VIR_STRDUP(memPath, cfg->memoryBackingDir) < 0) goto cleanup; - } else { - if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0) - goto cleanup; - prealloc = true; } if (virJSONValueObjectAdd(props, "B:prealloc", prealloc, "s:mem-path", memPath, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.args new file mode 100644 index 000000000..cceffce3a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-memshared.args @@ -0,0 +1,26 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 16,sockets=2,cores=4,threads=2 \ +-object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram,\ +share=yes,size=112197632 \ +-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ +-object memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram,\ +share=no,size=112197632 \ +-numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nographic \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot n \ +-usb \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 43d3f1bd3..799aea9fa 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1539,10 +1539,11 @@ mymain(void) DO_TEST_PARSE_ERROR("cpu-numa3", NONE); DO_TEST_FAILURE("cpu-numa-disjoint", NONE); DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA); DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_OBJECT_MEMORY_RAM); DO_TEST_FAILURE("cpu-numa-memshared", NONE); + DO_TEST("cpu-numa-memshared", QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("cpu-host-model", NONE); DO_TEST("cpu-host-model-vendor", NONE); skipLegacyCPUs = true; DO_TEST("cpu-host-model-fallback", NONE); DO_TEST_FAILURE("cpu-host-model-nofallback", NONE); -- 2.13.0

2 2

[libvirt] [PATCH] Use sys/uio.h for writev()
by Daniel P. Berrange 14 Jun '17

14 Jun '17

With glibc >= 2.25.90 writev() is only available if you explicitly include sys/uio.h Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- A build breaker, but not yet pushed in case anyone has opinions... configure.ac | 2 +- src/util/virlog.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1a73b34..1a48bb0 100644 --- a/configure.ac +++ b/configure.ac @@ -328,7 +328,7 @@ dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h regex.h sys/un.h \ sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \ - libtasn1.h sys/ucred.h sys/mount.h stdarg.h]) + libtasn1.h sys/ucred.h sys/mount.h stdarg.h sys/uio.h]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) AC_CHECK_FUNCS([stat stat64 __xstat __xstat64 lstat lstat64 __lxstat __lxstat64]) diff --git a/src/util/virlog.c b/src/util/virlog.c index 7933e1a..3a28e5e 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -32,6 +32,9 @@ #include <unistd.h> #include <execinfo.h> #include <regex.h> +#if HAVE_SYS_UIO_H +# include <sys/uio.h> +#endif #if HAVE_SYSLOG_H # include <syslog.h> #endif -- 2.9.3

2 2

[libvirt] [PATCH] EventRegister: Fix double deference error in libvirt_virConnectDomainEventRegisterAny
by fangying 14 Jun '17

14 Jun '17

As descriped at https://www.spinics.net/linux/fedora/libvir/msg148562.html, even when virConnectDomainEventRegisterAny returns -1 there is still a scenario in which it will trigger the free callback. We fix the problem in the following way: (1) implement a function virObjectEventStateSetFreeCB to add freecallback. (2) call virObjectEventStateSetFreeCB only if the event is successfully added. Signed-off-by: fangying <fangying1(a)huawei.com> --- src/conf/object_event.c | 34 ++++++++++++++++++++++++++++++++++ src/conf/object_event.h | 7 +++++++ src/libvirt_private.syms | 2 +- src/remote/remote_driver.c | 4 ++-- 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/conf/object_event.c b/src/conf/object_event.c index e5f942f..a770978 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -923,6 +923,40 @@ virObjectEventStateRegisterID(virConnectPtr conn, /** + * virObjectEventStateSetFreeCB: + * @conn: connection to associate with callback + * @state: object event state + * @callbackID: ID of the function to remove from event + * @freecb: freecb to be added + * + * Add the callbalck function @freecb for @callbackID with connection @conn, + * from @state, for events. + */ +void +virObjectEventStateSetFreeCB(virConnectPtr conn, + virObjectEventStatePtr state, + int callbackID, + virFreeCallback freecb) +{ + size_t i; + virObjectEventCallbackListPtr cbList; + + virObjectEventStateLock(state); + cbList = state->callbacks; + for (i = 0; i < cbList->count; i++) { + virObjectEventCallbackPtr cb = cbList->callbacks[i]; + + if (cb->callbackID == callbackID && cb->conn == conn) { + cb->freecb = freecb; + break; + } + } + + virObjectEventStateUnlock(state); +} + + +/** * virObjectEventStateDeregisterID: * @conn: connection to associate with callback * @state: object event state diff --git a/src/conf/object_event.h b/src/conf/object_event.h index 7a9995e..a7d29a0 100644 --- a/src/conf/object_event.h +++ b/src/conf/object_event.h @@ -90,4 +90,11 @@ virObjectEventStateSetRemote(virConnectPtr conn, int remoteID) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +void +virObjectEventStateSetFreeCB(virConnectPtr conn, + virObjectEventStatePtr state, + int callbackID, + virFreeCallback freecb) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); + #endif diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 429b095..e9d9cb6 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -791,7 +791,7 @@ virObjectEventStateDeregisterID; virObjectEventStateEventID; virObjectEventStateNew; virObjectEventStateQueue; - +virObjectEventStateSetFreeCB; # conf/secret_conf.h virSecretDefFormat; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index d27e96f..71177bd 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5947,7 +5947,7 @@ remoteConnectDomainEventRegisterAny(virConnectPtr conn, if ((count = virDomainEventStateRegisterClient(conn, priv->eventState, dom, eventID, callback, - opaque, freecb, false, + opaque, NULL, false, &callbackID, priv->serverEventFilter)) < 0) goto done; @@ -5993,7 +5993,7 @@ remoteConnectDomainEventRegisterAny(virConnectPtr conn, } rv = callbackID; - + virObjectEventStateSetFreeCB(conn, priv->eventState, callbackID, freecb); done: remoteDriverUnlock(priv); return rv; -- 2.10.0.windows.1

2 1

[libvirt] [PATCH] fix memory leak in qemuMonitorJSONAttachCharDevCommand
by Yi Wang 14 Jun '17

14 Jun '17

The @tlsalias allocated in qemuAliasTLSObjFromSrcAlias may lost when append string to json. Signed-off-by: Xi Xu <xu.xi8(a)zte.com.cn> --- src/qemu/qemu_monitor_json.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f208dd0..773de0f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6487,6 +6487,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) goto error; + VIR_FREE(tlsalias); } break; -- 1.8.3.1

2 1

[libvirt] [PATCH v2] qemu: monitor: Fix a memory leak in qemuMonitorJSONAttachCharDevCommand
by Erik Skultety 14 Jun '17

14 Jun '17

With the current logic, we only free @tlsalias as part of the error label and would have to free it explicitly earlier in the code. Convert the error label to cleanup, so that we have only one sink, where we handle all frees. Since since JSON object append operation consumes pointers, make sure @backend is cleared before we hit the cleanup label. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f208dd05a..5ddc09ca6 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6430,8 +6430,8 @@ static virJSONValuePtr qemuMonitorJSONAttachCharDevCommand(const char *chrID, const virDomainChrSourceDef *chr) { - virJSONValuePtr ret; - virJSONValuePtr backend; + virJSONValuePtr ret = NULL; + virJSONValuePtr backend = NULL; virJSONValuePtr data = NULL; virJSONValuePtr addr = NULL; const char *backend_type = NULL; @@ -6440,7 +6440,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (!(backend = virJSONValueNewObject()) || !(data = virJSONValueNewObject())) { - goto error; + goto cleanup; } switch ((virDomainChrType) chr->type) { @@ -6456,14 +6456,14 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, case VIR_DOMAIN_CHR_TYPE_FILE: backend_type = "file"; if (virJSONValueObjectAppendString(data, "out", chr->data.file.path) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_DEV: backend_type = STRPREFIX(chrID, "parallel") ? "parallel" : "serial"; if (virJSONValueObjectAppendString(data, "device", chr->data.file.path) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_TCP: @@ -6472,7 +6472,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, chr->data.tcp.service); if (!addr || virJSONValueObjectAppend(data, "addr", addr) < 0) - goto error; + goto cleanup; addr = NULL; telnet = chr->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET; @@ -6480,13 +6480,13 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "telnet", telnet) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.tcp.listen) < 0) - goto error; + goto cleanup; if (chr->data.tcp.tlscreds) { if (!(tlsalias = qemuAliasTLSObjFromSrcAlias(chrID))) - goto error; + goto cleanup; if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) - goto error; + goto cleanup; } break; @@ -6496,14 +6496,14 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, chr->data.udp.connectService); if (!addr || virJSONValueObjectAppend(data, "remote", addr) < 0) - goto error; + goto cleanup; if (chr->data.udp.bindHost) { addr = qemuMonitorJSONBuildInetSocketAddress(chr->data.udp.bindHost, chr->data.udp.bindService); if (!addr || virJSONValueObjectAppend(data, "local", addr) < 0) - goto error; + goto cleanup; } addr = NULL; break; @@ -6514,12 +6514,12 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (!addr || virJSONValueObjectAppend(data, "addr", addr) < 0) - goto error; + goto cleanup; addr = NULL; if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.nix.listen) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_SPICEVMC: @@ -6527,7 +6527,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "type", virDomainChrSpicevmcTypeToString(chr->data.spicevmc)) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_SPICEPORT: @@ -6544,28 +6544,27 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, _("Hotplug unsupported for char device type '%d'"), chr->type); } - goto error; + goto cleanup; } if (virJSONValueObjectAppendString(backend, "type", backend_type) < 0 || virJSONValueObjectAppend(backend, "data", data) < 0) - goto error; + goto cleanup; data = NULL; if (!(ret = qemuMonitorJSONMakeCommand("chardev-add", "s:id", chrID, "a:backend", backend, NULL))) - goto error; + goto cleanup; + backend = NULL; - return ret; - - error: + cleanup: VIR_FREE(tlsalias); virJSONValueFree(addr); virJSONValueFree(data); virJSONValueFree(backend); - return NULL; + return ret; } -- 2.13.1

2 1

[libvirt] [PATCH] qemu: monitor: Fix a memory leak in qemuMonitorJSONAttachCharDevCommand
by Erik Skultety 14 Jun '17

14 Jun '17

With the current logic, we only free @tlsalias as part of the error label and would have to free it explicitly earlier in the code. Convert the error label to cleanup, so that we have only one sink, where we handle all frees. In order to do that we need to clear some JSON obj pointers down the success road to avoid SIGSEGV, since JSON object append operation consumes pointers. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 47 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index f208dd05a..b8b73926f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6430,8 +6430,8 @@ static virJSONValuePtr qemuMonitorJSONAttachCharDevCommand(const char *chrID, const virDomainChrSourceDef *chr) { - virJSONValuePtr ret; - virJSONValuePtr backend; + virJSONValuePtr ret = NULL; + virJSONValuePtr backend = NULL; virJSONValuePtr data = NULL; virJSONValuePtr addr = NULL; const char *backend_type = NULL; @@ -6440,7 +6440,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (!(backend = virJSONValueNewObject()) || !(data = virJSONValueNewObject())) { - goto error; + goto cleanup; } switch ((virDomainChrType) chr->type) { @@ -6456,14 +6456,14 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, case VIR_DOMAIN_CHR_TYPE_FILE: backend_type = "file"; if (virJSONValueObjectAppendString(data, "out", chr->data.file.path) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_DEV: backend_type = STRPREFIX(chrID, "parallel") ? "parallel" : "serial"; if (virJSONValueObjectAppendString(data, "device", chr->data.file.path) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_TCP: @@ -6472,21 +6472,20 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, chr->data.tcp.service); if (!addr || virJSONValueObjectAppend(data, "addr", addr) < 0) - goto error; - addr = NULL; + goto cleanup; telnet = chr->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET; if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "telnet", telnet) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.tcp.listen) < 0) - goto error; + goto cleanup; if (chr->data.tcp.tlscreds) { if (!(tlsalias = qemuAliasTLSObjFromSrcAlias(chrID))) - goto error; + goto cleanup; if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) - goto error; + goto cleanup; } break; @@ -6496,16 +6495,15 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, chr->data.udp.connectService); if (!addr || virJSONValueObjectAppend(data, "remote", addr) < 0) - goto error; + goto cleanup; if (chr->data.udp.bindHost) { addr = qemuMonitorJSONBuildInetSocketAddress(chr->data.udp.bindHost, chr->data.udp.bindService); if (!addr || virJSONValueObjectAppend(data, "local", addr) < 0) - goto error; + goto cleanup; } - addr = NULL; break; case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -6514,12 +6512,11 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (!addr || virJSONValueObjectAppend(data, "addr", addr) < 0) - goto error; - addr = NULL; + goto cleanup; if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.nix.listen) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_SPICEVMC: @@ -6527,7 +6524,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "type", virDomainChrSpicevmcTypeToString(chr->data.spicevmc)) < 0) - goto error; + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_SPICEPORT: @@ -6544,28 +6541,30 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, _("Hotplug unsupported for char device type '%d'"), chr->type); } - goto error; + goto cleanup; } if (virJSONValueObjectAppendString(backend, "type", backend_type) < 0 || virJSONValueObjectAppend(backend, "data", data) < 0) - goto error; - data = NULL; + goto cleanup; if (!(ret = qemuMonitorJSONMakeCommand("chardev-add", "s:id", chrID, "a:backend", backend, NULL))) - goto error; + goto cleanup; - return ret; + /* we must not free the following pointers as they've been collectively + * consumed by @ret, so clear them first + */ + addr = data = backend = NULL; - error: + cleanup: VIR_FREE(tlsalias); virJSONValueFree(addr); virJSONValueFree(data); virJSONValueFree(backend); - return NULL; + return ret; } -- 2.13.1

2 2

[libvirt] [PATCH 00/26] Support multiple PHBs for pSeries guests
by Andrea Bolognani 14 Jun '17

14 Jun '17

Book 1: A Journey Begins ======================== These commits merely set the stage for what's coming next. Adventure! Challenges! Friendship! Perhaps even love? 00-03: Trivial cleanups 04-05: Test suite changes that will make implementing future test cases possible; get them out of the way early in order to make patches more straightforward when the time finally comes 06: Simple is beautiful Book 2: From Great POWERs ========================= Our hero faces and overcomes many hardships and by doing so grows as an individual, but something is still amiss. 07-09: Get ready to remove some assumptions... 10: ... and then promptly remove them. Hashtag efficient 11-17: Introduce new characters-I mean, XML elements and attributes and capabilities and all that jazz. Close enough, I say. 18: By now, our hero has acquired amazing powers such as being able to create pSeries guests with multiple PHBs; unfortunately, he still has to rely on his strenght and his strength alone when facing new challenges. Wouldn't it be great if he could get some help? Maybe that's exactly where the story is heading, but we'll have to wait for the next books to find out... 19: Prove to the world that the journey is more important than the destination, yet you still gotta get there at some point Book 3: With a Little Help ========================== Joined by a ragtag group of newfound friends, our hero can push forward knowing that he will always be able to count on their help, and that he'll never again be alone. 20: You can only know how far you've come if you marked your starting point on the map 21-22: The Evil One can only recoil in horror as its minions are banished from the land, one by one. Onwards to the final battle! Book 4: The Parting of the Ways =============================== Every journey must come to an end. The Evil One is at last ready to set in motion its plan to take over the entire land; our hero and his companions are the only obstacles standing in its way. Will they be able to stop impending doom? Maybe, but chances are sure stacked against them. Will knowing this stop them from fighting until their last breath? Of course not. Is the title a Doctor Who reference? You better believe it is! 23-25: More characters join the fray, as the narrative gears up for an epic finale 26: The final battle takes place. Swords will clash, spells will be cast, old friends will fall, and when all is said and done... Well, you didn't really expect me to give away the ending so easily, did you? :) Book 5: ??? =========== Whew, that was quite something, wasn't it? But wait, there's more! The fifth book in this engrossing tetralogy is still being drafted, but is meant to be published along with the rest and provide insights and details that might have escaped even the most attentive reader... Yes, I'm talking about documentation here. Hardcover and paperback editions available. Signed copies can be purchased via mail order. Andrea Bolognani (26): conf: Remove obsolete comment conf: Make virDomainPCIAddressSetGrow() private conf: Tweak virDomainPCIAddressGetNextAddr() signature tests: Update qemumemlock data tests: Mock IOMMU groups conf: Simplify slot allocation qemu: Allow qemuBuildControllerDevStr() to return NULL qemu: Tweak index number checking conf: Move index number checking to drivers qemu: Relax pci-root index requirement for pSeries guests schema: Allow <target index='...'/> conf: Parse and format <target index='...'/> schema: Allow 'spapr-pci-host-bridge' controller model conf: Add 'spapr-pci-host-bridge' controller model qemu: Automatically pick index and model for pci-root controllers qemu: Introduce QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE qemu: Deal with PHB naming convention qemu: Use multiple PHBs for pSeries guests tests: Add tests for pSeries guests with multiple PHBs tests: Add baseline tests for automatic PHB usage qemu: Use PHBs to fill holes in PCI bus numbering qemu: Use PHBs when extending the guest PCI topology conf: Introduce isolation groups schema: Allow <isolationGroup/> conf: Parse and format <isolationGroup/> qemu: Isolate hostdevs on pSeries guests docs/schemas/domaincommon.rng | 12 ++ src/bhyve/bhyve_device.c | 4 +- src/bhyve/bhyve_domain.c | 15 ++ src/conf/device_conf.h | 8 +- src/conf/domain_addr.c | 138 +++++++-------- src/conf/domain_addr.h | 28 +-- src/conf/domain_conf.c | 50 +++++- src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 1 - src/libxl/libxl_domain.c | 14 ++ src/lxc/lxc_domain.c | 14 ++ src/openvz/openvz_driver.c | 14 ++ src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 146 +++++++++++++--- src/qemu/qemu_command.h | 9 +- src/qemu/qemu_domain.c | 14 ++ src/qemu/qemu_domain_address.c | 190 ++++++++++++++++++--- src/qemu/qemu_hotplug.c | 5 +- src/uml/uml_driver.c | 14 ++ src/vz/vz_driver.c | 14 ++ src/xen/xen_driver.c | 14 ++ .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 5 +- .../qemuargv2xml-pseries-nvram.xml | 5 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + .../qemumemlock-pc-hardlimit+hostdev.xml | 2 +- .../qemumemlock-pc-hardlimit+locked+hostdev.xml | 2 +- tests/qemumemlockdata/qemumemlock-pc-hostdev.xml | 2 +- .../qemumemlock-pc-locked+hostdev.xml | 2 +- .../qemumemlock-pseries-hardlimit+hostdev.xml | 2 +- ...emumemlock-pseries-hardlimit+locked+hostdev.xml | 2 +- .../qemumemlock-pseries-hostdev.xml | 2 +- .../qemumemlock-pseries-locked+hostdev.xml | 2 +- tests/qemumemlocktest.c | 21 ++- .../qemuxml2argv-pseries-hostdev.args | 25 +++ .../qemuxml2argv-pseries-hostdev.xml | 33 ++++ .../qemuxml2argv-pseries-many-buses-1.args | 22 +++ .../qemuxml2argv-pseries-many-buses-1.xml | 20 +++ .../qemuxml2argv-pseries-many-buses-2.args | 22 +++ .../qemuxml2argv-pseries-many-buses-2.xml | 18 ++ .../qemuxml2argv-pseries-many-devices.args | 53 ++++++ .../qemuxml2argv-pseries-many-devices.xml | 49 ++++++ .../qemuxml2argv-pseries-phb-default-missing.args | 22 +++ .../qemuxml2argv-pseries-phb-default-missing.xml | 16 ++ .../qemuxml2argv-pseries-phb-simple.args | 22 +++ .../qemuxml2argv-pseries-phb-simple.xml | 17 ++ tests/qemuxml2argvtest.c | 51 +++++- .../qemuxml2xmlout-panic-pseries.xml | 5 +- .../qemuxml2xmlout-ppc64-usb-controller-legacy.xml | 5 +- .../qemuxml2xmlout-ppc64-usb-controller.xml | 5 +- .../qemuxml2xmlout-pseries-hostdev.xml | 56 ++++++ ...xml => qemuxml2xmlout-pseries-many-buses-1.xml} | 19 ++- ...xml => qemuxml2xmlout-pseries-many-buses-2.xml} | 20 ++- .../qemuxml2xmlout-pseries-many-devices.xml | 125 ++++++++++++++ .../qemuxml2xmlout-pseries-nvram.xml | 5 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 5 +- .../qemuxml2xmlout-pseries-panic-no-address.xml | 5 +- ...qemuxml2xmlout-pseries-phb-default-missing.xml} | 18 +- ...m.xml => qemuxml2xmlout-pseries-phb-simple.xml} | 18 +- tests/qemuxml2xmltest.c | 47 ++++- tests/virpcimock.c | 43 ++++- 61 files changed, 1306 insertions(+), 204 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-hostdev.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-1.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-buses-2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-many-devices.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-default-missing.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-phb-simple.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-hostdev.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-many-buses-1.xml} (55%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-many-buses-2.xml} (54%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-many-devices.xml copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-phb-default-missing.xml} (56%) copy tests/qemuxml2xmloutdata/{qemuxml2xmlout-pseries-nvram.xml => qemuxml2xmlout-pseries-phb-simple.xml} (56%) -- 2.7.5

3 57

[libvirt] [PATCH 0/3] Yet another round of hugepage fixes
by Michal Privoznik 13 Jun '17

13 Jun '17

This time with some tests. You may recognize 2/3 which I've posted here: https://www.redhat.com/archives/libvir-list/2017-June/msg00258.html Michal Privoznik (3): qemuxml2xmltest: Test hugepage enabled domains qemu: Allow memAccess for hugepages again qemu: Prefer hugepages over mem source='file' src/qemu/qemu_command.c | 24 +++------ .../qemuxml2argv-fd-memory-numa-topology2.args | 2 +- .../qemuxml2argv-hugepages-memaccess.args | 42 +++++++++++++++ .../qemuxml2argv-hugepages-memaccess.xml | 62 ++++++++++++++++++++++ .../qemuxml2argv-hugepages-memaccess2.args | 39 ++++++++++++++ .../qemuxml2argv-hugepages-memaccess2.xml | 62 ++++++++++++++++++++++ .../qemuxml2argv-hugepages-pages4.xml | 14 +++-- .../qemuxml2argv-hugepages-pages5.xml | 14 +++-- .../qemuxml2argv-hugepages-pages6.xml | 14 +++-- tests/qemuxml2argvtest.c | 6 +++ .../qemuxml2xmlout-hugepages-memaccess.xml | 1 + .../qemuxml2xmlout-hugepages-memaccess2.xml | 1 + .../qemuxml2xmlout-hugepages-pages4.xml | 1 + .../qemuxml2xmlout-hugepages-pages5.xml | 1 + .../qemuxml2xmlout-hugepages-pages6.xml | 1 + tests/qemuxml2xmltest.c | 5 ++ 16 files changed, 262 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hugepages-memaccess2.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-memaccess2.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages4.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages5.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages6.xml -- 2.13.0

2 5

[libvirt] [PATCH v3 0/6] Fix error reporting in streams
by Michal Privoznik 13 Jun '17

13 Jun '17

diff to v3: -In the last patch, instead of reporting errors from callbacks, report system error based on errno set by the callbacks. Michal Privoznik (6): virfdstream: Check for thread error more frequently fdstream: Report error from the I/O thread virStream*All: Call virStreamAbort() more frequently virStream*All: Preserve reported error virFileInData: preserve errno in cleanup path virStream*All: Report error if a callback fails daemon/stream.c | 18 ++++++--- include/libvirt/libvirt-stream.h | 17 +++++++- src/libvirt-stream.c | 83 +++++++++++++++++++++++++++++++--------- src/util/virfdstream.c | 22 ++++++++--- src/util/virfile.c | 5 ++- 5 files changed, 113 insertions(+), 32 deletions(-) -- 2.13.0

2 24

[libvirt] [PATCH v2 0/2] Two simple hugepage fixes
by Michal Privoznik 13 Jun '17

13 Jun '17

v2 of: https://www.redhat.com/archives/libvir-list/2017-June/msg00395.html diff to v1: - Moved the decision logic to a separate static function as requested in the review. - In 2/2 the function header moved to a different location as requested. Michal Privoznik (2): qemuProcessBuildDestroyHugepagesPath: create path more frequently qemuDomainAttachMemory: Crate hugepage dir if needed src/qemu/qemu_hotplug.c | 3 +++ src/qemu/qemu_process.c | 52 ++++++++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_process.h | 5 +++++ 3 files changed, 55 insertions(+), 5 deletions(-) -- 2.13.0

2 5

[libvirt] [PATCH] daemonUnixSocketPaths: Unify exit paths
by Michal Privoznik 13 Jun '17

13 Jun '17

Right now, there is a lot of exit points from the function. Depending on their position they need to copy the same free calls. This goes against our style where we usually have just one exit point from the function which also does the necessary free. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- daemon/libvirtd.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index d17a694c9..db239f0d4 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -262,50 +262,47 @@ daemonUnixSocketPaths(struct daemonConfig *config, char **rosockfile, char **admsockfile) { + int ret = -1; + char *rundir = NULL; + if (config->unix_sock_dir) { if (virAsprintf(sockfile, "%s/libvirt-sock", config->unix_sock_dir) < 0) - goto error; + goto cleanup; if (privileged) { - if (virAsprintf(rosockfile, "%s/libvirt-sock-ro", config->unix_sock_dir) < 0) - goto error; - if (virAsprintf(admsockfile, "%s/libvirt-admin-sock", config->unix_sock_dir) < 0) - goto error; + if (virAsprintf(rosockfile, "%s/libvirt-sock-ro", config->unix_sock_dir) < 0 || + virAsprintf(admsockfile, "%s/libvirt-admin-sock", config->unix_sock_dir) < 0) + goto cleanup; } } else { if (privileged) { if (VIR_STRDUP(*sockfile, LOCALSTATEDIR "/run/libvirt/libvirt-sock") < 0 || VIR_STRDUP(*rosockfile, LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro") < 0 || VIR_STRDUP(*admsockfile, LOCALSTATEDIR "/run/libvirt/libvirt-admin-sock") < 0) - goto error; + goto cleanup; } else { - char *rundir = NULL; mode_t old_umask; if (!(rundir = virGetUserRuntimeDirectory())) - goto error; + goto cleanup; old_umask = umask(077); if (virFileMakePath(rundir) < 0) { umask(old_umask); - VIR_FREE(rundir); - goto error; + goto cleanup; } umask(old_umask); if (virAsprintf(sockfile, "%s/libvirt-sock", rundir) < 0 || - virAsprintf(admsockfile, "%s/libvirt-admin-sock", rundir) < 0) { - VIR_FREE(rundir); - goto error; - } - - VIR_FREE(rundir); + virAsprintf(admsockfile, "%s/libvirt-admin-sock", rundir) < 0) + goto cleanup; } } - return 0; - error: - return -1; + ret = 0; + cleanup: + VIR_FREE(rundir); + return ret; } -- 2.13.0

2 1

[libvirt] [PATCH] fix memory leak in daemonUnixSocketPaths
by Yi Wang 13 Jun '17

13 Jun '17

The @rundir is allocated in virGetUserRuntimeDirectory, may lost when virFileMakePath failed. Signed-off-by: Xi Xu <xu.xi8(a)zte.com.cn> --- daemon/libvirtd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index bac4bc1..d17a694 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -288,6 +288,7 @@ daemonUnixSocketPaths(struct daemonConfig *config, old_umask = umask(077); if (virFileMakePath(rundir) < 0) { umask(old_umask); + VIR_FREE(rundir); goto error; } umask(old_umask); -- 1.8.3.1

3 5

[libvirt] [PATCH 0/2] Two simple hugepage fixes
by Michal Privoznik 13 Jun '17

13 Jun '17

Ideally, we would have the security driver relabelling the paths qemu is going to touch. And this indeed is how I approached this problem firstly. But there are couple of problems: a) we generate the paths, add them onto the cmd line and forget them. You won't find them in virDomainDef. The secdriver cannot reconstruct them either as they may depend on qemu.conf (admin can whitelist just a few hugetlbfs mount points). b) Storing the paths in virDomainDef (which is all the the secriver sees) turns out to be not trivial too: where would you store them? In function that constructs the paths (qemuBuildMemoryBackendStr) we don't know what 'device' are we working with. All the callers either pass memory dev directly (for <memory/> cells), or construct a dummy one (for <memoryBacking/> and <numa/> cells) and pass it. This we wouldn't know where to store the constructed path anyway. This solution presented here turned out to be the least painful (yet not very clear from design POV, I give you that). Michal Privoznik (2): qemuProcessBuildDestroyHugepagesPath: create path more frequently qemuDomainAttachMemory: Crate hugepage dir if needed src/qemu/qemu_hotplug.c | 3 +++ src/qemu/qemu_process.c | 44 +++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_process.h | 5 +++++ 3 files changed, 47 insertions(+), 5 deletions(-) -- 2.13.0

2 5

[libvirt] [PATCH] qemu: Fix starting a domain with corrupted managed save file
by Jiri Denemark 13 Jun '17

13 Jun '17

Commit v3.4.0-44-gac793bd71 fixed a memory leak, but failed to return the special -3 value. Thus an attempt to start a domain with corrupted managed save file would removed the corrupted file and report "An error occurred, but the cause is unknown" instead of starting the domain from scratch. https://bugzilla.redhat.com/show_bug.cgi?id=1460962 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6654fd3e2..ba1dba5b7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6450,17 +6450,15 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver, *ret_def = def; *ret_data = data; + cleanup: virObjectUnref(caps); - return fd; error: virDomainDefFree(def); virQEMUSaveDataFree(data); VIR_FORCE_CLOSE(fd); - virObjectUnref(caps); - - return -1; + goto cleanup; } static int ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) -- 2.13.1

2 1

[libvirt] [PATCH] qemu/doc: Fix function name for handling events
by Philipp Hahn 13 Jun '17

13 Jun '17

Insert missing "IO" into function name. --- src/qemu/EVENTHANDLERS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/EVENTHANDLERS.txt b/src/qemu/EVENTHANDLERS.txt index 79c1505caa..c7798d600b 100644 --- a/src/qemu/EVENTHANDLERS.txt +++ b/src/qemu/EVENTHANDLERS.txt @@ -17,7 +17,7 @@ other qemu events in the future. ---------------------------------------------------- Any event emitted by qemu is received by -qemu_monitor_json.c:qemuMonitorJSONProcessEvent(). It looks up the +qemu_monitor_json.c:qemuMonitorJSONIOProcessEvent(). It looks up the event by name in the table eventHandlers (in the same file), which should have an entry like this for each event that libvirt understands: -- 2.11.0

2 1

[libvirt] [PATCH 1/3] bhyve: tests: add vnc test to bhyvexml2xmltest
by Roman Bogorodskiy 12 Jun '17

12 Jun '17

Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml | 41 +++++++++++++++++++++++ tests/bhyvexml2xmltest.c | 3 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml new file mode 100644 index 000000000..9e470e432 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc.xml @@ -0,0 +1,41 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904' autoport='no' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <model type='gop' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index d591576ca..b3759919e 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -104,6 +104,7 @@ mymain(void) DO_TEST_DIFFERENT("serial"); DO_TEST_DIFFERENT("serial-grub"); DO_TEST_DIFFERENT("serial-grub-nocons"); + DO_TEST_DIFFERENT("vnc"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); @@ -127,7 +128,7 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN(mymain) +VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/bhyvexml2argvmock.so") #else -- 2.12.1

2 2

[libvirt] [PATCH] qemu: hotplug: Release address properly when redirected device attach failure
by Shivaprasad G Bhat 12 Jun '17

12 Jun '17

The virDomainUSBAddressEnsure returns 0 or -1 and checking for 1 is wrong. Fix it. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_hotplug.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4a7d997..f339148 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1707,7 +1707,6 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn, virDomainRedirdevDefPtr redirdev) { int ret = -1; - int rc; qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDefPtr def = vm->def; char *charAlias = NULL; @@ -1724,10 +1723,9 @@ int qemuDomainAttachRedirdevDevice(virConnectPtr conn, if (!(charAlias = qemuAliasChardevFromDevAlias(redirdev->info.alias))) goto cleanup; - if ((rc = virDomainUSBAddressEnsure(priv->usbaddrs, &redirdev->info)) < 0) + if ((virDomainUSBAddressEnsure(priv->usbaddrs, &redirdev->info)) < 0) goto cleanup; - if (rc == 1) - need_release = true; + need_release = true; if (!(devstr = qemuBuildRedirdevDevStr(def, redirdev, priv->qemuCaps))) goto cleanup;

2 1

[libvirt] [PATCH] bhyve: add support for video device configuration
by Roman Bogorodskiy 12 Jun '17

12 Jun '17

Connect domain XML <driver vgaconf=""> configuration (introduced in a previous patch) to bhyve command generation. Unfortunately, this option was documented just recently and at the time of writing official online manpages didn't have it updated, so for now one can refer to: https://github.com/freebsd/freebsd/blob/master/usr.sbin/bhyve/bhyve.8#L327 for the detailed description of the possible vga configuration options. Also, add some tests for this new feature. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/bhyve/bhyve_command.c | 4 ++ .../bhyvexml2argv-vnc-vgaconf.args | 12 ++++++ .../bhyvexml2argv-vnc-vgaconf.ldargs | 1 + .../bhyvexml2argv-vnc-vgaconf.xml | 31 ++++++++++++++++ tests/bhyvexml2argvtest.c | 1 + .../bhyvexml2xmlout-vnc-vgaconf.xml | 43 ++++++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 7 files changed, 93 insertions(+) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index eae5cb3ca..f70e3bc60 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -408,6 +408,10 @@ bhyveBuildGraphicsArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, _("Unsupported listen type")); } + if (video->driver) + virBufferAsprintf(&opt, ",vga=%s", + virDomainVideoVgaconfTypeToString(video->driver->vgaconf)); + virCommandAddArg(cmd, "-s"); virCommandAddArgBuffer(cmd, &opt); return 0; diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.args new file mode 100644 index 000000000..70347ee0b --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.args @@ -0,0 +1,12 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-l bootrom,/path/to/test.fd \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=off \ +-s 1,lpc bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.ldargs new file mode 100644 index 000000000..421376db9 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.ldargs @@ -0,0 +1 @@ +dummy diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.xml new file mode 100644 index 000000000..f1bcd1bde --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf.xml @@ -0,0 +1,31 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader readonly="yes" type="pflash">/path/to/test.fd</loader> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <model type='gop' heads='1' primary='yes'> + <driver vgaconf='off'/> + </model> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index c8f8c685a..a369a447a 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -193,6 +193,7 @@ mymain(void) DO_TEST("net-e1000"); DO_TEST("uefi"); DO_TEST("vnc"); + DO_TEST("vnc-vgaconf"); /* Address allocation tests */ DO_TEST("addr-single-sata-disk"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf.xml new file mode 100644 index 000000000..6cc1aa088 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-vnc-vgaconf.xml @@ -0,0 +1,43 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64'>hvm</type> + <loader readonly='yes' type='pflash'>/path/to/test.fd</loader> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + <graphics type='vnc' port='5904' autoport='no' listen='127.0.0.1'> + <listen type='address' address='127.0.0.1'/> + </graphics> + <video> + <model type='gop' heads='1' primary='yes'> + <driver vgaconf='off'/> + </model> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </video> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index b3759919e..70e4caeb3 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -105,6 +105,7 @@ mymain(void) DO_TEST_DIFFERENT("serial-grub"); DO_TEST_DIFFERENT("serial-grub-nocons"); DO_TEST_DIFFERENT("vnc"); + DO_TEST_DIFFERENT("vnc-vgaconf"); /* Address allocation tests */ DO_TEST_DIFFERENT("addr-single-sata-disk"); -- 2.12.1

2 4

[libvirt] [PATCH 1/2] conf: add video driver configuration element
by Roman Bogorodskiy 12 Jun '17

12 Jun '17

Add support for video driver configuration. In domain xml it looks like this: <video> <model type=''> <driver .../> </model> </video> At present, the only supported configuration is 'vgaconf' that looks this way: <driver vgaconf='io|on|off'> It was added with bhyve gop video in mind to allow users control how the video device is exposed to the guest, specifically, how VGA I/O is handled. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- docs/schemas/domaincommon.rng | 13 +++++++++ src/conf/domain_conf.c | 63 +++++++++++++++++++++++++++++++++++++++++-- src/conf/domain_conf.h | 17 ++++++++++++ src/libvirt_private.syms | 2 ++ 4 files changed, 93 insertions(+), 2 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 281309ec0..f45820383 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3278,6 +3278,19 @@ </optional> </element> </optional> + <optional> + <element name="driver"> + <optional> + <attribute name="vgaconf"> + <choice> + <value>io</value> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> + </element> + </optional> </element> </optional> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0ff216e3a..2ab55b52f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -553,6 +553,11 @@ VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "virtio", "gop") +VIR_ENUM_IMPL(virDomainVideoVgaconf, VIR_DOMAIN_VIDEO_VGACONF_LAST, + "io", + "on", + "off") + VIR_ENUM_IMPL(virDomainInput, VIR_DOMAIN_INPUT_TYPE_LAST, "mouse", "tablet", @@ -2280,6 +2285,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def) virDomainDeviceInfoClear(&def->info); VIR_FREE(def->accel); + VIR_FREE(def->driver); VIR_FREE(def); } @@ -13368,6 +13374,43 @@ virDomainVideoAccelDefParseXML(xmlNodePtr node) return def; } +static virDomainVideoDriverDefPtr +virDomainVideoDriverDefParseXML(xmlNodePtr node) +{ + xmlNodePtr cur; + virDomainVideoDriverDefPtr def; + char *vgaconf = NULL; + int val; + + cur = node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (!vgaconf && + xmlStrEqual(cur->name, BAD_CAST "driver")) { + vgaconf = virXMLPropString(cur, "vgaconf"); + } + } + cur = cur->next; + } + + if (!vgaconf) + return NULL; + + if (VIR_ALLOC(def) < 0) + goto cleanup; + + if ((val = virDomainVideoVgaconfTypeFromString(vgaconf)) <= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown vgaconf value '%s'"), vgaconf); + goto cleanup; + } + def->vgaconf = val; + + cleanup: + VIR_FREE(vgaconf); + return def; +} + static virDomainVideoDefPtr virDomainVideoDefParseXML(xmlNodePtr node, const virDomainDef *dom, @@ -13405,6 +13448,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, } def->accel = virDomainVideoAccelDefParseXML(cur); + def->driver = virDomainVideoDriverDefParseXML(cur); } } cur = cur->next; @@ -22998,6 +23042,18 @@ virDomainVideoAccelDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } +static void +virDomainVideoDriverDefFormat(virBufferPtr buf, + virDomainVideoDriverDefPtr def) +{ + virBufferAddLit(buf, "<driver"); + if (def->vgaconf) { + virBufferAsprintf(buf, " vgaconf='%s'", + virDomainVideoVgaconfTypeToString(def->vgaconf)); + } + virBufferAddLit(buf, "/>\n"); +} + static int virDomainVideoDefFormat(virBufferPtr buf, @@ -23028,10 +23084,13 @@ virDomainVideoDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " heads='%u'", def->heads); if (def->primary) virBufferAddLit(buf, " primary='yes'"); - if (def->accel) { + if (def->accel || def->driver) { virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); - virDomainVideoAccelDefFormat(buf, def->accel); + if (def->accel) + virDomainVideoAccelDefFormat(buf, def->accel); + if (def->driver) + virDomainVideoDriverDefFormat(buf, def->driver); virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</model>\n"); } else { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 09fb7aada..cbf25a67b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1350,6 +1350,16 @@ typedef enum { } virDomainVideoType; +typedef enum { + VIR_DOMAIN_VIDEO_VGACONF_IO = 0, + VIR_DOMAIN_VIDEO_VGACONF_ON, + VIR_DOMAIN_VIDEO_VGACONF_OFF, + + VIR_DOMAIN_VIDEO_VGACONF_LAST +} virDomainVideoVgaconf; + +VIR_ENUM_DECL(virDomainVideoVgaconf) + typedef struct _virDomainVideoAccelDef virDomainVideoAccelDef; typedef virDomainVideoAccelDef *virDomainVideoAccelDefPtr; struct _virDomainVideoAccelDef { @@ -1358,6 +1368,12 @@ struct _virDomainVideoAccelDef { }; +typedef struct _virDomainVideoDriverDef virDomainVideoDriverDef; +typedef virDomainVideoDriverDef *virDomainVideoDriverDefPtr; +struct _virDomainVideoDriverDef { + virDomainVideoVgaconf vgaconf; +}; + struct _virDomainVideoDef { int type; unsigned int ram; /* kibibytes (multiples of 1024) */ @@ -1367,6 +1383,7 @@ struct _virDomainVideoDef { unsigned int heads; bool primary; virDomainVideoAccelDefPtr accel; + virDomainVideoDriverDefPtr driver; virDomainDeviceInfo info; }; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index e6901a8f1..40995533c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -525,6 +525,8 @@ virDomainVideoDefaultType; virDomainVideoDefFree; virDomainVideoTypeFromString; virDomainVideoTypeToString; +virDomainVideoVgaconfTypeFromString; +virDomainVideoVgaconfTypeToString; virDomainVirtTypeFromString; virDomainVirtTypeToString; virDomainWatchdogActionTypeFromString; -- 2.12.1

2 2

[libvirt] [PATCH 1/2] util: rename qemuGetProcessInfo to virProcessGetStat
by Wang King 12 Jun '17

12 Jun '17

qemuGetProcessInfo is more likely a process utility function, just rename it to virProcessGetStat and move it to virprocess.c source file. --- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 83 ++++++++++-------------------------------------- src/util/virprocess.c | 62 ++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 4 +++ 4 files changed, 83 insertions(+), 67 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d361454..3681869 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2382,6 +2382,7 @@ virProcessGetMaxMemLock; virProcessGetNamespaces; virProcessGetPids; virProcessGetStartTime; +virProcessGetStat; virProcessKill; virProcessKillPainfully; virProcessNamespaceAvailable; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6c79d4f..a4aa5da 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1378,68 +1378,6 @@ qemuGetSchedInfo(unsigned long long *cpuWait, return ret; } - -static int -qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, - pid_t pid, int tid) -{ - char *proc; - FILE *pidinfo; - unsigned long long usertime = 0, systime = 0; - long rss = 0; - int cpu = 0; - int ret; - - /* In general, we cannot assume pid_t fits in int; but /proc parsing - * is specific to Linux where int works fine. */ - if (tid) - ret = virAsprintf(&proc, "/proc/%d/task/%d/stat", (int) pid, tid); - else - ret = virAsprintf(&proc, "/proc/%d/stat", (int) pid); - if (ret < 0) - return -1; - - pidinfo = fopen(proc, "r"); - VIR_FREE(proc); - - /* See 'man proc' for information about what all these fields are. We're - * only interested in a very few of them */ - if (!pidinfo || - fscanf(pidinfo, - /* pid -> stime */ - "%*d (%*[^)]) %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu" - /* cutime -> endcode */ - "%*d %*d %*d %*d %*d %*d %*u %*u %ld %*u %*u %*u" - /* startstack -> processor */ - "%*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %d", - &usertime, &systime, &rss, &cpu) != 4) { - VIR_WARN("cannot parse process status data"); - } - - /* We got jiffies - * We want nanoseconds - * _SC_CLK_TCK is jiffies per second - * So calculate thus.... - */ - if (cpuTime) - *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) - / (unsigned long long)sysconf(_SC_CLK_TCK); - if (lastCpu) - *lastCpu = cpu; - - if (vm_rss) - *vm_rss = rss * virGetSystemPageSizeKB(); - - - VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld", - (int) pid, tid, usertime, systime, cpu, rss); - - VIR_FORCE_FCLOSE(pidinfo); - - return 0; -} - - static int qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, @@ -1482,9 +1420,9 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, vcpuinfo->number = i; vcpuinfo->state = VIR_VCPU_RUNNING; - if (qemuGetProcessInfo(&vcpuinfo->cpuTime, - &vcpuinfo->cpu, NULL, - vm->pid, vcpupid) < 0) { + if (virProcessGetStat(vm->pid, vcpupid, + &vcpuinfo->cpuTime, + &vcpuinfo->cpu, NULL) < 0) { virReportSystemError(errno, "%s", _("cannot get vCPU placement & pCPU time")); return -1; @@ -2641,7 +2579,7 @@ qemuDomainGetInfo(virDomainPtr dom, } if (virDomainObjIsActive(vm)) { - if (qemuGetProcessInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) { + if (virProcessGetStat(vm->pid, 0, &(info->cpuTime), NULL, NULL) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot read cputime for domain")); goto cleanup; @@ -8172,6 +8110,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; bool force = (flags & VIR_DOMAIN_DEVICE_MODIFY_FORCE) != 0; int ret = -1; + virQEMUCapsPtr qemuCaps = NULL; + qemuDomainObjPrivatePtr priv; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE; @@ -8190,6 +8130,8 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; + priv = vm->privateData; + if (virDomainUpdateDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; @@ -8216,6 +8158,12 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, goto endjob; } + if (priv->qemuCaps) + qemuCaps = virObjectRef(priv->qemuCaps); + else if (!(qemuCaps = virQEMUCapsCacheLookup(caps, driver->qemuCapsCache, + vm->def->emulator))) + goto endjob; + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { /* Make a copy for updated domain. */ vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt); @@ -8263,6 +8211,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, qemuDomainObjEndJob(driver, vm); cleanup: + virObjectUnref(qemuCaps); virDomainDefFree(vmdef); if (dev != dev_copy) virDomainDeviceDefFree(dev_copy); @@ -11107,7 +11056,7 @@ qemuDomainMemoryStatsInternal(virQEMUDriverPtr driver, ret = 0; } - if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) { + if (virProcessGetStat(vm->pid, 0, NULL, NULL, &rss) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot get RSS for domain")); } else { diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 1fbbbb3..98f4b25 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1426,3 +1426,65 @@ virProcessSetScheduler(pid_t pid ATTRIBUTE_UNUSED, } #endif /* !HAVE_SCHED_SETSCHEDULER */ + +int +virProcessGetStat(pid_t pid, int tid, + unsigned long long *cpuTime, + int *lastCpu, long *vm_rss) +{ + char *proc; + FILE *pidinfo; + unsigned long long usertime = 0, systime = 0; + long rss = 0; + int cpu = 0; + int ret; + + /* In general, we cannot assume pid_t fits in int; but /proc parsing + * is specific to Linux where int works fine. */ + if (tid) + ret = virAsprintf(&proc, "/proc/%d/task/%d/stat", (int) pid, tid); + else + ret = virAsprintf(&proc, "/proc/%d/stat", (int) pid); + if (ret < 0) + return -1; + + pidinfo = fopen(proc, "r"); + VIR_FREE(proc); + + /* See 'man proc' for information about what all these fields are. We're + * only interested in a very few of them */ + if (!pidinfo || + fscanf(pidinfo, + /* pid -> stime */ + "%*d (%*[^)]) %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu" + /* cutime -> endcode */ + "%*d %*d %*d %*d %*d %*d %*u %*u %ld %*u %*u %*u" + /* startstack -> processor */ + "%*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %d", + &usertime, &systime, &rss, &cpu) != 4) { + VIR_WARN("cannot parse process status data"); + } + + /* We got jiffies + * We want nanoseconds + * _SC_CLK_TCK is jiffies per second + * So calculate thus.... + */ + if (cpuTime) + *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) + / (unsigned long long)sysconf(_SC_CLK_TCK); + if (lastCpu) + *lastCpu = cpu; + + if (vm_rss) + *vm_rss = rss * virGetSystemPageSizeKB(); + + + VIR_DEBUG("Got status for %d/%d user=%llu sys=%llu cpu=%d rss=%ld", + (int) pid, tid, usertime, systime, cpu, rss); + + VIR_FORCE_FCLOSE(pidinfo); + + return 0; + +} diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 3c5a882..2a2b91d 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -106,4 +106,8 @@ typedef enum { int virProcessNamespaceAvailable(unsigned int ns); +int virProcessGetStat(pid_t pid, int tid, + unsigned long long *cpuTime, + int *lastCpu, long *vm_rss); + #endif /* __VIR_PROCESS_H__ */ -- 2.8.3

2 2