January 2022 - Devel - libvirt List Archives

[PATCH 00/33] ppc64 PowerNV machines support
by Daniel Henrique Barboza 25 Jan '22

25 Jan '22

Hi, The ppc64 PowerNV (Power Non-Virtualized) machine types is the bare-metal emulation of the IBM Power server. They follow a different specification than the virtualized guest emulation, a.k.a the pSeries guest that Libvirt supports for awhile. There is an interest in running these PowerNV machines using Libvirt, in particular due to the growing popularity of the OpenCI project. This is the motivation of this work. Although these machines are present in QEMU for a few years now, they only became "Libvirt compliant" recently in upstream QEMU. The reason is that running with '-nodefaults' wouldn't allow users to add PHBs manually in the command line. Since the correspondent capabilities are already present since QEMU 5.0 I didn't find a good way to block the creation of powerNV domains for older QEMU versions (suggestions welcome). Support for these machines consists of adding a specific root-port and pcie-root implemementation for each one of them. powernv8 uses pnv-phb3-root-port/pnv-phb3 and powernv9 uses pnv-phb4-root-port/pnv-phb4. PowerNV PHBs have a similar handling as the already existing spapr-pci-host-bridge bus. These domains needs BMC devices to turn off from the OS. These devices aren't implemented in Libvirt yet (to my surprise, given that it's an Intel interface), so the domains needs to be turned off using 'virsh destroy'. I have patches that implements the required BMC devices, but decided to post them as a follow up to not make this patch set too large. The series is organized as follows: - patch 1: same patch sent a few days ago in [1], reposted here because the capabilities was added on top of it; - patches 2-9: cleanups and simplifications to allow a simple powernv8 domain to boot; - patches 10-26: add root-port and phb of the powernv8 machine; - patches 27-33: add root-port and phb of the powernv9 machine. No change in existing pcie-root and pcie-root-port models were made. This work can also be fetched from here: https://gitlab.com/danielhb/libvirt/-/tree/pnv_v1 Frederic, fell free to give this a ride and let us know how it goes. [1] https://listman.redhat.com/archives/libvir-list/2022-January/msg00766.html Daniel Henrique Barboza (33): tests: update QEMU and domain ppc64 capabilities for qemu 7.0 qemu_domain.c: add PowerNV machine helpers qemu_capabilities.c: use 'MachineIsPowerPC' in DeviceDiskCaps qemu_validate.c: use qemuDomainIsPowerPC() in qemuValidateDomainChrDef() qemu_domain.c: define ISA as default PowerNV serial qemu_validate.c: enhance 'machine type not supported' message qemu_domain.c: disable default devices for PowerNV machines tests: add basic PowerNV8 test qemu_migration.c: forbid powernv domains migration qemu: introduce QEMU_CAPS_DEVICE_PNV_PHB3_ROOT_PORT conf: add 'pnv-phb3-root-port' domain definition qemu: add 'modelName' value for pnv-phb3-root-port device qemu: introduce QEMU_CAPS_DEVICE_PNV_PHB3 conf: add 'pnv-phb3' controller model qemu: add 'modelName' value for pnv-phb3 device domain_conf.c: fix identation in virDomainControllerDefParseXML() conf: parse and format <target chip-id='...'/> introduce virDomainControllerIsPowerNVPHB conf, qemu: add default 'chip-id' value for pnv-phb3 controllers conf, qemu: add default 'targetIndex' value for pnv-phb3 devs qemu_command.c: add command line for the pnv-phb3 device qemu_domain_address.c: change pnv-phb3 minimal downstream slot domain_conf: format pnv-phb3-root-port empty addr tests: add pnv-phb3-root-port test domain_validate.c: allow targetIndex 0 out of idx 0 for PowerNV PHBs domain_conf.c: reject duplicated pnv-phb3 devices qemu: introduce QEMU_CAPS_DEVICE_PNV_PHB4_ROOT_PORT conf: add 'pnv-phb4-root-port' domain definition qemu: add 'modelName' value for pnv-phb4-root-port device qemu: introduce QEMU_CAPS_DEVICE_PNV_PHB4 conf: add 'pnv-phb4' controller model qemu: add 'modelName' value for pnv-phb4 device tests: add PowerNV9 tests docs/formatdomain.rst | 4 + docs/schemas/domaincommon.rng | 10 + src/conf/domain_conf.c | 157 +- src/conf/domain_conf.h | 8 + src/conf/domain_validate.c | 5 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 12 +- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 21 +- src/qemu/qemu_domain.c | 56 +- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_domain_address.c | 64 +- src/qemu/qemu_migration.c | 6 + src/qemu/qemu_validate.c | 63 +- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 148 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 4 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 4 + .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 4 + .../caps_7.0.0.ppc64.replies | 33825 ++++++++++++++++ .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1143 + ...default-video-type-ppc64.ppc64-latest.args | 8 +- tests/qemuxml2argvdata/powernv8-basic.args | 32 + tests/qemuxml2argvdata/powernv8-basic.xml | 16 + tests/qemuxml2argvdata/powernv8-dupPHBs.err | 1 + tests/qemuxml2argvdata/powernv8-dupPHBs.xml | 27 + .../qemuxml2argvdata/powernv8-root-port.args | 33 + tests/qemuxml2argvdata/powernv8-root-port.xml | 17 + .../qemuxml2argvdata/powernv8-two-sockets.xml | 26 + tests/qemuxml2argvdata/powernv9-dupPHBs.err | 1 + tests/qemuxml2argvdata/powernv9-dupPHBs.xml | 27 + .../qemuxml2argvdata/powernv9-root-port.args | 33 + tests/qemuxml2argvdata/powernv9-root-port.xml | 17 + ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 8 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 8 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 8 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 8 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 8 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 8 +- .../ppc64-pseries-graphics.ppc64-latest.args | 22 +- .../ppc64-pseries-headless.ppc64-latest.args | 16 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 6 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 8 +- .../tpm-emulator-spapr.ppc64-latest.args | 14 +- tests/qemuxml2argvtest.c | 18 + tests/qemuxml2xmloutdata/powernv8-basic.xml | 31 + .../qemuxml2xmloutdata/powernv8-root-port.xml | 36 + .../powernv8-two-sockets.xml | 38 + .../qemuxml2xmloutdata/powernv9-root-port.xml | 36 + tests/qemuxml2xmltest.c | 15 + tests/testutilsqemu.c | 2 +- 50 files changed, 35963 insertions(+), 108 deletions(-) create mode 100644 tests/domaincapsdata/qemu_7.0.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml create mode 100644 tests/qemuxml2argvdata/powernv8-basic.args create mode 100644 tests/qemuxml2argvdata/powernv8-basic.xml create mode 100644 tests/qemuxml2argvdata/powernv8-dupPHBs.err create mode 100644 tests/qemuxml2argvdata/powernv8-dupPHBs.xml create mode 100644 tests/qemuxml2argvdata/powernv8-root-port.args create mode 100644 tests/qemuxml2argvdata/powernv8-root-port.xml create mode 100644 tests/qemuxml2argvdata/powernv8-two-sockets.xml create mode 100644 tests/qemuxml2argvdata/powernv9-dupPHBs.err create mode 100644 tests/qemuxml2argvdata/powernv9-dupPHBs.xml create mode 100644 tests/qemuxml2argvdata/powernv9-root-port.args create mode 100644 tests/qemuxml2argvdata/powernv9-root-port.xml create mode 100644 tests/qemuxml2xmloutdata/powernv8-basic.xml create mode 100644 tests/qemuxml2xmloutdata/powernv8-root-port.xml create mode 100644 tests/qemuxml2xmloutdata/powernv8-two-sockets.xml create mode 100644 tests/qemuxml2xmloutdata/powernv9-root-port.xml -- 2.34.1

