From patchwork Fri Aug 28 14:48:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammed Gamal X-Patchwork-Id: 44515 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 n7SEn0RU020022 for ; Fri, 28 Aug 2009 14:49:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751542AbZH1Os4 (ORCPT ); Fri, 28 Aug 2009 10:48:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751624AbZH1Os4 (ORCPT ); Fri, 28 Aug 2009 10:48:56 -0400 Received: from mail-fx0-f217.google.com ([209.85.220.217]:44403 "EHLO mail-fx0-f217.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751521AbZH1Osz (ORCPT ); Fri, 28 Aug 2009 10:48:55 -0400 Received: by fxm17 with SMTP id 17so1616063fxm.37 for ; Fri, 28 Aug 2009 07:48:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=MjNKYgYOp3a/lS1/bTR1QizNVSrkjLNgSm/T2933pUU=; b=ntftXM20elYEjdRSgP8vohni+chkqljnl6vGYAPW7W/nb6fuPORqol1pAOdhIHBVBm fHKPFJoBAFm/mdR25jcRfgiA+JzXpL5hj9AbZI1d7SuMfQtyQ6EMk0zumbiI9AZvRp0O rcywgwxuPEBgZfUiFcZiRU13Gh8QTGvcS+k3k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=R2FW8aTVM+Vs3HnZNJAhlLb1xm0Er8G8fBwd7w/q/MwsxgGxiJiotPgZ2znp30pT92 /SNwBsa83soqXfBzudctfOt4gudIMn2dCRwabt5csV8QcNL6/I48/tJkTo4rON5tJXp7 vhj6NjcRmNgzmvhPhH3AFE11353uoJx7EI4Hc= Received: by 10.103.126.7 with SMTP id d7mr330193mun.115.1251470936518; Fri, 28 Aug 2009 07:48:56 -0700 (PDT) Received: from localhost ([41.237.159.104]) by mx.google.com with ESMTPS id 23sm6991532mun.43.2009.08.28.07.48.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 28 Aug 2009 07:48:56 -0700 (PDT) From: Mohammed Gamal To: avi@redhat.com Cc: kvm@vger.kernel.org, Mohammed Gamal Subject: [PATCH 1/2] Update kvm.h in qemu-kvm tree Date: Fri, 28 Aug 2009 16:48:52 +0200 Message-Id: <1251470933-14500-1-git-send-email-m.gamal005@gmail.com> X-Mailer: git-send-email 1.6.0.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Update struct kvm_run and KVM_EXIT_* constants to match the one in the kernel-space tree Signed-off-by: Mohammed Gamal --- kvm/include/linux/kvm.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/kvm/include/linux/kvm.h b/kvm/include/linux/kvm.h index ff1025d..801865d 100644 --- a/kvm/include/linux/kvm.h +++ b/kvm/include/linux/kvm.h @@ -135,6 +135,10 @@ struct kvm_pit_config { #define KVM_EXIT_S390_RESET 14 #define KVM_EXIT_DCR 15 #define KVM_EXIT_NMI 16 +#define KVM_EXIT_INTERNAL_ERROR 17 + +/* For KVM_EXIT_INTERNAL_ERROR */ +#define KVM_INTERNAL_ERROR_EMULATION 1 /* for KVM_RUN, returned by mmap(vcpu_fd, offset=0) */ struct kvm_run { @@ -221,6 +225,9 @@ struct kvm_run { __u32 data; __u8 is_write; } dcr; + struct { + __u32 suberror; + } internal; /* Fix the size of the union. */ char padding[256]; };