- Devel - libvirt List Archives

[libvirt] [PATCH] travis: Don't install xz on macOS
by Andrea Bolognani 15 Mar '18

15 Mar '18

It's already being dragged in by Python. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1f09f9cad..d071c98634 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: - brew update - brew unlink python - brew upgrade - - brew install rpcgen yajl xz + - brew install rpcgen yajl script: # We can't run make distcheck/syntax-check because they # fail on macOS, but doing 'install' and 'dist' gives us -- 2.14.3

2 1

[libvirt] [PATCH] rpm: depend on python2, not bare python
by Daniel P. Berrangé 15 Mar '18

15 Mar '18

Fedora requires packages to depend on "python2" RPM, not the unversioned "python" name. Fortunately even though RHEL-6 ships a "python" RPM, it has a virtual Provides for the "python2" name, so we don't need to conditionalize this. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 2 +- mingw-libvirt.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8e9836ebbd..bc8257f34b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -305,7 +305,7 @@ BuildRequires: perl-interpreter %else BuildRequires: perl %endif -BuildRequires: python +BuildRequires: python2 %if %{with_systemd} BuildRequires: systemd-units %endif diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index dc18d055ba..5e12bb1cae 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -61,7 +61,7 @@ BuildRequires: pkgconfig # Need native version for msgfmt BuildRequires: gettext BuildRequires: libxslt -BuildRequires: python +BuildRequires: python2 %if 0%{?fedora} >= 27 BuildRequires: perl-interpreter %else -- 2.14.3

2 1

[libvirt] [PATCH 0/2] travis: fix macOS build
by Daniel P. Berrangé 15 Mar '18

15 Mar '18

You can see the "working" build here: https://travis-ci.org/berrange/libvirt/builds/353816421 Yeah it still failed, but it got past the brew bit that was failing before, and now fails for genuine code problems :-) Daniel P. Berrangé (2): travis: move macOS before_install tasks into osx matrix entry travis: unlink python package before upgrading brew packages .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.14.3

2 5

[libvirt] [PATCH] conf: nodedev: Update capabilities from within virNodeDeviceObjHasCap
by Erik Skultety 15 Mar '18

15 Mar '18

