- Devel - libvirt List Archives

[libvirt] [PATCH v4 1/2] daemon: Fix domain name leak in error path
by Wang King 25 Apr '17

25 Apr '17

Domain name duplicated in make_nonnull_domain, but not freed when virTypedParamsSerialize return negative. --- daemon/remote.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1610fea..a8c21fd 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1066,8 +1066,10 @@ remoteRelayDomainEventTunable(virConnectPtr conn, if (virTypedParamsSerialize(params, nparams, (virTypedParameterRemotePtr *) &data.params.params_val, &data.params.params_len, - VIR_TYPED_PARAM_STRING_OKAY) < 0) + VIR_TYPED_PARAM_STRING_OKAY) < 0) { + VIR_FREE(data.dom.name); return -1; + } remoteDispatchObjectEventSend(callback->client, remoteProgram, REMOTE_PROC_DOMAIN_EVENT_CALLBACK_TUNABLE, @@ -1206,8 +1208,10 @@ remoteRelayDomainEventJobCompleted(virConnectPtr conn, if (virTypedParamsSerialize(params, nparams, (virTypedParameterRemotePtr *) &data.params.params_val, &data.params.params_len, - VIR_TYPED_PARAM_STRING_OKAY) < 0) + VIR_TYPED_PARAM_STRING_OKAY) < 0) { + VIR_FREE(data.dom.name); return -1; + } remoteDispatchObjectEventSend(callback->client, remoteProgram, REMOTE_PROC_DOMAIN_EVENT_CALLBACK_JOB_COMPLETED, -- 2.8.3

2 3

[libvirt] [PATCH] qemu: fix argument of virDomainNetGetActualDirectMode
by ZhiPeng Lu 25 Apr '17

25 Apr '17

it should be a comparison of modes between new and old devices. So the argument of the second virDomainNetGetActualDirectMode should be newdev. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 120bcdc..eec99af 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3273,7 +3273,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, if (STRNEQ_NULLABLE(virDomainNetGetActualDirectDev(olddev), virDomainNetGetActualDirectDev(newdev)) || - virDomainNetGetActualDirectMode(olddev) != virDomainNetGetActualDirectMode(olddev) || + virDomainNetGetActualDirectMode(olddev) != virDomainNetGetActualDirectMode(newdev) || !virNetDevVPortProfileEqual(virDomainNetGetActualVirtPortProfile(olddev), virDomainNetGetActualVirtPortProfile(newdev)) || !virNetDevVlanEqual(virDomainNetGetActualVlan(olddev), -- 1.8.3.1

2 1

[libvirt] [PATCH v2] autogen.sh: Improve and generalize
by Andrea Bolognani 25 Apr '17

25 Apr '17

The goal is twofold: firstly, we want to extend the script so that it can deal with more than a single git submodule, and secondly we'd like to reduce the amount of duplicated code. Moreover, since we're making heavy changes to the code anyway, we might as well make sure it follows a somewhat consistent coding style too. To reduce code duplication, we introduce a new --dry-run option, which can be used by third parties to figure out whether calling autogen.sh is necessary or not: this allows us to get rid of the reimplementation of part of the logic in cfg.mk and guarantee they'll never get out of sync. Other changes include: making dirty submodules checking and cleaning entirely independent of other operations; removing the use of 'set -e' and handling errors explicitly instead; better parsing of command line arguments. --- Changes from [v1]: * drop the generic submodule update framework and simply update all submodules unconditionally, *then* perform any required gnulib-specific step; * handle "autogen not required" and "dry run error" differently in cfg.mk; * improve comments. [v1] https://www.redhat.com/archives/libvir-list/2017-April/msg00816.html autogen.sh | 253 ++++++++++++++++++++++++++++++++++++++++--------------------- cfg.mk | 53 ++++++------- 2 files changed, 193 insertions(+), 113 deletions(-) diff --git a/autogen.sh b/autogen.sh index d1c319d..d5d836a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,117 +1,196 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -set -e +die() +{ + echo "error: $1" >&2 + exit 1 +} -srcdir=`dirname "$0"` -test -z "$srcdir" && srcdir=. +starting_point=$(pwd) -THEDIR=`pwd` -cd "$srcdir" +srcdir=$(dirname "$0") +test "$srcdir" || srcdir=. -test -f src/libvirt.c || { - echo "You must run this script in the top-level libvirt directory" - exit 1 +cd "$srcdir" || { + die "Failed to cd into $srcdir" } +test -f src/libvirt.c || { + die "$0 must live in the top-level libvirt directory" +} -EXTRA_ARGS= +dry_run= no_git= -if test "x$1" = "x--no-git"; then - no_git=" $1" - shift - case "$1 $2" in - --gnulib-srcdir=*) no_git="$no_git $1"; shift ;; - --gnulib-srcdir\ *) no_git="$no_git $1=$2"; shift; shift;; - esac -fi -if test -z "$NOCONFIGURE" ; then - if test "x$1" = "x--system"; then - shift - prefix=/usr - libdir=$prefix/lib - sysconfdir=/etc - localstatedir=/var - if [ -d /usr/lib64 ]; then - libdir=$prefix/lib64 - fi - EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir" - echo "Running ./configure with $EXTRA_ARGS $@" - else - if test -z "$*" && test ! -f "$THEDIR/config.status"; then - echo "I am going to run ./configure with no arguments - if you wish" - echo "to pass any to it, please specify them on the $0 command line." - fi - fi -fi +gnulib_srcdir= +extra_args= +while test "$#" -gt 0; do + case "$1" in + --dry-run) + # This variable will serve both as an indicator of the fact that + # a dry run has been requested, and to store the result of the + # dry run. It will be ultimately used as return code for the + # script: 0 means no action is necessary, 2 means that autogen.sh + # needs to be executed, and 1 is reserved for failures + dry_run=0 + shift + ;; + --no-git) + no_git=" $1" + shift + ;; + --gnulib-srcdir=*) + gnulib_srcdir=" $1" + shift + ;; + --gnulib-srcdir) + gnulib_srcdir=" $1=$2" + shift + shift + ;; + --system) + prefix=/usr + sysconfdir=/etc + localstatedir=/var + if test -d $prefix/lib64; then + libdir=$prefix/lib64 + else + libdir=$prefix/lib + fi + extra_args="--prefix=$prefix --localstatedir=$localstatedir" + extra_args="$extra_args --sysconfdir=$sysconfdir --libdir=$libdir" + shift + ;; + *) + # All remaining arguments will be passed to configure verbatim + break + ;; + esac +done +no_git="$no_git$gnulib_srcdir" -# Compute the hash we'll use to determine whether rerunning bootstrap -# is required. The first is just the SHA1 that selects a gnulib snapshot. -# The second ensures that whenever we change the set of gnulib modules used -# by this package, we rerun bootstrap to pull in the matching set of files. -# The third ensures that whenever we change the set of local gnulib diffs, -# we rerun bootstrap to pull in those diffs. -bootstrap_hash() +gnulib_hash() { + local no_git=$1 + if test "$no_git"; then - echo no-git + echo "no-git" return fi - git submodule status | sed 's/^[ +-]//;s/ .*//' + + # Compute the hash we'll use to determine whether rerunning bootstrap + # is required. The first is just the SHA1 that selects a gnulib snapshot. + # The second ensures that whenever we change the set of gnulib modules used + # by this package, we rerun bootstrap to pull in the matching set of files. + # The third ensures that whenever we change the set of local gnulib diffs, + # we rerun bootstrap to pull in those diffs. + git submodule status .gnulib | awk '{ print $1 }' git hash-object bootstrap.conf - git ls-tree -d HEAD gnulib/local | awk '{print $3}' + git ls-tree -d HEAD gnulib/local | awk '{ print $3 }' } -# Ensure that whenever we pull in a gnulib update or otherwise change to a -# different version (i.e., when switching branches), we also rerun ./bootstrap. -# Also, running 'make rpm' tends to litter the po/ directory, and some people -# like to run 'git clean -x -f po' to fix it; but only ./bootstrap regenerates -# the required file po/Makevars. -# Only run bootstrap from a git checkout, never from a tarball. +# Only look into git submodules if we're in a git checkout if test -d .git || test -f .git; then - curr_status=.git-module-status t= - if test "$no_git"; then - t=no-git - elif test -d .gnulib; then - t=$(bootstrap_hash; git diff .gnulib) + + # Check for dirty submodules + if test -z "$CLEAN_SUBMODULE"; then + for path in $(git submodule status | awk '{ print $2 }'); do + case "$(git diff "$path")" in + *-dirty*) + echo "error: $path is dirty, please investigate" >&2 + echo "set CLEAN_SUBMODULE to discard submodule changes" >&2 + exit 1 + ;; + esac + done fi - case $t:${CLEAN_SUBMODULE+set} in - *:set) ;; - *-dirty*) - echo "error: gnulib submodule is dirty, please investigate" 2>&1 - echo "set env-var CLEAN_SUBMODULE to discard gnulib changes" 2>&1 - exit 1 ;; - esac - # Keep this test in sync with cfg.mk:_update_required - if test "$t" = "$(cat $curr_status 2>/dev/null)" \ - && test -f "po/Makevars" && test -f AUTHORS; then - # good, it's up to date, all we need is autoreconf - autoreconf -if + if test "$CLEAN_SUBMODULE" && test -z "$no_git"; then + if test -z "$dry_run"; then + echo "Cleaning up submodules..." + git submodule foreach 'git clean -dfqx && git reset --hard' || { + die "Cleaning up submodules failed" + } + fi + fi + + # Update all submodules. If any of the submodules has not been + # initialized yet, it will be initialized now; moreover, any submodule + # with uncommitted changes will be returned to the expected state + echo "Updating submodules..." + git submodule update --init || { + die "Updating submodules failed" + } + + # The expected hash, eg. the one computed after the last + # successful bootstrap run, is stored on disk + state_file=.git-module-status + expected_hash=$(cat "$state_file" 2>/dev/null) + actual_hash=$(gnulib_hash "$no_git") + + if test "$actual_hash" = "$expected_hash" && \ + test -f po/Makevars && test -f AUTHORS; then + # The gnulib hash matches our expectations, and all the files + # that can only be generated through bootstrap are present: + # we just need to run autoreconf. Unless we're performing a + # dry run, of course... + if test -z "$dry_run"; then + echo "Running autoreconf..." + autoreconf -if || { + die "autoreconf failed" + } + fi else - if test -z "$no_git" && test ${CLEAN_SUBMODULE+set}; then - echo cleaning up submodules... - git submodule foreach 'git clean -dfqx && git reset --hard' + # Whenever the gnulib submodule or any of the related bits + # has been changed in some way (see gnulib_hash) we need to + # run bootstrap again. If we're performing a dry run, we + # change the return code instead to signal our caller + if test "$dry_run"; then + dry_run=2 + else + echo "Running bootstrap..." + ./bootstrap$no_git --bootstrap-sync || { + die "bootstrap failed" + } + gnulib_hash >"$state_file" fi - echo running bootstrap$no_git... - ./bootstrap$no_git --bootstrap-sync && bootstrap_hash > $curr_status \ - || { echo "Failed to bootstrap, please investigate."; exit 1; } fi fi -test -n "$NOCONFIGURE" && exit 0 +# When performing a dry run, we can stop here +test "$dry_run" && exit "$dry_run" -cd "$THEDIR" +# If asked not to run configure, we can stop here +test "$NOCONFIGURE" && exit 0 -if test "x$OBJ_DIR" != x; then - mkdir -p "$OBJ_DIR" - cd "$OBJ_DIR" +cd "$starting_point" || { + die "Failed to cd into $starting_point" +} + +if test "$OBJ_DIR"; then + mkdir -p "$OBJ_DIR" || { + die "Failed to create $OBJ_DIR" + } + cd "$OBJ_DIR" || { + die "Failed to cd into $OBJ_DIR" + } fi -if test -z "$*" && test -z "$EXTRA_ARGS" && test -f config.status; then - ./config.status --recheck +if test -z "$*" && test -z "$extra_args" && test -f config.status; then + echo "Running config.status..." + ./config.status --recheck || { + die "config.status failed" + } else - $srcdir/configure $EXTRA_ARGS "$@" -fi && { - echo - echo "Now type 'make' to compile libvirt." -} + if test -z "$*" && test -z "$extra_args"; then + echo "I am going to run configure with no arguments - if you wish" + echo "to pass any to it, please specify them on the $0 command line." + else + echo "Running configure with $extra_args $@" + fi + "$srcdir/configure" $extra_args "$@" || { + die "configure failed" + } +fi + +echo +echo "Now type 'make' to compile libvirt." diff --git a/cfg.mk b/cfg.mk index 09548fe..c04a991 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1026,33 +1026,30 @@ prev_version_file = /dev/null ifneq ($(_gl-Makefile),) ifeq (0,$(MAKELEVEL)) - _curr_status = .git-module-status - # The sed filter accommodates those who check out on a commit from which - # no tag is reachable. In that case, git submodule status prints a "-" - # in column 1 and does not print a "git describe"-style string after the - # submodule name. Contrast these: - # -b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib - # b653eda3ac4864de205419d9f41eec267cb89eeb .gnulib (v0.0-2286-gb653eda) - # $ cat .git-module-status - # b653eda3ac4864de205419d9f41eec267cb89eeb - # - # Keep this logic in sync with autogen.sh. - _submodule_hash = $(SED) 's/^[ +-]//;s/ .*//' - _update_required := $(shell \ - cd '$(srcdir)'; \ - test -d .git || { echo 0; exit; }; \ - test -f po/Makevars || { echo 1; exit; }; \ - test -f AUTHORS || { echo 1; exit; }; \ - test "no-git" = "$$(cat $(_curr_status))" && { echo 0; exit; }; \ - actual=$$(git submodule status | $(_submodule_hash); \ - git hash-object bootstrap.conf; \ - git ls-tree -d HEAD gnulib/local | awk '{print $$3}'; \ - git diff .gnulib); \ - stamp="$$($(_submodule_hash) $(_curr_status) 2>/dev/null)"; \ - test "$$stamp" = "$$actual"; echo $$?) + _dry_run_result := $(shell \ + cd '$(srcdir)'; \ + test -d .git || test -f .git || { echo 0; exit; }; \ + $(srcdir)/autogen.sh --dry-run >/dev/null 2>&1; \ + echo $$?; \ + ) _clean_requested = $(filter %clean,$(MAKECMDGOALS)) - ifeq (1,$(_update_required)$(_clean_requested)) - $(info INFO: gnulib update required; running ./autogen.sh first) + + # A return value of 0 means no action is required + + # A return value of 1 means a genuine error has occurred while + # performing the dry run, and it should be reported so it can + # be investigated + ifeq (1,$(_dry_run_result)) + $(info INFO: autogen.sh error, running again to show details) +maint.mk Makefile: _autogen_error + endif + + # A return value of 2 means that autogen.sh needs to be executed + # in earnest before building, probably because of gnulib updates. + # We don't run autogen.sh if the clean target has been invoked, + # though, as it would be quite pointless + ifeq (2,$(_dry_run_result)$(_clean_requested)) + $(info INFO: running autogen.sh is required, running it now...) $(shell touch $(srcdir)/AUTHORS $(srcdir)/ChangeLog) maint.mk Makefile: _autogen endif @@ -1066,6 +1063,10 @@ _autogen: $(srcdir)/autogen.sh ./config.status +.PHONY: _autogen_error +_autogen_error: + $(srcdir)/autogen.sh --dry-run + # regenerate HACKING as part of the syntax-check ifneq ($(_gl-Makefile),) syntax-check: $(top_srcdir)/HACKING spacing-check test-wrap-argv \ -- 2.7.4

2 2

[libvirt] [PATCH] test: Remove unnecessary unlocks in cleanup paths
by John Ferlan 25 Apr '17

25 Apr '17

Commit id '865f479da' altered the logic to use a common test*ObjFindByName helpers which would lock/unlock the test driver; however, a few cleanup paths in that cleanup missed removing the Unlock, so remove it now. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/test/test_driver.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 00999b1..2db3f7d 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3931,7 +3931,6 @@ testInterfaceUndefine(virInterfacePtr iface) ret = 0; cleanup: - testDriverUnlock(privconn); return ret; } @@ -3960,7 +3959,6 @@ testInterfaceCreate(virInterfacePtr iface, cleanup: if (privinterface) virInterfaceObjUnlock(privinterface); - testDriverUnlock(privconn); return ret; } @@ -3989,7 +3987,6 @@ testInterfaceDestroy(virInterfacePtr iface, cleanup: if (privinterface) virInterfaceObjUnlock(privinterface); - testDriverUnlock(privconn); return ret; } @@ -4480,7 +4477,6 @@ testStoragePoolUndefine(virStoragePoolPtr pool) if (privpool) virStoragePoolObjUnlock(privpool); testObjectEventQueue(privconn, event); - testDriverUnlock(privconn); return ret; } @@ -4591,7 +4587,6 @@ testStoragePoolDestroy(virStoragePoolPtr pool) testObjectEventQueue(privconn, event); if (privpool) virStoragePoolObjUnlock(privpool); - testDriverUnlock(privconn); return ret; } -- 2.9.3

