October 2024 - Devel - Libvirt List Archives

[PATCH 0/9] qemu: Change CPU comparison algorithm for future models

by Jiri Denemark

When starting a domain we check whether the guest CPU definition is compatible with the host (i.e., when the host supports all features required both explicitly and by the specified CPU model) as long as check == 'partial', which is the default. We are doing so by checking our definition of the CPU model in the CPU map amending it with explicitly mentioned features and comparing it to features QEMU would enabled when started with -cpu host. But since our CPU model definitions often slightly differ from QEMU we may be checking features which are not actually needed and on the other hand not checking something that is part of the CPU model in QEMU. This patch changes the algorithm for CPU models added in the future (changing it for existing models could cause them to suddenly become incompatible with the host and domains using them would fail to start). The new algorithm uses information we probe from QEMU about features that block each model from being directly usable. If all those features are explicitly disabled in the CPU definition we consider the base model compatible with the host. Then we only need to check that all explicitly required features are supported by QEMU on the host to get the result for the whole CPU definition. After this we only use the model definitions (for newly added models) from CPU map for creating a CPU definition for host-model. Jiri Denemark (9): cpu_x86: Introduce <check> element for CPU models cpu_map: Use compat partial check for all x86 CPU models cpu: Introduce virCPUGetCheckMode qemu: Use g_autoptr in qemuConnectCompareHypervisorCPU qemu: Use virCPUCompare in qemuConnectCompareHypervisorCPU directly qemu: Separate partial CPU check into a function cpu: Introduce virCPUCompareUnusable qemu_capabilities: Introduce virQEMUCapsGetCPUBlockers qemu: Change CPU comparison algorithm for future models src/cpu/cpu.c | 104 ++++++++++++++++++ src/cpu/cpu.h | 17 +++ src/cpu/cpu_x86.c | 67 +++++++++++ src/cpu_map/x86_486.xml | 1 + src/cpu_map/x86_Broadwell-IBRS.xml | 1 + src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Broadwell-noTSX.xml | 1 + src/cpu_map/x86_Broadwell.xml | 1 + src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 1 + src/cpu_map/x86_Cascadelake-Server.xml | 1 + src/cpu_map/x86_Conroe.xml | 1 + src/cpu_map/x86_Cooperlake.xml | 1 + src/cpu_map/x86_Dhyana.xml | 1 + src/cpu_map/x86_EPYC-Genoa.xml | 1 + src/cpu_map/x86_EPYC-IBPB.xml | 1 + src/cpu_map/x86_EPYC-Milan.xml | 1 + src/cpu_map/x86_EPYC-Rome.xml | 1 + src/cpu_map/x86_EPYC.xml | 1 + src/cpu_map/x86_GraniteRapids.xml | 1 + src/cpu_map/x86_Haswell-IBRS.xml | 1 + src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Haswell-noTSX.xml | 1 + src/cpu_map/x86_Haswell.xml | 1 + src/cpu_map/x86_Icelake-Client-noTSX.xml | 1 + src/cpu_map/x86_Icelake-Client.xml | 1 + src/cpu_map/x86_Icelake-Server-noTSX.xml | 1 + src/cpu_map/x86_Icelake-Server.xml | 1 + src/cpu_map/x86_IvyBridge-IBRS.xml | 1 + src/cpu_map/x86_IvyBridge.xml | 1 + src/cpu_map/x86_Nehalem-IBRS.xml | 1 + src/cpu_map/x86_Nehalem.xml | 1 + src/cpu_map/x86_Opteron_G1.xml | 1 + src/cpu_map/x86_Opteron_G2.xml | 1 + src/cpu_map/x86_Opteron_G3.xml | 1 + src/cpu_map/x86_Opteron_G4.xml | 1 + src/cpu_map/x86_Opteron_G5.xml | 1 + src/cpu_map/x86_Penryn.xml | 1 + src/cpu_map/x86_SandyBridge-IBRS.xml | 1 + src/cpu_map/x86_SandyBridge.xml | 1 + src/cpu_map/x86_SapphireRapids.xml | 1 + src/cpu_map/x86_SierraForest.xml | 1 + src/cpu_map/x86_Skylake-Client-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Client.xml | 1 + src/cpu_map/x86_Skylake-Server-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 1 + src/cpu_map/x86_Skylake-Server.xml | 1 + src/cpu_map/x86_Snowridge.xml | 1 + src/cpu_map/x86_Westmere-IBRS.xml | 1 + src/cpu_map/x86_Westmere.xml | 1 + src/cpu_map/x86_athlon.xml | 1 + src/cpu_map/x86_core2duo.xml | 1 + src/cpu_map/x86_coreduo.xml | 1 + src/cpu_map/x86_cpu64-rhel5.xml | 1 + src/cpu_map/x86_cpu64-rhel6.xml | 1 + src/cpu_map/x86_kvm32.xml | 1 + src/cpu_map/x86_kvm64.xml | 1 + src/cpu_map/x86_n270.xml | 1 + src/cpu_map/x86_pentium.xml | 1 + src/cpu_map/x86_pentium2.xml | 1 + src/cpu_map/x86_pentium3.xml | 1 + src/cpu_map/x86_pentiumpro.xml | 1 + src/cpu_map/x86_phenom.xml | 1 + src/cpu_map/x86_qemu32.xml | 1 + src/cpu_map/x86_qemu64.xml | 1 + src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 38 +++++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_domain.c | 65 +++++++++++ src/qemu/qemu_domain.h | 7 ++ src/qemu/qemu_driver.c | 45 ++++---- src/qemu/qemu_process.c | 7 +- 72 files changed, 390 insertions(+), 28 deletions(-) -- 2.47.0

