- Devel - libvirt List Archives

[PATCH] spec: Drop nwfilter dependency in libvirt-daemon-xen
by Jim Fehlig 22 Oct '24

22 Oct '24

The libvirt xen driver does not support nwfilters. In fact, since commit d721b6840f, the driver rejects VM configuration referencing nwfilters. Drop the needless nwfilter dependency from libvirt-daemon-xen. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- libvirt.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f26de04553..d54d2a1e3e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -993,7 +993,6 @@ Requires: libvirt-daemon-driver-libxl = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} -Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: xen -- 2.43.0

2 1

Re: [PATCH v4 3/6] schema: add TPM emulator <source type='file' path='..'>
by Stefan Berger 22 Oct '24

22 Oct '24

> > Learn to parse a file path for the TPM state. > > Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> > --- > docs/formatdomain.rst | 19 ++++++++++++++ > src/conf/domain_conf.c | 28 +++++++++++++++++++++ > src/conf/domain_conf.h | 9 +++++++ > src/conf/schemas/domaincommon.rng | 14 +++++++++++ > tests/qemuxmlconfdata/tpm-emulator-tpm2.xml | 1 + > 5 files changed, 71 insertions(+) > > diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst > index e6f09a728f..d4feb4421c 100644 > --- a/docs/formatdomain.rst > +++ b/docs/formatdomain.rst > @@ -8174,6 +8174,25 @@ Example: usage of the TPM Emulator > The default version used depends on the combination of hypervisor, > guest > architecture, TPM model and backend. > > +``source`` > + The ``source`` element specifies the location of the TPM state > storage . This > + element only works with the ``emulator`` backend. > + > + If not specified, the storage configuration is left to libvirt > discretion. IMO it would be good to mention that it is up to the user to prevent files being used by multiple VMs, especially if locking cannot be used. > + > + This element requires that swtpm v0.7 or later is installed. > + > + The following attributes are supported: > + > + ``type`` > + The type of storage. It's possible to provide "file" to utilize a > single > + file or block device where the TPM state will be stored. > + > + ``path`` > + The path to the TPM state storage. > + > + :since:`Since v10.8.0` > + > ``persistent_state`` > The ``persistent_state`` attribute indicates whether 'swtpm' TPM > state is > kept or not when a transient domain is powered off or undefined. This > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c > index 284a3815b3..9dd8b6b55d 100644 > --- a/src/conf/domain_conf.c > +++ b/src/conf/domain_conf.c > @@ -1322,6 +1322,12 @@ VIR_ENUM_IMPL(virDomainTPMVersion, > "2.0", > ); > > +VIR_ENUM_IMPL(virDomainTPMSourceType, > + VIR_DOMAIN_TPM_SOURCE_TYPE_LAST, > + "default", > + "file", > +); > + > VIR_ENUM_IMPL(virDomainTPMPcrBank, > VIR_DOMAIN_TPM_PCR_BANK_LAST, > "sha1", > @@ -10784,6 +10790,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, > int nbackends; > int nnodes; > size_t i; > + xmlNodePtr source_node = NULL; > g_autofree char *path = NULL; > g_autofree char *secretuuid = NULL; > g_autofree char *persistent_state = NULL; > @@ -10857,6 +10864,22 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt, > def->data.emulator.hassecretuuid = true; > } > > + source_node = virXPathNode("./backend/source", ctxt); > + if (source_node) { > + if (virXMLPropEnum(source_node, "type", > + virDomainTPMSourceTypeTypeFromString, > + VIR_XML_PROP_NONZERO, > + &def->data.emulator.source_type) < 0) > + goto error; > + path = virXMLPropString(source_node, "path"); > + if (!path) { > + virReportError(VIR_ERR_XML_ERROR, "%s", > + _("missing TPM source path")); > + goto error; > + } > + def->data.emulator.source_path = g_steal_pointer(&path); > + } > + > persistent_state = virXMLPropString(backends[0], > "persistent_state"); > if (persistent_state) { > if (virStringParseYesNo(persistent_state, > @@ -25070,6 +25093,11 @@ virDomainTPMDefFormat(virBuffer *buf, > > virXMLFormatElement(&backendChildBuf, "active_pcr_banks", > NULL, &activePcrBanksBuf); > } > + if (def->data.emulator.source_type != > VIR_DOMAIN_TPM_SOURCE_TYPE_DEFAULT) { > + virBufferAsprintf(&backendChildBuf, "<source type='%s'", > + > virDomainTPMSourceTypeTypeToString(def->data.emulator.source_type)); > + virBufferEscapeString(&backendChildBuf, " path='%s'/>\n", > def->data.emulator.source_path); > + } > break; > case VIR_DOMAIN_TPM_TYPE_EXTERNAL: > if (def->data.external.source->type == VIR_DOMAIN_CHR_TYPE_UNIX) { > diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h > index 6b27322e3e..7a70f68177 100644 > --- a/src/conf/domain_conf.h > +++ b/src/conf/domain_conf.h > @@ -1463,6 +1463,13 @@ typedef enum { > VIR_DOMAIN_TPM_PCR_BANK_LAST > } virDomainPcrBank; > > +typedef enum { > + VIR_DOMAIN_TPM_SOURCE_TYPE_DEFAULT = 0, > + VIR_DOMAIN_TPM_SOURCE_TYPE_FILE, > + > + VIR_DOMAIN_TPM_SOURCE_TYPE_LAST > +} virDomainTPMSourceType; > + > #define VIR_DOMAIN_TPM_DEFAULT_DEVICE "/dev/tpm0" > > struct _virDomainTPMDef { > @@ -1478,6 +1485,7 @@ struct _virDomainTPMDef { > struct { > virDomainTPMVersion version; > virDomainChrSourceDef *source; > + virDomainTPMSourceType source_type; > char *source_path; > char *logfile; > unsigned int debug; > @@ -4277,6 +4285,7 @@ VIR_ENUM_DECL(virDomainRNGBackend); > VIR_ENUM_DECL(virDomainTPMModel); > VIR_ENUM_DECL(virDomainTPMBackend); > VIR_ENUM_DECL(virDomainTPMVersion); > +VIR_ENUM_DECL(virDomainTPMSourceType); > VIR_ENUM_DECL(virDomainTPMPcrBank); > VIR_ENUM_DECL(virDomainMemoryModel); > VIR_ENUM_DECL(virDomainMemoryBackingModel); > diff --git a/src/conf/schemas/domaincommon.rng > b/src/conf/schemas/domaincommon.rng > index efb5f00d77..72c8b6c694 100644 > --- a/src/conf/schemas/domaincommon.rng > +++ b/src/conf/schemas/domaincommon.rng > @@ -5923,6 +5923,7 @@ > <interleave> > <ref name="tpm-backend-emulator-encryption"/> > <ref name="tpm-backend-emulator-active-pcr-banks"/> > + <ref name="tpm-backend-emulator-source"/> > </interleave> > <optional> > <attribute name="persistent_state"> > @@ -5981,6 +5982,19 @@ > </optional> > </define> > > + <define name="tpm-backend-emulator-source"> > + <optional> > + <element name="source"> > + <attribute name="type"> > + <value>file</value> > + </attribute> > + <attribute name="path"> > + <ref name="filePath"/> Should probably be absFilePath? With this nit: Reviewed-by: Stefan Berger <stefanb(a)linux.ibm.com> > + </attribute> > + </element> > + </optional> > + </define> > + > <define name="tpm-backend-emulator-encryption"> > <optional> > <element name="encryption"> > diff --git a/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml > b/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml > index 8a613db456..3d6300f544 100644 > --- a/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml > +++ b/tests/qemuxmlconfdata/tpm-emulator-tpm2.xml > @@ -34,6 +34,7 @@ > <sha256/> > <sha512/> > </active_pcr_banks> > + <source type='file' path='/path/to/state'/> > </backend> > </tpm> > <audio id='1' type='none'/> > -- > 2.47.0

