March 2022 - Devel - libvirt List Archives

[PATCH] virsh: Fix integer overflow in allocpages
by Michal Privoznik 31 Mar '22

31 Mar '22

I've came across an aarch64 system which supports hugepages up to 16GiB of size. However, I was unable to allocate them using virsh allocpages. This is because cmdAllocpages() uses vshCommandOptScaledInt(), which scales passed value into bytes, but since the virNodeAllocPages() expects size in KiB the variable holding bytes is then divided by 1024. However, the limit for the biggest value passed to vshCommandOptScaledInt() is UINT_MAX which is now obviously wrong, as it needs to be UINT_MAX * 1024. The same bug is in completer. But here, let's use ULLONG_MAX so that we don't have to care about it anymore. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-completer-host.c | 2 +- tools/virsh-host.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 40cb687582..cbdc3f0d49 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -42,7 +42,7 @@ virshPagesizeNodeToString(xmlNodePtr node) unit = virXMLPropString(node, "unit"); if (virStrToLong_ull(pagesize, NULL, 10, &byteval) < 0) return NULL; - if (virScaleInteger(&byteval, unit, 1024, UINT_MAX) < 0) + if (virScaleInteger(&byteval, unit, 1024, ULLONG_MAX) < 0) return NULL; size = vshPrettyCapacity(byteval, &suffix); ret = g_strdup_printf("%.0f%s", size, suffix); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 2e3cbc39b6..1e83d19fa1 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -488,7 +488,7 @@ cmdAllocpages(vshControl *ctl, const vshCmd *cmd) if (cellno && vshCommandOptInt(ctl, cmd, "cellno", &startCell) < 0) return false; - if (vshCommandOptScaledInt(ctl, cmd, "pagesize", &tmp, 1024, UINT_MAX) < 0) + if (vshCommandOptScaledInt(ctl, cmd, "pagesize", &tmp, 1024, UINT_MAX * 1024ULL) < 0) return false; pageSizes[0] = VIR_DIV_UP(tmp, 1024); -- 2.35.1

2 1

Entering freeze for libvirt-8.2.0
by Jiri Denemark 31 Mar '22

31 Mar '22

I have just tagged v8.2.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://libvirt.org/sources/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

3 3

[PATCH v2 REBASE 0/3] qemu: don't pause VM when creating internal snapshot
by Nikolay Shirokovskiy 31 Mar '22

31 Mar '22

Diff to v1 [1]: - fix mistake of dropping hunk that starts CPUs if snapshot was not successful. We still need it if halt upon snapshot is requested. The is series is mostly about the first patch. The others patch are minor cleanups. [1] v1 version https://listman.redhat.com/archives/libvir-list/2022-March/229437.html Maxim Nestratov (1): qemu: don't pause vm when creating internal snapshot Nikolay Shirokovskiy (2): qemu: remove excessive check in qemuSnapshotCreateActiveInternal qemu: remove unnecessary gotos in qemuSnapshotCreateActiveInternal src/qemu/qemu_snapshot.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) -- 2.35.1

1 3

[libvirt PATCH] Fix spelling
by Tim Wiederhake 30 Mar '22

