[libvirt] [PATCH 1/4] qemu: Separate CPU updating code from qemuProcessReconnect

[Marc Hartmayer]

On Wed, Oct 11, 2017 at 12:11 PM +0200, Jiri Denemark <jdenemar at redhat.com> wrote:
> The new function is called qemuProcessRefreshCPU.
>
> Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> ---
>  src/qemu/qemu_process.c | 66 ++++++++++++++++++++++++++++++++-----------------
>  1 file changed, 43 insertions(+), 23 deletions(-)
>
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index 0cb023095b..5ed6b68eb8 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -6876,6 +6876,47 @@ qemuProcessRefreshDisks(virQEMUDriverPtr driver,
>  }
>
>
> +static int
> +qemuProcessRefreshCPU(virQEMUDriverPtr driver,
> +                      virDomainObjPtr vm)
> +{
> +    virCapsPtr caps = virQEMUDriverGetCapabilities(driver, false);
> +    virCPUDefPtr host = NULL;
> +    int ret = -1;
> +
> +    if (!virQEMUCapsGuestIsNative(caps->host.arch, vm->def->os.arch) ||
> +        !caps->host.cpu ||
> +        !vm->def->cpu)
> +        return 0;
> +
> +    if (!caps)
> +        goto cleanup;

That's somehow weird...  We access 'caps->host.arch'/ 'caps->host.cpu'
and after that we're checking for a null pointer?!

> +
> +    /* If the domain with a host-model CPU was started by an old libvirt
> +     * (< 2.3) which didn't replace the CPU with a custom one, let's do it now
> +     * since the rest of our code does not really expect a host-model CPU in a
> +     * running domain.
> +     */
> +    if (vm->def->cpu->mode == VIR_CPU_MODE_HOST_MODEL) {
> +        if (!(host = virCPUCopyMigratable(caps->host.cpu->arch, caps->host.cpu)))
> +            goto cleanup;
> +
> +        if (virCPUUpdate(vm->def->os.arch, vm->def->cpu, host) < 0)
> +            goto cleanup;
> +
> +        if (qemuProcessUpdateCPU(driver, vm, QEMU_ASYNC_JOB_NONE) < 0)
> +            goto cleanup;
> +    }
> +
> +    ret = 0;
> +
> + cleanup:
> +    virCPUDefFree(host);
> +    virObjectUnref(caps);
> +    return ret;
> +}
> +
> +
>  struct qemuProcessReconnectData {
>      virConnectPtr conn;
>      virQEMUDriverPtr driver;
> @@ -7042,29 +7083,8 @@ qemuProcessReconnect(void *opaque)
>      ignore_value(qemuSecurityCheckAllLabel(driver->securityManager,
>                                             obj->def));
>
> -    /* If the domain with a host-model CPU was started by an old libvirt
> -     * (< 2.3) which didn't replace the CPU with a custom one, let's do it now
> -     * since the rest of our code does not really expect a host-model CPU in a
> -     * running domain.
> -     */
> -    if (virQEMUCapsGuestIsNative(caps->host.arch, obj->def->os.arch) &&
> -        caps->host.cpu &&
> -        obj->def->cpu &&
> -        obj->def->cpu->mode == VIR_CPU_MODE_HOST_MODEL) {
> -        virCPUDefPtr host;
> -
> -        if (!(host = virCPUCopyMigratable(caps->host.cpu->arch, caps->host.cpu)))
> -            goto error;
> -
> -        if (virCPUUpdate(obj->def->os.arch, obj->def->cpu, host) < 0) {
> -            virCPUDefFree(host);
> -            goto error;
> -        }
> -        virCPUDefFree(host);
> -
> -        if (qemuProcessUpdateCPU(driver, obj, QEMU_ASYNC_JOB_NONE) < 0)
> -            goto error;
> -    }
> +    if (qemuProcessRefreshCPU(driver, obj) < 0)
> +        goto error;
>
>      if (qemuDomainRefreshVcpuInfo(driver, obj, QEMU_ASYNC_JOB_NONE, true) < 0)
>          goto error;
> --
> 2.14.2
>
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
>
--
Beste Grüße / Kind regards
   Marc Hartmayer

IBM Deutschland Research & Development GmbH
Vorsitzende des Aufsichtsrats: Martina Koederitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294