- Devel - libvirt List Archives

[libvirt] [PATCH] virt-aa-helper: Actually fix AppArmor profile
by Andrea Bolognani 20 Aug '19

20 Aug '19

Tried previously in commit b1eb8b3e8fd1d4cb1da8e5e2b16f2c10837fd823 Author: Andrea Bolognani <abologna(a)redhat.com> Date: Mon Aug 19 10:23:42 2019 +0200 virt-aa-helper: Fix AppArmor profile v5.6.0-243-gb1eb8b3e8f with somewhat disappointing results. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/security/apparmor/usr.lib.libvirt.virt-aa-helper | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper index d81dddef30..64772f0756 100644 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper @@ -18,8 +18,8 @@ profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper { @{PROC}/filesystems r, # Used when internally running another command (namely apparmor_parser) - @{PROC}/self/fd r, - @{PROC}/@{pid}/fd r, + @{PROC}/self/fd/ r, + @{PROC}/@{pid}/fd/ r, /etc/libnl-3/classid r, -- 2.21.0

3 3

[libvirt] [PATCH 00/21] conf: namespaces: remove some copy'n'paste
by Ján Tomko 20 Aug '19

20 Aug '19

Ján Tomko (21): virDomainDefNamespaceParse: remove unused attributes virDomainDefParseXML: remove unused parameter prepare: domain format if format not href conf: ns.parse: decouple call from condition util: introduce virXMLNamespace conf: network: use generic XML namespace types conf: storage: use generic XML namespace types conf: domain: use generic XML namespace types xml: virXMLNamespace: add prefix conf: network: store namespace prefix conf: domain: store namespace prefix conf: storage: store namespace prefix conf: test: store namespace href util: introduce virXMLNamespaceFormatNS conf: network: use virXMLNamespaceFormatNS conf: storage: use virXMLNamespaceFormatNS conf: domain: use virXMLNamespaceFormatNS util: xml: introduce virXMLNamespaceRegister conf: network: use virXMLNamespaceRegister conf: storage: use virXMLNamespaceRegister conf: domain: use virXMLNamespaceRegister src/bhyve/bhyve_domain.c | 18 ++++-------------- src/bhyve/bhyve_domain.h | 2 +- src/conf/capabilities.h | 13 ------------- src/conf/domain_conf.c | 24 +++++++++++++----------- src/conf/domain_conf.h | 6 +++--- src/conf/network_conf.c | 13 ++++++++----- src/conf/network_conf.h | 25 ++++--------------------- src/conf/storage_conf.c | 15 +++++++++------ src/conf/storage_conf.h | 23 ++++------------------- src/conf/virconftypes.h | 3 --- src/lxc/lxc_domain.c | 17 ++++------------- src/lxc/lxc_domain.h | 2 +- src/network/bridge_driver.c | 15 +++------------ src/network/bridge_driver.h | 2 +- src/qemu/qemu_domain.c | 17 ++++------------- src/qemu/qemu_domain.h | 2 +- src/storage/storage_backend_fs.c | 14 +++----------- src/storage/storage_backend_rbd.c | 14 +++----------- src/storage/storage_util.c | 2 +- src/storage/storage_util.h | 2 +- src/test/test_driver.c | 23 ++++++++++------------- src/util/virxml.c | 27 +++++++++++++++++++++++++++ src/util/virxml.h | 22 ++++++++++++++++++++++ src/vmx/vmx.c | 5 +++-- 24 files changed, 130 insertions(+), 176 deletions(-) -- 2.19.2

2 43

[libvirt] [PATCH] virpci:fix Secondary Bus Reset bug
by hexin900110＠163.com 20 Aug '19

20 Aug '19

From: hexin <hexin15(a)baidu.com> The parent bridge configuration of the current device should be read and reset, instead of reading the current device configuration. Signed-off-by: He Xin <hexin15(a)baidu.com> Signed-off-by: Liu Qi <liuqi16(a)baidu.com> Signed-off-by: Zhang Yu <zhangyu31(a)baidu.com> --- src/util/virpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 61a6b359e5..483de2cb16 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -821,7 +821,7 @@ virPCIDeviceTrySecondaryBusReset(virPCIDevicePtr dev, /* Read the control register, set the reset flag, wait 200ms, * unset the reset flag and wait 200ms. */ - ctl = virPCIDeviceRead16(dev, cfgfd, PCI_BRIDGE_CONTROL); + ctl = virPCIDeviceRead16(dev, parentfd, PCI_BRIDGE_CONTROL); virPCIDeviceWrite16(parent, parentfd, PCI_BRIDGE_CONTROL, ctl | PCI_BRIDGE_CTL_RESET); -- 2.22.0

5 5

[libvirt] [PATCH 0/2] cgroups v2 fixes
by Pavel Hrdina 20 Aug '19

20 Aug '19

*** BLURB HERE *** Pavel Hrdina (2): vircgroupv2: fix parsing multiple values in single file vircgroupv2: fix virCgroupV2GetCpuCfsQuota for "max" value src/util/vircgroupv2.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 2.21.0

2 4

[libvirt] [ocaml PATCH 0/3] Misc improvements
by Pino Toscano 20 Aug '19

20 Aug '19

*** IMAGINE A BLURB HERE *** Pino Toscano (3): Synchronize Virterror with libvirt 5.6.0 Update config.guess and config.sub Fix shebang in perl scripts config.guess | 284 ++++++++++++++++++++++++++++------- config.sub | 69 +++++---- libvirt/generator.pl | 3 +- libvirt/libvirt.ml | 8 + libvirt/libvirt.mli | 4 + libvirt/libvirt_c_epilogue.c | 4 +- 6 files changed, 282 insertions(+), 90 deletions(-) -- 2.21.0

2 4

[libvirt] 5.6.0 regression: "Some activation file descriptors are unclaimed"
by Allen, John 20 Aug '19

20 Aug '19

After upgrading to v5.6.0, starting libvirtd fails with the following message in journalctl -xe: libvirtd[186338]: internal error: Some activation file descriptors are unclaimed 5b8569dd6e284b9159c701e8bffafb196983fc4a introduces the message. The commit message indicates that systemd version 227 is required, but my system seems to be running version 237. Is this a known issue? Is there any other configuration for systemd needed to avoid the problem? Thanks, John

2 5

[libvirt] [PATCH 0/2] libxl: suspend-related fixes
by Jim Fehlig 20 Aug '19

20 Aug '19

Commit d00c77ae introduced a regression in save and migration operations of persisent domains. E.g. after a successful migration the source host showes the migrated domain in state "pmsuspended" instead of "shut off". Fix it by reverting the commit and setting the state after a successful call to the underlying libxl API. Jim Fehlig (2): Revert "libxl: send lifecycle event on suspend" libxl: send lifecycle event on PMSuspend src/libxl/libxl_domain.c | 19 ++++++++----------- src/libxl/libxl_driver.c | 6 ++++++ 2 files changed, 14 insertions(+), 11 deletions(-) -- 2.22.0

2 4

[libvirt] [PATCH] conf: resctrl object is not properly handled
by Wang Huaqiang 20 Aug '19

20 Aug '19

resctrl object stored in def->resctrls is shared by cachetune and memorytune. The domain xml configuration is parsed firstly for cachetune then memorytune, and the resctrl object will not be created in parsing settings for memorytune once it found sharing exists. But resctrl is improperly freed when sharing happens. Signed-off-by: Wang Huaqiang <huaqiang.wang(a)intel.com> --- src/conf/domain_conf.c | 12 +++++------- tests/genericxml2xmlindata/memorytune.xml | 4 ++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 617ccac..604e006 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19590,7 +19590,6 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, VIR_AUTOUNREF(virResctrlAllocPtr) alloc = NULL; ssize_t i = 0; int n; - int ret = -1; ctxt->node = node; @@ -19632,14 +19631,13 @@ virDomainMemorytuneDefParse(virDomainDefPtr def, if (!(resctrl = virDomainResctrlNew(node, alloc, vcpus, flags))) return -1; - if (VIR_APPEND_ELEMENT(def->resctrls, def->nresctrls, resctrl) < 0) - goto cleanup; + if (VIR_APPEND_ELEMENT(def->resctrls, def->nresctrls, resctrl) < 0) { + virDomainResctrlDefFree(resctrl); + return -1; + } } - ret = 0; - cleanup: - virDomainResctrlDefFree(resctrl); - return ret; + return 0; } diff --git a/tests/genericxml2xmlindata/memorytune.xml b/tests/genericxml2xmlindata/memorytune.xml index ea03e22..7486b54 100644 --- a/tests/genericxml2xmlindata/memorytune.xml +++ b/tests/genericxml2xmlindata/memorytune.xml @@ -5,6 +5,10 @@ <currentMemory unit='KiB'>219136</currentMemory> <vcpu placement='static'>4</vcpu> <cputune> + <cachetune vcpus='0-1'> + <cache id='0' level='3' type='both' size='768' unit='KiB'/> + <cache id='1' level='3' type='both' size='768' unit='KiB'/> + </cachetune> <memorytune vcpus='0-1'> <node id='0' bandwidth='20'/> <node id='1' bandwidth='30'/> -- 2.7.4

3 2

[libvirt] [PATCH v2] tools: console: Relax stream EOF handling
by Roman Bolshakov 20 Aug '19

20 Aug '19

Regular VM shutdown triggers the error for existing session of virsh console and it returns with non-zero exit code: error: internal error: console stream EOF The message and status code are misleading because there's no real error. virStreamRecv returns 0 when the end of the stream is reached. In that case, virStreamFinish should be used to get confirmation of stream completion. virSteramAbort is used otherwise to terminate the stream early before an EOF. Fixes: 29f2b5248c6 ("tools: console: pass stream/fd errors to user") Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- Changes since v1: - Added needAbort parameter to virConsoleShutdown to specify if finish or abort is needed - Use it (needAbort = false) to finish stream after EOF from virStreamRecv - Print internal error if virStreamFinish or virStreamAbort do not succeed tools/virsh-console.c | 44 ++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/tools/virsh-console.c b/tools/virsh-console.c index e16f841e57..ad514a99a7 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -97,7 +97,7 @@ virConsoleHandleSignal(int sig ATTRIBUTE_UNUSED) static void -virConsoleShutdown(virConsolePtr con) +virConsoleShutdown(virConsolePtr con, bool needAbort) { virErrorPtr err = virGetLastError(); @@ -105,8 +105,15 @@ virConsoleShutdown(virConsolePtr con) virCopyLastError(&con->error); if (con->st) { + int termError; virStreamEventRemoveCallback(con->st); - virStreamAbort(con->st); + if (needAbort) + termError = virStreamAbort(con->st); + else + termError = virStreamFinish(con->st); + if (termError < 0) + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot terminate console stream")); virStreamFree(con->st); con->st = NULL; } @@ -158,7 +165,7 @@ virConsoleEventOnStream(virStreamPtr st, if (avail < 1024) { if (VIR_REALLOC_N(con->streamToTerminal.data, con->streamToTerminal.length + 1024) < 0) { - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } con->streamToTerminal.length += 1024; @@ -172,11 +179,10 @@ virConsoleEventOnStream(virStreamPtr st, if (got == -2) goto cleanup; /* blocking */ if (got <= 0) { + bool needAbort = true; if (got == 0) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("console stream EOF")); - - virConsoleShutdown(con); + needAbort = false; + virConsoleShutdown(con, needAbort); goto cleanup; } con->streamToTerminal.offset += got; @@ -195,7 +201,7 @@ virConsoleEventOnStream(virStreamPtr st, if (done == -2) goto cleanup; /* blocking */ if (done < 0) { - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } memmove(con->terminalToStream.data, @@ -216,7 +222,7 @@ virConsoleEventOnStream(virStreamPtr st, if (events & VIR_STREAM_EVENT_ERROR || events & VIR_STREAM_EVENT_HANGUP) { - virConsoleShutdown(con); + virConsoleShutdown(con, true); } cleanup: @@ -246,7 +252,7 @@ virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED, if (avail < 1024) { if (VIR_REALLOC_N(con->terminalToStream.data, con->terminalToStream.length + 1024) < 0) { - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } con->terminalToStream.length += 1024; @@ -260,17 +266,17 @@ virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED, if (got < 0) { if (errno != EAGAIN) { virReportSystemError(errno, "%s", _("cannot read from stdin")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); } goto cleanup; } if (got == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("EOF on stdin")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } if (con->terminalToStream.data[con->terminalToStream.offset] == con->escapeChar) { - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } @@ -283,13 +289,13 @@ virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED, if (events & VIR_EVENT_HANDLE_ERROR) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IO error on stdin")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } if (events & VIR_EVENT_HANDLE_HANGUP) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("EOF on stdin")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } @@ -322,7 +328,7 @@ virConsoleEventOnStdout(int watch ATTRIBUTE_UNUSED, if (done < 0) { if (errno != EAGAIN) { virReportSystemError(errno, "%s", _("cannot write to stdout")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); } goto cleanup; } @@ -344,13 +350,13 @@ virConsoleEventOnStdout(int watch ATTRIBUTE_UNUSED, if (events & VIR_EVENT_HANDLE_ERROR) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IO error stdout")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } if (events & VIR_EVENT_HANDLE_HANGUP) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("EOF on stdout")); - virConsoleShutdown(con); + virConsoleShutdown(con, true); goto cleanup; } @@ -489,7 +495,7 @@ virshRunConsole(vshControl *ctl, ret = 0; cleanup: - virConsoleShutdown(con); + virConsoleShutdown(con, true); if (ret < 0) { vshResetLibvirtError(); -- 2.22.0

3 3

[libvirt] [PATCH] ci: Adapt to container name changes
by Andrea Bolognani 20 Aug '19

20 Aug '19

Since libvirt-dockerfile's commit 7130ffe0a0e9, the containers used for CI builds have been renamed from buildenv-* to buildenv-libvirt-* in order to make it possible for projects other than libvirt to be supported, so we need to update our Makefile.ci scaffolding accordingly. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- This is connected to https://www.redhat.com/archives/libvir-list/2019-August/msg00399.html https://www.redhat.com/archives/libvir-list/2019-August/msg00416.html and should only be merged once the above have been merged *and* deployed, as in, images with the new names have been generated. Makefile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.ci b/Makefile.ci index 8857c953b2..dddd438a98 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -49,7 +49,7 @@ CI_SUBMODULES = $(shell git submodule | awk '{ print $$2 }') # Location of the container images we're going to pull # Can be useful to overridde to use a locally built # image instead -CI_IMAGE_PREFIX = quay.io/libvirt/buildenv- +CI_IMAGE_PREFIX = quay.io/libvirt/buildenv-libvirt- # The default tag is ':latest' but if the container # repo above uses different conventions this can override it -- 2.21.0

2 7