- Devel - libvirt List Archives

[libvirt] [PATCH] util: storage: drop VIR_STORAGE_FILE_AUTO_SAFE
by Yi Li 26 Aug '19

26 Aug '19

merge VIR_STORAGE_FILE_AUTO_SAFE/VIR_STORAGE_FILE_AUTO to VIR_STORAGE_FILE_AUTO virStorageFileProbeFormatFromBuf will probe the backingStore format. Fix the booting issue when setting backingStore format (QCOW image) to RAW image. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/qemu/qemu_block.c | 2 -- src/util/virstoragefile.c | 4 +--- src/util/virstoragefile.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 66b1d11..0b99efc 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -1367,7 +1367,6 @@ qemuBlockStorageSourceGetBlockdevFormatProps(virStorageSourcePtr src) driver = virStorageFileFormatTypeToString(src->format); break; - case VIR_STORAGE_FILE_AUTO_SAFE: case VIR_STORAGE_FILE_AUTO: case VIR_STORAGE_FILE_NONE: case VIR_STORAGE_FILE_COW: @@ -2275,7 +2274,6 @@ qemuBlockStorageSourceCreateGetFormatProps(virStorageSourcePtr src, case VIR_STORAGE_FILE_DIR: return 0; - case VIR_STORAGE_FILE_AUTO_SAFE: case VIR_STORAGE_FILE_AUTO: case VIR_STORAGE_FILE_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 7288e18..2ebb2f1 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -692,7 +692,7 @@ qedGetBackingStore(char **res, if (flags & QED_F_BACKING_FORMAT_NO_PROBE) *format = VIR_STORAGE_FILE_RAW; else - *format = VIR_STORAGE_FILE_AUTO_SAFE; + *format = VIR_STORAGE_FILE_AUTO; return BACKING_STORE_OK; } @@ -4916,8 +4916,6 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src, goto cleanup; if (backingFormat == VIR_STORAGE_FILE_AUTO) - backingStore->format = VIR_STORAGE_FILE_RAW; - else if (backingFormat == VIR_STORAGE_FILE_AUTO_SAFE) backingStore->format = VIR_STORAGE_FILE_AUTO; else backingStore->format = backingFormat; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index b65cd4c..c9deb6f 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -60,7 +60,6 @@ VIR_ENUM_DECL(virStorage); typedef enum { - VIR_STORAGE_FILE_AUTO_SAFE = -2, VIR_STORAGE_FILE_AUTO = -1, VIR_STORAGE_FILE_NONE = 0, VIR_STORAGE_FILE_RAW, -- 2.7.5

2 1

[libvirt] [PATCH v4 00/42] Split the libvirtd daemon into per-driver daemons
by Daniel P. Berrangé 23 Aug '19

23 Aug '19

This is what all the driver refactoring I've done has been about enabling. We gain new daemons for each driver, for the primary virt drivers: virtlibxld virtlxcd virtqemud virtvboxd virtvzd And again for the secondary drivers virtinterfaced virtnetworkd virtnodedevd virtnwfilterd virtsecretd virtstoraged Finally to support IP connectivity, and also the legacy lbivirtd UNIX domain socket (for the old libvirt remote driver SSH tunnelling): virtproxyd The the sake of facilitating upgrades, the existing libvirtd still exists and works the same way it always has. You either run libvirtd, or you run the per-driver daemons, never both. The remote driver will look to see whether libvirtd is running to figure out whether to connect to libvirtd or the new per-driver daemons. When auto-spawning daemons for nonroot users, we default to spawning the per-driver daemons. This can be controlled with a UR parameter "?mode=direct|legacy|auto", where 'direct' means per-driver and 'legacy' means libvirtd (or indirect via virtproxyd if that's running). Canged in v4: - Addressed previous review feedback - Temporarily drop identity patches, which will continue in a separate patch series, once this is merged. Changed in v3: - Add identity forwarding between daemons for polkit auth - Make virtxend sockets conditional on Xen kernel - Other misc review fixes Changed in v2: - Added systemd unit files for service & sockets, ensuring conflicts with libvirtd - Fixed proxy to actually handle probing of URIs (still not quite perfect) - Renamed virtlibxld to virtxend as "xen" is the user facing name of the URI - Lazy loading of secondary drivers, so connecting to virtqemud does't auto-spawn all secondary driver daemons, until a relevant API is actually invoked - Actually generated config files / augeas files per daemon - Abort daemon startup if driver fails to load - Many other fixes A few nice to have things, but not merge blocking - MAYBE make it possible to disable build of libvirtd, or of the per-driver daemons so downstream vendors can decide which to ship. Alternatively they can just not include the binary in the package file list ? - Tuning of the daemon defaults for worker threads to better suit the fact that we have per-driver daemons - More work on RPM packaging to allow install of per-driver daemosn without pulling in libvirtd too Daniel P. Berrangé (42): build: make augeas-gentest.pl write to stdout build: collapse rules adding augeas tests to CLEANFILES build: create all augeas test files in same dir as their source build: use a common rule for checking augeas test data files build: centralize rule for handling generated config files remote: stop trying to print help as giant blocks of text remote: conditionalize daemon name in libvirtd daemon remote: conditionalize driver loading in libvirtd daemon remote: conditionalize IP socket usage in libvirtd daemon build: use @CONFIG@ instead of ::CONFIG:: in augeas tests remote: conditionalize IP socket config in libvirtd.conf remote: conditionalize IP socket config in augeas definitions remote: remove useless $(LIBSOCKET) variable remote: refactor & rename variables for building libvirtd build: don't hardcode /etc in the config related files remote: reduce duplication in systemd unit file make rules into one remote: conditionalize systemd socket unit files remote: refactor how list of systemd unit files is built remote: in per-driver daemons ensure that state initialize succeeds remote: introduce virtproxyd daemon to handle IP connectivity secret: introduce virtsecretd daemon network: introduce virtnetworkd daemon interface: introduce virtinterfaced daemon storage: introduce virtstoraged daemon nodedev: introduce virtnodedevd daemon nwfilter: introduce virtnwfilterd daemon libxl: introduce virtxend daemon qemu: introduce virtqemud daemon lxc: introduce virtlxcd daemon vbox: introduce virtvboxd daemon bhyve: introduce virtbhyved daemon vz: introduce virtvzd daemon admin: add ability to connect to the per-driver daemon sockets remote: get rid of bogus ATTRIBUTE_UNUSED annotation client param remote: change generated methods to not directly access connection remote: fix lock ordering mistake in event registration remote: change hand written methods to not directly access connection remote: open secondary drivers via remote driver if needed remote: handle autoprobing of driver within virtproxyd remote: use enum helpers for parsing remote driver transport remote: refactor the code for choosing the UNIX socket path remote: enable connecting to the per-driver daemons .gitignore | 63 +- .gnulib | 2 +- build-aux/augeas-gentest.pl | 22 +- docs/remote.html.in | 18 + libvirt.spec.in | 91 ++ m4/virt-driver-remote.m4 | 15 + src/Makefile.am | 32 +- src/admin/admin_server_dispatch.c | 9 + src/bhyve/Makefile.inc.am | 56 +- src/bhyve/bhyve_driver.c | 10 +- src/bhyve/test_libvirtd_bhyve.aug.in | 2 +- src/driver-state.h | 8 +- src/driver.h | 2 + src/interface/Makefile.inc.am | 63 + src/interface/interface_backend_netcf.c | 8 +- src/interface/interface_backend_udev.c | 4 +- src/interface/virtinterfaced.service.in | 24 + src/libvirt-admin.c | 33 +- src/libvirt.c | 42 +- src/libvirt_internal.h | 1 + src/libxl/Makefile.inc.am | 81 +- src/libxl/libxl_driver.c | 10 +- src/libxl/test_libvirtd_libxl.aug.in | 2 +- src/libxl/virtxend.service.in | 29 + src/locking/Makefile.inc.am | 77 +- src/locking/test_libvirt_lockd.aug.in | 2 +- src/locking/test_libvirt_sanlock.aug.in | 2 +- src/locking/test_virtlockd.aug.in | 2 +- src/locking/virtlockd.service.in | 2 +- src/logging/Makefile.inc.am | 23 +- src/logging/test_virtlogd.aug.in | 2 +- src/logging/virtlogd.service.in | 2 +- src/lxc/Makefile.inc.am | 78 +- src/lxc/lxc_driver.c | 12 +- src/lxc/test_libvirtd_lxc.aug.in | 2 +- src/lxc/virtlxcd.service.in | 40 + src/network/Makefile.inc.am | 62 + src/network/bridge_driver.c | 4 +- src/network/virtnetworkd.service.in | 25 + src/node_device/Makefile.inc.am | 63 + src/node_device/node_device_hal.c | 12 +- src/node_device/node_device_udev.c | 8 +- src/node_device/virtnodedevd.service.in | 24 + src/nwfilter/Makefile.inc.am | 63 + src/nwfilter/nwfilter_driver.c | 12 +- src/nwfilter/virtnwfilterd.service.in | 24 + src/qemu/Makefile.inc.am | 77 +- src/qemu/qemu_driver.c | 8 +- src/qemu/test_libvirtd_qemu.aug.in | 2 +- src/qemu/virtqemud.service.in | 40 + src/remote/Makefile.inc.am | 285 ++-- src/remote/libvirtd-admin.socket.in | 15 +- src/remote/libvirtd-ro.socket.in | 15 +- src/remote/libvirtd-tcp.socket.in | 13 +- src/remote/libvirtd-tls.socket.in | 13 +- src/remote/{libvirtd.aug => libvirtd.aug.in} | 26 +- .../{libvirtd.conf => libvirtd.conf.in} | 62 +- src/remote/libvirtd.service.in | 2 +- src/remote/libvirtd.socket.in | 11 +- src/remote/remote_daemon.c | 303 ++-- src/remote/remote_daemon.h | 13 + src/remote/remote_daemon_config.c | 47 +- src/remote/remote_daemon_config.h | 10 +- src/remote/remote_daemon_dispatch.c | 1263 ++++++++++------- src/remote/remote_driver.c | 422 ++++-- src/remote/remote_driver.h | 4 - src/remote/test_libvirtd.aug.in | 24 +- src/remote/virtproxyd.service.in | 24 + src/rpc/gendispatch.pl | 96 +- src/secret/Makefile.inc.am | 63 + src/secret/secret_driver.c | 8 +- src/secret/virtsecretd.service.in | 24 + src/storage/Makefile.inc.am | 62 + src/storage/storage_driver.c | 8 +- src/storage/virtstoraged.service.in | 26 + src/vbox/Makefile.inc.am | 63 + src/vbox/virtvboxd.service.in | 25 + src/vz/Makefile.inc.am | 63 + src/vz/virtvzd.service.in | 25 + src/vz/vz_driver.c | 14 +- tools/libvirt-guests.service.in | 2 +- 81 files changed, 3051 insertions(+), 1275 deletions(-) create mode 100644 src/interface/virtinterfaced.service.in create mode 100644 src/libxl/virtxend.service.in create mode 100644 src/lxc/virtlxcd.service.in create mode 100644 src/network/virtnetworkd.service.in create mode 100644 src/node_device/virtnodedevd.service.in create mode 100644 src/nwfilter/virtnwfilterd.service.in create mode 100644 src/qemu/virtqemud.service.in rename src/remote/{libvirtd.aug => libvirtd.aug.in} (89%) rename src/remote/{libvirtd.conf => libvirtd.conf.in} (92%) create mode 100644 src/remote/virtproxyd.service.in create mode 100644 src/secret/virtsecretd.service.in create mode 100644 src/storage/virtstoraged.service.in create mode 100644 src/vbox/virtvboxd.service.in create mode 100644 src/vz/virtvzd.service.in -- 2.21.0

3 50

[libvirt] [PATCH v2 0/9] Add virDomainGetGuestInfo()
by Jonathon Jongsma 23 Aug '19

23 Aug '19

This series adds several bits of guest information provided by a new API function virDomainGetGuestInfo(). There is an implementation for qemu using the guest agent. In particular, it adds information about logged-in users, guest OS, timezone, hostname, and filesystem info. This is the second version of this patch series. Various things were improved, but the biggest difference is that this version includes filesystem information. Filesystem information is already accessible via the public API virDomainGetFSInfo(), but recent versions of the qemu guest agent added additional information, and the existing public API is not able to be extended without breaking API since it returns a C struct. This new API uses typed parameters so that it can be extended as necessary when new fields are added. The overall API follows the bulk stats API quite closely, and tries to return data in similar ways (for example, the "users.N.*" field name scheme was inspired by various stats fields). It should be noted that like version 1 of this patch series, the API still only operates on a single domain, not a list of domains. I'm willing to consider changing the API to operate on a list of domains if that is the concensus, but I lean toward keeping it simpler. Here's an example of the output of the virsh command added in this patch operating on a fedora 30 guest: virsh # guestinfo fedora30 user.count : 1 user.0.name : test user.0.login-time : 1566422940895 os.id : fedora os.name : Fedora os.pretty-name : Fedora 30 (Workstation Edition) os.version : 30 (Workstation Edition) os.version-id : 30 os.machine : x86_64 os.variant : Workstation Edition os.variant-id : workstation os.kernel-release : 5.2.7-200.fc30.x86_64 os.kernel-version : #1 SMP Thu Aug 8 05:35:29 UTC 2019 timezone.name : CDT timezone.offset : -18000 hostname : myhostname fs.count : 3 fs.0.name : dm-0 fs.0.mountpoint : / fs.0.fstype : ext4 fs.0.total-bytes : 25928306688 fs.0.used-bytes : 10762133504 fs.0.disk.count : 1 fs.0.disk.0.alias : vda fs.0.disk.0.serial : 947684ABZ8639Q fs.0.disk.0.device : /dev/vda2 fs.1.name : vda1 fs.1.mountpoint : /boot fs.1.fstype : ext4 fs.1.total-bytes : 952840192 fs.1.used-bytes : 229019648 fs.1.disk.count : 1 fs.1.disk.0.alias : vda fs.1.disk.0.serial : 947684ABZ8639Q fs.1.disk.0.device : /dev/vda1 fs.2.name : md127 fs.2.mountpoint : /run/media/test/971b1edc-da61-4015-b465-560a9b1b6e9b fs.2.fstype : ext4 fs.2.total-bytes : 1950134272 fs.2.used-bytes : 6291456 fs.2.disk.count : 2 fs.2.disk.0.alias : vdb fs.2.disk.0.device : /dev/vdb1 fs.2.disk.1.alias : vdc fs.2.disk.1.device : /dev/vdc1 In contrast, here is the output of the virsh command operating on a fedora24 guest: virsh # guestinfo fedora24 error: Reconnected to the hypervisor fs.count : 2 fs.0.name : dm-0 fs.0.mountpoint : / fs.0.fstype : ext4 fs.0.disk.count : 1 fs.0.disk.0.alias : vda fs.1.name : vda1 fs.1.mountpoint : /boot fs.1.fstype : ext4 fs.1.disk.count : 1 fs.1.disk.0.alias : vda However, if you specifically request an info category that is not supported by the guest agent: virsh # guestinfo --user fedora24 error: internal error: unable to execute QEMU agent command 'guest-get-users': The command guest-get-users has not been found Jonathon Jongsma (9): lib: add virDomainGetGuestInfo() remote: implement virDomainGetGuestInfo qemu: add helper for getting guest users qemu: add helper function for querying OS info qemu: add helper for querying timezone info qemu: add support for new fields in FSInfo qemu: add helper for getting full FSInfo qemu: Implement virDomainGetGuestInfo() virsh: add 'guestinfo' command include/libvirt/libvirt-domain.h | 14 + src/driver-hypervisor.h | 8 + src/libvirt-domain.c | 117 ++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_agent.c | 482 ++++++++++++++++++++++- src/qemu/qemu_agent.h | 9 + src/qemu/qemu_driver.c | 110 ++++++ src/remote/remote_daemon_dispatch.c | 41 ++ src/remote/remote_driver.c | 53 +++ src/remote/remote_protocol.x | 21 +- src/remote_protocol-structs | 12 + tests/qemuagenttest.c | 576 +++++++++++++++++++++++++++- tools/virsh-domain.c | 85 ++++ 13 files changed, 1494 insertions(+), 35 deletions(-) -- 2.21.0

2 13

[libvirt] [PATCH 00/19] Add vhost-user-gpu support
by marcandre.lureau＠redhat.com 23 Aug '19

23 Aug '19

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, This series of patches adds support for running virtio GPUs in seperate processes, thanks to vhost-user backend. The QEMU support landed for 4.1. There are several benefits of running the GPU/virgl in an external process, since Mesa is rather heavy on the qemu main loop, and may block for a while, or crash. The external GPU process is started with one end of a socket pair, the other end is given to a QEMU chardev attached to a device. The external process is also added to the cgroup to limit resources usage. Thanks Since RFC: - discover helpers following the vhost-user spec - change vhost-user <video> model for a vhostuser attribute - add a patch to specify the rendernode on <accel> - change the way command line is built, following qemu series changes - socket labeling - a few cleanup patches - rebased Marc-André Lureau (19): device-conf: removed unneeded virDomainDeviceInfoCopy() tpm: minor argument comment fix qemu_firmware: only set nfeatures on success qemu: extract out qemuFetchConfigs from firmware domain: add "vhostuser" attribute to virtio video model domain: add rendernode attribute on <accel> qemu-cgroup: allow accel rendernode access qemu: add vhost-user-gpu capabilities checks qemu: check that qemu is vhost-user-vga capable qemu: validate virtio-gpu with vhost-user qemu: restrict 'virgl=' option to non-vhostuser video type qemu: add vhost-user helpers qemu: add qemuSecurityStartVhostUserGPU helper qemu: add vhost-user-gpu helper unit qemu: prepare domain for vhost-user GPU qemu: start/stop the vhost-user-gpu external device qemu: build vhost-user GPU devices tests: mock execv/execve tests: add vhost-user-gpu xml2argv tests docs/formatdomain.html.in | 11 + docs/schemas/domaincommon.rng | 16 +- src/conf/device_conf.c | 22 +- src/conf/device_conf.h | 4 +- src/conf/domain_conf.c | 33 +- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 - src/qemu/Makefile.inc.am | 6 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_cgroup.c | 24 ++ src/qemu/qemu_command.c | 54 ++- src/qemu/qemu_configs.c | 183 ++++++++ src/qemu/qemu_configs.h | 31 ++ src/qemu/qemu_domain.c | 10 +- src/qemu/qemu_extdevice.c | 79 +++- src/qemu/qemu_extdevice.h | 5 + src/qemu/qemu_firmware.c | 146 +------ src/qemu/qemu_process.c | 18 +- src/qemu/qemu_security.c | 48 +++ src/qemu/qemu_security.h | 6 + src/qemu/qemu_tpm.c | 2 +- src/qemu/qemu_vhost_user.c | 395 ++++++++++++++++++ src/qemu/qemu_vhost_user.h | 51 +++ src/qemu/qemu_vhost_user_gpu.c | 307 ++++++++++++++ src/qemu/qemu_vhost_user_gpu.h | 54 +++ tests/Makefile.am | 9 + .../etc/qemu/vhost-user/40-gpu.json | 1 + .../etc/qemu/vhost-user/50-gpu.json | 0 .../qemu/vhost-user/test-vhost-user-gpu | 11 + .../usr/share/qemu/vhost-user/30-gpu.json | 1 + .../usr/share/qemu/vhost-user/50-gpu.json | 8 + .../usr/share/qemu/vhost-user/60-gpu.json | 1 + tests/qemuvhostusertest.c | 132 ++++++ .../vhost-user-gpu-secondary.args | 35 ++ .../vhost-user-gpu-secondary.xml | 44 ++ tests/qemuxml2argvdata/vhost-user-vga.args | 32 ++ tests/qemuxml2argvdata/vhost-user-vga.xml | 41 ++ tests/qemuxml2argvtest.c | 21 + tests/virfilewrapper.c | 22 + 40 files changed, 1690 insertions(+), 186 deletions(-) create mode 100644 src/qemu/qemu_configs.c create mode 100644 src/qemu/qemu_configs.h create mode 100644 src/qemu/qemu_vhost_user.c create mode 100644 src/qemu/qemu_vhost_user.h create mode 100644 src/qemu/qemu_vhost_user_gpu.c create mode 100644 src/qemu/qemu_vhost_user_gpu.h create mode 120000 tests/qemuvhostuserdata/etc/qemu/vhost-user/40-gpu.json create mode 100644 tests/qemuvhostuserdata/etc/qemu/vhost-user/50-gpu.json create mode 100755 tests/qemuvhostuserdata/usr/libexec/qemu/vhost-user/test-vhost-user-gpu create mode 120000 tests/qemuvhostuserdata/usr/share/qemu/vhost-user/30-gpu.json create mode 100644 tests/qemuvhostuserdata/usr/share/qemu/vhost-user/50-gpu.json create mode 120000 tests/qemuvhostuserdata/usr/share/qemu/vhost-user/60-gpu.json create mode 100644 tests/qemuvhostusertest.c create mode 100644 tests/qemuxml2argvdata/vhost-user-gpu-secondary.args create mode 100644 tests/qemuxml2argvdata/vhost-user-gpu-secondary.xml create mode 100644 tests/qemuxml2argvdata/vhost-user-vga.args create mode 100644 tests/qemuxml2argvdata/vhost-user-vga.xml -- 2.22.0.rc2.384.g1a9a72ea1d

4 26

[libvirt] [PATCH] storage_driver: Don't crash in storagePoolCreateXML
by Michal Privoznik 23 Aug '19

23 Aug '19

In my recent patches I've introduced virStoragePoolObjIsStarting() which is then used to protect storage pool definition when the pool object is locked and unlocked during long running jobs. Well, my patches did not anticipate that @obj can be NULL under 'cleanup' label in storagePoolCreateXML() (for instance when parsing XML fails). This imperfection is causing libvirtd to crash then. Fixes: 13284a6b83 storage_driver: Protect pool def during startup and build Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index cd9f14a2c0..30940b5dcf 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -808,7 +808,7 @@ storagePoolCreateXML(virConnectPtr conn, pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL); cleanup: - if (virStoragePoolObjIsStarting(obj)) { + if (obj && virStoragePoolObjIsStarting(obj)) { if (!virStoragePoolObjIsActive(obj)) virStoragePoolUpdateInactive(obj); virStoragePoolObjSetStarting(obj, false); -- 2.21.0

2 1

[libvirt] [PATCH 0/2] rpm: fix usage of 'nc' dep
by Daniel P. Berrangé 23 Aug '19

23 Aug '19

Daniel P. Berrangé (2): rpm: depend on /usr/bin/nc instead of nc rpm: move nc dep into the libvirt-daemon sub-RPM libvirt.spec.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.21.0

2 4

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

23 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 correctly when EOF is reached. Existing implementations of esx, fd, and remote streams behave the same for virStreamFinish and virStreamAbort: they close the stream. So, we can continue to use virStreamAbort to handle EOF and errors from virStreamRecv but additonally we can report error if virStreamAbort fails. Fixes: 29f2b5248c6 ("tools: console: pass stream/fd errors to user") Signed-off-by: Roman Bolshakov <r.bolshakov(a)yadro.com> --- tools/virsh-console.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/virsh-console.c b/tools/virsh-console.c index e16f841e57..a235a9a283 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -106,7 +106,9 @@ virConsoleShutdown(virConsolePtr con) if (con->st) { virStreamEventRemoveCallback(con->st); - virStreamAbort(con->st); + if (virStreamAbort(con->st) < 0) + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot terminate console stream")); virStreamFree(con->st); con->st = NULL; } @@ -172,10 +174,6 @@ virConsoleEventOnStream(virStreamPtr st, if (got == -2) goto cleanup; /* blocking */ if (got <= 0) { - if (got == 0) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("console stream EOF")); - virConsoleShutdown(con); goto cleanup; } -- 2.22.0

3 2

[libvirt] [PATCH v1 00/11] Couple of storage driver improvements
by Michal Privoznik 23 Aug '19

23 Aug '19

Patches 02/11, 09/11 and finally 11/11 are actual bug fixes. The rest is a preparation work. More detailed: 02/11 - Fixes a refcounting issue (and thus invalid memory access) 09/11 - Fixes a problem where starting a transitive pool which has a persistent config may lead to it's disappearance 11/11 - Tries to relax locking to allow more concurrent access Michal Prívozník (11): virStoragePoolObjRemove: Don't unlock pool object upon return virStoragePoolObjListForEach: Grab a reference for pool object storagePoolRefreshImpl: Fix variable name in comment virStoragePoolUpdateInactive: Don't call virStoragePoolObjEndAPI virstorageobj: Rename virStoragePoolObjAssignDef virStoragePoolObjListAdd: Turn boolean arg into flags virStoragePoolObjListAdd: Separate out definition assignment virstorageobj: Introduce VIR_STORAGE_POOL_OBJ_LIST_ADD_LIVE flag storagePoolCreateXML: Don't lose persistent storage on failed create storage_driver: Protect pool def during startup and build storage: Drop and reacquire pool obj lock in some backends src/conf/virstorageobj.c | 89 ++++++++++++++++++++------ src/conf/virstorageobj.h | 17 ++++- src/libvirt_private.syms | 4 +- src/storage/storage_backend_disk.c | 11 +++- src/storage/storage_backend_fs.c | 13 +++- src/storage/storage_backend_logical.c | 15 +++-- src/storage/storage_backend_vstorage.c | 9 ++- src/storage/storage_backend_zfs.c | 7 +- src/storage/storage_driver.c | 67 +++++++++++-------- src/test/test_driver.c | 21 ++---- 10 files changed, 181 insertions(+), 72 deletions(-) -- 2.21.0

3 25

[libvirt] RFC: revival of hotplug/unplug for PCI Multifunction devices in QEMU guests
by Daniel Henrique Barboza 23 Aug '19

23 Aug '19

Hi, This is labeled as RFC but it's more like a FYI to let people know and comment beforehand. Shiva sent a 28 patch series last year that implements hotplug/unplug support for PCI multifunction devices [1]. The design motivation of his work was based in a RFC sent to this mailing list back in 2016 [2]. I'll briefly summarize the goals and motivations here. What we have today in Libvirt: - no hotplug/unplug support for multifunction PCI devices This is explained in details in [2]. When hotplugging a multifunction device, QEMU will queue the hotplug operation of all non-zero functions and, when function 0 is hotplugged, all functions are hotplugged together. This is true for all archs that supports PCI multifunction devices in QEMU. For unplug it varies: x86 will unplug all functions if any function is unplugged, ppc64 needs to unplug each one. Due to the nature of how Libvirt hotplug works now, hotplug of these devices is not possible. All hotplugs are considered in an isolated manner. Even if we hotplug each function in the proper order (i.e. leaving function 0 last), Libvirt can assign different slots in the guest for each. Similar problems happens with hot-unplug. This feature aims to address these by creating a new <devices> element, exclusive for multifunction devices, that aggregates all functions of a device in a single operation. To handle this new element, the existing attach/detach functions in the QEMU driver now handles multiple devices. Attaching/detaching a single device is routed away from the specialized multifunction code to be handled to the existing attach/detach code base. - no support for partial assignment of functions We can't make the assumption that the guest will always assign all devices of a multifunction device. Some functions might be a security risk to expose to a guest, or the device can behave differently depending on the amount of functions assigned. Even if the 'leftover' functions can't be used to anything else in the host, the decision of full/partial assignment of functions should come from the user, not us. We can't predict how any other hardware vendor will setup its devices. This patch series also handles this case. ------ The latest version of this feature, rebase to cdd362e0e7a (the current master as I'm writing this), can be found at: https://github.com/danielhb/libvirt/tree/multifunction-rc2 This is a work still ongoing that it's not ready for contribution yet (first patches that changes the unit test code are breaking existing tests). The feature itself is being stress tested using a Broadcom BCM5719 with 4 functions and it looks solid. I'll see if I can grab a x86 env with a multifunction card to test it there too when I have the chance. Thoughts/comments are welcome. Instead of dropping a 28+ patch set for review, I'm planning into sending smaller chunks that makes senses individually. Thanks, DHB [1] https://www.redhat.com/archives/libvir-list/2018-March/msg00729.html [2] https://www.redhat.com/archives/libvir-list/2016-April/msg01057.html

3 7

[libvirt] [PATCH] virpci: Rename virPCIDevice{Bind, Unbind}FromStubWithOverride
by Michal Privoznik 23 Aug '19

23 Aug '19

After my previous patches we have virPCIDeviceBindToStub() and virPCIDeviceUnbindFromStub() which really do nothing but call virPCIDeviceBindToStubWithOverride() and virPCIDeviceUnbindFromStubWithOverride() respectively. Drop "WithOverride" from the names and drop the thin wrappers. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/util/virpci.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 6724a8ad9e..ee78151e74 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1136,7 +1136,7 @@ virPCIDeviceBindWithDriverOverride(virPCIDevicePtr dev, } static int -virPCIDeviceUnbindFromStubWithOverride(virPCIDevicePtr dev) +virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) { if (!dev->unbind_from_stub) { VIR_DEBUG("Unbind from stub skipped for PCI device %s", dev->name); @@ -1147,13 +1147,7 @@ virPCIDeviceUnbindFromStubWithOverride(virPCIDevicePtr dev) } static int -virPCIDeviceUnbindFromStub(virPCIDevicePtr dev) -{ - return virPCIDeviceUnbindFromStubWithOverride(dev); -} - -static int -virPCIDeviceBindToStubWithOverride(virPCIDevicePtr dev) +virPCIDeviceBindToStub(virPCIDevicePtr dev) { const char *stubDriverName; VIR_AUTOFREE(char *) stubDriverPath = NULL; @@ -1192,12 +1186,6 @@ virPCIDeviceBindToStubWithOverride(virPCIDevicePtr dev) return 0; } -static int -virPCIDeviceBindToStub(virPCIDevicePtr dev) -{ - return virPCIDeviceBindToStubWithOverride(dev); -} - /* virPCIDeviceDetach: * * Detach this device from the host driver, attach it to the stub -- 2.21.0

1 0

[libvirt] [PATCH 00/12] Drop KVM assignment
by Michal Privoznik 23 Aug '19

23 Aug '19

The KVM style of PCI assignment is not used, and it hasn't been for a while. Any attempt to start a domain with it would result in error as kernel dropped its support in 4.12.0 (after being deprecated for 1.5 years). Michal Prívozník (12): qemu: Drop KVM assignment tests: Remove 'kvm' PCI backend from domaincapstest virhostdev: Unify virDomainHostdevDef to virPCIDevice translation qemu: Drop unused qemuOpenPCIConfig() virhostdev: Disable legacy kvm assignment virpci: Drop 'pci-stub' driver virpci: Remove unused virPCIDeviceWaitForCleanup virpci: Drop newid style of PCI device detach virpcimock: Don't create "pci-stub" driver virpcimock: Don't create new_id or remove_id files virpcimock: Drop @driverActions enum news: Document KVM assignment removal docs/news.xml | 13 + src/libvirt_private.syms | 1 - src/qemu/qemu_capabilities.c | 6 - src/qemu/qemu_command.c | 48 +-- src/qemu/qemu_command.h | 3 - src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_hostdev.c | 44 +- src/qemu/qemu_hostdev.h | 1 - src/qemu/qemu_hotplug.c | 20 +- src/util/virhostdev.c | 97 +++-- src/util/virpci.c | 403 +----------------- src/util/virpci.h | 2 - .../qemu_1.7.0.x86_64.xml | 1 - .../qemu_2.12.0-virt.aarch64.xml | 1 - .../qemu_2.12.0.ppc64.xml | 1 - .../qemu_2.12.0.s390x.xml | 1 - .../qemu_2.12.0.x86_64.xml | 1 - .../qemu_2.6.0-virt.aarch64.xml | 1 - .../qemu_2.6.0.aarch64.xml | 1 - .../domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 - .../qemu_2.6.0.x86_64.xml | 1 - .../domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 - .../qemu_2.8.0-tcg.x86_64.xml | 1 - .../domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 - .../qemu_2.8.0.x86_64.xml | 1 - .../qemu_2.9.0-q35.x86_64.xml | 1 - .../qemu_2.9.0-tcg.x86_64.xml | 1 - .../qemu_2.9.0.x86_64.xml | 1 - .../domaincapsschemadata/qemu_3.0.0.s390x.xml | 1 - .../qemu_3.1.0.x86_64.xml | 1 - .../domaincapsschemadata/qemu_4.0.0.s390x.xml | 1 - .../qemu_4.0.0.x86_64.xml | 1 - .../qemu_4.1.0.x86_64.xml | 1 - tests/domaincapstest.c | 4 +- tests/virpcimock.c | 137 +----- 35 files changed, 92 insertions(+), 722 deletions(-) -- 2.21.0

3 41

[libvirt] [PATCH] mdev: point user to mdevctl for missing devices
by Jonathon Jongsma 22 Aug '19

22 Aug '19

When a host is rebooted, any mediated devices that were previously configured will disappear. There have been requests for libvirt to handle persisting these mediated devices across reboots, but the decision was made that this should be handled at a lower level. mdevctl is a new tool that handles registration and persistence of mediated devices. If desired, mdevctl can automatically start these mediated devices when the parent device becomes available. Since mdevctl is the recommended solution for handling persistent mediated devices, point users there when they encounter an error for a missing mediated device. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- NOTE: - previous patch which attempted to start missing devices using mdevctl has been withdrawn. src/util/virmdev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 3d5488cdae..df02fc8d28 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -149,7 +149,9 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model) if (!virFileExists(sysfspath)) { virReportError(VIR_ERR_DEVICE_MISSING, - _("mediated device '%s' not found"), uuidstr); + _("mediated device '%s' not found. " + "Persistent devices can be managed with 'mdevctl'."), + uuidstr); return NULL; } -- 2.21.0

2 2

[libvirt] [PATCH v2 0/2] security: Deal with stale XATTRs
by Michal Privoznik 22 Aug '19

22 Aug '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-August/msg00520.html diff to v1: - use virOnce to obtain host boot time - switched to configure time check of getutxid - dropped host's UUID from timestamp Michal Prívozník (2): util: Introduce virhostuptime security_util: Remove stale XATTRs configure.ac | 1 + src/libvirt_private.syms | 4 + src/security/security_util.c | 196 +++++++++++++++++++++++++++++++- src/util/Makefile.inc.am | 2 + src/util/virhostuptime.c | 81 +++++++++++++ src/util/virhostuptime.h | 27 +++++ tests/qemusecuritymock.c | 12 ++ tools/libvirt_recover_xattrs.sh | 2 +- 8 files changed, 323 insertions(+), 2 deletions(-) create mode 100644 src/util/virhostuptime.c create mode 100644 src/util/virhostuptime.h -- 2.21.0

2 6

[libvirt] [PATCH] security: Don't increase XATTRs refcounter on failure
by Michal Privoznik 22 Aug '19

22 Aug '19

If user has two domains, each have the same disk (configured for RW) but each runs with different seclabel then we deny start of the second domain because in order to do that we would need to relabel the disk but that would cut the first domain off. Even if we did not do that, qemu would fail to start because it would be unable to lock the disk image for the second time. So far, this behaviour is expected. But what is not expected is that we increase the refcounter in XATTRs and leave it like that. What happens is that when the second domain starts, virSecuritySetRememberedLabel() is called, and since there are XATTRs from the first domain it increments the refcounter and returns it (refcounter == 2 at this point). Then callers (virSecurityDACSetOwnership() and virSecuritySELinuxSetFileconHelper()) realize that refcounter is greater than 1 and desired seclabel doesn't match the one the disk image already has and an error is produced. But the refcounter is never decremented. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740024 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/security/security_dac.c | 19 ++++++++++++++----- src/security/security_selinux.c | 17 +++++++++++------ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 137daf5d28..b0070f7390 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -754,6 +754,8 @@ virSecurityDACSetOwnership(virSecurityManagerPtr mgr, struct stat sb; int refcount; int rc; + bool rollback = false; + int ret = -1; if (!path && src && src->path && virStorageSourceIsLocalStorage(src)) @@ -780,16 +782,18 @@ virSecurityDACSetOwnership(virSecurityManagerPtr mgr, } else if (refcount < 0) { return -1; } else if (refcount > 1) { + rollback = true; /* Refcount is greater than 1 which means that there * is @refcount domains using the @path. Do not * change the label (as it would almost certainly * cause the other domains to lose access to the - * @path). */ + * @path). However, the refcounter was incremented in + * XATTRs so decrease it. */ if (sb.st_uid != uid || sb.st_gid != gid) { virReportError(VIR_ERR_OPERATION_INVALID, _("Setting different DAC user or group on %s " "which is already in use"), path); - return -1; + goto cleanup; } } } @@ -797,7 +801,13 @@ virSecurityDACSetOwnership(virSecurityManagerPtr mgr, VIR_INFO("Setting DAC user and group on '%s' to '%ld:%ld'", NULLSTR(src ? src->path : path), (long)uid, (long)gid); - if (virSecurityDACSetOwnershipInternal(priv, src, path, uid, gid) < 0) { + if (virSecurityDACSetOwnershipInternal(priv, src, path, uid, gid) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (ret < 0 && rollback) { virErrorPtr origerr; virErrorPreserveLast(&origerr); @@ -812,10 +822,9 @@ virSecurityDACSetOwnership(virSecurityManagerPtr mgr, NULLSTR(src ? src->path : path)); virErrorRestore(&origerr); - return -1; } - return 0; + return ret; } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index ea20373a90..0c6ace75fa 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -1334,6 +1334,7 @@ virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr, security_context_t econ = NULL; int refcount; int rc; + bool rollback = false; int ret = -1; if ((rc = virSecuritySELinuxTransactionAppend(path, tcon, @@ -1358,11 +1359,13 @@ virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr, } else if (refcount < 0) { goto cleanup; } else if (refcount > 1) { + rollback = true; /* Refcount is greater than 1 which means that there * is @refcount domains using the @path. Do not * change the label (as it would almost certainly * cause the other domains to lose access to the - * @path). */ + * @path). However, the refcounter was + * incremented in XATTRs so decrease it. */ if (STRNEQ(econ, tcon)) { virReportError(VIR_ERR_OPERATION_INVALID, _("Setting different SELinux label on %s " @@ -1373,7 +1376,12 @@ virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr, } } - if (virSecuritySELinuxSetFileconImpl(path, tcon, optional, privileged) < 0) { + if (virSecuritySELinuxSetFileconImpl(path, tcon, optional, privileged) < 0) + goto cleanup; + + ret = 0; + cleanup: + if (ret < 0 && rollback) { virErrorPtr origerr; virErrorPreserveLast(&origerr); @@ -1388,11 +1396,8 @@ virSecuritySELinuxSetFileconHelper(virSecurityManagerPtr mgr, path); virErrorRestore(&origerr); - goto cleanup; - } - ret = 0; - cleanup: + } freecon(econ); return ret; } -- 2.21.0

2 1

[libvirt] [PATCH v10 00/10] incremental backup
by Eric Blake 22 Aug '19

22 Aug '19

This is not the final version of incremental backup - before we can accept this series, it needs a lot of polish to pick up cleanups made possible by Peter's blockdev work, and we need to settle on our Job API addition (so that the return value of BackupBegin and the parameter to BackupGetXMLDesc and BackupEnd use the same representation, whether that be UUID or something else). I also know that Peter left quite a few comments against v9, many of which I have not actually attempted to address yet. But it rebases things on top of the checkpoint work that landed in the 5.6 release, and is still able to perform the pull-mode incremental backups that I demonstrated at KVM Forum 2018. There's still probably crashes in portions of the code that are not exercised by my demo, and I know that we really want to use qemu's blockdev image creation instead of calling out to qemu-img create for preparing the qcow2 scratch image in pull mode. The main point of this posting is to allow further testing before the actual feature lands in an upstream libvirt release. I've pushed a tag backup-v10 to both my libvirt.git and libvirt-python.git repos to match: https://repo.or.cz/libvirt/ericb.git/shortlog/refs/tags/backup-v10 https://repo.or.cz/libvirt-python/ericb.git/shortlog/refs/tags/backup-v10 001/10:[0033] [FC] 'backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag' 002/10:[0002] [FC] 'backup: Document new XML for backups' 003/10:[0010] [FC] 'backup: Introduce virDomainBackup APIs' 004/10:[0031] [FC] 'backup: Implement backup APIs for remote driver' 005/10:[----] [--] 'backup: Parse and output backup XML' 006/10:[----] [--] 'backup: Implement virsh support for backup' 007/10:[0025] [FC] 'backup: qemu: Implement framework for backup job APIs' 008/10:[0002] [FC] 'backup: Wire up qemu full pull backup commands over QMP' 009/10:[----] [--] 'backup: qemu: Wire up qemu full push backup commands over QMP' 010/10:[0017] [FC] 'backup: Implement qemu incremental pull backup' Eric Blake (10): backup: qemu: Implement VIR_DOMAIN_CHECKPOINT_XML_SIZE flag backup: Document new XML for backups backup: Introduce virDomainBackup APIs backup: Implement backup APIs for remote driver backup: Parse and output backup XML backup: Implement virsh support for backup backup: qemu: Implement framework for backup job APIs backup: Wire up qemu full pull backup commands over QMP backup: qemu: Wire up qemu full push backup commands over QMP backup: Implement qemu incremental pull backup include/libvirt/libvirt-domain.h | 41 +- src/conf/backup_conf.h | 94 +++ src/conf/virconftypes.h | 3 + src/driver-hypervisor.h | 14 + src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_domain.h | 4 + src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.h | 4 + docs/docs.html.in | 3 +- docs/format.html.in | 1 + docs/formatbackup.html.in | 184 +++++ docs/formatcheckpoint.html.in | 12 +- docs/index.html.in | 3 +- docs/schemas/domainbackup.rng | 219 ++++++ examples/c/misc/event-test.c | 3 + libvirt.spec.in | 1 + mingw-libvirt.spec.in | 2 + src/conf/Makefile.inc.am | 2 + src/conf/backup_conf.c | 546 +++++++++++++++ src/conf/domain_conf.c | 2 +- src/libvirt-domain-checkpoint.c | 7 +- src/libvirt-domain.c | 219 ++++++ src/libvirt_private.syms | 8 +- src/libvirt_public.syms | 7 + src/qemu/qemu_blockjob.c | 3 + src/qemu/qemu_domain.c | 35 +- src/qemu/qemu_driver.c | 684 ++++++++++++++++++- src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor_json.c | 84 +++ src/qemu/qemu_process.c | 8 + src/remote/remote_driver.c | 3 + src/remote/remote_protocol.x | 54 +- src/remote_protocol-structs | 28 + tests/Makefile.am | 2 + tests/domainbackupxml2xmlin/backup-pull.xml | 9 + tests/domainbackupxml2xmlin/backup-push.xml | 9 + tests/domainbackupxml2xmlin/empty.xml | 1 + tests/domainbackupxml2xmlout/backup-pull.xml | 9 + tests/domainbackupxml2xmlout/backup-push.xml | 9 + tests/domainbackupxml2xmlout/empty.xml | 7 + tests/virschematest.c | 2 + tools/virsh-domain.c | 253 ++++++- tools/virsh.pod | 49 ++ 43 files changed, 2623 insertions(+), 21 deletions(-) create mode 100644 src/conf/backup_conf.h create mode 100644 docs/formatbackup.html.in create mode 100644 docs/schemas/domainbackup.rng create mode 100644 src/conf/backup_conf.c create mode 100644 tests/domainbackupxml2xmlin/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlin/backup-push.xml create mode 100644 tests/domainbackupxml2xmlin/empty.xml create mode 100644 tests/domainbackupxml2xmlout/backup-pull.xml create mode 100644 tests/domainbackupxml2xmlout/backup-push.xml create mode 100644 tests/domainbackupxml2xmlout/empty.xml -- 2.21.0

1 10

[libvirt] [PATCH 00/11] Fix 10 tests on macOS
by Roman Bolshakov 21 Aug '19

21 Aug '19

Hi! This patch series attempts to reduce the number of failing tests on macOS. The fixes involve some funk with macOS dynamic and static linkers, dyld and ld64, respectively. As result, instead of 15 failing tests we get only 5. The tests have been fixed: qemublocktest qemumonitorjsontest viriscsitest virmacmaptest virnetserverclienttest vircryptotest qemufirmwaretest domaincapstest commandtest sockettest The tests are still failing: qemumemlocktest storagepoolxml2argvtest qemuxml2xmltest qemusecuritytest qemuxml2argvtest qemucapsprobe doesn't yet works but I started working on the fix. The failing tests depend on virpcimock that is guarded by ifdefs so no functions are injected and the mock is no-op on macOS. How can we fix the tests that rely on the mock? Should we select only specific tests to run on macOS or we should make virpci mock cross-platform? Skipping them entirely is not an option IMO as I think qemu driver can be used on macOS with qemu/hvf/haxm domains and the tests are helpful for the domains. And as soon as we get working tests and qemucapsprobe I'd want to resend hvf patchset. Best regards, Roman Roman Bolshakov (11): tests: Don't test octal localhost IP in sockettest on macOS tests: Avoid IPv4-translated IPv6 address in sockettest tests: Preload mocks with DYLD_INSERT_LIBRARIES on macOS tests: Add lib- prefix to all mocks tests: Remove -module flag for mocks tests: Drop /private CWD prefix in commandhelper build: Use flat namespace for libvirt on macOS tests: Lookup extended stat/lstat in mocks tests: Use flat namespace on macOS tests: Avoid gnulib replacements in mocks tests: Make references to global symbols indirect in test drivers configure.ac | 1 + src/Makefile.am | 9 +- tests/Makefile.am | 199 +++++++++++++++++---------------- tests/bhyveargv2xmltest.c | 2 +- tests/bhyvexml2argvtest.c | 2 +- tests/bhyvexml2xmltest.c | 2 +- tests/commandhelper.c | 9 ++ tests/domaincapstest.c | 6 +- tests/fchosttest.c | 2 +- tests/libxlxml2domconfigtest.c | 2 +- tests/nsstest.c | 2 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucapsprobe.c | 2 +- tests/qemumemlocktest.c | 3 +- tests/qemumonitorjsontest.c | 2 +- tests/qemuxml2argvtest.c | 8 +- tests/qemuxml2xmltest.c | 6 +- tests/sockettest.c | 6 +- tests/testutils.c | 4 +- tests/testutils.h | 18 ++- tests/vircaps2xmltest.c | 2 +- tests/vircgrouptest.c | 2 +- tests/vircryptotest.c | 2 +- tests/virfilecachetest.c | 2 +- tests/virfiletest.c | 2 +- tests/virfilewrapper.c | 5 + tests/virfirewalltest.c | 2 +- tests/virhostcputest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/viriscsitest.c | 3 +- tests/virmacmaptest.c | 2 +- tests/virmock.h | 10 ++ tests/virmockstathelpers.c | 18 +++ tests/virnetdaemontest.c | 2 +- tests/virnetdevbandwidthtest.c | 2 +- tests/virnetdevtest.c | 2 +- tests/virnetserverclienttest.c | 2 +- tests/virnettlscontexttest.c | 2 +- tests/virnettlssessiontest.c | 2 +- tests/virpcitest.c | 2 +- tests/virpolkittest.c | 2 +- tests/virportallocatortest.c | 2 +- tests/virsystemdtest.c | 2 +- tests/virusbtest.c | 2 +- 44 files changed, 214 insertions(+), 149 deletions(-) -- 2.22.0

2 24

[libvirt] [PATCH 00/10] ci: Several fixes and improvements
by Andrea Bolognani 21 Aug '19

21 Aug '19

See the individual commits for details, but the gist of it is that after this series it's possible for users to hook into the build process and customize it according to their needs; on top of that, the whole thing is made more maintainable in the process. Andrea Bolognani (10): ci: Fix /etc/sub{u,g}id parsing ci: Drop $(CI_SUBMODULES) ci: Move everything to a separate directory ci: Create user's home directory in the container ci: Move source directory under $(CI_USER_HOME) ci: Introduce $(CI_BUILD_SCRIPT) ci: Generalize running commands inside the container ci: Introduce $(CI_PREPARE_SCRIPT) ci: Run $(CI_PREPARE_SCRIPT) as root ci: Stop using --workdir .gitignore | 2 +- .travis.yml | 8 +-- Makefile.am | 6 +- Makefile.ci => ci/Makefile | 109 +++++++++++++++++++------------------ ci/build.sh | 40 ++++++++++++++ ci/prepare.sh | 13 +++++ 6 files changed, 118 insertions(+), 60 deletions(-) rename Makefile.ci => ci/Makefile (79%) create mode 100644 ci/build.sh create mode 100644 ci/prepare.sh -- 2.21.0

2 12

[libvirt] [PATCH v2 0/9] More consistent virDomainUndefine flag handling
by Eric Blake 21 Aug '19

21 Aug '19

Since v1: - use syntax-check rather than dynamic runtime check for API mismatch - fix more stragglers with mismatched API, found by the syntax-check - fix a bug in bhyve no-op flag handling - expand no-op flag handling to other affected drivers Eric Blake (9): vbox: Add various vir*Flags API xenapi: Add various vir*Flags API maint: Enhance check-driverimpls.pl to check for API pairing bhyve: Ignore no-op flag during virDomainUndefine libxl: Ignore no-op flag during virDomainUndefine lxc: Ignore no-op flag during virDomainUndefine openvz: Ignore no-op flag during virDomainUndefine vmware: Ignore no-op flag during virDomainUndefine xenapi: Ignore no-op flag during virDomainUndefine src/bhyve/bhyve_driver.c | 6 +++++- src/check-driverimpls.pl | 33 +++++++++++++++++++++++++++++++-- src/libxl/libxl_driver.c | 4 +++- src/lxc/lxc_driver.c | 5 ++++- src/openvz/openvz_driver.c | 5 ++++- src/vbox/vbox_common.c | 24 ++++++++++++++++++++++-- src/vmware/vmware_driver.c | 5 ++++- src/xenapi/xenapi_driver.c | 28 ++++++++++++++++++++++++---- 8 files changed, 97 insertions(+), 13 deletions(-) -- 2.20.1

2 23

[libvirt] [PATCH 0/5] security: Deal with stale XATTRs
by Michal Privoznik 21 Aug '19

21 Aug '19

There are some ways users can end up in stale XATTRs. One is sudden power loss, the other is stopping libvirt whilst some domains are running and then rebooting the host. And I believe users will find other creative ways to shut down domains without qemuProcessStop() being called. When that happens our XATTRs will be left behind and not reflect the real state of things (e.g. refcounter). To resolve this, record a timestamp within XATTRs too so that host reboots can be detected. Michal Prívozník (5): virUUIDFormat: s/VIR_UUID_RAW_LEN/VIR_UUID_BUFLEN/ in comment security_util: Use more VIR_AUTOFREE() security_util: Document virSecurityMoveRememberedLabel util: Introduce virhostuptime security_util: Remove stale XATTRs src/libvirt_private.syms | 4 + src/security/security_util.c | 293 +++++++++++++++++++++++++++++------ src/util/Makefile.inc.am | 2 + src/util/virhostuptime.c | 61 ++++++++ src/util/virhostuptime.h | 27 ++++ src/util/viruuid.c | 2 +- tests/qemusecuritymock.c | 12 ++ 7 files changed, 353 insertions(+), 48 deletions(-) create mode 100644 src/util/virhostuptime.c create mode 100644 src/util/virhostuptime.h -- 2.21.0

3 11

[libvirt] [PATCH] virt-aa-helper: Drop unnecessary AppArmor rule
by Andrea Bolognani 21 Aug '19

21 Aug '19

Apparently /proc/self is automatically converted to /proc/@{pid} before checking rules, which makes spelling it out explicitly redundant. Suggested-by: Jamie Strandboge <jamie(a)canonical.com> Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/security/apparmor/usr.lib.libvirt.virt-aa-helper | 1 - 1 file changed, 1 deletion(-) diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper index 64772f0756..11e9c039ca 100644 --- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper +++ b/src/security/apparmor/usr.lib.libvirt.virt-aa-helper @@ -18,7 +18,6 @@ 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, /etc/libnl-3/classid r, -- 2.21.0

2 1

[libvirt] [PATCH v3 0/2] snapshot: Store both config and live XML in the snapshot domain
by Maxiwell S. Garcia 21 Aug '19

21 Aug '19

This patchset store both config and live XML in the snapshot XML. To avoid nest 'config' XML one level deeper ('inactive/domain'), it was necessary change the virDomainDefFormatInternal() to use 'domain' or 'inactiveDomain' in the root node. Maxiwell S. Garcia (2): qemu: formatting XML from domain def choosing the root name snapshot: Store both config and live XML in the snapshot domain src/conf/domain_conf.c | 13 ++++++++++--- src/conf/domain_conf.h | 1 + src/conf/moment_conf.c | 1 + src/conf/moment_conf.h | 11 +++++++++++ src/conf/snapshot_conf.c | 23 +++++++++++++++++++++-- src/qemu/qemu_driver.c | 37 ++++++++++++++++++++++++++++--------- 6 files changed, 72 insertions(+), 14 deletions(-) -- 2.20.1

3 5

[libvirt] [PATCH] virDomainGetAutostart takes a pointer that it writes the output value to
by Sage Imel 21 Aug '19

21 Aug '19

The current version of get_autostart seg faults. This patch correctly passes a pointer to an int to virDomainGetAutostart and returns a result based on the value of that int Signed-off-by: sage Imel <sage(a)cat.pdx.edu> --- src/domain.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/domain.rs b/src/domain.rs index 11ecb3c..acb9e6e 100644 --- a/src/domain.rs +++ b/src/domain.rs @@ -136,7 +136,7 @@ extern "C" { fn virDomainGetHostname(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; fn virDomainGetUUIDString(ptr: sys::virDomainPtr, uuid: *mut libc::c_char) -> libc::c_int; fn virDomainGetXMLDesc(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; - fn virDomainGetAutostart(ptr: sys::virDomainPtr) -> libc::c_int; + fn virDomainGetAutostart(ptr: sys::virDomainPtr, autostart: *mut libc::c_int) -> libc::c_int; fn virDomainSetAutostart(ptr: sys::virDomainPtr, autostart: libc::c_uint) -> libc::c_int; fn virDomainGetID(ptr: sys::virDomainPtr) -> libc::c_uint; fn virDomainSetMaxMemory(ptr: sys::virDomainPtr, memory: libc::c_ulong) -> libc::c_int; @@ -1036,11 +1036,12 @@ impl Domain { pub fn get_autostart(&self) -> Result<bool, Error> { unsafe { - let ret = virDomainGetAutostart(self.as_ptr()); + let mut autostart: libc::c_int = 0; + let ret = virDomainGetAutostart(self.as_ptr(), &mut autostart); if ret == -1 { return Err(Error::new()); } - return Ok(ret == 1); + return Ok(autostart == 1); } } -- 2.17.1

2 3

[libvirt] [PATCH] virDomainGetAutostart takes a pointer that it writes the output value to
by Sage Imel 21 Aug '19

21 Aug '19

--- src/domain.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/domain.rs b/src/domain.rs index 11ecb3c..acb9e6e 100644 --- a/src/domain.rs +++ b/src/domain.rs @@ -136,7 +136,7 @@ extern "C" { fn virDomainGetHostname(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; fn virDomainGetUUIDString(ptr: sys::virDomainPtr, uuid: *mut libc::c_char) -> libc::c_int; fn virDomainGetXMLDesc(ptr: sys::virDomainPtr, flags: libc::c_uint) -> *mut libc::c_char; - fn virDomainGetAutostart(ptr: sys::virDomainPtr) -> libc::c_int; + fn virDomainGetAutostart(ptr: sys::virDomainPtr, autostart: *mut libc::c_int) -> libc::c_int; fn virDomainSetAutostart(ptr: sys::virDomainPtr, autostart: libc::c_uint) -> libc::c_int; fn virDomainGetID(ptr: sys::virDomainPtr) -> libc::c_uint; fn virDomainSetMaxMemory(ptr: sys::virDomainPtr, memory: libc::c_ulong) -> libc::c_int; @@ -1036,11 +1036,12 @@ impl Domain { pub fn get_autostart(&self) -> Result<bool, Error> { unsafe { - let ret = virDomainGetAutostart(self.as_ptr()); + let mut autostart: libc::c_int = 0; + let ret = virDomainGetAutostart(self.as_ptr(), &mut autostart); if ret == -1 { return Err(Error::new()); } - return Ok(ret == 1); + return Ok(autostart == 1); } } -- 2.17.1

3 3

[libvirt] [PATCH] xml: namespaces: use uri instead of href
by Ján Tomko 21 Aug '19

21 Aug '19

Store the namespace URI as const char*, instead of in a function. Suggested-by: Jiri Denemark <jdenemar(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/bhyve/bhyve_domain.c | 11 ++--------- src/lxc/lxc_domain.c | 9 +-------- src/network/bridge_driver.c | 11 +---------- src/qemu/qemu_domain.c | 10 +--------- src/storage/storage_backend_fs.c | 9 +-------- src/storage/storage_backend_rbd.c | 11 +---------- src/test/test_driver.c | 11 ++--------- src/util/virxml.c | 6 +++--- src/util/virxml.h | 2 +- src/vmx/vmx.c | 8 +------- 10 files changed, 14 insertions(+), 74 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index ea4bd54969..ed281d7c68 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -31,8 +31,6 @@ VIR_LOG_INIT("bhyve.bhyve_domain"); -#define BHYVE_NAMESPACE_HREF "http://libvirt.org/schemas/domain/bhyve/1.0" - static void * bhyveDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED) { @@ -258,16 +256,11 @@ bhyveDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } -static const char * -bhyveDomainDefNamespaceHref(void) -{ - return BHYVE_NAMESPACE_HREF; -} - virXMLNamespace virBhyveDriverDomainXMLNamespace = { .parse = bhyveDomainDefNamespaceParse, .free = bhyveDomainDefNamespaceFree, .format = bhyveDomainDefNamespaceFormatXML, .prefix = "bhyve", - .href = bhyveDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/bhyve/1.0", + }; diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 00362e4c7f..c4360f25f6 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -34,7 +34,6 @@ #include "virinitctl.h" #define VIR_FROM_THIS VIR_FROM_LXC -#define LXC_NAMESPACE_HREF "http://libvirt.org/schemas/domain/lxc/1.0" VIR_ENUM_IMPL(virLXCDomainJob, LXC_JOB_LAST, @@ -302,19 +301,13 @@ lxcDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } -static const char * -lxcDomainDefNamespaceHref(void) -{ - return LXC_NAMESPACE_HREF; -} - virXMLNamespace virLXCDriverDomainXMLNamespace = { .parse = lxcDomainDefNamespaceParse, .free = lxcDomainDefNamespaceFree, .format = lxcDomainDefNamespaceFormatXML, .prefix = "lxc", - .href = lxcDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/lxc/1.0", }; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index dd4f111cc0..86e2035b85 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -83,8 +83,6 @@ VIR_LOG_INIT("network.bridge_driver"); -#define DNSMASQ_NAMESPACE_HREF "http://libvirt.org/schemas/network/dnsmasq/1.0" - static virNetworkDriverStatePtr network_driver; @@ -231,19 +229,12 @@ networkDnsmasqDefNamespaceFormatXML(virBufferPtr buf, } -static const char * -networkDnsmasqDefNamespaceHref(void) -{ - return DNSMASQ_NAMESPACE_HREF; -} - - virXMLNamespace networkDnsmasqXMLNamespace = { .parse = networkDnsmasqDefNamespaceParse, .free = networkDnsmasqDefNamespaceFree, .format = networkDnsmasqDefNamespaceFormatXML, .prefix = "dnsmasq", - .href = networkDnsmasqDefNamespaceHref, + .uri = "http://libvirt.org/schemas/network/dnsmasq/1.0", }; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6d770d3c13..8a3755c6fe 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -81,8 +81,6 @@ VIR_LOG_INIT("qemu.qemu_domain"); -#define QEMU_NAMESPACE_HREF "http://libvirt.org/schemas/domain/qemu/1.0" - VIR_ENUM_IMPL(qemuDomainJob, QEMU_JOB_LAST, "none", @@ -3713,19 +3711,13 @@ qemuDomainDefNamespaceFormatXML(virBufferPtr buf, return 0; } -static const char * -qemuDomainDefNamespaceHref(void) -{ - return QEMU_NAMESPACE_HREF; -} - virXMLNamespace virQEMUDriverDomainXMLNamespace = { .parse = qemuDomainDefNamespaceParse, .free = qemuDomainDefNamespaceFree, .format = qemuDomainDefNamespaceFormatXML, .prefix = "qemu", - .href = qemuDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/qemu/1.0", }; diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index d947beac2c..d793ac19e8 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -528,7 +528,6 @@ virStorageBackendFileSystemBuild(virStoragePoolObjPtr pool, #if WITH_STORAGE_FS -# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/fs/1.0" /* Backend XML Namespace handling for fs or netfs specific mount options to * be added to the mount -o {options_list} command line that are not otherwise @@ -624,12 +623,6 @@ virStoragePoolDefFSNamespaceFormatXML(virBufferPtr buf, } -static const char * -virStoragePoolDefFSNamespaceHref(void) -{ - return STORAGE_POOL_FS_NAMESPACE_HREF; -} - #endif /* WITH_STORAGE_FS */ @@ -697,7 +690,7 @@ static virXMLNamespace virStoragePoolFSXMLNamespace = { .free = virStoragePoolDefFSNamespaceFree, .format = virStoragePoolDefFSNamespaceFormatXML, .prefix = "fs", - .href = virStoragePoolDefFSNamespaceHref, + .uri = "http://libvirt.org/schemas/storagepool/fs/1.0", }; #endif /* WITH_STORAGE_FS */ diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 22caa189d7..c4781debd8 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -58,8 +58,6 @@ struct _virStoragePoolRBDConfigOptionsDef { char **values; }; -#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/rbd/1.0" - static void virStoragePoolDefRBDNamespaceFree(void *nsdata) { @@ -166,13 +164,6 @@ virStoragePoolDefRBDNamespaceFormatXML(virBufferPtr buf, } -static const char * -virStoragePoolDefRBDNamespaceHref(void) -{ - return STORAGE_POOL_RBD_NAMESPACE_HREF; -} - - static int virStorageBackendRBDRADOSConfSet(rados_t cluster, const char *option, @@ -1538,7 +1529,7 @@ static virXMLNamespace virStoragePoolRBDXMLNamespace = { .free = virStoragePoolDefRBDNamespaceFree, .format = virStoragePoolDefRBDNamespaceFormatXML, .prefix = "rbd", - .href = virStoragePoolDefRBDNamespaceHref, + .uri = "http://libvirt.org/schemas/storagepool/rbd/1.0", }; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 57d54c05b3..6a694d8b1f 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -167,8 +167,6 @@ testDriverDispose(void *obj) virObjectUnref(driver->eventState); } -#define TEST_NAMESPACE_HREF "http://libvirt.org/schemas/domain/test/1.0" - typedef struct _testDomainNamespaceDef testDomainNamespaceDef; typedef testDomainNamespaceDef *testDomainNamespaceDefPtr; struct _testDomainNamespaceDef { @@ -180,12 +178,6 @@ struct _testDomainNamespaceDef { xmlNodePtr *snap_nodes; }; -static const char* -testDomainDefNamespaceHref(void) -{ - return TEST_NAMESPACE_HREF; -} - static void testDomainDefNamespaceFree(void *data) { @@ -427,7 +419,8 @@ testDriverNew(void) .parse = testDomainDefNamespaceParse, .free = testDomainDefNamespaceFree, .prefix = "test", - .href = testDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/test/1.0", + }; virDomainDefParserConfig config = { .features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG | diff --git a/src/util/virxml.c b/src/util/virxml.c index 84b824f432..f9c117dd58 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -1416,7 +1416,7 @@ void virXMLNamespaceFormatNS(virBufferPtr buf, virXMLNamespace const *ns) { - virBufferAsprintf(buf, " xmlns:%s='%s'", ns->prefix, ns->href()); + virBufferAsprintf(buf, " xmlns:%s='%s'", ns->prefix, ns->uri); } @@ -1426,10 +1426,10 @@ virXMLNamespaceRegister(xmlXPathContextPtr ctxt, { if (xmlXPathRegisterNs(ctxt, BAD_CAST ns->prefix, - BAD_CAST ns->href()) < 0) { + BAD_CAST ns->uri) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to register xml namespace '%s'"), - ns->href()); + ns->uri); return -1; } diff --git a/src/util/virxml.h b/src/util/virxml.h index be2abd23f7..30cc895436 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -257,7 +257,7 @@ struct _virXMLNamespace { virXMLNamespaceFree free; virXMLNamespaceFormat format; const char *prefix; - virXMLNamespaceHref href; + const char *uri; }; typedef struct _virXMLNamespace virXMLNamespace; typedef virXMLNamespace *virXMLNamespacePtr; diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index c4e90537f8..2cc0995783 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -597,18 +597,12 @@ virVMXDomainDefNamespaceFormatXML(virBufferPtr buf, void *nsdata) return 0; } -static const char * -virVMXDomainDefNamespaceHref(void) -{ - return "http://libvirt.org/schemas/domain/vmware/1.0"; -} - static virXMLNamespace virVMXDomainXMLNamespace = { .parse = NULL, .free = virVMXDomainDefNamespaceFree, .format = virVMXDomainDefNamespaceFormatXML, .prefix = "vmware", - .href = virVMXDomainDefNamespaceHref, + .uri = "http://libvirt.org/schemas/domain/vmware/1.0", }; virDomainXMLOptionPtr -- 2.19.2

2 1

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

21 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