> -----Original Message-----
> From: Markus Armbruster <arm...@redhat.com>
> Sent: Thursday, August 26, 2021 9:51 PM
> To: qemu-devel@nongnu.org
> Cc: peter.mayd...@linaro.org; Sunil Muthuswamy <sunil...@microsoft.com>;
> Kamil Rytarowski <ka...@netbsd.org>; Reinoud Zandijk
> <rein...@netbsd.org>; Reinoud Zandijk <rein...@netbsd.org>; Michael S .
> Tsirkin <m...@redhat.com>
> Subject: [EXTERNAL] [PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker()
>
> There is nothing to delete after migrate_add_blocker() failed. Trying
> anyway is safe, but useless. Don't.
>
> Cc: Sunil Muthuswamy <sunil...@microsoft.com>
> Cc: Kamil Rytarowski <ka...@netbsd.org>
> Cc: Reinoud Zandijk <rein...@netbsd.org>
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
> Message-Id: <20210720125408.387910-9-arm...@redhat.com>
> Reviewed-by: Reinoud Zandijk <rein...@netbsd.org>
> Acked-by: Michael S. Tsirkin <m...@redhat.com>
> ---
> target/i386/nvmm/nvmm-all.c | 1 -
> target/i386/whpx/whpx-all.c | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
> index dfa690d65d..7bb0d9e30e 100644
> --- a/target/i386/nvmm/nvmm-all.c
> +++ b/target/i386/nvmm/nvmm-all.c
> @@ -929,7 +929,6 @@ nvmm_init_vcpu(CPUState *cpu)
> (void)migrate_add_blocker(nvmm_migration_blocker, &local_error);
> if (local_error) {
> error_report_err(local_error);
> - migrate_del_blocker(nvmm_migration_blocker);
> error_free(nvmm_migration_blocker);
> return -EINVAL;
> }
> diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
> index f832f286ac..cc8c0b984b 100644
> --- a/target/i386/whpx/whpx-all.c
> +++ b/target/i386/whpx/whpx-all.c
> @@ -1349,7 +1349,6 @@ int whpx_init_vcpu(CPUState *cpu)
> (void)migrate_add_blocker(whpx_migration_blocker, &local_error);
> if (local_error) {
> error_report_err(local_error);
> - migrate_del_blocker(whpx_migration_blocker);
> error_free(whpx_migration_blocker);
> ret = -EINVAL;
> goto error;
> --
> 2.31.1
Signed-off-by: Sunil Muthuswamy <sunil...@microsoft.com>
