Re: [libvirt] [PATCH 04/11] conf: Use getParseOpaque() in virDomainObjSetDefTransient

On 9/20/18 1:44 PM, Marc Hartmayer wrote: > This allows the QEMU driver to use the originally used QEMU > capabilities for copying the domain. It avoids the usage of a possible > changed QEMU capability as virQEMUCapsCacheLookup might return a > different QEMU capability than used before (for example when during > the job the QEMU binary has been replaced virQEMUCapsCacheLookupCopy > will invalidate the originally used QEMU capability). > > For other drivers @parseOpqaue will still be NULL, because > xmlopt->privateData.getParseOpaque is currently only implemented for > the QEMU driver. > > Signed-off-by: Marc Hartmayer <mhartmay(a)linux.ibm.com&gt; > Reviewed-by: Stefan Zimmermann <stzi(a)linux.ibm.com&gt; > Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com&gt; > --- > src/conf/domain_conf.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > This one I'm not so sure about. One would think the domain def that's being copied would have already gone through PostParse, et. al. The SetDefTransient is where we're copying the recently Parsed and Validated @def, so why would it need the qemuCaps especially since @flags would be PARSE_INACTIVE | PARSE_SKIP_VALIDATE in *DefCopy.

John > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c > index 1ee43950ae2d..a3f2fcb0a001 100644 > --- a/src/conf/domain_conf.c > +++ b/src/conf/domain_conf.c > @@ -3366,6 +3366,7 @@ virDomainObjSetDefTransient(virCapsPtr caps, > virDomainObjPtr domain) > { > int ret = -1; > + void *parseOpaque = NULL; > > if (!domain->persistent) > return 0; > @@ -3373,7 +3374,10 @@ virDomainObjSetDefTransient(virCapsPtr caps, > if (domain->newDef) > return 0; > > - if (!(domain->newDef = virDomainDefCopy(domain->def, caps, xmlopt, NULL, false))) > + if (xmlopt->privateData.getParseOpaque) > + parseOpaque = xmlopt->privateData.getParseOpaque(domain); > + > + if (!(domain->newDef = virDomainDefCopy(domain->def, caps, xmlopt, parseOpaque, false))) > goto out; > > ret = 0; >