[libvirt] [PATCH v2] virt-aa-helper: Set the supported features

Christian Ehrhardt christian.ehrhardt at canonical.com
Fri Feb 2 07:14:29 UTC 2018


On Fri, Jan 19, 2018 at 3:55 PM, Shivaprasad G Bhat
<sbhat at linux.vnet.ibm.com> wrote:
> The virt-aa-helper fails to parse the xmls with the memory/cpu
> hotplug features or user assigned aliases. Set the features in
> xmlopt->config for the parsing to succeed.
>
> Signed-off-by: Shivaprasad G Bhat <sbhat at linux.vnet.ibm.com>
> ---
>  src/security/virt-aa-helper.c |    8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
> index f7ccae0..29a459d 100644
> --- a/src/security/virt-aa-helper.c
> +++ b/src/security/virt-aa-helper.c
> @@ -654,6 +654,11 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
>      return rc;
>  }
>
> +virDomainDefParserConfig virAAHelperDomainDefParserConfig = {
> +    .features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG |
> +                VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN |
> +                VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS,
> +};

Sure we can't link against qemu_domain.c to get "the original"
virQEMUDriverDomainDefParserConfig.
But a comment here that the define is essentially taken there might
helpful to later on follow any updates there.

Also mentioning why exactly you dropped
VIR_DOMAIN_DEF_FEATURE_USER_ALIAS for the same reason.

Other than that - I built and tested the case you are reporting and
can confirm that it works.
Tested-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

BTW - since the essential line to trigger this is something like:
  <maxMemory slots='16' unit='KiB'>10485760</maxMemory>
Adding that in the commit message wouldn't be so bad either (but not important)

>  static int
>  get_definition(vahControl * ctl, const char *xmlStr)
> @@ -673,7 +678,8 @@ get_definition(vahControl * ctl, const char *xmlStr)
>          goto exit;
>      }
>
> -    if (!(ctl->xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL, NULL, NULL))) {
> +    if (!(ctl->xmlopt = virDomainXMLOptionNew(&virAAHelperDomainDefParserConfig,
> +                                              NULL, NULL, NULL, NULL))) {
>          vah_error(ctl, 0, _("Failed to create XML config object"));
>          goto exit;
>      }
>
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list



-- 
Christian Ehrhardt
Software Engineer, Ubuntu Server
Canonical Ltd




More information about the libvir-list mailing list