From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwXaF-0006kH-Jp for qemu-devel@nongnu.org; Mon, 16 Jun 2014 10:08:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwXa9-0001vc-9j for qemu-devel@nongnu.org; Mon, 16 Jun 2014 10:08:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34449) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwXa9-0001v9-0N for qemu-devel@nongnu.org; Mon, 16 Jun 2014 10:08:21 -0400 Message-ID: <539EFA4F.1000408@redhat.com> Date: Mon, 16 Jun 2014 08:08:15 -0600 From: Eric Blake MIME-Version: 1.0 References: <1401970944-18735-1-git-send-email-wenchaoqemu@gmail.com> <1401970944-18735-28-git-send-email-wenchaoqemu@gmail.com> In-Reply-To: <1401970944-18735-28-git-send-email-wenchaoqemu@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="xPLooWoOhS0eapMpOmhMv9CdFKXWh6Q0u" Subject: Re: [Qemu-devel] [PATCH V6 27/29] qapi event: convert GUEST_PANICKED List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wenchao Xia , qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, armbru@redhat.com, lcapitulino@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --xPLooWoOhS0eapMpOmhMv9CdFKXWh6Q0u Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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. >=20 > Signed-off-by: Wenchao Xia > --- > 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(-) >=20 > @@ -50,7 +41,7 @@ static void handle_event(int event) > } > =20 > 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' ] } > =20 > +## > +# @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'. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --xPLooWoOhS0eapMpOmhMv9CdFKXWh6Q0u Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJTnvpPAAoJEKeha0olJ0NqPIUH/iVa+R2TCeWOTSDSORmaW2KP lENuubHVM16opAW1Lx7V32JHWhBXEHDpJJkyvHFSBOqmaoRisfuL5OCtSA5CUQFw 22224o+by8EJRbq3GkBBW1K7zfUk1eeW6yx6Iwpr13PQY7yl0mLEPs4yQ7yY70Z2 SX8NxSQHmNrBrrE7h03kJb7UEMilpASjD0P2T30LtnXlG6/G2IRLA3dz8ExBXa+s LsNXfxilHaaLL8fWUbny6CXC17gYuXea60hsp5swLSLgSs7vtgKG3TEXUQ/Te8bo pdDzESFQ071aPunYMcO2WRXuH6W+X/vCpkLB4XnM9NyLd9RF+eReGsXSTYRUIhg= =OqTT -----END PGP SIGNATURE----- --xPLooWoOhS0eapMpOmhMv9CdFKXWh6Q0u--