[libvirt] [PATCH] virQEMUDriverPtr clean up

[Daniel P. Berrangé]

On Sun, Mar 17, 2019 at 06:04:27AM +0000, Humaid wrote:
> From: Ubuntu <shbh at Ubuntu1.4obxdks5shaudmr0jmg1ainqgb.bx.internal.cloudapp.net>

You need to set your git author name to something sensible using
commands line this:

  $ git config --global user.name "John Doe"
  $ git config --global user.email johndoe at example.com

you can use 'git commit --amend --reset-author' to fix the author
on existing commits once you've fixed your config.

> ---
>  src/qemu/qemu_tpm.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
> index 835a9caf46..b60e443f14 100644
> --- a/src/qemu/qemu_tpm.c
> +++ b/src/qemu/qemu_tpm.c
> @@ -834,16 +834,16 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver,
>  
>  
>  int
> -qemuExtTPMStart(virQEMUDriverPtr driver,
> -                virDomainObjPtr vm,
> +qemuExtTPMStart(virDomainObjPtr vm,
>                  qemuDomainLogContextPtr logCtxt)

This has removed a parameter from qemuExtTPMStart, but has not updated
the declaration of this in the header, nor updated any callers. So there
is no way this code is going to successfully compile.

I'm not really convinced we want todo this change in any case. Normally
we lookup the 'driver' at the main API entry points, and then just pass
it to all internal APIs.

>  {
>      int ret = 0;
> +    qemuDomainObjPrivatePtr priv = vm->privateData;
>      virDomainTPMDefPtr tpm = vm->def->tpm;
>  
>      switch (tpm->type) {
>      case VIR_DOMAIN_TPM_TYPE_EMULATOR:
> -        ret = qemuExtTPMStartEmulator(driver, vm, logCtxt);
> +        ret = qemuExtTPMStartEmulator(priv->driver, vm, logCtxt);
>          break;
>      case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
>      case VIR_DOMAIN_TPM_TYPE_LAST:



Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|