From 95a8c4332dd42ab6a558117a07134a7fdb2ce8f4 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 6 Mar 2020 15:28:18 +0100 Subject: [PATCH] qemuDomainDeviceDiskDefPostParseRestoreSecAlias: Hardcode restored aliases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to be able to change the function generating the alias and thus also the aliases itself, we must hardcode the old format for the case of upgrading form libvirt which didn't record them in the status XML yet. Note that this code path is tested by 'tests/qemustatusxml2xmldata/disk-secinfo-upgrade-in.xml' Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_domain.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c8bd6f6447..71ed809e4b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9031,16 +9031,14 @@ qemuDomainDeviceDiskDefPostParseRestoreSecAlias(virDomainDiskDefPtr disk, } if (restoreAuthSecret) { - if (!(authalias = qemuDomainGetSecretAESAlias(disk->info.alias, false))) - return -1; + authalias = g_strdup_printf("%s-secret0", disk->info.alias); if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->secinfo, &authalias) < 0) return -1; } if (restoreEncSecret) { - if (!(encalias = qemuDomainGetSecretAESAlias(disk->info.alias, true))) - return -1; + encalias = g_strdup_printf("%s-luks-secret0", disk->info.alias); if (qemuStorageSourcePrivateDataAssignSecinfo(&priv->encinfo, &encalias) < 0) return -1;