On 06/05/2014 06:22 AM, Wenchao Xia wrote: > 'monitor.h' is still included in target-s390x/kvm.c, since I have > no good way to verify whether other code need it on my x86 host. > > Signed-off-by: Wenchao Xia <wenchaoq...@gmail.com> > --- > docs/qmp/qmp-events.txt | 14 -------------- > hw/misc/pvpanic.c | 13 ++----------- > qapi-event.json | 12 ++++++++++++ > qapi-schema.json | 12 ++++++++++++ > target-s390x/kvm.c | 8 +++----- > 5 files changed, 29 insertions(+), 30 deletions(-) >
> @@ -50,7 +41,7 @@ static void handle_event(int event) > } > > if (event & PVPANIC_PANICKED) { > - panicked_mon_event("pause"); > + qapi_event_send_guest_panicked(GUEST_PANICK_ACTION_PAUSE, NULL); s/PANICK/PANIC/ > vm_stop(RUN_STATE_GUEST_PANICKED); > return; > } > diff --git a/qapi-event.json b/qapi-event.json > index 93f9eeb..6bfc2a7 100644 > --- a/qapi-event.json > +++ b/qapi-event.json > @@ -400,3 +400,15 @@ > ## > { 'event': 'BALLOON_CHANGE', > 'data': { 'actual': 'int' } } > + > +## > +# @GUEST_PANICKED > +# > +# Emitted when guest OS panic is detected > +# > +# @action: action that has been taken, currently always "pause" > +# > +# Since: 2.1 > +## > +{ 'event': 'GUEST_PANICKED', > + 'data': { 'action': 'GuestPanickAction' } } s/GuestPanickAction/GuestPanicAction/ > diff --git a/qapi-schema.json b/qapi-schema.json > index 23be2bf..badc1bf 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -4837,4 +4837,16 @@ > { 'enum': 'IoOperationType', > 'data': [ 'read', 'write' ] } > > +## > +# @GuestPanickAction And again. The English word is 'panic'; the only time you add a 'k' is in situations where you are trying to avoid the hard ending 'c' looking like a soft sound because it is followed by an 'e' or 'i'. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature