From patchwork Thu Apr 3 15:18:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 877928 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3320935wrs; Thu, 3 Apr 2025 08:21:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWqtWnlIbfhreb+zb9OmCeIpCpx3g2F3+Mxk6o89K59yWZuWaDdZ/XiF0nUOpp2kvb9quFjtw==@linaro.org X-Google-Smtp-Source: AGHT+IFUn9FS6KQ66HX3JYoNHUyccrUI3idJNj9MFxesGeZw4mrvnlhoLesMjFUIQAeGP23KGjEU X-Received: by 2002:a05:620a:4446:b0:7c5:5801:ea9a with SMTP id af79cd13be357-7c6862e7997mr2769868885a.11.1743693664561; Thu, 03 Apr 2025 08:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743693664; cv=none; d=google.com; s=arc-20240605; b=h2bwYEA9sdvJurac6sBVq8zJgiq+fbW0uQX7YIg7E3sdYLdjmQ+Bgl9mwix9TQnthI n367GZ8rClSU7HRQt6IkhUJVsM9skGJoxZozng2wHvLl66t8A5+2BxFqyrR/RZLYKGlp 0vcE/+WXeWb1NtduUSmnHIEaAWRu12AWox1G7OwsJszoQ0FVdKDwEfBsDItm1DbaRJVU Yxw7CW5jwUaxGvGtKibXU3lC5slBcuxal7ZMeBBA4cNl8JsQGF871+eaApdDfn4nKyAz DWa4UEWJK7VJb/nG1+JlceIRhsP3oetvkyz54XSemtT9EB79EydK584OQsXqAdFCbH5H t4hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TkNWzS/5Q0X1wok5s6TRzd+7v9TwGIUutsDTBjTDsAk=; fh=uZabDrQmZm0L+6w9TkaKSHx4mVelHvsyKGr5umV4YlI=; b=ZRcpWGyZbxoD2WJaYTVjQh+6U1lnf5/JNR1hvpo1Kp52XV59853k6uGkxC5yl5h2e8 iqayjCqn8tdx+bwterPl/BDV9OwP453aaAf71S+oG0UMld8b0123Wtma7Kosbo8hUU5z GMbQlgELEYyBelfVhBbOzfZcDoJrxTENZxmInCcpL0kMmuPZj4/U/Pjr2M7IFnkB35th UhFiOXi+SksL+KDyisD/ObnWxCAqfo0xbEEY3224V4icr1+mbggZMB/xp4bEJvnwUl34 EmVo9pWWoMQsmj0NIFJIqYoXW3qER9nx1J/8Hz4538a2N5KLoyQJeS3speVft1FrQ1EN lj3w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=koCTxZ3d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c76e749b83si131391985a.73.2025.04.03.08.21.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 08:21:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=koCTxZ3d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u0MMw-0000mW-9L; Thu, 03 Apr 2025 11:20:40 -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 1u0MLj-0007lk-S1 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 11:19:30 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0MLh-0000WI-5y for qemu-devel@nongnu.org; Thu, 03 Apr 2025 11:19:22 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3914a5def6bso690741f8f.1 for ; Thu, 03 Apr 2025 08:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743693559; x=1744298359; 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=TkNWzS/5Q0X1wok5s6TRzd+7v9TwGIUutsDTBjTDsAk=; b=koCTxZ3du0y0CvksF7OGuQUac6tVNY6BHfLs3imR6iQKaU8yDoe26Eve+uBz+nYjdQ E5ENUZzf2CnpA0X99UHJTSlZ1YMFWAj80swxGlday6CqKJO33ysIVDGM8k2eGYyOztj8 fIOWk1KqMELKZ3bvRNXsXIXr2ho7JNhyXtah6a1kE6Sl9LCQ5B16s9oaVram3q/OBeBH eccncIsOYTaTXe/Dx1Hr4Z7CDgI4lSubnyEvzoxLKiCfjmHrMZjXvKJy/BqmZ0KfTJ/N FAcl6hFPuYeZwCucjJuqcXpRYUgGOfZt5Px6VlGEu+t0++/MFWcfuISNgNbLDK+4ZGLV 7DZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743693559; x=1744298359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TkNWzS/5Q0X1wok5s6TRzd+7v9TwGIUutsDTBjTDsAk=; b=V28KwF5Xma8J8djhvopMH9BXH2VDSrij5jK+A8lSILNvFBOO4h7QqI7rxovnGJFsAL mrQD2gbin34Mwk8QZmhrhOYO765Sbas83iBt+KyBIZ1kn1uDrzAnY/Ds9ZCFjfYD5FHY O98lQFwJ9BV+TkWngpVhkUHWosEwspZJQkF1OYF2QzC/g8CTM77u6Vx3esUXMTyluq66 DuEnbLnJEoULo/otE+/lZMu9cfohHSa6yFeSlP4amkLO2GTckGezVAM1wb21rBNmHbLr z1n/drCcsu0HF/cfjkwZ1dd6LE0X5l0tXMoSI7lHtSZzax30DD881juPSASrYboLHsT6 X0DA== X-Gm-Message-State: AOJu0YyjDPOzqxaFHcuWfCkvNon8IKSjkkSxGPNwaVk9D1sHxCTHGwKA +lPSg4D3xjogoFQnVKyjtXMUdis+LXelJBihoiUui4pBY+1nl5jOCVCRk94vz72oz8O8don6IOB e X-Gm-Gg: ASbGncumKodZhJzoU5UUQTrIibFW45JSjmv7JwwiNEqRXox21d7gtGGQ7wzaD+2GHLI O86eAg1Fi2NDDlmTDcZ2bOxAiV0alcTTyasZzTC2YyRWzJkeIkKangJ5tAh6J774vtmC2sF1Koa 2fgVuzDa9gGCZWCBAXYowYu6csHgTVcWdLkTMGfmV+za4blQeBzpXZlF2lQ2BREeDWTdNz2VxBF D5DXlFkc7ws36huJI39PhWFrbWOO6GypXUf3zgpESup9qyInqGNFJ0UPK7CnricoEpinBnnfKKK efQqMv3rC25xVX25a5AAWUxQ5H+CaPwbAbqbomNZBj4c8uMG9aPlPDGbegryBOBYo1v1yoXe6Vf zaLp97TZTlukNvA7X/65xGJ4a89haNw== X-Received: by 2002:a05:6000:4211:b0:39c:1f04:a646 with SMTP id ffacd0b85a97d-39c2f8cfe62mr2784406f8f.13.1743693559057; Thu, 03 Apr 2025 08:19:19 -0700 (PDT) Received: from localhost.localdomain (145.171.88.92.rev.sfr.net. [92.88.171.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a7225sm2065828f8f.26.2025.04.03.08.19.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 08:19:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Gustavo Romero , Peter Maydell , Laurent Vivier , Ani Sinha , Udo Steinberg , "Michael S. Tsirkin" , qemu-arm@nongnu.org, Paolo Bonzini , Igor Mammedov , Andrew Jones , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Fabiano Rosas , =?utf-8?q?Alex_Benn=C3=A9e?= , Shannon Zhao Subject: [PATCH-for-10.0? v2 07/14] hw/intc/gicv3_its: Do not check its_class_name() for NULL Date: Thu, 3 Apr 2025 17:18:22 +0200 Message-ID: <20250403151829.44858-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403151829.44858-1-philmd@linaro.org> References: <20250403151829.44858-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since commit cc5e719e2c8 ("kvm: require KVM_CAP_SIGNAL_MSI"), its_class_name() single implementation doesn't return NULL anymore. Update the prototype docstring, and remove the pointless checks. Reported-by: Gustavo Romero Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/hw/intc/arm_gicv3_its_common.h | 2 +- hw/arm/virt-acpi-build.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/intc/arm_gicv3_its_common.h b/include/hw/intc/arm_gicv3_its_common.h index 7dc712b38d2..3c7b543b018 100644 --- a/include/hw/intc/arm_gicv3_its_common.h +++ b/include/hw/intc/arm_gicv3_its_common.h @@ -128,7 +128,7 @@ struct GICv3ITSCommonClass { * Return the ITS class name to use depending on whether KVM acceleration * and KVM CAP_SIGNAL_MSI are supported * - * Returns: class name to use or NULL + * Returns: class name to use */ const char *its_class_name(void); diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 3ac8f8e1786..9b7fc99f170 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -741,7 +741,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) memmap[VIRT_HIGH_GIC_REDIST2].size); } - if (its_class_name() && !vmc->no_its) { + if (!vmc->no_its) { /* * ACPI spec, Revision 6.0 Errata A * (original 6.0 definition has invalid Length) @@ -973,7 +973,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) vms->oem_table_id); } - if (its_class_name() && !vmc->no_its) { + if (!vmc->no_its) { acpi_add_table(table_offsets, tables_blob); build_iort(tables_blob, tables->linker, vms); }