1 0

[PATCH v4 0/6] Add TPM emulator <source type='file/dir' path='..'/>
by marcandre.lureau＠redhat.com 22 Oct '24

22 Oct '24

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, When swtpm capabilities reports "nvram-backend-dir", it can accepts a single file or block device where TPM state will be stored. --tpmstate must be backend-uri=file://. v4: - add "qemu: explicit swtpm state locking" - add r-b from Stefan, first patch only atm v3: - changed to <source type='file/dir' path='..'/> v2: - add <source dir='..'/> support as well (Daniel) Related: https://issues.redhat.com/browse/CNV-35250 Marc-André Lureau (6): util: check swtpm nvram-backend-{dir,file} capabilities tpm: rename 'storagepath' to 'source_path' schema: add TPM emulator <source type='file' path='..'> schema: add TPM emulator <source type='dir' path='..'> qemu_tpm: handle file/block storage source qemu: explicit swtpm state locking docs/formatdomain.rst | 20 +++ src/conf/domain_conf.c | 31 ++++- src/conf/domain_conf.h | 12 +- src/conf/schemas/domaincommon.rng | 26 ++++ src/qemu/qemu_tpm.c | 115 +++++++++++++----- src/security/security_selinux.c | 6 +- src/util/virtpm.c | 3 + src/util/virtpm.h | 3 + .../qemuxmlconfdata/tpm-emulator-tpm2-enc.xml | 1 + tests/qemuxmlconfdata/tpm-emulator-tpm2.xml | 1 + tests/testutilsqemu.c | 1 + 11 files changed, 186 insertions(+), 33 deletions(-) -- 2.47.0

