December 2021 - Devel - libvirt List Archives

[PATCH] rpc: Require dtrace sources to be generated first
by Michal Privoznik 04 Jan '22

04 Jan '22

The virt_socket_lib is built from virnetsocket.c (among others). But this file includes virprobe.h which includes libvirt_probes.h which is a generated file. But this dependency is not recorded in meson which may lead to a failed build. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I don't know if this is the right fix or we need to go with declare_dependency(), or even something else. But this fixes the build for me. src/rpc/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rpc/meson.build b/src/rpc/meson.build index 7fde92e6cf..36a2809adf 100644 --- a/src/rpc/meson.build +++ b/src/rpc/meson.build @@ -9,6 +9,7 @@ socket_sources = [ virt_socket_lib = static_library( 'virt_socket', [ + dtrace_gen_headers, socket_sources, ], dependencies: [ -- 2.32.0

2 1

[PATCH v2] Add VM info to improve error log message for qemu monitor
by Rohit Kumar 04 Jan '22

04 Jan '22

This patch is to determine the VM which had IO or socket hangup error. Accessing directly vm->def->name inside qemuMonitorIO() or qemuMonitorSend() might leads to illegal access as we are out of 'vm' context and vm->def might not exist. Adding a field "domainName" inside mon object to access vm name and initialising it when creating mon object. Signed-off-by: Rohit Kumar <rohit.kumar3(a)nutanix.com> --- diff to v1: - Adding a field domainName inside _qemuMonitor struct for accessing vm name instead of directly accessing mon->vm->def->name. - Link to v1: https://listman.redhat.com/archives/libvir-list/2021-December/msg00217.html - Talked with peter on RFC and he suggested me to add a field inside monitor struct to get VM name. src/qemu/qemu_monitor.c | 47 +++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index dda6ae9796..c3a0227795 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -80,6 +80,7 @@ struct _qemuMonitor { GSource *watch; virDomainObj *vm; + char *domainName; qemuMonitorCallbacks *cb; void *callbackOpaque; @@ -243,6 +244,7 @@ qemuMonitorDispose(void *obj) virCondDestroy(&mon->notify); g_free(mon->buffer); g_free(mon->balloonpath); + g_free(mon->domainName); } @@ -530,13 +532,18 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, qemuMonitor *mon = opaque; bool error = false; bool hangup = false; + virDomainObj *vm = NULL; + char *vmName = NULL; virObjectRef(mon); + vm = mon->vm; + vmName = mon->domainName; + /* lock access to the monitor and protect fd */ virObjectLock(mon); #if DEBUG_IO - VIR_DEBUG("Monitor %p I/O on socket %p cond %d", mon, socket, cond); + VIR_DEBUG("Monitor %p I/O on socket %p cond %d vm=%p name=%s", mon, socket, cond, vm, NULLSTR(vmName)); #endif if (mon->fd == -1 || !mon->watch) { virObjectUnlock(mon); @@ -583,8 +590,8 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, if (!error && !mon->goteof && cond & G_IO_ERR) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Invalid file descriptor while waiting for monitor")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s: Invalid file descriptor while waiting for monitor"), NULLSTR(vmName)); mon->goteof = true; } } @@ -609,13 +616,14 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, virResetLastError(); } else { if (virGetLastErrorCode() == VIR_ERR_OK && !mon->goteof) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Error while processing monitor IO")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s: Error while processing monitor IO"), NULLSTR(vmName)); virCopyLastError(&mon->lastError); virResetLastError(); } - VIR_DEBUG("Error on monitor %s", NULLSTR(mon->lastError.message)); + VIR_DEBUG("Error on monitor %s mon=%p vm=%p name=%s", + NULLSTR(mon->lastError.message), mon, vm, NULLSTR(vmName)); /* If IO process resulted in an error & we have a message, * then wakeup that waiter */ if (mon->msg && !mon->msg->finished) { @@ -631,22 +639,22 @@ qemuMonitorIO(GSocket *socket G_GNUC_UNUSED, * will try to acquire the virDomainObj *mutex next */ if (mon->goteof) { qemuMonitorEofNotifyCallback eofNotify = mon->cb->eofNotify; - virDomainObj *vm = mon->vm; /* Make sure anyone waiting wakes up now */ virCondSignal(&mon->notify); virObjectUnlock(mon); - VIR_DEBUG("Triggering EOF callback"); + VIR_DEBUG("Triggering EOF callback mon=%p vm=%p name=%s", + mon, vm, NULLSTR(vmName)); (eofNotify)(mon, vm, mon->callbackOpaque); virObjectUnref(mon); } else if (error) { qemuMonitorErrorNotifyCallback errorNotify = mon->cb->errorNotify; - virDomainObj *vm = mon->vm; /* Make sure anyone waiting wakes up now */ virCondSignal(&mon->notify); virObjectUnlock(mon); - VIR_DEBUG("Triggering error callback"); + VIR_DEBUG("Triggering error callback mon=%p vm=%p name=%s", + mon, vm, NULLSTR(vmName)); (errorNotify)(mon, vm, mon->callbackOpaque); virObjectUnref(mon); } else { @@ -694,6 +702,7 @@ qemuMonitorOpenInternal(virDomainObj *vm, mon->fd = fd; mon->context = g_main_context_ref(context); mon->vm = virObjectRef(vm); + mon->domainName = g_strdup(vm->def->name); mon->waitGreeting = true; mon->cb = cb; mon->callbackOpaque = opaque; @@ -932,17 +941,19 @@ qemuMonitorSend(qemuMonitor *mon, qemuMonitorMessage *msg) { int ret = -1; + virDomainObj *vm = mon->vm; + char *vmName = mon->domainName; /* Check whether qemu quit unexpectedly */ if (mon->lastError.code != VIR_ERR_OK) { - VIR_DEBUG("Attempt to send command while error is set %s", - NULLSTR(mon->lastError.message)); + VIR_DEBUG("Attempt to send command while error is set %s mon=%p vm=%p name=%s", + NULLSTR(mon->lastError.message), mon, vm, NULLSTR(vmName)); virSetError(&mon->lastError); return -1; } if (mon->goteof) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("End of file from qemu monitor")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s: End of file from qemu monitor"), NULLSTR(vmName)); return -1; } @@ -955,15 +966,15 @@ qemuMonitorSend(qemuMonitor *mon, while (!mon->msg->finished) { if (virCondWait(&mon->notify, &mon->parent.lock) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to wait on monitor condition")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s: Unable to wait on monitor condition"), NULLSTR(vmName)); goto cleanup; } } if (mon->lastError.code != VIR_ERR_OK) { - VIR_DEBUG("Send command resulted in error %s", - NULLSTR(mon->lastError.message)); + VIR_DEBUG("Send command resulted in error %s mon=%p vm=%p name=%s", + NULLSTR(mon->lastError.message), mon, vm, NULLSTR(vmName)); virSetError(&mon->lastError); goto cleanup; } -- 2.25.1

