[PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker()

Markus Armbruster posted 15 patches 4 years, 5 months ago
Maintainers: Greg Kurz <groug@kaod.org>, Fam Zheng <fam@euphon.net>, Sunil Muthuswamy <sunilmut@microsoft.com>, Jagannathan Raman <jag.raman@oracle.com>, David Gibson <david@gibson.dropbear.id.au>, Marcelo Tosatti <mtosatti@redhat.com>, Reinoud Zandijk <reinoud@netbsd.org>, Michael Roth <michael.roth@amd.com>, Elena Ufimtseva <elena.ufimtseva@oracle.com>, Juan Quintela <quintela@redhat.com>, John G Johnson <john.g.johnson@oracle.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Kamil Rytarowski <kamil@netbsd.org>, Paolo Bonzini <pbonzini@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
[PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker()
Posted by Markus Armbruster 4 years, 5 months ago
There is nothing to delete after migrate_add_blocker() failed.  Trying
anyway is safe, but useless.  Don't.

Cc: Sunil Muthuswamy <sunilmut@microsoft.com>
Cc: Kamil Rytarowski <kamil@netbsd.org>
Cc: Reinoud Zandijk <reinoud@netbsd.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210720125408.387910-9-armbru@redhat.com>
Reviewed-by: Reinoud Zandijk <reinoud@NetBSD.org>
Acked-by: Michael S. Tsirkin <mst@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


RE: [EXTERNAL] [PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker()
Posted by Sunil Muthuswamy 4 years, 5 months ago
> -----Original Message-----
> From: Markus Armbruster <armbru@redhat.com>
> Sent: Thursday, August 26, 2021 9:51 PM
> To: qemu-devel@nongnu.org
> Cc: peter.maydell@linaro.org; Sunil Muthuswamy <sunilmut@microsoft.com>; Kamil Rytarowski <kamil@netbsd.org>; Reinoud Zandijk
> <reinoud@netbsd.org>; Reinoud Zandijk <reinoud@NetBSD.org>; Michael S . Tsirkin <mst@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 <sunilmut@microsoft.com>
> Cc: Kamil Rytarowski <kamil@netbsd.org>
> Cc: Reinoud Zandijk <reinoud@netbsd.org>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Message-Id: <20210720125408.387910-9-armbru@redhat.com>
> Reviewed-by: Reinoud Zandijk <reinoud@NetBSD.org>
> Acked-by: Michael S. Tsirkin <mst@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 <sunilmut@microsoft.com>


Re: [EXTERNAL] [PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker()
Posted by Markus Armbruster 4 years, 5 months ago
Sunil Muthuswamy <sunilmut@microsoft.com> writes:

> Signed-off-by: Sunil Muthuswamy <sunilmut@microsoft.com>

Too late; the pull request has been merged already.

Moreover, Signed-off-by means you contributed to this patch or helped
merging it.  See

    https://www.kernel.org/doc/html/latest/process/submitting-patches.html#sign-your-work-the-developer-s-certificate-of-origin

You might have meant

    Reviewed-by: Sunil Muthuswamy <sunilmut@microsoft.com>

or

    Acked-by: Sunil Muthuswamy <sunilmut@microsoft.com>

Just for next time & thanks anyway.