3 67

[PATCH] conf: network: Allow hostnames to start with a number
by Peter Krempa 25 Jan '22

25 Jan '22

From: Nicolas Lécureuil <neoclust(a)mageia.org> RFC952 mandated that hostnames would start with an alpha character. This requirement was later relaxed by RFC1123 which allowed hostnames to start with a number as well. https://datatracker.ietf.org/doc/html/rfc952 https://datatracker.ietf.org/doc/html/rfc1123#page-13 Signed-off-by: Nicolas Lécureuil <nicolas.lecureuil(a)siveo.net> Reviewed-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed after review of a trivial merge request. src/conf/network_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 10d3330fdf..c769bbaeb5 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -548,7 +548,7 @@ virNetworkDHCPHostDefParseXML(const char *networkName, } name = virXMLPropString(node, "name"); - if (name && (!g_ascii_isalpha(name[0]))) { + if (name && !(g_ascii_isalpha(name[0]) || g_ascii_isdigit(name[0]))) { virReportError(VIR_ERR_XML_ERROR, _("Cannot use host name '%s' in network '%s'"), name, networkName); -- 2.34.1

1 0

[PATCH 0/3] Fix hotplug of unassigned hostdevs
by Michal Privoznik 25 Jan '22

25 Jan '22

Honestly, I don't understand the reasoning behind <address type='unassigned'/> (esp. when the device is not accessible to the guest anyway). We offer virNodeDeviceDettach() and virNodeDeviceReAttach(). But apparently there are some issues with hotplug/hotunplug of hostdevs with such type of address. Michal Prívozník (3): domain_validate: Refuse VIR_DOMAIN_DEVICE_ADDRESS_TYPE_UNASSIGNED qemuDomainAttachHostPCIDevice: Handle hostevs with unassigned type of address qemuDomainDetachDeviceLive: Handle hostevs with unassigned type of address src/conf/domain_validate.c | 45 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_hotplug.c | 20 ++++++++++++++--- 2 files changed, 62 insertions(+), 3 deletions(-) -- 2.34.1

