From nobody Tue Sep 9 23:58:13 2025 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 1737559125825388.40714217724576; Wed, 22 Jan 2025 07:18:45 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 50E6E14DE; Wed, 22 Jan 2025 10:18:45 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 11435154E; Wed, 22 Jan 2025 10:17:26 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9782F14B0; Wed, 22 Jan 2025 10:17:21 -0500 (EST) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 98FF014A4 for ; Wed, 22 Jan 2025 10:17:14 -0500 (EST) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-21670dce0a7so147393785ad.1 for ; Wed, 22 Jan 2025 07:17:14 -0800 (PST) Received: from grind.. ([191.202.238.10]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d402f7dsm96059215ad.216.2025.01.22.07.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 07:17:12 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 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=1737559033; x=1738163833; 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=dioV+R7OCrp1cTWAB9ed5BFX9VGmEXOnujxMRizQsmw=; b=FGFiwqMdxtz43lkX7VB+/mjaoroO3SfO9u+P9wlNM0dEy75sOjjRoEhAaJbL6DMFVQ koy4/EtXqgwzuAM8EX2m+DjdT7LMV0DWoMJlZjH8No1WSfpcrZDOtPvXc6Iluw+FLCV9 Rypc5FfDvmMEc+rBCrKcX1evelIczezbSSfrVUqLHTsJb5npse7TUYVZnrB6wU7h74+X ARHFNzHzEiFjv/jr890y8TMEy0/b9rtVGF1HO+g6DnGa/IavWiqEHo01bmjmTZnA4kcd 8KzyUVHi8WoZQDZyJ3f68T4w8OYD4xTfySJbe2lH+dy/BAVdY4tz9GFCM8hPOmLXVJPS zOSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737559033; x=1738163833; 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=dioV+R7OCrp1cTWAB9ed5BFX9VGmEXOnujxMRizQsmw=; b=SkfEWivpwjiSWe8bcpB2mCDlZysn1TVbU/2y94WOlwkve8BZVBMJwEfiq+s0tMufqE QSqMY80KEpq2xaxkqoZpjVSm/XIrudjPn7La/64w4JSSDOvVnPpOC/9H3xYSQCGYmBNE dRpoBAUheaY2FcQ+SIQ/tgPmnIR85y1mA9symwYFjQdClqB6yjbvG/H0KjRJ6WMCcqqA qrbC8Sttyn87rr1OCSIXVhWl9yUQ/5tgh6VAMjHSJMH+V1a1LRlr5ogx+aQyG8kARGm9 adDHlpnZlKqWS1MOSlXzIxMoVxbk8vcsOyeJODBQgYPisWhhm63Pu1thBoJbbyccMk/X 1a8g== X-Gm-Message-State: AOJu0YxzlZCcebaBqqXzAPsQmvwDXKChgJ/OEJvushBzU1G61TuGt2SV KugHi5H70oGTfHsX09TFuV2Xu15CfhTtim9gn8Fk4nisqck1IKEUJLHWCNd22vZKCYlEsoHFTJF h X-Gm-Gg: ASbGncvH+BFh8jAHE+fU3brzZCpcJ3Sv0S7fqCAaNuQfjwV2m/eXyZx/nSR3F1oMmoo swekZypqpCUnpfkt+joSg/iSI8Trx6j2HGcNINIVo57hRvN+5YxeyVl+qMSSU3DtfDkLE1d5XSq wxb4if+C8H/qs8iMiK9uflNnFBHA7AIVVxIQRNgn3rdX9IN4zJ7qt5M48YYpvJC9f97WPJvMAkI zxiY6NOOdqT6B2OwcIJpGo4z3pyqgRK+EEIGulS3g+6Q6y02mp7r6ak+WkV4YTOpwNn1TiX X-Google-Smtp-Source: AGHT+IGDbEAGVGEijpTbfJcqOUIlkjDuMLgpFDYfHTSPbHH4gPPFkKQ//2i5ha6EgpFDbLx0cXwl+A== X-Received: by 2002:a17:902:e802:b0:212:615f:c1 with SMTP id d9443c01a7336-21c3540a0admr360074665ad.14.1737559033171; Wed, 22 Jan 2025 07:17:13 -0800 (PST) From: Daniel Henrique Barboza To: devel@lists.libvirt.org Subject: [PATCH v2 2/3] conf,qemu: implement RISC-V 'aia' virt domain feature Date: Wed, 22 Jan 2025 12:17:01 -0300 Message-ID: <20250122151702.95617-4-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250122151702.95617-1-dbarboza@ventanamicro.com> References: <20250122151702.95617-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: Y6K5EO4EBJPCVXGXEST2AVHIDITMQPHG X-Message-ID-Hash: Y6K5EO4EBJPCVXGXEST2AVHIDITMQPHG 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: 1737559128452019000 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 Reviewed-by: Martin Kletzander --- docs/formatdomain.rst | 8 +++++++ src/conf/domain_conf.c | 40 +++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 12 ++++++++++ src/conf/schemas/domaincommon.rng | 15 ++++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_validate.c | 15 ++++++++++++ 6 files changed, 92 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 620daae9af..785b51bb4e 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2043,6 +2043,7 @@ Hypervisors may allow certain CPU / machine features = to be toggled on/off. + ... =20 @@ -2290,6 +2291,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 11.1.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 3f88a77a8f..5e7b9edf8f 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, @@ -1536,6 +1537,14 @@ VIR_ENUM_IMPL(virDomainPstoreBackend, "acpi-erst", ); =20 +VIR_ENUM_IMPL(virDomainAIA, + VIR_DOMAIN_AIA_LAST, + "default", + "none", + "aplic", + "aplic-imsic", +); + typedef enum { VIR_DOMAIN_NET_VHOSTUSER_MODE_NONE, VIR_DOMAIN_NET_VHOSTUSER_MODE_CLIENT, @@ -17171,6 +17180,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; @@ -21161,6 +21182,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: @@ -28219,6 +28251,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_DEFAULT) + 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 9f7c28343f..ba1a495764 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2206,6 +2206,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; @@ -2423,6 +2424,17 @@ typedef enum { =20 VIR_ENUM_DECL(virDomainIBS); =20 +typedef enum { + VIR_DOMAIN_AIA_DEFAULT =3D 0, + VIR_DOMAIN_AIA_NONE, + 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 7121519ca3..5848d3eaaf 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6996,6 +6996,9 @@ + + + @@ -7294,6 +7297,18 @@ =20 + + + + + none + aplic + aplic-imsic + + + + + diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 33b93cbd3e..ee90fb2b84 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 086c66b602..0a086d9cf4 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -264,6 +264,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.48.1