From nobody Sat Nov 15 00:05:43 2025 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1759236588; cv=none; d=zohomail.com; s=zohoarc; b=cZ5eKV4o80z/623za3xdlYedqKUjSlKjbXB3eQtmSnRoUjesmTNAP3VYO6OThz3T8yAEhDtDFYdw9kiwcGdZv6BQjrHvOgO8+xJvGLVI6xogQxmWUk6i+3OuLdQF3F4T4jWNIJDgmUfz0YgPMFpAgP7jxLL/WgLXrN3QWYf98Po= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759236588; 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=PPVe2snjpAo+GS2+ZyY+b7ULAiCMdCkLP6OsyBsTUcY=; b=Q0lEKTCeDj65I5Vo0A58u43uehkypOw6AYvrC+B/tMaMVn0gSwU8aQXkXt2Oz8Dwavem2E+KHfKOQiH2a3OL756i36KWwxomyiMmEvzjK82lBtcXFNdSNOrIbCcbgwTQeVp1d6K+qPLPHCtOTFI6DIze+FGQwBygFcC1a5jUB5Y= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175923658815581.93058328027928; Tue, 30 Sep 2025 05:49:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3ZlN-00081r-Kz; Tue, 30 Sep 2025 08:47:26 -0400 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 1v3ZlF-0007yW-VJ for qemu-devel@nongnu.org; Tue, 30 Sep 2025 08:47:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v3Zl6-0002LR-LW for qemu-devel@nongnu.org; Tue, 30 Sep 2025 08:47:17 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-656-NZL0NY2JNYuGdSIX31lGCQ-1; Tue, 30 Sep 2025 08:47:00 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 199C3195DBAC; Tue, 30 Sep 2025 12:46:57 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.14]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4630F185FE57; Tue, 30 Sep 2025 12:46:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6DC0A21E6773; Tue, 30 Sep 2025 14:46:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759236424; 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=PPVe2snjpAo+GS2+ZyY+b7ULAiCMdCkLP6OsyBsTUcY=; b=DbT7sQyC3Ch2pOAYqqY/QB08W/9LXWGijURBs1nmSzWR6uL3DbKTZO/PmAbkMmBNJh8zrX AbDtWvjIFBD37uwX8JyCDKmNYUeEEU5XEw3vrPZkAk2mLr5JShE7g7EsfrasGWyJYsfuD+ apI7pjoIvB17KP6zI795W+Kw9w/66Xk= X-MC-Unique: NZL0NY2JNYuGdSIX31lGCQ-1 X-Mimecast-MFC-AGG-ID: NZL0NY2JNYuGdSIX31lGCQ_1759236419 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org, Steve Sistare , Akihiko Odaki Subject: [PULL 04/13] migration/cpr: Clean up error reporting in cpr_resave_fd() Date: Tue, 30 Sep 2025 14:46:44 +0200 Message-ID: <20250930124653.321609-5-armbru@redhat.com> In-Reply-To: <20250930124653.321609-1-armbru@redhat.com> References: <20250930124653.321609-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, T_SPF_HELO_TEMPERROR=0.01, T_SPF_TEMPERROR=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: 1759236589773116600 Content-Type: text/plain; charset="utf-8" qapi/error.h advises: * Please don't error_setg(&error_fatal, ...), use error_report() and * exit(), because that's more obvious. Do that, and replace exit() by g_assert_not_reached(), since this is actually a programming error. Cc: Steve Sistare Signed-off-by: Markus Armbruster Reviewed-by: Steve Sistare Message-ID: <20250923091000.3180122-5-armbru@redhat.com> Reviewed-by: Akihiko Odaki --- migration/cpr.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/migration/cpr.c b/migration/cpr.c index 42ad0b0d50..9848a21ea6 100644 --- a/migration/cpr.c +++ b/migration/cpr.c @@ -7,6 +7,7 @@ =20 #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/error-report.h" #include "hw/vfio/vfio-device.h" #include "migration/cpr.h" #include "migration/misc.h" @@ -100,10 +101,10 @@ void cpr_resave_fd(const char *name, int id, int fd) if (old_fd < 0) { cpr_save_fd(name, id, fd); } else if (old_fd !=3D fd) { - error_setg(&error_fatal, - "internal error: cpr fd '%s' id %d value %d " - "already saved with a different value %d", - name, id, fd, old_fd); + error_report("internal error: cpr fd '%s' id %d value %d " + "already saved with a different value %d", + name, id, fd, old_fd); + g_assert_not_reached(); } } =20 --=20 2.49.0