conf: add <acpi><table> to <os>

Add a new element to <domain> XML:
<os>
  <acpi>
    <table type="slic">/path/to/acpi/table/file</table>
  </acpi>
</os>

To supply a path to a SLIC (Software Licensing) ACPI
table blob.

https://bugzilla.redhat.com/show_bug.cgi?id=1327537

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 72bfa35f30fbf90bfedca69e82d9526b4dd8a089..9b3f9ee26963b746d3a0d69b658ee3bf5fe3acd4 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -277,6 +277,9 @@
     <initrd>/root/f8-i386-initrd</initrd>
     <cmdline>console=ttyS0 ks=http://example.com/f8-i386/os/</cmdline>
     <dtb>/root/ppc.dtb</dtb>
+    <acpi>
+      <table type='slic'>/path/to/slic.dat</table>
+    </acpi>
   </os>
   ...</pre>
 
@@ -302,6 +305,11 @@
       <dd>The contents of this element specify the fully-qualified path
         to the (optional) device tree binary (dtb) image in the host OS.
         <span class="since">Since 1.0.4</span></dd>
+      <dt><code>acpi</code></dt>
+      <dd>The <code>table</code> element contains a fully-qualified path
+        to the ACPI table. The <code>type</code> attribute contains the
+        ACPI table type (currently only <code>slic</code> is supported)
+        <span class="since">Since 1.3.5 (QEMU only)</span></dd>
     </dl>
 
     <h4><a name="elementsOSContainer">Container boot</a></h4>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 903fd7ebe6179d0233dcde1598bb029659f3fd21..bbe676147e4abdce470f962d6ab6100772c6c0c1 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -306,6 +306,9 @@
         <optional>
           <ref name="bios"/>
         </optional>
+        <optional>
+          <ref name="acpiTable"/>
+        </optional>
       </interleave>
     </element>
   </define>
@@ -4505,6 +4508,21 @@
     </data>
   </define>
 
+  <define name="acpiTable">
+    <element name="acpi">
+      <zeroOrMore>
+        <element name="table">
+          <attribute name="type">
+            <choice>
+              <value>slic</value>
+            </choice>
+          </attribute>
+          <ref name="absFilePath"/>
+        </element>
+      </zeroOrMore>
+    </element>
+  </define>
+
   <define name="smbios">
     <element name="smbios">
       <attribute name="mode">

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7108c7e1af37299a809df55bb586eae579b76b90..e5c355eb1948e5591a7d86127204df47c32f30c4 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2619,6 +2619,7 @@ void virDomainDefFree(virDomainDefPtr def)
     VIR_FREE(def->os.cmdline);
     VIR_FREE(def->os.dtb);
     VIR_FREE(def->os.root);
+    VIR_FREE(def->os.slic_table);
     virDomainLoaderDefFree(def->os.loader);
     VIR_FREE(def->os.bootloader);
     VIR_FREE(def->os.bootloaderArgs);
@@ -15115,6 +15116,8 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
                              virHashTablePtr *bootHash)
 {
     xmlNodePtr *nodes = NULL;
+    xmlNodePtr oldnode;
+    char *tmp = NULL;
     int ret = -1;
     size_t i;
     int n;
@@ -15175,6 +15178,40 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
     }
 
     if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
+        if ((n = virXPathNodeSet("./os/acpi/table", ctxt, &nodes)) < 0)
+            goto error;
+
+        if (n > 1) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("Only one acpi table is supported"));
+            goto error;
+        }
+
+        if (n == 1) {
+            oldnode = ctxt->node;
+            ctxt->node = nodes[0];
+            tmp = virXPathString("string(./@type)", ctxt);
+
+            if (!tmp) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("Missing acpi table type"));
+                goto error;
+            }
+
+            if (STREQ_NULLABLE(tmp, "slic")) {
+                VIR_FREE(tmp);
+                tmp = virXPathString("string(.)", ctxt);
+                def->os.slic_table = virFileSanitizePath(tmp);
+                VIR_FREE(tmp);
+            } else {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("Unknown acpi table type: %s"),
+                               tmp);
+                goto error;
+            }
+            ctxt->node = oldnode;
+        }
+
         if (virDomainDefParseBootXML(ctxt, def) < 0)
             goto error;
         if (!(*bootHash = virHashCreate(5, NULL)))
@@ -15185,6 +15222,7 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
 
  error:
     VIR_FREE(nodes);
+    VIR_FREE(tmp);
     return ret;
 }
 
@@ -22516,6 +22554,14 @@ virDomainDefFormatInternal(virDomainDefPtr def,
                           def->os.dtb);
     virBufferEscapeString(buf, "<root>%s</root>\n",
                           def->os.root);
+    if (def->os.slic_table) {
+        virBufferAddLit(buf, "<acpi>\n");
+        virBufferAdjustIndent(buf, 2);
+        virBufferEscapeString(buf, "<table type='slic'>%s</table>\n",
+                              def->os.slic_table);
+        virBufferAdjustIndent(buf, -2);
+        virBufferAddLit(buf, "</acpi>\n");
+    }
 
     if (!def->os.bootloader) {
         for (n = 0; n < def->os.nBootDevs; n++) {

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 4e0550c4a164bcea8c2a8460d8a5431f916fadc3..963b478d4c0c4ff001228a0613606ccfe731e44f 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1746,6 +1746,7 @@ struct _virDomainOSDef {
     char *cmdline;
     char *dtb;
     char *root;
+    char *slic_table;
     virDomainLoaderDefPtr loader;
     char *bootloader;
     char *bootloaderArgs;

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml b/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml
new file mode 100644 (file)
index 0000000..9b8f590
--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-acpi-table.xml
@@ -0,0 +1,30 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+    <acpi>
+      <table type='slic'>/var/lib/libvirt/acpi/slic.dat</table>
+    </acpi>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu</emulator>
+    <controller type='usb' index='0'/>
+    <controller type='ide' index='0'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>

diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-acpi-table.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-acpi-table.xml
new file mode 100644 (file)
index 0000000..2eb25a3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-acpi-table.xml
@@ -0,0 +1,34 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <acpi>
+      <table type='slic'>/var/lib/libvirt/acpi/slic.dat</table>
+    </acpi>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu</emulator>
+    <controller type='usb' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index c85cd6072246c2c70e18e9e69557b85954bc4540..e23831b3b45d31b89c05463baf44eb30fe1edff7 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -806,6 +806,9 @@ mymain(void)
     DO_TEST("virtio-input-passthrough");
 
     virObjectUnref(cfg);
+
+    DO_TEST("acpi-table");
+
     qemuTestDriverFree(&driver);
 
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;