From nobody Tue Nov 26 22:31:15 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1704342939; cv=none; d=zohomail.com; s=zohoarc; b=kKHc2175cHVGvw0Rgn3NYyTe4xlUngPP43xOvAC0Ig65oIspHnS/ncqNbCrXCpuUXYQBnhTp62c0vUWvqg2m2Gjz4d+rAfJ7RXUlnlTDM4Vss5wyL1pXC+M/eUi7YSuX+WSEBkWkZ1LxwQ4546APWuFpIzM+F4qDzmhqua37nCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704342939; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pgPfvYyH9GUtQmjreG2FRloy8mQoBl7JfiFhYkJLhrg=; b=dGODqzY5aTFlyNdAX7zWkmnn7kx3fNyt7XlYQMmEsLY4wXxzY9BhBKevYYVw3ruJ32QXGucZU6PmwoPEqcM/7+FtkXXyWlOh/ATxqzwvYUrdPirrnQ9fWKRMFCboJCm0keZruOea1Nr0QILMZqBGE8fHzk3wjDsqm8wEr3RkWhM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1704342939183214.3055213368683; Wed, 3 Jan 2024 20:35:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLFQq-0004J3-RJ; Wed, 03 Jan 2024 23:34:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLFQp-0004I6-MK for qemu-devel@nongnu.org; Wed, 03 Jan 2024 23:34:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLFQo-0006jX-29 for qemu-devel@nongnu.org; Wed, 03 Jan 2024 23:34:11 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-osB_PlAtMkaMLOgUJ2SRDw-1; Wed, 03 Jan 2024 23:34:08 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A2F9385A589; Thu, 4 Jan 2024 04:34:07 +0000 (UTC) Received: from x1n.redhat.com (unknown [10.72.116.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id B904BC15A0C; Thu, 4 Jan 2024 04:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704342849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pgPfvYyH9GUtQmjreG2FRloy8mQoBl7JfiFhYkJLhrg=; b=dPHXwyl8JFC1xaBgSoQ3iG0gmccu0PzBrW4BhSL3IlVtuWMnFn/gPgUqFF3YNg7lsv2AfD dqeH2IsliH5lW6ccddt2syGZlMpd6HT6zi4FNSEi+UAMuZfJ6Pe/U0Qh0Hwr6wc+6+EZJ7 GnmxAMJFU1NVWhp/gFQc0tA4IFg63G8= X-MC-Unique: osB_PlAtMkaMLOgUJ2SRDw-1 From: peterx@redhat.com To: qemu-devel@nongnu.org, Stefan Hajnoczi Cc: Fabiano Rosas , Steve Sistare , Juan Quintela , peterx@redhat.com, Leonardo Bras Soares Passos , Avihai Horon Subject: [PULL 22/26] migration/multifd: Remove error_setg() in migration_ioc_process_incoming() Date: Thu, 4 Jan 2024 12:32:07 +0800 Message-ID: <20240104043213.431566-23-peterx@redhat.com> In-Reply-To: <20240104043213.431566-1-peterx@redhat.com> References: <20240104043213.431566-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.601, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1704342939986100001 Content-Type: text/plain; charset="utf-8" From: Avihai Horon 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 Reviewed-by: Fabiano Rosas Link: https://lore.kernel.org/r/20231231093016.14204-9-avihaih@nvidia.com Signed-off-by: Peter Xu --- 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, Er= ror **errp) } =20 if (multifd_load_setup(errp) !=3D 0) { - error_setg(errp, "Failed to setup multifd channels"); return; } =20 --=20 2.41.0