From nobody Tue Apr 7 23:44:29 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; dmarc=pass(p=none dis=none) header.from=yandex-team.com ARC-Seal: i=1; a=rsa-sha256; t=1773235000; cv=none; d=zohomail.com; s=zohoarc; b=kKiQ4+KJXiNdtyoRnXLVfuWpCD5HlcYfMqG9jIy2JqW7LmpYd9Yydjh1thhaNwg3wZwU28+C6L3GRhrSYE5oAv2pPf2qK3mwHrSBBf9pHKjju0UjfT7Ptz9BUGWVm6eqR1Yp/R4c2RO5d7W4sO7UvOa0ufWNvSiNEdMyCeCadUM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773235000; 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=iUTREIsMsoxJZYrRIxYpYeInFZJ/vFfyLJNkWygU7M8=; b=H9gEHZNmcvG1UAyRYGIHfpi1LqppKB2TjN4uXqCW1TF8AH9dAII0/CREgYGllzGMXdcJxcWfparhAW5+0xOTRMyplKlSNn9MXiJIB9+oWnbnK3QrAmaB637pHyX6SapNU4OsddpVIE3wZN1Nf91xYDM/QiXq35uH8wQxkfSjE2I= 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 1773235000507682.8460622618976; Wed, 11 Mar 2026 06:16:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0JPZ-0000oW-Lz; Wed, 11 Mar 2026 09:15:42 -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 1w0JPR-0000mn-Bm; Wed, 11 Mar 2026 09:15:33 -0400 Received: from forwardcorp1a.mail.yandex.net ([178.154.239.72]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0JPN-0000Mc-Gh; Wed, 11 Mar 2026 09:15:33 -0400 Received: from mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:bf1f:0:640:c739:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id 22913C01FD; Wed, 11 Mar 2026 16:15:26 +0300 (MSK) Received: from heifetz-lin.yandex-team.ru (unknown [2a02:6bf:8080:d28::1:5]) by mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id MFGaO30AdeA0-rzyliYDq; Wed, 11 Mar 2026 16:15:25 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.com; s=default; t=1773234925; bh=iUTREIsMsoxJZYrRIxYpYeInFZJ/vFfyLJNkWygU7M8=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=YBc4aiBfHGr7XExuH6wBZ/fLtXfk6o3DhfFDRq0p3dju7PYq5et5fS+/r2Xlck1w8 Be4r3B5BPsiNj+qoibk3YP6aJgSJVOL05gGxRRS7CepmE1OCZTZNJb//lyj9xBPlKw mNKd/u9GdXxUDLfm7/xyyYto56eNJp335O+rLVrI= Authentication-Results: mail-nwsmtp-smtp-corp-main-66.iva.yp-c.yandex.net; dkim=pass header.i=@yandex-team.com From: Sergei Heifetz To: qemu-devel@nongnu.org Cc: Fabiano Rosas , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , Ani Sinha , qemu-trivial@nongnu.org, Laurent Vivier Subject: [PATCH v4 2/4] dump/dump.c: reorder usage and assertion of block Date: Wed, 11 Mar 2026 18:15:20 +0500 Message-Id: <20260311131522.58600-3-heifetz@yandex-team.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260311131522.58600-1-heifetz@yandex-team.com> References: <20260311131522.58600-1-heifetz@yandex-team.com> 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=178.154.239.72; envelope-from=heifetz@yandex-team.com; helo=forwardcorp1a.mail.yandex.net X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-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 @yandex-team.com) X-ZM-MESSAGEID: 1773235002548154100 Content-Type: text/plain; charset="utf-8" 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 --- dump/dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dump/dump.c b/dump/dump.c index f7a99a7af2e..80ed6c8d219 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.34.1