From nobody Mon Apr 6 18:30:31 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=1773843338; cv=none; d=zohomail.com; s=zohoarc; b=jdEVkhG0WRM/iRM3AeTENYZ5sgYTXaOJIgZSnOGz5RSOsSQRqTAjJWd24M5KQ/vjnTD1ZBUHiOGWVnmeQre5gGb1ZSX7Ho3L5viNHjtPJg8u/djuQhXr2yVBGAf7PU7QGO+5K6raw9EIMqlfPrvn66zowrH0NgH47kMCjNPZROw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773843338; 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=AEbNy1TPQELKc3EgslmrmKhjnoJ/DB2v+lEXp4pRnDJr5o+Ns6GCYVJc/vm2AxMqDsugiPm+noc7TEXq+QTEtmFG0unP8uS2+A9SvZkAIwR6BmR9pjou4NY5MhRwvkq/Vagu5nUDJkMWTCA06lhi/52zTao2aa3LbbipcBAd2R8= 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 1773843338508602.6899454665794; Wed, 18 Mar 2026 07:15:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2rgF-0006yj-Sy; Wed, 18 Mar 2026 10:15:27 -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 1w2rgE-0006yS-Mt for qemu-devel@nongnu.org; Wed, 18 Mar 2026 10:15:26 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2rgC-0005zC-Tp for qemu-devel@nongnu.org; Wed, 18 Mar 2026 10:15:26 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-829759ca646so4184098b3a.2 for ; Wed, 18 Mar 2026 07:15:24 -0700 (PDT) Received: from trieu2-huynh-trieuhpn-ubuntu24.bee-live.svc.cluster.local ([27.122.242.65]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6af06bd7sm2927272b3a.0.2026.03.18.07.15.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 07:15:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773843323; x=1774448123; 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=dPDbyJ8FXP+9PMx1GohxCvh4/hMmMwJGBf/C6j65FIDJvA22qpDupWREIIkbbZlL/p VF9/yskaGwgoXEQHFQb7Pkap+9ncE4mNXCYt4TrJYewnPZzXmoDkfHmxSId7VvW/yGFZ own503XP1AxZ2EzON+Q2fr/LG5FRGSeb0absY/aGrXWrteWSAluUsouefzeG9iH0q8D6 F/Cz06uYUe6DTdP9ugr5Lk/Yx36MT+9+SpJxFDaBv1qtZRtfx/iEtDJ6AML36xznfWHG L0hUgsf859NBAtKjUCXd95nX5x5C+3LrDIP/c+Bs58Ek4UBjGiOGTOWkindjPokFgTEt 84aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773843323; x=1774448123; 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=ZHPe/AuVbrejtSzdzNPzra+k9lGWjrDB4BLLK24grTq/xbJaZBfhT+ALRSh1peKOxR /1odMLj1g63CbSLZuL8pVMk/5uofaRK0pI/1A+6GzJ4i5UYe4A+o4WIfaIED4XSVqL48 youTplqaUvttqwh3Oxz4gOpTQuNaszkoRgIuaxhGEAPhp1rjC9aolQUTghjUAFZBx3SF 9CP7EnvIk1dhfbxJi8GzLkKgGwrjpUQMnr0nHEG+uCAt2GB5WlooKChsU3EEGE0o5O9G eS0gRYP8ukZWez/hOO4vyuwECqL/JYUUERlVGAnZTrcTWl/uy5+xE8Uhg8fGWfAD0M8g FRgA== X-Gm-Message-State: AOJu0YxyljMNPx1zBEpVmtzvGwcaYzamCXLVez47kpMoouD+w96Mq2Le D3gZlx5SKcRy42Va1TuWeCmSPsIpVTh554mg/h7XlpJkBbxejoNt5pq8F16plG41GYY= X-Gm-Gg: ATEYQzzvcytNWfCj4eVzgYR1d3EJIDydUQIkUVtNIAdVAuexj0Sl0++kbdgp9FqXR1F BtNsU1Nlt1xHgqLOndYzbZeDT6X+gsSBQB1kdonavayIAg20YQvQtIcsjwCt3fSoM5QdKidGhd0 nIZNOpN9ySVlTN285Mhp5M0kfWewJteWqBCMDXYSiqmpHXIPtARb62nUX3FPxuzfEPb9ilJUjj9 7En0cEwy5wH3VCFozHubqObOfnuH/tEMxQybUyUrCTqRMQDu/noqIpjFKqivvoq4BxlMK1T7DLp xGZQ3BXXI1CDaGo63CGrIKh6iMp/HXBIokd0N582uIgpMZTbX5cfVJEUfiyD4DixWoJU7XzIuwz BP8xGsquyzjnpeEb+dFnvO0PehcjFgGDFZQNSiWNtLgYCtCJGF71i1Ngzh6rSbD2I3r1oWiw3qY soulHkAxDCqjLhOWoSuug77tgpGQ53kwkteq84/gBCB3XU0lyzsgzCmP9P9bfU0qOm2Ww2iw4g4 SVT3v64Bg== X-Received: by 2002:a05:6a00:91de:b0:82a:6dc5:4e0c with SMTP id d2e1a72fcca58-82a6dc55684mr2327856b3a.27.1773843322630; Wed, 18 Mar 2026 07:15:22 -0700 (PDT) From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh , Richard Henderson , Helge Deller , Thomas Huth , Laurent Vivier , "Edgar E. Iglesias" Subject: [PATCH v3 1/4] hw/core/loader: fix error handling for load_image_targphys callers Date: Wed, 18 Mar 2026 23:14:10 +0900 Message-ID: <20260318141415.8538-2-vikingtc4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260318141415.8538-1-vikingtc4@gmail.com> References: <20260318141415.8538-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::42a; envelope-from=vikingtc4@gmail.com; helo=mail-pf1-x42a.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: 1773843339767158500 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 Reviewed-by: Peter Maydell --- 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 Mon Apr 6 18:30:31 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=1773843338; cv=none; d=zohomail.com; s=zohoarc; b=IfdD+EvR/VoK3Nhwk2Z4lYx0xKTqwDUYdVLTTb219qrNAq6D9IJga8evq5YIhr0v4EvmkmEyU3frHOuPmDI4tc+liF2V0IflFrAlWVoya8mDRVNlcSbkFIJuGHpndQ7Zze9PtDMlGTHfDP0McrnnHmDgSVtiDakMDDtf/LQCH+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773843338; 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=HWqqzCPgesAImXOd+s3nioEtI9ptMvjv0dZehGxlSSWMliiRpn8c3ViihyykWbT/T0TSt0MSEwZCGFuyFm9heJFhl9tts48uJawvY9udKA/rzhQPnXidhglvnMGUYoWVcJX7qt3Z18FE0miCE6uKl6aacmJC9cHkA8NUfUUwfNY= 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 17738433388921000.3679119088549; Wed, 18 Mar 2026 07:15:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2rgL-0007A5-Rg; Wed, 18 Mar 2026 10:15:33 -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 1w2rgJ-000752-Nk for qemu-devel@nongnu.org; Wed, 18 Mar 2026 10:15:31 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2rgG-0005zp-J7 for qemu-devel@nongnu.org; Wed, 18 Mar 2026 10:15:30 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-8296d553142so3245746b3a.3 for ; Wed, 18 Mar 2026 07:15:28 -0700 (PDT) Received: from trieu2-huynh-trieuhpn-ubuntu24.bee-live.svc.cluster.local ([27.122.242.65]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6af06bd7sm2927272b3a.0.2026.03.18.07.15.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 07:15:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773843327; x=1774448127; 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=DE6eC9/YrMniym4F98gkQ5ZKsibGuD4ZhZIp17+jyG518FZKWORlPnCbKtCRFqULOK WqlI2mJTnsh7vsB+1gPKbcbZUy0nlAnUzlNy/1yy+1G0pg1D/JxT7N9A9TM70tJvS9Vu l616OGXmbX2bi6R5aQJYJZomrbxeXXs05LrvRwDaqg5Lge1zNrmbOSNAMHJkEIac/uHl hYe7IU6X6QErne8znbS3bDSDotstPy4OWuFvve4Jr4HHujl1vbCcSmOdVMXT4YP6BYLn 8docSr7W4OHPm06Q1leO40MOm/yVOy9RgN72rFRDUk+hmW5ohcOwW31VgnMhKlqmEfzR ghbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773843327; x=1774448127; 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=gOYWjrFP7UQJtDtjKYCkCtgRDzwNYaGhNmA3T0uatG18Grvmab3Zl7++jxtv0T/VIO peKloqrUvYGe3WRhrHxfns9tKV9dd9aOoxdbFMUbbrDvhZyAtmyQJvxP9ga6IiaUPhrs lEi3IPdyVNibclVrMTo6YcZbeDPQeuhYXXEB76R2/+F9LbH1U56DM8qDm3n/h9Nl1wbx Z1LwMkh6/PK/Z4a34i2J1MQSwCviK7V9yVs3lQI3+pLE0zBEDMQYXbJIBPM3mFlQzCtu L2s9j9oWzgFe6rBV38THgmWKOL4AewToJR7SthH/pMuTjgkQwhWjEG6NI5WHpFxnwxzP NRTw== X-Gm-Message-State: AOJu0Ywqh+2F/J5PeIMTOD8Ro4sK8hFFZ8g52cIdr3R6eslehq9E/LPC YLCNWY09RA9j/OBUjqaxXNQnmOfCSsRwxU6BGn4aPmIRVmPbvVbmt2QWlCn0TGHB90s= X-Gm-Gg: ATEYQzzlrwQig/XZi+Q653IjUFXCE/uK/9EMHizuk28GFEW8RVtXV3PkT2rKGsGv2xz r38QyZV3/3XHx9JxzgDwkbxMI38YRgCXNUIsyTULpmEEgwlb9D6q6UUq0SCvrMZXjOTMc+4bHE1 HG7zd4pDmzjdamXFYARfYSNsEGfXfNG2VYD+0lbbO4Jo+HNXFaUlPeEEQI59ynYTJmbFEEfa73I Bx0G3GsnJaAbnwZpsGw98fe5+A6Nbrq74PIFdod43nm2M0GhjQFoTxdjpdxAjC0HS8m9/vnXoq5 Zn2QmUTJoLIXpC4kPOWkbaZU7Z1Xey3Az+VQRJp+TvpCZDERAqu8CWCwMPbms4STQfGfpH5+Hpy qmnFdbTIT4lFYzwJ9+WYEN3DebN5dNqn9YihoaEy/3ZZuC5MO8etljux+rYyX53bs8Q5sZHHSl7 N442E0PVD6GJIZ+EMBG3xjFMbOyxBCRbKPbfrDAI5drcd1eM3ryzVrDXn8HXMT0dRwRKG6/YYfa BekdqqCYJaU7tPRtQ0c X-Received: by 2002:a05:6a00:1d15:b0:824:ad1e:3b6e with SMTP id d2e1a72fcca58-82a6af17eeemr3305363b3a.49.1773843326639; Wed, 18 Mar 2026 07:15:26 -0700 (PDT) From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh , Corey Minyard Subject: [PATCH v3 2/4] hw/core/loader: fix error handling for get_image_size callers Date: Wed, 18 Mar 2026 23:14:11 +0900 Message-ID: <20260318141415.8538-3-vikingtc4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260318141415.8538-1-vikingtc4@gmail.com> References: <20260318141415.8538-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::436; envelope-from=vikingtc4@gmail.com; helo=mail-pf1-x436.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: 1773843349673158501 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 Reviewed-by: Peter Maydell --- 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 Mon Apr 6 18:30:31 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=1773843367; cv=none; d=zohomail.com; s=zohoarc; b=C4Cg22f0F/JMkPzoqDIxt+15Ozavfv5NIiGaP2aYj/xHDESRSc3encr2mNn9eVICOWiLhIN1LrY2VCsR436kgysnKfAMxHaZGngY4QnGoCioazeGRAmYfXsGqtFLv8HLlOCznCLfpMa2F4ZSRnA5VYAYQFb4/RVJLSogIkuQvBM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773843367; 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=SBiT6vlEs4FHvqWb5vivCxroMV4NYEwo7nX99bKUTpd5+JVPMtuP4+5t9AcQ7yUmFilGq32J5u3BsUPSL7x1dj9eRe2XtbjqhCkqUmtV5KE6Uq0hUNVB7NiZF3t67EbS77oTR6IKQefPG7Rzwpv0DO7m4+OZfVG+GrxW0+RSn8k= 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 1773843367519366.0256868045474; Wed, 18 Mar 2026 07:16:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2rgf-0007Ld-He; Wed, 18 Mar 2026 10:15:53 -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 1w2rgR-0007Fc-1o for qemu-devel@nongnu.org; Wed, 18 Mar 2026 10:15:39 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2rgM-00060J-RE for qemu-devel@nongnu.org; Wed, 18 Mar 2026 10:15:38 -0400 Received: by mail-pf1-x434.google.com with SMTP id d2e1a72fcca58-82a67ce6969so886331b3a.1 for ; Wed, 18 Mar 2026 07:15:34 -0700 (PDT) Received: from trieu2-huynh-trieuhpn-ubuntu24.bee-live.svc.cluster.local ([27.122.242.65]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6af06bd7sm2927272b3a.0.2026.03.18.07.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 07:15:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773843333; x=1774448133; 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=Ja0rutqfHkCD4mBBvgqyd0BtZrPUWHSL8npaKbpFtMHyNODifeKabtKnfVU8XsiCXe ouSa2syaBH/PYUamzy2ZLolxG3g1wGc1wSRM9JqcWYi2POmzKpZDnc9fOrE9wwCtTQsw kFsFAVbjHagaKIop0JgG3HTTUzQCUzubPPOYuMn4z1AIwq9fan2sJBwwCntBtPb48tA1 wjpAgLtMB7s4lq68GVcugX3pCvkEw0SNhsbzeNJ5aTM8LqQMS3hyqtvRdgDAV6pCM7AU kHV3k9xWWxyXd0d6XOS4UB7LD4fCJs6+oyrbLv1zNW/VuUQzCEJuJSpGBsbjg5AzaCK2 4y+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773843333; x=1774448133; 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=Dc55+C+DwAXkjytHhqXRe0Z3SNLCoblSGoJ1Zs/pUsuoFuMtnfO7+bp8xZnEvDjdKm zv1b4YjDx0f7VTl1IXYEBuBOoQACLWvNWTzDlc3ow+lVrFmFlfFiXGLIWVTaEtkFe//H QtP4011lacHj9OLp8zShFxBoq0ycwKGrRSwppLFWX3hjgVp5eowz+wdqBMcDqTDeR/IR GivOJTDgH/3LF0caZe9c8zrco25tkmcTPdFrsVOog1Y3LZVDYSnrCguKG7lDlPMREXbr N4Am+ocLIi4RQPEg1J3Cv327y/clay/EmvHIEWlnBy98EOCLXit90v+o4AUlb8g927ld bhqA== X-Gm-Message-State: AOJu0YxmiqMEh92cXCq22jorsStr9KyJpw60KvHayD1l0LMpOy9oYpKF JwUcB51t3R96/pqBSe5gR/67jUpLWvZPb8J7iS9/ReEt4Q0OzLmrQT3QcGmU2CniDAw= X-Gm-Gg: ATEYQzzBs7bUMKNplcTVoyU67kaLNAhNT21SVmOmXT+2Xra43uHx9C5Si0rgTeVOQvE QvD8uzRJI5nHJR2ig6dPsAWeyJig/jfC+R4Xag1zfl+kFOpiJH6q4JspisZECPcuw0J6/UmhtZk xVJWSz7vB/XQFeL5aDjCSZZvApJTcYeFqAJJgzBdcMGnJXiftyRyo5af/II6CKX26Xoo6qyk8qe nr3mkMuSjA5l6rdKPBveyB4UCbrbJKZZE6VcIxJx1u8y8RovJU2PgNSaDH33tq738zrpTaRSwYe VwA54A3IDW+oFhNhOcdPc3sLvnifpq78fhxof3BKB2YXjrba9Dv/dKTGUi7o4SXKlwsgqYpP4cw MDcCGEuyMHsvZbIXb76y8igu/sCtIeLBEZsqCHUWdNoQRmEYxuxvwJoTNMATJ+rZBATQDHSVIts TLeD3b7MignOe4t872oyoW779BWlza8h0jqLaTAYPAAOu+yTQmdMajNHWHOpBU8rAG2r30Oqy9m nwccgBhsA== X-Received: by 2002:a05:6a00:908e:b0:82a:78cd:3ba4 with SMTP id d2e1a72fcca58-82a78cd64a0mr422801b3a.13.1773843332696; Wed, 18 Mar 2026 07:15:32 -0700 (PDT) From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh , Anthony Krowiak , Jagannathan Raman , "Maciej S . Szmigiero" , Matthew Rosato , Elena Ufimtseva , Halil Pasic , Jason Herne , Cornelia Huck , Eric Farman , Alex Williamson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , "Michael S. Tsirkin" , Stefano Garzarella , qemu-s390x@nongnu.org (open list:vfio-ap) Subject: [PATCH v3 3/4] util/event_notifier: fix error handling for event_notifier_init callers Date: Wed, 18 Mar 2026 23:14:12 +0900 Message-ID: <20260318141415.8538-4-vikingtc4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260318141415.8538-1-vikingtc4@gmail.com> References: <20260318141415.8538-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::434; envelope-from=vikingtc4@gmail.com; helo=mail-pf1-x434.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: 1773843368793154100 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 Mon Apr 6 18:30:31 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=1773843392; cv=none; d=zohomail.com; s=zohoarc; b=XoIJc3/076eVMZdH9/UrABGjf2XsJjTJqq2lyR2aTuoSbV+4D/d9qX8AA4ek7+BBzlgPDPnxtB45oDlpgihyi2aoTC3k/lwOYNJPCw0SoXFXUp1PxGzas+eVW56aLeo17C5O0NdFEcWa/yHSddtohOnC0tBBP8ImYJMdQqjIHbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773843392; 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=CyxnvsevbWSo3sHG+CEDq18ke8swsdb9WaW4Dw7HXq6rtcW2BGCm1thATHs/L37cWJb6ObIal1+5E7M4mdlfeBLGjHIrremvZBcbIvMlGkqLC+F8jbI7IIAE8qoEJTdroAyrNnbJZmEQThvNgvpXZPZy1D/aQhwcXo5OPH1XzKM= 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 17738433921281022.9320613286491; Wed, 18 Mar 2026 07: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 1w2rh8-0007qT-3c; Wed, 18 Mar 2026 10:16:22 -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 1w2rgW-0007Lf-Hw for qemu-devel@nongnu.org; Wed, 18 Mar 2026 10:15:49 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2rgS-00060k-Kv for qemu-devel@nongnu.org; Wed, 18 Mar 2026 10:15:43 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-82985f42664so4582652b3a.0 for ; Wed, 18 Mar 2026 07:15:38 -0700 (PDT) Received: from trieu2-huynh-trieuhpn-ubuntu24.bee-live.svc.cluster.local ([27.122.242.65]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82a6af06bd7sm2927272b3a.0.2026.03.18.07.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 07:15:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773843337; x=1774448137; 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=k8GKEXT61iESXMCSA0plHxcyKEg/RgZAV8VRp8HGhkpHZeuthsUTB0LfY2RsryZJGQ DmLfyCppvjHeGgiNjsLYTNn4Kz5mqa/9v5L3NJaA40Z5GehbgKESjk1QCBCEgqso4ehx JKZUglHydO8z8lsy6GddA9CQEavKJcFIeL3UYBlEQXKsEA8bggPOxgdcrdbqjKOHD0F+ iFc5eMiGQTs7lsvZUKnDtmRS/cdoTAjLbYSfq83Cxz/4RFLo33bGinU7lvJCThxOda9m yo3u/4SWbl8v5Cwb11G464OwkmEDOpDa9LLiTSkD4hititF7n23U7tBcp5T25xwm1L1t maCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773843337; x=1774448137; 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=rYX7h2PtKRzQMC8GPscPJ9Nc5UnfPsR5KCveqI1pWLIcIERdcssum75Mb7glgc+P59 AKu+lRjR+yyhKt+sxBT5yAtewlUXe+inAzHth7+3oHFM+FNaDrQAnwnvItSJouSZr99x hAVTJPZxQdthLTkjTC/vGbw/KZT6VeO0navvUR2ulLH5hoq7dtSETV9vCTX7l7Aqxx2A W/JGUMuiQnBOmX1/yXdNf0B+0b7d8VTd2rGKEq9qs8/M4jxubgBGCk/sNiMRsP3Q8xkS K45OUoZMveBVBclcC3x8csPMvDI5oXgpViX4b1ceTfqB2HyrzDoZrDfhGxNVV5krn6dt QfMw== X-Gm-Message-State: AOJu0Yw+7R7NwRYvqRselDVXzss7g2E1YAPq6KX3p99YoQNT/CpxOBVc 9O33a/1WLVocjrj1aCfE3VedB8D4eecPPO6wKlVm08ULWgRFtfs3YhxfYl4DBYGcWHE= X-Gm-Gg: ATEYQzxQl6YItOsg1Ti2Ffh4cSvtdsM66gBafvodpN9s7zQidSBhMuswte5UecJnLDr h8by5wNnvlx9BdF3UTiylB4/X8om54HeYqPrR0VrCF67IiciR6r0fdJ6ucvZ57vqkfxoP5w/5hz BAg0so8vCJfuRQKSHwIiLBTZI0imca/2PpfTeHnBRUDNamTKvKV7UTgpNZqNNDvXzjfn+QXj79D s71GnxDt77Rz0ELKDJM73v9jXTMiWo6MY+bHVNSGgsIgyXmuidh3GAJiiJ66TO0khlslzfUl02P uJMYAYe/A150rvdsspR3XzgaLxoENXa7SFDJaTG6N8aADkNecDKPPDxjuZNMQ94O/3GOlTszLwK hRPLGmX5q2q62RX4UFXWAiVytSgw5YR2cf5KBmKWdaGSeaUl0YtlX7Ebj2G0TJrIJgtzSYoMs1W PnJXTzpNjp9lO2vNxwS1uyNNnDJ3HkaBV22l6ZqQT5tSNZH2eCAzBMx+M1FgfBniNP6Yd5COWqO 2Nyd/OJMw== X-Received: by 2002:a05:6a00:9519:b0:823:9e5:855e with SMTP id d2e1a72fcca58-82a6a969227mr3247067b3a.0.1773843337277; Wed, 18 Mar 2026 07:15:37 -0700 (PDT) From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh , Akihiko Odaki , Sriram Yagnaraman , Jason Wang , Jiri Pirko , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Fam Zheng , qemu-block@nongnu.org (open list:megasas) Subject: [PATCH v3 4/4] hw/pci/msix: fix error handling for msix_init callers Date: Wed, 18 Mar 2026 23:14:13 +0900 Message-ID: <20260318141415.8538-5-vikingtc4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260318141415.8538-1-vikingtc4@gmail.com> References: <20260318141415.8538-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::436; envelope-from=vikingtc4@gmail.com; helo=mail-pf1-x436.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: 1773843393661154100 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 Reviewed-by: Peter Maydell --- 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