qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
	Sunil Muthuswamy <sunilmut@microsoft.com>,
	Reinoud Zandijk <reinoud@NetBSD.org>,
	Kamil Rytarowski <kamil@netbsd.org>,
	"Michael S . Tsirkin" <mst@redhat.com>
Subject: [PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker()
Date: Fri, 27 Aug 2021 06:50:37 +0200	[thread overview]
Message-ID: <20210827045044.388748-9-armbru@redhat.com> (raw)
In-Reply-To: <20210827045044.388748-1-armbru@redhat.com>

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



  parent reply	other threads:[~2021-08-27  4:55 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-27  4:50 [PULL 00/15] Error reporting patches for 2021-08-26 Markus Armbruster
2021-08-27  4:50 ` [PULL 01/15] error: Use error_fatal to simplify obvious fatal errors (again) Markus Armbruster
2021-08-27  4:50 ` [PULL 02/15] spapr: Plug memory leak when we can't add a migration blocker Markus Armbruster
2021-08-27  4:50 ` [PULL 03/15] spapr: Explain purpose of ->fwnmi_migration_blocker more clearly Markus Armbruster
2021-08-27  4:50 ` [PULL 04/15] multi-process: Fix pci_proxy_dev_realize() error handling Markus Armbruster
2021-08-27  4:50 ` [PULL 05/15] vhost-scsi: Plug memory leak on migrate_add_blocker() failure Markus Armbruster
2021-08-27  4:50 ` [PULL 06/15] i386: Never free migration blocker objects instead of sometimes Markus Armbruster
2021-08-27  4:50 ` [PULL 07/15] vfio: Avoid error_propagate() after migrate_add_blocker() Markus Armbruster
2021-08-27  4:50 ` Markus Armbruster [this message]
2021-08-27 16:58   ` [EXTERNAL] [PULL 08/15] whpx nvmm: Drop useless migrate_del_blocker() Sunil Muthuswamy
2021-08-28  9:13     ` Markus Armbruster
2021-08-27  4:50 ` [PULL 09/15] migration: Unify failure check for migrate_add_blocker() Markus Armbruster
2021-08-27  4:50 ` [PULL 10/15] migration: Handle migration_incoming_setup() errors consistently Markus Armbruster
2021-08-27  4:50 ` [PULL 11/15] microvm: Drop dead error handling in microvm_machine_state_init() Markus Armbruster
2021-08-27  4:50 ` [PULL 12/15] vhost: Clean up how VhostOpts method vhost_get_config() fails Markus Armbruster
2021-08-27  4:50 ` [PULL 13/15] vhost: Clean up how VhostOpts method vhost_backend_init() fails Markus Armbruster
2021-08-27  4:50 ` [PULL 14/15] Remove superfluous ERRP_GUARD() Markus Armbruster
2021-08-27  4:50 ` [PULL 15/15] vl: Clean up -smp error handling Markus Armbruster
2021-08-27 10:32 ` [PULL 00/15] Error reporting patches for 2021-08-26 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210827045044.388748-9-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=kamil@netbsd.org \
    --cc=mst@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=reinoud@NetBSD.org \
    --cc=sunilmut@microsoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).