From 882f643a2e148cfd5b7e0c1131d9f7cf4f4fe03c Mon Sep 17 00:00:00 2001
From: Stefan Knorr <sknorr@suse.de>
Date: Mon, 25 Nov 2019 16:47:44 +0100
Subject: [PATCH] Make the AMD SEV Guide part of SLES-all

Signed-off-by: Stefan Knorr <sknorr@suse.de>
---
 DC-SLES-amd-sev          |  5 +++--
 xml/art_amd-sev.xml      | 35 ++++++++++++++---------------------
 xml/book_quickstarts.xml |  2 +-
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/DC-SLES-amd-sev b/DC-SLES-amd-sev
index c509429060..b849ac0c5a 100644
--- a/DC-SLES-amd-sev
+++ b/DC-SLES-amd-sev
@@ -4,11 +4,12 @@
 ## ----------------------------
 ##
 ## Basics
-MAIN="art_amd-sev.xml"
+MAIN="MAIN.SLEDS.xml"
 ROOTID=art-amd-sev
 
 ## Profiling
-PROFOS="article"
+PROFOS="sles"
+PROFARCH="x86_64;zseries;power;aarch64"
 
 
 ## stylesheet location
diff --git a/xml/art_amd-sev.xml b/xml/art_amd-sev.xml
index 48d02f4ef4..8e2a78c074 100644
--- a/xml/art_amd-sev.xml
+++ b/xml/art_amd-sev.xml
@@ -7,8 +7,6 @@
 [
   <!ENTITY % entities SYSTEM "entity-decl.ent">
   %entities;
-  <!ENTITY productnamex "&sls;">
-  <!ENTITY productnumberx "15">
 ]>
 
 <article xml:id="art-amd-sev" xml:lang="en" version="5.0"
@@ -17,8 +15,8 @@
   xmlns:xlink="http://www.w3.org/1999/xlink">
  <title>AMD Secure Encrypted Virtualization (AMD-SEV) Guide</title>
  <info>
-  <productname>&productnamex;</productname>
-  <productnumber>&productnumberx;</productnumber>
+  <productname>&productname;</productname>
+  <productnumber>&productnumber;</productnumber>
   <date><?dbtimestamp format="B d, Y" ?></date>
   <abstract>
    <para>
@@ -34,8 +32,7 @@
    </para>
   </abstract>
  </info>
- <!-- intro paras: -->
- 
+
  <sect1 xml:id="sec-amd-sev-intro">
  <title>Introducing SEV</title>
  <para>
@@ -48,7 +45,7 @@
   Without encryption, any stored information - such as sensitive data,
   passwords, or secret keys - could easily be compromised.
  </para>
- <para>   
+ <para>
   AMD's SEV (Secure Encrypted Virtualization) is a technology to protect Linux
   KVM virtual machines by transparently encrypting the memory of each VM with a
   unique key. SEV can also calculate a signature of the memory contents, which
@@ -66,9 +63,9 @@
   &sle;.
  </para>
  </sect1>
- 
+
  <!-- sections: -->
- 
+
  <sect1 xml:id="sec-amd-sev-hostreqs">
   <title>VM Host Requirements</title>
   <para>
@@ -92,7 +89,7 @@
   </para>
   <screen>/sys/module/kvm_amd/parameters/sev = 1</screen>
  </sect1>
- 
+
  <sect1 xml:id="sec-amd-sev-vmreqs">
   <title>VM Requirements</title>
   <para>
@@ -208,7 +205,7 @@
     </callout>
    </calloutlist>
   </example>
-  
+
   <para>
    The guest policy is four unsigned bytes with the following definition:
   </para>
@@ -333,10 +330,8 @@
    the <tag class="element">locked</tag> subelement of
    <tag class="element">memoryBacking</tag>. Explicit memory locking can be
    avoided by configuring the virtual machine to use <literal>hugepages</literal>.
-   For more information on using hugepages with VMs, refer to the
-   <citetitle>Virtualization Best Practices Guide</citetitle>, 
-   Chapter "Configuring the VM Host Server and the VM Guest to use Huge Pages":
-   <link xlink:href="&dsc-sles;/html/SLES-all/article-vt-best-practices.html#sec-vt-best-mem-huge-pages"/>.
+   For more information on using hugepages with VMs, see
+   <xref linkend="sec-vt-best-mem-huge-pages"/>.
   </para>
   <para>
    Whilst the overhead incurred is no different to that required for
@@ -344,7 +339,7 @@
    when pinning memory. If the limit is too low, the VM will get killed.
   </para>
  </sect1>
- 
+
  <sect1 xml:id="sec-amd-sev-limits">
   <title>Current Limitations</title>
   <itemizedlist>
@@ -374,7 +369,7 @@
    and various layers of software receive new features.
   </para>
  </sect1>
- 
+
  <sect1 xml:id="sec-amd-sev-moreinfo">
   <title>For More Information</title>
   <itemizedlist>
@@ -411,9 +406,7 @@
    </listitem>
   </itemizedlist>
  </sect1>
- 
- <!-- common end matter -->
- 
+
  <xi:include href="common_gfdl1.2_i.xml"/>
- 
+
 </article>
diff --git a/xml/book_quickstarts.xml b/xml/book_quickstarts.xml
index 95da16c4e4..a38e4cbc0d 100644
--- a/xml/book_quickstarts.xml
+++ b/xml/book_quickstarts.xml
@@ -14,7 +14,6 @@
  xmlns:xlink="http://www.w3.org/1999/xlink">
  <info>
   <title>Quick Start Manuals</title>
-  <!--<titleabbrev></titleabbrev>-->
   <productname>&productname;</productname>
   <productnumber>&productnumber;</productnumber>
   <date>
@@ -30,5 +29,6 @@
  <xi:include href="art_sle_modules_quick.xml"/>
  <xi:include os="sles" href="xen2kvm_quick.xml"/>
  <xi:include os="sles" href="vt_best_practices.xml"/>
+ <xi:include os="sles" href="art_amd-sev.xml"/>
  <xi:include href="common_legal.xml"/>
 </book>