From patchwork Wed May 12 19:24:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 52407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 25146B7DEE for ; Thu, 13 May 2010 05:25:36 +1000 (EST) Received: from localhost ([127.0.0.1]:44596 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OCHYj-0005UT-8j for incoming@patchwork.ozlabs.org; Wed, 12 May 2010 15:25:33 -0400 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 Received: from flocke.weilnetz.de (p54ADF1DC.dip.t-dialin.net [84.173.241.220]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MDCnY-1O6qa62lZM-00GYNy; Wed, 12 May 2010 21:24:50 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1OCHY1-0002Yb-S2; Wed, 12 May 2010 21:24:49 +0200 From: Stefan Weil To: qemu-devel@nongnu.org Date: Wed, 12 May 2010 21:24:45 +0200 Message-Id: <1273692285-9802-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.1 X-Provags-ID: V01U2FsdGVkX19Dq56JRfXLXsMN+mrPz4IuZ7AyACX6hHneyUF h7h7E105wVW8ShvUXsoLaPKAQoYWpc4u28+k+ccLSqLUYP5PBk fmJ99c9jU3zc5dtT2KbGsMUHmId/oTXNHYsWkJbgJIHjl9dmv4 raQ== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Jan Kiszka Subject: [Qemu-devel] [PATCH] target-i386: Avoid kvm related compiler error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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()) {