2 9

[PATCH v3 0/5] Add TPM emulator <source type='file/dir' path='..'/>
by marcandre.lureau＠redhat.com 21 Oct '24

21 Oct '24

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, When swtpm capabilities reports "nvram-backend-dir", it can accepts a single file or block device where TPM state will be stored. --tpmstate must be backend-uri=file://. v3: - changed to <source type='file/dir' path='..'/> v2: - add <source dir='..'/> support as well (Daniel) Related: https://issues.redhat.com/browse/CNV-35250 Marc-André Lureau (5): util: check swtpm nvram-backend-{dir,file} capabilities tpm: rename 'storagepath' to 'source_path' schema: add TPM emulator <source type='file' path='..'> schema: add TPM emulator <source type='dir' path='..'> qemu_tpm: handle file/block storage source docs/formatdomain.rst | 20 ++++ src/conf/domain_conf.c | 31 ++++- src/conf/domain_conf.h | 12 +- src/conf/schemas/domaincommon.rng | 26 +++++ src/qemu/qemu_tpm.c | 110 +++++++++++++----- src/security/security_selinux.c | 4 +- src/util/virtpm.c | 2 + src/util/virtpm.h | 2 + .../qemuxmlconfdata/tpm-emulator-tpm2-enc.xml | 1 + tests/qemuxmlconfdata/tpm-emulator-tpm2.xml | 1 + 10 files changed, 176 insertions(+), 33 deletions(-) -- 2.45.2.827.g557ae147e6

4 21

[PATCH 0/3] Report CPU model blockers in domain capabilities
by Jiri Denemark 21 Oct '24

21 Oct '24