2 1

[libvirt] [PATCH] util: relax virNetDevSetCoalesce() stub
by Roman Bogorodskiy 24 Apr '17

24 Apr '17

Currently, virNetDevSetCoalesce() stub is always returning error. As it's used by virNetDevTapCreateInBridgePort(), it essentially breaks bridged networking if coalesce is not supported. To make it work, relax the stub to trigger error only when its coalesce argument is not NULL, otherwise report success. --- src/util/virnetdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 131a56a8d..131c4d983 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3155,8 +3155,11 @@ int virNetDevSetCoalesce(const char *ifname, } # else int virNetDevSetCoalesce(const char *ifname, - virNetDevCoalescePtr coalesce ATTRIBUTE_UNUSED) + virNetDevCoalescePtr coalesce) { + if (!coalesce) + return 0; + virReportSystemError(ENOSYS, _("Cannot set coalesce info on interface '%s'"), ifname); -- 2.11.0

2 2

[libvirt] [PATCH] Fix minor typos
by Yuri Chornoivan 24 Apr '17

24 Apr '17

Hi, Attached is a minor fix for the typos in libvirt's git/master. Best regards, Yuri P. S. Sorry for the lame format. My mail provider rejects direct sending emails from git send.

2 1

[libvirt] [PATCH go-xml] Support for filesystem devices
by Ryan Goodfellow 24 Apr '17

24 Apr '17

