From nobody Tue Apr 7 22:04: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=1773234993; cv=none; d=zohomail.com; s=zohoarc; b=kfFmhZm96EfermzU1k5z0oe9XqbOy6+d1FJoWmZ8yBM4y8aPHtHKYsvq6y0/3KNbnuSNgdxPoO0KoTrX9wwFo/KCiNcYPVof/cvfGUoiuMz7ydr95tzrLRzhbda7lppcCwWNEU5PVr/WoZ/R4KyUBN6erLGJSnbkfpe5Xl4L8lA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773234993; 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=aib1BAh5M0/WVaVVuWFg17CTYoL9n/LthhkUS9jzeSU=; b=OeJUyL32/vRtvSYP+Moulgq1vjnC+aTAkfz6b1lBG5ze8YH59lq9VG8SwDZZq3ao2y55ReStyMPf5Xhs5TIG9zktI+7bOO0tEkytZos3o5P6A6Av5UaPquoTjGGhji2L8PkPWjK8qIb+FsLXmVFGo1qEbgG6UkBvlcb0XOOm7mM= 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 177323499267470.96172786331476; Wed, 11 Mar 2026 06:16:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0JPc-0000ow-In; Wed, 11 Mar 2026 09:15:44 -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-0000mo-Bm; Wed, 11 Mar 2026 09:15:33 -0400 Received: from forwardcorp1d.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0JPN-0000Mb-Gf; 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 forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 156A580606; Wed, 11 Mar 2026 16:15:25 +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-WCu8oipK; Wed, 11 Mar 2026 16:15:24 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.com; s=default; t=1773234924; bh=aib1BAh5M0/WVaVVuWFg17CTYoL9n/LthhkUS9jzeSU=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=VNFO+oW8qUqstjz8iawyeIUPsWLxQ9qgZUSfuDp0wHLBSDHKlcGAmcbbodSQeTvwp SC5xvDIWTUNV+CoRjOVvK/AUQC4X/3I10UwmE4ocVFgVcWQXnNn7nRtX47Ghcu9FFT 2a3D43cyXKVsfXJGjvnJUQ8ATiYyUciOQLERYJeQ= 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 1/4] migration/savevm.c: reorder usage and assertion of mis->from_src_file Date: Wed, 11 Mar 2026 18:15:19 +0500 Message-Id: <20260311131522.58600-2-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.200; envelope-from=heifetz@yandex-team.com; helo=forwardcorp1d.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: 1773234995882158500 Content-Type: text/plain; charset="utf-8" Reorder the code so the assertion of mis->from_src_file occurs before the call to migration_ioc_unregister_yank_from_file, which dereferences it in qemu_file_get_ioc. Fixes: 39675ffffb3394 ("migration: Move the yank unregister of channel_clos= e out") Signed-off-by: Sergei Heifetz Reviewed-by: Laurent Vivier Acked-by: Fabiano Rosas Reviewed-by: Peter Xu --- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migration/savevm.c b/migration/savevm.c index 3dc812a7bbb..930a3391e35 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2885,13 +2885,14 @@ static bool postcopy_pause_incoming(MigrationIncomi= ngState *mis) =20 assert(migrate_postcopy_ram()); =20 + assert(mis->from_src_file); + /* * Unregister yank with either from/to src would work, since ioc behin= d it * is the same */ migration_ioc_unregister_yank_from_file(mis->from_src_file); =20 - assert(mis->from_src_file); qemu_file_shutdown(mis->from_src_file); qemu_fclose(mis->from_src_file); mis->from_src_file =3D NULL; --=20 2.34.1 From nobody Tue Apr 7 22:04: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 Reviewed-by: Peter Xu --- 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 From nobody Tue Apr 7 22:04: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=1773235008; cv=none; d=zohomail.com; s=zohoarc; b=HinKAgrWdu16fDxnK4HyRTLZC3WQR65T/EHjn8nQzUtyNs9LoqdWY2Zkv/e3XkQp51d6PGKeVd0nfbpiRveS05Bb4j5dfWqnngmrkyi1wbBCNGdd86/iDSbXAQcEQVgrJLMuYgfCo8GNEI+gXSYsVOZRstiFErksZQJeFu4Gmro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773235008; 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=UA/R0WQkrgbt3pL8qQzjwpD0OPbLj/fizGAQeQVn4Gk=; b=a6pSm26nvmkLsAOjpTIow1vf3RE/fQkaqnuPKUvtaF3rrE3nlrCoA4jo/VUWjeLiBpfrRfwGeegst0PymrVlgQAZ39T/7dChmX6t2h71Wk+lc+Nsx6o+OTX9TxRXmmkNnrHJ+eh+2uihI9Dq3elks1TPYnvyzAnNRE6fRadCEv4= 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 1773235008784600.691150864992; Wed, 11 Mar 2026 06:16:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0JPo-0000ty-UH; Wed, 11 Mar 2026 09:15:56 -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-0000mp-By; Wed, 11 Mar 2026 09:15:33 -0400 Received: from forwardcorp1a.mail.yandex.net ([2a02:6b8:c0e:500:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0JPN-0000Mk-H5; Wed, 11 Mar 2026 09:15:31 -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 15029C0209; Wed, 11 Mar 2026 16:15:27 +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-5q90nciX; Wed, 11 Mar 2026 16:15:26 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.com; s=default; t=1773234926; bh=UA/R0WQkrgbt3pL8qQzjwpD0OPbLj/fizGAQeQVn4Gk=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=ecItJ24nPn4ugGBF2B7038+TGQbLwc/guKbqQRSge3zrAlwCwQ/9GRYkrtaBrjuTr 5dTR0oupsNDsCVKbfF2QpdVUv6j6F0k2/JNLZGvCg4OtR73L3OD9VFdfBdH9wqhNtj hR6lWmZo7TcBko+iv7/4wSzcn3fnm1sDk8SoBlbg= 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, Peter Maydell Subject: [PATCH v4 3/4] system/physmem.c: remove useless assertion of block Date: Wed, 11 Mar 2026 18:15:21 +0500 Message-Id: <20260311131522.58600-4-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=2a02:6b8:c0e:500:1:45:d181:df01; envelope-from=heifetz@yandex-team.com; helo=forwardcorp1a.mail.yandex.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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: 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: 1773235010085158500 Content-Type: text/plain; charset="utf-8" It is useless to assert that block is not NULL because it is already dereferenced in the first line of the function. The assertion is also unnecessary because the function is called in only two places, and `block` can't be NULL in either of them: - In `migration/ram.c`, we have already dereferenced `block` in the code just before the call. - In `system/memory.c`, we assert `mr->ram_block` before passing it to the function. (We could split the declaration and initialization of oldsize, but then we would need to remove the const qualifier. As the assertion is useless anyway, removing the const qualifier seems worse.) Signed-off-by: Sergei Heifetz Reviewed-by: Peter Maydell Reviewed-by: Peter Xu --- system/physmem.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/system/physmem.c b/system/physmem.c index b0311f45312..317b359ebe2 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -2057,8 +2057,6 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsi= ze, Error **errp) const ram_addr_t oldsize =3D block->used_length; const ram_addr_t unaligned_size =3D newsize; =20 - assert(block); - newsize =3D TARGET_PAGE_ALIGN(newsize); newsize =3D REAL_HOST_PAGE_ALIGN(newsize); =20 --=20 2.34.1 From nobody Tue Apr 7 22:04: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=1773234965; cv=none; d=zohomail.com; s=zohoarc; b=ai8Dd3sZ9W3q42a5olzZyHzihnEk5DQgCh3wvOuncoCqmIBRk41iJk7arzz9w9s9hJarGmdPW3EyFQEpoGhRkmMjw3B23VmEhHecwUXGUQfPdH2+VVGPCuutBbqQ3Gr8uwQNV06mF+IIKb2HNR0Su3I5VUtRdwuNw2J7KF+A2w8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773234965; 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=tzPB6fjysN2r3rjRlnKTgZ2tmMc0GDYMM+Hwo4GReow=; b=WrZGxQLRdpSQaF+rm1PNDxem09VU4ySpvveS41iERycisai6cuVjpPOkI4JJO61aScHG5ucp8K/EinyZLRL3Qx3qPzGtlVpTGo2hKsnm2DoDDXzXzhwwrUHeLnyE78IbNEsTzwV7r2Pse8gJhUIHD67SU/5iwcCP7uiMJ5x244U= 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 1773234965652982.862573157597; Wed, 11 Mar 2026 06:16:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0JPW-0000oF-MG; Wed, 11 Mar 2026 09:15:38 -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-0000mq-Bm; Wed, 11 Mar 2026 09:15:33 -0400 Received: from forwardcorp1d.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0JPN-0000Mu-I4; 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 forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id EEA3D8062A; Wed, 11 Mar 2026 16:15:27 +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-YDaVl7co; Wed, 11 Mar 2026 16:15:27 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.com; s=default; t=1773234927; bh=tzPB6fjysN2r3rjRlnKTgZ2tmMc0GDYMM+Hwo4GReow=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=E5T7HrTXts1T37eZB7F797F26v9igZitn8mA7PVQhD+P7hhXoB0ahmqUnIyCplk2A waX8Car8zPvh4Hv0jHqfMrm9g7gVK2gILFYUojkjKNI78q595I9F9EYsZpFCCAs7Dz InNLvmlEUHLXyBN+uQu7/XmLxzJKFOxeyMgiLgts= 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 4/4] hw/usb/core.c: reorder usage and assertion of p->ep Date: Wed, 11 Mar 2026 18:15:22 +0500 Message-Id: <20260311131522.58600-5-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.200; envelope-from=heifetz@yandex-team.com; helo=forwardcorp1d.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: 1773234969286154100 Content-Type: text/plain; charset="utf-8" Reorder the code so the assertion of p->ep occurs before it is used in the subsequent lines. Signed-off-by: Sergei Heifetz Reviewed-by: Laurent Vivier Reviewed-by: Peter Xu --- hw/usb/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index b3f811c513b..9572a870cc0 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -423,10 +423,10 @@ void usb_handle_packet(USBDevice *dev, USBPacket *p) p->status =3D USB_RET_NODEV; return; } + assert(p->ep); assert(dev =3D=3D p->ep->dev); assert(dev->state =3D=3D USB_STATE_DEFAULT); usb_packet_check_state(p, USB_PACKET_SETUP); - assert(p->ep !=3D NULL); =20 /* Submitting a new packet clears halt */ if (p->ep->halted) { --=20 2.34.1