From 64e98bd85307c6ea98fc70322361ddcde237ec9b Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 26 Oct 2023 13:56:46 +0200
Subject: [PATCH] docs: formatdomain: Clarify that the SLIC ACPI table config
 is available for all modes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the docs for the <acpi><table> element under a common section as
it's not specific for direct kernel boot. In fact the original use was
for Windows activation.

Fixes: 72f652da63255c7f1a9914625cce617dde9128d0
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 docs/formatdomain.rst | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 03735e4593..459815d2b5 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -387,9 +387,6 @@ and full virtualized guests.
      <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>
    ...
 
@@ -413,11 +410,6 @@ and full virtualized guests.
    The contents of this element specify the fully-qualified path to the
    (optional) device tree binary (dtb) image in the host OS. :since:`Since
    1.0.4`
-``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)`
-
 
 Container boot
 ~~~~~~~~~~~~~~
@@ -470,6 +462,27 @@ If you want to enable user namespace, set the ``idmap`` element. The ``uid`` and
      <gid start='0' target='1000' count='10'/>
    </idmap>
 
+Common ``<os>`` element configuration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These options apply to any form of booting of the guest OS.
+
+::
+
+   ...
+   <os>
+     ...
+     <acpi>
+       <table type='slic'>/path/to/slic.dat</table>
+     </acpi>
+   </os>
+   ...
+
+``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)`
+
 
 SMBIOS System Information
 -------------------------