2 6

[PATCH] qemuDomainAttachHostPCIDevice: Fix coding style
by Michal Privoznik 25 Jan '22

25 Jan '22

Our coding style requires that a body of an if() longer than two lines is wrapped in a curly braces. There's one offender in qemuDomainAttachHostPCIDevice(). Fortunately, there was no functional problem because one of the lines is a comment. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/qemu/qemu_hotplug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 22acbd0852..f36de2385a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1663,9 +1663,10 @@ qemuDomainAttachHostPCIDevice(virQEMUDriver *driver, qemuAssignDeviceHostdevAlias(vm->def, &info->alias, -1); - if (qemuDomainIsPSeries(vm->def)) + if (qemuDomainIsPSeries(vm->def)) { /* Isolation groups are only relevant for pSeries guests */ qemuDomainFillDeviceIsolationGroup(vm->def, &dev); + } if (qemuDomainEnsurePCIAddress(vm, &dev) < 0) goto error; -- 2.34.1

1 0

[libvirt PATCH 0/2] qemu: support the SeaBIOS/EDK2 debug console
by Daniel P. Berrangé 25 Jan '22

25 Jan '22

# virsh dumpxml fedora34x86_64 | xmllint -xpath '/domain/devices/console[2]' - <console type="pty"> <target type="isa-debug" port="1"/> <address type="isa" iobase="0x402"/> </console> # virsh start --paused fedora34x86_64 # virsh console --devname console1 fedora34x86_64 Now in another terminal # virsh resume fedora34x86_64 And the 'virsh console' will now show the very first messages at startup.... SecCoreStartupWithStack(0xFFFCC000, 0x820000) SEC: Normal boot DecompressMemFvs: OutputBuffer@A00000+0xCE0090 ScratchBuffer@1700000+0x10000 PcdOvmfDecompressionScratchEnd=0x1710000 Register PPI Notify: DCD0BE23-9586-40F4-B643-06522CED4EDE Install PPI: 8C8CE578-8A3D-4F1C-9935-896185C32DD3 Install PPI: 5473C07A-3DCB-4DCA-BD6F-1E9689E7349A The 0th FV start address is 0x00000820000, size is 0x000E0000, handle is 0x820000 Register PPI Notify: 49EDB1C1-BF21-4761-BB12-EB0031AABB39 Register PPI Notify: EA7CA24B-DED5-4DAD-A389-BF827E8F9B38 Install PPI: B9E0ABFE-5979-4914-977F-6DEE78C278A6 Install PPI: DBE23AA9-A345-4B97-85B6-B226F1617389 DiscoverPeimsAndOrderWithApriori(): Found 0xD PEI FFS files in the 0th FV ...snip... Daniel P. Berrangé (2): conf: support firmware ISA debug console qemu: wire up support for isa-debugcon docs/formatdomain.rst | 3 +- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 23 ++++++++--- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 35 +++++++++++++++-- src/qemu/qemu_domain_address.c | 25 ++++++++++++ src/qemu/qemu_validate.c | 18 ++++++++- .../debugcon.x86_64-latest.args | 39 +++++++++++++++++++ tests/qemuxml2argvdata/debugcon.xml | 27 +++++++++++++ tests/qemuxml2argvtest.c | 2 + 10 files changed, 162 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/debugcon.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/debugcon.xml -- 2.33.1

