qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: peterx@redhat.com
To: qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Cc: Fabiano Rosas <farosas@suse.de>,
	Steve Sistare <steven.sistare@oracle.com>,
	Juan Quintela <quintela@trasno.org>,
	peterx@redhat.com,
	Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
	Avihai Horon <avihaih@nvidia.com>
Subject: [PULL 22/26] migration/multifd: Remove error_setg() in migration_ioc_process_incoming()
Date: Thu,  4 Jan 2024 12:32:07 +0800	[thread overview]
Message-ID: <20240104043213.431566-23-peterx@redhat.com> (raw)
In-Reply-To: <20240104043213.431566-1-peterx@redhat.com>

From: Avihai Horon <avihaih@nvidia.com>

If multifd_load_setup() fails in migration_ioc_process_incoming(),
error_setg() is called with errp. This will lead to an assert because in
that case errp already contains an error.

Fix it by removing the redundant error_setg().

Fixes: 6720c2b32725 ("migration: check magic value for deciding the mapping of channels")
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20231231093016.14204-9-avihaih@nvidia.com
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 migration/migration.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/migration/migration.c b/migration/migration.c
index 8bb1a8134e..9524c22a50 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -843,7 +843,6 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
     }
 
     if (multifd_load_setup(errp) != 0) {
-        error_setg(errp, "Failed to setup multifd channels");
         return;
     }
 
-- 
2.41.0



  parent reply	other threads:[~2024-01-04  4:35 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-04  4:31 [PULL 00/26] Migration 20240104 patches peterx
2024-01-04  4:31 ` [PULL 01/26] MAINTAINERS: Leaving Migration peterx
2024-01-04  4:31 ` [PULL 02/26] MAINTAINERS: Remove myself as reviewer from Live Migration peterx
2024-01-04  4:31 ` [PULL 03/26] cpus: vm_was_suspended peterx
2024-01-04  4:31 ` [PULL 04/26] cpus: stop vm in suspended runstate peterx
2024-01-04  4:31 ` [PULL 05/26] cpus: check running not RUN_STATE_RUNNING peterx
2024-01-04  4:31 ` [PULL 06/26] cpus: vm_resume peterx
2024-01-04  4:31 ` [PULL 07/26] migration: propagate suspended runstate peterx
2024-01-04  4:31 ` [PULL 08/26] migration: preserve " peterx
2024-01-04  4:31 ` [PULL 09/26] migration: preserve suspended for snapshot peterx
2024-01-04  4:31 ` [PULL 10/26] migration: preserve suspended for bg_migration peterx
2024-01-04  4:31 ` [PULL 11/26] tests/qtest: migration events peterx
2024-01-04  4:31 ` [PULL 12/26] tests/qtest: option to suspend during migration peterx
2024-01-04  4:31 ` [PULL 13/26] tests/qtest: precopy migration with suspend peterx
2024-01-04  4:31 ` [PULL 14/26] tests/qtest: postcopy " peterx
2024-01-04  4:32 ` [PULL 15/26] migration: Remove migrate_max_downtime() declaration peterx
2024-01-04  4:32 ` [PULL 16/26] migration: Remove nulling of hostname in migrate_init() peterx
2024-01-04  4:32 ` [PULL 17/26] migration: Refactor migration_incoming_setup() peterx
2024-01-04  4:32 ` [PULL 18/26] migration: Remove errp parameter in migration_fd_process_incoming() peterx
2024-01-04  4:32 ` [PULL 19/26] migration/multifd: Fix error message in multifd_recv_initial_packet() peterx
2024-01-04  4:32 ` [PULL 20/26] migration/multifd: Simplify multifd_channel_connect() if else statement peterx
2024-01-04  4:32 ` [PULL 21/26] migration/multifd: Fix leaking of Error in TLS error flow peterx
2024-01-04  4:32 ` peterx [this message]
2024-01-04  4:32 ` [PULL 23/26] migration: Fix migration_channel_read_peek() error path peterx
2024-01-04  4:32 ` [PULL 24/26] migration: Remove unnecessary usage of local Error peterx
2024-01-04  4:32 ` [PULL 25/26] migration/multifd: " peterx
2024-01-04  4:32 ` [PULL 26/26] migration: fix coverity migrate_mode finding peterx
2024-01-05 16:08 ` [PULL 00/26] Migration 20240104 patches Peter Maydell
2024-01-07 12:33   ` Peter Xu
2024-01-07 12:41     ` Stefan Hajnoczi
2024-01-07 15:23       ` Peter Maydell
2024-01-07 16:28         ` Stefan Hajnoczi
2024-01-08  2:10           ` Peter Xu
2024-01-08  2:34             ` Peter Xu
2024-01-08 15:22               ` 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=20240104043213.431566-23-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=avihaih@nvidia.com \
    --cc=farosas@suse.de \
    --cc=lsoaresp@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@trasno.org \
    --cc=stefanha@redhat.com \
    --cc=steven.sistare@oracle.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).