June 2026 - Devel - libvirt List Archives

[PATCH v3 00/35] monitor: turn QMP and HMP into QOM objects
by Daniel P. Berrangé 19 Jun '26

19 Jun '26

Conceptually -object and object_add/object_del should be sufficient for essentially all QEMU configuration....if only we ported all our internal custom backends/devices/etc to QOM. That is of course a big job which is why it hasn't happened. This series started with the premise that the monitor is one of the easier areas to convert since we have no more than three classes, a common base, and QMP and HMP subclasses[1]. So why not give it a go and thus unlock the ability to dynamically create/delete monitors in QMP/HMP. This series does the conversion in a great many small steps to better understand the implications at each stage. The high level outcome of this series is * HMP and QMP monitors are QOM objects, 'monitor-hmp' and 'monitor-qmp' respectively * Both can be cold plugged and hot plugged. QMP only, can also be hot unplugged. * '-mon' is obsolete, deprecated and replaced by '-object', but -monitor, -qmp and kept as high level syntax sugar * QMP gains a concept of "close-action" which makes it possible to mark a monitor for auto-delete. The monitor hot-unplug code and the qtest and functional testing code is heavily derived from a series sent by Christian Brauner which proposed new monitor_add/monitor_del commands: https://lists.nongnu.org/archive/html/qemu-devel/2026-04/msg01349.html I left Christian's authorship & SoB on the patches which were derived from his code, though the code has been refactored quite a bit in places, so bugs are quite possibly my own. Note that Christian's series allowed the use of "monitor_del" commands against the current monitor session. ie a client could delete the very monitor it was using. This is an awkward concept as it needs special casing to delay the deletion to happen in the background, such that that the QMP response to 'monitor_del' could still be sent back. This also left the chardev was orphaned as there's no way to run 'chardev_dev' in that usage pattern. To provide an alternative mechanism to address the same use case, this series introduces the 'close-action' concept mentioned above, that allows hotplugging a monitor to service a specific task, with the monitor being purged when the script closes its connection. This avoids the special casing that an explicit "self deletion" paradigm required. While supporting hotplug of HMP was trivial, I didn't do any work to think about hotunplug of HMP, since IMHO it is of limited value given HMP's typical use cases. [1] ~~~ we did all this not because it was easy, but because we thought it would be easy ~~~ Changed in v3: - Removed unused 'dead' struct field - Make use of 'setup_pending' struct field across BH - Add missing free of chardev_id - Add missnig ERRP_GUARD in monitor_new_qmp - Misc docs typos / rephrasing - Moved docs patch to the end - Fixed docs about the default QOM ID naming for legacy monitor syntax - Fixed random sleep time calculation in tests Christian Brauner (6): monitor: convert from oneshot BH to persistent BH monitor: reject attempts to delete the current monitor monitor: protect qemu_chr_fe_accept_input with monitor lock monitor: implement support for deleting QMP objects tests/qtest: add tests for dynamic monitor add/remove tests/functional: add e2e test for dynamic QMP monitor hotplug Daniel P. Berrangé (29): qom: replace 'can_be_deleted' with 'prepare_delete' monitor: replace 'common' with 'parent_obj' in MonitorHMP monitor: replace 'common' with 'parent_obj' in MonitorQMP monitor: rename monitor_init* to monitor_new* monitor: minimal conversion of monitors to QOM monitor: add 'chardev' property to Monitor base class monitor: add 'readline' property to HMP Monitor class monitor: add 'pretty' property to QMP Monitor class monitor: remove 'skip_flush' field monitor: move monitor_data_(init|destroy) into QOM init/finalize monitor: use class methods for monitor_vprintf monitor: use class methods for monitor_qapi_event_emit monitor: use class methods for monitor_accept_input monitor: use class method for I/O thread request monitor: use dynamic cast in monitor_qmp_requests_pop_any_with_lock util: use dynamic cast in error vreport monitor: drop unused monitor_cur_is_qmp monitor: use dynamic cast in QMP commands monitor: use dynamic cast in monitor_is_hmp_non_interactive monitor: drop unused monitor_is_qmp method monitor: eliminate monitor_is_hmp_non_interactive method monitor: implement "user creatable" interface for adding monitors tests/functional: add a stress test for monitor hot unplug qom: add method for getting the "id" of a QOM object qom: add trace events for user creatable create/delete APIs monitor: add support for auto-deleting monitors upon close tests: switch from -mon to -object monitor-qmp qemu-options: document new monitor-hmp and monitor-qmp objects docs: mark '-mon' as deprecated in favour of -object MAINTAINERS | 1 + backends/cryptodev.c | 10 +- backends/hostmem.c | 5 +- backends/iommufd.c | 10 +- block/throttle-groups.c | 10 +- chardev/char.c | 3 +- docs/about/deprecated.rst | 10 + docs/devel/writing-monitor-commands.rst | 4 +- docs/system/arm/xenpvh.rst | 4 +- docs/system/i386/xen.rst | 3 +- docs/system/i386/xenpvh.rst | 4 +- event-loop-base.c | 8 +- gdbstub/system.c | 4 +- include/monitor/monitor.h | 23 +- include/qom/object.h | 10 + include/qom/object_interfaces.h | 26 +- include/system/event-loop-base.h | 2 +- migration/migration-hmp-cmds.c | 5 +- monitor/hmp-cmds.c | 7 +- monitor/hmp.c | 181 +++++++++-- monitor/monitor-internal.h | 73 +++-- monitor/monitor.c | 262 +++++++-------- monitor/qmp-cmds-control.c | 12 +- monitor/qmp-cmds.c | 14 +- monitor/qmp.c | 303 +++++++++++++++--- net/can/can_core.c | 5 +- python/qemu/machine/machine.py | 4 +- qapi/qom.json | 62 ++++ qemu-options.hx | 57 +++- qom/object.c | 17 + qom/object_interfaces.c | 20 +- qom/trace-events | 5 + storage-daemon/qemu-storage-daemon.c | 2 +- stubs/monitor-core.c | 5 - stubs/monitor-internal.c | 3 +- system/vl.c | 12 +- tests/functional/generic/meson.build | 1 + .../generic/test_monitor_hotplug.py | 277 ++++++++++++++++ tests/qemu-iotests/245 | 4 +- tests/qtest/libqtest.c | 2 +- tests/qtest/qmp-test.c | 174 ++++++++++ tests/unit/test-util-sockets.c | 1 - tools/qemu-vnc/stubs.c | 5 - ui/ui-hmp-cmds.c | 2 +- util/error-report.c | 13 +- util/main-loop.c | 5 +- 46 files changed, 1343 insertions(+), 327 deletions(-) create mode 100755 tests/functional/generic/test_monitor_hotplug.py -- 2.54.0

