4:48 p.m.
This patche set provides support for the new watchdog model "diag288"
including the new watchdog action "inject-nmi".
Boris Fiuczynski (2):
Support for the new watchdog action inject-nmi
Support for the new watchdog model diag288
docs/formatdomain.html.in | 5 +++++
docs/schemas/domaincommon.rng | 2 ++
include/libvirt/libvirt-domain.h | 1 +
src/conf/domain_conf.c | 6 ++++--
src/conf/domain_conf.h | 2 ++
src/qemu/qemu_command.c | 6 +++---
src/qemu/qemu_monitor_json.c | 2 +-
tools/virsh-domain.c | 3 ++-
8 files changed, 20 insertions(+), 7 deletions(-)
--
2.3.0
4:48 p.m.
New subject: [libvirt] [PATCH 1/2] Support for the new watchdog action inject-nmi
This patches provides support for the 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>
Reviewed-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com>
Reviewed-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com>
Reviewed-by: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com>
---
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 4e85b51..0ee555d 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -5704,6 +5704,9 @@ qemu-kvm -net nic,model=? /dev/null
<li>'none' — do nothing</li>
<li>'dump' — automatically dump the guest
<span class="since">Since 0.8.7</span></li>
+ <li>'inject-nmi' — 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 f0f7400..55dec4e 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 d851225..ed34d53 100644
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -2833,6 +2833,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 ca55981..ecf7b0d 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 ba17a8d..e677f30 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 13c57d2..aef7c44 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -557,7 +557,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 4c47473..cc1e46d 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -11677,7 +11677,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
4:48 p.m.
New subject: [libvirt] [PATCH 2/2] Support for the new watchdog model diag288
This patches provides support for the new watchdog model "diag288".
Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com>
Reviewed-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com>
Reviewed-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com>
Reviewed-by: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com>
---
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 0ee555d..e0ae40e 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -5683,6 +5683,8 @@ qemu-kvm -net nic,model=? /dev/null
<li> 'i6300esb' — the recommended device,
emulating a PCI Intel 6300ESB </li>
<li> 'ib700' — emulating an ISA iBase IB700
</li>
+ <li> 'diag288' — 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 55dec4e..1f26c53 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 ecf7b0d..c27c8c6 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 e677f30..d5f1cd9 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 3886b4f..52bb1d1 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
@@ -2545,9 +2545,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
3:30 p.m.
On Wed, Jun 17, 2015 at 04:48:31PM +0200, Boris Fiuczynski wrote:
This patche set provides support for the new watchdog model
"diag288"
including the new watchdog action "inject-nmi".
Boris Fiuczynski (2):
Support for the new watchdog action inject-nmi
Support for the new watchdog model diag288
docs/formatdomain.html.in | 5 +++++
docs/schemas/domaincommon.rng | 2 ++
include/libvirt/libvirt-domain.h | 1 +
src/conf/domain_conf.c | 6 ++++--
src/conf/domain_conf.h | 2 ++
src/qemu/qemu_command.c | 6 +++---
src/qemu/qemu_monitor_json.c | 2 +-
tools/virsh-domain.c | 3 ++-
8 files changed, 20 insertions(+), 7 deletions(-)
Looks good to me.
It would be nice to get the command line and XML generation tested
by qemuxml2argv and qemuxml2xml tests.
Jan
--
2.3.0
--
libvir-list mailing list
libvir-list(a)redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
3376
days inactive
3382
days old
3 comments
2 participants
participants (2)
-
Boris Fiuczynski -
Ján Tomko