libxl: support 'rawset' ACPI table type

This fixes representation of the 'acpi_firmware' config in the Xen
driver, which repesents a concatenation of tables of any type.

Use of 'type=slic' is accepted on input for backwards compatibility.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index c108cc0c2a58afb907c55d63588eb4363fa2dcfd..7e0bab5444f0d667e9715e2bf1ba7c55b0364347 100644 (file)
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -498,7 +498,7 @@ These options apply to any form of booting of the guest OS.
      signature auto-detected from header (:since:`Since 11.2.0 (QEMU)`).
    * ``rawset``: concatenation of multiple ACPI tables with header
      and data, each with any ACPI signature, auto-detected from header
-     (:since:`Since 11.2.0`).
+     (:since:`Since 11.2.0 (Xen)`).
    * ``slic``: a single ACPI table with header and data, providing
      software licensing information. The ACPI table signature in the
      header will be forced to ``SLIC`` (:since:`Since 1.3.5 (QEMU)`,

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index ddfbe9b2ea80cbe5077a2a45166878f1354d70b5..06265cb1c031875194771ce2ac5578e234ee93ed 100644 (file)
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -331,11 +331,12 @@ libxlDomainDefValidate(const virDomainDef *def,
 
     for (i = 0; i < def->os.nacpiTables; i++) {
         switch (def->os.acpiTables[i]->type) {
-        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC:
+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC: /* Back compat for historical mistake,
+                                                  * functionally the same as 'rawset' */
+        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET:
             break;
 
         case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAW:
-        case VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET:
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("ACPI table type '%1$s' is not supported"),
                            virDomainOsACPITableTypeToString(def->os.acpiTables[i]->type));

diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index 96b8b0511c516ff2b5b59f09d4d4a54ffe9b095f..ec8de30c018c2e719d8533152086a38bd82ede2b 100644 (file)
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -140,7 +140,7 @@ xenParseXLOS(virConf *conf, virDomainDef *def, virCaps *caps)
             def->os.nacpiTables = 1;
             def->os.acpiTables = g_new0(virDomainOSACPITableDef *, 1);
             def->os.acpiTables[0] = g_new0(virDomainOSACPITableDef, 1);
-            def->os.acpiTables[0]->type = VIR_DOMAIN_OS_ACPI_TABLE_TYPE_SLIC;
+            def->os.acpiTables[0]->type = VIR_DOMAIN_OS_ACPI_TABLE_TYPE_RAWSET;
             def->os.acpiTables[0]->path = g_steal_pointer(&slic);
         }
 

diff --git a/tests/xlconfigdata/test-fullvirt-acpi-slic.xml b/tests/xlconfigdata/test-fullvirt-acpi-slic.xml
index 366d87762414f60ea7d13e79a7e11eada73f1a08..bf617e5e057231f5726f037c0f3b6d9323c34618 100644 (file)
--- a/tests/xlconfigdata/test-fullvirt-acpi-slic.xml
+++ b/tests/xlconfigdata/test-fullvirt-acpi-slic.xml
@@ -8,7 +8,7 @@
     <type arch='x86_64' machine='xenfv'>hvm</type>
     <loader type='rom' format='raw'>/usr/lib/xen/boot/hvmloader</loader>
     <acpi>
-      <table type='slic'>/sys/firmware/acpi/tables/SLIC</table>
+      <table type='rawset'>/sys/firmware/acpi/tables/SLIC</table>
     </acpi>
     <boot dev='cdrom'/>
   </os>