[libvirt] [PATCH] qemu: store the emulator name in the capabilities XML

[Daniel Henrique Barboza]

On 12/18/19 11:03 AM, Daniel P. Berrangé wrote:
> We don't need this for any functional purpose, but when debugging hosts
> it is useful to know what binary a given capabilities XML document is
> associated with.
> 
> Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
> ---
>   src/qemu/qemu_capabilities.c | 15 +++++++++++++++
>   1 file changed, 15 insertions(+)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 2223589058..7d47fa4d02 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -3852,6 +3852,7 @@ virQEMUCapsParseSEVInfo(virQEMUCapsPtr qemuCaps, xmlXPathContextPtr ctxt)
>    * Parsing a doc that looks like
>    *
>    * <qemuCaps>
> + *   <emulator>/some/path</emulator>
>    *   <qemuctime>234235253</qemuctime>
>    *   <selfctime>234235253</selfctime>
>    *   <selfvers>1002016</selfvers>
> @@ -3895,6 +3896,18 @@ virQEMUCapsLoadCache(virArch hostArch,
>           goto cleanup;
>       }
>   
> +    if (!(str = virXPathString("string(./emulator)", ctxt))) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("missing emulator in QEMU capabilities cache"));
> +        goto cleanup;
> +    }
> +    if (!STREQ(str, qemuCaps->binary)) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR,
> +                       _("Expected caps for '%s' but saw '%s'"),
> +                       qemuCaps->binary, str);
> +        goto cleanup;
> +    }


Looks like "make syntax-check" is not happy about this if statement:

../src/qemu/qemu_capabilities.c:3904:    if (!STREQ(str, qemuCaps->binary)) {

build-aux/syntax-check.mk: Use STRNEQ instead of !STREQ and STREQ instead of !STRNEQ
make: *** [../build-aux/syntax-check.mk:1104: sc_prohibit_not_streq] Error 1
make: *** Waiting for unfinished jobs....
8.84 prohibit_backslash_alignment
8.96 prohibit_canonicalize_without_use



This patch also broke 6 tests in 'make check', at least here in my env:

FAIL: domaincapstest
FAIL: qemuxml2argvtest
FAIL: qemuxml2xmltest
FAIL: qemublocktest
FAIL: qemusecuritytest
FAIL: qemucapabilitiestest



Thanks,


DHB




> +    VIR_FREE(str);
>       if (virXPathLongLong("string(./qemuctime)", ctxt, &l) < 0) {
>           virReportError(VIR_ERR_XML_ERROR, "%s",
>                          _("missing qemuctime in QEMU capabilities XML"));
> @@ -4232,6 +4245,8 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps)
>       virBufferAddLit(&buf, "<qemuCaps>\n");
>       virBufferAdjustIndent(&buf, 2);
>   
> +    virBufferEscapeString(&buf, "<emulator>%s</emulator>\n",
> +                          qemuCaps->binary);
>       virBufferAsprintf(&buf, "<qemuctime>%llu</qemuctime>\n",
>                         (long long)qemuCaps->ctime);
>       virBufferAsprintf(&buf, "<selfctime>%llu</selfctime>\n",
>