From nobody Thu Dec 18 08:27:23 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1739902501600832.3621884883416; Tue, 18 Feb 2025 10:15:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 03FD51B9C; Tue, 18 Feb 2025 13:15:00 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 983951A39; Tue, 18 Feb 2025 13:13:38 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 24F811A40; Tue, 18 Feb 2025 13:13:34 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 534441BF6 for ; Tue, 18 Feb 2025 13:13:06 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-526-PzjvBE4TMj2bgrs83b9bYQ-1; Tue, 18 Feb 2025 13:13:02 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DB7ED1800570 for ; Tue, 18 Feb 2025 18:13:01 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.158]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6AF8119560AF; Tue, 18 Feb 2025 18:13:00 +0000 (UTC) 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_H2,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=redhat.com; s=mimecast20190719; t=1739902386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4AAOSzqzVkZ1vvYgKgybUFUs2FPv/LFT5NaJ45hldSA=; b=Mji7kwkcr1LVj4fDyJgxbuNmAVuNMpyXhXXFaMj9NuZmxEtioFpl+RQnrfdvF9gK41jkXG S4owengVrfcaanBlbTlZ+zR/eBo3bvFAS9v14rFvaA0CZT3nwUnudcIzheFV+BTA9bDN7/ MMXipJBtz6MD2J3ZNilbidCw/fb3Lq0= X-MC-Unique: PzjvBE4TMj2bgrs83b9bYQ-1 X-Mimecast-MFC-AGG-ID: PzjvBE4TMj2bgrs83b9bYQ_1739902382 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Subject: [PATCH 3/4] conf: support MSDM ACPI table type Date: Tue, 18 Feb 2025 18:12:52 +0000 Message-ID: <20250218181253.1632013-4-berrange@redhat.com> In-Reply-To: <20250218181253.1632013-1-berrange@redhat.com> References: <20250218181253.1632013-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _86tRl4SV7L6O7WcwVMjrvStrXxlvEebMPVkZrmneEQ_1739902382 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: LNSJ32CZRQTETSCARTTW7AKFJGJZX3DS X-Message-ID-Hash: LNSJ32CZRQTETSCARTTW7AKFJGJZX3DS X-MailFrom: berrange@redhat.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: Victor Toso 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: 1739902502113019000 Content-Type: text/plain; charset="utf-8" The MSDM ACPI table is a replacement for the SLIC table type, now preferred by Microsoft for Windows Licensing checks: https://learn.microsoft.com/en-us/previous-versions/windows/hardware/desi= gn/dn653305(v=3Dvs.85) Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/formatdomain.rst | 4 ++-- src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 ++++- src/libvirt_private.syms | 2 ++ src/libxl/libxl_domain.c | 7 +++++++ src/qemu/qemu_validate.c | 7 +++++++ 7 files changed, 24 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 381bf84f67..81dfd310ae 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -485,8 +485,8 @@ These options apply to any form of booting of the guest= OS. =20 ``acpi`` The ``table`` element contains a fully-qualified path to the ACPI table= . The - ``type`` attribute contains the ACPI table type (currently only ``slic`= ` is - supported) :since:`Since 1.3.5 (QEMU)` :since:`Since 5.9.0 (Xen)` + ``type`` attribute contains the ACPI table type: ``slic`` (:since:`Sin= ce 1.3.5 (QEMU)` + :since:`Since 5.9.0 (Xen)`, ``msdm``. =20 =20 SMBIOS System Information diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 04fb893587..e0f9ad3123 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1460,6 +1460,7 @@ VIR_ENUM_IMPL(virDomainOsDefFirmwareFeature, VIR_ENUM_IMPL(virDomainOsACPITable, VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST, "slic", + "msdm", ); =20 VIR_ENUM_IMPL(virDomainCFPC, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7735cce325..d84da21cca 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2476,6 +2476,7 @@ VIR_ENUM_DECL(virDomainOsDefFirmwareFeature); =20 typedef enum { VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC, + VIR_DOMAIN_OS_ACPI_TABLE_TYPE_MSDM, =20 VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST } virDomainOsACPITable; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 3328a63205..9bae953295 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -7191,7 +7191,10 @@ - slic + + slic + msdm + diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 30a9f806f0..db8c29ec1d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -611,6 +611,8 @@ virDomainObjTaint; virDomainObjUpdateModificationImpact; virDomainObjWait; virDomainObjWaitUntil; +virDomainOsACPITableTypeFromString; +virDomainOsACPITableTypeToString; virDomainOsDefFirmwareTypeFromString; virDomainOsDefFirmwareTypeToString; virDomainOSTypeFromString; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 816ed2f349..5fb85931f4 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -336,6 +336,13 @@ libxlDomainDefValidate(const virDomainDef *def, case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC: break; =20 + case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_MSDM: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("ACPI table '%1$s' not supported"), + virDomainOsACPITableTypeToString( + def->os.acpiTables[i]->type)); + return -1; + default: case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST: virReportEnumRangeError(virDomainOsACPITable, diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 039f5f84e6..0b3efcd700 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -747,6 +747,13 @@ qemuValidateDomainDefBoot(const virDomainDef *def, case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC: break; =20 + case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_MSDM: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("ACPI table '%1$s' not supported"), + virDomainOsACPITableTypeToString( + def->os.acpiTables[i]->type)); + return -1; + default: case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST: virReportEnumRangeError(virDomainOsACPITable, --=20 2.47.1