From nobody Sun Apr 12 04:27:15 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1771866454; cv=none; d=zohomail.com; s=zohoarc; b=DN8c6QZGV2UPg9k5hkKyW3j7AyTrfTpLWF4n9A0jMS+QGQTuCCNIqARTfQJSCAjdsSeqUeYTPA3nOuAYhpj6+pwoviM3HT1gxZZ33PleQ8FA9O2T97AsNXYF65kSahMudF4pTp5+YhUv7qnJhWdd1OqgbATjeVOYz26oXdicRS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771866454; h=Content-Transfer-Encoding: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:Cc; bh=Aa0SLfc8fXsQ713SAbRbmhAS+wd4hTaQKfR4EPdmzFo=; b=KorIBPWGY1x98X6KZK6vPThOM14fj+0/D8Tjfiq8+RHjfP0XsVhwVyPafcJomXe9omzESI+n2XLk2HioRt/NhkhneHv6rzE3ijiIA+Cz97miF+UTlUDD7Z4u0Uly7W0Cyq6C4F1fVywd4/MFQ90BEnpWEl4dfTO3+ZDNcaHDs40= 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 1771866454733449.72940529659957; Mon, 23 Feb 2026 09:07:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vuZM9-0004ZF-58; Mon, 23 Feb 2026 12:04:26 -0500 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 1vuZLB-0002pj-Kh for qemu-devel@nongnu.org; Mon, 23 Feb 2026 12:03:28 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vuZL8-0000RD-1b for qemu-devel@nongnu.org; Mon, 23 Feb 2026 12:03:24 -0500 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-48378136adcso27657965e9.1 for ; Mon, 23 Feb 2026 09:03:18 -0800 (PST) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483a9b21ceasm200155625e9.0.2026.02.23.09.03.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 09:03:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1771866197; x=1772470997; 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=Aa0SLfc8fXsQ713SAbRbmhAS+wd4hTaQKfR4EPdmzFo=; b=uzsPBFvtVqWGzJof15XJF9AexqPBKXN+S2i9eHCZXyFkYZTE9K2F9LW5ebksM5ohYH Nu9S5XAy1NIj7Riq0j7Zav4DLmDzJzi/hlkIkKnmlnTH+X31BZWokTEoXcIR6IVZgAJ/ jv/KtgHXjymVrRaXuVRx19erLt99mOpgZ3vRiGFPnIEuZgSucIKlHjfndgtF2lpoXDng ezUo8nY+cMlLC3WPjRtjJfoqnP1V+7jOXy9NrUf5CU3FoCws41AdirKMr1JvyrdtdYv6 MqHHJN3lhNIa0IKV96VVvH0diOn+29U55wFP48192D6jb8PC20N5iKkuyPsEp4/qWEtJ ipTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771866197; x=1772470997; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Aa0SLfc8fXsQ713SAbRbmhAS+wd4hTaQKfR4EPdmzFo=; b=SKT4vpZObEtOHeqszEpBBCgo0bMAzlT7xSdD8YIxS8acjCLnqThcnF6IjIWIS8jbs4 4OPXXC0H6NXypTWC1h2EAswGjE8f1n+cY2VUZO1GWELRNRxRnKbOsb1TQ0MPPLtHBEyN RTVslxdujauXpvpg86M2z3yzL0icdWd6EleUdBh2a9pYRO4mOjcjuMVvFm72ZfbLlRA8 ZAJymm+ANkO1FVzvYaHblulp0GixO2WFgaW16dUcvNEjLDoTuLvpf/SV0fxq7p6q8RN6 mCiqc70Mlr+la56gy0yGAuuh8eNbVP+zXilhWkYJRYBoCT+kZbJYK0XeWlvLTosOks1l jaaQ== X-Forwarded-Encrypted: i=1; AJvYcCXNYMZ/Xyuo/gtNxWWyhY/f0BsZd1qe6RCj4WvKDLl90k76x2w+qYHn8FQHByD3U6PPqNTQs6e4MS5P@nongnu.org X-Gm-Message-State: AOJu0Ywqvsw9btKfoUIjw7CxsoD1ABMqZZ7lwoEflHlvWlvQM+EZUfnf EPgZrIqGj5k9grtDpvyrLT7f18J0c2E4b12elo3IhnVMC8eMXTTEsTwLlPNV9lA6hY4= X-Gm-Gg: AZuq6aKSNolux6q49FR3ZI2g6qPuOetFubY/f60K32wW3AexfKWu749axMJqE/tIhUQ TWQNKqhZAYxSxjZ+5MaXpTGcktQ80vRXppNaoSpaUAqD1ew3x8YWMvu9EU7kjOGptF+I/nDjKxr K3f8c2rg5EaFVlZirFXryTS1ZmHNfNPr4H3WawUy0WaWSa6Qmaa8NbVV4Do2JOsr8M4EQYfyYhz SEIZbGu5gKw6LGG6VazG7VlhJYia5pst+zDYQEPzcm/ppGu+aLy/KQ0MAlmyG7id7DcO4n1vach zjl9DdEW6tuVCOHW2FFhk7+xr014fH75bhdKYzNYgJv3X+CIpSccsBF1SyArJ95zZHhZN1yjhKo OG7q0zQ37Ms/gqLUVCRExrIyIgGqD7Tg++mzbr8r/l6I+hZYYP8TMGkAJtu5pGCFNREFXMnryxl vtPQUsBzIwUTt+Jm60oBh8yqLP51pQ2mFoxCs9sYE2CkaqG5b3DSsAmoWzGL7KzHzzGJXD54msL QO6yOmiSPlWw2qJRZ4Q9wVoJwOth4c= X-Received: by 2002:a05:600c:350e:b0:477:2f7c:314f with SMTP id 5b1f17b1804b1-483a95f8af4mr145935825e9.10.1771866197155; Mon, 23 Feb 2026 09:03:17 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 57/65] hw/arm/virt: Move MSI controller creation out of create_gic() Date: Mon, 23 Feb 2026 17:02:04 +0000 Message-ID: <20260223170212.441276-58-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260223170212.441276-1-peter.maydell@linaro.org> References: <20260223170212.441276-1-peter.maydell@linaro.org> 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=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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: 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 @linaro.org) X-ZM-MESSAGEID: 1771866455622158500 Content-Type: text/plain; charset="utf-8" The create_gic() function also creates the MSI controller; however there isn't really a strong linkage here, and for the GICv5 it will be more convenient to separate it out. Move it to a new create_msi_controller() function. Signed-off-by: Peter Maydell Reviewed-by: Jonathan Cameron --- hw/arm/virt.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0d1032967c..3c318680f8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -959,11 +959,21 @@ static void create_gic(VirtMachineState *vms, MemoryR= egion *mem) } =20 fdt_add_gic_node(vms); +} =20 - if (vms->msi_controller =3D=3D VIRT_MSI_CTRL_ITS) { +static void create_msi_controller(VirtMachineState *vms) +{ + switch (vms->msi_controller) { + case VIRT_MSI_CTRL_ITS: create_its(vms); - } else if (vms->msi_controller =3D=3D VIRT_MSI_CTRL_GICV2M) { + break; + case VIRT_MSI_CTRL_GICV2M: create_v2m(vms); + break; + case VIRT_MSI_CTRL_NONE: + break; + default: + g_assert_not_reached(); } } =20 @@ -2515,6 +2525,7 @@ static void machvirt_init(MachineState *machine) virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem); =20 create_gic(vms, sysmem); + create_msi_controller(vms); =20 virt_post_cpus_gic_realized(vms, sysmem); =20 --=20 2.43.0