From patchwork Fri May 1 22:45:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hollis Blanchard X-Patchwork-Id: 21528 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 n41MkH5W023908 for ; Fri, 1 May 2009 22:46:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760766AbZEAWqO (ORCPT ); Fri, 1 May 2009 18:46:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757825AbZEAWqL (ORCPT ); Fri, 1 May 2009 18:46:11 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:36747 "EHLO e5.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754690AbZEAWqD (ORCPT ); Fri, 1 May 2009 18:46:03 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e5.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n41MfDBT008828; Fri, 1 May 2009 18:41:13 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n41Mk20T148674; Fri, 1 May 2009 18:46:02 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n41Mk2sq012753; Fri, 1 May 2009 18:46:02 -0400 Received: from localhost.localdomain (slate.austin.ibm.com [9.53.41.42]) by d01av04.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n41MjxoO012651; Fri, 1 May 2009 18:46:01 -0400 From: Hollis Blanchard To: avi@redhat.com Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Subject: [PATCH 4/5] [qemu-kvm] Use CAP_IRQ_ROUTING in kvm_get_irq_route_gsi() Date: Fri, 1 May 2009 17:45:58 -0500 Message-Id: <6ef19c9b6ce2f03445ebfc55af5ea7dfff922d71.1241217749.git.hollisb@us.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1241217959-23749-1-git-send-email-hollisb@us.ibm.com> References: <1241217959-23749-1-git-send-email-hollisb@us.ibm.com> In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This fixes a build break when KVM_IOAPIC_NUM_PINS is not defined. Signed-off-by: Hollis Blanchard --- kvm/libkvm/libkvm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/kvm/libkvm/libkvm.c b/kvm/libkvm/libkvm.c index 0610e3f..ba0a5d1 100644 --- a/kvm/libkvm/libkvm.c +++ b/kvm/libkvm/libkvm.c @@ -1406,6 +1406,7 @@ int kvm_commit_irq_routes(kvm_context_t kvm) int kvm_get_irq_route_gsi(kvm_context_t kvm) { +#ifdef KVM_CAP_IRQ_ROUTING if (kvm->max_used_gsi >= KVM_IOAPIC_NUM_PINS) { if (kvm->max_used_gsi <= kvm_get_gsi_count(kvm)) return kvm->max_used_gsi + 1; @@ -1413,6 +1414,9 @@ int kvm_get_irq_route_gsi(kvm_context_t kvm) return -ENOSPC; } else return KVM_IOAPIC_NUM_PINS; +#else + return -ENOSYS; +#endif } #ifdef KVM_CAP_DEVICE_MSIX