[libvirt PATCH] .gitlab-ci.yml: Fix Leap 15.4 codestyle job
by Erik Skultety
Commit a3cc0e9ceb3e forgot to tweak the codestyle job so that we refer
to Leap 15.4 as Leap 15 (with the recent change in lcitool). However,
it was easy to miss as that job is not managed by the manifest.
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a36c0ef18..2378b1a39f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,10 +118,10 @@ codestyle_prebuilt_env:
- .codestyle_job
- .gitlab_native_build_job_prebuilt_env
needs:
- - job: x86_64-opensuse-leap-154-container
+ - job: x86_64-opensuse-leap-15-container
optional: true
variables:
- NAME: opensuse-leap-154
+ NAME: opensuse-leap-15
codestyle_local_env:
extends:
@@ -129,7 +129,7 @@ codestyle_local_env:
- .gitlab_native_build_job_local_env
variables:
IMAGE: registry.opensuse.org/opensuse/leap:15.4
- NAME: opensuse-leap-154
+ NAME: opensuse-leap-15
# This artifact published by this job is downloaded to push to Weblate
--
2.40.1
2 years
[libvirt PATCH 0/4] ci: Update to latest lcitool, drop Fedora 36 & add Fedora 38
by Erik Skultety
This depends on the corresponding changes in libvirt-perl and libvirt-python:
https://gitlab.com/libvirt/libvirt-perl/-/merge_requests/92
https://gitlab.com/libvirt/libvirt-python/-/merge_requests/114
Once those are in, I'll provide a link to a fresh libvirt proof pipeline.
Erik Skultety (4):
ci: Add Fedora 38 target
ci: Drop Fedora 36 target
ci: Flip mingw jobs from Fedora 37 to Fedora 38
ci: integration: Flip QEMU upstream integration tests to Fedora 38
...-mingw32.sh => fedora-38-cross-mingw32.sh} | 0
...-mingw64.sh => fedora-38-cross-mingw64.sh} | 0
ci/buildenv/{fedora-36.sh => fedora-38.sh} | 0
...ile => fedora-38-cross-mingw32.Dockerfile} | 2 +-
...ile => fedora-38-cross-mingw64.Dockerfile} | 2 +-
...ora-36.Dockerfile => fedora-38.Dockerfile} | 2 +-
ci/gitlab/builds.yml | 76 ++++++-------
ci/gitlab/containers.yml | 22 ++--
ci/integration.yml | 104 +++++++++---------
ci/manifest.yml | 17 +--
10 files changed, 113 insertions(+), 112 deletions(-)
rename ci/buildenv/{fedora-37-cross-mingw32.sh => fedora-38-cross-mingw32.sh} (100%)
rename ci/buildenv/{fedora-37-cross-mingw64.sh => fedora-38-cross-mingw64.sh} (100%)
rename ci/buildenv/{fedora-36.sh => fedora-38.sh} (100%)
rename ci/containers/{fedora-37-cross-mingw32.Dockerfile => fedora-38-cross-mingw32.Dockerfile} (98%)
rename ci/containers/{fedora-37-cross-mingw64.Dockerfile => fedora-38-cross-mingw64.Dockerfile} (98%)
rename ci/containers/{fedora-36.Dockerfile => fedora-38.Dockerfile} (98%)
--
2.40.0
2 years
[PATCH] qemu: hotplug: Reorder setup of disk backend metadata
by Peter Krempa
The regular VM startup code first calls the setup of the disk backing
chain as defined in the XML and then calls the function to load the
rest of the backing chain from the image metadata. The hotplug code
did it the other way around, thus causing a failure when attempting
to attach a QCOW2 image via FD passing.
Reorder the hotplug code to have the same order.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2193315
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_hotplug.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 8c14540275..54b5a2c2c9 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -921,9 +921,6 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
if (virDomainDiskTranslateSourcePool(disk) < 0)
goto cleanup;
- if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) < 0)
- goto cleanup;
-
for (i = 0; i < vm->def->ndisks; i++) {
if (virDomainDiskDefCheckDuplicateInfo(vm->def->disks[i], disk) < 0)
goto cleanup;
@@ -1007,6 +1004,9 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0)
goto cleanup;
+ if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) < 0)
+ goto cleanup;
+
if (qemuHotplugAttachManagedPR(vm, disk->src, VIR_ASYNC_JOB_NONE) < 0)
goto cleanup;
--
2.40.0
2 years
[libvirt PATCH 0/5] meson: Introduce initconfdir option
by Andrea Bolognani
Makes things nicer for those using distros that are not
derived from RHEL or SUSE.
Andrea Bolognani (5):
meson: Introduce initconfdir option
meson: Use initconfdir
rpm: Set initconfdir explicitly
meson: Move definition of os_release
meson: Improve initconfdir defaults
docs/manpages/libvirt-guests.rst | 2 +-
docs/manpages/meson.build | 1 +
libvirt.spec.in | 1 +
meson.build | 20 +++++++++++++++++++-
meson_options.txt | 1 +
src/ch/virtchd.service.in | 2 +-
src/interface/virtinterfaced.service.in | 2 +-
src/libxl/virtxend.service.in | 2 +-
src/locking/virtlockd.service.in | 2 +-
src/logging/virtlogd.service.in | 2 +-
src/lxc/virtlxcd.service.in | 2 +-
src/meson.build | 1 +
src/network/virtnetworkd.service.in | 2 +-
src/node_device/virtnodedevd.service.in | 2 +-
src/nwfilter/virtnwfilterd.service.in | 2 +-
src/qemu/virtqemud.service.in | 2 +-
src/remote/libvirtd.service.in | 2 +-
src/remote/virtproxyd.service.in | 2 +-
src/secret/virtsecretd.service.in | 2 +-
src/storage/virtstoraged.service.in | 2 +-
src/vbox/virtvboxd.service.in | 2 +-
src/vz/virtvzd.service.in | 2 +-
tools/libvirt-guests.service.in | 2 +-
tools/libvirt-guests.sh.in | 5 +++--
tools/meson.build | 1 +
tools/virt-pki-validate.in | 13 +++++++------
26 files changed, 52 insertions(+), 27 deletions(-)
--
2.40.1
2 years
[libvirt PATCH] util: Improve comment for workaround
by Andrea Bolognani
Now that a version of GLib that contains the fix has been
released, it's more useful to record that information. Adding
a TODO annotation makes the whole thing easily greppable.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/util/virfile.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/util/virfile.c b/src/util/virfile.c
index 657e74e026..228482e8f8 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -1747,8 +1747,7 @@ virFindFileInPath(const char *file)
return NULL;
/* Workaround for a bug in g_find_program_in_path() not returning absolute
- * path as documented. This has been fixed in
- * https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2127
+ * path as documented. TODO drop it once we require GLib >= 2.69.0
*/
return g_canonicalize_filename(path, NULL);
}
--
2.40.1
2 years
[PATCH] qemu: Fix error message
by Andrea Bolognani
The spelling is slightly different from another otherwise
identical error message in the same file.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Pushed as trivial.
src/qemu/qemu_dbus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c
index db47e4b5ba..7a7af2850e 100644
--- a/src/qemu/qemu_dbus.c
+++ b/src/qemu/qemu_dbus.c
@@ -252,7 +252,7 @@ qemuDBusStart(virQEMUDriver *driver,
if (!virFileExists(sockpath)) {
virReportError(VIR_ERR_OPERATION_TIMEOUT,
- _("DBus daemon %1$s didn't show up"),
+ _("dbus-daemon %1$s didn't show up"),
cfg->dbusDaemonName);
goto cleanup;
}
--
2.40.1
2 years
[PATCH 0/1] fix risc-v QEMU domains in non-RISC-V hosts
by Daniel Henrique Barboza
Hi,
For some reason didn't notice this was broken until recently. We're
missing an API in the RISC-V CPU driver to allow QEMU TCG risc-v domains
to run in non-native hosts.
Daniel Henrique Barboza (1):
cpu_riscv64.c: add update() implementation
src/cpu/cpu_riscv64.c | 28 +++++++++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
--
2.40.0
2 years
[libvirt PATCH] meson: Fix qemu_{user,group} defaults for Arch
by Andrea Bolognani
The current values might have been accurate at the time
when the logic was introduced, but these days Arch is
using the same ones as Debian.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
Proof that I'm not making this up:
https://github.com/archlinux/svntogit-community/blob/83e66277ba6e08968496...
meson.build | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index bad13c0c9d..09c3ab00f4 100644
--- a/meson.build
+++ b/meson.build
@@ -1614,20 +1614,18 @@ if not get_option('driver_qemu').disabled()
qemu_group = 'wheel'
else
os_release = run_command('grep', '-E', '^ID(_LIKE)*=', '/etc/os-release', check: false).stdout()
- if os_release.contains('arch')
- qemu_user = 'nobody'
- qemu_group = 'nobody'
# RHEL and CentOS both have ID_LIKE=fedora, SLES has ID_LIKE=suse
- elif (os_release.contains('fedora') or
- os_release.contains('gentoo') or
- os_release.contains('suse'))
+ if (os_release.contains('fedora') or
+ os_release.contains('gentoo') or
+ os_release.contains('suse'))
qemu_user = 'qemu'
qemu_group = 'qemu'
# Ubuntu has ID_LIKE=debian so we need to handle it first
elif os_release.contains('ubuntu')
qemu_user = 'libvirt-qemu'
qemu_group = 'kvm'
- elif os_release.contains('debian')
+ elif (os_release.contains('arch') or
+ os_release.contains('debian'))
qemu_user = 'libvirt-qemu'
qemu_group = 'libvirt-qemu'
else
--
2.40.1
2 years