8 hours, 42 minutes

1
8
0 / 0

[PATCH 1/9] cpu_x86: Introduce <check> element for CPU models

by Jiri Denemark

CPU models in the CPU map may be marked with <check partial="compat"/> to indicate a backward compatible partial check (comparing our definition of the model with the host CPU) should be performed. Other models will be checked using just runnability info from QEMU. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 7cf158e25b..70893f8a62 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -150,6 +150,7 @@ struct _virCPUx86Model { char *name; bool decodeHost; bool decodeGuest; + bool compatCheck; virCPUx86Vendor *vendor; virCPUx86Signatures *signatures; virCPUx86Data data; @@ -1463,6 +1464,36 @@ x86ModelCompare(virCPUx86Model *model1, } +static int +x86ModelParseCheck(virCPUx86Model *model, + xmlXPathContextPtr ctxt) +{ + g_autofree char *check = NULL; + int rc; + + if ((rc = virXPathBoolean("boolean(./check)", ctxt)) <= 0) + return rc; + + check = virXPathString("string(./check/@partial)", ctxt); + if (!check) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing check/@partial in CPU model %1$s"), + model->name); + return -1; + } + + if (STRNEQ(check, "compat")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid check/@partial value '%1$s' in CPU model %2$s"), + check, model->name); + return -1; + } + + model->compatCheck = true; + return 0; +} + + static int x86ModelParseDecode(virCPUx86Model *model, xmlXPathContextPtr ctxt) @@ -1693,6 +1724,9 @@ x86ModelParse(xmlXPathContextPtr ctxt, model = g_new0(virCPUx86Model, 1); model->name = g_strdup(name); + if (x86ModelParseCheck(model, ctxt) < 0) + return -1; + if (x86ModelParseDecode(model, ctxt) < 0) return -1; -- 2.47.0

8 hours, 42 minutes

1
0
0 / 0

[PATCH] qemu: Give the users possibility to overwrite temp files for <transient\> disk

by Peter Krempa

Normally when starting up a VM with a transient disk, if the file libvirt would use as the temp overlay for the original disk image exists libvirt will not touch it and fail startup. This is done in order to avoid any potential removal of user files if they manage to create a colliding filename. In case when the user doesn't want the above behaviour this patch' introduces a 'overwriteTemp' attribute for the '<transient/>' element which allows users to opt into simply removing the file before the next start. Closes: https://gitlab.com/libvirt/libvirt/-/issues/684 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/formatdomain.rst | 7 +++++++ src/conf/domain_conf.c | 7 +++++++ src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 +++++ src/qemu/qemu_snapshot.c | 17 +++++++++++++---- .../disk-transient.x86_64-latest.xml | 2 +- tests/qemuxmlconfdata/disk-transient.xml | 2 +- 7 files changed, 35 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index e6f09a728f..ab2fccdd97 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3479,6 +3479,13 @@ paravirtualized driver is specified via the ``disk`` element. ``shareBacking`` attribute should be set to ``yes``. Note that hypervisor drivers may need to hotplug such disk and thus it works only with configurations supporting hotplug. :since:`Since 7.4.0` + + Hypervisors may need to store a temporary file containing the data written + by the domain while running, which may be stored in the same location + as the original source of the disk. Note that in some cases the temporary + file can't be cleaned up (e.g. when the domain is not shutdown before the host). + An optional attribute ``overwriteTemp`` set to ``yes`` (:since:`Since 10.10`) + indicates that the hypervisor may overwrite the file rather than fail startup. ``serial`` If present, this specify serial number of virtual hard drive. For example, it may look like ``<serial>WD-WMAP9A966149</serial>``. Not supported for diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6d7dee7956..359591d8f7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8240,6 +8240,11 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, VIR_XML_PROP_NONE, &def->transientShareBacking) < 0) return NULL; + + if (virXMLPropTristateBool(transientNode, "overwriteTemp", + VIR_XML_PROP_NONE, + &def->transientOverwriteTemp) < 0) + return NULL; } if (virDomainDiskDefIotuneParse(def, ctxt) < 0) @@ -23233,6 +23238,8 @@ virDomainDiskDefFormat(virBuffer *buf, virBufferAddLit(&childBuf, "<transient"); if (def->transientShareBacking == VIR_TRISTATE_BOOL_YES) virBufferAddLit(&childBuf, " shareBacking='yes'"); + if (def->transientOverwriteTemp == VIR_TRISTATE_BOOL_YES) + virBufferAddLit(&childBuf, " overwriteTemp='yes'"); virBufferAddLit(&childBuf, "/>\n"); } virBufferEscapeString(&childBuf, "<serial>%s</serial>\n", def->serial); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a15af4fae3..169c626584 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -569,6 +569,7 @@ struct _virDomainDiskDef { virDomainStartupPolicy startupPolicy; bool transient; virTristateBool transientShareBacking; + virTristateBool transientOverwriteTemp; virDomainDeviceInfo info; virTristateBool rawio; virDomainDeviceSGIO sgio; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index efb5f00d77..cd87e83410 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -1618,6 +1618,11 @@ <ref name='virYesNo'/> </attribute> </optional> + <optional> + <attribute name="overwriteTemp"> + <ref name='virYesNo'/> + </attribute> + </optional> <empty/> </element> </optional> diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 1187ebf276..b8ca045900 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1287,10 +1287,19 @@ qemuSnapshotGetTransientDiskDef(virDomainDiskDef *domdisk, domdisk->src->path, suffix); if (virFileExists(snapdisk->src->path)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("Overlay file '%1$s' for transient disk '%2$s' already exists"), - snapdisk->src->path, domdisk->dst); - return NULL; + if (domdisk->transientOverwriteTemp == VIR_TRISTATE_BOOL_YES) { + if (unlink(snapdisk->src->path) != 0) { + virReportSystemError(errno, + _("Failed to delete overlay file '%1$s' for transient disk '%2$s'"), + snapdisk->src->path, domdisk->dst); + return NULL; + } + } else { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("Overlay file '%1$s' for transient disk '%2$s' already exists"), + snapdisk->src->path, domdisk->dst); + return NULL; + } } return g_steal_pointer(&snapdisk); diff --git a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml index aab5894447..5f8f15f714 100644 --- a/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml +++ b/tests/qemuxmlconfdata/disk-transient.x86_64-latest.xml @@ -21,7 +21,7 @@ <driver name='qemu' type='qcow2' cache='none'/> <source file='/tmp/QEMUGuest2.img'/> <target dev='vda' bus='virtio'/> - <transient shareBacking='yes'/> + <transient shareBacking='yes' overwriteTemp='yes'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </disk> <disk type='file' device='disk'> diff --git a/tests/qemuxmlconfdata/disk-transient.xml b/tests/qemuxmlconfdata/disk-transient.xml index edd65a0da0..722f1f9a92 100644 --- a/tests/qemuxmlconfdata/disk-transient.xml +++ b/tests/qemuxmlconfdata/disk-transient.xml @@ -18,7 +18,7 @@ <driver name='qemu' type='qcow2' cache='none'/> <source file='/tmp/QEMUGuest2.img'/> <target dev='vda' bus='virtio'/> - <transient shareBacking='yes'/> + <transient shareBacking='yes' overwriteTemp='yes'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> -- 2.47.0

12 hours, 5 minutes

2
1
0 / 0

[PATCH] NEWS: Fix naming of DISK_DETECT_ZEROES migration parameter

by Michal Privoznik

There's a typo in NEWS.rst where VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES has the _ZEROES suffix duplicated referring to a non-existent migration parameter. Drop the suffix. Fixes: 2e29ab3269701535f71cf56cc51165e7eeb1e49f Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Merged as trivial. NEWS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.rst b/NEWS.rst index f9a0d11896..56adf8df8b 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -25,7 +25,7 @@ v10.9.0 (unreleased) has no access to the allocation state of blocks at the cost of CPU overhead. This feature is available via the ``--migrate-disks-detect-zeroes`` option - for ``virsh migrate`` or ``VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES_ZEROES`` + for ``virsh migrate`` or ``VIR_MIGRATE_PARAM_MIGRATE_DISKS_DETECT_ZEROES`` migration parameter. See the documentation for caveats. * **Improvements** -- 2.45.2

12 hours, 26 minutes

1
0
0 / 0

[PATCH 0/4] virbitmap: Fix buffer overflow when shrinking a bitmap and copying it

by Peter Krempa

See patches for rationale. Peter Krempa (4): virBitmapNewCopy: Honor sizes of either bitmap when doing memcpy() virbitmap: Extract and reuse buffer size calculation into a function util: virbitmap: Extract clearing of unused bits at the end of the last unit util: bitmap: Rewrite virBitmapShrink using new helpers src/util/virbitmap.c | 84 +++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 44 deletions(-) -- 2.47.0

14 hours, 43 minutes

2
4
0 / 0

[PATCH 1/4] virBitmapNewCopy: Honor sizes of either bitmap when doing memcpy()

by Peter Krempa

'virBitmapNewCopy()' allocates a new bitmap with the same number of bits but uses the internal allocation length as argument for the memcpy() operation to copy the bits. Due to bugs in other code these may not be the same resulting into a buffer overflow if the source is over-allocated. Use the buffer length of the target bitmap instead. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virbitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index b8d0352bb1..a1a8c5d126 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -582,7 +582,7 @@ virBitmapNewCopy(virBitmap *src) { virBitmap *dst = virBitmapNew(src->nbits); - memcpy(dst->map, src->map, src->map_len * sizeof(src->map[0])); + memcpy(dst->map, src->map, dst->map_len * sizeof(src->map[0])); return dst; } -- 2.47.0

15 hours, 12 minutes

1
0
0 / 0

[PATCH 0/2] Hyper-V feature fixes

by Martin Kletzander

I wrote so many good commit messages today, leave me alone. Martin Kletzander (2): qemu: Add more translations to virQEMUCapsCPUFeatureTranslationTable qemu: Do not hardcode Hyper-V feature names on command line src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_command.c | 22 +++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) -- 2.47.0