2 43

[PATCH 1/1] qemu: stop silently narrowing the guest CPU during live migration
by Denis V. Lunev 18 Jun '26

18 Jun '26

qemuDomainMakeCPUMigratable() strips features marked added='yes' (in src/cpu_map/x86_*.xml) from the migration cookie when the source CPU was specified as host-model. The intent was libvirt-protocol compat with older destinations; the cost is guest CPU compat, paid silently on every migration. Every Intel x86 CPU model from Westmere through Sapphire Rapids carries 60+ added='yes' features, including vmx-exit-load-perf-global-ctrl and vmx-entry-load-perf-global-ctrl that control the LOAD_IA32_PERF_GLOBAL_CTRL allowed-1 bits of MSR_IA32_VMX_{EXIT,ENTRY}_CTLS. A host-model live migration on any of these models drops those features from the destination's qemu argv. Modern qemu gates the nested VMX capability MSRs on the explicit -cpu list, so the guest's MSR view shifts. Linux distributions that load kvm_intel by default snapshot those MSRs at module-load time and validate every newly online CPU against that snapshot. An automated test that boots a guest, live-migrates it, and hot-plugs additional vCPUs reliably trips kvm_intel: Inconsistent VMCS config on CPU N kvm: enabling virtualization on CPUN failed smpboot: CPU N is now offline the guest agent's online attempt returns -EIO and the hot-plug fails. Live migration must preserve the guest's CPU specification bit for bit -- this is a hard contract, not an optimisation target. Drop the strip. If a destination libvirt does not know a feature in the cookie, its parser rejects the migration with a precise unknown-feature error: operators can upgrade or narrow the source CPU definition. Either is visible; the status quo is not. This effectively reverts 14d3517410 ("qemu: domain: Drop added features from migratable CPU") together with its follow-up aae8a5774b ("qemu: Drop vmx-* from migratable CPU model only when origCPU is set"), and removes the now-unused origCPU plumbing in qemuDomainMakeCPUMigratable() and its callers. Signed-off-by: Denis V. Lunev <den(a)openvz.org> --- src/qemu/qemu_domain.c | 46 ++------------------------------ src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_migration_cookie.c | 5 +--- 3 files changed, 4 insertions(+), 50 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 84c8645259..eccd279bbe 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5307,36 +5307,10 @@ qemuDomainDefCopy(virQEMUDriver *driver, } -typedef struct { - const char * const *added; - GStrv keep; -} qemuDomainDropAddedCPUFeaturesData; - - -static bool -qemuDomainDropAddedCPUFeatures(const char *name, - virCPUFeaturePolicy policy G_GNUC_UNUSED, - void *opaque) -{ - qemuDomainDropAddedCPUFeaturesData *data = opaque; - - if (!g_strv_contains(data->added, name)) - return true; - - if (data->keep && g_strv_contains((const char **) data->keep, name)) - return true; - - return false; -} - - int qemuDomainMakeCPUMigratable(virArch arch, - virCPUDef *cpu, - virCPUDef *origCPU) + virCPUDef *cpu) { - qemuDomainDropAddedCPUFeaturesData data = { 0 }; - if (cpu->mode != VIR_CPU_MODE_CUSTOM || !cpu->model || !ARCH_IS_X86(arch)) @@ -5353,22 +5327,6 @@ qemuDomainMakeCPUMigratable(virArch arch, virCPUDefUpdateFeature(cpu, "pconfig", VIR_CPU_FEATURE_DISABLE); } - if (origCPU) { - if (virCPUx86GetAddedFeatures(cpu->model, &data.added) < 0) - return -1; - - /* Drop features marked as added in a cpu model, but only - * when they are not mentioned in origCPU, i.e., when they were not - * explicitly mentioned by the user. - */ - if (data.added) { - g_auto(GStrv) keep = virCPUDefListExplicitFeatures(origCPU); - data.keep = keep; - - virCPUDefFilterFeatures(cpu, qemuDomainDropAddedCPUFeatures, &data); - } - } - return 0; } @@ -5569,7 +5527,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriver *driver, } if (def->cpu && - qemuDomainMakeCPUMigratable(def->os.arch, def->cpu, origCPU) < 0) + qemuDomainMakeCPUMigratable(def->os.arch, def->cpu) < 0) return -1; /* Old libvirt doesn't understand <audio> elements so diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b321a64e96..0600af8b7c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1066,8 +1066,7 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net, int qemuDomainMakeCPUMigratable(virArch arch, - virCPUDef *cpu, - virCPUDef *origCPU); + virCPUDef *cpu); int qemuDomainInitializePflashStorageSource(virDomainObj *vm, diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 7311a8294b..ebc2072ab0 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -535,15 +535,12 @@ static int qemuMigrationCookieAddCPU(qemuMigrationCookie *mig, virDomainObj *vm) { - qemuDomainObjPrivate *priv = vm->privateData; - if (mig->cpu) return 0; mig->cpu = virCPUDefCopy(vm->def->cpu); - if (qemuDomainMakeCPUMigratable(vm->def->os.arch, mig->cpu, - priv->origCPU) < 0) + if (qemuDomainMakeCPUMigratable(vm->def->os.arch, mig->cpu) < 0) return -1; mig->flags |= QEMU_MIGRATION_COOKIE_CPU; -- 2.51.0

4 7

[PATCH 0/2] qemu: Fix error reporting when QEMU capability probing fails
by Peter Krempa 18 Jun '26

18 Jun '26

See both patches for explanation and examples. Peter Krempa (2): qemuProcessQMPStop: Preserve error when killing qemu used for capability probing virQEMUCapsLogProbeFailure: Reraise error with more information src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_process.c | 4 ++++ 2 files changed, 8 insertions(+) -- 2.54.0

2 3

[PATCH v2 00/35] monitor: turn QMP and HMP into QOM objects
by Daniel P. Berrangé 18 Jun '26

18 Jun '26

Conceptually -object and object_add/object_del should be sufficient for essentially all QEMU configuration....if only we ported all our internal custom backends/devices/etc to QOM. That is of course a big job which is why it hasn't happened. This series started with the premise that the monitor is one of the easier areas to convert since we have no more than three classes, a common base, and QMP and HMP subclasses[1]. So why not give it a go and thus unlock the ability to dynamically create/delete monitors in QMP/HMP. This series does the conversion in a great many small steps to better understand the implications at each stage. The high level outcome of this series is * HMP and QMP monitors are QOM objects, 'monitor-hmp' and 'monitor-qmp' respectively * Both can be cold plugged and hot plugged. QMP only, can also be hot unplugged. * '-mon' is obsolete, deprecated and replaced by '-object', but -monitor, -qmp and kept as high level syntax sugar * QMP gains a concept of "close-action" which makes it possible to mark a monitor for auto-delete. The monitor hot-unplug code and the qtest and functional testing code is heavily derived from a series sent by Christian Brauner which proposed new monitor_add/monitor_del commands: https://lists.nongnu.org/archive/html/qemu-devel/2026-04/msg01349.html I left Christian's authorship & SoB on the patches which were derived from his code, though the code has been refactored quite a bit in places, so bugs are quite possibly my own. Christian, if you prefer any changes in attribution here let me know. Note that Christian's series allowed the use of "monitor_del" commands against the current monitor session. ie a client could delete the very monitor it was using. This is an awkward concept as it needs special casing to delay the deletion to happen in the background, such that that the QMP response to 'monitor_del' could still be sent back. This also left the chardev was orphaned as there's no way to run 'chardev_dev' in that usage pattern. To provide an alternative mechanism to address the same use case, this series introduces the 'close-action' concept mentioned above, that allows hotplugging a monitor to service a specific task, with the monitor being purged when the script closes its connection. This avoids the special casing that an explicit "self deletion" paradigm required. While supporting hotplug of HMP was trivial, I didn't do any work to think about hotunplug of HMP, since IMHO it is of limited value given HMP's typical use cases. While -mon is deprecated in favour of -object, given '-mon' is such a significant CLI option, it is likely wise to not remove it as quickly as our deprecation policy would otherwise allow given the disruption that's liable to cause. It isn't a big burden to keep it around for a long time. [1] ~~~ we did all this not because it was easy, but because we thought it would be easy ~~~ Christian Brauner (6): monitor: convert from oneshot BH to persistent BH monitor: reject attempts to delete the current monitor monitor: protect qemu_chr_fe_accept_input with monitor lock monitor: implement support for deleting QMP objects tests/qtest: add tests for dynamic monitor add/remove tests/functional: add e2e test for dynamic QMP monitor hotplug Daniel P. Berrangé (29): qom: replace 'can_be_deleted' with 'prepare_delete' monitor: replace 'common' with 'parent_obj' in MonitorHMP monitor: replace 'common' with 'parent_obj' in MonitorQMP monitor: rename monitor_init* to monitor_new* monitor: minimal conversion of monitors to QOM monitor: add 'chardev' property to Monitor base class monitor: add 'readline' property to HMP Monitor class monitor: add 'pretty' property to QMP Monitor class monitor: remove 'skip_flush' field monitor: move monitor_data_(init|destroy) into QOM init/finalize monitor: use class methods for monitor_vprintf monitor: use class methods for monitor_qapi_event_emit monitor: use class methods for monitor_accept_input monitor: use class method for I/O thread request monitor: use dynamic cast in monitor_qmp_requests_pop_any_with_lock util: use dynamic cast in error vreport monitor: drop unused monitor_cur_is_qmp monitor: use dynamic cast in QMP commands monitor: use dynamic cast in monitor_is_hmp_non_interactive monitor: drop unused monitor_is_qmp method monitor: eliminate monitor_is_hmp_non_interactive method monitor: implement "user creatable" interface for adding monitors qemu-options: document new monitor-hmp and monitor-qmp objects tests/functional: add a stress test for monitor hot unplug qom: add method for getting the "id" of a QOM object qom: add trace events for user creatable create/delete APIs monitor: add support for auto-deleting monitors upon close tests: switch from -mon to -object monitor-qmp docs: mark '-mon' as deprecated in favour of -object MAINTAINERS | 1 + backends/cryptodev.c | 10 +- backends/hostmem.c | 5 +- backends/iommufd.c | 10 +- block/throttle-groups.c | 10 +- chardev/char.c | 3 +- docs/about/deprecated.rst | 10 + docs/devel/writing-monitor-commands.rst | 4 +- docs/system/arm/xenpvh.rst | 4 +- docs/system/i386/xen.rst | 3 +- docs/system/i386/xenpvh.rst | 4 +- event-loop-base.c | 8 +- gdbstub/system.c | 4 +- include/monitor/monitor.h | 23 +- include/qom/object.h | 10 + include/qom/object_interfaces.h | 26 +- include/system/event-loop-base.h | 2 +- migration/migration-hmp-cmds.c | 5 +- monitor/hmp-cmds.c | 7 +- monitor/hmp.c | 181 +++++++++-- monitor/monitor-internal.h | 74 +++-- monitor/monitor.c | 261 +++++++-------- monitor/qmp-cmds-control.c | 12 +- monitor/qmp-cmds.c | 14 +- monitor/qmp.c | 301 +++++++++++++++--- net/can/can_core.c | 5 +- python/qemu/machine/machine.py | 4 +- qapi/qom.json | 62 ++++ qemu-options.hx | 53 ++- qom/object.c | 17 + qom/object_interfaces.c | 20 +- qom/trace-events | 5 + storage-daemon/qemu-storage-daemon.c | 2 +- stubs/monitor-core.c | 5 - stubs/monitor-internal.c | 3 +- system/vl.c | 12 +- tests/functional/generic/meson.build | 1 + .../generic/test_monitor_hotplug.py | 275 ++++++++++++++++ tests/qemu-iotests/245 | 4 +- tests/qtest/libqtest.c | 2 +- tests/qtest/qmp-test.c | 174 ++++++++++ tests/unit/test-util-sockets.c | 1 - tools/qemu-vnc/stubs.c | 5 - ui/ui-hmp-cmds.c | 2 +- util/error-report.c | 13 +- util/main-loop.c | 5 +- 46 files changed, 1335 insertions(+), 327 deletions(-) create mode 100755 tests/functional/generic/test_monitor_hotplug.py -- 2.54.0

2 76

[PATCH 0/3] lxc: Misc cleanups
by Michal Privoznik 18 Jun '26

18 Jun '26

While reviewing Radoslaw's patched [1] I've noticed some opportunities for improvement. 1: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/2HH7… Michal Prívozník (3): lxc: Drop pointless g_free() from virLXCProcessStart() lxc: Don't leak @veth in lxcDomainAttachDeviceNetLive() lxc: Rework cleanup section in lxcDomainAttachDeviceNetLive() src/lxc/lxc_driver.c | 30 ++++++++++++++---------------- src/lxc/lxc_process.c | 1 - 2 files changed, 14 insertions(+), 17 deletions(-) -- 2.53.0

2 4

[PATCH] virsh: Make --type argument of detach-interface optional
by Michal Privoznik 18 Jun '26

18 Jun '26

From: Michal Privoznik <mprivozn(a)redhat.com> The detach-interface virsh command requires domain (obviously) and --type to identify <interface/>. Optionally, --mac can be provided to chose from multiple interfaces. Well, that renders --type argument redundant. I mean, if there are but unique MACs within domain XML, then interface type is implied. If there are duplicate MACs then --type can help to differentiate, though at that point detach-device seems like a better fit. Long story short, make --type optional. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/manpages/virsh.rst | 2 +- tools/virsh-domain.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 39d91d8375..2992495ecb 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -5586,7 +5586,7 @@ detach-interface :: - detach-interface domain type [--mac mac] + detach-interface domain [--type type] [--mac mac] [[[--live] [--config] | [--current]] | [--persistent]] [--print-xml] Detach a network interface from a domain. diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f9de3b42a9..8a6f868e34 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12782,7 +12782,6 @@ static const vshCmdOptDef opts_detach_interface[] = { {.name = "type", .type = VSH_OT_STRING, .positional = true, - .required = true, .help = N_("network interface type") }, {.name = "mac", @@ -12816,7 +12815,7 @@ virshDomainDetachInterface(char *doc, g_autoptr(xmlDoc) xml = NULL; g_autoptr(xmlXPathContext) ctxt = NULL; g_autofree char *detach_xml = NULL; - g_autofree char *xpath = g_strdup_printf("/domain/devices/interface[@type='%s']", type); + g_autofree char *xpath = NULL; g_autofree xmlNodePtr *nodes = NULL; ssize_t nnodes; xmlNodePtr matchNode = NULL; @@ -12827,8 +12826,16 @@ virshDomainDetachInterface(char *doc, return false; } + if (type) + xpath = g_strdup_printf("/domain/devices/interface[@type='%s']", type); + else + xpath = g_strdup("/domain/devices/interface"); + if ((nnodes = virXPathNodeSet(xpath, ctxt, &nodes)) <= 0) { - vshError(ctl, _("No interface found whose type is %1$s"), type); + if (type) + vshError(ctl, _("No interface found whose type is %1$s"), type); + else + vshError(ctl, "%s", _("Domain has no interfaces")); return false; } -- 2.53.0

2 1

Plans for 12.5.0 release (freeze on 2026-06-25)
by Jiri Denemark 18 Jun '26

18 Jun '26

We are getting close to 12.5.0 release of libvirt. To aim for the release on Wednesday 01 Jul I suggest entering the freeze on Thursday 25 Jun and tagging RC2 on Monday 29 Jun. I hope this works for everyone. Jirka

1 0

[PATCH v2 0/2] lxc: Assign aliases to filesystem and network devices
by rsmigiel＠redhat.com 17 Jun '26

17 Jun '26

From: Radoslaw Smigielski <rsmigiel(a)redhat.com> This series adds device alias assignment for filesystem and network interface devices in LXC domains, make them working the same way like console devices. This is needed as a prerequisite for fixing bug #63 (loop device path length limitation), where device aliases will be used to compose synthetic lo_file_name references in the format "libvirt-$UUID-$DEVALIAS". It split this patch into two separate commits, filesystem and network related. -- 2.54.0

2 4

[PATCH] docs/uri.rst: document ext transport argv parameter
by Mark Cave-Ayland 17 Jun '26

17 Jun '26

This new parameter was added as part of commit ee06a78790 ("remote: allow passing argv to the ext transport"). Signed-off-by: Mark Cave-Ayland <mark.caveayland(a)nutanix.com> --- docs/uri.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/uri.rst b/docs/uri.rst index cc970001f4..48eda49308 100644 --- a/docs/uri.rst +++ b/docs/uri.rst @@ -1,3 +1,5 @@ +.. role:: since + =============== Connection URIs =============== @@ -326,6 +328,9 @@ Supported extra parameters: ``command`` The external command launched to tunnel the data to the destination. + ``argv`` :since:`(since 12.5.0)` + An optional parameter to be passed to the external command. ``argv`` may be + specified multiple times to pass multiple arguments. ``tcp`` transport ^^^^^^^^^^^^^^^^^ -- 2.43.0

2 1

[PATCH] ci: refresh with 'lcitool manifest'
by Michal Privoznik 17 Jun '26

17 Jun '26

From: Michal Privoznik <mprivozn(a)redhat.com> Switch from openSUSE Leap 15.5 to 16.0. Not just CI build job, but also codestyle_job which runs on Leap too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/2607661514 .gitlab-ci.yml | 6 +++--- .../{opensuse-leap-15.sh => opensuse-leap-16.sh} | 11 +++-------- ...p-15.Dockerfile => opensuse-leap-16.Dockerfile} | 14 ++++---------- ci/gitlab/builds.yml | 9 ++++----- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 4 +--- 6 files changed, 17 insertions(+), 31 deletions(-) rename ci/buildenv/{opensuse-leap-15.sh => opensuse-leap-16.sh} (88%) rename ci/containers/{opensuse-leap-15.Dockerfile => opensuse-leap-16.Dockerfile} (86%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6de867e1f2..e79da09443 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,14 +108,14 @@ codestyle_job: stage: sanity_checks extends: .gitlab_native_build_job needs: - - job: x86_64-opensuse-leap-15-container + - job: x86_64-opensuse-leap-16-container optional: true script: - source ci/jobs.sh - run_codestyle variables: - NAME: opensuse-leap-15 - TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.5 + NAME: opensuse-leap-16 + TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:16.0 # This artifact published by this job is downloaded to push to Weblate # for translation usage: diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-16.sh similarity index 88% rename from ci/buildenv/opensuse-leap-15.sh rename to ci/buildenv/opensuse-leap-16.sh index 55d9fe5974..be9aca1aa2 100644 --- a/ci/buildenv/opensuse-leap-15.sh +++ b/ci/buildenv/opensuse-leap-16.sh @@ -6,7 +6,6 @@ function install_buildenv() { zypper update -y - zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports… zypper install -y --allow-downgrade \ audit-devel \ augeas \ @@ -18,7 +17,6 @@ function install_buildenv() { clang-devel \ codespell \ cpp \ - cppi \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ @@ -64,19 +62,17 @@ function install_buildenv() { perl-base \ pkgconfig \ python3-base \ + python3-black \ python3-docutils \ python3-flake8 \ - python3-pip \ python3-pytest \ - python3-setuptools \ - python3-wheel \ qemu-tools \ readline-devel \ rpm-build \ - sanlock-devel \ sed \ systemd-rpm-macros \ - systemtap-sdt-devel \ + systemtap-dtrace \ + systemtap-headers \ wireshark-devel \ xen-devel rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED @@ -85,7 +81,6 @@ function install_buildenv() { ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - /usr/bin/pip3 install black } export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-16.Dockerfile similarity index 86% rename from ci/containers/opensuse-leap-15.Dockerfile rename to ci/containers/opensuse-leap-16.Dockerfile index 8857f35ce0..7d1680f464 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-16.Dockerfile @@ -4,10 +4,9 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.opensuse.org/opensuse/leap:15.6 +FROM registry.opensuse.org/opensuse/leap:16.0 RUN zypper update -y && \ - zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backports… && \ zypper install -y --allow-downgrade \ audit-devel \ augeas \ @@ -19,7 +18,6 @@ RUN zypper update -y && \ clang-devel \ codespell \ cpp \ - cppi \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ @@ -65,19 +63,17 @@ RUN zypper update -y && \ perl-base \ pkgconfig \ python3-base \ + python3-black \ python3-docutils \ python3-flake8 \ - python3-pip \ python3-pytest \ - python3-setuptools \ - python3-wheel \ qemu-tools \ readline-devel \ rpm-build \ - sanlock-devel \ sed \ systemd-rpm-macros \ - systemtap-sdt-devel \ + systemtap-dtrace \ + systemtap-headers \ wireshark-devel \ xen-devel && \ zypper clean --all && \ @@ -88,8 +84,6 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN /usr/bin/pip3 install black - ENV CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" ENV LANG="en_US.UTF-8" ENV MAKE="/usr/bin/make" diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index c11c834f60..65bec6d0f8 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -198,17 +198,16 @@ x86_64-fedora-rawhide-clang: TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:rawhide -x86_64-opensuse-leap-15: +x86_64-opensuse-leap-16: extends: .native_build_job needs: - - job: x86_64-opensuse-leap-15-container + - job: x86_64-opensuse-leap-16-container optional: true allow_failure: false variables: - CFLAGS: -Wno-missing-include-dirs - NAME: opensuse-leap-15 + NAME: opensuse-leap-16 RPM: skip - TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.6 + TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:16.0 x86_64-opensuse-tumbleweed: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index a4b9a5f03b..0c62956277 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -84,11 +84,11 @@ x86_64-fedora-rawhide-container: NAME: fedora-rawhide -x86_64-opensuse-leap-15-container: +x86_64-opensuse-leap-16-container: extends: .container_job allow_failure: false variables: - NAME: opensuse-leap-15 + NAME: opensuse-leap-16 x86_64-opensuse-tumbleweed-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 67a53bb3d2..0bf6d93798 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -161,13 +161,11 @@ targets: allow-failure: true builds: false - opensuse-leap-15: + opensuse-leap-16: jobs: - arch: x86_64 variables: RPM: skip - # Keep until fix for: https://bugzilla.opensuse.org/show_bug.cgi?id=1216862 - CFLAGS: -Wno-missing-include-dirs opensuse-tumbleweed: jobs: -- 2.53.0

2 1