On Thu, Nov 12, 2015 at 12:56:27 +0100, Jiri Denemark wrote:
On Thu, Nov 12, 2015 at 14:07:38 +0300, Dmitry Andreev wrote:
Libvirt already has two types of panic devices - pvpanic and pSeries firmware. This patch introduces the 'model' attribute and a new type of panic device.
'isa' model is for ISA pvpanic device. 'pseries' model is a default value for pSeries guests. 'hyperv' model is the new type. It's used for Hyper-V crash.
Schema, docs and tests are updated for the new attribute. --- docs/formatdomain.html.in | 29 +++++++++++++++++-- docs/schemas/domaincommon.rng | 9 ++++++ src/conf/domain_conf.c | 33 ++++++++++++++++++---- src/conf/domain_conf.h | 10 +++++++ src/qemu/qemu_domain.c | 4 +++ .../qemuxml2argv-panic-no-address.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-panic.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- .../qemuxml2argv-pseries-nvram.xml | 2 +- .../qemuxml2argv-pseries-panic-address.xml | 2 +- .../qemuxml2argv-pseries-panic-no-address.xml | 2 +- .../qemuxml2xmlout-pseries-panic-missing.xml | 2 +- 12 files changed, 85 insertions(+), 14 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c88b032..93b9813 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6152,19 +6152,44 @@ qemu-kvm -net nic,model=? /dev/null <pre> ... <devices> - <panic> + <panic model='isa'> <address type='isa' iobase='0x505'/> </panic> </devices> ... </pre> + <p> + Example: usage of panic configuration for Hyper-V guests + </p> +<pre> + ... + <devices> + <panic model='hyperv'/> + </devices> + ... +</pre>
I think it would be enough to add <panic model='hyperv'/> as another device in the previous example. That is:
<pre> ... <devices> - <panic> + <panic model='isa'> <address type='isa' iobase='0x505'/> </panic> + <panic model='hyperv'/> </devices> ... </pre>
And one more important thing. We will now support specifying more panic elements for a single domain so both the code and the schema have to be changed to reflect this. Jirka