4 7

[PATCH 1/2] docs: Fix typos in the code comment
by Han Han 24 Jan '22

24 Jan '22

1. s/LifeCycle/Lifecycle/, 2. s/virConnectDomainEventTrayChangeReason/virDomainEventTrayChangeReason/ Signed-off-by: Han Han <hhan(a)redhat.com> --- include/libvirt/libvirt-domain.h | 2 +- include/libvirt/libvirt-network.h | 2 +- include/libvirt/libvirt-nodedev.h | 2 +- include/libvirt/libvirt-secret.h | 2 +- include/libvirt/libvirt-storage.h | 2 +- src/conf/domain_conf.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 5f0a9b7572..0647361952 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4054,7 +4054,7 @@ typedef void (*virConnectDomainEventDiskChangeCallback)(virConnectPtr conn, void *opaque); /** - * virConnectDomainEventTrayChangeReason: + * virDomainEventTrayChangeReason: * * The reason describing why the callback was called */ diff --git a/include/libvirt/libvirt-network.h b/include/libvirt/libvirt-network.h index 398d8fccd4..80bd03878b 100644 --- a/include/libvirt/libvirt-network.h +++ b/include/libvirt/libvirt-network.h @@ -262,7 +262,7 @@ typedef enum { * virConnectNetworkEventLifecycleCallback: * @conn: connection object * @net: network on which the event occurred - * @event: The specific virNetworkEventLifeCycleType which occurred + * @event: The specific virNetworkEventLifecycleType which occurred * @detail: contains some details on the reason of the event. * It will be 0 for the while. * @opaque: application specified data diff --git a/include/libvirt/libvirt-nodedev.h b/include/libvirt/libvirt-nodedev.h index 245365b07f..0c01d51aab 100644 --- a/include/libvirt/libvirt-nodedev.h +++ b/include/libvirt/libvirt-nodedev.h @@ -229,7 +229,7 @@ typedef enum { * virConnectNodeDeviceEventLifecycleCallback: * @conn: connection object * @dev: node device on which the event occurred - * @event: The specific virNodeDeviceEventLifeCycleType which occurred + * @event: The specific virNodeDeviceEventLifecycleType which occurred * @detail: contains some details on the reason of the event. * @opaque: application specified data * diff --git a/include/libvirt/libvirt-secret.h b/include/libvirt/libvirt-secret.h index b8e53674d8..bc1286883c 100644 --- a/include/libvirt/libvirt-secret.h +++ b/include/libvirt/libvirt-secret.h @@ -190,7 +190,7 @@ typedef enum { * virConnectSecretEventLifecycleCallback: * @conn: connection object * @secret: secret on which the event occurred - * @event: The specific virSecretEventLifeCycleType which occurred + * @event: The specific virSecretEventLifecycleType which occurred * @detail: contains some details on the reason of the event. * @opaque: application specified data * diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index f89856b93e..f8c665a18f 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -488,7 +488,7 @@ typedef enum { * virConnectStoragePoolEventLifecycleCallback: * @conn: connection object * @pool: pool on which the event occurred - * @event: The specific virStoragePoolEventLifeCycleType which occurred + * @event: The specific virStoragePoolEventLifecycleType which occurred * @detail: contains some details on the reason of the event. * @opaque: application specified data * diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e2f35fe20b..6b25a91d80 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2823,7 +2823,7 @@ struct _virDomainDef { virDomainResourceDef *resource; virDomainIdMapDef idmap; - /* These 3 are based on virDomainLifeCycleAction enum flags */ + /* These 3 are based on virDomainLifecycleAction enum flags */ int onReboot; int onPoweroff; int onCrash; -- 2.34.1

2 3

[PATCH 00/11] conf: Misc cleanups & reworks
by Michal Privoznik 24 Jan '22

24 Jan '22

As I was going through domain_conf.c trying to change the code to use virXMLPropEnum() more I had to write couple of clean ups first. Patches can be also found here: https://gitlab.com/MichalPrivoznik/libvirt/-/commits/virxmlprop/ but on the branch, there are also said virXMLPropEnum() patches so look only at the first 11 patches on the branch. Michal Prívozník (11): virDomainInputDefParseXML: Move validation into validator virDomainChrSourceDefCopy: Copy more struct members virDomainChrSourceDefCopy: Don't check arguments against NULL virDomainChrSourceDefCopy: return void conf: Fix type of @present in _virDomainTimerDef struct conf: Fix @tickpolicy member of _virDomainTimerDef struct conf: Fix @track member of _virDomainTimerDef struct conf: Fix @mode member of _virDomainTimerDef struct conf: Rework virDomainTimerDefFormat() virDomainTimerDefFormat: return void conf: Separate out virDomainClockDef formatting src/conf/domain_conf.c | 296 ++++++++++++++----------------------- src/conf/domain_conf.h | 22 +-- src/conf/domain_validate.c | 67 ++++++++- src/libxl/libxl_conf.c | 2 +- src/libxl/xen_common.c | 23 +-- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/qemu/qemu_command.c | 28 ++-- src/qemu/qemu_process.c | 5 +- src/qemu/qemu_validate.c | 14 +- 10 files changed, 226 insertions(+), 235 deletions(-) -- 2.34.1

2 13

[PATCH 0/2] Fix wrong parameter "scsi" for vhost-user-blk-pci device
by yshxxsjt715＠gmail.com 24 Jan '22

24 Jan '22

From: shenjiatong <yshxxsjt715(a)gmail.com> Co-authored-by: Peter Krempa Peter Krempa (1): qemuxml2argvtest: disk-vhostuser: Add invocation for qemu-4.2 shenjiatong (1): Remove scsi parameter for vhost-user-blk for qemu 4.2 src/qemu/qemu_command.c | 6 ++- .../disk-vhostuser-numa.x86_64-4.2.0.args | 39 +++++++++++++++++++ .../disk-vhostuser-numa.x86_64-latest.args | 39 +++++++++++++++++++ .../qemuxml2argvdata/disk-vhostuser-numa.xml | 32 +++++++++++++++ tests/qemuxml2argvtest.c | 2 + 5 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args create mode 100644 tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-vhostuser-numa.xml -- 2.25.1

3 4

[trivial][pushed][libvirt PATCH] docs: Fix spelling
by Tim Wiederhake 24 Jan '22

24 Jan '22

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- docs/kbase/debuglogs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/kbase/debuglogs.rst b/docs/kbase/debuglogs.rst index d2632cfff1..c361c698c5 100644 --- a/docs/kbase/debuglogs.rst +++ b/docs/kbase/debuglogs.rst @@ -163,7 +163,7 @@ In order to setup libvirt logging persistently, follow the steps below: $XDG_CONFIG_HOME/libvirt/libvirtd.conf $XDG_CONFIG_HOME/libvirt/virtqemud.conf -- find & replace, or set the apropriate `Log outputs`_ and `Log filters`_, e.g :: +- find & replace, or set the appropriate `Log outputs`_ and `Log filters`_, e.g :: log_filters="3:remote 4:event 3:util.json 3:rpc 1:*" log_outputs="1:file:/var/log/libvirt/libvirtd.log" -- 2.31.1

1 0

[PATCH] meson: Explicitly specify run_command's check parameter
by Martin Kletzander 24 Jan '22

24 Jan '22

An update to meson 0.61.1 meant that it started showing warnings due to the fact that the default for run_command's 'check' parameter is going to change. It unveiled the fact that we were even missing that parameter in some calls where we expected different outcome. To make sure the behaviour does not change specify the parameter explicitly. In places where we check for the return code the parameter should be 'false' so that meson does not fail. In all other cases the parameter should be set to 'true' to make sure possible failure also stops meson. The warning in meson was added in https://github.com/mesonbuild/meson/pull/9304 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- build-aux/meson.build | 2 +- docs/meson.build | 4 ++-- meson.build | 22 ++++++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index e491bdeebc3f..f4d0130e3bf2 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -20,7 +20,7 @@ endif if host_machine.system() == 'freebsd' grep_prog = find_program('grep') - grep_cmd = run_command(grep_prog, '--version') + grep_cmd = run_command(grep_prog, '--version', check: true) if grep_cmd.stdout().startswith('grep (BSD grep') grep_prog = find_program('/usr/local/bin/grep', required: false) if not grep_prog.found() diff --git a/docs/meson.build b/docs/meson.build index 50c12cc3c255..54bba5e1b1fc 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -132,7 +132,7 @@ aclperms_gen = custom_target( ) docs_timestamp = run_command( - python3_prog, meson_timestamp_prog.path(), env: runutf8 + python3_prog, meson_timestamp_prog.path(), env: runutf8, check: true, ).stdout().strip() site_xsl = files('site.xsl') @@ -206,7 +206,7 @@ endforeach # # Use this knowledge to detect the version that we know doesn't work # for building libvirt and reject it -rst2html5_version = run_command(rst2html5_prog, '--version') +rst2html5_version = run_command(rst2html5_prog, '--version', check: true) rst2html5_version = rst2html5_version.stdout().split(' ') if rst2html5_version[1] != '(Docutils' error('Please uninstall the rst2html5 package and install the docutils package') diff --git a/meson.build b/meson.build index 70843afcd546..ccb2b73624e0 100644 --- a/meson.build +++ b/meson.build @@ -14,10 +14,10 @@ project( # figure out if we are building from git -git = run_command('test', '-d', '.git').returncode() == 0 +git = run_command('test', '-d', '.git', check: false).returncode() == 0 if git and not get_option('no_git') - run_command('git', 'submodule', 'update', '--init') + run_command('git', 'submodule', 'update', '--init', check: true) endif @@ -45,7 +45,7 @@ endif if get_option('system') prefix = '/usr' libdir = prefix / 'lib64' - if run_command('test', '-d', libdir).returncode() != 0 + if run_command('test', '-d', libdir, check: false).returncode() != 0 libdir = prefix / 'lib' endif localstatedir = '/var' @@ -222,6 +222,7 @@ size_max = cc.sizeof('size_t', prefix: '#include <stdint.h>') alloc_max = run_command( 'python3', '-c', 'print(min(2**(@0@ * 8 - 1) - 1, 2**(@1@ * 8) - 1))'.format(ptrdiff_max, size_max), + check: true, ) # sanitizer instrumentation may enlarge stack frames @@ -1096,7 +1097,7 @@ if not get_option('nls').disabled() endforeach if xgettext_prog.found() and msgfmt_prog.found() and msgmerge_prog.found() - rc = run_command(msgfmt_prog, '--version') + rc = run_command(msgfmt_prog, '--version', check: false) if rc.returncode() == 0 and rc.stdout().contains('GNU gettext') have_gnu_gettext_tools = true endif @@ -1199,7 +1200,7 @@ selinux_dep = dependency('libselinux', required: get_option('selinux')) if selinux_dep.found() selinux_mount = get_option('selinux_mount') if selinux_mount == '' - if run_command('test', '-d', '/sys/fs/selinux').returncode() == 0 + if run_command('test', '-d', '/sys/fs/selinux', check: false).returncode() == 0 selinux_mount = '/sys/fs/selinux' else selinux_mount = '/selinux' @@ -1658,7 +1659,7 @@ if not get_option('driver_qemu').disabled() default_qemu_user = 'root' default_qemu_group = 'wheel' else - os_release = run_command('grep', '^ID=', '/etc/os-release').stdout() + os_release = run_command('grep', '^ID=', '/etc/os-release', check: true).stdout() if os_release.contains('arch') default_qemu_user = 'nobody' default_qemu_group = 'nobody' @@ -1682,8 +1683,8 @@ if not get_option('driver_qemu').disabled() # If the expected user and group don't exist, or we haven't hit any # of the cases above bacuse we're running on an unknown OS, the only # sensible fallback is root:root - if (run_command('getent', 'passwd', default_qemu_user).returncode() != 0 and - run_command('getent', 'group', default_qemu_group).returncode() != 0) + if (run_command('getent', 'passwd', default_qemu_user, check: false).returncode() != 0 and + run_command('getent', 'group', default_qemu_group, check: false).returncode() != 0) default_qemu_user = 'root' default_qemu_group = 'root' endif @@ -2178,7 +2179,8 @@ if git ) endforeach - authors = run_command(python3_prog, meson_gen_authors_prog.path(), env: runutf8) + authors = run_command(python3_prog, meson_gen_authors_prog.path(), + env: runutf8, check: true) authors_file = 'AUTHORS.rst.in' authors_conf = configuration_data() @@ -2218,7 +2220,7 @@ configure_file( output: '@BASENAME@', configuration: run_conf, ) -run_command('chmod', 'a+x', meson.current_build_dir() / 'run') +run_command('chmod', 'a+x', meson.current_build_dir() / 'run', check: true) # generate developer tooling files -- 2.34.1

2 1