From 2c4c7de1595330a828015dd750b5ef3874f289d1 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Thu, 6 Dec 2018 14:50:19 +0100 Subject: [PATCH] qemu: process: SEV: Assume libDir to be the directory to create files in Since SEV operates on a per domain basis, it's very likely that all SEV launch-related data will be created under /var/lib/libvirt/qemu/. Therefore, when calling into qemuProcessSEVCreateFile we can assume @libDir as the directory prefix rather than passing it explicitly. Signed-off-by: Erik Skultety Acked-by: Michal Privoznik --- src/qemu/qemu_process.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d061591f62..3d1ac76ecb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6041,14 +6041,15 @@ qemuProcessPrepareDomain(virQEMUDriverPtr driver, static int -qemuProcessSEVCreateFile(const char *configDir, +qemuProcessSEVCreateFile(virDomainObjPtr vm, const char *name, const char *data) { + qemuDomainObjPrivatePtr priv = vm->privateData; char *configFile; int ret = -1; - if (!(configFile = virFileBuildPath(configDir, name, ".base64"))) + if (!(configFile = virFileBuildPath(priv->libDir, name, ".base64"))) return -1; if (virFileRewriteStr(configFile, S_IRUSR | S_IWUSR, data) < 0) { @@ -6085,12 +6086,12 @@ qemuProcessPrepareSEVGuestInput(virDomainObjPtr vm) } if (sev->dh_cert) { - if (qemuProcessSEVCreateFile(priv->libDir, "dh_cert", sev->dh_cert) < 0) + if (qemuProcessSEVCreateFile(vm, "dh_cert", sev->dh_cert) < 0) return -1; } if (sev->session) { - if (qemuProcessSEVCreateFile(priv->libDir, "session", sev->session) < 0) + if (qemuProcessSEVCreateFile(vm, "session", sev->session) < 0) return -1; } -- 2.39.5