From 78c2a8b9345871afabb840061962d81008337fea Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Sun, 24 Nov 2019 09:48:30 +0100 Subject: [PATCH] qemu: process: Move handling of qemu capability overrides Do all post-processing of capabilities in qemuProcessPrepareQEMUCaps. Signed-off-by: Peter Krempa Reviewed-by: Cole Robinson --- src/qemu/qemu_process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 227ec30989..c2ed986387 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5524,6 +5524,10 @@ qemuProcessPrepareQEMUCaps(virDomainObjPtr vm, if (processStartFlags & VIR_QEMU_PROCESS_START_STANDALONE) virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS); + /* Update qemu capabilities according to lists passed in via namespace */ + if (qemuProcessStartUpdateCustomCaps(vm) < 0) + return -1; + return 0; } @@ -5596,10 +5600,6 @@ qemuProcessInit(virQEMUDriverPtr driver, if (virDomainObjSetDefTransient(caps, driver->xmlopt, vm, priv->qemuCaps) < 0) goto cleanup; - /* Update qemu capabilities according to lists passed in via namespace */ - if (qemuProcessStartUpdateCustomCaps(vm) < 0) - goto cleanup; - if (flags & VIR_QEMU_PROCESS_START_PRETEND) { if (qemuDomainSetPrivatePaths(driver, vm) < 0) { virDomainObjRemoveTransientDef(vm); -- 2.47.2