30 Mar '22

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- ci/integration.yml | 8 ++++---- docs/drvqemu.rst | 6 +++--- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_domain.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/integration.yml b/ci/integration.yml index 2808e829ef..17f20b3945 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -62,7 +62,7 @@ centos-stream-8-tests: variables: # needed by libvirt-gitlab-executor DISTRO: centos-stream-8 - # can be overriden in forks to set a different runner tag + # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG @@ -78,7 +78,7 @@ centos-stream-9-tests: variables: # needed by libvirt-gitlab-executor DISTRO: centos-stream-9 - # can be overriden in forks to set a different runner tag + # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG @@ -94,7 +94,7 @@ fedora-34-tests: variables: # needed by libvirt-gitlab-executor DISTRO: fedora-34 - # can be overriden in forks to set a different runner tag + # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG @@ -110,7 +110,7 @@ fedora-35-tests: variables: # needed by libvirt-gitlab-executor DISTRO: fedora-35 - # can be overriden in forks to set a different runner tag + # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst index afc499ad50..cfe4473951 100644 --- a/docs/drvqemu.rst +++ b/docs/drvqemu.rst @@ -589,13 +589,13 @@ specific properties of devices instantiated by libvirt. The ``<qemu:device>`` sub-element groups overrides for a device identified via the ``alias`` attribute. The alias corresponds to the ``<alias name=''>`` property of a device. It's strongly recommended to use user-specified aliases -for devices with overriden properties. +for devices with overridden properties. Sub element ``<qemu:frontend>`` encapsulates all overrides of properties for the device frontend and overrides what libvirt formats via ``-device``. :since:`Since 8.2.0`. -The individual properties are overriden by a ``<qemu:property>`` element. The +The individual properties are overridden by a ``<qemu:property>`` element. The ``name`` specifies the name of the property to override. In case when libvirt doesn't configure the property a property with the name is added to the commandline. The ``type`` attribute specifies a type of the argument used. The @@ -612,7 +612,7 @@ remove a device property which is not formatted by libvirt will cause failure to startup the VM. *Note:* The libvirt project doesn't guarantee any form of compatibility and -stability of devices with overriden properties. The domain is tainted when +stability of devices with overridden properties. The domain is tainted when such configuration is used. Example: diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 948029d60d..b2426a6d25 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -642,7 +642,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DIRTYRATE_MODE , /* calc-dirty-rate accepts mode parameter */ /* 425 */ - QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME, /* tls hostname can be overriden for NBD clients */ + QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME, /* tls hostname can be overridden for NBD clients */ QEMU_CAPS_MEMORY_BACKEND_PREALLOC_THREADS, /* -object memory-backend-*.prealloc-threads */ QEMU_CAPS_LAST /* this must always be the last item */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 18d403e099..1bfea0d470 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3368,7 +3368,7 @@ qemuDomainDefNamespaceParseOverrideProperties(qemuDomainXmlNsOverrideProperty *p if (STREQ(prop->name, "id")) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("property with name 'id' can't be overriden")); + _("property with name 'id' can't be overridden")); return -1; } -- 2.31.1

2 1

[libvirt PATCH] fix documentation for sockets topology
by John Levon 30 Mar '22

30 Mar '22

From: John Levon <john.levon(a)nutanix.com> In 0895a0e, it was noted that the "sockets" value in the topology section of capabilities reflects not the number of sockets per NUMA node, not the total number. Unfortunately, the fix was applied to the wrong place: the domain XML format documentation, not that for the capabilities output. And, in fact, the domain XML interprets "sockets" as the total number, not a per-node value. Back out this change in favour of a note in the capabilities documentation instead. Fixes: 0895a0e75d13874254218e16dc66dcad673671d3 Suggested-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: John Levon <john.levon(a)nutanix.com> --- docs/formatcaps.html.in | 5 ++++- docs/formatdomain.rst | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in index 09662f78c8..a4abad5d20 100644 --- a/docs/formatcaps.html.in +++ b/docs/formatcaps.html.in @@ -51,7 +51,10 @@ <dt><code>topology</code></dt> <dd>This element embodies the host internal topology. Management applications may want to learn this information when orchestrating new - guests - e.g. due to reduce inter-NUMA node transfers.</dd> + guests - e.g. due to reduce inter-NUMA node transfers. Note that the + <code>sockets</code> value reported here is per-NUMA-node; this is in + contrast to the value given in domain definitions, which is interpreted + as a total number of sockets for the domain.</dd> <dt><code>secmodel</code></dt> <dd>To find out default security labels for different security models you diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index e492532004..9652e97eec 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1489,12 +1489,12 @@ In case no restrictions need to be put on CPU model and its features, a simpler The ``topology`` element specifies requested topology of virtual CPU provided to the guest. Four attributes, ``sockets``, ``dies``, ``cores``, and ``threads``, accept non-zero positive integer values. They refer to the - number of CPU sockets per NUMA node, number of dies per socket, number of - cores per die, and number of threads per core, respectively. The ``dies`` - attribute is optional and will default to 1 if omitted, while the other - attributes are all mandatory. Hypervisors may require that the maximum number - of vCPUs specified by the ``cpus`` element equals to the number of vcpus - resulting from the topology. + total number of CPU sockets, number of dies per socket, number of cores per + die, and number of threads per core, respectively. The ``dies`` attribute is + optional and will default to 1 if omitted, while the other attributes are all + mandatory. Hypervisors may require that the maximum number of vCPUs specified + by the ``cpus`` element equals to the number of vcpus resulting from the + topology. ``feature`` The ``cpu`` element can contain zero or more ``feature`` elements used to fine-tune features provided by the selected CPU model. The list of known -- 2.32.0

