summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBoris Fiuczynski <fiuczy@linux.vnet.ibm.com>2016-04-29 15:23:41 +0200
committerAndrea Bolognani <abologna@redhat.com>2016-05-02 17:01:40 +0200
commitd855465452e978c3efe94d85ab107c066b40045d (patch)
treee518fefdf6997b1c77c54fc174e04108809927e1 /docs
parentb43ab240c2ba86a2821386d0d8377b95f57b0bcb (diff)
downloadlibvirt-d855465452e978c3efe94d85ab107c066b40045d.tar.gz
qemu: add panic device support for S390
If a panic device is being defined without a model in a domain the default value is always overwritten with model ISA. An ISA bus does not exist on S390 and therefore specifying a panic device results in an unsupported configuration. Since the S390 architecture inherently provides a crash detection capability the panic device should be defined in the domain xml. This patch adds an s390 panic device model and prevents setting a device address on it. Signed-off-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/formatdomain.html.in16
-rw-r--r--docs/schemas/domaincommon.rng1
2 files changed, 13 insertions, 4 deletions
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 3e72dae2dc..bead624606 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -6355,9 +6355,15 @@ qemu-kvm -net nic,model=? /dev/null
<span class="since">Since 1.2.1, QEMU and KVM only</span>
</p>
<p>
- For pSeries guests, this feature is always enabled since it's
- implemented by the guest firmware, thus libvirt automatically
- adds the <code>panic</code> element to the domain XML.
+ This feature is always enabled for:
+ </p>
+ <ul>
+ <li>pSeries guests, since it's implemented by the guest firmware</li>
+ <li>S390 guests, since it's an integral part of the S390 architecture</li>
+ </ul>
+ <p>
+ For the guest types listed above, libvirt automatically adds a
+ <code>panic</code> element to the domain XML.
</p>
<p>
Example: usage of panic configuration
@@ -6385,6 +6391,8 @@ qemu-kvm -net nic,model=? /dev/null
<li>'pseries' &mdash; default and valid only for pSeries guests.</li>
<li>'hyperv' &mdash; for Hyper-V crash CPU feature.
<span class="since">Since 1.3.0, QEMU and KVM only</span></li>
+ <li>'s390' &mdash; default for S390 guests.
+ <span class="since">Since 1.3.5</span></li>
</ul>
</dd>
<dt><code>address</code></dt>
@@ -6392,7 +6400,7 @@ qemu-kvm -net nic,model=? /dev/null
<p>
address of panic. The default ioport is 0x505. Most users
don't need to specify an address, and doing so is forbidden
- altogether for pseries and hyperv models.
+ altogether for s390, pseries and hyperv models.
</p>
</dd>
</dl>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index f143bf05bb..b82f8c856e 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -5518,6 +5518,7 @@
<value>isa</value>
<value>pseries</value>
<value>hyperv</value>
+ <value>s390</value>
</choice>
</attribute>
</optional>