From patchwork Thu Apr 3 20:40: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: 877947 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3468078wrs; Thu, 3 Apr 2025 13:41:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXXP0hRSXqAoh/uIFo0ZBUNqjxWQWr61nHRRtegC5FPPB94liKrLNt8EvmhieN+AXPUVWAW5g==@linaro.org X-Google-Smtp-Source: AGHT+IGdTNIDr5/ovOMnrAOgLZbqS7ehlwLv3B8359w8lrPFwC8Z8G9uoHvkkaAIQF1zUEnPXq2F X-Received: by 2002:a05:6214:1903:b0:6e4:4adb:8c29 with SMTP id 6a1803df08f44-6ef0bec78d4mr59647186d6.12.1743712874688; Thu, 03 Apr 2025 13:41:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743712874; cv=none; d=google.com; s=arc-20240605; b=CxiOqcaF3Yk3rigvu62NL4mf0SJGdhPmvp+gS8kMqN545A6Q2tFfin/NyeK+BGfhPo c1r5z7qD4bF0P8dxuY8auaPOA/cFI2z9yzfRPYgX8lUDnnY31287z1mTo2ArBQdbB6aM pgSjsoCksUXiRC1wYqq0mwNhNqMdjlvAJ+IU+mr0nW2HDOLFUHgTnwjoQ+Dnk4hGnt6+ lCB665Z9HEGJqExzVUDIPosS/2S1GJ0aJVXk7oC2Nsi/R8MQpjqZtDmu6ekDgu3TSDT7 iMQas4r813VMsHPPltK+Vy4D4fv2lb2dxoDrH26rs7WLMDFK/KxUi3b9LiKa1Ykfwes2 hXuA== 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=91qw8dB7Eg7Eq+MHz4XIrej88B1FVRM9ctS9zjgiZGk=; fh=MyqIMCjZFHy0NzBnvXc8KFcCapThoPogDzLe5J0FgH4=; b=XHtGev6/3nHBTNeWffsFAkEdSceqYOmDp/TWTAoJFdPZWCmJBUTxoUd+gz75UwwPM5 aQYJhddSY0fgkyzzS8PBEYo0V0VEsNSqvE79WZaVa0Z2MTMWqn+kzKnFBYvhlT9JGOPy LsrByrwSftEB+ab1YHsmBuIKqObWIf0Hx7TITagIALrV22FfJGHY6kB38GWptL7J/MbJ P28hAmryOH8My5FeiWBDOasl53a0iMJBqePiZjt79L/ZRDcCebDjdYykKqLMb7wgYnmf /iYuPG1ZvOX1IgSxsYDKhBzcWAWIuLiloFKPVimkG2+8bUYzf45PxiADJBCdsfnRvmN+ T8rw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wiNHb4TX; 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 6a1803df08f44-6ef0efc577dsi18260546d6.6.2025.04.03.13.41.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 13:41:14 -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=wiNHb4TX; 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 1u0RMp-0000QQ-1J; Thu, 03 Apr 2025 16:40:51 -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 1u0RMn-0000QE-Io for qemu-devel@nongnu.org; Thu, 03 Apr 2025 16:40:49 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450: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 1u0RMi-000523-Om for qemu-devel@nongnu.org; Thu, 03 Apr 2025 16:40:49 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3913b539aabso772213f8f.2 for ; Thu, 03 Apr 2025 13:40:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743712842; x=1744317642; 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=91qw8dB7Eg7Eq+MHz4XIrej88B1FVRM9ctS9zjgiZGk=; b=wiNHb4TXxLhauYBb42lEygT+ElfPmQYLPU1CT3g2wPNmVMQQjWOtxLHTxnBM9qkRWm YW3KjzLTVRNmYy+VGdp2JOJEc50aCWdnnO+m0/X3TAnD48pX7NkJSDmV8IjKHpVtl6FI fUPrfG0LyxBWk7LZjJU4EeEppx+Hu+E/eOcVkciaO7H9gdol8NGh7nWlmJ3qhfSea1VF dwKIM0vjVxpw1F4vbDwpz5JXnKIJW6Ow7SBqgPhMp70Io20Pv+UVEhM3OpU48tNaXDZo PLng0Lk8RhOdDhjytLxM/lF/4mHbpV+aDFyzJfHF64aopkaRZ6Czcl1TeamQl2UxKhrC U99A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743712842; x=1744317642; 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=91qw8dB7Eg7Eq+MHz4XIrej88B1FVRM9ctS9zjgiZGk=; b=YQIMGNsZx6hxiHa4Icr3JveorEg1cT0cWAqW0B/C+hCfRp2OjJe0nxH+/ozq4gAuXt VxSJzWQOZDPdhYCFSuRSymL8vkCpT47uPkQUUNaH9XxCjDnHI9lQdKu0Qwvc7Hgxq4Jt eY8tevDQV+RJIa6HMKjqzv4UxgZyxJaRsKwR31nOPVKVQWfWAG8CE0HH196NbnrrbcSZ U31qPGg8MojZG2UzOf29P1IxEi/FQwKsfs29XkXpJzNUr/j0GwBJzPCOhGqEWLwog7AS M9Ci56Ou0c2+WgpSxhhCm6gf/PN50fnl4HOCkk/SiYRLtr9tKTUo3xfL00g9ykXM/aQK xM4g== X-Gm-Message-State: AOJu0YwHigf/pA4Inej8oBuzZ2q0/im9BwU07D/oeM4MzNkfhmHaO00f I1kIU9BwQMHrXI5qr2U5KNb/k8Sz895ZBRR/kjZwcRiMcC/MRkXv3Eot58hQrKQymglrmlyX1eI F X-Gm-Gg: ASbGncvihW+YAVBh2VLZ1VCoWcTRzKf8ksqgURz3cByBKQY7seYx4rUvFCuEjMrEH4R U6ViWjjSliRc8boGbDt0nZR7eza8YyRm5+cHoETfRwJlHaYNIsKuEaPEjg8ATf/5NpcOBFmBirF FjIU15ntlXqfiBKa0sxcOiOPjHOjZa957G7stmlufYU5ixqYT7vK+gdU1qYRqQAbgpNKp4JfyKE OhmTGjqjM+ufJlDT/T+508tnjFqTY4YTeH7iEYqhu2++1ucsTkqE/zz4LhlHmzC8ysAWu7cykQ3 muihfipdP1pHUS1ORfbXkgrAzmQsjch9yWe/9PNkuv7IKy0Kt2jcmz5poaXhpMvQ4QimqI9hzoX KygXtPHvh1RXPlbiV/sS8yPGobmrF7JJNoXQ= X-Received: by 2002:a05:6000:188f:b0:391:3915:cfea with SMTP id ffacd0b85a97d-39cba93329amr612537f8f.38.1743712842401; Thu, 03 Apr 2025 13:40:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1663053sm30876275e9.15.2025.04.03.13.40.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 13:40:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Andrew Jones , =?utf-8?q?Alex_Benn=C3=A9e?= , "Michael S. Tsirkin" , qemu-arm@nongnu.org, Udo Steinberg , Shannon Zhao , Gustavo Romero , Igor Mammedov , Peter Maydell , Ani Sinha , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH-for-10.1 v3 2/9] hw/intc/gicv3_its: Do not check its_class_name() for NULL Date: Thu, 3 Apr 2025 22:40:22 +0200 Message-ID: <20250403204029.47958-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403204029.47958-1-philmd@linaro.org> References: <20250403204029.47958-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philmd@linaro.org; helo=mail-wr1-x42a.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, T_SPF_TEMPERROR=0.01 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); }