1 day, 4 hours

1
2
0 / 0

[PATCH 00/20] qemu: support mapped-ram+directio+mulitfd

by Jim Fehlig

This series is essentially V1 of a prior RFC [1] to support QEMU's mapped-ram stream format [2] and migration capability. Along with supporting mapped-ram, it implements a design approach we discussed for supporting parallel save/restore [3]. In summary, the approach is 1. Add mapped-ram migration capability 2. Steal an element from save header 'unused' for a 'features' variable and bump save version to 3. 3. Add /etc/libvirt/qemu.conf knob for the save format version, defaulting to latest v3 4. Use v3 (aka mapped-ram) by default 5. Use mapped-ram with BYPASS_CACHE for v3, old approach for v2 6. include: Define constants for parallel save/restore 7. qemu: Add support for parallel save. Implies mapped-ram, reject if v2 8. qemu: Add support for parallel restore. Implies mapped-ram. Reject if v2 9. tools: add parallel parameter to virsh save command 10. tools: add parallel parameter to virsh restore command With this series, saving and restoring using mapped-ram is enabled by default if the underlying QEMU advertises the mapped-ram migration capability. It can be disabled by changing the 'save_image_version' setting in qemu.conf. To use mapped-ram with QEMU: - The 'mapped-ram' migration capability must be set to true - The 'multifd' migration capability must be set to true and the 'multifd-channels' migration parameter must set to a value >= 1 - QEMU must be provided an fdset containing the migration fd(s) - The 'migrate' qmp command is invoked with a URI referencing the fdset and an offset where to start reading or writing the data stream, e.g. {"execute":"migrate", "arguments":{"detach":true,"resume":false, "uri":"file:/dev/fdset/0,offset=0x11921"}} The mapped-ram stream, in conjunction with direct IO and multifd, can significantly improve the time required to save VM memory state. The following tables compare mapped-ram with the existing, sequential save stream. In all cases, the save and restore operations are to/from a block device comprised of two NVMe disks in RAID0 configuration with xfs (~8600MiB/s). The values in the 'save time' and 'restore time' columns were scraped from the 'real' time reported by time(1). The 'Size' and 'Blocks' columns were provided by the corresponding outputs of stat(1). VM: 32G RAM, 1 vcpu, idle (shortly after boot) | save | restore | | time | time | Size | Blocks -----------------------+---------+---------+--------------+-------- legacy | 6.193s | 4.399s | 985744812 | 1925288 -----------------------+---------+---------+--------------+-------- mapped-ram | 5.109s | 1.176s | 34368554354 | 1774472 -----------------------+---------+---------+--------------+-------- legacy + direct IO | 5.725s | 4.512s | 985765251 | 1925328 -----------------------+---------+---------+--------------+-------- mapped-ram + direct IO | 4.627s | 1.490s | 34368554354 | 1774304 -----------------------+---------+---------+--------------+-------- mapped-ram + direct IO | | | | + multifd-channels=8 | 4.421s | 0.845s | 34368554318 | 1774312 ------------------------------------------------------------------- VM: 32G RAM, 30G dirty, 1 vcpu in tight loop dirtying memory | save | restore | | time | time | Size | Blocks -----------------------+---------+---------+--------------+--------- legacy | 25.800s | 14.332s | 33154309983 | 64754512 -----------------------+---------+---------+--------------+--------- mapped-ram | 18.742s | 15.027s | 34368559228 | 64617160 -----------------------+---------+---------+--------------+--------- legacy + direct IO | 13.115s | 18.050s | 33154310496 | 64754520 -----------------------+---------+---------+--------------+--------- mapped-ram + direct IO | 13.623s | 15.959s | 34368557392 | 64662040 -----------------------+-------- +---------+--------------+--------- mapped-ram + direct IO | | | | + multifd-channels=8 | 6.994s | 6.470s | 34368554980 | 64665776 -------------------------------------------------------------------- As can be seen from the tables, one caveat of mapped-ram is the logical file size of a saved image is basically equivalent to the VM memory size. Note however that mapped-ram typically uses fewer blocks on disk. Support for mapped-ram+direct-io only recently landed in upstream QEMU and will first appear in the 9.1 release, which may complicate merging support in libvirt. Specifically, I'm not sure how to detect if the combination is supported by QEMU. Suggestions welcomed. Similar to the RFC, V1 ignores compression. libvirt currently supports compression by connecting the output of QEMU's save stream to the specified compression program via a pipe. This approach is incompatible with mapped-ram since the fd provided to QEMU must be seekable. In general, we can consider mapped-ram and compression incompatible and document they cannot be used together. [1] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/E... [2] https://gitlab.com/qemu-project/qemu/-/blob/master/docs/devel/migration/m... [3] https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/K... Claudio Fontana (2): include: Define constants for parallel save/restore tools: add parallel parameter to virsh restore command Jim Fehlig (17): lib: virDomainSaveParams: Ensure absolute save path qemu_fd: Add function to retrieve fdset ID qemu: Add function to check capability in migration params qemu: Add function to get bool value from migration params qemu: Add mapped-ram migration capability qemu: Add function to get migration params for save qemu: QEMU_SAVE_VERSION: Bump to version 3 qemu: conf: Add setting for save image version qemu: Add helper function for creating save image fd qemu: Add support for mapped-ram on save qemu: Decompose qemuSaveImageOpen qemu: Move creation of qemuProcessIncomingDef struct qemu: Apply migration parameters in qemuMigrationDstRun qemu: Add support for mapped-ram on restore qemu: Support O_DIRECT with mapped-ram on save qemu: Support O_DIRECT with mapped-ram on restore qemu: Add support for parallel save and restore Li Zhang (1): tools: add parallel parameter to virsh save command docs/manpages/virsh.rst | 9 +- include/libvirt/libvirt-domain.h | 13 ++ src/libvirt-domain.c | 52 +++++-- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf.in | 6 + src/qemu/qemu_conf.c | 16 +++ src/qemu/qemu_conf.h | 5 + src/qemu/qemu_driver.c | 104 +++++++++----- src/qemu/qemu_fd.c | 18 +++ src/qemu/qemu_fd.h | 3 + src/qemu/qemu_migration.c | 192 +++++++++++++++++-------- src/qemu/qemu_migration.h | 9 +- src/qemu/qemu_migration_params.c | 86 ++++++++++++ src/qemu/qemu_migration_params.h | 17 +++ src/qemu/qemu_monitor.c | 39 ++++++ src/qemu/qemu_monitor.h | 5 + src/qemu/qemu_process.c | 120 +++++++++++----- src/qemu/qemu_process.h | 19 ++- src/qemu/qemu_saveimage.c | 216 ++++++++++++++++++++--------- src/qemu/qemu_saveimage.h | 35 +++-- src/qemu/qemu_snapshot.c | 26 ++-- src/qemu/test_libvirtd_qemu.aug.in | 1 + tools/virsh-domain.c | 79 +++++++++-- 23 files changed, 827 insertions(+), 244 deletions(-) -- 2.35.3

