qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Xu" <peterx@redhat.com>,
	"Laurent Vivier" <lvivier@redhat.com>,
	qemu-block@nongnu.org, "Thomas Huth" <thuth@redhat.com>,
	"Juan Quintela" <quintela@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Leonardo Bras" <leobras@redhat.com>,
	"Fam Zheng" <fam@euphon.net>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Tejus GK" <tejus.gk@nutanix.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 06/13] migration: Refactor repeated call of yank_unregister_instance
Date: Mon,  2 Oct 2023 14:20:14 +0200	[thread overview]
Message-ID: <20231002122021.231959-7-quintela@redhat.com> (raw)
In-Reply-To: <20231002122021.231959-1-quintela@redhat.com>

From: Tejus GK <tejus.gk@nutanix.com>

In the function qmp_migrate(), yank_unregister_instance() gets called
twice which isn't required. Hence, refactoring it so that it gets called
during the local_error cleanup.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Acked-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Tejus GK <tejus.gk@nutanix.com>
Message-ID: <20230621130940.178659-3-tejus.gk@nutanix.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/migration.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index e2ed85b5be..6d3cf5d5cd 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1703,15 +1703,11 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
     } else if (strstart(uri, "fd:", &p)) {
         fd_start_outgoing_migration(s, p, &local_err);
     } else {
-        if (!resume_requested) {
-            yank_unregister_instance(MIGRATION_YANK_INSTANCE);
-        }
         error_setg(&local_err, QERR_INVALID_PARAMETER_VALUE, "uri",
                    "a valid migration protocol");
         migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
                           MIGRATION_STATUS_FAILED);
         block_cleanup_parameters();
-        return;
     }
 
     if (local_err) {
-- 
2.41.0



  parent reply	other threads:[~2023-10-02 12:23 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-02 12:20 [PULL 00/13] Migration 20231002 patches Juan Quintela
2023-10-02 12:20 ` [PULL 01/13] migration-test: Create kvm_opts Juan Quintela
2023-10-02 12:20 ` [PULL 02/13] migration-test: bootpath is the same for all tests and for all archs Juan Quintela
2023-10-02 12:20 ` [PULL 03/13] migration-test: Add bootfile_create/delete() functions Juan Quintela
2023-10-02 12:20 ` [PULL 04/13] migration-test: dirtylimit checks for x86_64 arch before Juan Quintela
2023-10-02 12:20 ` [PULL 05/13] migration-test: simplify shmem_opts handling Juan Quintela
2023-10-02 12:20 ` Juan Quintela [this message]
2023-10-02 12:20 ` [PULL 07/13] migration: Use qemu_file_transferred_noflush() for block migration Juan Quintela
2023-10-02 12:20 ` [PULL 08/13] migration: Don't abuse qemu_file transferred for RDMA Juan Quintela
2023-10-02 12:20 ` [PULL 09/13] migration/RDMA: It is accounting for zero/normal pages in two places Juan Quintela
2023-10-02 12:20 ` [PULL 10/13] migration/rdma: Remove QEMUFile parameter when not used Juan Quintela
2023-10-02 12:20 ` [PULL 11/13] migration/rdma: Don't use imaginary transfers Juan Quintela
2023-10-02 12:20 ` [PULL 12/13] migration: Remove unused qemu_file_credit_transfer() Juan Quintela
2023-10-02 12:20 ` [PULL 13/13] migration/rdma: Simplify the function that saves a page Juan Quintela
2023-10-02 21:57 ` [PULL 00/13] Migration 20231002 patches Stefan Hajnoczi

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=20231002122021.231959-7-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=berrange@redhat.com \
    --cc=fam@euphon.net \
    --cc=leobras@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=tejus.gk@nutanix.com \
    --cc=thuth@redhat.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).