Jiri Denemark (3): domain_capabilities: Sort CPU models domain_capabilities: Report CPU blockers NEWS: Report CPU model blockers in domain capabilities NEWS.rst | 6 + docs/formatdomaincaps.rst | 56 +- src/conf/domain_capabilities.c | 48 ++ src/conf/domain_capabilities.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 1 + .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 430 +++++++++-- .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 649 +++++++++++++++-- .../qemu_5.2.0-virt.aarch64.xml | 56 +- tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 56 +- tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_5.2.0.s390x.xml | 122 ++-- tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 430 +++++++++-- .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 681 +++++++++++++++-- .../qemu_6.0.0-virt.aarch64.xml | 56 +- tests/domaincapsdata/qemu_6.0.0.aarch64.xml | 56 +- tests/domaincapsdata/qemu_6.0.0.s390x.xml | 122 ++-- tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml | 442 ++++++++++-- .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml | 682 ++++++++++++++++-- tests/domaincapsdata/qemu_6.1.0.x86_64.xml | 442 ++++++++++-- .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 680 +++++++++++++++-- .../qemu_6.2.0-virt.aarch64.xml | 58 +- tests/domaincapsdata/qemu_6.2.0.aarch64.xml | 58 +- tests/domaincapsdata/qemu_6.2.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml | 673 +++++++++++++++-- .../qemu_7.0.0-virt.aarch64.xml | 58 +- tests/domaincapsdata/qemu_7.0.0.aarch64.xml | 58 +- tests/domaincapsdata/qemu_7.0.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_7.0.0.x86_64.xml | 441 +++++++++-- .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml | 403 +++++++++-- .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml | 619 ++++++++++++++-- tests/domaincapsdata/qemu_7.1.0.ppc64.xml | 4 +- tests/domaincapsdata/qemu_7.1.0.x86_64.xml | 403 +++++++++-- .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml | 403 +++++++++-- .../qemu_7.2.0-tcg.x86_64+hvf.xml | 511 +++++++++++-- .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml | 511 +++++++++++-- tests/domaincapsdata/qemu_7.2.0.x86_64.xml | 403 +++++++++-- .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml | 451 ++++++++++-- .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml | 559 ++++++++++++-- tests/domaincapsdata/qemu_8.0.0.x86_64.xml | 451 ++++++++++-- .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 570 +++++++++++++-- tests/domaincapsdata/qemu_8.1.0.s390x.xml | 282 ++++++-- tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml | 562 +++++++++++++-- .../qemu_8.2.0-virt.aarch64.xml | 72 +- tests/domaincapsdata/qemu_8.2.0.aarch64.xml | 72 +- tests/domaincapsdata/qemu_8.2.0.s390x.xml | 280 +++++-- tests/domaincapsdata/qemu_8.2.0.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml | 536 ++++++++++++-- tests/domaincapsdata/qemu_9.0.0.x86_64.xml | 547 ++++++++++++-- .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml | 576 +++++++++++++-- .../qemu_9.1.0-tcg-virt.riscv64.xml | 16 +- .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml | 557 ++++++++++++-- tests/domaincapsdata/qemu_9.1.0.x86_64.xml | 576 +++++++++++++-- .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml | 576 +++++++++++++-- .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml | 557 ++++++++++++-- tests/domaincapsdata/qemu_9.2.0.x86_64.xml | 576 +++++++++++++-- 65 files changed, 19644 insertions(+), 2745 deletions(-) -- 2.47.0

2 4

[PATCH v2 0/2] qemu: Don't complain when <transient/> disk overlay is left behind
by Peter Krempa 18 Oct '24

18 Oct '24

v2: - remove the overlay unconditionally - document the overlay filename template Peter Krempa (2): qemu: snapshot: Delete leftover overlay files for <transient/> disks docs: formatdomain: Document the temporary file for transient disks docs/formatdomain.rst | 7 +++++++ src/qemu/qemu_snapshot.c | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) -- 2.47.0

2 3

[PATCH] rpm: Require dmidecode on more architectures
by Andrea Bolognani 18 Oct '24

18 Oct '24

It's not only used on x86_64 these days. See virSysinfoRead(). Technically we should include loongarch64 in the list as well, but Fedora hasn't been bootstrapped on the architecture yet, and when the time comes several more changes are going to be necessary anyway. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c3dc6e21c0..f26de04553 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -19,7 +19,7 @@ %define arches_x86 %{ix86} x86_64 %define arches_systemtap_64bit %{arches_64bit} -%define arches_dmidecode %{arches_x86} +%define arches_dmidecode %{arches_x86} aarch64 riscv64 %define arches_xen %{arches_x86} aarch64 %if 0%{?fedora} %define arches_xen x86_64 aarch64 -- 2.46.2

2 1

Plans for 10.9.0 release (freeze on Friday 25 Oct)
by Jiri Denemark 18 Oct '24

18 Oct '24

We are getting close to 10.9.0 release of libvirt. To aim for the release on Friday 01 Nov I suggest entering the freeze on Friday 25 Oct and tagging RC2 on Wednesday 30 Oct. I hope this works for everyone. Jirka

1 0

[PATCH] qemu: Give the users possibility to overwrite temp files for <transient\> disk
by Peter Krempa 18 Oct '24

18 Oct '24

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

2 3

[PATCH] NEWS: Fix naming of DISK_DETECT_ZEROES migration parameter
by Michal Privoznik 17 Oct '24

17 Oct '24

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

1 0