From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wen Congyang Subject: Re: [PATCH 2/7 v6] update linux headers Date: Fri, 06 Jul 2012 18:50:10 +0800 Message-ID: <4FF6C2E2.5020608@cn.fujitsu.com> References: <4FF6B188.2060607@cn.fujitsu.com> <4FF6B232.4050502@cn.fujitsu.com> <4FF6BD1D.8020605@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Gleb Natapov , kvm list , qemu-devel , "linux-kernel@vger.kernel.org" , Avi Kivity , KAMEZAWA Hiroyuki To: Jan Kiszka Return-path: In-Reply-To: <4FF6BD1D.8020605@siemens.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org List-Id: kvm.vger.kernel.org At 07/06/2012 06:25 PM, Jan Kiszka Wrote: > On 2012-07-06 11:38, Wen Congyang wrote: >> Signed-off-by: Wen Congyang > > Which kvm.git hash is this referring? Please state this to avoid that we > are merging support for kernel features that are still under review. The following kvm.git: http://git.kernel.org/?p=virt/kvm/kvm.git;a=summary I apply my kvm's patch, and use ./scripts/update-linux-headers.sh to generate this patch. Thanks Wen Congyang > > Jan > >> --- >> linux-headers/asm-x86/kvm_para.h | 2 ++ >> linux-headers/linux/kvm_para.h | 6 ++++++ >> 2 files changed, 8 insertions(+), 0 deletions(-) >> >> diff --git a/linux-headers/asm-x86/kvm_para.h b/linux-headers/asm-x86/kvm_para.h >> index f2ac46a..f9d858f 100644 >> --- a/linux-headers/asm-x86/kvm_para.h >> +++ b/linux-headers/asm-x86/kvm_para.h >> @@ -89,5 +89,7 @@ struct kvm_vcpu_pv_apf_data { >> __u32 enabled; >> }; >> >> +#define KVM_PV_PORT (0x505UL) >> + >> >> #endif /* _ASM_X86_KVM_PARA_H */ >> diff --git a/linux-headers/linux/kvm_para.h b/linux-headers/linux/kvm_para.h >> index 7bdcf93..4fbd625 100644 >> --- a/linux-headers/linux/kvm_para.h >> +++ b/linux-headers/linux/kvm_para.h >> @@ -20,6 +20,12 @@ >> #define KVM_HC_FEATURES 3 >> #define KVM_HC_PPC_MAP_MAGIC_PAGE 4 >> >> +/* The bit of the value read from KVM_PV_PORT */ >> +#define KVM_PV_FEATURE_PANICKED 0 >> + >> +/* The value writen to KVM_PV_PORT */ >> +#define KVM_PV_PANICKED 1 >> + >> /* >> * hypercalls use architecture specific >> */ >> >