From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Gustavo Romero" <gustavo.romero@linaro.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Laurent Vivier" <lvivier@redhat.com>,
"Ani Sinha" <anisinha@redhat.com>,
"Udo Steinberg" <udo@hypervisor.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
qemu-arm@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Andrew Jones" <ajones@ventanamicro.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Fabiano Rosas" <farosas@suse.de>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Shannon Zhao" <shannon.zhaosl@gmail.com>
Subject: [PATCH-for-10.0? v2 06/14] hw/arm/virt: Remove pointless VirtMachineState::tcg_its field
Date: Thu, 3 Apr 2025 17:18:21 +0200 [thread overview]
Message-ID: <20250403151829.44858-7-philmd@linaro.org> (raw)
In-Reply-To: <20250403151829.44858-1-philmd@linaro.org>
VirtMachineState::tcg_its has the same value of
VirtMachineClass::no_tcg_its. Directly use the latter,
removing the former.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/arm/virt.h | 1 -
hw/arm/virt.c | 13 +++++--------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index c8e94e6aedc..17c160429ea 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -150,7 +150,6 @@ struct VirtMachineState {
bool highmem_mmio;
bool highmem_redists;
bool its;
- bool tcg_its;
bool virt;
bool ras;
bool mte;
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index a96452f17a4..c0748cbb95a 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -710,11 +710,12 @@ static inline DeviceState *create_acpi_ged(VirtMachineState *vms)
static void create_its(VirtMachineState *vms)
{
+ VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
const char *itsclass = its_class_name();
DeviceState *dev;
if (!strcmp(itsclass, "arm-gicv3-its")) {
- if (!vms->tcg_its) {
+ if (!vmc->no_tcg_its) {
itsclass = NULL;
}
}
@@ -831,7 +832,9 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem)
redist_region_count);
if (!kvm_irqchip_in_kernel()) {
- if (vms->tcg_its) {
+ VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
+
+ if (vmc->no_tcg_its) {
object_property_set_link(OBJECT(vms->gic), "sysmem",
OBJECT(mem), &error_fatal);
qdev_prop_set_bit(vms->gic, "has-lpi", true);
@@ -3357,12 +3360,6 @@ static void virt_instance_init(Object *obj)
} else {
/* Default allows ITS instantiation */
vms->its = true;
-
- if (vmc->no_tcg_its) {
- vms->tcg_its = false;
- } else {
- vms->tcg_its = true;
- }
}
/* Default disallows iommu instantiation */
--
2.47.1
next prev parent reply other threads:[~2025-04-03 15:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-03 15:18 [PATCH-for-10.0 v2 00/14] hw/arm: Tests & ACPI tables fixes for 10.0 Philippe Mathieu-Daudé
2025-04-03 15:18 ` [PATCH-for-10.0 v2 01/14] tests/functional/test_aarch64_rme_virt: fix sporadic failure Philippe Mathieu-Daudé
2025-04-03 15:18 ` [PATCH-for-10.0 v2 02/14] tests/functional: Add a decorator for skipping tests on particular OS Philippe Mathieu-Daudé
2025-04-03 17:31 ` Richard Henderson
2025-04-03 18:04 ` Thomas Huth
2025-04-03 20:27 ` Philippe Mathieu-Daudé
2025-04-03 15:18 ` [PATCH-for-10.0 v2 03/14] tests/functional: Skip aarch64_replay test on macOS Philippe Mathieu-Daudé
2025-04-03 17:31 ` Richard Henderson
2025-04-03 15:18 ` [PATCH-for-10.0 v2 04/14] tests/qtest: Skip Aarch64 VMapple machine Philippe Mathieu-Daudé
2025-04-03 17:33 ` Richard Henderson
2025-04-03 18:00 ` Thomas Huth
2025-04-03 15:18 ` [PATCH-for-10.0 v2 05/14] hw/arm: Do not build VMapple machine by default Philippe Mathieu-Daudé
2025-04-03 17:34 ` Richard Henderson
2025-04-03 15:18 ` Philippe Mathieu-Daudé [this message]
2025-04-03 17:36 ` [PATCH-for-10.0? v2 06/14] hw/arm/virt: Remove pointless VirtMachineState::tcg_its field Richard Henderson
2025-04-03 20:24 ` Philippe Mathieu-Daudé
2025-04-03 15:18 ` [PATCH-for-10.0? v2 07/14] hw/intc/gicv3_its: Do not check its_class_name() for NULL Philippe Mathieu-Daudé
2025-04-03 17:37 ` Richard Henderson
2025-04-03 15:18 ` [PATCH-for-10.0? v2 08/14] hw/arm/virt: Simplify create_its() Philippe Mathieu-Daudé
2025-04-03 17:38 ` Richard Henderson
2025-04-03 15:18 ` [PATCH-for-10.0? v2 09/14] hw/arm/virt-acpi: Factor its_enabled() helper out Philippe Mathieu-Daudé
2025-04-03 17:38 ` Richard Henderson
2025-04-03 15:18 ` [PATCH-for-10.0? v2 10/14] qtest/bios-tables-test: Add test for -M virt, its=off Philippe Mathieu-Daudé
2025-04-03 15:18 ` [PATCH-for-10.0? v2 11/14] qtest/bios-tables-test: Whitelist aarch64/virt 'its_off' variant blobs Philippe Mathieu-Daudé
2025-04-04 10:50 ` Igor Mammedov
2025-04-03 15:18 ` [PATCH-for-10.0? v2 12/14] hw/arm/virt-acpi: Always build IORT table (even with GIC ITS disabled) Philippe Mathieu-Daudé
2025-04-03 15:18 ` [PATCH-for-10.0? v2 13/14] hw/arm/virt-acpi: Do not advertise disabled GIC ITS Philippe Mathieu-Daudé
2025-04-04 10:41 ` Igor Mammedov
2025-04-04 12:49 ` Philippe Mathieu-Daudé
2025-05-06 15:49 ` Igor Mammedov
2025-04-03 15:18 ` [PATCH-for-10.0? v2 14/14] qtest/bios-tables-test: Update aarch64/virt 'its_off' variant blobs Philippe Mathieu-Daudé
2025-04-03 16:31 ` [PATCH-for-10.0 v2 00/14] hw/arm: Tests & ACPI tables fixes for 10.0 Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250403151829.44858-7-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=ajones@ventanamicro.com \
--cc=alex.bennee@linaro.org \
--cc=anisinha@redhat.com \
--cc=berrange@redhat.com \
--cc=farosas@suse.de \
--cc=gustavo.romero@linaro.org \
--cc=imammedo@redhat.com \
--cc=lvivier@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=shannon.zhaosl@gmail.com \
--cc=thuth@redhat.com \
--cc=udo@hypervisor.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).