From: Peter Krempa Date: Sat, 23 Nov 2019 08:43:35 +0000 (+0100) Subject: qemu: process: Make it obvious that virDomainDefPostParse is called with NULL opaque X-Git-Tag: v6.0.0-rc1~532 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2504dbeb5d29f31de042382fe187906e3c95840d;p=thirdparty%2Flibvirt.git qemu: process: Make it obvious that virDomainDefPostParse is called with NULL opaque Commit c90fb5a828a added explicit use of the private copy of the qemu capabilities to various places. The change to qemuProcessInit was bogus though as at the point where we re-initiate the post parse callbacks priv->qemuCaps is still NULL as we clear it after shutdown of the VM and don't initiate it until a later point. Using the value from priv->qemuCaps might mislead readers of the code into thinking that something useful is being passed at that point so go with an explicit NULL instead. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a588ee25f8..3083d0b538 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5531,7 +5531,8 @@ qemuProcessInit(virQEMUDriverPtr driver, if (vm->def->postParseFailed) { VIR_DEBUG("re-running the post parse callback"); - if (virDomainDefPostParse(vm->def, caps, 0, driver->xmlopt, priv->qemuCaps) < 0) + /* we don't have the private copy of qemuCaps at this point */ + if (virDomainDefPostParse(vm->def, caps, 0, driver->xmlopt, NULL) < 0) goto cleanup; }