Commit d18feadc0c put this into virNodeDeviceMatch, but this should have rather been part of virNodeDeviceObjHasCap from the beginning, since virNodeDeviceObjHasCap is the last helper to be called (in the calltree) whereas virNodeDeviceMatch is called from a single place only - virNodeDeviceObjListExportCallback. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/conf/virnodedeviceobj.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index ad0f27ee4..0417664ad 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -644,6 +644,10 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj, { virNodeDevCapsDefPtr cap = NULL; + /* Refresh the capabilities first, e.g. due to a driver change */ + if (virNodeDeviceUpdateCaps(obj->def) < 0) + return false; + for (cap = obj->def->caps; cap; cap = cap->next) { if (type == cap->data.type) return true; @@ -811,10 +815,6 @@ static bool virNodeDeviceMatch(virNodeDeviceObjPtr obj, unsigned int flags) { - /* Refresh the capabilities first, e.g. due to a driver change */ - if (virNodeDeviceUpdateCaps(obj->def) < 0) - return false; - /* filter by cap type */ if (flags & VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_CAP) { if (!(MATCH(SYSTEM) || -- 2.13.6

2 3

[libvirt] [PATCH] travis: Temporarily disable 'brew upgrade'
by Andrea Bolognani 15 Mar '18

15 Mar '18

There are a lot of changes happening in the homebrew ecosystem around Python, and as a consequence 'brew upgrade' hasn't been able to complete successfully for several days. Temporarily disable upgrading the system before building: this will need to be reverted once the upgrade issues have been sorted out. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79f30f3090..c891ef419c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ env: - VIR_TEST_DEBUG=1 before_install: - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew upgrade && brew install rpcgen yajl xz && brew link --force python@2; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew install rpcgen yajl xz && brew link --force python@2; fi before_script: - ./autogen.sh --prefix=$(pwd)/install-root -- 2.14.3

2 1

[libvirt] libvirt build failure with --disable-shared
by Rahul Sharma 15 Mar '18

15 Mar '18

Hi, I am facing an error with libvirt build where it fails if I try to disable shared libraries. Though I opened up the issue on gitlab, not sure if that was the right place to open one. Kindly do let me know if this should be opened up at some other place. Build failure with libvirt-4.1.0 using the command: CFLAGS="-fPIC" ./configure --enable-static --disable-shared --prefix=/home/ubuntu/libvirt-4.1.0/out https://gitlab.com/libvirt/libvirt/issues/1 - Rahul

3 2

[libvirt] [jenkins-ci PATCH] guests: Stop installing polkit-devel
by Andrea Bolognani 15 Mar '18

15 Mar '18

As of libvirt commit 9cd42e725f42 only the runtime package is needed, even during build. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/vars/mappings.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index e3781b9..190013e 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -546,9 +546,8 @@ mappings: Ubuntu12: pkg-config polkit: + default: polkit deb: policykit-1 - pkg: polkit - rpm: polkit-devel python2: default: python -- 2.14.3

2 1

[libvirt] [PATCH v2] spec: Drop polkit-devel from BuildRequires
by Andrea Bolognani 15 Mar '18

15 Mar '18

As of 2499d1a09508 we don't link against libpolkit anymore, so we only need the polkit package to be available during build. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5e05d706f8..8e9836ebbd 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -358,11 +358,9 @@ BuildRequires: ebtables BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel %if 0%{?fedora} || 0%{?rhel} >= 7 -# F22 polkit-devel doesn't pull in polkit anymore, which we need for pkcheck BuildRequires: polkit >= 0.112 -BuildRequires: polkit-devel >= 0.112 %else -BuildRequires: polkit-devel >= 0.93 +BuildRequires: polkit >= 0.93 %endif # For mount/umount in FS driver BuildRequires: util-linux -- 2.14.3

2 1

[libvirt] [PATCH] spec: Drop polkit from {,Build}Requires:
by Andrea Bolognani 15 Mar '18

15 Mar '18

As of 2499d1a09508 we don't link against libpolkit or look for the pkcheck command anymore, so these package relationships are no longer necessary and can be safely dropped. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5e05d706f8..e70cc02dc8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -357,13 +357,6 @@ BuildRequires: radvd BuildRequires: ebtables BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel -%if 0%{?fedora} || 0%{?rhel} >= 7 -# F22 polkit-devel doesn't pull in polkit anymore, which we need for pkcheck -BuildRequires: polkit >= 0.112 -BuildRequires: polkit-devel >= 0.112 -%else -BuildRequires: polkit-devel >= 0.93 -%endif # For mount/umount in FS driver BuildRequires: util-linux %if %{with_qemu} @@ -489,11 +482,6 @@ Requires: module-init-tools # for /sbin/ip & /sbin/tc Requires: iproute Requires: avahi-libs -%if 0%{?fedora} || 0%{?rhel} >= 7 -Requires: polkit >= 0.112 -%else -Requires: polkit >= 0.93 -%endif %if %{with_cgconfig} Requires: libcgroup %endif -- 2.14.3

2 3

[libvirt] [PATCH v2] qemu: hotplug: Clean up memory backing files after failed memory hotplug
by Peter Krempa 15 Mar '18

15 Mar '18

Libvirt provides full path to the backing file since commit fec8f9c49afb479f6. This made qemu create the backend object but did not delete it. This was fixed for unplug case in 4d83a6722f but not in case of failure to hotplug the frontend. We'd leave the files behind which would make memory unusable in case of hugepages. https://bugzilla.redhat.com/show_bug.cgi?id=1553085 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Differences to v1: - dropped mostly unhelpful comment - moved the call slightly earlier so that the error of the original hotplug operation is preserved src/qemu/qemu_hotplug.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e0a5300f08..49af4d4ff0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2212,6 +2212,10 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, ignore_value(qemuMonitorDelObject(priv->mon, objalias)); if (qemuDomainObjExitMonitor(driver, vm) < 0) mem = NULL; + + if (objAdded && mem) + ignore_value(qemuProcessDestroyMemoryBackingPath(driver, vm, mem)); + virErrorRestore(&orig_err); if (!mem) goto audit; -- 2.16.2

2 1

[libvirt] [PATCH 0/3] Couple of user alias fixes
by Michal Privoznik 15 Mar '18

15 Mar '18

The deeper into the rabbit hole we go the more I think it was a mistake to let users specify device aliases. Michal Privoznik (3): virDomainDeviceValidateAliasForHotplug: Use correct domain defintion conf: Check for user aliases duplicates only qemu: Forbid user aliases for USB controllers src/conf/domain_conf.c | 6 +++--- src/qemu/qemu_domain.c | 20 +++++++++++++++++++- tests/qemuxml2argvdata/user-aliases-usb.xml | 19 +++++++++++++++++++ tests/qemuxml2argvdata/user-aliases.xml | 1 - tests/qemuxml2argvtest.c | 1 + 5 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/user-aliases-usb.xml -- 2.16.1

2 8

[libvirt] [PATCH 0/2] Improve qemuDomainObjPrivateXMLParseJob
by Jiri Denemark 15 Mar '18

15 Mar '18

This is a follow-up to the Peter's work pushed yesterday. Jiri Denemark (2): qemu: Parse all job related private XML in dedicated function qemu: Switch context for job related private XML parsing src/qemu/qemu_domain.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) -- 2.16.2

2 4

[libvirt] [PATCH] lockd: fix typo in virtlockd-admin.socket
by Jim Fehlig 15 Mar '18

15 Mar '18

Commit ce7ae55ea1 introduced a typo in virtlockd-admin socket file /usr/lib/systemd/system/virtlockd-admin.socket:7: Unknown lvalue 'Server' in section 'Socket' Change 'Server' to 'Service'. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/locking/virtlockd-admin.socket.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in index 1fa0a3dc3..2a7500f3d 100644 --- a/src/locking/virtlockd-admin.socket.in +++ b/src/locking/virtlockd-admin.socket.in @@ -4,7 +4,7 @@ Before=libvirtd.service [Socket] ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock -Server=virtlockd.service +Service=virtlockd.service [Install] WantedBy=sockets.target -- 2.16.2

2 1

[libvirt] [PATCH 00/10] conf: Make disk source parsing cleaner and reusable
by Peter Krempa 15 Mar '18

15 Mar '18

Fixup and cleanup the disk source parsing code and make it usable in other parts of the code by exporting it. Peter Krempa (10): conf: Remove unnecessary condition from virDomainDiskSourceFormatInternal conf: Refactor seclabel formatting in virDomainDiskSourceFormatInternal conf: Remove virDomainDiskSourceDefFormatSeclabel conf: Refactor formatting of startupPolicy in virDomainDiskSourceFormatInternal conf: disk: Separate virStorageSource formatting conf: Validate disk source configuration also for the backing store conf: Separate seclabel validation from parsing conf: Parse and validate disk source seclabels together with the source conf: Extract parsing of storage source related data conf: Add and export wrapper for parsing storage source XML src/conf/domain_conf.c | 402 ++++++++++++++++++++++++++++------------------- src/conf/domain_conf.h | 13 ++ src/libvirt_private.syms | 2 + 3 files changed, 254 insertions(+), 163 deletions(-) -- 2.16.2

2 14

[libvirt] [PATCH] daemonStreamHandleWriteData: Preserve error when aborting stream
by Michal Privoznik 14 Mar '18

14 Mar '18

The daemonStreamHandleWriteData() function is called whenever server side of stream is able to receive some data. Nevertheless, it calls virStreamSend() (to pass data down to virFDStream) and depending on its return value it may abort the stream. However, the functions it called when doing so are public APIs and as such reset any error set previously. Therefore, if there was any error in writing data to stream (i.e. repored in virStreamSend) it is reset before virNetServerProgramSendReplyError() can get to it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/remote/remote_daemon_stream.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c index 4dd3af9e0..532afd856 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -549,8 +549,9 @@ daemonStreamHandleWriteData(virNetServerClientPtr client, } else if (ret == -2) { /* Blocking, so indicate we have more todo later */ return 1; - } else { + } else if (ret < 0) { virNetMessageError rerr; + virErrorPtr err = virSaveLastError(); memset(&rerr, 0, sizeof(rerr)); @@ -558,7 +559,10 @@ daemonStreamHandleWriteData(virNetServerClientPtr client, stream->closed = true; virStreamEventRemoveCallback(stream->st); virStreamAbort(stream->st); - + if (err) { + virSetError(err); + virFreeError(err); + } return virNetServerProgramSendReplyError(stream->prog, client, msg, -- 2.16.1

2 1

[libvirt] [PATCH] virsysinfo: Use more virSkipSpacesBackwards()
by Michal Privoznik 14 Mar '18

14 Mar '18

Some fields reported by dmidecode have plenty of useless spaces (in fact some have nothing but spaces). To deal with this we have introduced virSkipSpacesBackwards() and use it in virSysinfoParseX86Processor() and virSysinfoParseX86Memory(). However, other functions (e.g. virSysinfoParseX86Chassis()) don't use it at all and thus we are reporting nonsense: <sysinfo type='smbios'> <chassis> <entry name='manufacturer'>FUJITSU</entry> <entry name='version'> </entry> <entry name='serial'> </entry> <entry name='asset'> </entry> <entry name='sku'>Default string</entry> </chassis> </sysinfo> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virsysinfo.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 43a4c8835..5795d90c7 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -644,7 +644,8 @@ static int virSysinfoParseBIOS(const char *base, virSysinfoBIOSDefPtr *bios) { int ret = -1; - const char *cur, *eol = NULL; + const char *cur; + char *eol = NULL; virSysinfoBIOSDefPtr def; if ((cur = strstr(base, "BIOS Information")) == NULL) @@ -657,24 +658,28 @@ virSysinfoParseBIOS(const char *base, virSysinfoBIOSDefPtr *bios) if ((cur = strstr(base, "Vendor: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->vendor, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->version, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Release Date: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->date, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "BIOS Revision: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->release, cur, eol - cur) < 0) goto cleanup; } @@ -697,7 +702,8 @@ static int virSysinfoParseX86System(const char *base, virSysinfoSystemDefPtr *sysdef) { int ret = -1; - const char *cur, *eol = NULL; + const char *cur; + char *eol = NULL; virSysinfoSystemDefPtr def; if ((cur = strstr(base, "System Information")) == NULL) @@ -710,42 +716,49 @@ virSysinfoParseX86System(const char *base, virSysinfoSystemDefPtr *sysdef) if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->manufacturer, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Product Name: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->product, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->version, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->serial, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "UUID: ")) != NULL) { cur += 6; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->uuid, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "SKU Number: ")) != NULL) { cur += 12; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->sku, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Family: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->family, cur, eol - cur) < 0) goto cleanup; } @@ -770,7 +783,8 @@ virSysinfoParseX86BaseBoard(const char *base, size_t *nbaseBoard) { int ret = -1; - const char *cur, *eol = NULL; + const char *cur; + char *eol = NULL; virSysinfoBaseBoardDefPtr boards = NULL; size_t nboards = 0; char *board_type = NULL; @@ -787,36 +801,42 @@ virSysinfoParseX86BaseBoard(const char *base, if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->manufacturer, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Product Name: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->product, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->version, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->serial, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Asset Tag: ")) != NULL) { cur += 11; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->asset, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Location In Chassis: ")) != NULL) { cur += 21; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->location, cur, eol - cur) < 0) goto cleanup; } @@ -848,7 +868,8 @@ virSysinfoParseX86Chassis(const char *base, virSysinfoChassisDefPtr *chassisdef) { int ret = -1; - const char *cur, *eol = NULL; + const char *cur; + char *eol = NULL; virSysinfoChassisDefPtr def; if ((cur = strstr(base, "Chassis Information")) == NULL) @@ -861,30 +882,35 @@ virSysinfoParseX86Chassis(const char *base, if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->manufacturer, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->version, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->serial, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Asset Tag: ")) != NULL) { cur += 11; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->asset, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "SKU Number: ")) != NULL) { cur += 12; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->sku, cur, eol - cur) < 0) goto cleanup; } -- 2.16.1

2 2

[libvirt] [PATCH] m4: Fix xenstore detection
by Andrea Bolognani 14 Mar '18

14 Mar '18

Commit 596fc3e3897e introduced the ability to detect xenstore using pkg-config for systems with Xen 4.9, but accidentally broke detection for all other systems. Fix the logic so that it works in all cases. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- m4/virt-driver-xen.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/m4/virt-driver-xen.m4 b/m4/virt-driver-xen.m4 index 52d4f51626..1d0acfa363 100644 --- a/m4/virt-driver-xen.m4 +++ b/m4/virt-driver-xen.m4 @@ -42,7 +42,6 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_XEN], [ if test "$xen_path_provided" = "no" ; then PKG_CHECK_MODULES([XEN], [xenstore], [ - fail=0 with_xen=yes ], [ fail=1 @@ -52,8 +51,8 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_XEN], [ if test "$xen_path_provided" = "yes" || test "$fail" = 1 ; then CFLAGS="$CFLAGS $XEN_CFLAGS" LIBS="$LIBS $XEN_LIBS" + fail=0 AC_CHECK_LIB([xenstore], [xs_read], [ - fail=0 with_xen=yes XEN_LIBS="$XEN_LIBS -lxenstore" ],[ -- 2.14.3

2 1

[libvirt] libvirt cannot boot windows-uefi-guest with virtio disk
by Иван Иванов 14 Mar '18

14 Mar '18

I am using libvirt 3.6 version on Ubuntu 17.10 and create domain with command: virt-install --name dc02 --memory 1024,maxmemory=2048 --vcpus 1 --cpu host --boot uefi,hd,network --disk /var/lib/libvirt/images/dc02.qcow2,bus=virtio --network bridge=br.27,model=virtio --video=qxl --memballoon virtio --hvm --controller usb3 --machine=q35 --graphics spice,listen=192.168.69.108 Domain boot failed with BSOD message "Unaccesible boot device", but when i change virtio-drive to sata-drive, its successfuly boot ps -ef output for virtio-drive look like: libvirt+ 39726 1 45 19:59 ? 00:00:06 qemu-system-x86_64 -enable-kvm -name guest=dc02,debug-threads=on -S -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain-11-dc02/master-key.aes -machine pc-q35-2.10,accel=kvm,usb=off,vmport=off,dump-guest-core=off -cpu SandyBridge,vme=on,ss=on,vmx=on,pcid=on,hypervisor=on,arat=on,tsc_adjust=on,xsaveopt=on,pdpe1gb=on -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on -drive file=/var/lib/libvirt/qemu/nvram/dc02_VARS.fd,if=pflash,format=raw,unit=1 -m 2048 -realtime mlock=off -smp 1,sockets=1,cores=1,threads=1 -uuid fab3a566-46ad-4b2c-9e65-26cb685af33a -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/domain-11-dc02/monitor.sock,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc,driftfix=slew -global kvm-pit.lost_tick_policy=delay -no-hpet -no-shutdown -global ICH9-LPC.disable_s3=1 -global ICH9-LPC.disable_s4=1 -boot strict=on -device pcie-root-port,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 -device i82801b11-bridge,id=pci.2,bus=pcie.0,addr=0x1e -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.2,addr=0x0 -device pcie-root-port,port=0x11,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x1 -device pcie-root-port,port=0x12,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x2 -device pcie-root-port,port=0x13,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x3 -device pcie-root-port,port=0x14,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x4 -device pcie-root-port,port=0x15,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x5 -device nec-usb-xhci,id=usb,bus=pci.4,addr=0x0 -device virtio-serial-pci,id=virtio-serial0,bus=pci.5,addr=0x0 -drive file=/var/lib/libvirt/images/dc02.qcow2,format=qcow2,if=none,id=drive-virtio-disk0 -device virtio-blk-pci,scsi=off,bus=pci.6,addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -netdev tap,fd=27,id=hostnet0,vhost=on,vhostfd=29 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:16:88:b3,bus=pci.1,addr=0x0,bootindex=2 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -chardev spicevmc,id=charchannel0,name=vdagent -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 -spice port=5900,addr=192.168.69.108,disable-ticketing,image-compression=off,seamless-migration=on -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vram64_size_mb=0,vgamem_mb=16,max_outputs=1,bus=pcie.0,addr=0x1 -device intel-hda,id=sound0,bus=pci.3,addr=0x1 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -chardev spicevmc,id=charredir0,name=usbredir -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 -chardev spicevmc,id=charredir1,name=usbredir -device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=2 -device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x0 -msg timestamp=on But when i run this domain with qemu-system its succsessfuly boot and work. Cmd looks like: qemu-system-x86_64 -machine type=pc-q35-2.8 -accel kvm -cpu host \ -cdrom /var/lib/libvirt/images/virtio-win-0.1.141.iso \ --bios /usr/share/OVMF/OVMF_CODE.fd \ -m 2048 -smp 2 -drive file=/var/lib/libvirt/images/dc02.qcow2,index=0,media=disk,if=virtio -boot menu=on \ -spice addr=192.168.69.108,port=5910,disable-ticketing I cannot fugire out where i went wrong

2 1

[libvirt] [GSoC]: Help in setup
by Sukrit Bhatnagar 14 Mar '18

14 Mar '18

Hi, I am Sukrit, currently pursuing Masters in Computer Science and Engineering from Indian Institute of Technology Bombay, India. I am interested in applying for a few projects listed on the ideas page. But, I am not able to connect to IRC channel (missing key problem). Also, I am not able to run `autogen.sh` successfully from the git repo clone as there is some error related to gnulib git repo's URL. Can someone help me out please? Thanks, Sukrit Bhatnagar

6 6

[libvirt] [PATCH 00/11] Make some virsh.pod adjustments for vol-* commands
by John Ferlan 14 Mar '18

14 Mar '18

Been reviewing documentation lately - ran into the virsh vol-* commands and their "inconsistency" with the expected ordering of the command options. Also the commands were largely a mash of sentences without regard for any sort of readability. John Ferlan (11): virsh: Clean up formatting of the vol-create* commands virsh: Fix man page argument ordering for vol-clone command virsh: Fix man page argument ordering for vol-delete command virsh: Fix man page argument ordering for vol-upload command virsh: Fix man page argument ordering for vol-download command virsh: Fix man page argument ordering for vol-wipe command virsh: Fix man page argument ordering for vol-dumpxml command virsh: Fix man page argument ordering for vol-info command virsh: Clean up man page formatting for vol-list and vol-pool virsh: Fix man page argument ordering for vol-{path|name|key} commands tools: Clean up the vol-resize man page tools/virsh.pod | 238 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 168 insertions(+), 70 deletions(-) -- 2.13.6

2 12

[libvirt] [PATCH] qemu: avoid denial of service reading from QEMU guest agent (CVE-2018-1064)
by Daniel P. Berrangé 14 Mar '18

14 Mar '18

We read from the agent until seeing a \r\n pair to indicate a completed reply or event. To avoid memory denial-of-service though, we must have a size limit on amount of data we buffer. 10 MB is large enough that it ought to cope with normal agent replies, and small enough that we're not consuming unreasonable mem. This is identical to the flaw we had reading from the QEMU monitor as CVE-2018-5748, so rather embarrassing that we forgot to fix the agent code at the same time. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a security patch pre-reviewed via the libvirt-security list src/qemu/qemu_agent.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 0f36054a61..89183c3f76 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -53,6 +53,15 @@ VIR_LOG_INIT("qemu.qemu_agent"); #define DEBUG_IO 0 #define DEBUG_RAW_IO 0 +/* We read from QEMU until seeing a \r\n pair to indicate a + * completed reply or event. To avoid memory denial-of-service + * though, we must have a size limit on amount of data we + * buffer. 10 MB is large enough that it ought to cope with + * normal QEMU replies, and small enough that we're not + * consuming unreasonable mem. + */ +#define QEMU_AGENT_MAX_RESPONSE (10 * 1024 * 1024) + /* When you are the first to uncomment this, * don't forget to uncomment the corresponding * part in qemuAgentIOProcessEvent as well. @@ -535,6 +544,12 @@ qemuAgentIORead(qemuAgentPtr mon) int ret = 0; if (avail < 1024) { + if (mon->bufferLength >= QEMU_AGENT_MAX_RESPONSE) { + virReportSystemError(ERANGE, + _("No complete agent response found in %d bytes"), + QEMU_AGENT_MAX_RESPONSE); + return -1; + } if (VIR_REALLOC_N(mon->buffer, mon->bufferLength + 1024) < 0) return -1; -- 2.14.3

1 0

[libvirt] [PATCH 0/5] Partially successful attempt at Python 3 compatibility
by Andrea Bolognani 14 Mar '18

14 Mar '18

We use Python in out build system: more specifically, we're stuck with Python 2 even though Python 3's been out for a decade and some major Linux distributions have gone Python 3-only recently. This series tries to solve the issue, but falls quite short. Maybe someone who actually knows Python should have tried instead of me? The good news is that, once the first two patches have been merged, anyone will be able to give it a shot by running PYTHON=$(which python3) ./autogen.sh or similar. Let's get the ball rolling! Andrea Bolognani (5): NEWS: Move generation to the docs/ directory docs: Call reformat-news.py with $(PYTHON) esx: Port esx_vi_generator.py to Python 3 hyperv: Port hyperv_wmi_generator.py to Python 3 docs: Port apibuild.py to Python 3 .gitignore | 1 + Makefile.am | 24 +-- docs/Makefile.am | 24 +++ docs/apibuild.py | 379 ++++++++++++++++++------------------- src/esx/esx_vi_generator.py | 30 ++- src/hyperv/hyperv_wmi_generator.py | 17 +- 6 files changed, 233 insertions(+), 242 deletions(-) -- 2.14.3

2 10

[libvirt] [PATCH 0/2] qemu: Remove memory backing files on failed memory hotplug
by Peter Krempa 14 Mar '18

14 Mar '18

see 2/2 Peter Krempa (2): REPRODUCER -- DO NOT PUSH qemu: hotplug: Clean up memory backing files after failed memory hotplug dom.xml | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ mem.xml | 6 +++ src/qemu/qemu_hotplug.c | 7 +++ 3 files changed, 123 insertions(+) create mode 100644 dom.xml create mode 100644 mem.xml -- 2.16.2

3 6

[libvirt] [PATCH] m4: use pkgconfig to detect xenstore
by Olaf Hering 14 Mar '18

14 Mar '18

Since Xen 4.9 a pkgconfig file exists to gather info about building against libxenstore.so. Use it if available. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- m4/virt-driver-xen.m4 | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/m4/virt-driver-xen.m4 b/m4/virt-driver-xen.m4 index 2a26863ca..52d4f5162 100644 --- a/m4/virt-driver-xen.m4 +++ b/m4/virt-driver-xen.m4 @@ -27,25 +27,42 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_XEN], [ old_CFLAGS="$CFLAGS" XEN_LIBS="" XEN_CFLAGS="" + fail=0 dnl search for the Xen store library + dnl Either use the provided path, or make use of pkgconfig + dnl Xen versions prior 4.9 had no pkgconfig file if test "$with_xen" != "no" ; then + xen_path_provided="no" if test "$with_xen" != "yes" && test "$with_xen" != "check" ; then XEN_CFLAGS="-I$with_xen/include" XEN_LIBS="-L$with_xen/lib64 -L$with_xen/lib" + xen_path_provided="yes" + fi + + if test "$xen_path_provided" = "no" ; then + PKG_CHECK_MODULES([XEN], [xenstore], [ + fail=0 + with_xen=yes + ], [ + fail=1 + ]) + fi + dnl manual check if either path was provided or pkgconfig does not exist + if test "$xen_path_provided" = "yes" || test "$fail" = 1 ; then + CFLAGS="$CFLAGS $XEN_CFLAGS" + LIBS="$LIBS $XEN_LIBS" + AC_CHECK_LIB([xenstore], [xs_read], [ + fail=0 + with_xen=yes + XEN_LIBS="$XEN_LIBS -lxenstore" + ],[ + if test "$with_xen" = "yes"; then + fail=1 + fi + with_xen=no + ]) fi - fail=0 - CFLAGS="$CFLAGS $XEN_CFLAGS" - LIBS="$LIBS $XEN_LIBS" - AC_CHECK_LIB([xenstore], [xs_read], [ - with_xen=yes - XEN_LIBS="$XEN_LIBS -lxenstore" - ],[ - if test "$with_xen" = "yes"; then - fail=1 - fi - with_xen=no - ]) fi if test "$with_xen" != "no" ; then

2 2

[libvirt] [PATCH] bugfix: add lock in ClientClose to avoid data race
by xinhua.Cao 13 Mar '18

13 Mar '18

From: l00425170 <liujunjie23(a)huawei.com> When libvirt client registers callback function, remoteDispatchConnectDomainEventCallbackRegisterAny is called, then virInsertElementsN will be called to add new callback for struct daemonClientPrivate *priv. But at the same time, if the corresponding socket is closed (one way is to kill the client process), the close callback remoteClientCloseFunc is called, then remoteFreePrivCallbacks(priv) is called to free priv. So there exists data race to cause libvirtd coredump. More details, in add callback, when memset for ptrptr (that is priv) is done in virExpandN at the process of virInsertElementsN. At this time point, priv can be free to be 0x0 when close client. So when the procedure goes to memcpy in virInsertElementsN, the libvirtd will coredump. And the stack are as follows: Thread 1 (Thread 0x7feadf7fe700 (LWP 8978)): #0 0x00007feb7b77f314 in __memcpy_ssse3_back() from /usr/lib64/libc.so.6 #1 0x00007feb7e769a82 in memcpy (__len=8, __src=0x7feadf7fdb58, __dest=<optimized out>) at /usr/include/bits/string3.h:51 #2 virInsertElementsN (ptrptr=ptrptr@entry=0x558e9c36fae8, size=size@entry=8, at=<optimized out>, at@entry=18446744073709551615, countptr=countptr@entry=0x558e9c36faf0, add=add@entry=1, newelems=newelems@entry=0x7feadf7fdb58, clearOriginal=clearOriginal@entry=true, inPlace=inPlace@entry=false, report=report@entry=true, domcode=domcode@entry=7, filename=filename@entry=0x558e9af16107 "remote.c", funcname=funcname@entry=0x558e9af24600 <__FUNCTION__.48097> "remoteDispatchConnectDomainEventCallbackRegisterAny", linenr=linenr@entry=4424) at util/viralloc.c:454 #3 0x0000558e9aed7001 in remoteDispatchConnectDomainEventCallbackRegisterAny (server=<optimized out>, msg=<optimized out>, ret=0x7feab805e6f0, args=0x7feab806aa40, rerr=0x7feadf7fdc90, client=<optimized out>) at remote.c:4422 #4 remoteDispatchConnectDomainEventCallbackRegisterAnyHelper (server=<optimized out>, client=<optimized out>, msg=<optimized out>, rerr=0x7feadf7fdc90, args=0x7feab806aa40, ret=0x7feab805e6f0) at remote_dispatch.h:424 #5 0x0000558e9af0ca48 in virNetServerProgramDispatchCall (msg=0x558e9c3925c0, client=0x558e9c36f970, server=0x558e9c351570, prog=0x558e9c367d50) at rpc/virnetserverprogram.c:474 #6 virNetServerProgramDispatch (prog=0x558e9c367d50, server=server@entry=0x558e9c351570, client=0x558e9c36f970, msg=0x558e9c3925c0) at rpc/virnetserverprogram.c:311 #7 0x0000558e9af085ed in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x558e9c351570) at rpc/virnetserver.c:148 #8 virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x558e9c351570) at rpc/virnetserver.c:169 #9 0x00007feb7e7f1861 in virThreadPoolWorker (opaque=opaque@entry=0x558e9c36b5f0) at util/virthreadpool.c:167 #10 0x00007feb7e7f0b78 in virThreadHelper (data=<optimized out>) at util/virthread.c:219 #11 0x00007feb7b9fcdc5 in start_thread () from /usr/lib64/libpthread.so.0 #12 0x00007feb7b72b75d in clone () from /usr/lib64/libc.so.6 Signed-off-by: l00425170 <liujunjie23(a)huawei.com> --- src/remote/remote_daemon.h | 2 ++ src/remote/remote_daemon_dispatch.c | 46 ++++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h index 4467f71..8accafc 100644 --- a/src/remote/remote_daemon.h +++ b/src/remote/remote_daemon.h @@ -76,6 +76,8 @@ struct daemonClientPrivate { virConnectPtr conn; daemonClientStreamPtr streams; + + bool clientClosed; }; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index fdb0a36..59e69e6 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1752,8 +1752,12 @@ static void remoteClientCloseFunc(virNetServerClientPtr client) daemonRemoveAllClientStreams(priv->streams); /* Deregister event delivery callback */ - if (priv->conn) + if (priv->conn) { + virMutexLock(&priv->lock); remoteClientFreePrivateCallbacks(priv); + priv->clientClosed = true; + virMutexUnlock(&priv->lock); + } } @@ -3889,6 +3893,11 @@ remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + /* If we call register first, we could append a complete callback * to our array, but on OOM append failure, we'd have to then hope * deregister works to undo our register. So instead we append an @@ -4116,6 +4125,11 @@ remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + /* We intentionally do not use VIR_DOMAIN_EVENT_ID_LAST here; any * new domain events added after this point should only use the * modern callback style of RPC. */ @@ -4192,6 +4206,11 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server ATTRI virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->dom && !(dom = get_nonnull_domain(priv->conn, *args->dom))) goto cleanup; @@ -5702,6 +5721,11 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server ATTRIBUTE_UN virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->net && !(net = get_nonnull_network(priv->conn, *args->net))) goto cleanup; @@ -5824,6 +5848,11 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server ATTRIBUT virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->pool && !(pool = get_nonnull_storage_pool(priv->conn, *args->pool))) goto cleanup; @@ -5945,6 +5974,11 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNetServerPtr server ATTRIBUTE virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->dev && !(dev = get_nonnull_node_device(priv->conn, *args->dev))) goto cleanup; @@ -6066,6 +6100,11 @@ remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->secret && !(secret = get_nonnull_secret(priv->conn, *args->secret))) goto cleanup; @@ -6188,6 +6227,11 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server ATTRIBUTE_U virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->dom && !(dom = get_nonnull_domain(priv->conn, *args->dom))) goto cleanup; -- 2.13.3.windows.1

2 1