From nobody Sun Feb 8 13:11:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1729778953479905.9616021126035; Thu, 24 Oct 2024 07:09:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6D8051A7F; Thu, 24 Oct 2024 10:09:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 11E231969; Thu, 24 Oct 2024 10:08:32 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B306017A2; Thu, 24 Oct 2024 10:08:29 -0400 (EDT) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 194F9169B for ; Thu, 24 Oct 2024 10:08:29 -0400 (EDT) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-20c767a9c50so7771315ad.1 for ; Thu, 24 Oct 2024 07:08:29 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([177.197.107.149]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20e7f0f32e5sm72685755ad.248.2024.10.24.07.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 07:08:27 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1729778908; x=1730383708; darn=lists.libvirt.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=jdYWrd1sqhbX4xZy+/pp37rrJXoOSABUQUZj+XMCMx4=; b=Xhnyub2Ihkt6p3sNMROrti5U6s9YkGeqpWGypZpz0Yz3zyzi2ZjM355xsctJaShNFj XwQmiZiOb2hgq+3hVsgb6i1hjfrhQeiHo982dKzKhbzZHxVKWKOYXFsLBMAGMcYllXDn vantu+mD7EnOYmlfFSOsnGfi/3GQG8s0XRb50Um1hzddyQtBlXH8OQ+bcLnH8SOgE8xX J9zHMuxnnjepn5iZxrFdQkyp9aiVLWswKNN0Y+YWkvWI3er06aCGkUNXY/8kqDUIMkv/ 89N5Zq7JlJikAWZCS0rDZlCMX+hf3BLwccAON2p/tBPjjdbi/NbLuL1hcGa9yYlmOtWC YjiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729778908; x=1730383708; 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=jdYWrd1sqhbX4xZy+/pp37rrJXoOSABUQUZj+XMCMx4=; b=YOfptYyZ8iXoyncFOsWK3UVVS10fALrDzH5rALWy7+e2z5XjemrK7nBbcA8tGPpYqZ CaCY+2i5veKGGnzeQj5+ypFsXRkz5WCRmevmN97BYhGbZ1f8+rcy7Zk0fQ5LtkOE8xjD BgCiU/1TGvpG7Q/CCMHccoAhn7Enz+ScJwMEp65ZrbuOp2UY5Ai8SM1GgkxKrpjKFr1J QrTvA2lqUqn4/5A/CYe+e25S0k4poN1anAnFYlNTSyMZybHz8CuVImWqP2TIPrRLWzHB aAr8CBIMnU4LrFIijY6eKwWLAHM95AgXKAyMeNFKU0x1mNr+UbgpsD7pbqyKb6uSoYXX IwvQ== X-Gm-Message-State: AOJu0YxoZtoc+qTjfZ36kyY6abWE6dLNs7bfWrpg9DLUjTU2AzFyCvMf fW8rUN3hVVDD2JNuHFOFSVTGHySlRPfWt1m7E0eHWbV/j2ERReZ/pAecMGqlDXgZgOdHJhNS1+G x X-Google-Smtp-Source: AGHT+IEsjOkpqzvuYwxqwvwRU6Fxe6cVpW4sCEfFsnlmJS66Zyhz+6vwZmzWbT4ZhHtoKxLPp7yIEA== X-Received: by 2002:a17:903:244e:b0:20c:890c:2f76 with SMTP id d9443c01a7336-20fa9e5c583mr86399175ad.16.1729778907731; Thu, 24 Oct 2024 07:08:27 -0700 (PDT) From: Daniel Henrique Barboza To: devel@lists.libvirt.org Subject: [PATCH 1/3] qemu: add capability for RISC-V AIA feature Date: Thu, 24 Oct 2024 11:08:18 -0300 Message-ID: <20241024140820.168641-2-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241024140820.168641-1-dbarboza@ventanamicro.com> References: <20241024140820.168641-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6EVLSEFDWWQLLK42OQB6I7VGBZKQI4HQ X-Message-ID-Hash: 6EVLSEFDWWQLLK42OQB6I7VGBZKQI4HQ X-MailFrom: dbarboza@ventanamicro.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: dbarboza@ventanamicro.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1729778955227116600 Content-Type: text/plain; charset="utf-8" AIA (Advanced Interrupt Architecture) support was introduced in QEMU 7.0 for the 'virt' machine type. It allows the guest to choose from a more modern interrupt model than the default (CLINT - Core Logical Interrupt Controller). Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 + 4 files changed, 5 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9322ae9ae6..7b6d881c39 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -719,6 +719,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 465 */ "snapshot-internal-qmp", /* QEMU_CAPS_SNAPSHOT_INTERNAL_QMP = */ "chardev-reconnect-miliseconds", /* QEMU_CAPS_CHARDEV_RECONN= ECT_MILISECONDS */ + "machine.virt.aia", /* QEMU_CAPS_MACHINE_VIRT_AIA */ ); =20 =20 @@ -1748,6 +1749,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsMachi= nePropsPSeries[] =3D { static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsVirt[] =3D { { "iommu", QEMU_CAPS_MACHINE_VIRT_IOMMU }, { "ras", QEMU_CAPS_MACHINE_VIRT_RAS }, + { "aia", QEMU_CAPS_MACHINE_VIRT_AIA }, }; =20 static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsGeneric[] =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 54c7e30903..d38ab4df28 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -698,6 +698,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 465 */ QEMU_CAPS_SNAPSHOT_INTERNAL_QMP, /* internal snapshot support via QMP = commands 'snapshot-save'/'snapshot-delete' */ QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS, /* 'reconnect-ms' option for = chardevs supported */ + QEMU_CAPS_MACHINE_VIRT_AIA, /* -machine virt,aia=3D(none|aplic|aplic-i= msic), RISC-V only */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_8.0.0_riscv64.xml index 7959d49c02..0207637ebc 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml @@ -142,6 +142,7 @@ + 7002050 0 v7.2.0-333-g222059a0fc diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_9.1.0_riscv64.xml index 1e7b1e622b..bb6fbbe098 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -168,6 +168,7 @@ + 9001000 0 v9.1.0 --=20 2.45.2 From nobody Sun Feb 8 13:11:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1729778982543335.18720886782194; Thu, 24 Oct 2024 07:09:42 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 99E18199A; Thu, 24 Oct 2024 10:09:41 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id AAA401AA5; Thu, 24 Oct 2024 10:08:43 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4166E19CE; Thu, 24 Oct 2024 10:08:39 -0400 (EDT) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D0DD718F7 for ; Thu, 24 Oct 2024 10:08:31 -0400 (EDT) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-20cdda5cfb6so8023565ad.3 for ; Thu, 24 Oct 2024 07:08:31 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([177.197.107.149]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20e7f0f32e5sm72685755ad.248.2024.10.24.07.08.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 07:08:29 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1729778909; x=1730383709; darn=lists.libvirt.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=7tOUZ44UACYt+Bwy5+SzH3a8SyyruQO/jQzoO54ozR0=; b=UB5gZGrCUlasPanC9jb1wGS9l3NlpmAVeD/jii5AcMFC5ubDLwH1/P3l6O9rUIAO4V /XtevO3G8F5CNhmH/iZEQ+cs0SWVttJtI+MwCjZKCdUB5y5gEbnJT8Nhyv2IqdGyO7BH r/1CSQ5QzJngmuNyz4AhpZ0/EC6sA+wxLkauNVN9OW37OWRNcRSAYqphFby6YEiXoOZn SWNfJ6WyuVDTtX+QjIJhF6mv/Mah/tVU5qwdGfnYfnnlTky+dok5OR+ax/lUOk1sHI1M MxPT+w5MoXmyUtM8RpuS2W9zJF3dCH3WeDa1WVQfv/61GXWPoOw2XhXtl24sv0a9Tr0z vcfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729778909; x=1730383709; 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=7tOUZ44UACYt+Bwy5+SzH3a8SyyruQO/jQzoO54ozR0=; b=tG4PXlbg87uFupii2ZWU1OZQMOmVtRzXfaMnd6GWyX4/JVFU7WD4QPyp7FMRNC9ydR u+xA4MElo/DC+8/UIfoSvcJU+Y79qiZSEXOYpC6Ucb0+c9ZMAgUrsCfIqJlOMuRjX8qz taAS1PMmEycpRF501YFhnH0hFr73VW8mt8c+tSMM3vyvPIAOSJvm/hUlxK53N0kuFxZJ bG5YLhMeANRObS+yBPo4qZ/MlJD7WvlvxJeVly7FBTrEo59XVdqg/cMnjfocJT4/UP8/ lD4i+ZDYb9KM+Hdvm2iKf7uYDm8KZ/VQnZKNIvbF8nRVAfK7u1SCfoFNbHFYea8PKLVR M42Q== X-Gm-Message-State: AOJu0Yy75gQ/aHx15z6Wu66hYgpnnT+ZWe0wGmd117B9Q4FTymUpEgzh UBlqUPwsaxCDR0aoZ8w8BrFL7FNyZME+ML/etxFUduska/bnQ1LaF/Twob45PY+qtIFqLx3t1Nr L X-Google-Smtp-Source: AGHT+IFd9gtR+sivS6mDorkhrS8oRceEWIJqv13rmssrJeSQbc3OeFDfKC9jWFBKQH24y0HH6y+4LA== X-Received: by 2002:a17:903:2286:b0:20c:5263:247a with SMTP id d9443c01a7336-20fa9ea08ccmr85509845ad.38.1729778909526; Thu, 24 Oct 2024 07:08:29 -0700 (PDT) From: Daniel Henrique Barboza To: devel@lists.libvirt.org Subject: [PATCH 2/3] conf,qemu: implement RISC-V 'aia' virt domain feature Date: Thu, 24 Oct 2024 11:08:19 -0300 Message-ID: <20241024140820.168641-3-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241024140820.168641-1-dbarboza@ventanamicro.com> References: <20241024140820.168641-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HE2TL5GBNQ5NHK2JCMSCJCY2RN6VOZVQ X-Message-ID-Hash: HE2TL5GBNQ5NHK2JCMSCJCY2RN6VOZVQ X-MailFrom: dbarboza@ventanamicro.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: dbarboza@ventanamicro.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1729778983473116600 Content-Type: text/plain; charset="utf-8" This feature is implemented as a string that can range from "none", "aplic" and "aplic-imsic". If the feature isn't present in the domain XML the hypervisor default will be used. For QEMU, at least up to 9.2, the default is "none". Signed-off-by: Daniel Henrique Barboza --- docs/formatdomain.rst | 8 +++++++ src/conf/domain_conf.c | 39 +++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 11 +++++++++ src/conf/schemas/domaincommon.rng | 15 ++++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_validate.c | 15 ++++++++++++ 6 files changed, 90 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 3253a28e5a..780cea9aba 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2028,6 +2028,7 @@ Hypervisors may allow certain CPU / machine features = to be toggled on/off. + ... =20 @@ -2275,6 +2276,13 @@ are: disable the emulation of a PS/2 controller used by ``ps2`` bus input de= vices. If the attribute is not defined, the hypervisor default will be used. :since:`Since 10.7.0` (QEMU only) +``aia`` + Configure aia (Advanced Interrupt Architecture) for RISC-V 'virt' + guests. Possible values for the ``value`` attribute are ``aplic`` (one + emulated APLIC device present per socket), ``aplic-imsic`` (one APLIC a= nd + one IMSIC device present per core), or ``none`` (no support for AIA). + If the attribute is not defined, the hypervisor default + will be used. :since:`Since 10.8.0` (QEMU/KVM and RISC-V guests only) =20 Time keeping ------------ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6d7dee7956..1a677c47d7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -186,6 +186,7 @@ VIR_ENUM_IMPL(virDomainFeature, "async-teardown", "ras", "ps2", + "aia", ); =20 VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, @@ -1522,6 +1523,13 @@ VIR_ENUM_IMPL(virDomainPstoreBackend, "acpi-erst", ); =20 +VIR_ENUM_IMPL(virDomainAIA, + VIR_DOMAIN_AIA_LAST, + "none", + "aplic", + "aplic-imsic", +); + typedef enum { VIR_DOMAIN_NET_VHOSTUSER_MODE_NONE, VIR_DOMAIN_NET_VHOSTUSER_MODE_CLIENT, @@ -17040,6 +17048,18 @@ virDomainFeaturesDefParse(virDomainDef *def, break; } =20 + case VIR_DOMAIN_FEATURE_AIA: { + virDomainAIA value; + + if (virXMLPropEnumDefault(nodes[i], "value", virDomainAIATypeF= romString, + VIR_XML_PROP_NONZERO, &value, + VIR_DOMAIN_AIA_NONE) < 0) + return -1; + + def->features[val] =3D value; + break; + } + case VIR_DOMAIN_FEATURE_TCG: if (virDomainFeaturesTCGDefParse(def, ctxt, nodes[i]) < 0) return -1; @@ -21007,6 +21027,17 @@ virDomainDefFeaturesCheckABIStability(virDomainDef= *src, } break; =20 + case VIR_DOMAIN_FEATURE_AIA: + if (src->features[i] !=3D dst->features[i]) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("State of feature '%1$s' differs: source:= '%2$s=3D%3$s', destination: '%4$s=3D%5$s'"), + featureName, + "value", virDomainAIATypeToString(src->feat= ures[i]), + "value", virDomainAIATypeToString(dst->feat= ures[i])); + return false; + } + break; + case VIR_DOMAIN_FEATURE_MSRS: case VIR_DOMAIN_FEATURE_TCG: case VIR_DOMAIN_FEATURE_ASYNC_TEARDOWN: @@ -28001,6 +28032,14 @@ virDomainDefFormatFeatures(virBuffer *buf, virTristateBoolTypeToString(def->feature= s[i])); break; =20 + case VIR_DOMAIN_FEATURE_AIA: + if (def->features[i] =3D=3D VIR_DOMAIN_AIA_NONE) + break; + + virBufferAsprintf(&childBuf, "\n", + virDomainAIATypeToString(def->features[i])); + break; + case VIR_DOMAIN_FEATURE_LAST: break; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a15af4fae3..3cc019eb90 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2182,6 +2182,7 @@ typedef enum { VIR_DOMAIN_FEATURE_ASYNC_TEARDOWN, VIR_DOMAIN_FEATURE_RAS, VIR_DOMAIN_FEATURE_PS2, + VIR_DOMAIN_FEATURE_AIA, =20 VIR_DOMAIN_FEATURE_LAST } virDomainFeature; @@ -2398,6 +2399,16 @@ typedef enum { =20 VIR_ENUM_DECL(virDomainIBS); =20 +typedef enum { + VIR_DOMAIN_AIA_NONE =3D 0, + VIR_DOMAIN_AIA_APLIC, + VIR_DOMAIN_AIA_APLIC_IMSIC, + + VIR_DOMAIN_AIA_LAST +} virDomainAIA; + +VIR_ENUM_DECL(virDomainAIA); + typedef struct _virDomainFeatureKVM virDomainFeatureKVM; struct _virDomainFeatureKVM { int features[VIR_DOMAIN_KVM_LAST]; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index efb5f00d77..203b2ca979 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6922,6 +6922,9 @@ + + + @@ -7220,6 +7223,18 @@ =20 + + + + + none + aplic + aplic-imsic + + + + + diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5fb4df3513..deb4ef5ba6 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -229,6 +229,8 @@ virDiskNameParse; virDiskNameToBusDeviceIndex; virDiskNameToIndex; virDomainActualNetDefFree; +virDomainAIATypeFromString; +virDomainAIATypeToString; virDomainAudioDefFree; virDomainAudioFormatTypeFromString; virDomainAudioFormatTypeToString; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index fa23c5f973..8f44205667 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -265,6 +265,21 @@ qemuValidateDomainDefFeatures(const virDomainDef *def, } break; =20 + case VIR_DOMAIN_FEATURE_AIA: + if (def->features[i] !=3D VIR_TRISTATE_SWITCH_ABSENT && + !qemuDomainIsRISCVVirt(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("aia feature is only supported with RISC-= V Virt machines")); + return -1; + } + if (def->features[i] !=3D VIR_TRISTATE_SWITCH_ABSENT && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_VIRT_AIA)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("aia feature is not available with this QE= MU binary")); + return -1; + } + break; + case VIR_DOMAIN_FEATURE_SMM: case VIR_DOMAIN_FEATURE_KVM: case VIR_DOMAIN_FEATURE_XEN: --=20 2.45.2 From nobody Sun Feb 8 13:11:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1729779013793478.2109934677992; Thu, 24 Oct 2024 07:10:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id D5744190C; Thu, 24 Oct 2024 10:10:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9C2E6185F; Thu, 24 Oct 2024 10:08:50 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8483B1921; Thu, 24 Oct 2024 10:08:45 -0400 (EDT) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8A8241A5E for ; Thu, 24 Oct 2024 10:08:32 -0400 (EDT) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-20c7edf2872so15353125ad.1 for ; Thu, 24 Oct 2024 07:08:32 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([177.197.107.149]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20e7f0f32e5sm72685755ad.248.2024.10.24.07.08.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 07:08:30 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1729778911; x=1730383711; darn=lists.libvirt.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=EmDAEZK+2+hkD+7sTBSD2KZ5Uwf5yN6ujNADZaaUCgE=; b=MRsdgod5Agkf8c8J4iexcGePh8xngHLwA52XwKa3ywaYB1KKnUS9bb5fkvBLhClsQ+ FJpwwqac6DfPuZh/aOz2DjWxV311nDDjiA3XQxWhOdtfvdkOW0yJuw4hAl+VPMKLjyFr cKbecBmSHFezNJztX/AcGtScq0BgvKjwDy9vQ/d+hJ3mPzVoavGsT3wJBbY54Lsx3yz+ pzNwOI5pz4ffwEe6vKw8o6F5SIA1nqQlPEh/ob/46SiBJexW1y6yNjynSGEy6rms8U8W 36qDOHjBU7IiRAK3l1NBLP69wzIZuWG8STbWHxU6sub+iGgMSUANohf2yCDoQSqxKaU6 fgXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729778911; x=1730383711; 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=EmDAEZK+2+hkD+7sTBSD2KZ5Uwf5yN6ujNADZaaUCgE=; b=hQ+xu4WNKiOM4fQg1RKmjdYDMCRP809Bxcq42eJig1E21W04bb5F6pfVja9vjIVwGp iRPjtp/+EAR+T7anG8lqX2awu6eLAeBhcBaGXN9LPCOhDf7tBt+4pid5mQTXE917GHD7 ueRj8QjWVPJ4ThT2QXkzp6yztTed7m0dfboLgWabShMIwnpZlFIxfdddRRNiwN0vUO+M VO3uOdshqaI47j3pOhqdQa2G6BqOS2YG3BYBflm76iYpsBu+YGNfKK5k1dMdNXA8Vb1m o0xasDbtfKxNXbF2MIPrXrQF5zhYxkwFgzmi+WRmD2EoOGNnCYf+LwaV7qoXP7sY+DJQ DVMw== X-Gm-Message-State: AOJu0Yy9gFCq+TFauI/OhbFp35omBZirb8I3oiqT+L4emFOBfOu7TTLY FhhQhcGgMn5Zj5h4LqUwlg4VOfmU1/Ho22pBBltLw9CkD9bVWLyRJDAAPLY+pZHYrIf+NuChe/r a X-Google-Smtp-Source: AGHT+IE7D+x4IH0zfP9BViPmOFZ7TSmBgHOa+Bw7jErB2gW3IjE+GiqF86f+1nyqtvyxN66bLMVgZA== X-Received: by 2002:a17:902:db0b:b0:20c:7196:a1e9 with SMTP id d9443c01a7336-20fb892f9c3mr35828995ad.13.1729778911235; Thu, 24 Oct 2024 07:08:31 -0700 (PDT) From: Daniel Henrique Barboza To: devel@lists.libvirt.org Subject: [PATCH 3/3] qemu: add RISC-V 'aia' command line Date: Thu, 24 Oct 2024 11:08:20 -0300 Message-ID: <20241024140820.168641-4-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241024140820.168641-1-dbarboza@ventanamicro.com> References: <20241024140820.168641-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: KQZIC6HGOKHYLAGLCR356I2JECVEWDCZ X-Message-ID-Hash: KQZIC6HGOKHYLAGLCR356I2JECVEWDCZ X-MailFrom: dbarboza@ventanamicro.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: dbarboza@ventanamicro.com X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1729779015503116600 Content-Type: text/plain; charset="utf-8" The 'aia' feature is added as a machine type option for the 'virt' RISC-V machine, e.g. "-machine virt,aia=3D". Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_command.c | 5 +++ ...cv64-virt-features-aia.riscv64-latest.args | 31 +++++++++++++++++++ ...scv64-virt-features-aia.riscv64-latest.xml | 1 + .../riscv64-virt-features-aia.xml | 27 ++++++++++++++++ tests/qemuxmlconftest.c | 2 ++ 5 files changed, 66 insertions(+) create mode 100644 tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64= -latest.args create mode 120000 tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64= -latest.xml create mode 100644 tests/qemuxmlconfdata/riscv64-virt-features-aia.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a5ff7695c3..2637138481 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6712,6 +6712,11 @@ qemuAppendDomainFeaturesMachineParam(virBuffer *buf, virBufferAsprintf(buf, ",i8042=3D%s", str); } =20 + if (def->features[VIR_DOMAIN_FEATURE_AIA] !=3D VIR_DOMAIN_AIA_NONE) { + const char *str =3D virDomainAIATypeToString(def->features[VIR_DOM= AIN_FEATURE_AIA]); + virBufferAsprintf(buf, ",aia=3D%s", str); + } + return 0; } =20 diff --git a/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest= .args b/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.args new file mode 100644 index 0000000000..75b0f1e425 --- /dev/null +++ b/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.args @@ -0,0 +1,31 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-riscv64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=3Doff,aia=3Daplic-imsic,dump-guest-core=3Doff,memory-bac= kend=3Driscv_virt_board.ram,acpi=3Doff \ +-accel tcg \ +-cpu rv64 \ +-m size=3D4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","siz= e":4294967296}' \ +-overcommit mem-lock=3Doff \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest= .xml b/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.xml new file mode 120000 index 0000000000..1ab55fc10e --- /dev/null +++ b/tests/qemuxmlconfdata/riscv64-virt-features-aia.riscv64-latest.xml @@ -0,0 +1 @@ +riscv64-virt-features-aia.xml \ No newline at end of file diff --git a/tests/qemuxmlconfdata/riscv64-virt-features-aia.xml b/tests/qe= muxmlconfdata/riscv64-virt-features-aia.xml new file mode 100644 index 0000000000..708a2886f9 --- /dev/null +++ b/tests/qemuxmlconfdata/riscv64-virt-features-aia.xml @@ -0,0 +1,27 @@ + + guest + 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 + 4194304 + 4194304 + 4 + + hvm + + + + + + + rv64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-riscv64 + + + diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 9bcd937447..5fc011d41e 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -2921,6 +2921,8 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-q35-4.2", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("x86_64-default-cpu-tcg-features", "x86_64"); =20 + DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-features-aia", "riscv64"); + DO_TEST_CAPS_LATEST("virtio-9p-multidevs"); DO_TEST_CAPS_LATEST("virtio-9p-createmode"); =20 --=20 2.45.2