8026296455
- util: introduce object for holding a system inhibitor lock (RHEL-83064) - src: convert drivers over to new virInhibitor APIs (RHEL-83064) - rpc: remove logind support for virNetDaemon (RHEL-83064) - util: fix off-by-1 in inhibitor constants (RHEL-83064) - util: don't attempt to acquire logind inhibitor if not requested (RHEL-83064) - network: Free inhibitor in networkStateCleanup() (RHEL-83064) - conf: introduce support for multiple ACPI tables (RHEL-81041) - src: validate permitted ACPI table types in libxl/qemu drivers (RHEL-81041) - src: introduce 'raw' and 'rawset' ACPI table types (RHEL-81041) - qemu: support 'raw' ACPI table type (RHEL-81041) - libxl: support 'rawset' ACPI table type (RHEL-81041) - conf: support MSDM ACPI table type (RHEL-81041) - qemu: support MSDM ACPI table type (RHEL-81041) - qemuxmlconftest: Include shared memory 'net-vhostuser' test cases (RHEL-84133) - qemuValidateDomainDeviceDefNetwork: Require shared memory for all vhost-user interfaces (RHEL-84133) - qemu: process: Remove un-updated 'qemuProcessStartWarnShmem' (RHEL-84133) Resolves: RHEL-81041, RHEL-83064, RHEL-84133
120 lines
4.6 KiB
Diff
120 lines
4.6 KiB
Diff
From bfde8a471a604ddc3bfe7ee5baddbedc379ddf34 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <bfde8a471a604ddc3bfe7ee5baddbedc379ddf34.1742990721.git.jdenemar@redhat.com>
|
|
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
Date: Mon, 17 Feb 2025 16:58:27 +0000
|
|
Subject: [PATCH] conf: support MSDM ACPI table type
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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/design/dn653305(v=vs.85)
|
|
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
(cherry picked from commit 32765cd14e99411dfd14a230be86f2aecf7e9a7a)
|
|
Resolves: https://issues.redhat.com/browse/RHEL-81041
|
|
---
|
|
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 b03b5317aa..c144851b62 100644
|
|
--- a/docs/formatdomain.rst
|
|
+++ b/docs/formatdomain.rst
|
|
@@ -497,6 +497,10 @@ These options apply to any form of booting of the guest 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`).
|
|
|
|
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 2ee0403c86..f6d3d849eb 100644
|
|
--- a/src/conf/domain_conf.c
|
|
+++ b/src/conf/domain_conf.c
|
|
@@ -1461,6 +1461,7 @@ VIR_ENUM_IMPL(virDomainOsACPITable,
|
|
"raw",
|
|
"rawset",
|
|
"slic",
|
|
+ "msdm",
|
|
);
|
|
|
|
VIR_ENUM_IMPL(virDomainCFPC,
|
|
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
|
|
index bc3f42888e..961b7b056c 100644
|
|
--- a/src/conf/domain_conf.h
|
|
+++ b/src/conf/domain_conf.h
|
|
@@ -2466,6 +2466,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,
|
|
|
|
VIR_DOMAIN_OS_ACPI_TABLE_TYPE_LAST
|
|
} virDomainOsACPITable;
|
|
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
|
|
index 99bcc90d4f..d46eb44588 100644
|
|
--- a/src/conf/schemas/domaincommon.rng
|
|
+++ b/src/conf/schemas/domaincommon.rng
|
|
@@ -7192,6 +7192,7 @@
|
|
<value>raw</value>
|
|
<value>rawset</value>
|
|
<value>slic</value>
|
|
+ <value>msdm</value>
|
|
</choice>
|
|
</attribute>
|
|
<ref name="absFilePath"/>
|
|
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;
|
|
|
|
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.acpiTables[i]->type));
|
|
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
index adf7b21b14..9fe191d3b9 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",
|
|
+ "");
|
|
|
|
|
|
const char *
|
|
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
|
|
index b088e54dd0..378f502ea7 100644
|
|
--- a/src/qemu/qemu_validate.c
|
|
+++ b/src/qemu/qemu_validate.c
|
|
@@ -734,6 +734,7 @@ qemuValidateDomainDefBoot(const virDomainDef *def,
|
|
break;
|
|
|
|
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.acpiTables[i]->type));
|
|
--
|
|
2.49.0
|