From nobody Tue Apr 7 06:15:59 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1773645249; cv=none; d=zohomail.com; s=zohoarc; b=IDufGIg7vj0gJMiYF7iyLkDr2KAlWOEPy1navMvgjDSZHQzp3IU1LPtKgvY1hPbPow+84PaDgQ8GcjNTLafMW532b3dvsKLlOxAJv7fIjIdmWjz5TEvLGqNDhlF5PcPDGm6bltnGXqSP3zDtW+f79Yz0Ef4U6Gf/tY2uDriKayE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773645249; 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=oTbAI5nQwt8L3qE7iScD8wYy0OZjyqx7A4iwVeRG2DM=; b=bunHepWgQztTykipAgxvsT9oIG/FBAT59QOMu9lMg9gDfNrfxz48hRzvnwm6PtY3YRizJAZC7OjGBuAqUOomzLMFPkQl5Nk/mEUmR9RMAarBYDxAarhE6wwchxPYP9Wr9SetkBdLGUx31GyyEDhy9UN6Ae6OETTiywNJqqi6OVs= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773645249895178.68336331375156; Mon, 16 Mar 2026 00:14:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w226W-00080c-Rl; Mon, 16 Mar 2026 03:11:08 -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 1w225k-0007VL-I3; Mon, 16 Mar 2026 03:10:25 -0400 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w225d-0007kf-Tp; Mon, 16 Mar 2026 03:10:15 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 9A015193C25; Mon, 16 Mar 2026 10:10:02 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 97E6138004D; Mon, 16 Mar 2026 10:10:05 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773645002; bh=yS6wJVRyK2NZzmnCyDXLV5GJr4GKcXKiMWKEFsAE4xo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IIG0MwG5Ld9LXWYQB4q+4UVxcU1f0N4lKjmPlfoYP6hANS04Qc77LwXA5A/obFsOr BCfyBp/HaR42qG/2sQSYym0gNUHw/yHMefLqUuAHN+qBZDLMJl7wL/wgxljig/rEgk TvwMTV59WZItjtWCrSYO8tHqmQC83NZRMBK54VgjSGG8xh7ht+ap22V0bMseF4eDkw bVBD5RkPPzKaXlx8VQX6a0Z2zRDMm+0Uw7yNkxgft/fu8NWH8rVrSxLhhj77E2GkIR i54Wwo3/wBQMovEDh7j9V67A0VpfiD4O26ECahG6qOs4ChuBP56FYB1KehBTVNohhr My4NTHhizUiqg== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: Sergei Heifetz , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 03/14] dump/dump.c: reorder usage and assertion of block Date: Mon, 16 Mar 2026 10:09:51 +0300 Message-ID: <20260316071005.91624-4-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260316071005.91624-1-mjt@tls.msk.ru> References: <20260316071005.91624-1-mjt@tls.msk.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773645250913158500 Content-Type: text/plain; charset="utf-8" From: Sergei Heifetz Reorder the code so the assertion of block occurs before it is used in the subsequent lines. Signed-off-by: Sergei Heifetz Reviewed-by: Laurent Vivier Reviewed-by: Peter Xu Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- dump/dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dump/dump.c b/dump/dump.c index f7a99a7af2..80ed6c8d21 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -1288,6 +1288,7 @@ static bool get_next_page(GuestPhysBlock **blockptr, = uint64_t *pfnptr, /* block =3D=3D NULL means the start of the iteration */ if (!block) { block =3D QTAILQ_FIRST(&s->guest_phys_blocks.head); + assert(block); *blockptr =3D block; addr =3D block->target_start; *pfnptr =3D dump_paddr_to_pfn(s, addr); @@ -1295,7 +1296,6 @@ static bool get_next_page(GuestPhysBlock **blockptr, = uint64_t *pfnptr, *pfnptr +=3D 1; addr =3D dump_pfn_to_paddr(s, *pfnptr); } - assert(block !=3D NULL); =20 while (1) { if (addr >=3D block->target_start && addr < block->target_end) { --=20 2.47.3