openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support for the new watchdog model diag288 

This patch provides support for the new watchdog model "diag288".

Signed-off-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Reviewed-by: Daniel Hansel <daniel.hansel@linux.vnet.ibm.com>
Reviewed-by: Stefan Zimmermann <stzi@linux.vnet.ibm.com>
Reviewed-by: Tony Krowiak <akrowiak@linux.vnet.ibm.com>
This commit is contained in:
Boris Fiuczynski 2015-06-24 11:28:43 +02:00 committed by Ján Tomko
parent 4fda44940b
commit b831c5b801
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/formatdomain.html.in
View File

@ -5716,6 +5716,8 @@ qemu-kvm -net nic,model=? /dev/null
<li> 'i6300esb' &mdash; the recommended device, <li> 'i6300esb' &mdash; the recommended device,
emulating a PCI Intel 6300ESB </li> emulating a PCI Intel 6300ESB </li>
<li> 'ib700' &mdash; emulating an ISA iBase IB700 </li> <li> 'ib700' &mdash; emulating an ISA iBase IB700 </li>
<li> 'diag288' &mdash; emulating an S390 DIAG288 device
<span class="since">Since 1.3.0</span></li>
</ul> </ul>
</dd> </dd>
<dt><code>action</code></dt> <dt><code>action</code></dt>

1
docs/schemas/domaincommon.rng
View File

@ -3261,6 +3261,7 @@
<choice> <choice>
<value>i6300esb</value> <value>i6300esb</value>
<value>ib700</value> <value>ib700</value>
<value>diag288</value>
</choice> </choice>
</attribute> </attribute>
<optional> <optional>

3
src/conf/domain_conf.c
View File

@ -498,7 +498,8 @@ VIR_ENUM_IMPL(virDomainSmbiosMode, VIR_DOMAIN_SMBIOS_LAST,
VIR_ENUM_IMPL(virDomainWatchdogModel, VIR_DOMAIN_WATCHDOG_MODEL_LAST, VIR_ENUM_IMPL(virDomainWatchdogModel, VIR_DOMAIN_WATCHDOG_MODEL_LAST,
"i6300esb", "i6300esb",
"ib700") "ib700",
"diag288")
VIR_ENUM_IMPL(virDomainWatchdogAction, VIR_DOMAIN_WATCHDOG_ACTION_LAST, VIR_ENUM_IMPL(virDomainWatchdogAction, VIR_DOMAIN_WATCHDOG_ACTION_LAST,
"reset", "reset",

1
src/conf/domain_conf.h
View File

@ -1304,6 +1304,7 @@ struct _virDomainSoundDef {
typedef enum { typedef enum {
VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB, VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB,
VIR_DOMAIN_WATCHDOG_MODEL_IB700, VIR_DOMAIN_WATCHDOG_MODEL_IB700,
VIR_DOMAIN_WATCHDOG_MODEL_DIAG288,
VIR_DOMAIN_WATCHDOG_MODEL_LAST VIR_DOMAIN_WATCHDOG_MODEL_LAST
} virDomainWatchdogModel; } virDomainWatchdogModel;

6
src/qemu/qemu_command.c
View File

@ -2308,7 +2308,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
* - VirtIO block * - VirtIO block
* - VirtIO balloon * - VirtIO balloon
* - Host device passthrough * - Host device passthrough
* - Watchdog (not IB700) * - Watchdog
* - pci serial devices * - pci serial devices
* *
* Prior to this function being invoked, qemuCollectPCIAddress() will have * Prior to this function being invoked, qemuCollectPCIAddress() will have
@ -2543,9 +2543,9 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
goto error; goto error;
} }
/* A watchdog - skip IB700, it is not a PCI device */ /* A watchdog - check if it is a PCI device */
if (def->watchdog && if (def->watchdog &&
def->watchdog->model != VIR_DOMAIN_WATCHDOG_MODEL_IB700 && def->watchdog->model == VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB &&
def->watchdog->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { def->watchdog->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
if (virDomainPCIAddressReserveNextSlot(addrs, &def->watchdog->info, if (virDomainPCIAddressReserveNextSlot(addrs, &def->watchdog->info,
flags) < 0) flags) < 0)