3 12

CDROM hotplug not supported even with usb bus
by Tianren Zhang 03 Jan '22

03 Jan '22

Hi, I am using libvirt-4.5.0 + qemu-kvm-ev-2.12.0 and I have a question about the cdrom function of libvirt. When I tried to attach a CD ROM, it rejected the operation showing "cdrom/floppy device hotplug isn't supported". I understand that it should be rejected when the IDE bus is used, but the hotplug with USB bus is totally feasible, as it's also supported in qemu, in this case, should it be allowed for hotplug? I have not tried the newest version of libvirt yet, but looking at the upstream source code it seems that there is no change regarding this issue. Thank you, Tianren Zhang

2 1

[libvirt PATCH] spec: Drop BuildRequires on ZFS
by Andrea Bolognani 03 Jan '22

03 Jan '22

We're no longer performing build time detection. Fixes: 506c3a39d6e645c8414c278ceaba97935f90cb95 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7bd74da2c9..9e24ba92ff 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -320,12 +320,6 @@ BuildRequires: glusterfs-devel >= 3.4.1 %if %{with_storage_sheepdog} BuildRequires: sheepdog %endif -%if %{with_storage_zfs} -# Support any conforming implementation of zfs. On stock Fedora -# this is zfs-fuse, but could be zfsonlinux upstream RPMs -BuildRequires: /sbin/zfs -BuildRequires: /sbin/zpool -%endif %if %{with_numactl} # For QEMU/LXC numa info BuildRequires: numactl-devel -- 2.31.1

2 1

[libvirt PATCH] meson: Don't require the parted command at build time
by Andrea Bolognani 03 Jan '22

03 Jan '22

We need libparted to be available at build time otherwise we can't link against it; we don't, however, need the parted command to be present until runtime and, just as is the case for other commands, we already perform a lookup through the virCommand API so making sure it's available at build time is unnecessary. This doesn't make any difference for platform such as Fedora and CentOS, where both the library and the command are in the same package, but others like Debian, Ubuntu and openSUSE have separate packages for the two components and this change means that we can install one less package at build time. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/437853370 meson.build | 8 -------- src/storage/storage_backend_disk.c | 2 ++ src/storage/storage_util.c | 2 ++ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 57561adf51..be51af1934 100644 --- a/meson.build +++ b/meson.build @@ -1043,14 +1043,6 @@ endif libparted_version = '1.8.0' libparted_dep = dependency('libparted', version: '>=' + libparted_version, required: false) -if libparted_dep.found() - parted_prog = find_program('parted', required: false, dirs: libvirt_sbin_path) - if parted_prog.found() - conf.set_quoted('PARTED', parted_prog.path()) - else - libparted_dep = dependency('', required: false) - endif -endif libpcap_version = '1.5.0' if not get_option('libpcap').disabled() diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 97554e2576..be8a535570 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -40,6 +40,8 @@ VIR_LOG_INIT("storage.storage_backend_disk"); #define SECTOR_SIZE 512 +#define PARTED "parted" + static bool virStorageVolPartFindExtended(virStorageVolDef *def, const void *opaque G_GNUC_UNUSED) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 03874d6ca3..728710153e 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -85,6 +85,8 @@ VIR_LOG_INIT("storage.storage_util"); # define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) #endif +#define PARTED "parted" + /* virStorageBackendNamespaceInit: * @poolType: virStoragePoolType * @xmlns: Storage Pool specific namespace callback methods -- 2.31.1

2 1

how to change nic's tx/rx ring size inside vm
by longguang.yue 31 Dec '21

31 Dec '21

Hi, all: my environment is qemu-kvm-6.0.0, 4.18.0-240, libvirt 7.4.0. vm is configured like this queues='4' rx_queue_size='1024' tx_queue_size='1024'. inside vm i can not change nic's ring size. changing tx leads to error 'Cannot set device ring parameters: Operation not supported'. changing rx leads to error 'rx unmodified, ignoring. no ring parameters changed, aborting' how to make it work and confirm what current value is? thanks

1 1

[libvirt PATCH] spec: Demote netcat to Recommends
by Andrea Bolognani 24 Dec '21

24 Dec '21

It is only needed if compatibility with clients using libvirt 6.9.0 is required, and can be uninstalled otherwise. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7bd74da2c9..0180b4200c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -402,8 +402,12 @@ Summary: Server side daemon and supporting files for libvirt library # The client side, i.e. shared libs are in a subpackage Requires: %{name}-libs = %{version}-%{release} -# (client invokes 'nc' against the UNIX socket on the server) -Requires: /usr/bin/nc +# netcat is needed on the server side so that clients that have +# libvirt < 6.9.0 can connect, but newer versions will prefer +# virt-ssh-helper. Making this a Recommends means that it gets +# installed by default, but can still be removed if compatibility +# with old clients is not required +Recommends: /usr/bin/nc # for modprobe of pci devices Requires: module-init-tools -- 2.31.1

2 1

[PATCH] docs: Fix indentation in shell snippet
by Andrea Bolognani 24 Dec '21

24 Dec '21

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/daemons.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/daemons.rst b/docs/daemons.rst index 8a05ee77a7..c8ae3b0cef 100644 --- a/docs/daemons.rst +++ b/docs/daemons.rst @@ -402,7 +402,7 @@ host first. systemctl unmask virt${drv}d{,-ro,-admin}.socket systemctl enable virt${drv}d.service systemctl enable virt${drv}d{,-ro,-admin}.socket - done + done #. Start the sockets for the same set of daemons. There is no need to start the services as they will get started when the first socket connection is @@ -413,7 +413,7 @@ host first. $ for drv in qemu network nodedev nwfilter secret storage do systemctl start virt${drv}d{,-ro,-admin}.socket - done + done #. If connections from remote hosts need to be supported the proxy daemon must be enabled and started -- 2.31.1

1 0