1 day, 4 hours

1
20
0 / 0

[PATCH] ci: refresh with 'lcitool manifest'

by Daniel P. Berrangé

Major changes: * macOS 13 is removed. Cirrus CI now only supports a single version, macOS 14, so there is no addition of macOS 15 possible. * The polkit lcitool mapping is renamed to pkcheck * The polkit package is renamed on Debian & Ubuntu Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- ci/buildenv/debian-12-cross-aarch64.sh | 2 +- ci/buildenv/debian-12-cross-armv6l.sh | 2 +- ci/buildenv/debian-12-cross-armv7l.sh | 2 +- ci/buildenv/debian-12-cross-i686.sh | 2 +- ci/buildenv/debian-12-cross-mips64el.sh | 2 +- ci/buildenv/debian-12-cross-mipsel.sh | 2 +- ci/buildenv/debian-12-cross-ppc64le.sh | 2 +- ci/buildenv/debian-12-cross-s390x.sh | 2 +- ci/buildenv/debian-12.sh | 2 +- ci/buildenv/debian-sid-cross-aarch64.sh | 2 +- ci/buildenv/debian-sid-cross-armv6l.sh | 2 +- ci/buildenv/debian-sid-cross-armv7l.sh | 2 +- ci/buildenv/debian-sid-cross-i686.sh | 2 +- ci/buildenv/debian-sid-cross-mips64el.sh | 2 +- ci/buildenv/debian-sid-cross-ppc64le.sh | 2 +- ci/buildenv/debian-sid-cross-s390x.sh | 2 +- ci/buildenv/debian-sid.sh | 2 +- ci/buildenv/opensuse-leap-15.sh | 1 + ci/buildenv/ubuntu-2204.sh | 2 +- ci/buildenv/ubuntu-2404.sh | 2 +- ci/cirrus/macos-13.vars | 16 ---------------- .../debian-12-cross-aarch64.Dockerfile | 2 +- .../debian-12-cross-armv6l.Dockerfile | 2 +- .../debian-12-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-12-cross-i686.Dockerfile | 2 +- .../debian-12-cross-mips64el.Dockerfile | 2 +- .../debian-12-cross-mipsel.Dockerfile | 2 +- .../debian-12-cross-ppc64le.Dockerfile | 2 +- ci/containers/debian-12-cross-s390x.Dockerfile | 2 +- ci/containers/debian-12.Dockerfile | 2 +- .../debian-sid-cross-aarch64.Dockerfile | 2 +- .../debian-sid-cross-armv6l.Dockerfile | 2 +- .../debian-sid-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-sid-cross-i686.Dockerfile | 2 +- .../debian-sid-cross-mips64el.Dockerfile | 2 +- .../debian-sid-cross-ppc64le.Dockerfile | 2 +- .../debian-sid-cross-s390x.Dockerfile | 2 +- ci/containers/debian-sid.Dockerfile | 2 +- ci/containers/opensuse-leap-15.Dockerfile | 1 + ci/containers/ubuntu-2204.Dockerfile | 2 +- ci/containers/ubuntu-2404.Dockerfile | 2 +- ci/gitlab/builds.yml | 18 +----------------- ci/lcitool/projects/libvirt.yml | 2 +- ci/manifest.yml | 7 ------- 44 files changed, 42 insertions(+), 79 deletions(-) delete mode 100644 ci/cirrus/macos-13.vars diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh index 93288ae46f..b4a056d940 100644 --- a/ci/buildenv/debian-12-cross-aarch64.sh +++ b/ci/buildenv/debian-12-cross-aarch64.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh index 37e743478d..07ffb3da37 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-12-cross-armv6l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh index 1b8e4f7019..6f88f6cc06 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-12-cross-armv7l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh index 060b6ea75e..5da816d086 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-12-cross-i686.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh index 6da5920d1d..09c445758c 100644 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ b/ci/buildenv/debian-12-cross-mips64el.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh index 5ad809c625..a762d1e3b8 100644 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ b/ci/buildenv/debian-12-cross-mipsel.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh index eca66706fc..fe7b672799 100644 --- a/ci/buildenv/debian-12-cross-ppc64le.sh +++ b/ci/buildenv/debian-12-cross-ppc64le.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh index 65dc4ce545..1ca0768d14 100644 --- a/ci/buildenv/debian-12-cross-s390x.sh +++ b/ci/buildenv/debian-12-cross-s390x.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index d06f33af12..fcd5291f22 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -74,7 +74,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index 93288ae46f..b4a056d940 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index f19ec82093..53d2d79b38 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 4ebf3126e3..4e60877e77 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 43c02e784e..98e08b2397 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index 6da5920d1d..09c445758c 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index eca66706fc..fe7b672799 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 65dc4ce545..1ca0768d14 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -40,7 +40,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index d06f33af12..fcd5291f22 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -74,7 +74,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh index 2a1c1e2314..add707c752 100644 --- a/ci/buildenv/opensuse-leap-15.sh +++ b/ci/buildenv/opensuse-leap-15.sh @@ -6,6 +6,7 @@ function install_buildenv() { zypper update -y + zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backpor... zypper install -y \ audit-devel \ augeas \ diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2204.sh index 95762d663c..e581ce6012 100644 --- a/ci/buildenv/ubuntu-2204.sh +++ b/ci/buildenv/ubuntu-2204.sh @@ -75,7 +75,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/ubuntu-2404.sh b/ci/buildenv/ubuntu-2404.sh index 5ce8e74a91..8e459cbb25 100644 --- a/ci/buildenv/ubuntu-2404.sh +++ b/ci/buildenv/ubuntu-2404.sh @@ -75,7 +75,7 @@ function install_buildenv() { open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-13.vars deleted file mode 100644 index d23fe3cd47..0000000000 --- a/ci/cirrus/macos-13.vars +++ /dev/null @@ -1,16 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -CCACHE='/opt/homebrew/bin/ccache' -CPAN_PKGS='' -CROSS_PKGS='' -MAKE='/opt/homebrew/bin/gmake' -NINJA='/opt/homebrew/bin/ninja' -PACKAGING_COMMAND='brew' -PIP3='/opt/homebrew/bin/pip3' -PKGS='augeas bash-completion black ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep json-c libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline' -PYPI_PKGS='pytest' -PYTHON='/opt/homebrew/bin/python3' diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile index e57cbffaec..f4d587177b 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-12-cross-aarch64.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile index 9572f4d28f..d8f2a3bc42 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-12-cross-armv6l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile index e29eea8a6b..1abfb79931 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-12-cross-armv7l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile index 39f5e9ef8d..5681121d80 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-12-cross-i686.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile index af15c9c76a..a4f2aabe10 100644 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ b/ci/containers/debian-12-cross-mips64el.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile index 63caa15b20..a3f0652818 100644 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ b/ci/containers/debian-12-cross-mipsel.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile index 6c6e747120..caf8229a8e 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile index 4e124ca26a..c4f8479c13 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-12-cross-s390x.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index 682f8217f4..3e6d0597e2 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 1932a7cfbe..3a06f01c5c 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index bd7b1a12a3..fdf129aa04 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index a0ee83d25b..8dbb705d69 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index b2f96a6c03..f856306a62 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index bcb24e13ff..468c5fbc3e 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 66180dcb1e..37c256fe1e 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 5f9fbc8ffd..232a8d7844 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -42,7 +42,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 87aee59bbd..febd286d86 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -76,7 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index 38160bf7dc..952799aede 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -7,6 +7,7 @@ FROM registry.opensuse.org/opensuse/leap:15.6 RUN zypper update -y && \ + zypper addrepo -fc https://download.opensuse.org/update/leap/15.6/backports/openSUSE:Backpor... && \ zypper install -y \ audit-devel \ augeas \ diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2204.Dockerfile index 18555693d1..dc69a7d4df 100644 --- a/ci/containers/ubuntu-2204.Dockerfile +++ b/ci/containers/ubuntu-2204.Dockerfile @@ -77,7 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/ubuntu-2404.Dockerfile b/ci/containers/ubuntu-2404.Dockerfile index b2f461b629..ecccfc637a 100644 --- a/ci/containers/ubuntu-2404.Dockerfile +++ b/ci/containers/ubuntu-2404.Dockerfile @@ -77,7 +77,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ open-iscsi \ perl-base \ pkgconf \ - policykit-1 \ + polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 214119b902..771fa67501 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -624,28 +624,12 @@ x86_64-freebsd-14: UPGRADE_COMMAND: pkg upgrade -y -aarch64-macos-13: - extends: .cirrus_build_job - needs: [] - allow_failure: false - variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest - CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_INSTANCE_TYPE: macos_instance - INSTALL_COMMAND: brew install - NAME: macos-13 - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - UPDATE_COMMAND: brew update - UPGRADE_COMMAND: brew upgrade - - aarch64-macos-14: extends: .cirrus_build_job needs: [] allow_failure: false variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-runner:sonoma CIRRUS_VM_IMAGE_SELECTOR: image CIRRUS_VM_INSTANCE_TYPE: macos_instance INSTALL_COMMAND: brew install diff --git a/ci/lcitool/projects/libvirt.yml b/ci/lcitool/projects/libvirt.yml index 9f8fc06ce4..aa0dc5924a 100644 --- a/ci/lcitool/projects/libvirt.yml +++ b/ci/lcitool/projects/libvirt.yml @@ -63,8 +63,8 @@ packages: - numad - openwsman - perl + - pkcheck - pkg-config - - polkit - portablexdr - python3 - python3-docutils diff --git a/ci/manifest.yml b/ci/manifest.yml index 647510ed2f..43b9995717 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -203,13 +203,6 @@ targets: variables: RPM: skip - macos-13: - jobs: - - arch: aarch64 - variables: - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - macos-14: jobs: - arch: aarch64 -- 2.46.0

1 day, 11 hours

1
0
0 / 0

[PATCH v2] lxc: fix variable storage order before call

by Adam Julis

virDomainConfNWFilterInstantiate() was called without updated net->ifname, it caused in some cases throwing error message. If function failed, change is reverted. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/658 Signed-off-by: Adam Julis <ajulis(a)redhat.com> --- src/lxc/lxc_process.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 205ab96ebb..0233d17f4e 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -271,6 +271,7 @@ virLXCProcessSetupInterfaceTap(virDomainDef *vm, { g_autofree char *parentVeth = NULL; g_autofree char *containerVeth = NULL; + g_autofree char *backupIfname = NULL; const virNetDevVPortProfile *vport = virDomainNetGetActualVirtPortProfile(net); VIR_DEBUG("calling vethCreate()"); @@ -315,14 +316,17 @@ virLXCProcessSetupInterfaceTap(virDomainDef *vm, return NULL; } - if (net->filter && - virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) - return NULL; - - /* success is guaranteed, so update the interface object */ - g_free(net->ifname); + /* success almost guaranteed, next function needs updated net->ifname */ + backupIfname = g_steal_pointer(net->ifname); net->ifname = g_steal_pointer(&parentVeth); + if (net->filter && + virDomainConfNWFilterInstantiate(vm->name, vm->uuid, net, false) < 0) { + g_free(net->ifname); + net->ifname = g_steal_pointer(&backupIfname); + return NULL; + } + return g_steal_pointer(&containerVeth); } -- 2.45.2

1 day, 12 hours

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Devel October 2024