From patchwork Wed Nov 4 10:49:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 57510 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA4Ao4OJ031538 for ; Wed, 4 Nov 2009 10:50:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755300AbZKDKt4 (ORCPT ); Wed, 4 Nov 2009 05:49:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755287AbZKDKtz (ORCPT ); Wed, 4 Nov 2009 05:49:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:61396 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755285AbZKDKtx (ORCPT ); Wed, 4 Nov 2009 05:49:53 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nA4Anxj0031266 for ; Wed, 4 Nov 2009 05:49:59 -0500 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nA4AnvVS001476; Wed, 4 Nov 2009 05:49:58 -0500 Received: from localhost.localdomain (file.tlv.redhat.com [10.35.255.8]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id 7E10A250051; Wed, 4 Nov 2009 12:49:56 +0200 (IST) From: Avi Kivity To: Marcelo Tosatti Cc: Gleb Natapov , kvm@vger.kernel.org Subject: [PATCH QEMU-KVM 4/4] Import internal error data header updates from kvm.git Date: Wed, 4 Nov 2009 12:49:56 +0200 Message-Id: <1257331796-29722-5-git-send-email-avi@redhat.com> In-Reply-To: <1257331796-29722-1-git-send-email-avi@redhat.com> References: <1257331796-29722-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/kvm/include/linux/kvm.h b/kvm/include/linux/kvm.h index f8f8900..c518b36 100644 --- a/kvm/include/linux/kvm.h +++ b/kvm/include/linux/kvm.h @@ -187,6 +187,9 @@ struct kvm_run { } dcr; struct { __u32 suberror; + /* Available with KVM_CAP_INTERNAL_ERROR_DATA: */ + __u32 ndata; + __u64 data[16]; } internal; /* Fix the size of the union. */ char padding[256]; @@ -436,6 +439,7 @@ struct kvm_ioeventfd { #endif #define KVM_CAP_IOEVENTFD 36 #define KVM_CAP_SET_IDENTITY_MAP_ADDR 37 +#define KVM_CAP_INTERNAL_ERROR_DATA 40 #ifdef KVM_CAP_IRQ_ROUTING