From nobody Tue Apr 7 02:37:16 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773686876; cv=none; d=zohomail.com; s=zohoarc; b=Z87H3eYoTCXl16L3UQhk0uZr0vfcfaLGsaPgzxcLMJhTg8q3MKGuEjOBYTrGr4yIknPUJRttvAK//sOTtpWSn4UM34lvOP723RDbxGzrf2OzQXCr8enkUNgfPTXGroRNKCoEHkfDy8tYVC2NqFz981tTB/GxlVDUArmnf3MED4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773686876; 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=0JwfkhT9sSlS9UqhjPbzhhn/aYQKLtUB2y+zwcN3UPM=; b=bcM4PuwSHRq8ITu30ugSMVk4FetwW3mf1GecxAw7VTUZ/F5EOZN7u6tdFntv82xp3nMxXmnyl6xxVGnfMJq6X08FvggV01isOpu8aYRbmbpWT0IREnVlHVrSzKHU9kUWGrza346OSuWAlt9A6mgnlzPuG02PCfpun85fdmV0+v8= 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 1773686876868967.4229891700587; Mon, 16 Mar 2026 11:47:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2Cxy-0000C6-QE; Mon, 16 Mar 2026 14:47:02 -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 1w2Cxw-0000Be-TC for qemu-devel@nongnu.org; Mon, 16 Mar 2026 14:47:01 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2Cxu-0006Br-OK for qemu-devel@nongnu.org; Mon, 16 Mar 2026 14:47:00 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-2ad21f437eeso235845ad.0 for ; Mon, 16 Mar 2026 11:46:57 -0700 (PDT) Received: from trieu2-huynh-trieuhpn-ubuntu24.bee-live.svc.cluster.local ([27.122.242.65]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b04f40f515sm77284145ad.74.2026.03.16.11.46.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 11:46:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773686816; x=1774291616; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0JwfkhT9sSlS9UqhjPbzhhn/aYQKLtUB2y+zwcN3UPM=; b=UEMYlzxgkKJbZJ9hVZ3e6hL5cvdDUSj3MiBhKwFx/lNOlyszPGr8s/XI2nQ+3rGYNc WfbgkQeHEvs8VUwj0njeSREKMD1uf3eBS3rzTC+bOOfiGuwFZEPyh1lLkcqQJCd+G1Yv /G11pAxct6RmWmh7Ih6ze2c3gIxSxaxS/gsBuxykEBUjlrmFFF76DUCzvJb4IwvQSusx T/FKNnwP3tqaQN/NBIm4Nlb1+jauuIHTkuuvxkEG4YnR3uIKSVsdj84c8cBfipMuqgFO zX2gCeuMCet76rI2sfEvGWfK9mMJcRN7NQ/FZa1ZjBCMHFI95p9KwVVVY2zSF3qFzYfP oEbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773686816; x=1774291616; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=0JwfkhT9sSlS9UqhjPbzhhn/aYQKLtUB2y+zwcN3UPM=; b=Cz0Fymk5q5pEhoNRdrJes8V+Ph28JJ2d17gr1f3k0QnXb5MZJYF5oCP6OwTNhMbNh5 2EIeQhwefa5Pp7ou9udgmlv/YhZ6QJC5s7xnMaydNfc/ED/yIbREMAhUo6Wd4n0HOiVL 3h+5eN9waxHrjhbpAk7JA8kkdGBUwYhlOxFRNFG8Q7RpXIaO3wO9S9xTlhEjcqcmYuZz 8ORiQ/Ar8DysTYlu4f2DeIejCpI6WROa144Ou76V4zLNh8Hs3+AVgi/rC+YNCRSaY+b+ QckakKd5S9vvYytI5ITRIy3bcWABEuT1FYw06VQ7+gf8NJfK84/THc1saPKhO92NI88I fLHw== X-Gm-Message-State: AOJu0Yzducviof1uxOazTLcWgutShcwDbzUmJicgGpEziGxaPYzSv0s3 fXbvYZnVeFrQa4uq/AK2+ljwcC7UmiJx+qvdmoTge1fqlFWn1K8iDMRCyrQz6pSz X-Gm-Gg: ATEYQzyNczyuBr+N3aSVT/mFDB7w8h60b1G5qCTztWbOIgYhT5qySfam30ALI1k2eXq 6oHzbMdJJM0hDP52SI+WfGo9essR4kVwAuVuHBrUbDObE/vyX36HUpWEMWDx5AojJAQ5p1uVaXa ftx8iAeeLh6MzmSQnTCZcmqk2Vt8JK5YfMLbq00RSG7zE0XW5YvegRFsmqd2Y8pt3fbSfWkfU4U bwx5QVOhn7tzaNwXYQklv3M/LG+BvFsdwffguyZEAra7IQdIBxNv2VtDItz7WfMhKffU6gHkpsA 3qEEfg/5AW6poT5o86paaHTdUbvh3TVieIA3aS+OefJV3BgGh/+8WgDXczbJ2ljxwGnD1hmHKtI l4GPS6jDRPpR8W6mIiE4Q0Y65DjLtmR2C1+S6cI9pE4xg4zv0UR+ITFYn8mRxY9KAj3lD9VGxNA tUJgI9QRb/iRN5IzA6Teo+a3L23HsMuRFFHJ8hvxNkMU1oOZuwURJi6wDPtBOyRr51GAq+hN7x4 HJVX5MBPg== X-Received: by 2002:a17:902:ce07:b0:2ae:be67:722f with SMTP id d9443c01a7336-2b063758ee6mr5034825ad.22.1773686816093; Mon, 16 Mar 2026 11:46:56 -0700 (PDT) From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh Subject: [PATCH v3 v3 1/4] hw/core/loader: fix error handling for load_image_targphys callers Date: Tue, 17 Mar 2026 03:46:37 +0900 Message-ID: <20260316184644.68116-2-vikingtc4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260316184644.68116-1-vikingtc4@gmail.com> References: <20260311183432.214960-1-viking4@gmail.com> <20260316184644.68116-1-vikingtc4@gmail.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=2607:f8b0:4864:20::635; envelope-from=vikingtc4@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: 15 X-Spam_score: 1.5 X-Spam_bar: + X-Spam_report: (1.5 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, 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 @gmail.com) X-ZM-MESSAGEID: 1773686878601154100 Content-Type: text/plain; charset="utf-8" Use QEMU's Error API to handle load_image_targphys() failures consistently across callers. - Use &error_fatal for callers that previously passed NULL, ensuring the process exits early on failure instead of continuing in an invalid state. - No functional changes. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/413 Signed-off-by: Trieu Huynh --- hw/alpha/dp264.c | 2 +- hw/hppa/machine.c | 2 +- hw/m68k/next-cube.c | 11 +++++++++-- hw/m68k/q800.c | 2 +- hw/m68k/virt.c | 2 +- hw/microblaze/boot.c | 3 ++- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 98219f0456..2ab3c14747 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -190,7 +190,7 @@ static void clipper_init(MachineState *machine) /* Put the initrd image as high in memory as possible. */ initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; load_image_targphys(initrd_filename, initrd_base, - ram_size - initrd_base, NULL); + ram_size - initrd_base, &error_fatal); =20 address_space_stq_le(&address_space_memory, param_offset + 0x1= 00, initrd_base + 0xfffffc0000000000ULL, diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index ec63dc1297..99a4c22c73 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -507,7 +507,7 @@ static void machine_HP_common_init_tail(MachineState *m= achine, PCIBus *pci_bus, } =20 load_image_targphys(initrd_filename, initrd_base, initrd_size, - NULL); + &error_fatal); cpu[0]->env.initrd_base =3D initrd_base; cpu[0]->env.initrd_end =3D initrd_base + initrd_size; } diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 26177c7b86..4bfe5bcf56 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -1326,9 +1326,16 @@ static void next_cube_init(MachineState *machine) memory_region_init_alias(&m->rom2, NULL, "next.rom2", &m->rom, 0x0, 0x20000); memory_region_add_subregion(sysmem, 0x0, &m->rom2); - if (load_image_targphys(bios_name, 0x01000000, 0x20000, NULL) < 8) { + Error *local_err =3D NULL; + if (load_image_targphys(bios_name, 0x01000000, 0x20000, &local_err) < = 8) { if (!qtest_enabled()) { - error_report("Failed to load firmware '%s'.", bios_name); + if (local_err) { + error_report_err(local_err); + } else { + error_report("Firmware image '%s' is too short.", bios_nam= e); + } + } else { + error_free(local_err); } } else { uint8_t *ptr; diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index ded531394e..c0d78eb7d7 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -633,7 +633,7 @@ static void q800_machine_init(MachineState *machine) =20 initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; load_image_targphys(initrd_filename, initrd_base, - ram_size - initrd_base, NULL); + ram_size - initrd_base, &error_fatal); BOOTINFO2(param_ptr, BI_RAMDISK, initrd_base, initrd_size); } else { diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index e67900c727..ffe6e23415 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -292,7 +292,7 @@ static void virt_init(MachineState *machine) =20 initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; load_image_targphys(initrd_filename, initrd_base, - ram_size - initrd_base, NULL); + ram_size - initrd_base, &error_fatal); BOOTINFO2(param_ptr, BI_RAMDISK, initrd_base, initrd_size); } else { diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index a6f9ebab90..4ad5ffd34b 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -38,6 +38,7 @@ #include "hw/core/loader.h" #include "elf.h" #include "qemu/cutils.h" +#include "qapi/error.h" =20 #include "boot.h" =20 @@ -171,7 +172,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is= _little_endian, /* Not an ELF image nor an u-boot image, try a RAW image. */ if (kernel_size < 0) { kernel_size =3D load_image_targphys(kernel_filename, ddr_base, - ramsize, NULL); + ramsize, &error_fatal); boot_info.bootstrap_pc =3D ddr_base; high =3D (ddr_base + kernel_size + 3) & ~3; } --=20 2.43.0 From nobody Tue Apr 7 02:37:16 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773686876; cv=none; d=zohomail.com; s=zohoarc; b=gEVmVcx0f8Ghigr6C7HPL08Zd7QYXgSRczB4+amJwA8U3C1Gkvv80a9H4/y9kHR5kk7+PWgursFCaT7ikwopRmqpXMqc7Z5+YHqLhh7gX2QlSMRdu64j2NKHuAsHHgEGCV96p13Jn5S09DNfQighaKEKf7OGkOvX39mIWEfWTns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773686876; 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=RAF+Ctc/n8rztxL19g6KwtSiXS2fa1crOXpQVEMXVww=; b=CrKzKCzY3tXH8P6CjojU5rmKuCtuautxg2l1svD3awtFYBLgcDUe+qCEK7P0bYMqfgsFkD9Swh+yqQDwlpz0HQduwCcKJJjBjJLR4hSwoKmvKkDeVHRFttWSGxxD4bSB0SiMBKCEitLJezWgwZfouoZteR/ENipE9A62dbzwioU= 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 177368687677596.66931345392936; Mon, 16 Mar 2026 11:47:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2Cy0-0000CW-1S; Mon, 16 Mar 2026 14:47:05 -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 1w2Cxy-0000Bo-7c for qemu-devel@nongnu.org; Mon, 16 Mar 2026 14:47:02 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2Cxw-0006Bz-MA for qemu-devel@nongnu.org; Mon, 16 Mar 2026 14:47:01 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2aae4816912so32416385ad.2 for ; Mon, 16 Mar 2026 11:47:00 -0700 (PDT) Received: from trieu2-huynh-trieuhpn-ubuntu24.bee-live.svc.cluster.local ([27.122.242.65]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b04f40f515sm77284145ad.74.2026.03.16.11.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 11:46:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773686819; x=1774291619; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RAF+Ctc/n8rztxL19g6KwtSiXS2fa1crOXpQVEMXVww=; b=LbOJWHAzGEzRIxeV7qZzZCKf1A/Fg/hKb1QieHZ6OMUZQGkcPPdZ38OmW0OZVvbIep xwdTonHZLwUNN8s9B2lw0yra8ux7QdG9RF/sKOs+EN9+gqkofhsrSvz9353ku3hzf/Uk rdc9NfPq3ID2WRiZBgSlwNNQvYMY4UOebmCVQYMjzb36Fu+gHYNAgdETB514nsDDU8+x RdpEqhJwDasQPAspOFwoVGaPJYJ/1l9+DAnUUtU2r5cjQjgcfkrN1raYCH2WdZmeA79e 2MwMBTs5dhy/2+OOa0qDNg3KKjaoV4VWqQ3pQntS1r+BeUXoEtc8K/4XGLcfJfhpZTlx qktw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773686819; x=1774291619; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=RAF+Ctc/n8rztxL19g6KwtSiXS2fa1crOXpQVEMXVww=; b=B2QKLx+Tj8mrRvHBFGI5FqzrGFRGt/bR+ON8fTWRvyV0U7dMDf3BNu+16Sg4s/fu4R IFvzdEz93bX7nbBQEweD+41FaNyUpH2OzxgrBMIE8HNok6TfDeyaA2xqbmvgemeogkwj gguMAjJuKjLDb3VwmiX4iCOmtvz5I2xYb2lLZTbmwtzUrvXu4Q4ICv4KlDfdc28SJrpg 3GKFBJ7MIycPHhG+5y96O8DgDRTGA6u+QuoJnYagLomp4odOYU6kooyZWcLjM5oNM3yL Y8K8Mr6mefQpvk0xywDU701vUhrAanM3kPzM6ENdKRKr4eMZHBE5jtS08mQTec3Pq+Of omNA== X-Gm-Message-State: AOJu0YwbToaNY/nrjrCczKO6jr++yjBOHsCr43CSxmr3b0xKVhTstImp dvf+PBrMw3Lje+5Lt7udTsqWeiUUt6LJEe/8IJa61SfDQ/DOvaGTZ09KBiVMc9Ic X-Gm-Gg: ATEYQzxkrAypFmFCMg9eHwbgN2lEHU2jHRK2/ruH7WNP609jC92AXNXg23+KijOE6m0 g5iO5doxCmEEkvhTJoZiM9p4n+gMxNb+8ykIp9vi7S2dOe49p0bRXXMciCQ4rj2kRYZOToLVsyv sanRBZuGmvmk3vn5AsXRa5vrd1QUD74WdN2yStp5cUaokhIR+HzKrkqhD/HNGPCpi6iE9q+dNOf m+BbIL5Qb1naLD4+IFnIdPwoIFAvbQ/FqSv+HCpMPbENqqXyT/+MWyTGzmMVNQbcaIFcSixvkMR h1ozm9oU1xpuXAra8v5geISafUsDIcyIuKQgUeJXWVsR0+dgsfklhBpxwq4MMDbw2vQnXsJ2cMN mJbvsgKqWUUFdxBvNeGwOlMt30l/FoBRevKtd4buixkbqJOPzYLRoa7TRJh8BjJQl3KIgVWDQDc l8WnD/fx725J872tamvDjn3nNBazmekVbjwwf7TWAi8WLdJ0OrGP9SA32Rj8X13T373opokbYVt rLumYvpfQ== X-Received: by 2002:a17:903:907:b0:2ad:bd4c:a5 with SMTP id d9443c01a7336-2aeca9b90bemr134492195ad.1.1773686818827; Mon, 16 Mar 2026 11:46:58 -0700 (PDT) From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh Subject: [PATCH v3 v3 2/4] hw/core/loader: fix error handling for get_image_size callers Date: Tue, 17 Mar 2026 03:46:38 +0900 Message-ID: <20260316184644.68116-3-vikingtc4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260316184644.68116-1-vikingtc4@gmail.com> References: <20260311183432.214960-1-viking4@gmail.com> <20260316184644.68116-1-vikingtc4@gmail.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=2607:f8b0:4864:20::62b; envelope-from=vikingtc4@gmail.com; helo=mail-pl1-x62b.google.com X-Spam_score_int: 15 X-Spam_score: 1.5 X-Spam_bar: + X-Spam_report: (1.5 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, 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 @gmail.com) X-ZM-MESSAGEID: 1773686878386154100 Content-Type: text/plain; charset="utf-8" Check the return value of get_image_size() and report failures for non-mandatory file such as FRU image. - Use ret < 0 to detect failures in getting image size. - No functional changes. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/413 Signed-off-by: Trieu Huynh --- hw/ipmi/ipmi_bmc_sim.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 012e2ee4fe..fd875491f5 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -2561,6 +2561,8 @@ static void ipmi_fru_init(IPMIFru *fru) g_free(fru->data); fru->data =3D NULL; } + } else { + error_report("Could not get file size '%s'", fru->filename); } =20 out: --=20 2.43.0 From nobody Tue Apr 7 02:37:16 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773686878; cv=none; d=zohomail.com; s=zohoarc; b=bo+uvg0ChiRYJ7gKvG/Ck4bZaWHdvE7ypJXoZ+JpncoHY1sruhgaFPkuGji0CCepvzecf971WhyxI3tCGuQJ6OIyeYsrAszlqSnOo7j/RHxRTdyQTHEfG+QyZ5xmjc3jOHcjq7vMcZ4aJMHGwq/16tBlZikW5+ohrDLzF7i5n9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773686878; 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=9AsPYgj95PXD3MBcJoJu/VQSlxFjkWCj9VT48jKP+PA=; b=ktKw7pagSO1QHGxCGrtPgkgHlu0PvYLyfybSg+Htbs2ksbsKYs6ILPDDKqr1Jg7WkuQ46pK6ZaOpDHaFc3DSTlnYewp/qqX/YmJHhMdUC2vULGk/VlHEJArCDrugosjiS3737yBSIzAlrlkAbNilf5oUiZTS5n3kqoF6RyueGO4= 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 1773686878040992.5350345383301; Mon, 16 Mar 2026 11:47:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2CyV-0000F8-AG; Mon, 16 Mar 2026 14:47:35 -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 1w2CyU-0000Ek-6R for qemu-devel@nongnu.org; Mon, 16 Mar 2026 14:47:34 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2CyS-0006EI-Cp for qemu-devel@nongnu.org; Mon, 16 Mar 2026 14:47:33 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-2ad21f437eeso241395ad.0 for ; Mon, 16 Mar 2026 11:47:31 -0700 (PDT) Received: from trieu2-huynh-trieuhpn-ubuntu24.bee-live.svc.cluster.local ([27.122.242.65]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b04f40f515sm77284145ad.74.2026.03.16.11.47.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 11:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773686851; x=1774291651; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9AsPYgj95PXD3MBcJoJu/VQSlxFjkWCj9VT48jKP+PA=; b=JBWwA4SS63psi908GzZEtZUp4I0BC61XPYavdJeGt1es64ShJNxMHLbL5QyR4t+3OQ MW5r1yBS1KfZl3HbvJmVfY7oeKRZEz2q9Ena2hQDRtos2o+5VF8ZTT6ukv+MvRP3i3SS yVbaGS157FdpPs9gZh2Jd8LIRislieoKitccChM/Q83yohhh0OBAYErAch2ANkqDQEV3 sv4c9ybwGx7fSRMdv7c711ekd/DY8L4ynH3AfJ6/6z1e1jQRttan2ryHN6rGDhIAXrzt Na2sfAyPdmLESFXhMo8p3GRsYyAjNn79QzQ3CvT/2VGYm1EjFHrdkc51mkkiBwKjMv/T JivA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773686851; x=1774291651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9AsPYgj95PXD3MBcJoJu/VQSlxFjkWCj9VT48jKP+PA=; b=gDAHaWH3geRXewtF2LbY/IRPfGeUOkfN7S1r0a2t5Ki+F5lXrM4FYjcUGbPvFk0cy9 t6/1QNYe1EigxO6E0qTESNsUYbR4RVpTwIU/wj8EVxa6YzLNT3txCnm+aR2rzhf4H2/r SuVDAF6OApX27qPpi4GKs8uJYfqa6NLugQGtnPzu2+1+jadcPEoCK/HwubedY2eHadKT 3C0g3cH9VYA/cuxSW8yvsXipVgdLUQoW9ipCNcchR+WcX/m+LDO8LG0AeimQoU5lLCP2 /lgJO0twrph6W3gAbsk//12HMZj99l+5sklzuHvGcGIOpjYVyeM/8BSpPTnOtmPxXEN8 nkpA== X-Gm-Message-State: AOJu0YwskDZH3nQcmwGvZTdqyvaWgjZxSSi7IG5MHHP7kRYF2H6/HgQY Lm9X8mCmh1jppkam/QtZHJq3OBbs9Ssu2z1UtogngieGev0ywJ5B4kr0VynipfrP3gQ= X-Gm-Gg: ATEYQzwP+jJamD85FOQgKv3vNXVxgyd0xCo53zmj+k85mMfx95v83lvEWTEbz+DUBLq Qp/YLZ1XWJ5rKc07aXJpcVMiZlJ2tJRSVBTsKW+4l3nPD3KX7qyvxC5D7g6deZDnOO9VD41rMaq 8xkwYNCBqVb1deQjI70srcXoEAj81lxZMZP6Ej4pxoRR5jE7u1SrxnF0rkFcB1ft5VX4Ki5vwy4 5Oz6PIdUzFugZkHFQj2AgxAYAwQ75sG8PzZhrKfH/h7PoqfhHgF/hASj1r3a6ym3blAlxlhe/Q8 qkbNPnBTxF9FQ5XGUBVFobp3YFY3dnSbUipXYjASCBDyFxgrq3hS8sw0dl0VY3f65jUWOrc80P3 HWu7fCBzc018lLpZFH37V97azaVWSA4sDmb/zOte/aPhVVusAsevqj5xLLfJuRaGp+gwLcU05UH u/WpQ1uK+STyJWZJQ5QyYhGU29zkdvYKGhq9uAO9j/xpSHgzpn2j+MSvzjh5agnzgIK5tOo6wvm nUMOJhWsY6nVrtUTnjP X-Received: by 2002:a17:902:e802:b0:2ae:46f9:a115 with SMTP id d9443c01a7336-2b0636844bdmr5135175ad.22.1773686850836; Mon, 16 Mar 2026 11:47:30 -0700 (PDT) From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh , Anthony Krowiak , Jagannathan Raman , "Maciej S . Szmigiero" , Matthew Rosato Subject: [PATCH v3 v3 3/4] util/event_notifier: fix error handling for event_notifier_init callers Date: Tue, 17 Mar 2026 03:46:39 +0900 Message-ID: <20260316184644.68116-4-vikingtc4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260316184644.68116-1-vikingtc4@gmail.com> References: <20260311183432.214960-1-viking4@gmail.com> <20260316184644.68116-1-vikingtc4@gmail.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=2607:f8b0:4864:20::635; envelope-from=vikingtc4@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: 15 X-Spam_score: 1.5 X-Spam_bar: + X-Spam_report: (1.5 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, 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 @gmail.com) X-ZM-MESSAGEID: 1773686880210158502 Content-Type: text/plain; charset="utf-8" Check return value of event_notifier_init() and return early on failure instead of continuing with invalid state. - Use ret < 0 to handle negative return value. - No functional changes. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/413 Signed-off-by: Trieu Huynh Acked-by: Anthony Krowiak Reviewed-by: Jagannathan Raman Reviewed-by: Maciej S. Szmigiero # for the Hy= per-V part Reviewed-by: Matthew Rosato --- hw/hyperv/hyperv.c | 4 ++-- hw/hyperv/vmbus.c | 4 ++-- hw/remote/proxy.c | 15 +++++++++++++-- hw/vfio/ap.c | 2 +- hw/vfio/ccw.c | 2 +- hw/vfio/pci-quirks.c | 2 +- hw/vfio/pci.c | 2 +- hw/virtio/vhost-vdpa.c | 4 ++-- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c index 27e323a819..aa278b179e 100644 --- a/hw/hyperv/hyperv.c +++ b/hw/hyperv/hyperv.c @@ -439,7 +439,7 @@ HvSintRoute *hyperv_sint_route_new(uint32_t vp_index, u= int32_t sint, sint_route->staged_msg->cb_data =3D cb_data; =20 r =3D event_notifier_init(ack_notifier, false); - if (r) { + if (r < 0) { goto cleanup_err_sint; } event_notifier_set_handler(ack_notifier, sint_ack_handler); @@ -453,7 +453,7 @@ HvSintRoute *hyperv_sint_route_new(uint32_t vp_index, u= int32_t sint, =20 /* We need to setup a GSI for this SintRoute */ r =3D event_notifier_init(&sint_route->sint_set_notifier, false); - if (r) { + if (r < 0) { goto cleanup_err_sint; } =20 diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index 64abe4c4c1..5388f4277f 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -1432,7 +1432,7 @@ static void open_channel(VMBusChannel *chan) goto put_gpadl; } =20 - if (event_notifier_init(&chan->notifier, 0)) { + if (event_notifier_init(&chan->notifier, 0) < 0) { goto put_gpadl; } =20 @@ -2450,7 +2450,7 @@ static void vmbus_realize(BusState *bus, Error **errp) } =20 ret =3D event_notifier_init(&vmbus->notifier, 0); - if (ret !=3D 0) { + if (ret < 0) { error_setg(errp, "event notifier failed to init with %d", ret); goto remove_msg_handler; } diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c index 5081d67e7f..e91566509f 100644 --- a/hw/remote/proxy.c +++ b/hw/remote/proxy.c @@ -52,9 +52,20 @@ static void setup_irqfd(PCIProxyDev *dev) PCIDevice *pci_dev =3D PCI_DEVICE(dev); MPQemuMsg msg; Error *local_err =3D NULL; + int ret =3D 0; =20 - event_notifier_init(&dev->intr, 0); - event_notifier_init(&dev->resample, 0); + ret =3D event_notifier_init(&dev->intr, 0); + if (ret < 0) { + error_report("Failed to init intr notifier: %s", strerror(-ret)); + return; + } + + ret =3D event_notifier_init(&dev->resample, 0); + if (ret < 0) { + error_report("Failed to init resample notifier: %s", strerror(-ret= )); + event_notifier_cleanup(&dev->intr); + return; + } =20 memset(&msg, 0, sizeof(MPQemuMsg)); msg.cmd =3D MPQEMU_CMD_SET_IRQFD; diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index e58a0169af..5c8f305653 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -180,7 +180,7 @@ static bool vfio_ap_register_irq_notifier(VFIOAPDevice = *vapdev, return false; } =20 - if (event_notifier_init(notifier, 0)) { + if (event_notifier_init(notifier, 0) < 0) { error_setg_errno(errp, errno, "vfio: Unable to init event notifier for irq (%d)= ", irq); diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 2251facb35..ce9c014e6a 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -418,7 +418,7 @@ static bool vfio_ccw_register_irq_notifier(VFIOCCWDevic= e *vcdev, return false; } =20 - if (event_notifier_init(notifier, 0)) { + if (event_notifier_init(notifier, 0) < 0) { error_setg_errno(errp, errno, "vfio: Unable to init event notifier for irq (%d)= ", irq); diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 7b907b9360..66e02b15a4 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -318,7 +318,7 @@ static VFIOIOEventFD *vfio_ioeventfd_init(VFIOPCIDevice= *vdev, =20 ioeventfd =3D g_malloc0(sizeof(*ioeventfd)); =20 - if (event_notifier_init(&ioeventfd->e, 0)) { + if (event_notifier_init(&ioeventfd->e, 0) < 0) { g_free(ioeventfd); return NULL; } diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 94c174a773..1945751ffd 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -70,7 +70,7 @@ static bool vfio_notifier_init(VFIOPCIDevice *vdev, Event= Notifier *e, } =20 ret =3D event_notifier_init(e, 0); - if (ret) { + if (ret < 0) { error_setg_errno(errp, -ret, "vfio_notifier_init %s failed", name); return false; } diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 2f8f11df86..9c7634e243 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -1075,13 +1075,13 @@ static int vhost_vdpa_svq_set_fds(struct vhost_dev = *dev, int r; =20 r =3D event_notifier_init(&svq->hdev_kick, 0); - if (r !=3D 0) { + if (r < 0) { error_setg_errno(errp, -r, "Couldn't create kick event notifier"); goto err_init_hdev_kick; } =20 r =3D event_notifier_init(&svq->hdev_call, 0); - if (r !=3D 0) { + if (r < 0) { error_setg_errno(errp, -r, "Couldn't create call event notifier"); goto err_init_hdev_call; } --=20 2.43.0 From nobody Tue Apr 7 02:37:16 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773686877; cv=none; d=zohomail.com; s=zohoarc; b=TC3A6Pswv1fseO7V9Naq2pWFUNzlIuyjhLqzqDrAqje41sTI8xTTMNf79ijOUMuof+X5bdaheaK6el1wn/jCcXN5fbNYdTemQ7V8wMro/oFcDniytb5c7b14QrQ5dniizNQ9VnPgahmND8uanayqQGd5Cfaebq1eQA+L+mtEhMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773686877; 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=rcq98p8TBMj9rp8LW0tSIRQYuIxm2SJ2Ri6ycH/WQ9o=; b=OvwzA02YaA65uhKDxDSaJvRhZncUagdpNDZQdVFiaNiNOyxfT1QzqpBieAUnSePP5m9lUbJ72Ie3Nr8XZ+UH6sp3E00XZ12g4/k78Nd84gtwtaUYeUWft2Ee6+B3uU3jUR7Zy6fzmjan8gRc1vDQnKL7KPSvVlhVHZGgdeqON6o= 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 1773686877134994.100092742838; Mon, 16 Mar 2026 11:47:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2Cyg-0000G1-VP; Mon, 16 Mar 2026 14:47:48 -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 1w2Cyb-0000Fh-CL for qemu-devel@nongnu.org; Mon, 16 Mar 2026 14:47:43 -0400 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2CyZ-0006F4-Iy for qemu-devel@nongnu.org; Mon, 16 Mar 2026 14:47:41 -0400 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-2b04d051664so17538175ad.0 for ; Mon, 16 Mar 2026 11:47:39 -0700 (PDT) Received: from trieu2-huynh-trieuhpn-ubuntu24.bee-live.svc.cluster.local ([27.122.242.65]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b04f40f515sm77284145ad.74.2026.03.16.11.47.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 11:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773686858; x=1774291658; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rcq98p8TBMj9rp8LW0tSIRQYuIxm2SJ2Ri6ycH/WQ9o=; b=mTJX1hKr+M44gpD5dnzpCu8yHgkz2aAX63foBxMne8iT/ozq0K3eHtesinooFWugP5 qtqH8TrDxw8mib5hwuv+vhlFjQqhOujH6/wcBSQIAUzhUz4e+SM4z06uHhu4Rb0WiibH TXPWr+VzcyY3UWH/aYh7+DE6ab3dtK8PnJLw9OMD/Nn6XGZUFplYpk21RIKTwvoZ8JtQ fAystrXb8/Wdrz5Sb6eTEZvNEQmU3PXDyaCruuNezMQppRPJe1jlZfDzk/7/TMcN02l1 iSWSQoZymyhOsMlU6YGYx+qBrdgVUhjGu8ziaICwrvmtovwmrM95EQnDeG+DrPUoFJdL 80xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773686858; x=1774291658; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=rcq98p8TBMj9rp8LW0tSIRQYuIxm2SJ2Ri6ycH/WQ9o=; b=MrtofNJE7S3zBe9h9nHLhWxZFppnihq7RjYAOzedRzOasmErP9oqNhVjKKfAIasF9/ IsyE0wINWyyzqTzc4dNXPhwkthrghsslsHZhmEwuPMJek0C3IBfF9I2PZpvVCD6B/CwD I+vMP2uxCrq+fnvo98nTO4NGvNjYiynee9bm1L8m/KUWgN01a86e1kB7GRYoihWYqbaB p0cJx+yczssWgCGHbTuk87+B5zt/UHUcXPPU8VYUfi8IgT7HG2szNviGRv3bewRzCPTF nZSPLaQ2sLDIPvSOCvLRIAwpqrprd7wkQbgdc4TqmCwhZFl4XSMb3kB1Nei7IIHcVKzv LdWg== X-Gm-Message-State: AOJu0Yy5LF8X3U+9+3XKai2o890QU6plZ9uTuwwFlxeR4mjKlxfy+KPy EQnCyolpMFhq0iocOTUkoESAtpdl7cXONpYM2DWUg0ngM3/7X8jAqm65mJ5aD7mw X-Gm-Gg: ATEYQzyQ0y2jjoXeMCG5C/RG/hdyJ2awW240rvIqnsOuJh0ieMHsDxqhLeLCObxqoHu JHPL6lWaIRpwZuiFHg45JKEm1hSxlERb40pmxsGbM6rFnsup7HWMf/RLvHdpOJnKfBEJ6mHTyyQ OhYGWnOxoVs4jCdC/cT4bhz8AV2al1gJxeOYeV9JgDgCUQmdzJeyeOQXNmlJ5/NdORQCpp2dLwT XN1U8Rn8+TEf9GvtR9MczI/BmkvIp7HLLUkXGVoPFWGbdev/WiMhqJ+hUYe10gD+yKYVm4tIGsZ Z3iCzsUNAl5fw2x9tpuNzVQymm9zcZnjii9gAusJAK4gGQcuqn6ObZScqOvt+vzMjPY/TXglg69 T6MCMPtac6THhabMFNX4fzScsrRf4PWOtPeQHALQqWJ6lCWcCf5IFDGcPI1uCMn1wPjOQzZn59F 2bS+/gyfiXyjPyzrVPV/kmChrwZoC3TqDpsVtneSELkKhN6UbUkjjrNTa+VKlJ2+bZmeOFEAcMl qQL/yy03480sf32XaAa X-Received: by 2002:a17:903:3c6e:b0:2ae:80f9:d8ad with SMTP id d9443c01a7336-2aeca9412c6mr153357785ad.5.1773686857845; Mon, 16 Mar 2026 11:47:37 -0700 (PDT) From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh Subject: [PATCH v3 v3 4/4] hw/pci/msix: fix error handling for msix_init callers Date: Tue, 17 Mar 2026 03:46:40 +0900 Message-ID: <20260316184644.68116-5-vikingtc4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260316184644.68116-1-vikingtc4@gmail.com> References: <20260311183432.214960-1-viking4@gmail.com> <20260316184644.68116-1-vikingtc4@gmail.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=2607:f8b0:4864:20::633; envelope-from=vikingtc4@gmail.com; helo=mail-pl1-x633.google.com X-Spam_score_int: 15 X-Spam_score: 1.5 X-Spam_bar: + X-Spam_report: (1.5 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, 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 @gmail.com) X-ZM-MESSAGEID: 1773686878485154100 Content-Type: text/plain; charset="utf-8" Check return value of msix_init() and return early on failure instead of continuing with invalid state. - Use ret < 0 to handle negative return value. - Use errp parameter to handle failure instead of NULL. - No functional changes. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/413 Signed-off-by: Trieu Huynh --- hw/net/igbvf.c | 2 +- hw/net/rocker/rocker.c | 2 +- hw/pci/msix.c | 2 +- hw/scsi/megasas.c | 16 +++++++++++----- hw/usb/hcd-xhci-pci.c | 16 +++++++++++----- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/hw/net/igbvf.c b/hw/net/igbvf.c index 48d56e43ac..9a165c7063 100644 --- a/hw/net/igbvf.c +++ b/hw/net/igbvf.c @@ -260,7 +260,7 @@ static void igbvf_pci_realize(PCIDevice *dev, Error **e= rrp) =20 ret =3D msix_init(dev, IGBVF_MSIX_VEC_NUM, &s->msix, IGBVF_MSIX_BAR_ID= X, 0, &s->msix, IGBVF_MSIX_BAR_IDX, 0x2000, 0x70, errp); - if (ret) { + if (ret < 0) { return; } =20 diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 4a7056bd45..910dce901b 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -1228,7 +1228,7 @@ static int rocker_msix_init(Rocker *r, Error **errp) &r->msix_bar, ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_PBA_OFFSET, 0, errp); - if (err) { + if (err < 0) { return err; } =20 diff --git a/hw/pci/msix.c b/hw/pci/msix.c index b35476d057..1b23eaf100 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -432,7 +432,7 @@ int msix_init_exclusive_bar(PCIDevice *dev, uint32_t ne= ntries, 0, &dev->msix_exclusive_bar, bar_nr, bar_pba_offset, 0, errp); - if (ret) { + if (ret < 0) { return ret; } =20 diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index f62e420a91..a29742d449 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2380,11 +2380,17 @@ static void megasas_scsi_realize(PCIDevice *dev, Er= ror **errp) memory_region_init_io(&s->queue_io, OBJECT(s), &megasas_queue_ops, s, "megasas-queue", 0x40000); =20 - if (megasas_use_msix(s) && - msix_init(dev, 15, &s->mmio_io, b->mmio_bar, 0x2000, - &s->mmio_io, b->mmio_bar, 0x3800, 0x68, NULL)) { - /* TODO: check msix_init's error, and should fail on msix=3Don */ - s->msix =3D ON_OFF_AUTO_OFF; + if (megasas_use_msix(s)) { + ret =3D msix_init(dev, 15, &s->mmio_io, b->mmio_bar, 0x2000, + &s->mmio_io, b->mmio_bar, 0x3800, 0x68, + s->msix =3D=3D ON_OFF_AUTO_ON ? errp : NULL); + + if (ret < 0) { + if (s->msix =3D=3D ON_OFF_AUTO_ON) { + return; + } + s->msix =3D ON_OFF_AUTO_OFF; + } } =20 if (pci_is_express(dev)) { diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c index aa570506fc..c5446a4a5e 100644 --- a/hw/usb/hcd-xhci-pci.c +++ b/hw/usb/hcd-xhci-pci.c @@ -173,11 +173,17 @@ static void usb_xhci_pci_realize(struct PCIDevice *de= v, Error **errp) } =20 if (s->msix !=3D ON_OFF_AUTO_OFF) { - /* TODO check for errors, and should fail when msix=3Don */ - msix_init(dev, s->xhci.numintrs, - &s->xhci.mem, 0, OFF_MSIX_TABLE, - &s->xhci.mem, 0, OFF_MSIX_PBA, - 0x90, NULL); + ret =3D msix_init(dev, s->xhci.numintrs, + &s->xhci.mem, 0, OFF_MSIX_TABLE, + &s->xhci.mem, 0, OFF_MSIX_PBA, + 0x90, s->msix =3D=3D ON_OFF_AUTO_ON ? errp : NULL); + + if (ret < 0) { + if (s->msix =3D=3D ON_OFF_AUTO_ON) { + return; + } + s->msix =3D ON_OFF_AUTO_OFF; + } } s->xhci.as =3D pci_get_address_space(dev); } --=20 2.43.0