2 1

[PATCH 0/3] Cleanups based on 'nvram' refactor patch
by Peter Krempa 30 Mar '22

30 Mar '22

Few cleanups that I've suggested in the review for adding remote store of nvram. Peter Krempa (3): virXMLFormatElement: Introduce virXMLFormatElementInternal virDomainLoaderDefFormat: Use modern XML formatting approach vboxSetBootDeviceOrder: Remove whitespace alignment in VIR_DEBUG statements src/conf/domain_conf.c | 40 +++++++++++++-------------- src/libvirt_private.syms | 1 + src/util/virxml.c | 58 +++++++++++++++++++++++++++++++--------- src/util/virxml.h | 7 +++++ src/vbox/vbox_common.c | 36 ++++++++++++------------- 5 files changed, 90 insertions(+), 52 deletions(-) -- 2.35.1

2 4

[libvirt PATCH] qemu: Rename virDomainAsyncJobPhase{From,To}String
by Jiri Denemark 30 Mar '22

30 Mar '22

Recent refactor (v8.1.0-217-ga193f4bef6) generalized job related enums and functions by changing "qemu" prefix to "vir" and moving them to src/hypervisor/domain_job.[ch]. This was in most cases a good thing, but async job phases are driver specific and the corresponding functions remained in src/qemu/qemu_domainjob.[ch], but still their prefix was changed to "vir". Let's change it back to "qemu". Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domainjob.c | 10 +++++----- src/qemu/qemu_domainjob.h | 4 ++-- src/qemu/qemu_migration.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 56a3f6cb19..1cddc7f2f0 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -74,7 +74,7 @@ qemuDomainJobSetStatsType(virDomainJobData *jobData, const char * -virDomainAsyncJobPhaseToString(virDomainAsyncJob job, +qemuDomainAsyncJobPhaseToString(virDomainAsyncJob job, int phase G_GNUC_UNUSED) { switch (job) { @@ -97,7 +97,7 @@ virDomainAsyncJobPhaseToString(virDomainAsyncJob job, } int -virDomainAsyncJobPhaseFromString(virDomainAsyncJob job, +qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job, const char *phase) { if (!phase) @@ -682,7 +682,7 @@ qemuDomainObjSetJobPhase(virDomainObj *obj, VIR_DEBUG("Setting '%s' phase to '%s'", virDomainAsyncJobTypeToString(priv->job.asyncJob), - virDomainAsyncJobPhaseToString(priv->job.asyncJob, phase)); + qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, phase)); if (priv->job.asyncOwner == 0) { priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet()); @@ -1191,7 +1191,7 @@ qemuDomainObjPrivateXMLFormatJob(virBuffer *buf, if (priv->job.phase) { virBufferAsprintf(&attrBuf, " phase='%s'", - virDomainAsyncJobPhaseToString(priv->job.asyncJob, + qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, priv->job.phase)); } @@ -1244,7 +1244,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm, priv->job.asyncJob = async; if ((tmp = virXPathString("string(@phase)", ctxt))) { - priv->job.phase = virDomainAsyncJobPhaseFromString(async, tmp); + priv->job.phase = qemuDomainAsyncJobPhaseFromString(async, tmp); if (priv->job.phase < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown job phase %s"), tmp); diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index faf47105a3..f67eace36c 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -119,9 +119,9 @@ struct _qemuDomainJobObj { void qemuDomainJobSetStatsType(virDomainJobData *jobData, qemuDomainJobStatsType type); -const char *virDomainAsyncJobPhaseToString(virDomainAsyncJob job, +const char *qemuDomainAsyncJobPhaseToString(virDomainAsyncJob job, int phase); -int virDomainAsyncJobPhaseFromString(virDomainAsyncJob job, +int qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job, const char *phase); void qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3e653543c6..98f82abe7c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2190,7 +2190,7 @@ qemuMigrationSrcCleanup(virDomainObj *vm, VIR_DEBUG("vm=%s, conn=%p, asyncJob=%s, phase=%s", vm->def->name, conn, virDomainAsyncJobTypeToString(priv->job.asyncJob), - virDomainAsyncJobPhaseToString(priv->job.asyncJob, + qemuDomainAsyncJobPhaseToString(priv->job.asyncJob, priv->job.phase)); if (!qemuMigrationJobIsActive(vm, VIR_ASYNC_JOB_MIGRATION_OUT)) -- 2.35.1

