From patchwork Tue May 6 14:41:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887821 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588616wrq; Tue, 6 May 2025 07:49:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXqVHfsDVsnXhdSSFicsQ02WyA2SE565V4/c4GyxYny71vdwMAWf/NVq+PU1aHwxwoyVzYI4g==@linaro.org X-Google-Smtp-Source: AGHT+IFJ58CjA3xEvqmrLAtKGSWaRWUIF2vLkZCty262SXWzSfztIJAPKDQQXtZaDoNREnvE3vgH X-Received: by 2002:a05:620a:3949:b0:7c5:49ee:86aa with SMTP id af79cd13be357-7cae3a883fcmr1359300085a.4.1746542943562; Tue, 06 May 2025 07:49:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542943; cv=none; d=google.com; s=arc-20240605; b=bWX9aMWjTt3bmy7Yz7JGSIdOMGQ5UQ9/NN4mls5H0qcPnJSufGJrE4t5AAnAtlaT5e RwzA9J5NNIi2Fj+lU4OAqlEPmuD8xHURhaFSyqS7GFc/kPAUp8G9P/+PYdhAYrufiv/u LYBmQGrEriYhRqiHUgJe16MudUQ5whu5K6DG/9QswpovSIdYTF298riSaCgH86Obteqc 5xGFJIC+174z/FoJEpVxqCZBUWwaoMTh9IiKqjCqvxxfFIbZ5qzprv8nTxiStkQfTQtY PzRC+lvvQYY12708AJyl15IWJqjVGI9i9T8vhi7keIBlu6aP+oIOAeT0UbYt3aKijE/4 0WQQ== 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:to:from :dkim-signature; bh=5E5blIzr/7R8AU6vWnHAs12sKtgyOGDJz11Dz6ogeEY=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=XVkOT0ubFy7IfkuAOyk5CQ1YJM7SfoS8ts/LyzQ8ygLNEGvnndlzJ/K+yNk8pQEQs0 uVAO6XjwRrgOv165bOQVEjGyl3Tcg9yEhHwSyNfbu4O4GrwjRZQFdIEbZbzWlgDYzDUU jLOn8lB5np/882az7Ia5fGLTI+8qApr7YukditINzea6fyvFYAdG1re97xSuR6ifrqds uyajeI1eRr0adNNsZL0CAsstt+T+XfYYRIKORWkgAjgPJdc1T4BLT597OCNe3BJllR9V j8+DwsS/2v4MA7G8/JBB/fpVsCCGX/MUIHntmkXHcVHKHEjsoPobQgDDjssJmx8cFY8z WHhg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F2dxvdPS; 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-7cad24369dfsi1206457885a.421.2025.05.06.07.49.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:49:03 -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=F2dxvdPS; 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 1uCJX0-0000sh-V1; Tue, 06 May 2025 10:44: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 1uCJVD-0001dR-FM for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:36 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVA-00027N-C3 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:35 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so32630825e9.1 for ; Tue, 06 May 2025 07:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542551; x=1747147351; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5E5blIzr/7R8AU6vWnHAs12sKtgyOGDJz11Dz6ogeEY=; b=F2dxvdPS5wuRvUvMG2HeHQJ0I4eXkLVfuxKQa9wjHTasc8aCKTOmpaj4R4A3K/Ktgm 036yRZYhEMIfkn66eZr4D/7UvUOsTsV+kJoOR8n4daQjhSkaM7MppWOBIkL03AhjITUh dKTc7iLULEJTjSMWYXY1Lm7JrgdiW4C3u1pjAFjgRvsNjKIJXlXVoGQox5TWvf4CuHyU 3MUUL2vH5cIQLYMVJ/FlnUpqTdedwPhEcLxPDgGiVW0IAJja31DPZcimvFL4YmamXPpL fBdUfSJbh88RF4Xxgxsk3wBKAjnPjYNiytD2hNqjemHhLsFOJe554w6LH1YShr5i9/z5 W/eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542551; x=1747147351; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5E5blIzr/7R8AU6vWnHAs12sKtgyOGDJz11Dz6ogeEY=; b=OVbn0Jq0WYGAPTxfB/hVA1mfQzz2XtJBi1da/qcKuBSrFJVVe/C7+6Ip8DE/nuyO8R RQ7gkBb00NVy7ccZXD1B7OTr8yutuOSo2wL7opvE5gGGHUfDt/3AiroKjWs6G2iZW0D3 hGmbD6Ymli7iSy7+75fjXV/spmigY6FdEhSHbPWoBW0OcclRItma85A1pn7orP23CTP5 tfjj9wA2EVrdxEnaug7i8g9sW74dv/ZYNGXUMgPCq0ql/6mgwwgsDm8GhgP5pN1g060m XEvIkSz7vW+Csv/1g9ojhA54+3dRXUH8J0NsfgMVoy7obLpubbNrkolrL5jMzbBG8pIp nADA== X-Gm-Message-State: AOJu0YyS/T0bIfWPd+S1zlEXIflbwmhFEsB1coy12dGauZQvYrhUHR57 mAVLeOhynNSZHHzZvYbYNhqMJH8nH/qJ2Ui7vz/6foPBlgOElcaN7W7mjz7nit+aQ4AOfAWX+bl 2 X-Gm-Gg: ASbGncvVVREx8Ay2XAxonWLtsogMp/laygFCDq0bU2tOfY/z52UspEe8MQD/faLcpWC DYKnpeysnCIe5WTcxLAImwYtvi2mLXv+IXrbfkxzMcPhwuLIjwjLeJwmXRwZDR4bJlkw87UTe5A qCCJGFW1TEVKITxf6FJWYnIS5Q3CWBhbOO2MdqqratqzsQcnd4Y7G+Ni2V+jCDq8RXbgKGK4/Es RxJxnA0Y3ALjXf81IC4b3A7uueyQpDqa/XPBNaPV0w1I5l1bnSgVY+dnzS2lzjGmS7GWPqVj+9i 9S3Pg5UmqP08b2fkRFaReOOh1YvWR05XHsCy9nFVMArXhN8= X-Received: by 2002:a05:600c:3848:b0:43c:f0ae:da7 with SMTP id 5b1f17b1804b1-441d0fbd372mr28379845e9.7.1746542550754; Tue, 06 May 2025 07:42:30 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:30 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 12/32] hw/arm/virt: Remove VirtMachineClass::no_its field Date: Tue, 6 May 2025 15:41:54 +0100 Message-ID: <20250506144214.1221450-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.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=ham 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 From: Philippe Mathieu-Daudé The VirtMachineClass::no_its field was only used by virt-2.7 machine, which got removed. Remove it and simplify virt_instance_init() and virt_acpi_build(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- include/hw/arm/virt.h | 1 - hw/arm/virt-acpi-build.c | 5 ++--- hw/arm/virt.c | 16 ++++++---------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 5d3b25509ff..463ac09615e 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -117,7 +117,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; - bool no_its; bool no_tcg_its; bool claim_edge_triggered_timers; bool smbios_old_sys_ver; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 3ac8f8e1786..1c8b61f9f8a 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -670,7 +670,6 @@ static void build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { int i; - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); const MemMapEntry *memmap = vms->memmap; AcpiTable table = { .sig = "APIC", .rev = 4, .oem_id = vms->oem_id, .oem_table_id = vms->oem_table_id }; @@ -741,7 +740,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) memmap[VIRT_HIGH_GIC_REDIST2].size); } - if (its_class_name() && !vmc->no_its) { + if (its_class_name()) { /* * ACPI spec, Revision 6.0 Errata A * (original 6.0 definition has invalid Length) @@ -973,7 +972,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) vms->oem_table_id); } - if (its_class_name() && !vmc->no_its) { + if (its_class_name()) { acpi_add_table(table_offsets, tables_blob); build_iort(tables_blob, tables->linker, vms); } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a2a213717cc..9c4efcd8556 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3347,17 +3347,13 @@ static void virt_instance_init(Object *obj) vms->highmem_mmio = true; vms->highmem_redists = true; - if (vmc->no_its) { - vms->its = false; - } else { - /* Default allows ITS instantiation */ - vms->its = true; + /* Default allows ITS instantiation */ + vms->its = true; - if (vmc->no_tcg_its) { - vms->tcg_its = false; - } else { - vms->tcg_its = true; - } + if (vmc->no_tcg_its) { + vms->tcg_its = false; + } else { + vms->tcg_its = true; } /* Default disallows iommu instantiation */