From patchwork Tue Apr 7 09:12:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 16777 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 n379GIlh007913 for ; Tue, 7 Apr 2009 09:16:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757489AbZDGJNy (ORCPT ); Tue, 7 Apr 2009 05:13:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757453AbZDGJNy (ORCPT ); Tue, 7 Apr 2009 05:13:54 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:57028 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757489AbZDGJNw (ORCPT ); Tue, 7 Apr 2009 05:13:52 -0400 Received: by fxm2 with SMTP id 2so2231951fxm.37 for ; Tue, 07 Apr 2009 02:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=F8i+dCbfrlVsenc5xCxDBLi4Wr2vJOmORDAI9mRkKSs=; b=Q/ja0yNHiLpRHabjZnlkOxgwSRleZzCs/V5EqBnU/wozj8PDM4eD9PeEfJ3jpsT410 awWaBtRmNhe7qt52DdjZ9wjtzypNQjIE/Rn8zHYmtNf7KVF1gN69M+reY27dqiuiL+ku OXGknNjdaxelhQijd9GfmBbPora0cRNWmzpio= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=W2KLLPU29JmdGpZMQUVOyXfgsk7oK8arxR+GgDYSOOw4+ww6qze5T0Z9ZXs8MM9/04 BMWFyo1Ak+AAHOQeFAKHQIbpnC5yLZy+kifKRK0G0VtmwK1LS7bLZ3K09jstzTdT0GMj /gG0quoPleG/MtzSLVx3sGvj6UoYWyp0qRSso= Received: by 10.86.82.6 with SMTP id f6mr3892691fgb.42.1239095628981; Tue, 07 Apr 2009 02:13:48 -0700 (PDT) Received: from dhcp-1-124.tlv.redhat.com (bzq-179-150-195.static.bezeqint.net [212.179.150.195]) by mx.google.com with ESMTPS id 3sm8308784fge.24.2009.04.07.02.13.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 07 Apr 2009 02:13:48 -0700 (PDT) Date: Tue, 7 Apr 2009 12:12:37 +0300 From: "Michael S. Tsirkin" To: avi@redhat.com Cc: kvm@vger.kernel.org Subject: [PATCH] libkvm: fix build with --with-patched-kernel on 2.6.29 Message-ID: <20090407091231.GA24488@dhcp-1-124.tlv.redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Make libkvm build with --with-patched-kernel on 2.6.29. Reported-by: Michael S. Tsirkin --- The patch was actually done by Avi. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/libkvm/kvm-common.h b/libkvm/kvm-common.h index 70a95c2..96361e8 100644 --- a/libkvm/kvm-common.h +++ b/libkvm/kvm-common.h @@ -66,8 +66,8 @@ struct kvm_context { #ifdef KVM_CAP_IRQ_ROUTING struct kvm_irq_routing *irq_routes; int nr_allocated_irq_routes; - int max_used_gsi; #endif + int max_used_gsi; }; int kvm_alloc_kernel_memory(kvm_context_t kvm, unsigned long memory, diff --git a/libkvm/libkvm.h b/libkvm/libkvm.h index d3e431a..ce6f054 100644 --- a/libkvm/libkvm.h +++ b/libkvm/libkvm.h @@ -815,6 +815,7 @@ int kvm_add_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin); */ int kvm_del_irq_route(kvm_context_t kvm, int gsi, int irqchip, int pin); +struct kvm_irq_routing_entry; /*! * \brief Adds a routing entry to the temporary irq routing table *