2 1

[libvirt PATCH] qemu: fix hotplug for multiqueue vdpa net device
by Jonathon Jongsma 30 Mar '22

30 Mar '22

While commit a5e659f0 removed the restriction against multiple queues for the vdpa net device, there were some missing pieces. Configuring a device statically and then starting the domain worked as expected, but hotplugging a device didn't have the expected multiqueue support enabled. Add the missing bits. Consider the following device xml: <interface type="vdpa"> <mac address="00:11:22:33:44:03" /> <source dev="/dev/vhost-vdpa-0" /> <model type="virtio" /> <driver queues='2' /> </interface> Without this patch, hotplugging the above XML description resulted in the following: {"execute":"netdev_add","arguments":{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","id":"hostnet1"},"id":"libvirt-392"} {"execute":"device_add","arguments":{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:03","bus":"pci.5","addr":"0x0"},"id":"libvirt-393"} With the patch, hotplugging results in the following: {"execute":"netdev_add","arguments":{"type":"vhost-vdpa","vhostdev":"/dev/fdset/0","queues":2,"id":"hostnet1"},"id":"libvirt-392"} {"execute":"device_add","arguments":{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostnet1","id":"net1","mac":"00:11:22:33:44:03","bus":"pci.5","addr":"0x0"},"id":"libvirt-393"} Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2024406 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/qemu_command.c | 4 ++++ src/qemu/qemu_hotplug.c | 3 +++ tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 453891a725..f7f55b20ef 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4346,6 +4346,10 @@ qemuBuildHostNetProps(virDomainNetDef *net, if (virJSONValueObjectAdd(&netprops, "s:type", "vhost-vdpa", NULL) < 0 || virJSONValueObjectAppendString(netprops, "vhostdev", vdpadev) < 0) return NULL; + + if (net->driver.virtio.queues > 1 && + virJSONValueObjectAppendNumberUlong(netprops, "queues", net->driver.virtio.queues) < 0) + return NULL; break; case VIR_DOMAIN_NET_TYPE_HOSTDEV: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3d1bb1be2a..d9ba0b7abe 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1386,6 +1386,9 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, break; case VIR_DOMAIN_NET_TYPE_VDPA: + queueSize = net->driver.virtio.queues; + if (!queueSize) + queueSize = 1; if (qemuDomainAdjustMaxMemLock(vm, false) < 0) goto cleanup; adjustmemlock = true; diff --git a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args index 26ef666036..4cb805451a 100644 --- a/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa-multiqueue.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ -add-fd set=0,fd=1732,opaque=net0-vdpa \ --netdev vhost-vdpa,vhostdev=/dev/fdset/0,id=hostnet0 \ +-netdev vhost-vdpa,vhostdev=/dev/fdset/0,queues=2,id=hostnet0 \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":6,"netdev":"hostnet0","id":"net0","mac":"52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -- 2.35.1

2 1

[libvirt PATCH] util: Improve macOS workaround
by Andrea Bolognani 29 Mar '22

29 Mar '22

