From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5esU-0008C4-T0 for qemu-devel@nongnu.org; Tue, 21 Jan 2014 12:12:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W5esO-0008W6-S9 for qemu-devel@nongnu.org; Tue, 21 Jan 2014 12:12:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8620) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W5esO-0008Vi-Ju for qemu-devel@nongnu.org; Tue, 21 Jan 2014 12:12:36 -0500 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Date: Tue, 21 Jan 2014 18:11:31 +0100 Message-Id: <1390324291-9847-1-git-send-email-rkrcmar@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] kvm: print suberror on all internal errors List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, drjones@redhat.com, kvm@vger.kernel.org KVM introduced internal error exit reason and suberror at the same time, and later extended it with internal error data. QEMU does not report suberror on hosts between these two events because we check for the extension. (half a year in 2009, but it is misleading) Fix by removing KVM_CAP_INTERNAL_ERROR_DATA condition on printf. (partially improved by bb44e0d12df70 and ba4047cf848a3 in the past) Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- kvm-all.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 0bfb060..0a91d8e 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1539,17 +1539,16 @@ static void kvm_handle_io(uint16_t port, void *da= ta, int direction, int size, =20 static int kvm_handle_internal_error(CPUState *cpu, struct kvm_run *run) { - fprintf(stderr, "KVM internal error."); + fprintf(stderr, "KVM internal error. Suberror: %d\n", + run->internal.suberror); + if (kvm_check_extension(kvm_state, KVM_CAP_INTERNAL_ERROR_DATA)) { int i; =20 - fprintf(stderr, " Suberror: %d\n", run->internal.suberror); for (i =3D 0; i < run->internal.ndata; ++i) { fprintf(stderr, "extra data[%d]: %"PRIx64"\n", i, (uint64_t)run->internal.data[i]); } - } else { - fprintf(stderr, "\n"); } if (run->internal.suberror =3D=3D KVM_INTERNAL_ERROR_EMULATION) { fprintf(stderr, "emulation failure\n"); --=20 1.8.5.2