From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=53986 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCHY7-0005UO-JO for qemu-devel@nongnu.org; Wed, 12 May 2010 15:24:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OCHY5-0005xZ-Mv for qemu-devel@nongnu.org; Wed, 12 May 2010 15:24:55 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:51287) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OCHY5-0005xI-8Q for qemu-devel@nongnu.org; Wed, 12 May 2010 15:24:53 -0400 From: Stefan Weil Date: Wed, 12 May 2010 21:24:45 +0200 Message-Id: <1273692285-9802-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH] target-i386: Avoid kvm related compiler error List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jan Kiszka Some versions of kvm.h (debian lenny) define KVM_CAP_VCPU_EVENTS without defining KVM_VCPUEVENT_VALID_NMI_PENDING or KVM_VCPUEVENT_VALID_SIPI_VECTOR. Without the patch, compilation fails: CC x86_64-softmmu/kvm.o /qemu/target-i386/kvm.c: In function 'kvm_put_vcpu_events': /qemu/target-i386/kvm.c:824: error: 'KVM_VCPUEVENT_VALID_NMI_PENDING' undeclared (first use in this function) /qemu/target-i386/kvm.c:824: error: (Each undeclared identifier is reported only once /qemu/target-i386/kvm.c:824: error: for each function it appears in.) /qemu/target-i386/kvm.c:824: error: 'KVM_VCPUEVENT_VALID_SIPI_VECTOR' undeclared (first use in this function) make[1]: *** [kvm.o] Error 1 Cc: Jan Kiszka Signed-off-by: Stefan Weil --- target-i386/kvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index f73b47b..9a37753 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -796,7 +796,7 @@ static int kvm_get_mp_state(CPUState *env) static int kvm_put_vcpu_events(CPUState *env, int level) { -#ifdef KVM_CAP_VCPU_EVENTS +#if defined(KVM_CAP_VCPU_EVENTS) && defined(KVM_VCPUEVENT_VALID_NMI_PENDING) struct kvm_vcpu_events events; if (!kvm_has_vcpu_events()) { -- 1.7.1