Since the workaround is specific to macOS, only disable compiler warnings when building on that platform. While at it, update the comment to reflect the fact that the workaround is needed for all versions of the OS, including the modern ones that we currently target. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/502990271 src/util/virutil.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index fe5500726e..176e2f8f59 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -869,9 +869,11 @@ virDoesGroupExist(const char *name) -/* Work around an incompatibility of OS X 10.11: getgrouplist +/* Work around an incompatibility of macOS: getgrouplist accepts int *, not gid_t *, and int and gid_t differ in sign. */ +# ifdef __APPLE__ VIR_WARNINGS_NO_POINTER_SIGN +# endif /* Compute the list of primary and supplementary groups associated * with @uid, and including @gid in the list (unless it is -1), @@ -934,7 +936,9 @@ virGetGroupList(uid_t uid, gid_t gid, gid_t **list) return ret; } +# ifdef __APPLE__ VIR_WARNINGS_RESET +# endif /* Set the real and effective uid and gid to the given values, as well -- 2.35.1

2 1

[libvirt PATCH] qemu: Use real defaults for user and group in qemu.conf
by Andrea Bolognani 29 Mar '22

29 Mar '22

The default values used by the library are determined at configure time based on a number of factors, and we should reflect them in the installed configuration file to make the comments it contains more useful. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/263 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/meson.build | 30 +++++++++++++++++++++++++--- src/qemu/{qemu.conf => qemu.conf.in} | 4 ++-- src/qemu/test_libvirtd_qemu.aug.in | 4 ++-- 3 files changed, 31 insertions(+), 7 deletions(-) rename src/qemu/{qemu.conf => qemu.conf.in} (99%) diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 39f0f615cc..96952cc52d 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -130,12 +130,36 @@ if conf.has('WITH_QEMU') ], } - virt_conf_files += files('qemu.conf') + qemu_user_group_conf = configuration_data({ + 'QEMU_USER': qemu_user, + 'QEMU_GROUP': qemu_group, + }) + qemu_conf = configure_file( + input: 'qemu.conf.in', + output: 'qemu.conf', + configuration: qemu_user_group_conf, + ) + + qemu_user_group_hack_conf = configuration_data({ + 'QEMU_USER': qemu_user, + 'QEMU_GROUP': qemu_group, + # This hack is necessary because the output file is going to be + # used as input for another configure_file() call later, which + # will take care of substituting @CONFIG@ with useful data + 'CONFIG': '@CONFIG@', + }) + test_libvirtd_qemu_aug_tmp = configure_file( + input: 'test_libvirtd_qemu.aug.in', + output: 'test_libvirtd_qemu.aug.tmp', + configuration: qemu_user_group_hack_conf, + ) + + virt_conf_files += qemu_conf virt_aug_files += files('libvirtd_qemu.aug') virt_test_aug_files += { 'name': 'test_libvirtd_qemu.aug', - 'aug': files('test_libvirtd_qemu.aug.in'), - 'conf': files('qemu.conf'), + 'aug': test_libvirtd_qemu_aug_tmp, + 'conf': qemu_conf, 'test_name': 'libvirtd_qemu', 'test_srcdir': meson.current_source_dir(), 'test_builddir': meson.current_build_dir(), diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf.in similarity index 99% rename from src/qemu/qemu.conf rename to src/qemu/qemu.conf.in index 71fd125699..04b7740136 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf.in @@ -516,11 +516,11 @@ # user = "+0" # Super user (uid=0) # user = "100" # A user named "100" or a user with uid=100 # -#user = "root" +#user = "@QEMU_USER@" # The group for QEMU processes run by the system instance. It can be # specified in a similar way to user. -#group = "root" +#group = "@QEMU_GROUP@" # Whether libvirt should dynamically change file ownership # to match the configured user/group above. Defaults to 1. diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 20a89ade32..757d21c33f 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -47,8 +47,8 @@ module Test_libvirtd_qemu = { "security_driver" = "selinux" } { "security_default_confined" = "1" } { "security_require_confined" = "1" } -{ "user" = "root" } -{ "group" = "root" } +{ "user" = "@QEMU_USER@" } +{ "group" = "@QEMU_GROUP@" } { "dynamic_ownership" = "1" } { "remember_owner" = "1" } { "cgroup_controllers" -- 2.35.1

2 1