From patchwork Sun Nov 27 02:45:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 127834 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 97CDBB712A for ; Sun, 27 Nov 2011 13:47:03 +1100 (EST) Received: from localhost ([::1]:40914 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RUUlX-0002xV-Tu for incoming@patchwork.ozlabs.org; Sat, 26 Nov 2011 21:46:51 -0500 Received: from eggs.gnu.org ([140.186.70.92]:51315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RUUlK-0002Ka-1A for qemu-devel@nongnu.org; Sat, 26 Nov 2011 21:46:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RUUlJ-00008t-3K for qemu-devel@nongnu.org; Sat, 26 Nov 2011 21:46:37 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:55216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RUUlI-0008Nh-Qg for qemu-devel@nongnu.org; Sat, 26 Nov 2011 21:46:36 -0500 Received: by mail-iy0-f173.google.com with SMTP id k32so7711723iak.4 for ; Sat, 26 Nov 2011 18:46:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=6MxfspFudIxrfDsaBKCM5sYuQWgrrQvjaZol8At65Qg=; b=DDZZi37IKivzhIWldZiNPGadRjQPpSADJDcZLoKKkET2dG1S+HPtY2GwfIkI3DkcJe 41+2xsRFSBaWl9HJ0y0DJAdmIWA0z4dQN3m65kirU7Yzwz6rGuWno04amFamdHVaGg3r 1GLeRzEkTqfZAHtTCor8TTgYP4KinDSjT/Eoc= Received: by 10.42.148.136 with SMTP id r8mr18293607icv.1.1322361996519; Sat, 26 Nov 2011 18:46:36 -0800 (PST) Received: from localhost ([111.192.255.64]) by mx.google.com with ESMTPS id eh34sm24759896ibb.5.2011.11.26.18.46.31 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 26 Nov 2011 18:46:36 -0800 (PST) From: Liu Ping Fan To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Sun, 27 Nov 2011 10:45:37 +0800 Message-Id: <1322361937-22438-5-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1322188529-11609-1-git-send-email-kernelfans@gmail.com> References: <1322188529-11609-1-git-send-email-kernelfans@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: aliguori@us.ibm.com, ryanh@us.ibm.com, jan.kiszka@web.de, linux-kernel@vger.kernel.org, avi@redhat.com Subject: [Qemu-devel] [PATCH 5/5] QEMU tmp patches for linux-header files X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Liu Ping Fan Temporary patch for qemu to compile. Normally the headers should be copied from kernel. Signed-off-by: Liu Ping Fan --- kvm/include/linux/kvm.h | 9 ++++++++- linux-headers/linux/kvm.h | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/kvm/include/linux/kvm.h b/kvm/include/linux/kvm.h index e46729e..a7fe019 100644 --- a/kvm/include/linux/kvm.h +++ b/kvm/include/linux/kvm.h @@ -162,6 +162,7 @@ struct kvm_pit_config { #define KVM_EXIT_INTERNAL_ERROR 17 #define KVM_EXIT_OSI 18 +#define KVM_EXIT_VCPU_DEAD 20 /* For KVM_EXIT_INTERNAL_ERROR */ #define KVM_INTERNAL_ERROR_EMULATION 1 #define KVM_INTERNAL_ERROR_SIMUL_EX 2 @@ -328,6 +329,12 @@ struct kvm_signal_mask { __u8 sigset[0]; }; +/*for KVM_VCPU_SET_STATE */ +struct kvm_vcpu_state { + int vcpu_id; + int state; +}; + /* for KVM_TPR_ACCESS_REPORTING */ struct kvm_tpr_access_ctl { __u32 enabled; @@ -726,7 +733,7 @@ struct kvm_clock_data { /* Available with KVM_CAP_XCRS */ #define KVM_GET_XCRS _IOR(KVMIO, 0xa6, struct kvm_xcrs) #define KVM_SET_XCRS _IOW(KVMIO, 0xa7, struct kvm_xcrs) - +#define KVM_SETSTATE_VCPU _IOW(KVMIO, 0xaa, struct kvm_vcpu_state) #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) struct kvm_assigned_pci_dev { diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index fc63b73..4422456 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -161,6 +161,8 @@ struct kvm_pit_config { #define KVM_EXIT_NMI 16 #define KVM_EXIT_INTERNAL_ERROR 17 #define KVM_EXIT_OSI 18 +#define KVM_EXIT_VCPU_DEAD 20 + /* For KVM_EXIT_INTERNAL_ERROR */ #define KVM_INTERNAL_ERROR_EMULATION 1 @@ -328,6 +330,12 @@ struct kvm_signal_mask { __u8 sigset[0]; }; +/*for KVM_VCPU_SET_STATE */ +struct kvm_vcpu_state { + int vcpu_id; + int state; +}; + /* for KVM_TPR_ACCESS_REPORTING */ struct kvm_tpr_access_ctl { __u32 enabled; @@ -747,6 +755,7 @@ struct kvm_clock_data { #define KVM_GET_XCRS _IOR(KVMIO, 0xa6, struct kvm_xcrs) #define KVM_SET_XCRS _IOW(KVMIO, 0xa7, struct kvm_xcrs) +#define KVM_SETSTATE_VCPU _IOW(KVMIO, 0xaa, struct kvm_vcpu_state) #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) struct kvm_assigned_pci_dev {