[libvirt PATCH 1/1] qemu: substitute missing model name for host-passthrough

[Peter Krempa]

On Tue, Sep 22, 2020 at 15:29:28 +0200, Tim Wiederhake wrote:

The stuff (before/after) you put into the cover letter should actually
be here. Or a better explanation if you don't like that.

But the cover letter blurb will get lost in time and this commit will
have no explanation/justification.

> Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> ---
>  src/qemu/qemu_driver.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index ae715c01d7..7f5cfc1a7f 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -12336,6 +12336,15 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn,
>          if (virCPUDefParseXMLString(xmlCPU, VIR_CPU_TYPE_AUTO, &cpu) < 0)
>              goto cleanup;
>  
> +        if (!cpu->model) {
> +            if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) {
> +                cpu->model = g_strdup("host");
> +            } else {
> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

VIR_ERR_INTERNAL_ERROR doesn't seem to be appropriate since it's in user
provided input.

> +                               _("cpu parameter is missing a model name"));
> +                goto cleanup;
> +            }
> +        }
>          ret = qemuConnectCPUModelComparison(qemuCaps, cfg->libDir,
>                                              cfg->user, cfg->group,
>                                              hvCPU, cpu, failIncompatible);
> -- 
> 2.26.2
>