From d292ddf1cc268bdd8a494f8e7ce76dc3445c26ab Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Tue, 21 Mar 2023 17:42:10 +0100 Subject: [PATCH] qemu_snapshot: external: don't error out when updating metadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Attaching disk into running VM the offline definition may not be updated and we will end up with that disk existing only in live definition. Creating snapshot with this state saves both live and offline definition into snapshot metadata. When we are deleting an external snapshot we are updating these definitions in the snapshot metadata so we should just skip over non-existing disks instead of reporting error. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2174700 Signed-off-by: Pavel Hrdina Reviewed-by: Ján Tomko --- src/qemu/qemu_snapshot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index fc04244e74..12ddf19c48 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2456,8 +2456,8 @@ qemuSnapshotUpdateDisksSingle(virDomainMomentObj *snap, { virDomainDiskDef *disk = NULL; - if (!(disk = qemuDomainDiskByName(def, snapDisk->name))) - return -1; + if (!(disk = virDomainDiskByName(def, snapDisk->name, true))) + return 0; if (virDomainSnapshotIsExternal(snap)) { virDomainDiskDef *parentDisk = NULL;