On Fri, 17 Apr 2015 06:28:10 -0600 Eric Blake <ebl...@redhat.com> wrote:
> On 04/17/2015 01:52 AM, Cornelia Huck wrote: > > From: Mao Chuan Li <maoch...@linux.vnet.ibm.com> > > > > This patch allows QEMU to inject a NMI into a guest when the > > watchdog expires. > > > > Signed-off-by: Mao Chuan Li <maoch...@linux.vnet.ibm.com> > > Reviewed-by: David Hildenbrand <d...@linux.vnet.ibm.com> > > Signed-off-by: Cornelia Huck <cornelia.h...@de.ibm.com> > > --- > > hw/watchdog/watchdog.c | 10 ++++++++++ > > qapi-schema.json | 6 +++++- > > 2 files changed, 15 insertions(+), 1 deletion(-) > > > > > +++ b/qapi-schema.json > > @@ -3606,10 +3606,14 @@ > > # > > # @none: nothing is done > > # > > +# @inject-nmi: a non-maskable interrupt is injected into the first VCPU > > (all > > +# VCPUS on x86) > > Needs a '(since 2.4)' designation. > Will add.