From: Peter Krempa Date: Wed, 12 Jan 2022 10:02:49 +0000 (+0100) Subject: virDomainSnapshotRedefineValidate: Fix validation of VIR_DOMAIN_SNAPSHOT_CREATE_DISK_... X-Git-Tag: v8.1.0-rc1~457 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82e0a1878ef4682c9dc49d5d3ccc1a67e3623525;p=thirdparty%2Flibvirt.git virDomainSnapshotRedefineValidate: Fix validation of VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY flag External snapshot with memory is created without using the VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY flag, but rather with properly configuring the XML. When redefining the code should be checking the same thing as by definition an external snapshot with memory is not a disk-only snapshot. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index fc6f0a859d..d46d9bd335 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -478,7 +478,8 @@ virDomainSnapshotRedefineValidate(virDomainSnapshotDef *def, bool external = def->state == VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT || virDomainSnapshotDefIsExternal(def); - if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) && !external) { + if ((flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) && + def->state != VIR_DOMAIN_SNAPSHOT_DISK_SNAPSHOT) { virReportError(VIR_ERR_INVALID_ARG, _("disk-only flag for snapshot %s requires " "disk-snapshot state"),