qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Avihai Horon <avihaih@nvidia.com>
To: <qemu-devel@nongnu.org>
Cc: Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>,
	"Fabiano Rosas" <farosas@suse.de>,
	Leonardo Bras <leobras@redhat.com>,
	Li Zhijian <lizhijian@fujitsu.com>,
	Avihai Horon <avihaih@nvidia.com>
Subject: [PATCH 08/11] migration/multifd: Remove error_setg() in migration_ioc_process_incoming()
Date: Sun, 31 Dec 2023 11:30:13 +0200	[thread overview]
Message-ID: <20231231093016.14204-9-avihaih@nvidia.com> (raw)
In-Reply-To: <20231231093016.14204-1-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>
---
 migration/migration.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/migration/migration.c b/migration/migration.c
index 732e3dadd9..b0c3b4c23a 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.26.3



  parent reply	other threads:[~2023-12-31  9:32 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-31  9:30 [PATCH 00/11] migration: Misc cleanups and fixes Avihai Horon
2023-12-31  9:30 ` [PATCH 01/11] migration: Remove migrate_max_downtime() declaration Avihai Horon
2024-01-02 17:27   ` Fabiano Rosas
2023-12-31  9:30 ` [PATCH 02/11] migration: Remove nulling of hostname in migrate_init() Avihai Horon
2024-01-02 18:43   ` Fabiano Rosas
2023-12-31  9:30 ` [PATCH 03/11] migration: Refactor migration_incoming_setup() Avihai Horon
2024-01-02 10:02   ` Philippe Mathieu-Daudé
2024-01-02 18:53   ` Fabiano Rosas
2023-12-31  9:30 ` [PATCH 04/11] migration: Remove errp parameter in migration_fd_process_incoming() Avihai Horon
2024-01-02 18:57   ` Fabiano Rosas
2023-12-31  9:30 ` [PATCH 05/11] migration/multifd: Fix error message in multifd_recv_initial_packet() Avihai Horon
2024-01-02 19:05   ` Fabiano Rosas
2023-12-31  9:30 ` [PATCH 06/11] migration/multifd: Simplify multifd_channel_connect() if else statement Avihai Horon
2024-01-02 10:03   ` Philippe Mathieu-Daudé
2023-12-31  9:30 ` [PATCH 07/11] migration/multifd: Fix leaking of Error in TLS error flow Avihai Horon
2024-01-02 19:32   ` Fabiano Rosas
2023-12-31  9:30 ` Avihai Horon [this message]
2024-01-02 19:33   ` [PATCH 08/11] migration/multifd: Remove error_setg() in migration_ioc_process_incoming() Fabiano Rosas
2023-12-31  9:30 ` [PATCH 09/11] migration: Fix migration_channel_read_peek() error path Avihai Horon
2024-01-02 10:05   ` Philippe Mathieu-Daudé
2024-01-08 12:34     ` Markus Armbruster
2024-01-02 19:39   ` Fabiano Rosas
2023-12-31  9:30 ` [PATCH 10/11] migration: Remove unnecessary usage of local Error Avihai Horon
2024-01-02 19:42   ` Fabiano Rosas
2023-12-31  9:30 ` [PATCH 11/11] migration/multifd: " Avihai Horon
2024-01-02 10:07   ` Philippe Mathieu-Daudé
2024-01-04  4:38 ` [PATCH 00/11] migration: Misc cleanups and fixes Peter Xu

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=20231231093016.14204-9-avihaih@nvidia.com \
    --to=avihaih@nvidia.com \
    --cc=farosas@suse.de \
    --cc=leobras@redhat.com \
    --cc=lizhijian@fujitsu.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@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).