From nobody Wed Mar 12 17:43:08 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 17406011957171015.3672105455635; Wed, 26 Feb 2025 12:19:55 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 1248E1A2C; Wed, 26 Feb 2025 15:19:55 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 8ABBC1956; Wed, 26 Feb 2025 15:17:03 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8D3AE168A; Wed, 26 Feb 2025 15:16:55 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 D7570194E for ; Wed, 26 Feb 2025 15:16:39 -0500 (EST) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-diG4hyTQMLaqZcjhAPJn2Q-1; Wed, 26 Feb 2025 15:16:38 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4F1D219373D9 for ; Wed, 26 Feb 2025 20:16:37 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.33.32]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 81CA8300018D; Wed, 26 Feb 2025 20:16:35 +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_H5,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=redhat.com; s=mimecast20190719; t=1740600999; 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=9raT2fdq0s1yqziRxRhRqI3Q1aAmT+/uE5kEZjr6ujw=; b=AnGFbpJEqIv0hwIvlsE3VEj3tnZT3SDYC0QgAmgoPeyOwau+Z2M9q0KIB0+3GFejtZ8zvo UQzwXrRXy7CMke0gK6pCV3lVqiv9YbIc/1mW32ry7CMEieMYiM19LZGH163VdTvVXxmdSO iXJjnCYAQGtZRZvHbSamaBX4zUPnJB8= X-MC-Unique: diG4hyTQMLaqZcjhAPJn2Q-1 X-Mimecast-MFC-AGG-ID: diG4hyTQMLaqZcjhAPJn2Q_1740600997 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: devel@lists.libvirt.org Subject: [PATCH v2 6/7] conf: support MSDM ACPI table type Date: Wed, 26 Feb 2025 20:16:18 +0000 Message-ID: <20250226201619.2730066-7-berrange@redhat.com> In-Reply-To: <20250226201619.2730066-1-berrange@redhat.com> References: <20250226201619.2730066-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 06s0OUWvJsDU6zT-cFZ1zaWVhwmlD3FXLXq5m9qw1VM_1740600997 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XP55CGJSW5ODRJRYQS4A72TAIBD5UAF3 X-Message-ID-Hash: XP55CGJSW5ODRJRYQS4A72TAIBD5UAF3 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: 1740601196761019000 Content-Type: text/plain; charset="utf-8" The MSDM ACPI table is an alternative for the SLIC table type, sometimes used 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 | 1 + src/libxl/libxl_domain.c | 1 + src/qemu/qemu_command.c | 3 ++- src/qemu/qemu_validate.c | 1 + 7 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 895f74a42a..3bf1ff7714 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -503,6 +503,10 @@ These options apply to any form of booting of the gues= t OS. software licensing information. The ACPI table signature in the header will be forced to ``SLIC`` (:since:`Since 1.3.5 (QEMU)`, mis-interpreted as ``rawset`` :since:`Since 5.9.0 (Xen)`). + * ``msdm``: a single ACPI table with header and data, providing + Microsoft Data Management information. The ACPI table signature + in the header will be forced to ``MSDM`` + (:since:`Since 11.2.0`). =20 Each type may be used only once, except for ``raw`` which can appear multiple times. diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 530473e200..7bdfe21bff 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1462,6 +1462,7 @@ VIR_ENUM_IMPL(virDomainOsACPITable, "raw", "rawset", "slic", + "msdm", ); =20 VIR_ENUM_IMPL(virDomainCFPC, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 299e2cbd5b..7880cbedff 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2478,6 +2478,7 @@ typedef enum { VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW, VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET, 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 b5eaf7c233..39d5604454 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -7184,6 +7184,7 @@ raw rawset slic + msdm diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index e31d92d903..c5a556ec78 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -339,6 +339,7 @@ libxlDomainDefValidate(const virDomainDef *def, break; =20 case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW: + case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_MSDM: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("ACPI table type '%1$s' is not supported"), virDomainOsACPITableTypeToString(def->os.acpiTa= bles[i]->type)); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5ecc50d838..67797a8af8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -132,7 +132,8 @@ VIR_ENUM_IMPL(qemuACPITableSIG, VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST, "", /* raw */ "", /* rawset */ - "SLIC"); + "SLIC", + ""); =20 =20 const char * diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 397e2073ef..295be2de5a 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -749,6 +749,7 @@ qemuValidateDomainDefBoot(const virDomainDef *def, break; =20 case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET: + case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_MSDM: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("ACPI table type '%1$s' is not supported"), virDomainOsACPITableTypeToString(def->os.acpiTa= bles[i]->type)); --=20 2.47.1