Re: [Qemu-devel] [PATCH v11 for-4.0 04/11] qemu_thread: supplement error handling for pci_edu_realize

[Markus Armbruster]

Fei Li <address@hidden> writes:

> From: Fei Li <address@hidden>
>
> Utilize the existed errp to propagate the error and do the
> corresponding cleanup to replace the temporary &error_abort.
>
> Cc: Markus Armbruster <address@hidden>
> Cc: Jiri Slaby <address@hidden>
> Signed-off-by: Fei Li <address@hidden>
> ---
>  hw/misc/edu.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/hw/misc/edu.c b/hw/misc/edu.c
> index 21adbfddce..8fe232b6d6 100644
> --- a/hw/misc/edu.c
> +++ b/hw/misc/edu.c
> @@ -356,9 +356,14 @@ static void pci_edu_realize(PCIDevice *pdev, Error 
> **errp)
>  
>      qemu_mutex_init(&edu->thr_mutex);
>      qemu_cond_init(&edu->thr_cond);
> -    /* TODO: let the further caller handle the error instead of abort() here 
> */
> -    qemu_thread_create(&edu->thread, "edu", edu_fact_thread,
> -                       edu, QEMU_THREAD_JOINABLE, &error_abort);
> +    if (qemu_thread_create(&edu->thread, "edu", edu_fact_thread,
> +                           edu, QEMU_THREAD_JOINABLE, errp) < 0) {
> +        qemu_cond_destroy(&edu->thr_cond);
> +        qemu_mutex_destroy(&edu->thr_mutex);
> +        timer_del(&edu->dma_timer);
> +        msi_uninit(pdev);
> +        return;
> +    }
>  
>      memory_region_init_io(&edu->mmio, OBJECT(edu), &edu_mmio_ops, edu,
>                      "edu-mmio", 1 * MiB);

In review of v9, I pointed out that pci_edu_uninit() neglects to call
msix_uninit(), and you offered to fix it.  Not in this series.  Do you
still intend to fix it?

That's a separate patch, though, so
Reviewed-by: Markus Armbruster <address@hidden>