This commit adds filesystem device support. A new family of types DomainFilesystem* are introduced and plumbed into the DomainDeviceList struct. Testing has also been included. --- domain.go | 40 ++++++++++++++++++++++++++++++++++++++++ domain_test.go | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+) diff --git a/domain.go b/domain.go index 307c71c..cccd9a6 100644 --- a/domain.go +++ b/domain.go @@ -81,6 +81,45 @@ type DomainDisk struct { Target *DomainDiskTarget `xml:"target"` } +type DomainFilesystemDriver struct { + Type string `xml:"type,attr"` + Name string `xml:"name,attr,omitempty"` + WRPolicy string `xml:"wrpolicy,attr,omitempty"` +} + +type DomainFilesystemSource struct { + Dir string `xml:"dir,attr,omitempty"` + File string `xml:"file,attr,omitempty"` +} + +type DomainFilesystemTarget struct { + Dir string `xml:"dir,attr"` +} + +type DomainFilesystemReadOnly struct { +} + +type DomainFilesystemSpaceHardLimit struct { + Value int `xml:",chardata"` + Unit string `xml:"unit,attr,omitempty"` +} + +type DomainFilesystemSpaceSoftLimit struct { + Value int `xml:",chardata"` + Unit string `xml:"unit,attr,omitempty"` +} + +type DomainFilesystem struct { + Type string `xml:"type,attr"` + AccessMode string `xml:"accessmode,attr"` + Driver *DomainFilesystemDriver `xml:"driver"` + Source *DomainFilesystemSource `xml:"source"` + Target *DomainFilesystemTarget `xml:"target"` + ReadOnly *DomainFilesystemReadOnly `xml:"readonly"` + SpaceHardLimit *DomainFilesystemSpaceHardLimit `xml:"space_hard_limit"` + SpaceSoftLimit *DomainFilesystemSpaceSoftLimit `xml:"space_soft_limit"` +} + type DomainInterfaceMAC struct { Address string `xml:"address,attr"` } @@ -212,6 +251,7 @@ type DomainVideo struct { type DomainDeviceList struct { Controllers []DomainController `xml:"controller"` Disks []DomainDisk `xml:"disk"` + Filesystems []DomainFilesystem `xml:"filesystem"` Interfaces []DomainInterface `xml:"interface"` Serials []DomainChardev `xml:"serial"` Consoles []DomainChardev `xml:"console"` diff --git a/domain_test.go b/domain_test.go index e5347ea..06d585c 100644 --- a/domain_test.go +++ b/domain_test.go @@ -690,6 +690,61 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Type: "kvm", + Name: "test", + Devices: &DomainDeviceList{ + Filesystems: []DomainFilesystem{ + DomainFilesystem{ + Type: "mount", + AccessMode: "mapped", + Driver: &DomainFilesystemDriver{ + Type: "path", + WRPolicy: "immediate", + }, + Source: &DomainFilesystemSource{ + Dir: "/home/user/test", + }, + Target: &DomainFilesystemTarget{ + Dir: "user-test-mount", + }, + }, + DomainFilesystem{ + Type: "file", + AccessMode: "passthrough", + Driver: &DomainFilesystemDriver{ + Name: "loop", + Type: "raw", + }, + Source: &DomainFilesystemSource{ + File: "/home/user/test.img", + }, + Target: &DomainFilesystemTarget{ + Dir: "user-file-test-mount", + }, + }, + }, + }, + }, + Expected: []string{ + `<domain type="kvm">`, + ` <name>test</name>`, + ` <devices>`, + ` <filesystem type="mount" accessmode="mapped">`, + ` <driver type="path" wrpolicy="immediate"></driver>`, + ` <source dir="/home/user/test"></source>`, + ` <target dir="user-test-mount"></target>`, + ` </filesystem>`, + ` <filesystem type="file" accessmode="passthrough">`, + ` <driver type="raw" name="loop"></driver>`, + ` <source file="/home/user/test.img"></source>`, + ` <target dir="user-file-test-mount"></target>`, + ` </filesystem>`, + ` </devices>`, + `</domain>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.11.0

2 3

[libvirt] [PATCH] [PATCH] rpc: fix keep alive timer segfault
by Yi Wang 24 Apr '17

24 Apr '17

ka maybe have been freeed in virObjectUnref, application using virKeepAliveTimer will segfault when unlock ka. We should keep ka's refs positive before using it. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/rpc/virkeepalive.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index c9faf88..4f666fd 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -160,17 +160,17 @@ virKeepAliveTimer(int timer ATTRIBUTE_UNUSED, void *opaque) bool dead; void *client; + virObjectRef(ka); virObjectLock(ka); client = ka->client; dead = virKeepAliveTimerInternal(ka, &msg); + virObjectUnlock(ka); + if (!dead && !msg) goto cleanup; - virObjectRef(ka); - virObjectUnlock(ka); - if (dead) { ka->deadCB(client); } else if (ka->sendCB(client, msg) < 0) { @@ -178,11 +178,8 @@ virKeepAliveTimer(int timer ATTRIBUTE_UNUSED, void *opaque) virNetMessageFree(msg); } - virObjectLock(ka); - virObjectUnref(ka); - cleanup: - virObjectUnlock(ka); + virObjectUnref(ka); } -- 1.8.3.1

4 5

[libvirt] [PATCH v2 0/2] Fix possible use-after-free when sending event message
by John Ferlan 24 Apr '17

24 Apr '17

v1: https://www.redhat.com/archives/libvir-list/2017-March/msg01228.html Change since v1, add the derefFcn as an argument to the renamed macro (not quite sure how I missed that originally. John Ferlan (2): daemon: Rework remoteClientFreeFunc cleanup loops into C macro remote: Fix possible use-after-free when sending event message daemon/remote.c | 164 ++++++++++++++++++++------------------------------------ 1 file changed, 58 insertions(+), 106 deletions(-) -- 2.9.3

3 7

[libvirt] [PATCH] util: fix virNetDevSetCoalesce fallback on Win32/FreeBSD
by Daniel P. Berrange 23 Apr '17

23 Apr '17

The current fallback stub for virNetDevSetCoalesce is inside an earlier conditional block. This deals with the feature being missing on older Linux platforms. We need a second fallback stub though, outside the top level conditional, to ensure builds work on Win32/FreeBSD platforms too. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix src/util/virnetdev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 6ff1b48..27f1637 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3207,6 +3207,15 @@ virNetDevGetFeatures(const char *ifname ATTRIBUTE_UNUSED, ifname); return 0; } + +int virNetDevSetCoalesce(const char *ifname, + virNetDevCoalescePtr coalesce ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, + _("Cannot set coalesce info on interface '%s'"), + ifname); + return -1; +} #endif -- 2.9.3

3 3

[libvirt] [PATCH] Remove pointless check for !ret in virDomainNetDefCoalesceParseXML
by Martin Kletzander 22 Apr '17

22 Apr '17

It was left there after removing a macro it was part of in first version or so. Now it will always be NULL. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4a777d67bfad..7d3cf178eaf6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6789,7 +6789,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, if (!str) goto cleanup; - if (!ret && VIR_ALLOC(ret) < 0) + if (VIR_ALLOC(ret) < 0) goto cleanup; if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) { -- 2.12.2

1 0

[libvirt] [PATCH] Don't leak str in virDomainNetDefCoalesceParseXML
by Martin Kletzander 22 Apr '17

22 Apr '17

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cbeebdc56880..4a777d67bfad 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6811,6 +6811,7 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, ret->rx_max_coalesced_frames = tmp; cleanup: + VIR_FREE(str); ctxt->node = save; return ret; -- 2.12.2

1 0

[libvirt] [PATCH v2 0/3] Add support for coalesce settings on interfaces
by Martin Kletzander 22 Apr '17

22 Apr '17

In linux this is supported since 4.11-rc3, I tested it with 4.11.0-rc5-next-20170407. The particular patch can be found here: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git/commit/?… Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1414627 In this version the XML is different so that there are no underscores (and it's actually more readable, IMHO). Plus some minor adjustments needed after rebase. Martin Kletzander (3): util: Add virNetDevSetCoalesce function conf, docs: Add support for coalesce setting(s) Set coalesce settings for domain interfaces configure.ac | 3 +- docs/formatdomain.html.in | 24 ++++ docs/schemas/domaincommon.rng | 131 +++++++++++++++++++++ src/bhyve/bhyve_command.c | 2 +- src/conf/domain_conf.c | 80 +++++++++++++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 2 +- src/qemu/qemu_domain.c | 31 +++++ src/qemu/qemu_interface.c | 2 +- src/uml/uml_conf.c | 2 +- src/util/virnetdev.c | 83 +++++++++++++ src/util/virnetdev.h | 34 ++++++ src/util/virnetdevtap.c | 5 + src/util/virnetdevtap.h | 2 + tests/bhyvexml2argvmock.c | 1 + .../qemuxml2argvdata/qemuxml2argv-net-coalesce.xml | 68 +++++++++++ .../qemuxml2xmlout-net-coalesce.xml | 71 +++++++++++ tests/qemuxml2xmltest.c | 1 + 19 files changed, 540 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-coalesce.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-coalesce.xml -- 2.12.2

3 8

[libvirt] [PATCH v2 0/5] Hyper-V method invocation
by Sri Ramanujam 22 Apr '17

22 Apr '17

Changes from v1: * Removed unneeded util function Sri Ramanujam (5): hyperv: Functions to work with invocation parameters. hyperv: Generate object property type information. hyperv: add hypervInvokeMethod hyperv: support virDomainSendKey hyperv: Add support for virDomainSetMemory src/hyperv/hyperv_driver.c | 182 +++++++ src/hyperv/hyperv_wmi.c | 879 ++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_wmi.h | 93 +++- src/hyperv/hyperv_wmi_classes.h | 19 + src/hyperv/hyperv_wmi_generator.input | 116 +++++ src/hyperv/hyperv_wmi_generator.py | 15 +- src/hyperv/openwsman.h | 4 + 7 files changed, 1306 insertions(+), 2 deletions(-) -- 2.9.3

2 7

Re: [libvirt] creating stream
by Michal Privoznik 21 Apr '17

21 Apr '17

On 04/20/2017 03:55 PM, Vasiliy Tolstov wrote: > 2017-04-06 14:59 GMT+03:00 Michal Privoznik <mprivozn(a)redhat.com>: >> That is not going to be enough. The RPC protocol is spread among other files >> too. You really should not hook into our RPC protocol. My question is still >> unanswered though - why do you need it anyway? > > Thanks for all your help, i'm create mostly complete libvirt binding > using generator. Last problem - do you know binary representation ofr > virTypedParams? Does it xdr encoded when passed via wire or not? And > format of this field? You can see for yourself - just fire up wireshark with libvirt dissector installed and issue the API. Also, you may look at remote_typed_param_value and remote_typed_param structs defined in src/remote/remote_protocol.h. Michal

2 7

[libvirt] [PATCH v3 0/3] libxl: nestedhvm support
by Wim Ten Have 21 Apr '17

21 Apr '17

From: Wim ten Have <wim.ten.have(a)oracle.com> This patch enhances host-passthrough capability to advertise the required vendor CPU virtualization feature which will be used to enable 'nestedhvm' in the libxl driver. Wim ten Have (3): libxl: set nestedhvm for mode host-passthrough xenconfig: add conversions for xen-xl xlconfigtest: add tests for 'nestedhvm' support cfg.mk | 2 +- src/libxl/libxl_conf.c | 46 ++++++++++++++-- src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_domain.c | 2 +- src/xenconfig/xen_xl.c | 64 ++++++++++++++++++++++ .../test-fullvirt-nestedhvm-disabled.cfg | 26 +++++++++ .../test-fullvirt-nestedhvm-disabled.xml | 61 +++++++++++++++++++++ tests/xlconfigdata/test-fullvirt-nestedhvm.cfg | 26 +++++++++ tests/xlconfigdata/test-fullvirt-nestedhvm.xml | 59 ++++++++++++++++++++ tests/xlconfigtest.c | 2 + 10 files changed, 282 insertions(+), 8 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm.xml -- 2.9.3

3 8

[libvirt] [PATCH] docs: fix typo in closing HTML element
by Daniel P. Berrange 21 Apr '17

21 Apr '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 5469fc3..9bea3bc 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5425,7 +5425,7 @@ qemu-kvm -net nic,model=? /dev/null This element provides means of setting coalesce settings for some interface devices (currently only type <code>network</code> and <code>bridge</code>. Currently there is just one attribute, - <code>max</code>, to tweak, in element <code>frames<code> for + <code>max</code>, to tweak, in element <code>frames</code> for the <code>rx</code> group, which accepts a non-negative integer that specifies the maximum number of packets that will be received before an interrupt. -- 2.9.3

1 0

[libvirt] [PATCH] util: check ifa_addr pointer before accessing its elements
by Pavel Hrdina 21 Apr '17

21 Apr '17

Reported by Rafał Wojciechowski <it(a)rafalwojciechowski.pl>. Thread 1 (Thread 0x7f194b99d700 (LWP 5631)): 0 virNetDevGetifaddrsAddress (addr=0x7f194b99c7c0, ifname=0x7f193400e2b0 "ovirtmgmt") at util/virnetdevip.c:738 1 virNetDevIPAddrGet (ifname=0x7f193400e2b0 "ovirtmgmt", addr=addr@entry=0x7f194b99c7c0) at util/virnetdevip.c:795 2 0x00007f19467800d6 in networkGetNetworkAddress (netname=<optimized out>, netaddr=netaddr@entry=0x7f1924013f18) at network/bridge_driver.c:4780 3 0x00007f193e43a33c in qemuProcessGraphicsSetupNetworkAddress (listenAddr=0x7f19340f7650 "127.0.0.1", glisten=0x7f1924013f10) at qemu/qemu_process.c:4062 4 qemuProcessGraphicsSetupListen (vm=<optimized out>, graphics=0x7f1924014f10, cfg=0x7f1934119f00) at qemu/qemu_process.c:4133 5 qemuProcessSetupGraphics (flags=17, vm=0x7f19240155d0, driver=0x7f193411f1d0) at qemu/qemu_process.c:4196 6 qemuProcessPrepareDomain (conn=conn@entry=0x7f192c00ab50, driver=driver@entry=0x7f193411f1d0, vm=vm@entry=0x7f19240155d0, flags=flags@entry=17) at qemu/qemu_process.c:4969 7 0x00007f193e4417c0 in qemuProcessStart (conn=conn@entry=0x7f192c00ab50, driver=driver@entry=0x7f193411f1d0, vm=0x7f19240155d0,asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_START, migrateFrom=migrateFrom@entry=0x0, migrateFd=migrateFd@entry=-1, migratePath=migratePath@entry=0x0,snapshot=snapshot@entry=0x0, vmop=vmop@entry=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, flags=17, flags@entry=1) at qemu/qemu_process.c:5553 Man page for getifaddrs also states that the "ifa_addr" may contain a null pointer which happens if there is an existing network interface on the host without IP address. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/virnetdevip.c | 7 ++++++- src/util/virnetdevtap.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 726fa6c3e3..09925e1d74 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -902,10 +902,15 @@ virNetDevGetifaddrsAddress(const char *ifname, } for (ifa = ifap; ifa; ifa = ifa->ifa_next) { - int family = ifa->ifa_addr->sa_family; + int family; if (STRNEQ_NULLABLE(ifa->ifa_name, ifname)) continue; + + if (!ifa->ifa_addr) + continue; + family = ifa->ifa_addr->sa_family; + if (family != AF_INET6 && family != AF_INET) continue; diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 02ef7fd240..93002b9294 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -762,6 +762,9 @@ virNetDevTapInterfaceStats(const char *ifname, } for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + if (!ifa->ifa_addr) + continue; + if (ifa->ifa_addr->sa_family != AF_LINK) continue; -- 2.12.2

2 1

[libvirt] [PATCH] Use port range 5901-5999 if not set in qemu.conf, avoid port 5900
by Christophe de Dinechin 21 Apr '17

21 Apr '17

In order to avoid conflict with the default port (5900) for host VNC server (vino-server for example), or to conflict with X11 (starting at port 6000), restrict range of ports to 5901-5999 unless explicitly specified in qemu.conf. On the other hand, if port range is explicitly specified in qemu.conf, there is no reason not to allow ports 1024-5900 (system ports are below 1024). Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1442235 Signed-off-by: Christophe de Dinechin <dinechin(a)redhat.com> --- src/qemu/qemu_conf.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 1b704da..07f3177 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -65,9 +65,15 @@ VIR_LOG_INIT("qemu.qemu_conf"); * This limitation is mentioned in qemu.conf, so bear in mind that the * configuration file should reflect any changes made to these values. */ -#define QEMU_REMOTE_PORT_MIN 5900 + +// Range of available ports - Avoid ports below 1024 (system ports) +#define QEMU_REMOTE_PORT_MIN 1024 #define QEMU_REMOTE_PORT_MAX 65535 +// Default min and max if not configured in qemu.conf +#define QEMU_REMOTE_PORT_MIN_DEFAULT 5901 +#define QEMU_REMOTE_PORT_MAX_DEFAULT 5999 + #define QEMU_WEBSOCKET_PORT_MIN 5700 #define QEMU_WEBSOCKET_PORT_MAX 65535 @@ -283,8 +289,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) #undef SET_TLS_X509_CERT_DEFAULT - cfg->remotePortMin = QEMU_REMOTE_PORT_MIN; - cfg->remotePortMax = QEMU_REMOTE_PORT_MAX; + cfg->remotePortMin = QEMU_REMOTE_PORT_MIN_DEFAULT; + cfg->remotePortMax = QEMU_REMOTE_PORT_MAX_DEFAULT; cfg->webSocketPortMin = QEMU_WEBSOCKET_PORT_MIN; cfg->webSocketPortMax = QEMU_WEBSOCKET_PORT_MAX; -- 2.9.3

3 6

[libvirt] How to get VM memory usage
by wangyufeng＠cloudguarding.com 21 Apr '17

21 Apr '17

Hello everyone, Could you tell me how to get VM memory usage from libvirt-go? Thanks wangyufeng(a)cloudguarding.com

2 3

[libvirt] [PATCH] util: allow ignoring SIOCSIFHWADDR when errno is EPERM
by Laine Stump 21 Apr '17

21 Apr '17

From: Laine Stump <laine(a)redhat.com> Commit f4ef3a71 made a variation of virNetDevSetMAC that would return without logging an error message if errno was set to EADDRNOTAVAIL. This errno is set by some SRIOV VF drivers (in particular igbvf) when they fail to set the device's MAC address due to the PF driver refusing the request. This is useful if we want to try a different method of setting the VF MAC address before giving up (Commit 86556e16 actually does this, setting the desired MAC address to the "admin MAC in the PF, then detaching and reattaching the VF netdev driver to force a reinit of the MAC address). During testing of Bug 1442040 t was discovered that the ixgbe driver returns EPERM in this situation, so this patch changes the exception case for silent+non-terminal failure to account for this difference. Completes resolution to: https://bugzilla.redhat.com/1415609 (RHEL 7.4) https://bugzilla.redhat.com/1442040 (RHEL 7.3.z) --- src/util/virnetdev.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 170e348..9aa9c9f 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -226,7 +226,8 @@ int virNetDevExists(const char *ifname) * virNetDevSetMACInternal: * @ifname: interface name to set MTU for * @macaddr: MAC address - * @quiet: true if a failure to set MAC address with errno == EADDRNOTAVAIL + * @quiet: true if a failure to set MAC address with + * errno == EADDRNOTAVAIL || errno == EPERM * should be silent (still returns error, but without log) * * This function sets the @macaddr for a given interface @ifname. @@ -258,7 +259,8 @@ virNetDevSetMACInternal(const char *ifname, if (ioctl(fd, SIOCSIFHWADDR, &ifr) < 0) { - if (quiet && errno == EADDRNOTAVAIL) + if (quiet && + (errno == EADDRNOTAVAIL || errno == EPERM)) goto cleanup; virReportSystemError(errno, @@ -305,7 +307,8 @@ virNetDevSetMACInternal(const char *ifname, ifr.ifr_addr.sa_len = VIR_MAC_BUFLEN; if (ioctl(s, SIOCSIFLLADDR, &ifr) < 0) { - if (quiet && errno == EADDRNOTAVAIL) + if (quiet && + (errno == EADDRNOTAVAIL || errno == EPERM)) goto cleanup; virReportSystemError(errno, @@ -2229,11 +2232,12 @@ virNetDevSetNetConfig(const char *linkdev, int vf, int retries = 100; /* if pfDevOrig == NULL, this isn't a VF, so we've failed */ - if (!pfDevOrig || errno != EADDRNOTAVAIL) + if (!pfDevOrig || + (errno != EADDRNOTAVAIL && errno != EPERM)) goto cleanup; /* Otherwise this is a VF, and virNetDevSetMAC failed with - * EADDRNOTAVAIL, which could be due to the + * EADDRNOTAVAIL/EPERM, which could be due to the * "administratively set" flag being set in the PF for * this VF. When this happens, we can attempt to use an * alternate method to set the VF MAC: first set it into -- 2.9.3

2 1

[libvirt] [PATCH v3 1/2] daemon: Fix domain name leak in error path
by Wang King 21 Apr '17

21 Apr '17

Domain name duplicated in make_nonnull_domain, but not freed when virTypedParamsSerialize return negative. --- daemon/remote.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1610fea..5d726f4 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1067,7 +1067,7 @@ remoteRelayDomainEventTunable(virConnectPtr conn, (virTypedParameterRemotePtr *) &data.params.params_val, &data.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) - return -1; + goto error; remoteDispatchObjectEventSend(callback->client, remoteProgram, REMOTE_PROC_DOMAIN_EVENT_CALLBACK_TUNABLE, @@ -1075,6 +1075,10 @@ remoteRelayDomainEventTunable(virConnectPtr conn, &data); return 0; + error: + VIR_FREE(data.dom.name); + return -1; + } @@ -1207,13 +1211,16 @@ remoteRelayDomainEventJobCompleted(virConnectPtr conn, (virTypedParameterRemotePtr *) &data.params.params_val, &data.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) - return -1; + goto error; remoteDispatchObjectEventSend(callback->client, remoteProgram, REMOTE_PROC_DOMAIN_EVENT_CALLBACK_JOB_COMPLETED, (xdrproc_t)xdr_remote_domain_event_callback_job_completed_msg, &data); return 0; + error: + VIR_FREE(data.dom.name); + return -1; } -- 2.8.3

2 2

[libvirt] [PATCH] util: allow ignoring SIOCSIFHWADDR when errno is EPERM
by Laine Stump 20 Apr '17

20 Apr '17

From: Laine Stump <laine(a)redhat.com> Commit f4ef3a71 made a variation of virNetDevSetMAC that would return without logging an error message if errno was set to EADDRNOTAVAIL. This errno is set by some SRIOV VF drivers (in particular igbvf) when they fail to set the device's MAC address due to the PF driver refusing the request. This is useful if we want to try a different method of setting the VF MAC address before giving up (Commit 86556e16 actually does this, setting the desired MAC address to the "admin MAC in the PF, then detaching and reattaching the VF netdev driver to force a reinit of the MAC address). During testing of Bug 1442040 t was discovered that the ixgbe driver returns EPERM in this situation, so this patch changes the exception case for silent+non-terminal failure to account for this difference. Completes resolution to: https://bugzilla.redhat.com/1415609 (RHEL 7.4) https://bugzilla.redhat.com/1442040 (RHEL 7.3.z) --- NB: I could also change it to be silent on *any* error, but this could lead to situations where the actual cause of a failure to set the MAC address is obscured to the point of being unable to figure out the problem (because the error would instead show up when the kernel is trying to initialize the MAC address as it reattached the VF net driver, for example). Limiting the errno's that warrant the silent treatment allows us to give more useful error reporting in these other cases. src/util/virnetdev.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 170e348..9aa9c9f 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -226,7 +226,8 @@ int virNetDevExists(const char *ifname) * virNetDevSetMACInternal: * @ifname: interface name to set MTU for * @macaddr: MAC address - * @quiet: true if a failure to set MAC address with errno == EADDRNOTAVAIL + * @quiet: true if a failure to set MAC address with + * errno == EADDRNOTAVAIL || errno == EPERM * should be silent (still returns error, but without log) * * This function sets the @macaddr for a given interface @ifname. @@ -258,7 +259,8 @@ virNetDevSetMACInternal(const char *ifname, if (ioctl(fd, SIOCSIFHWADDR, &ifr) < 0) { - if (quiet && errno == EADDRNOTAVAIL) + if (quiet && + (errno == EADDRNOTAVAIL || errno == EPERM)) goto cleanup; virReportSystemError(errno, @@ -305,7 +307,8 @@ virNetDevSetMACInternal(const char *ifname, ifr.ifr_addr.sa_len = VIR_MAC_BUFLEN; if (ioctl(s, SIOCSIFLLADDR, &ifr) < 0) { - if (quiet && errno == EADDRNOTAVAIL) + if (quiet && + (errno == EADDRNOTAVAIL || errno == EPERM)) goto cleanup; virReportSystemError(errno, @@ -2229,11 +2232,12 @@ virNetDevSetNetConfig(const char *linkdev, int vf, int retries = 100; /* if pfDevOrig == NULL, this isn't a VF, so we've failed */ - if (!pfDevOrig || errno != EADDRNOTAVAIL) + if (!pfDevOrig || + (errno != EADDRNOTAVAIL && errno != EPERM)) goto cleanup; /* Otherwise this is a VF, and virNetDevSetMAC failed with - * EADDRNOTAVAIL, which could be due to the + * EADDRNOTAVAIL/EPERM, which could be due to the * "administratively set" flag being set in the PF for * this VF. When this happens, we can attempt to use an * alternate method to set the VF MAC: first set it into -- 2.9.3

1 0

[libvirt] [PATCH v2 0/3] libxl: nestedhvm support
by Wim Ten Have 20 Apr '17

20 Apr '17

From: Wim ten Have <wim.ten.have(a)oracle.com> This patch enhances host-passthrough capability to advertise the required vendor CPU virtualization feature which will be used to enable 'nestedhvm' in the libxl driver. Wim ten Have (3): libxl: set nestedhvm for mode host-passthrough xenconfig: add conversions for xen-xl xlconfigtest: add tests for 'nestedhvm' support src/libxl/libxl_conf.c | 47 +++++++++++++-- src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_domain.c | 2 +- src/xenconfig/xen_xl.c | 67 ++++++++++++++++++++++ .../test-fullvirt-nestedhvm-disabled.cfg | 26 +++++++++ .../test-fullvirt-nestedhvm-disabled.xml | 62 ++++++++++++++++++++ .../test-fullvirt-nestedhvm-undefined.cfg | 25 ++++++++ .../test-fullvirt-nestedhvm-undefined.xml | 58 +++++++++++++++++++ tests/xlconfigdata/test-fullvirt-nestedhvm.cfg | 26 +++++++++ tests/xlconfigdata/test-fullvirt-nestedhvm.xml | 59 +++++++++++++++++++ tests/xlconfigtest.c | 3 + 11 files changed, 370 insertions(+), 7 deletions(-) create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm-undefined.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm-undefined.xml create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-nestedhvm.xml -- 2.9.3

3 12

[libvirt] [RFC] Add support for QEMU's l3-cache CPU property
by Jiri Denemark 20 Apr '17

20 Apr '17

Hi, Apparently, reporting a level 3 cache on a virtual CPU can dramatically increase performance in some use cases [1]. The interesting part is that l3-cache=on does not provide the real CPU cache data, it's just making it up. Anyway, we should be able to enable this via libvirt. And since there is another property which enables real CPU cache data to be passed to a guest, I suggest the following /domain/cpu/cache element equivalent to l3-cache=on: <cache level='3' mode='emulate'/> If we need to add support for passing the real CPU cache data, we can do that with <cache level='3' mode='passthrough'/> or we can even make the level attribute optional and support <cache mode='passthrough'/> Missing cache element means default behaviour of the hypervisor and we can eventually add <cache mode='disable'/> to turn off passing any CPU cache info to the guest. But I think we should now focus only on <cache level='3' mode='emulate'/> and leaving the rest for the future when we actually need it. This is how a more complete example would look like: <cpu mode='custom' match='exact'> <model>Broadwell</model> <cache level='3' mode='emulate'/> </cpu> And libvirt would translate it into -cpu Broadwell,l3-cache=on. Do you have any thoughts about the XML schema or naming? Thanks, Jirka [1] https://patchwork.kernel.org/patch/9308401/

2 5

[libvirt] [PATCH] virsh: report errors in virshInit()
by Daniel P. Berrange 20 Apr '17

20 Apr '17

There are several functions in virshInit which can fail, especially when running win32 builds under WINE. Currently virsh just exits without reporting what error happened. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tools/virsh.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 31e23bd..90f8125 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -358,16 +358,22 @@ virshInit(vshControl *ctl) /* set up the library error handler */ virSetErrorFunc(NULL, vshErrorHandler); - if (virEventRegisterDefaultImpl() < 0) + if (virEventRegisterDefaultImpl() < 0) { + vshReportError(ctl); return false; + } - if (virThreadCreate(&ctl->eventLoop, true, vshEventLoop, ctl) < 0) + if (virThreadCreate(&ctl->eventLoop, true, vshEventLoop, ctl) < 0) { + vshReportError(ctl); return false; + } ctl->eventLoopStarted = true; if ((ctl->eventTimerId = virEventAddTimeout(-1, vshEventTimeout, ctl, - NULL)) < 0) + NULL)) < 0) { + vshReportError(ctl); return false; + } if (ctl->connname) { /* Connecting to a named connection must succeed, but we delay -- 2.9.3

2 2

[libvirt] [PATCH] Increase default task limit for libvirtd
by Jim Fehlig 20 Apr '17

20 Apr '17

libvirtd can spawn threads/tasks when creating new domains for some hypervisors such as Xen's libxl driver, quickly reaching the cgroups pids controller default TasksMax setting of 512. When the limit is reached, attempting to create additional domains results in an error from the cgroups pids controller, e.g. kernel: [71282.213347] cgroup: fork rejected by pids controller in /system.slice/libvirtd.service Depending on domain type and configuration, anywhere from 4-7 threads/tasks may be created by libxl when starting a domain. In order to support 4096 domains, similar to commit 27cd763500, increase the TasksMax setting in libvirtd.service to 4096 * 8 = 32768 tasks. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- daemon/libvirtd.service.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in index 899abdf37..fbaf02f3b 100644 --- a/daemon/libvirtd.service.in +++ b/daemon/libvirtd.service.in @@ -29,6 +29,11 @@ Restart=on-failure # If changing this, also consider virtlogd.service & virtlockd.service # limits which are also related to number of guests LimitNOFILE=8192 +# The cgroups pids controller can limit the number of tasks started by +# the daemon, which can limit the number of domains for some hypervisors. +# A conservative default of 8 tasks per guest results in a TasksMax of +# 32k to support 4096 guests. +TasksMax=32768 [Install] WantedBy=multi-user.target -- 2.11.0

2 1

[libvirt] increase daemon task limit
by Jim Fehlig 20 Apr '17

20 Apr '17

I recently received a report of a libvirt+Xen installation reaching the pids cgroup controller TasksMax limit kernel: [71282.213347] cgroup: fork rejected by pids controller in /system.slice/libvirtd.service The default setting of TaskMax is 512 on this system # cat /sys/fs/cgroup/pids/system.slice/libvirtd.service/pids.max 512 Depending on domain type and configuration, I've noticed between 5-7 tasks (IO threads, qemu process, etc.) are created when starting a domain. It doesn't take too many domains before the 512 limit is reached. LimitNOFILE was recently changed by commit 27cd763500 to support 4096 domains. Following similar logic, would it be ok to increase TasksMax to 32768? That would accommodate 4096 domains with 8 tasks each. TasksMax also supports the special value of "infinity", but that seems a bit aggressive to me. Regards, Jim

2 3

[libvirt] [PATCH] Fix error reporting when poll returns POLLHUP/POLLERR
by Daniel P. Berrange 20 Apr '17

20 Apr '17

In the RPC client event loop code, if poll() returns only a POLLHUP or POLLERR status, then we end up reporting a bogus error message: error: failed to connect to the hypervisor error: An error occurred, but the cause is unknown We do actually report an error, but we virNetClientMarkClose method has already captured the error status before we report it, so the real error gets thrown away. The key fix is to report the error before calling virNetClientMarkClose(). In changing this, we also split out reporting of POLLHUP vs POLLERR to make any future bugs easier to diagnose. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/rpc/virnetclient.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 5174614..c959747 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1743,10 +1743,16 @@ static int virNetClientIOEventLoop(virNetClientPtr client, if (error) goto error; - if (fds[0].revents & (POLLHUP | POLLERR)) { + if (fds[0].revents & POLLHUP) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("received hangup event on socket")); virNetClientMarkClose(client, VIR_CONNECT_CLOSE_REASON_EOF); + goto error; + } + if (fds[0].revents & POLLERR) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("received hangup / error event on socket")); + _("received error event on socket")); + virNetClientMarkClose(client, VIR_CONNECT_CLOSE_REASON_ERROR); goto error; } } -- 2.9.3

2 1

[libvirt] [PATCH v2] daemon: Fix domain name leak in error path
by Wang King 19 Apr '17

19 Apr '17

Domain name duplicated in make_nonnull_domain, but not freed when virTypedParamsSerialize return negative. Remove useless error label incidentally. --- daemon/remote.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 1610fea..d8a55c7 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -648,7 +648,7 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn, /* build return data */ memset(&data, 0, sizeof(data)); if (VIR_STRDUP(data.path, path) < 0) - goto error; + return -1; data.type = type; data.status = status; make_nonnull_domain(&data.dom, dom); @@ -667,9 +667,6 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn, } return 0; - error: - VIR_FREE(data.path); - return -1; } @@ -1025,7 +1022,7 @@ remoteRelayDomainEventBlockJob2(virConnectPtr conn, memset(&data, 0, sizeof(data)); data.callbackID = callback->callbackID; if (VIR_STRDUP(data.dst, dst) < 0) - goto error; + return -1; data.type = type; data.status = status; make_nonnull_domain(&data.dom, dom); @@ -1035,9 +1032,6 @@ remoteRelayDomainEventBlockJob2(virConnectPtr conn, (xdrproc_t)xdr_remote_domain_event_block_job_2_msg, &data); return 0; - error: - VIR_FREE(data.dst); - return -1; } @@ -1067,7 +1061,7 @@ remoteRelayDomainEventTunable(virConnectPtr conn, (virTypedParameterRemotePtr *) &data.params.params_val, &data.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) - return -1; + goto error; remoteDispatchObjectEventSend(callback->client, remoteProgram, REMOTE_PROC_DOMAIN_EVENT_CALLBACK_TUNABLE, @@ -1075,6 +1069,10 @@ remoteRelayDomainEventTunable(virConnectPtr conn, &data); return 0; + error: + VIR_FREE(data.dom.name); + return -1; + } @@ -1207,13 +1205,16 @@ remoteRelayDomainEventJobCompleted(virConnectPtr conn, (virTypedParameterRemotePtr *) &data.params.params_val, &data.params.params_len, VIR_TYPED_PARAM_STRING_OKAY) < 0) - return -1; + goto error; remoteDispatchObjectEventSend(callback->client, remoteProgram, REMOTE_PROC_DOMAIN_EVENT_CALLBACK_JOB_COMPLETED, (xdrproc_t)xdr_remote_domain_event_callback_job_completed_msg, &data); return 0; + error: + VIR_FREE(data.dom.name); + return -1; } -- 2.8.3

2 1

[libvirt] [PATCH 0/2] qemu: hotplug: Write status XML only during successful vcpu hot(un)plug
by Peter Krempa 19 Apr '17

19 Apr '17

See the second patch. Peter Krempa (2): qemu: hotplug: Unexport qemuDomainHotplugDelVcpu qemu: hotplug: Don't save status XML when monitor is closed src/qemu/qemu_hotplug.c | 31 +++++++++++++++++-------------- src/qemu/qemu_hotplug.h | 3 --- 2 files changed, 17 insertions(+), 17 deletions(-) -- 2.12.2

2 3

[libvirt] [PATCH 0/9] qemu: More CPU enhancements and fixes
by Jiri Denemark 19 Apr '17

19 Apr '17

This is technically a v2 of the not yet pushed part of "qemu: Use migratable host CPU model from QEMU" series, but the patches were significantly rewritten based on the review comments and on the need for additional regression fix. Current libvirt makes a migratable host CPU model by removing features marked in cpu_map.xml with migratable='no'. This is not ideal because cpu_map.xml is a static database while feature migratability may differ depending on a hypervisor or its version. Thus we should preferably use the data we got from QEMU. And to make things even more complicated, we need to use both CPUID data we probed and data from QEMU when checking whether a guest CPU can run on the host to maintain backward compatibility with older libvirt. Thus we need to store three different views of the host CPU model with each QEMU binary. Jiri Denemark (9): qemu: Introduce virQEMUCapsSetHostModel qemu: Move qemuCaps CPU data copying into a separate function qemu: Introduce virQEMUCapsHostCPUDataClear qemu: Move qemuCaps host CPU data in a struct qemu: Prepare qemuCaps for multiple host CPU defs qemu: Pass migratable host CPU model to virCPUUpdate cpu: Drop feature filtering from virCPUUpdate cpu: Introduce virCPUGetHostIsSupported qemu: Use more data for comparing CPUs src/cpu/cpu.c | 20 +++ src/cpu/cpu.h | 3 + src/cpu/cpu_x86.c | 9 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 288 +++++++++++++++++++++++++++++-------------- src/qemu/qemu_capabilities.h | 16 ++- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_process.c | 6 +- tests/cputest.c | 7 +- 9 files changed, 247 insertions(+), 106 deletions(-) -- 2.12.2

2 19

[libvirt] [PATCH] virt-storage-rbd: fix typo s/RDB/RBD/ in configure check
by Daniel P. Berrange 19 Apr '17

19 Apr '17

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as trivial build fix. m4/virt-storage-rbd.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-storage-rbd.m4 b/m4/virt-storage-rbd.m4 index 727bd71..17e2115 100644 --- a/m4/virt-storage-rbd.m4 +++ b/m4/virt-storage-rbd.m4 @@ -36,7 +36,7 @@ AC_DEFUN([LIBVIRT_STORAGE_CHECK_RBD], [ LIBS="$old_LIBS" fi - if test "$LIBRDB_FOUND" = "yes"; then + if test "$LIBRBD_FOUND" = "yes"; then with_storage_rbd=yes AC_DEFINE_UNQUOTED([WITH_STORAGE_RBD], [1], [whether RBD backend for storage driver is enabled]) -- 2.9.3

1 0

[libvirt] [PATCH v3 0/2] default USB controller for PPC
by Pavel Hrdina 19 Apr '17

19 Apr '17

Pavel Hrdina (2): conf: add a new parse flag VIR_DOMAIN_DEF_PARSE_ABI_UPDATE_MIGRATION qemu_domain: use correct default USB controller on ppc64 src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 4 ++++ src/qemu/qemu_domain.c | 16 ++++++++++++---- src/qemu/qemu_migration_cookie.c | 2 +- 4 files changed, 19 insertions(+), 6 deletions(-) -- 2.12.2

2 3

[libvirt] [PATCH 0/2] autogen.sh: Rewrite and modularize
by Andrea Bolognani 19 Apr '17

19 Apr '17

This work was motivated by Dan's intention to introduce the keycodemapdb module into libvirt[1]. As it is, we have a few useful submodule-related features in our build system, but they are limited in that they assume there will be a single submodule, and it will be gnulib. This series removes such assumptions, making it possible to introduce more submodules without having to sacrifice any convenience. [1] https://www.redhat.com/archives/libvir-list/2017-March/msg00136.html Andrea Bolognani (2): autogen.sh: Rewrite autogen.sh: Modularize .gitignore | 2 +- .submodules/gnulib.functions | 65 ++++++++++ autogen.sh | 286 +++++++++++++++++++++++++++++-------------- cfg.mk | 34 ++--- 4 files changed, 265 insertions(+), 122 deletions(-) create mode 100644 .submodules/gnulib.functions -- 2.7.4

2 7

[libvirt] [PATCH] spec: Avoid RPM verification errors on nwfilter XMLs
by Jiri Denemark 19 Apr '17

19 Apr '17

/etc/libvirt/nwfilter/*.xml files are installed with no UUID, which means libvirtd will automatically alter all of them once it starts. Thus RPM verification will always fail on them. Let's use a trick similar to the default network XML and store nwfilter XMLs in /usr/share. They will be copied into /etc in %post. Additionally the /etc files are marked as %ghost so that they are uninstalled if the RPM package is removed. Note that the %post script overwrites existing files with new ones on upgrade, which is what has always been happening. https://bugzilla.redhat.com/show_bug.cgi?id=1431581 https://bugzilla.redhat.com/show_bug.cgi?id=1378774 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1d249851a..78c3c28e1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1360,6 +1360,13 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml + +# nwfilter files are installed in /usr/share/libvirt and copied to /etc in %post +# to avoid verification errors on changed files in /etc +install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/ +cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml \ + $RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/ + # Strip auto-generated UUID - we need it generated per-install sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml %if ! %{with_qemu} @@ -1586,6 +1593,17 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; fi + +%post daemon-config-nwfilter +cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/ +# Make sure libvirt picks up the new nwfilter defininitons +%if %{with_systemd} + /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 ||: +%else + /sbin/service libvirtd condrestart > /dev/null 2>&1 || : +%endif + + %if %{with_systemd} %triggerun -- libvirt < 0.9.4 %{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||: @@ -1767,7 +1785,9 @@ exit 0 %{_datadir}/libvirt/networks/default.xml %files daemon-config-nwfilter -%{_sysconfdir}/libvirt/nwfilter/*.xml +%dir %{_datadir}/libvirt/nwfilter/ +%{_datadir}/libvirt/nwfilter/*.xml +%ghost %{_sysconfdir}/libvirt/nwfilter/*.xml %files daemon-driver-interface %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so -- 2.12.2

2 4

[libvirt] [libvirt-perl][PATCH] Fix typo in NodeDevice.pm
by Dan Zheng 19 Apr '17

19 Apr '17

In commit 24a7f8b41ed09e885120af5336de69d3d4c91980, node device events were written with storage pool prefix by mistake. Signed-off-by: Dan Zheng <dzheng(a)redhat.com> --- lib/Sys/Virt/NodeDevice.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Sys/Virt/NodeDevice.pm b/lib/Sys/Virt/NodeDevice.pm index 97a5fad..3528c41 100644 --- a/lib/Sys/Virt/NodeDevice.pm +++ b/lib/Sys/Virt/NodeDevice.pm @@ -193,11 +193,11 @@ reason though the reason is currently unsed. =over 4 -=item Sys::Virt::StoragePool::EVENT_CREATED +=item Sys::Virt::NodeDevice::EVENT_CREATED Indicates that a device was created -=item Sys::Virt::StoragePool::EVENT_DELETED +=item Sys::Virt::NodeDevice::EVENT_DELETED Indicates that a device has been deleted -- 1.8.3.1

2 1

[libvirt] server side copy from one volume to another
by Vasiliy Tolstov 19 Apr '17

19 Apr '17

Hi! I have two pools pool_a and pool_b and need to copy volume from pool_a to pool_b. Now i can use volume download/upload to transfer data, but this is not optimal because all traffic goes via client. Does it possible to signal libvirt copy volume from pool_a to pool_b not transfer all data via client? Like server side copy? If this is not possible - may be someone from redhat team can do that? (Or provide some tips how can i do that?) -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

4 12

[libvirt] Incompatible CPU after upgrading qemu
by Jim Fehlig 19 Apr '17

19 Apr '17

Hi All, I've been doing some upgrade testing and noticed a problem starting some existing VMs after upgrading qemu from 2.6 to 2.9 on one of my AMD machines. Using libvirt 3.2.0 and qemu 2.6, I have no problems starting a VM with the following machine/CPU config <os> <type arch='x86_64' machine='pc-i440fx-2.6'>hvm</type> <boot dev='hd'/> </os> <cpu mode='custom' match='exact'> <model fallback='allow'>Opteron_G4</model> </cpu> After upgrading qemu to 2.9 the VM fails to start with error: the CPU is incompatible with host CPU: Host CPU does not provide required features: svm I see that qemu commit 75d373ef disables SVM in KVM mode, but that change was made quite some time ago and pertains to all machine types > pc-i440fx-2.2. Perhaps the problem was revealed by Jiri's recent libvirt changes to detect host CPU model by asking qemu? My knee-jerk reaction is to remove 'svm' from Opteron CPUs in cpu_map.xml, but I'm far from the expert on the evolving CPU code in libvirt, so asking the experts here for some guidance. Regards, Jim

2 2

[libvirt] [PATCH 0/6] Hyper-V method invocation support
by Sri Ramanujam 18 Apr '17

18 Apr '17

This patchset introduces functionality to support invoking Hyper-V methods over WMI. It also includes implementations for virDomainSendKey and virDomainSetMemory as examples of how to use the new functionality. With this patchset, all the pieces should be in place to implement all parts of the driver. I've got about 30 functions pending, to be submitted after this patchset is ACKed. Additionally, this patchset includes a new function under util that converts numbers into their string representation. There is a variant for both signed and unsigned numbers. Since everything must be represented as a string at the XML layer, this function comes in handy throughout the Hyper-V driver and I thought it would have some utility as a convenience method for the whole project. Sri Ramanujam (6): hyperv: Functions to work with invocation parameters. hyperv: Generate object property type information. hyperv: add hypervInvokeMethod hyperv: support virDomainSendKey util: add virNumToStr hyperv: Add support for virDomainSetMemory src/hyperv/hyperv_driver.c | 182 +++++++ src/hyperv/hyperv_wmi.c | 879 ++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_wmi.h | 93 +++- src/hyperv/hyperv_wmi_classes.h | 19 + src/hyperv/hyperv_wmi_generator.input | 116 +++++ src/hyperv/hyperv_wmi_generator.py | 15 +- src/hyperv/openwsman.h | 4 + src/util/virstring.c | 34 ++ src/util/virstring.h | 8 + 9 files changed, 1348 insertions(+), 2 deletions(-) -- 2.9.3

2 8

[libvirt] [PATCH v3] hyperv: recognize array property as distinct type.
by Dawid Zamirski 18 Apr '17

18 Apr '17

When hyperv code generator for WMI classes identifies common properties, it needs to take into account array type as a distinct type, i.e string != string[]. This is the case where v1 of the Msvm_VirtualSystemSettingData has Notes property as string whereas v2 uses Notes[], therefore they have to be treated as different fields and cannot be placed in the "common" struct. --- changes in v3: * add virBufferCheckError before calling virBufferContentAndReset. src/hyperv/hyperv_driver.c | 28 ++++++++++++++++++++++++++-- src/hyperv/hyperv_wmi_generator.py | 2 +- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 090ea24..8e5eeda 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -894,8 +894,32 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) if (VIR_STRDUP(def->name, computerSystem->data.common->ElementName) < 0) goto cleanup; - if (VIR_STRDUP(def->description, virtualSystemSettingData->data.common->Notes) < 0) - goto cleanup; + if (priv->wmiVersion == HYPERV_WMI_VERSION_V1) { + if (VIR_STRDUP(def->description, + virtualSystemSettingData->data.v1->Notes) < 0) + goto cleanup; + } else if (priv->wmiVersion == HYPERV_WMI_VERSION_V2 && + virtualSystemSettingData->data.v2->Notes.data != NULL) { + char **notes = (char **) virtualSystemSettingData->data.v2->Notes.data; + virBuffer buf = VIR_BUFFER_INITIALIZER; + size_t i = 0; + + /* in practice Notes has 1 element */ + for (i = 0; i < virtualSystemSettingData->data.v2->Notes.count; i++) { + /* but if there's more than 1, separate by double new line */ + if (virBufferUse(&buf) > 0) + virBufferAddLit(&buf, "\n\n"); + + virBufferAdd(&buf, *notes, -1); + notes++; + } + + if (virBufferCheckError(&buf)) + cleanup; + + def->description = virBufferContentAndReset(&buf); + } + virDomainDefSetMemoryTotal(def, memorySettingData->data.common->Limit * 1024); /* megabyte to kilobyte */ def->mem.cur_balloon = memorySettingData->data.common->VirtualQuantity * 1024; /* megabyte to kilobyte */ diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index c15d97a..9aee0b9 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -251,7 +251,7 @@ class WmiClass: for cls in self.versions: for prop in cls.properties: # consdered same if matches by name AND type - key = "%s_%s" % (prop.name, prop.type) + key = "%s_%s_%s" % (prop.name, prop.type, prop.is_array) if key in property_info: property_info[key][1] += 1 -- 2.9.3

2 1

[libvirt] [PATCH] xenconfig: avoid double free on OOM testing
by Jim Fehlig 18 Apr '17

18 Apr '17

Fix xlconfig channel tests when OOM testing is enabled. TEST: xlconfigtest 32) Xen XL-2-XML Format channel-unix ... OK Test OOM for nalloc=55 ................................................*** Error in `/home/jfehlig/virt/upstream/libvirt/tests/.libs/xlconfigtest': double free or corruption (fasttop): 0x0000000000679550 *** ... (gdb) bt #0 0x00007ffff36875af in raise () from /lib64/libc.so.6 #1 0x00007ffff36889aa in abort () from /lib64/libc.so.6 #2 0x00007ffff36c5150 in __libc_message () from /lib64/libc.so.6 #3 0x00007ffff36cb4f6 in malloc_printerr () from /lib64/libc.so.6 #4 0x00007ffff36cbcee in _int_free () from /lib64/libc.so.6 #5 0x00007ffff782babf in virFree (ptrptr=0x7fffffffdca8) at util/viralloc.c:582 #6 0x000000000042f2f3 in xenParseXLChannel (conf=0x677350, def=0x6815b0) at xenconfig/xen_xl.c:788 #7 0x000000000042f44e in xenParseXL (conf=0x677350, caps=0x6832b0, xmlopt=0x67f6e0) at xenconfig/xen_xl.c:828 #8 0x00000000004105a3 in testCompareFormatXML ( xlcfg=0x6811e0 "/home/jfehlig/virt/upstream/libvirt/tests/xlconfigdata/test-channel-unix.cfg", xml=0x681110 "/home/jfehlig/virt/upstream/libvirt/tests/xlconfigdata/test-channel-unix.xml", replaceVars=false) at xlconfigtest.c:152 When a channel is successfully parsed and its path and name fields assigned from local variables, set the local variables to NULL to prevent a double free on error. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/xenconfig/xen_xl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 43ecf4114..a5b342a86 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -759,8 +759,9 @@ xenParseXLChannel(virConfPtr conf, virDomainDefPtr def) if (STRPREFIX(type, "socket")) { channel->source->type = VIR_DOMAIN_CHR_TYPE_UNIX; - channel->source->data.nix.path = path; channel->source->data.nix.listen = 1; + channel->source->data.nix.path = path; + path = NULL; } else if (STRPREFIX(type, "pty")) { channel->source->type = VIR_DOMAIN_CHR_TYPE_PTY; VIR_FREE(path); @@ -771,6 +772,7 @@ xenParseXLChannel(virConfPtr conf, virDomainDefPtr def) channel->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL; channel->targetType = VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN; channel->target.name = name; + name = NULL; if (VIR_APPEND_ELEMENT(def->channels, def->nchannels, channel) < 0) goto cleanup; -- 2.11.0

2 2

[libvirt] VHPC at ISC extension - Papers due May 2
by VHPC 17 18 Apr '17

18 Apr '17

==================================================================== CALL FOR PAPERS 12th Workshop on Virtualization in High-Performance Cloud Computing (VHPC '17) held in conjunction with the International Supercomputing Conference - High Performance, June 18-22, 2017, Frankfurt, Germany. (Springer LNCS Proceedings) ==================================================================== Date: June 22, 2017 Workshop URL: http://vhpc.org Paper Submission Deadline: May 2, 2017 (extended), Springer LNCS, rolling abstract submission Abstract/Paper Submission Link: https://edas.info/newPaper.php?c=23179 Keynotes: Satoshi Matsuoka, Professor of Computer Science, Tokyo Institute of Technology and John Goodacre, Professor in Computer Architectures University of Manchester, Director of Technology and Systems ARM Ltd. Research Group and Chief Scientific Officer Kaleao Ltd. Call for Papers Virtualization technologies constitute a key enabling factor for flexible resource management in modern data centers, and particularly in cloud environments. Cloud providers need to manage complex infrastructures in a seamless fashion to support the highly dynamic and heterogeneous workloads and hosted applications customers deploy. Similarly, HPC environments have been increasingly adopting techniques that enable flexible management of vast computing and networking resources, close to marginal provisioning cost, which is unprecedented in the history of scientific and commercial computing. Various virtualization technologies contribute to the overall picture in different ways: machine virtualization, with its capability to enable consolidation of multiple underutilized servers with heterogeneous software and operating systems (OSes), and its capability to live-migrate a fully operating virtual machine (VM) with a very short downtime, enables novel and dynamic ways to manage physical servers; OS-level virtualization (i.e., containerization), with its capability to isolate multiple user-space environments and to allow for their coexistence within the same OS kernel, promises to provide many of the advantages of machine virtualization with high levels of responsiveness and performance; I/O Virtualization allows physical NICs/HBAs to take traffic from multiple VMs or containers; network virtualization, with its capability to create logical network overlays that are independent of the underlying physical topology and IP addressing, provides the fundamental ground on top of which evolved network services can be realized with an unprecedented level of dynamicity and flexibility; the increasingly adopted paradigm of Software-Defined Networking (SDN) promises to extend this flexibility to the control and data planes of network paths. Publication Accepted papers will be published in a Springer LNCS proceedings volume. Topics of Interest The VHPC program committee solicits original, high-quality submissions related to virtualization across the entire software stack with a special focus on the intersection of HPC and the cloud. Major Topics - Virtualization in supercomputing environments, HPC clusters, HPC in the cloud and grids - OS-level virtualization and containers (Docker, rkt, Singularity, Shifter, i.a.) - Lightweight/specialized operating systems, unikernels - Optimizations of virtual machine monitor platforms and hypervisors - Hypervisor support for heterogenous resources (GPUs, co-processors, FPGAs, etc.) - Virtualization support for emerging memory technologies - Virtualization in enterprise HPC and microvisors - Software defined networks and network virtualization - Management, deployment of virtualized environments and orchestration (Kubernetes i.a.), - Workflow-pipeline container-based composability - Performance measurement, modelling and monitoring of virtualized/cloud workloads - Virtualization in data intensive computing and Big Data processing - HPC convergence - Adaptation of HPC technologies in the cloud (high performance networks, RDMA, etc.) - ARM-based hypervisors, ARM virtualization extensions - I/O virtualization and cloud based storage systems - GPU, FPGA and many-core accelerator virtualization - Job scheduling/control/policy and container placement in virtualized environments - Cloud reliability, fault-tolerance and high-availability - QoS and SLA in virtualized environments - IaaS platforms, cloud frameworks and APIs - Large-scale virtualization in domains such as finance and government - Energy-efficient and power-aware virtualization - Container security - Configuration management tools for containers (including CFEngine, Puppet, i.a.) - Emerging topics including multi-kernel approaches and,NUMA in hypervisors The Workshop on Virtualization in High-Performance Cloud Computing (VHPC) aims to bring together researchers and industrial practitioners facing the challenges posed by virtualization in order to foster discussion, collaboration, mutual exchange of knowledge and experience, enabling research to ultimately provide novel solutions for virtualized computing systems of tomorrow. The workshop will be one day in length, composed of 20 min paper presentations, each followed by 10 min discussion sections, plus lightning talks that are limited to 5 minutes. Presentations may be accompanied by interactive demonstrations. Important Dates Rolling Abstract Submission May 2, 2017 - Paper submission deadline (extended) May 30, 2017 - Acceptance notification June 22, 2017 - Workshop Day July 18, 2017 - Camera-ready version due Chair Michael Alexander (chair), scaledinfra technologies, Austria Anastassios Nanos (co-chair), NTUA, Greece Balazs Gerofi (co-chair), RIKEN Advanced Institute for Computational Science, Japan Program committee Stergios Anastasiadis, University of Ioannina, Greece Jakob Blomer, CERN, Europe Ron Brightwell, Sandia National Laboratories, USA Eduardo César, Universidad Autonoma de Barcelona, Spain Julian Chesterfield, OnApp, UK Stephen Crago, USC ISI, USA Christoffer Dall, Columbia University, USA Patrick Dreher, MIT, USA Robert Futrick, Cycle Computing, USA Maria Girone, CERN, Europe Kyle Hale, Northwestern University, USA Romeo Kinzler, IBM, Switzerland Brian Kocoloski, University of Pittsburgh, USA Nectarios Koziris, National Technical University of Athens, Greece John Lange, University of Pittsburgh, USA Che-Rung Lee, National Tsing Hua University, Taiwan Giuseppe Lettieri, University of Pisa, Italy Qing Liu, Oak Ridge National Laboratory, USA Nikos Parlavantzas, IRISA, France Kevin Pedretti, Sandia National Laboratories, USA Amer Qouneh, University of Florida, USA Carlos Reaño, Technical University of Valencia, Spain Thomas Ryd, CFEngine, Norway Na Zhang, VMWare, USA Borja Sotomayor, University of Chicago, USA Craig Stewart, Indiana University, USA Anata Tiwari, San Diego Supercomputer Center, USA Kurt Tutschku, Blekinge Institute of Technology, Sweden Yasuhiro Watashiba, Osaka University, Japan Nicholas Wright, Lawrence Berkeley National Laboratory, USA Chao-Tung Yang, Tunghai University, Taiwan Paper Submission-Publication Papers submitted to the workshop will be reviewed by at least two members of the program committee and external reviewers. Submissions should include abstract, key words, the e-mail address of the corresponding author, and must not exceed 10 pages, including tables and figures at a main font size no smaller than 11 point. Submission of a paper should be regarded as a commitment that, should the paper be accepted, at least one of the authors will register and attend the conference to present the work. Accepted papers will be published in a Springer LNCS volume. . The format must be according to the Springer LNCS Style. Initial submissions are in PDF; authors of accepted papers will be requested to provide source files. Format Guidelines: ftp://ftp.springer.de/pub/tex/latex/llncs/latex2e/llncs2e.zip Abstract, Paper Submission Link: https://edas.info/newPaper.php?c=23179 Lightning Talks Lightning Talks are non-paper track, synoptical in nature and are strictly limited to 5 minutes. They can be used to gain early feedback on ongoing research, for demonstrations, to present research results, early research ideas, perspectives and positions of interest to the community. Submit abstract via the main submission link. General Information The workshop is one day in length and will be held in conjunction with the International Supercomputing Conference - High Performance (ISC) 2017, June 18-22, Frankfurt, Germany.

1 0

[libvirt] [RFC PATCH 00/11] Add mdev reporting capability to the nodedev driver
by Erik Skultety 18 Apr '17

18 Apr '17

This series enables the node device driver to report information about the existing mediated devices on the host. There is no device creation involved yet. The information reported by the node device driver is split into two parts, one that is reported within the physical parent's capabilities (the generic stuff that comes from the mdev types' sysfs attributes, note the 'description' attribute which is verbatim - raw,unstructured string) and the other that is reported within the mdev child device and merely contains the mdev type id, which the device was instantiated from, and the iommu group number. Basically, the format of the XML I went for is as follows: PCI parent: <device> <name>pci_0000_06_00_0</name> <path>/sys/devices/.../0000:06:00.0</path> <parent>pci_0000_05_08_0</parent> ... <capability type='pci'> ... <capability type='mdev'> <type id='nvidia-11'> <name>GRID M60-0B</name> <description>num_heads=2, frl_config=45, framebuffer=512M, max_resolution=2560x1600, max_instance=16</description> <device_api>vfio-pci</device_api> <available_instances>16</available_instances> </type> ... </capability> <iommuGroup number='20'> <address domain='0x0000' bus='0x06' slot='0x00' function='0x0'/> </iommuGroup> ... </capability> </device> mdev child: <device> <name>mdev_ef1212ff_ff23_4534_ffcd_01ff12017801</name> <path>/sys/devices/.../ef1212ff-ff23-4534-ffcd-01ff12017801</path> <parent>pci_0000_06_00_0</parent> <driver> <name>vfio_mdev</name> </driver> <capability type='mdev'> <type id='nvidia-18'/> <iommuGroup number='63'/> </capability> </device> Also, since we didn't have any node device driver documentation, I created a stub (comments are very welcome, you can shred it to pieces ;)) focusing on the PCI devices and then adding the mdev part into that. As I said, it's still a stub that needs lots of work on it, namely adding USBs and SCSI devices, but I figured that the fact some parts are missing should not be a show stopper for the nodedev-mdev patches. Thanks, Erik Erik Skultety (11): nodedev: Fix guideline violations in nodedev modules nodedev: Make use of the compile-time missing enum in switch error conf: nodedev: Split virNodeDeviceDefFormat into more functions nodedev: udevProcessPCI: Drop syspath variable docs: Use our XSLT template to generate list of supported pool types nodedev: Introduce the mdev capability to the nodedev driver structure nodedev: Fill in the mdev info for the parent PCI device nodedev: Introduce udevProcessMediatedDevice nodedev: Format the mdev capability of the PCI parent device docs: Provide a nodedev driver stub documentation docs: Document the mediated devices within the nodedev driver docs/drivers.html.in | 6 +- docs/drvnodedev.html.in | 275 +++++++++++++ docs/storage.html.in | 62 +-- include/libvirt/libvirt-nodedev.h | 1 + src/conf/node_device_conf.c | 625 ++++++++++++++++++------------ src/conf/node_device_conf.h | 21 +- src/conf/virnodedeviceobj.c | 3 +- src/libvirt-nodedev.c | 1 + src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 30 +- src/node_device/node_device_driver.h | 82 ++-- src/node_device/node_device_hal.c | 9 + src/node_device/node_device_linux_sysfs.c | 1 + src/node_device/node_device_linux_sysfs.h | 9 +- src/node_device/node_device_udev.c | 456 ++++++++++++++++------ tools/virsh-nodedev.c | 2 + 16 files changed, 1110 insertions(+), 474 deletions(-) create mode 100644 docs/drvnodedev.html.in -- 2.12.2

6 29

[libvirt] Trouble with virsh on Windows
by Charles Bancroft 18 Apr '17

18 Apr '17

Hi List, I have a question about some troubles I am having with virsh on Windows x64. I am currently running a KVM server on a linux box and need to allow Windows clients to access it. I have set up the server for access with: ``` listen_tls = 0 listen_tcp = 1 auth_tcp = "none" ``` to allow for remote access while testing things. I have verified that I can connect remotely from other linux machines, but my windows machine always reports: ``` error: failed to connect to the hypervisor error: An error occurred, but the cause is unknown ``` On the server side I see: ``` 10435: error : virNetSocketReadWire:1793 : Cannot recv data: Connection reset by peer ``` This happens no matter what build of virsh for windows I am using. I have tried 3 different mingw-64 builds and versions and am about to just build my own from scratch. I have verified that it is not the firewall or the version of Windows I am using. I am also able to use virsh within a docker or from the Windows Subsystem for Linux bash prompt. Any ideas as to what could be causing this connection reset? It happens as soon as a connection attempt occurs and I am running out of idea. Thanks! Charles Bancroft Principal Scientist Siege Technologies

2 6

[libvirt] [PATCH v2 0/2] Use the shared keycodemap database
by Daniel P. Berrange 18 Apr '17

18 Apr '17

Changed in v2: - Fixed make syntax-check errors - Auto-generate man pages listing value key codes for use with the virDomainSendKey API / virsh send-key command Daniel P. Berrange (2): util: switch over to use keycodemapdb GIT submodule Add ability to generate man page describing key code names & values .gitignore | 3 +- .gitmodules | 3 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/Makefile.am | 81 ++++++-- src/keycodemapdb | 1 + src/util/keymaps.csv | 464 ------------------------------------------ src/util/virkeycode-mapgen.py | 97 --------- src/util/virkeycode.c | 94 ++++----- tests/virkeycodetest.c | 5 + tools/virsh.pod | 20 ++ 11 files changed, 148 insertions(+), 623 deletions(-) create mode 160000 src/keycodemapdb delete mode 100644 src/util/keymaps.csv delete mode 100755 src/util/virkeycode-mapgen.py -- 2.9.3

2 9

[libvirt] [REPOST PATCH 0/5] Split out network object into its own module
by John Ferlan 18 Apr '17

18 Apr '17

Reposting with update to top of git tree commit id '0563d3f06' from: https://www.redhat.com/archives/libvir-list/2017-March/msg00892.html Previous cover letter - cut-n-pasted: Reached the last of the code from my RFC for making a common pool object - networkobj... For reference see patch 3 of: http://www.redhat.com/archives/libvir-list/2017-February/msg00519.html This series works through the network conf adjustments. This pile is fairly straightforward, like other series we split out anything referencing virNetworkPoolObj and go from there. There was one small detour to avoid a potentially conflict in names. John Ferlan (5): conf: Introduce virnetworkobj conf: Adjust coding style for network conf sources conf: Alter coding style of network conf function prototypes conf: Rename virNetworkObjAssignDef to virNetworkObjUpdateAssignDef conf: Use consistent function name prefixes for virnetworkobj po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/conf/network_conf.c | 1388 ++-------------------------------- src/conf/network_conf.h | 204 ++--- src/conf/virnetworkobj.c | 1372 +++++++++++++++++++++++++++++++++ src/conf/virnetworkobj.h | 185 +++++ src/libvirt_private.syms | 57 +- src/network/bridge_driver.c | 62 +- src/network/bridge_driver.h | 2 +- src/network/bridge_driver_platform.h | 2 +- src/test/test_driver.c | 16 +- 11 files changed, 1763 insertions(+), 1529 deletions(-) create mode 100644 src/conf/virnetworkobj.c create mode 100644 src/conf/virnetworkobj.h -- 2.9.3

2 6

[libvirt] [PATCH 00/38] Implement sparse streams for libvirt
by Michal Privoznik 18 Apr '17

18 Apr '17

There were already some attempts to do this in the past, but neither of them was successful. Anyway, let me just show you how good these perform: 7.9G -rw-r--r-- 1 root root 21G Feb 15 14:04 /var/lib/libvirt/images/gentoo.qcow2 libvirt.git # time virsh vol-download --sparse /var/lib/libvirt/images/gentoo.qcow2 /mnt/floppy/gentoo.qcow2 real 0m41.627s user 0m3.880s sys 0m5.720s libvirt.git # time virsh vol-download /var/lib/libvirt/images/gentoo.qcow2 /mnt/floppy/gentoo.qcow2 real 2m22.357s user 1m20.590s sys 0m12.510s All the patches can be found on my github: https://github.com/zippy2/libvirt/tree/sparse_iohelper5 (Yes, weird name, but there were plenty of local attempts to implement this and I'm not throwing them away until the feature is merged) Michal Privoznik (38): fdstreamtest: Rename tempdir fdstreamtest: Print more info on read failure fdstream: s/struct virFDStreamData */virFDStreamDataPtr/ virFDStreamData: Turn into virObjectLockable virfdstream: Drop iohelper in favour of a thread virfdstream: Use messages instead of pipe iohelper: Remove unused mode util: Introduce virFileInData Introduce virStreamRecvFlags Implement virStreamRecvFlags to some drivers Introduce virStreamSkip Introduce virStreamHoleSize Introduce VIR_STREAM_RECV_STOP_AT_HOLE flag Introduce virStreamSparseRecvAll Introduce virStreamSparseSendAll Introduce virStreamInData virNetClientStreamNew: Track origin stream Track if stream is skippable RPC: Introduce virNetStreamSkip Introduce VIR_NET_STREAM_SKIP message type Teach wireshark plugin about VIR_NET_STREAM_SKIP daemon: Introduce virNetServerProgramSendStreamSkip virnetclientstream: Introduce virNetClientStreamSendSkip daemon: Implement VIR_NET_STREAM_SKIP handling virnetclientstream: Introduce virNetClientStreamHandleSkip remote_driver: Implement virStreamSkip virNetClientStreamRecvPacket: Introduce @flags argument Introduce virNetClientStreamHoleSize remote: Implement virStreamHoleSize virNetClientStream: Wire up VIR_NET_STREAM_SKIP remote_driver: Implement VIR_STREAM_RECV_STOP_AT_HOLE daemonStreamHandleRead: Wire up seekable stream daemon: Don't call virStreamInData so often fdstream: Implement sparse stream gendispatch: Introduce @sparseflag for our calls Introduce virStorageVol{Download,Upload}Flags virsh: Implement sparse stream to vol-download virsh: Implement sparse stream to vol-upload daemon/remote.c | 2 +- daemon/stream.c | 147 +++++- daemon/stream.h | 3 +- include/libvirt/libvirt-storage.h | 9 + include/libvirt/libvirt-stream.h | 86 +++- src/driver-stream.h | 23 + src/esx/esx_stream.c | 16 +- src/libvirt-storage.c | 4 +- src/libvirt-stream.c | 453 ++++++++++++++++++ src/libvirt_internal.h | 3 + src/libvirt_private.syms | 2 + src/libvirt_public.syms | 9 + src/libvirt_remote.syms | 3 + src/remote/remote_driver.c | 89 +++- src/remote/remote_protocol.x | 2 + src/rpc/gendispatch.pl | 21 +- src/rpc/virnetclient.c | 1 + src/rpc/virnetclientstream.c | 202 +++++++- src/rpc/virnetclientstream.h | 17 +- src/rpc/virnetprotocol.x | 16 +- src/rpc/virnetserverprogram.c | 33 ++ src/rpc/virnetserverprogram.h | 7 + src/storage/storage_driver.c | 4 +- src/storage/storage_util.c | 10 +- src/util/iohelper.c | 72 +-- src/util/virfdstream.c | 888 ++++++++++++++++++++++++++++------- src/util/virfdstream.h | 2 +- src/util/virfile.c | 81 ++++ src/util/virfile.h | 3 + src/virnetprotocol-structs | 4 + tests/fdstreamtest.c | 12 +- tests/virfiletest.c | 203 ++++++++ tools/virsh-util.c | 49 ++ tools/virsh-util.h | 24 + tools/virsh-volume.c | 49 +- tools/virsh.pod | 6 +- tools/wireshark/src/packet-libvirt.c | 48 ++ tools/wireshark/src/packet-libvirt.h | 2 + 38 files changed, 2284 insertions(+), 321 deletions(-) -- 2.10.2

2 44

[libvirt] [PATCH 0/4] domain capabilities fix and test improvement
by Pavel Hrdina 18 Apr '17

18 Apr '17

Pavel Hrdina (4): qemu: refactor qemuDomainMachineIs* and qemuDomainMachineNeedsFDC qemu: use qemuDomainMachineIsPSeries qemu: report IDE bus in domain capabilities only if it's supported tests: domaincapstest: add test for Q35 machine type src/qemu/qemu_alias.c | 4 +- src/qemu/qemu_capabilities.c | 20 ++-- src/qemu/qemu_command.c | 42 +++---- src/qemu/qemu_domain.c | 79 ++++++------- src/qemu/qemu_domain.h | 14 +-- src/qemu/qemu_domain_address.c | 16 +-- src/qemu/qemu_hotplug.c | 14 +-- src/qemu/qemu_parse_command.c | 8 +- .../qemu_2.6.0-gicv2-virt.aarch64.xml | 1 - .../qemu_2.6.0-gicv3-virt.aarch64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 1 - tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml | 1 - tests/domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 - tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 - .../domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml | 125 +++++++++++++++++++++ tests/domaincapstest.c | 4 + 16 files changed, 229 insertions(+), 103 deletions(-) create mode 100644 tests/domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml -- 2.12.2

2 15

[libvirt] [PATCH V3] Expose resource control capabilites on cache bank
by Eli Qiao 18 Apr '17

18 Apr '17

This patch is based on Martin's cache branch. This patch amends the cache bank capability as follow: <cache> <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'> <control min='768' unit='KiB' type='unified' nallocations='4'/> </bank> <bank id='1' level='3' type='unified' size='15360' unit='KiB' cpus='6-11'> <control min='768' unit='KiB' type='unified' nallocations='4'/> </bank> </cache> Along with vircaps2xmltest case updated. Signed-off-by: Eli Qiao <liyong.qiao(a)intel.com> --- src/conf/capabilities.c | 120 ++++++++++++++++++++++- src/conf/capabilities.h | 13 ++- tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 8 +- tests/vircaps2xmltest.c | 13 +++ 4 files changed, 148 insertions(+), 6 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 416dd1a..3094e48 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -52,6 +52,7 @@ #define VIR_FROM_THIS VIR_FROM_CAPABILITIES #define SYSFS_SYSTEM_PATH "/sys/devices/system/" +#define SYSFS_RESCTRL_PATH "/sys/fs/resctrl/" VIR_LOG_INIT("conf.capabilities") @@ -873,6 +874,7 @@ virCapabilitiesFormatCaches(virBufferPtr buf, virCapsHostCacheBankPtr *caches) { size_t i = 0; + size_t j = 0; if (!ncaches) return 0; @@ -894,13 +896,32 @@ virCapabilitiesFormatCaches(virBufferPtr buf, */ virBufferAsprintf(buf, "<bank id='%u' level='%u' type='%s' " - "size='%llu' unit='%s' cpus='%s'/>\n", + "size='%llu' unit='%s' cpus='%s'", bank->id, bank->level, virCacheTypeToString(bank->type), bank->size >> (kilos * 10), kilos ? "KiB" : "B", cpus_str); + if (bank->ncontrol > 0) { + virBufferAddLit(buf, ">\n"); + virBufferAdjustIndent(buf, 2); + for (j = 0; j < bank->ncontrol; j++) { + bool min_kilos = !(bank->controls[j]->min % 1024); + virBufferAsprintf(buf, + "<control min='%llu' unit='%s' " + "type='%s' nallocations='%u'/>\n", + bank->controls[j]->min >> (min_kilos * 10), + min_kilos ? "KiB" : "B", + virCacheTypeToString(bank->controls[j]->type), + bank->controls[j]->nallocations); + } + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</bank>\n"); + } else { + virBufferAddLit(buf, "/>\n"); + } + VIR_FREE(cpus_str); } @@ -1513,13 +1534,97 @@ virCapsHostCacheBankEquals(virCapsHostCacheBankPtr a, void virCapsHostCacheBankFree(virCapsHostCacheBankPtr ptr) { + size_t i; + if (!ptr) return; virBitmapFree(ptr->cpus); + for (i = 0; i < ptr->ncontrol; i++) + VIR_FREE(ptr->controls[i]); + VIR_FREE(ptr->controls); VIR_FREE(ptr); } +/* test which kinds of cache control supported + * -1: don't support + * 0: cat + * 1: cdp + */ +static int +virCapabilitiesGetCacheControlType(virCapsHostCacheBankPtr bank) +{ + int ret = -1; + char *path = NULL; + if (virAsprintf(&path, SYSFS_RESCTRL_PATH "info/L%u", bank->level) < 0) + return -1; + + if (virFileExists(path)) { + ret = 0; + } else { + VIR_FREE(path); + if (virAsprintf(&path, SYSFS_RESCTRL_PATH "info/L%uCODE", bank->level) < 0) + return -1; + if (virFileExists(path)) + ret = 1; + } + + VIR_FREE(path); + return ret; +} + +static int +virCapabilitiesGetCacheControl(virCapsHostCacheBankPtr bank, const char* type) +{ + int ret = -1; + char *path = NULL; + char *cbm_mask = NULL; + virCapsHostCacheControlPtr control; + + if (VIR_ALLOC(control) < 0) + goto cleanup; + + if (virFileReadValueUint(&control->nallocations, + SYSFS_RESCTRL_PATH "info/L%u%s/num_closids", + bank->level, + type) < 0) + goto cleanup; + + if (virFileReadValueString(&cbm_mask, + SYSFS_RESCTRL_PATH + "info/L%u%s/cbm_mask", + bank->level, + type) < 0) + goto cleanup; + + virStringTrimOptionalNewline(cbm_mask); + + control->min = bank->size / (strlen(cbm_mask) * 4); + + if (STREQ("", type)) + control->type = VIR_CACHE_TYPE_UNIFIED; + else if (STREQ("CODE", type)) + control->type = VIR_CACHE_TYPE_INSTRUCTION; + else if (STREQ("DATA", type)) + control->type = VIR_CACHE_TYPE_DATA; + else + goto cleanup; + + if (VIR_APPEND_ELEMENT(bank->controls, + bank->ncontrol, + control) < 0) + goto error; + + ret = 0; + + cleanup: + VIR_FREE(path); + return ret; + error: + VIR_FREE(control); + return -1; +} + int virCapabilitiesInitCaches(virCapsPtr caps) { @@ -1595,7 +1700,18 @@ virCapabilitiesInitCaches(virCapsPtr caps) pos, ent->d_name) < 0) goto cleanup; - if (bank->level < cache_min_level) { + ret = virCapabilitiesGetCacheControlType(bank); + + if ((bank->level >= cache_min_level) || (ret >= 0)) { + if (ret == 0) { + if (virCapabilitiesGetCacheControl(bank, "") < 0) + goto cleanup; + } else if (ret == 1) { + if ((virCapabilitiesGetCacheControl(bank, "CODE") < 0) || + (virCapabilitiesGetCacheControl(bank, "DATA") < 0)) + goto cleanup; + } + } else { virCapsHostCacheBankFree(bank); bank = NULL; continue; diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index e099ccc..1007c30 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -139,15 +139,22 @@ struct _virCapsHostSecModel { }; typedef enum { - VIR_CACHE_TYPE_DATA, - VIR_CACHE_TYPE_INSTRUCTION, VIR_CACHE_TYPE_UNIFIED, + VIR_CACHE_TYPE_INSTRUCTION, + VIR_CACHE_TYPE_DATA, VIR_CACHE_TYPE_LAST } virCacheType; VIR_ENUM_DECL(virCache); +typedef struct _virCapsHostCacheControl virCapsHostCacheControl; +typedef virCapsHostCacheControl *virCapsHostCacheControlPtr; +struct _virCapsHostCacheControl { + unsigned long long min; /* B */ + virCacheType type; /* Data, Instruction or Unified */ + unsigned int nallocations; /* number of supported allocation */ +}; typedef struct _virCapsHostCacheBank virCapsHostCacheBank; typedef virCapsHostCacheBank *virCapsHostCacheBankPtr; struct _virCapsHostCacheBank { @@ -156,6 +163,8 @@ struct _virCapsHostCacheBank { unsigned long long size; /* B */ virCacheType type; /* Data, Instruction or Unified */ virBitmapPtr cpus; /* All CPUs that share this bank */ + size_t ncontrol; + virCapsHostCacheControlPtr *controls; }; typedef struct _virCapsHost virCapsHost; diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml index c30ea87..32a9549 100644 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml @@ -41,8 +41,12 @@ </cells> </topology> <cache> - <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'/> - <bank id='1' level='3' type='unified' size='15360' unit='KiB' cpus='6-11'/> + <bank id='0' level='3' type='unified' size='15360' unit='KiB' cpus='0-5'> + <control min='768' unit='KiB' type='unified' nallocations='4'/> + </bank> + <bank id='1' level='3' type='unified' size='15360' unit='KiB' cpus='6-11'> + <control min='768' unit='KiB' type='unified' nallocations='4'/> + </bank> </cache> </host> diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c index f590249..3d1ad43 100644 --- a/tests/vircaps2xmltest.c +++ b/tests/vircaps2xmltest.c @@ -47,6 +47,7 @@ test_virCapabilities(const void *opaque) char *capsXML = NULL; char *path = NULL; char *dir = NULL; + char *resctrl_dir = NULL; int ret = -1; /* @@ -58,6 +59,17 @@ test_virCapabilities(const void *opaque) data->resctrl ? "/system" : "") < 0) goto cleanup; + if (data->resctrl) { + if (virAsprintf(&resctrl_dir, "%s/vircaps2xmldata/linux-%s/resctrl", + abs_srcdir, data->filename) < 0) + goto cleanup; + } else { + /* Mock to bad directory to avoid using /sys/fs/resctrl */ + if (VIR_STRDUP(resctrl_dir, "") < 0) + goto cleanup; + } + + virFileMockAddPrefix("/sys/fs/resctrl", resctrl_dir); virFileMockAddPrefix("/sys/devices/system", dir); caps = virCapabilitiesNew(data->arch, data->offlineMigrate, data->liveMigrate); @@ -84,6 +96,7 @@ test_virCapabilities(const void *opaque) cleanup: VIR_FREE(dir); + VIR_FREE(resctrl_dir); VIR_FREE(path); VIR_FREE(capsXML); virObjectUnref(caps); -- 1.9.1

4 15