[libvirt] [PATCH v5 2/9] libxl: pass driver config to libxlMakeDomBuildInfo

Daniel P. Berrangé berrange at redhat.com
Fri Mar 16 17:36:44 UTC 2018


On Wed, Mar 14, 2018 at 03:26:09AM +0100, Marek Marczykowski-Górecki wrote:
> Preparation for global nestedhvm configuration - libxlMakeDomBuildInfo
> needs access to libxlDriverConfig.
> No functional change.
> 
> Adjusting tests require slightly more mockup functions, because of
> libxlDriverConfigNew() call.
> 
> Signed-off-by: Marek Marczykowski-Górecki <marmarek at invisiblethingslab.com>
> ---
> Changes since v4:
>  - drop now unneeded parameters
> Changes since v3:
>  - new patch, preparation
> ---
>  src/libxl/libxl_conf.c         | 13 +++++++------
>  src/libxl/libxl_conf.h         |  4 +---
>  src/libxl/libxl_domain.c       |  2 +-
>  tests/libxlxml2domconfigtest.c | 23 ++++++++++++++++-------
>  tests/virmocklibxl.c           | 25 +++++++++++++++++++++++++
>  5 files changed, 50 insertions(+), 17 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange at redhat.com>

Though one question...

> @@ -48,6 +49,19 @@ VIR_MOCK_IMPL_RET_ARGS(xc_interface_open,
>  }
>  
>  
> +VIR_MOCK_IMPL_RET_ARGS(libxl_get_version_info,
> +                       const libxl_version_info*,
> +                       libxl_ctx *, ctx)
> +{
> +    static libxl_version_info info;
> +
> +    memset(&info, 0, sizeof(info));
> +
> +    return &info;
> +    /* silence gcc warning */
> +    return real_libxl_get_version_info(ctx);

Why was gcc warning about that requires the second return
statement ?  I would have though this would /cause/ a
warning by creating unreachable code ?


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 :|




More information about the libvir-list mailing list