This patch provides support for a new watchdog action "inject-nmi" which allows to define an inject of a non-maskable interrupt into a guest. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com&gt; Reviewed-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com&gt; Reviewed-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com&gt; Reviewed-by: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com&gt; --- docs/formatdomain.html.in | 3 +++ docs/schemas/domaincommon.rng | 1 + include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_monitor_json.c | 2 +- tools/virsh-domain.c | 3 ++- 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 95d8c45..a97e246 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5738,6 +5738,9 @@ qemu-kvm -net nic,model=? /dev/null <li>'none' &mdash; do nothing</li> <li>'dump' &mdash; automatically dump the guest <span class="since">Since 0.8.7</span></li> + <li>'inject-nmi' &mdash; inject a non-maskable interrupt + into the guest + <span class="since">Since 1.3.0</span></li> </ul> <p> Note 1: the 'shutdown' action requires that the guest diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 3014365..3040797 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3272,6 +3272,7 @@ <value>pause</value> <value>none</value> <value>dump</value> + <value>inject-nmi</value> </choice> </attribute> </optional> diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 7564c20..e8202cf 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2842,6 +2842,7 @@ typedef enum { VIR_DOMAIN_EVENT_WATCHDOG_POWEROFF, /* Guest is forcibly powered off */ VIR_DOMAIN_EVENT_WATCHDOG_SHUTDOWN, /* Guest is requested to gracefully shutdown */ VIR_DOMAIN_EVENT_WATCHDOG_DEBUG, /* No action, a debug message logged */ + VIR_DOMAIN_EVENT_WATCHDOG_INJECTNMI,/* Inject a non-maskable interrupt into guest */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_WATCHDOG_LAST diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 183e66c..369d155 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -506,7 +506,8 @@ VIR_ENUM_IMPL(virDomainWatchdogAction, VIR_DOMAIN_WATCHDOG_ACTION_LAST, "poweroff", "pause", "dump", - "none") + "none", + "inject-nmi") VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST, "vga", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c96a6e4..8912bbb 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1315,6 +1315,7 @@ typedef enum { VIR_DOMAIN_WATCHDOG_ACTION_PAUSE, VIR_DOMAIN_WATCHDOG_ACTION_DUMP, VIR_DOMAIN_WATCHDOG_ACTION_NONE, + VIR_DOMAIN_WATCHDOG_ACTION_INJECTNMI, VIR_DOMAIN_WATCHDOG_ACTION_LAST } virDomainWatchdogAction; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 71e8f4b..b1ee852 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -555,7 +555,7 @@ static void qemuMonitorJSONHandleRTCChange(qemuMonitorPtr mon, virJSONValuePtr d VIR_ENUM_DECL(qemuMonitorWatchdogAction) VIR_ENUM_IMPL(qemuMonitorWatchdogAction, VIR_DOMAIN_EVENT_WATCHDOG_LAST, - "none", "pause", "reset", "poweroff", "shutdown", "debug"); + "none", "pause", "reset", "poweroff", "shutdown", "debug", "inject-nmi"); static void qemuMonitorJSONHandleWatchdog(qemuMonitorPtr mon, virJSONValuePtr data) { diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index baf4fa3..27d62e9 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11703,7 +11703,8 @@ VIR_ENUM_IMPL(vshDomainEventWatchdog, N_("reset"), N_("poweroff"), N_("shutdown"), - N_("debug")) + N_("debug"), + N_("inject-nmi")) static const char * vshDomainEventWatchdogToString(int action) -- 2.3.0

This patch provides support for the new watchdog model "diag288". Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com&gt; Reviewed-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com&gt; Reviewed-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com&gt; Reviewed-by: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com&gt; --- docs/formatdomain.html.in | 2 ++ docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 6 +++--- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index a97e246..c432aeb 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5717,6 +5717,8 @@ qemu-kvm -net nic,model=? /dev/null <li> 'i6300esb' &mdash; the recommended device, emulating a PCI Intel 6300ESB </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> </dd> <dt><code>action</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 3040797..1120003 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3261,6 +3261,7 @@ <choice> <value>i6300esb</value> <value>ib700</value> + <value>diag288</value> </choice> </attribute> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 369d155..03c3f74 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -498,7 +498,8 @@ VIR_ENUM_IMPL(virDomainSmbiosMode, VIR_DOMAIN_SMBIOS_LAST, VIR_ENUM_IMPL(virDomainWatchdogModel, VIR_DOMAIN_WATCHDOG_MODEL_LAST, "i6300esb", - "ib700") + "ib700", + "diag288") VIR_ENUM_IMPL(virDomainWatchdogAction, VIR_DOMAIN_WATCHDOG_ACTION_LAST, "reset", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8912bbb..aeba5a5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1304,6 +1304,7 @@ struct _virDomainSoundDef { typedef enum { VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB, VIR_DOMAIN_WATCHDOG_MODEL_IB700, + VIR_DOMAIN_WATCHDOG_MODEL_DIAG288, VIR_DOMAIN_WATCHDOG_MODEL_LAST } virDomainWatchdogModel; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5444638..99755f1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2308,7 +2308,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, * - VirtIO block * - VirtIO balloon * - Host device passthrough - * - Watchdog (not IB700) + * - Watchdog * - pci serial devices * * Prior to this function being invoked, qemuCollectPCIAddress() will have @@ -2543,9 +2543,9 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, goto error; } - /* A watchdog - skip IB700, it is not a PCI device */ + /* A watchdog - check if it is a PCI device */ 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) { if (virDomainPCIAddressReserveNextSlot(addrs, &def->watchdog->info, flags) < 0) -- 2.3.0