[PATCH 0/5] tests: Tool for programatic modification of qemucapabilitiesdata/*.replies
by Peter Krempa 23 Dec '21

23 Dec '21

I was asked multiple times how to automate modification of the qemu capability dumps. I wrote a tool [1] that allowed doing that. Unfortunately as it wasn't in the repo it was not avalilable. Now I've finally set out to finish it. It masquerades as a test in default mode checking the ordering and numbering of the caps dump files as in the past there were few cases where manual edits broke it. In update mode it allows modification of the replies and gives few examples to do so. There's a lot of possible things users would want to do so there's no way around actually writing some code but it should be easier this way. Since this now does also numbering, the AWK/shell script 'qemucapsfixreplies' can be removed. [1]: Okay, okay. Copy&paste'd few bits from various places into one messy C file and didn't bother with memory cleanup. But it worked. Peter Krempa (5): util: json: Introduce virJSONValueObjectReplaceValue tests: qemumonitortestutils.h: Reformat header file qemumonitortestutils: Extract parser for the monitor conversation dump file tests: Tool for programatic modification of qemucapabilitiesdata/*.replies tests: Remove 'qemucapsfixreplies' src/libvirt_private.syms | 1 + src/util/virjson.c | 20 +++ src/util/virjson.h | 6 + tests/domaincapstest.c | 3 +- tests/meson.build | 1 + tests/qemucapabilitiesnumbering.c | 242 ++++++++++++++++++++++++++++++ tests/qemucapabilitiestest.c | 4 +- tests/qemucapsfixreplies | 26 ---- tests/qemumonitortestutils.c | 123 ++++++++++----- tests/qemumonitortestutils.h | 149 +++++++++++------- 10 files changed, 453 insertions(+), 122 deletions(-) create mode 100644 tests/qemucapabilitiesnumbering.c delete mode 100755 tests/qemucapsfixreplies -- 2.31.1

2 6

[PATCH] ci: Refresh dockerfiles
by Peter Krempa 22 Dec '21

22 Dec '21

Apart from some churn, the important is the removal of 'netcf-devel' from the fedora rawhide container. Update to state as of 174fe4999204afcae (libvirt-ci). Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as trivial. It makes CI green again. .../debian-10-cross-aarch64.Dockerfile | 18 +++++++++--------- .../debian-10-cross-armv6l.Dockerfile | 18 +++++++++--------- .../debian-10-cross-armv7l.Dockerfile | 18 +++++++++--------- ci/containers/debian-10-cross-i686.Dockerfile | 18 +++++++++--------- ci/containers/debian-10-cross-mips.Dockerfile | 18 +++++++++--------- .../debian-10-cross-mips64el.Dockerfile | 18 +++++++++--------- .../debian-10-cross-mipsel.Dockerfile | 18 +++++++++--------- .../debian-10-cross-ppc64le.Dockerfile | 18 +++++++++--------- ci/containers/debian-10-cross-s390x.Dockerfile | 18 +++++++++--------- .../debian-11-cross-aarch64.Dockerfile | 12 ++++++------ .../debian-11-cross-armv6l.Dockerfile | 12 ++++++------ .../debian-11-cross-armv7l.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-i686.Dockerfile | 12 ++++++------ .../debian-11-cross-mips64el.Dockerfile | 12 ++++++------ .../debian-11-cross-mipsel.Dockerfile | 12 ++++++------ .../debian-11-cross-ppc64le.Dockerfile | 12 ++++++------ ci/containers/debian-11-cross-s390x.Dockerfile | 12 ++++++------ .../debian-sid-cross-aarch64.Dockerfile | 12 ++++++------ .../debian-sid-cross-armv6l.Dockerfile | 12 ++++++------ .../debian-sid-cross-armv7l.Dockerfile | 12 ++++++------ ci/containers/debian-sid-cross-i686.Dockerfile | 12 ++++++------ .../debian-sid-cross-mips64el.Dockerfile | 12 ++++++------ .../debian-sid-cross-mipsel.Dockerfile | 12 ++++++------ .../debian-sid-cross-ppc64le.Dockerfile | 12 ++++++------ .../debian-sid-cross-s390x.Dockerfile | 12 ++++++------ .../fedora-35-cross-mingw32.Dockerfile | 12 ++++++------ .../fedora-35-cross-mingw64.Dockerfile | 12 ++++++------ .../fedora-rawhide-cross-mingw32.Dockerfile | 12 ++++++------ .../fedora-rawhide-cross-mingw64.Dockerfile | 12 ++++++------ ci/containers/fedora-rawhide.Dockerfile | 1 - 30 files changed, 201 insertions(+), 202 deletions(-) diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile index 38013eb84b..cfbf5bb48f 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson==0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ eatmydata apt-get update && \ @@ -117,14 +126,5 @@ endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile index f9bfa031fa..3308ac2e10 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson==0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile index 0ddb3c65f5..0dcd8ee1d7 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson==0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ eatmydata apt-get update && \ @@ -117,14 +126,5 @@ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile index da14c20b3a..8806dff0c3 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson==0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-linux-gnu" ENV MESON_OPTS "--cross-file=i686-linux-gnu" diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile index efaf7a155b..edc54fe1ac 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson==0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mips-linux-gnu" ENV MESON_OPTS "--cross-file=mips-linux-gnu" diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile index 896a730ebe..d988d82fbf 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson==0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile index d50c2bcc8a..455edcae3c 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson==0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile index 8cbea4bee8..ad380052c9 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson==0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile index 3ad9a772c8..faeb450569 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -56,6 +56,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +RUN pip3 install \ + meson==0.56.0 + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ eatmydata apt-get update && \ @@ -116,14 +125,5 @@ endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc -RUN pip3 install \ - meson==0.56.0 - -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "s390x-linux-gnu" ENV MESON_OPTS "--cross-file=s390x-linux-gnu" diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index a8b5ff293c..1d6ca0dd76 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ eatmydata apt-get update && \ @@ -116,11 +122,5 @@ endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index 53c6759085..6ad97f9034 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index 4d41db399f..28bcf1b655 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ eatmydata apt-get update && \ @@ -116,11 +122,5 @@ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index 0693c03e48..f7be68ed45 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-linux-gnu" ENV MESON_OPTS "--cross-file=i686-linux-gnu" diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index 0c2e4b6cc7..3e98e52874 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index 5a5c4c2a35..165612b747 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index fdbe884a5c..d8706863c4 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index be4981d22f..4f699ee2b5 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "s390x-linux-gnu" ENV MESON_OPTS "--cross-file=s390x-linux-gnu" diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 883a5fe526..eac0c95c88 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture arm64 && \ eatmydata apt-get update && \ @@ -116,11 +122,5 @@ endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index 418b5295b4..5b53d741dd 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armel && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 8116ee3475..2eae6f073b 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture armhf && \ eatmydata apt-get update && \ @@ -116,11 +122,5 @@ endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index 63f770a366..3b9f6ba389 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture i386 && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-linux-gnu" ENV MESON_OPTS "--cross-file=i686-linux-gnu" diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index fb7b02ce88..0d90f002ae 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mips64el && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index 6c2d871a08..e29ca9eee3 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture mipsel && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index abcf271072..5707c8a57d 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture ppc64el && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 00a999a284..25aa6513cc 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -55,6 +55,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ dpkg-reconfigure locales +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN export DEBIAN_FRONTEND=noninteractive && \ dpkg --add-architecture s390x && \ eatmydata apt-get update && \ @@ -115,11 +121,5 @@ endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "s390x-linux-gnu" ENV MESON_OPTS "--cross-file=s390x-linux-gnu" diff --git a/ci/containers/fedora-35-cross-mingw32.Dockerfile b/ci/containers/fedora-35-cross-mingw32.Dockerfile index 0a26a1f9bd..de514525c6 100644 --- a/ci/containers/fedora-35-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-35-cross-mingw32.Dockerfile @@ -62,6 +62,12 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN nosync dnf install -y \ mingw32-curl \ mingw32-dbus \ @@ -82,11 +88,5 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" diff --git a/ci/containers/fedora-35-cross-mingw64.Dockerfile b/ci/containers/fedora-35-cross-mingw64.Dockerfile index e2a3ba9d6d..34dd93ccd9 100644 --- a/ci/containers/fedora-35-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-35-cross-mingw64.Dockerfile @@ -62,6 +62,12 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN nosync dnf install -y \ mingw64-curl \ mingw64-dbus \ @@ -82,11 +88,5 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "x86_64-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson" diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 31006b8092..f8eb7abe7e 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -63,6 +63,12 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN nosync dnf install -y \ mingw32-curl \ mingw32-dbus \ @@ -83,11 +89,5 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "i686-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index c9b01984b5..feec913384 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -63,6 +63,12 @@ exec "$@"' > /usr/bin/nosync && \ nosync dnf autoremove -y && \ nosync dnf clean all -y +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + RUN nosync dnf install -y \ mingw64-curl \ mingw64-dbus \ @@ -83,11 +89,5 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" - ENV ABI "x86_64-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson" diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 97476535b9..ff18e89e66 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -72,7 +72,6 @@ exec "$@"' > /usr/bin/nosync && \ lvm2 \ make \ meson \ - netcf-devel \ nfs-utils \ ninja-build \ numactl-devel \ -- 2.31.1

1 0

[PATCH RFC v2 0/4] blockdev-replace
by Vladimir Sementsov-Ogievskiy 22 Dec '21

22 Dec '21

Hi all! v2: 1. Let's start with minimal functionality: replace only one specific child. 2. Explicit type of parent: qdev / export / driver Hmm, 'driver' is for BlockDriverState.. Any better idea? I don't want to call it "node" or even "block-node", as finally, devices and exports are kind of nodes too in the whole block graph.. 3. I think it's better to start with x- prefix Plans for v3: - add tests of filter insertion and removing - add qmp transaction support Vladimir Sementsov-Ogievskiy (4): block-backend: blk_root(): drop const specifier on return type block/export: add blk_by_export_id() block: make bdrv_find_child() function public qapi: add blockdev-replace command qapi/block.json | 61 ++++++++++++++++++++++++++++++++++ include/block/block_int.h | 1 + include/sysemu/block-backend.h | 3 +- block.c | 13 ++++++++ block/block-backend.c | 2 +- block/export/export.c | 18 ++++++++++ block/qapi-sysemu.c | 56 +++++++++++++++++++++++++++++++ blockdev.c | 14 -------- 8 files changed, 152 insertions(+), 16 deletions(-) -- 2.31.1

1 4

[libvirt PATCH v2] qemu: Fix typo in comment
by Tim Wiederhake 22 Dec '21

22 Dec '21

Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a3d6eca569..8870b5f8ee 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -8217,7 +8217,7 @@ qemuMonitorJSONGetSEVMeasurement(qemuMonitor *mon) /** - * Retrive info about the SEV setup, returning those fields that + * Retrieve info about the SEV setup, returning those fields that * are required to do a launch attestation, as per * * HMAC(0x04 || API_MAJOR || API_MINOR || BUILD || GCTX.POLICY || GCTX.LD || MNONCE; GCTX.TIK) -- 2.31.1

3 2

[PATCH 0/6] json helper cleanups
by Peter Krempa 22 Dec '21

22 Dec '21

Peter Krempa (6): qemuBlockStorageSourceGetRBDProps: Simplify generation of auth modes Replace open coded virJSONValueArrayAppendString util: json: Don't copy string in virJSONValueNewString util: json: Open-code only call of virJSONValueNewStringLen util: json: Remove virJSONValueIsNull/virJSONValueObjectIsNull util: virjson.h: Reformat headers to conform with new style src/libvirt_private.syms | 3 - src/qemu/qemu_agent.c | 4 +- src/qemu/qemu_block.c | 10 +- src/util/virjson.c | 57 +------ src/util/virjson.h | 315 +++++++++++++++++++++++++++------------ src/util/virmacmap.c | 4 +- tests/virjsontest.c | 4 +- 7 files changed, 231 insertions(+), 166 deletions(-) -- 2.31.1

3 8

[PATCH] docs: Remove dependency on external resources
by Andrea Bolognani 21 Dec '21

21 Dec '21

The internals/eventloop document uses two images for illustrative purposes, but unlike other graphics included in the documentation these are not part of libvirt.git but rather were added to libvirt-media.git with commit fae5622074cf5e18d190496f8a43260c614599b2 Author: Michal Privoznik <mprivozn(a)redhat.com> Date: Mon Jun 6 17:27:50 2016 +0200 Add two event loop images These images are going to be used in our documentation of the event loop. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> https://gitlab.com/libvirt/libvirt-media/-/commit/fae5622074cf5e18d190496f8… and are requested directly from there. Specifically, the URLs point to the libvirt.org mirror of libvirt-media.git instead of the primary repository hosted on GitLab. Import the images into libvirt.git so that the website doesn't rely on external resources and can, if desired, be browsed entirely offline from installed packages. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Redacted to strip binary and binary-adjacent blobs. Full patch: https://gitlab.com/abologna/libvirt/-/commit/684805e3cf65ab3bb93a92ada3b720… docs/event_loop_simple.png | Bin 0 -> 16043 bytes docs/event_loop_simple.svg | 398 +++++++++++++++++ docs/event_loop_worker.png | Bin 0 -> 29696 bytes docs/event_loop_worker.svg | 708 +++++++++++++++++++++++++++++++ docs/internals/eventloop.html.in | 4 +- docs/meson.build | 2 + 6 files changed, 1110 insertions(+), 2 deletions(-) create mode 100644 docs/event_loop_simple.png create mode 100644 docs/event_loop_simple.svg create mode 100644 docs/event_loop_worker.png create mode 100644 docs/event_loop_worker.svg diff --git a/docs/event_loop_simple.png b/docs/event_loop_simple.png new file mode 100644 index 0000000000000000000000000000000000000000..daf4338a16bc1051aca0ca1c7ea13baa4e7179f1 [... PNG stuff here ...] diff --git a/docs/event_loop_simple.svg b/docs/event_loop_simple.svg new file mode 100644 index 0000000000..be25005002 [... SVG stuff here ...] diff --git a/docs/event_loop_worker.png b/docs/event_loop_worker.png new file mode 100644 index 0000000000000000000000000000000000000000..1bec1ea598b2806fea24ab25dc825c9055c76ee6 [... PNG stuff here ...] diff --git a/docs/event_loop_worker.svg b/docs/event_loop_worker.svg new file mode 100644 index 0000000000..d824e2d585 [... SVG stuff here ...] diff --git a/docs/internals/eventloop.html.in b/docs/internals/eventloop.html.in index 3e62d5ca53..aa22ba15cd 100644 --- a/docs/internals/eventloop.html.in +++ b/docs/internals/eventloop.html.in @@ -29,7 +29,7 @@ not waiting for direct user input and have no graphical interface. Such as Libvirt.</p> - <img alt="event loop" src="https://libvirt.org/git/?p=libvirt-media.git;a=blob_plain;f=png/event_loop_…"/> + <img alt="event loop" src="../event_loop_simple.png"/> <p>In Libvirt this approach is used in combination with <code>poll(2)</code> as all the communication with its @@ -70,7 +70,7 @@ acceptable for Libvirt. Therefore we have came up with the following solution.</p> - <img alt="event loop" src="https://libvirt.org/git/?p=libvirt-media.git;a=blob_plain;f=png/event_loop_…"/> + <img alt="event loop" src="../event_loop_worker.png"/> <p>The event loop does only necessary minimum and hand over message processing to another thread. In fact, there can be diff --git a/docs/meson.build b/docs/meson.build index 3aabb52950..3e708acf0e 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -10,6 +10,8 @@ docs_assets = [ 'android-chrome-256x256.png', 'apple-touch-icon.png', 'browserconfig.xml', + 'event_loop_simple.png', + 'event_loop_worker.png', 'favicon.ico', 'favicon-16x16.png', 'favicon-32x32.png', -- 2.31.1

3 8

[libvirt PATCH 0/2] docs: Move all images to a subdirectory
by Andrea Bolognani 21 Dec '21

21 Dec '21

Andrea Bolognani (2): docs: Drop structures.svg docs: Move all images to a subdirectory docs/api.rst | 6 +- docs/goals.html.in | 2 +- docs/{ => images}/event_loop_simple.png | Bin docs/{ => images}/event_loop_simple.svg | 0 docs/{ => images}/event_loop_worker.png | Bin docs/{ => images}/event_loop_worker.svg | 0 docs/{ => images}/libvirt-daemon-arch.png | Bin docs/{ => images}/libvirt-daemon-arch.svg | 0 docs/{ => images}/libvirt-driver-arch.png | Bin docs/{ => images}/libvirt-driver-arch.svg | 0 docs/{ => images}/libvirt-object-model.png | Bin docs/{ => images}/libvirt-object-model.svg | 0 .../libvirt-virConnect-example.png | Bin .../libvirt-virConnect-example.svg | 0 docs/images/meson.build | 24 +++ .../{ => images}/migration-managed-direct.png | Bin .../{ => images}/migration-managed-direct.svg | 0 docs/{ => images}/migration-managed-p2p.png | Bin docs/{ => images}/migration-managed-p2p.svg | 0 docs/{ => images}/migration-native.png | Bin docs/{ => images}/migration-native.svg | 0 docs/{ => images}/migration-tunnel.png | Bin docs/{ => images}/migration-tunnel.svg | 0 .../migration-unmanaged-direct.png | Bin .../migration-unmanaged-direct.svg | 0 docs/{ => images}/node.gif | Bin docs/{ => images}/node.svg | 0 docs/internals.html.in | 2 +- docs/internals/eventloop.html.in | 4 +- docs/meson.build | 13 +- docs/migration.rst | 10 +- docs/structures.svg | 187 ------------------ 32 files changed, 37 insertions(+), 211 deletions(-) rename docs/{ => images}/event_loop_simple.png (100%) rename docs/{ => images}/event_loop_simple.svg (100%) rename docs/{ => images}/event_loop_worker.png (100%) rename docs/{ => images}/event_loop_worker.svg (100%) rename docs/{ => images}/libvirt-daemon-arch.png (100%) rename docs/{ => images}/libvirt-daemon-arch.svg (100%) rename docs/{ => images}/libvirt-driver-arch.png (100%) rename docs/{ => images}/libvirt-driver-arch.svg (100%) rename docs/{ => images}/libvirt-object-model.png (100%) rename docs/{ => images}/libvirt-object-model.svg (100%) rename docs/{ => images}/libvirt-virConnect-example.png (100%) rename docs/{ => images}/libvirt-virConnect-example.svg (100%) create mode 100644 docs/images/meson.build rename docs/{ => images}/migration-managed-direct.png (100%) rename docs/{ => images}/migration-managed-direct.svg (100%) rename docs/{ => images}/migration-managed-p2p.png (100%) rename docs/{ => images}/migration-managed-p2p.svg (100%) rename docs/{ => images}/migration-native.png (100%) rename docs/{ => images}/migration-native.svg (100%) rename docs/{ => images}/migration-tunnel.png (100%) rename docs/{ => images}/migration-tunnel.svg (100%) rename docs/{ => images}/migration-unmanaged-direct.png (100%) rename docs/{ => images}/migration-unmanaged-direct.svg (100%) rename docs/{ => images}/node.gif (100%) rename docs/{ => images}/node.svg (100%) delete mode 100644 docs/structures.svg -- 2.31.1

2 4

[PATCH 0/7] qemu: Add support for qcow2's 'extended-l2' feature
by Peter Krempa 21 Dec '21

21 Dec '21

Peter Krempa (7): docs: formatstorage: Convert to RST storage: Introduce 'extended_l2' feature for storage volume qcow2GetFeatures: Extract population of features bitmap storage_file_probe: Add support for probing qcow2's incompatible features qemuBlockStorageSourceCreateGetFormatPropsQcow2: Add support for 'extended-l2' feature qemu: monitor: Extract whether qcow2 image uses extended L2 allocation data qemuBlockStorageSourceCreateDetectSize: Propagate 'extended_l2' feature to new overlays docs/formatstorage.html.in | 1000 ----------------- docs/formatstorage.rst | 827 ++++++++++++++ docs/meson.build | 2 +- docs/schemas/storagecommon.rng | 5 + src/conf/storage_source_conf.c | 1 + src/conf/storage_source_conf.h | 1 + src/qemu/qemu_block.c | 20 +- src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 10 +- src/storage/storage_util.c | 11 + src/storage_file/storage_file_probe.c | 61 +- .../qcow2-clusterSize.argv | 2 +- .../vol-qcow2-clusterSize.xml | 3 + .../vol-qcow2-clusterSize.xml | 4 + 14 files changed, 929 insertions(+), 1021 deletions(-) delete mode 100644 docs/formatstorage.html.in create mode 100644 docs/formatstorage.rst -- 2.31.1

2 15

[PATCH V3 0/4] Add virDomainSetLaunchSecurityState API
by Jim Fehlig 21 Dec '21

21 Dec '21

V3 of https://listman.redhat.com/archives/libvir-list/2021-December/msg00366.html Like V1 and V2, this series is compile-tested only. I plan to work on functional testing soon. Unlike previous versions, this one got little self-scrutiny since I wanted to get it posted to the list for feedback on questions regarding 4/4. Changes since V2: - Add test case in qemumonitorjsontest - Add virsh implementation Jim Fehlig (4): libvirt: Introduce virDomainSetLaunchSecurityState public API remote: Add RPC support for the virDomainSetLaunchSecurityState API qemu: Implement the virDomainSetLaunchSecurityState API tools: Add domsetlaunchsecstate virsh command docs/manpages/virsh.rst | 25 ++++++++ include/libvirt/libvirt-domain.h | 36 +++++++++++ src/driver-hypervisor.h | 7 ++ src/libvirt-domain.c | 62 ++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 88 +++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 14 ++++ src/qemu/qemu_monitor.h | 7 ++ src/qemu/qemu_monitor_json.c | 45 +++++++++++++ src/qemu/qemu_monitor_json.h | 6 ++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 17 ++++- src/remote_protocol-structs | 9 +++ tests/qemumonitorjsontest.c | 3 + tools/virsh-domain.c | 107 +++++++++++++++++++++++++++++++ 15 files changed, 431 insertions(+), 1 deletion(-) -- 2.34.1

3 10

[PATCH v2 00/12] Add riscv kvm accel support
by Yifei Jiang 20 Dec '21

20 Dec '21

This series adds both riscv32 and riscv64 kvm support, and implements migration based on riscv. Because of RISC-V KVM has been merged into the Linux master, so this series are changed from RFC to patch. Several steps to use this: 1. Build emulation $ ./configure --target-list=riscv64-softmmu $ make -j$(nproc) 2. Build kernel 3. Build QEMU VM Cross built in riscv toolchain. $ PKG_CONFIG_LIBDIR=<toolchain pkgconfig path> $ export PKG_CONFIG_SYSROOT_DIR=<toolchain sysroot path> $ ./configure --target-list=riscv64-softmmu --enable-kvm \ --cross-prefix=riscv64-linux-gnu- --disable-libiscsi --disable-glusterfs \ --disable-libusb --disable-usb-redir --audio-drv-list= --disable-opengl \ --disable-libxml2 $ make -j$(nproc) 4. Start emulation $ ./qemu-system-riscv64 -M virt -m 4096M -cpu rv64,x-h=true -nographic \ -name guest=riscv-hyp,debug-threads=on \ -smp 4 \ -bios ./fw_jump.bin \ -kernel ./Image \ -drive file=./hyp.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" 5. Start kvm-acceled QEMU VM in emulation $ ./qemu-system-riscv64 -M virt,accel=kvm -m 1024M -cpu host -nographic \ -name guest=riscv-guset \ -smp 2 \ -bios none \ -kernel ./Image \ -drive file=./guest.img,format=raw,id=hd0 \ -device virtio-blk-device,drive=hd0 \ -append "root=/dev/vda rw console=ttyS0 earlycon=sbi" Changes since patch v1 - Rebase on recent commit a216e7cf119c91ffdf5931834a1a030ebea40d70 - Sync-up headers with Linux-5.16-rc4. - Fixbug in kvm_arch_init_vcpu. - Create a macro for get and put regs csr. - Start kernel directly when kvm_enabled. - Use riscv_cpu_set_irq to inject KVM interrupts. - Use the Semihosting Console API for RISC-V kvm handle sbi. - Update vmstate_riscv_cpu version id. Placing kvm_timer into a subsection. Changes since RFC v6 - Rebase on recent commit 8627edfb3f1fca24a96a0954148885c3241c10f8 - Sync-up headers with Linux-5.16-rc1 Changes since RFC v5 - Rebase on QEMU v6.1.0-rc1 and kvm-riscv linux v19. - Move kvm interrupt setting to riscv_cpu_update_mip(). - Replace __u64 with uint64_t. Changes since RFC v4 - Rebase on QEMU v6.0.0-rc2 and kvm-riscv linux v17. - Remove time scaling support as software solution is incomplete. Because it will cause unacceptable performance degradation. and We will post a better solution. - Revise according to Alistair's review comments. - Remove compile time XLEN checks in kvm_riscv_reg_id - Surround TYPE_RISCV_CPU_HOST definition by CONFIG_KVM and share it between RV32 and RV64. - Add kvm-stub.c for reduce unnecessary compilation checks. - Add riscv_setup_direct_kernel() to direct boot kernel for KVM. Changes since RFC v3 - Rebase on QEMU v5.2.0-rc2 and kvm-riscv linux v15. - Add time scaling support(New patches 13, 14 and 15). - Fix the bug that guest vm can't reboot. Changes since RFC v2 - Fix checkpatch error at target/riscv/sbi_ecall_interface.h. - Add riscv migration support. Changes since RFC v1 - Add separate SBI ecall interface header. - Add riscv32 kvm accel support. Yifei Jiang (12): update-linux-headers: Add asm-riscv/kvm.h target/riscv: Add target/riscv/kvm.c to place the public kvm interface target/riscv: Implement function kvm_arch_init_vcpu target/riscv: Implement kvm_arch_get_registers target/riscv: Implement kvm_arch_put_registers target/riscv: Support start kernel directly by KVM target/riscv: Support setting external interrupt by KVM target/riscv: Handle KVM_EXIT_RISCV_SBI exit target/riscv: Add host cpu type target/riscv: Add kvm_riscv_get/put_regs_timer target/riscv: Implement virtual time adjusting with vm state changing target/riscv: Support virtual time context synchronization hw/riscv/boot.c | 11 + hw/riscv/virt.c | 54 ++- include/hw/riscv/boot.h | 1 + linux-headers/asm-riscv/kvm.h | 128 +++++++ linux-headers/linux/kvm.h | 8 + meson.build | 2 + target/riscv/cpu.c | 29 +- target/riscv/cpu.h | 11 + target/riscv/kvm-stub.c | 30 ++ target/riscv/kvm.c | 528 +++++++++++++++++++++++++++++ target/riscv/kvm_riscv.h | 25 ++ target/riscv/machine.c | 37 +- target/riscv/meson.build | 1 + target/riscv/sbi_ecall_interface.h | 72 ++++ 14 files changed, 918 insertions(+), 19 deletions(-) create mode 100644 linux-headers/asm-riscv/kvm.h create mode 100644 target/riscv/kvm-stub.c create mode 100644 target/riscv/kvm.c create mode 100644 target/riscv/kvm_riscv.h create mode 100644 target/riscv/sbi_ecall_interface.h -- 2.19.1

4 27

[PATCH 0/7] Polkit tty agent fixes
by Martin Kletzander 17 Dec '21

17 Dec '21

Apart from fixing bz 1945501 [0] there are some small changes/fixes to some of the polkit code. [0] https://bugzilla.redhat.com/show_bug.cgi?id=1945501 Martin Kletzander (7): virsh: Remove needless variable util: Tiny reword fix in comment util: Add virPolkitAgentAvailable virsh: Do not try connecting first time without polkit agent util: Report errors in all code paths in virPolkitAgentCreate util: Check for pkttyagent availability properly util: Make client-side polkit work even with polkit disabled src/libvirt_private.syms | 1 + src/util/virpolkit.c | 202 ++++++++++++++++++++++----------------- src/util/virpolkit.h | 1 + tools/virsh.c | 14 ++- 4 files changed, 127 insertions(+), 91 deletions(-) -- 2.34.0

5 34

[PATCH] virt-host-validate: Fix IOMMU output on S390
by Boris Fiuczynski 17 Dec '21

17 Dec '21

Commit 93e9e92c1e eliminated the option for skipping but left code in the s390 check which makes use of a skip. This leads to an output without result destroying the correct format. e.g. QEMU: Checking for hardware virtualization : PASS QEMU: Checking if device /dev/kvm exists : PASS QEMU: Checking if device /dev/kvm is accessible : PASS QEMU: Checking if device /dev/vhost-net exists : PASS QEMU: Checking if device /dev/net/tun exists : PASS QEMU: Checking for cgroup 'cpu' controller support : PASS QEMU: Checking for cgroup 'cpuacct' controller support : PASS QEMU: Checking for cgroup 'cpuset' controller support : PASS QEMU: Checking for cgroup 'memory' controller support : PASS QEMU: Checking for cgroup 'devices' controller support : PASS QEMU: Checking for cgroup 'blkio' controller support : PASS QEMU: Checking for device assignment IOMMU support : QEMU: Checking for secure guest support : PASS Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- tools/virt-host-validate-common.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 647ed7b48b..1cb9d206b5 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -378,11 +378,17 @@ int virHostValidateIOMMU(const char *hvname, * devices (which is quite usual on s390x). If there are * no PCI devices the directory is still there but is * empty. */ - if (!virDirOpen(&dir, "/sys/bus/pci/devices")) - return 0; + if (!virDirOpen(&dir, "/sys/bus/pci/devices")) { + virHostMsgFail(VIR_HOST_VALIDATE_NOTE, + "Skipped - PCI support disabled"); + return VIR_HOST_VALIDATE_FAILURE(VIR_HOST_VALIDATE_NOTE); + } rc = virDirRead(dir, &dent, NULL); - if (rc <= 0) - return 0; + if (rc <= 0) { + virHostMsgFail(VIR_HOST_VALIDATE_NOTE, + "Skipped - No PCI devices are online"); + return VIR_HOST_VALIDATE_FAILURE(VIR_HOST_VALIDATE_NOTE); + } virHostMsgPass(); } else { virHostMsgFail(level, -- 2.31.1

2 1

[PATCH v5 0/3] remove sysconfig files
by Olaf Hering 17 Dec '21

17 Dec '21

fix path to sysconfig file in NEWS.rst (jfehlig) rebased to 85574319952af2cf538d185bd58e4ed3edc7a3e8 Olaf Hering (3): libvirt.spec: relocate pre script of daemon-driver-qemu remove sysconfig files NEWS: mention removal of sysconfig NEWS.rst | 10 +++ docs/daemons.rst | 20 +++++ docs/remote.html.in | 6 +- libvirt.spec.in | 99 +++++++++++++++++-------- src/ch/meson.build | 5 -- src/ch/virtchd.service.in | 1 + src/ch/virtchd.sysconf | 3 - src/interface/meson.build | 5 -- src/interface/virtinterfaced.service.in | 1 + src/interface/virtinterfaced.sysconf | 3 - src/libxl/meson.build | 5 -- src/libxl/virtxend.service.in | 1 + src/libxl/virtxend.sysconf | 3 - src/locking/meson.build | 5 -- src/locking/virtlockd.service.in | 1 + src/locking/virtlockd.sysconf | 3 - src/logging/meson.build | 5 -- src/logging/virtlogd.sysconf | 3 - src/lxc/meson.build | 5 -- src/lxc/virtlxcd.service.in | 1 + src/lxc/virtlxcd.sysconf | 3 - src/meson.build | 16 ---- src/network/meson.build | 5 -- src/network/virtnetworkd.service.in | 1 + src/network/virtnetworkd.sysconf | 3 - src/node_device/meson.build | 5 -- src/node_device/virtnodedevd.service.in | 1 + src/node_device/virtnodedevd.sysconf | 3 - src/nwfilter/meson.build | 5 -- src/nwfilter/virtnwfilterd.service.in | 1 + src/nwfilter/virtnwfilterd.sysconf | 3 - src/qemu/meson.build | 5 -- src/qemu/virtqemud.service.in | 7 ++ src/qemu/virtqemud.sysconf | 12 --- src/remote/libvirtd.service.in | 7 ++ src/remote/libvirtd.sysconf | 21 ------ src/remote/meson.build | 10 --- src/remote/virtproxyd.service.in | 1 + src/remote/virtproxyd.sysconf | 3 - src/secret/meson.build | 5 -- src/secret/virtsecretd.service.in | 1 + src/secret/virtsecretd.sysconf | 3 - src/storage/meson.build | 5 -- src/storage/virtstoraged.service.in | 1 + src/storage/virtstoraged.sysconf | 3 - src/vbox/meson.build | 5 -- src/vbox/virtvboxd.service.in | 1 + src/vbox/virtvboxd.sysconf | 3 - src/vz/meson.build | 5 -- src/vz/virtvzd.service.in | 1 + src/vz/virtvzd.sysconf | 3 - tools/libvirt-guests.sh.in | 40 ++++++++++ tools/libvirt-guests.sysconf | 50 ------------- tools/meson.build | 6 -- 54 files changed, 167 insertions(+), 262 deletions(-) delete mode 100644 src/ch/virtchd.sysconf delete mode 100644 src/interface/virtinterfaced.sysconf delete mode 100644 src/libxl/virtxend.sysconf delete mode 100644 src/locking/virtlockd.sysconf delete mode 100644 src/logging/virtlogd.sysconf delete mode 100644 src/lxc/virtlxcd.sysconf delete mode 100644 src/network/virtnetworkd.sysconf delete mode 100644 src/node_device/virtnodedevd.sysconf delete mode 100644 src/nwfilter/virtnwfilterd.sysconf delete mode 100644 src/qemu/virtqemud.sysconf delete mode 100644 src/remote/libvirtd.sysconf delete mode 100644 src/remote/virtproxyd.sysconf delete mode 100644 src/secret/virtsecretd.sysconf delete mode 100644 src/storage/virtstoraged.sysconf delete mode 100644 src/vbox/virtvboxd.sysconf delete mode 100644 src/vz/virtvzd.sysconf delete mode 100644 tools/libvirt-guests.sysconf

3 6

[PATCH 0/4] vsh-table: Various small improvements
by Michal Privoznik 17 Dec '21

17 Dec '21

*** BLURB HERE *** Michal Prívozník (4): vshtabletest: Fix potential memleak vsh-table: Hide vshTableRow typedef vsh-table.h: Modernize declarations vsh-table: Ensure NULL terminated arguments to vshTable*() tests/vshtabletest.c | 6 ++++-- tools/vsh-table.c | 1 + tools/vsh-table.h | 22 ++++++++++++++++------ 3 files changed, 21 insertions(+), 8 deletions(-) -- 2.32.0

2 5

[PATCH v2 0/6] qemu: Explicitly forbid live changing nodeset for strict numatune
by Michal Privoznik 17 Dec '21

17 Dec '21

v2 of: https://listman.redhat.com/archives/libvir-list/2021-December/msg00708.html diff to v1: - Wrote documentation, per Pavel's request - Wrote a completer Michal Prívozník (6): manpages: Document 'restrictive' mode for numatune virsh-completer: Provide completer for numatune --mode qemu: Allow VIR_DOMAIN_NUMATUNE_MEM_RESTRICTIVE in qemuDomainSetNumaParamsLive() qemu: Explicitly forbid live changing nodeset for strict numatune qemu_command: do use host-nodes for system memory NEWS: Document recent numatune change NEWS.rst | 8 ++++ docs/formatdomain.rst | 3 ++ docs/manpages/virsh.rst | 10 ++--- src/libvirt-domain.c | 7 ++++ src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 37 +++++++++++++------ .../numatune-system-memory.x86_64-latest.args | 2 +- tools/virsh-completer-domain.c | 20 ++++++++++ tools/virsh-completer-domain.h | 5 +++ tools/virsh-domain.c | 1 + 10 files changed, 76 insertions(+), 20 deletions(-) -- 2.32.0

4 10

[PATCH] qemucapabilitiesdata: Fix command name in caps_3.0.0.ppc64.replies
by Michal Privoznik 17 Dec '21

17 Dec '21

Under the qemucapabilitiesdata we have a replies file for QEMU-3.0.0.ppc64. At least we think so. In fact, the file contains replies from a development snapshot release that predates 3.0.0 (specifically it's v2.12.0-1689-g518d23a) and as such does not reflect any change that was made to QEMU after the snapshot and before the official relase. One of such changes was renaming 'exit-preconfig' command to 'x-exit-preconfig' (QEMU commit v3.0.0-rc1~21^2~3). Ideally, we would just regenerate capabilities using the official release but since this is a PPC64 machine and pretty old version anyway let's just fix the command name. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index 3df67b71de..c12ee7814e 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -1296,7 +1296,7 @@ "arg-type": "0" }, { - "name": "exit-preconfig", + "name": "x-exit-preconfig", "ret-type": "0", "allow-oob": false, "allow-preconfig": true, @@ -12327,7 +12327,7 @@ "name": "system_wakeup" }, { - "name": "exit-preconfig" + "name": "x-exit-preconfig" }, { "name": "cont" -- 2.32.0

2 1

[PATCH] qemuGetSEVInfoToParams: Reformat to standard coding style
by Peter Krempa 16 Dec '21

16 Dec '21

The function was formatted weirdly which prompted additions to conform to the unusual style. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bae8b7c39b..372e1360b5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19901,30 +19901,30 @@ qemuGetSEVInfoToParams(virQEMUCaps *qemuCaps, virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); if (virTypedParamsAddString(&sevParams, &n, &maxpar, - VIR_NODE_SEV_PDH, sev->pdh) < 0) + VIR_NODE_SEV_PDH, sev->pdh) < 0) return -1; if (virTypedParamsAddString(&sevParams, &n, &maxpar, - VIR_NODE_SEV_CERT_CHAIN, sev->cert_chain) < 0) + VIR_NODE_SEV_CERT_CHAIN, sev->cert_chain) < 0) goto cleanup; if (virTypedParamsAddUInt(&sevParams, &n, &maxpar, - VIR_NODE_SEV_CBITPOS, sev->cbitpos) < 0) + VIR_NODE_SEV_CBITPOS, sev->cbitpos) < 0) goto cleanup; if (virTypedParamsAddUInt(&sevParams, &n, &maxpar, - VIR_NODE_SEV_REDUCED_PHYS_BITS, - sev->reduced_phys_bits) < 0) + VIR_NODE_SEV_REDUCED_PHYS_BITS, + sev->reduced_phys_bits) < 0) goto cleanup; if (virTypedParamsAddUInt(&sevParams, &n, &maxpar, - VIR_NODE_SEV_MAX_GUESTS, - sev->max_guests) < 0) + VIR_NODE_SEV_MAX_GUESTS, + sev->max_guests) < 0) goto cleanup; if (virTypedParamsAddUInt(&sevParams, &n, &maxpar, - VIR_NODE_SEV_MAX_ES_GUESTS, - sev->max_es_guests) < 0) + VIR_NODE_SEV_MAX_ES_GUESTS, + sev->max_es_guests) < 0) goto cleanup; *params = g_steal_pointer(&sevParams); -- 2.31.1

2 1