From patchwork Mon Mar 16 08:31:35 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 12338 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 n2G8VvJC012327 for ; Mon, 16 Mar 2009 08:31:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753564AbZCPIb5 (ORCPT ); Mon, 16 Mar 2009 04:31:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752655AbZCPIb5 (ORCPT ); Mon, 16 Mar 2009 04:31:57 -0400 Received: from mga01.intel.com ([192.55.52.88]:11048 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752570AbZCPIb5 (ORCPT ); Mon, 16 Mar 2009 04:31:57 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 16 Mar 2009 01:24:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,372,1233561600"; d="scan'208";a="439203367" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.13.189]) by fmsmga002.fm.intel.com with ESMTP; 16 Mar 2009 01:27:10 -0700 Received: from yasker by syang10-desktop with local (Exim 4.69) (envelope-from ) id 1Lj8ER-0005eZ-Nj; Mon, 16 Mar 2009 16:31:35 +0800 From: Sheng Yang To: Avi Kivity , Marcelo Tosatti , Anthony Liguori Cc: kvm@vger.kernel.org, Sheng Yang Subject: [PATCH 08/16] kvm: libkvm: allocate unused gsi for irq routing Date: Mon, 16 Mar 2009 16:31:35 +0800 Message-Id: <1237192295-21713-1-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1236865019-30321-9-git-send-email-sheng@linux.intel.com> References: <1236865019-30321-9-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Notice here is a simple solution, can be replaced later. (update: fix kvm_check_extension() only return 0 or 1, which is inconsisent with kvm_get_gsi_count()) Signed-off-by: Sheng Yang --- libkvm/kvm-common.h | 1 + libkvm/libkvm.c | 17 ++++++++++++++++- libkvm/libkvm.h | 8 ++++++++ 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/libkvm/kvm-common.h b/libkvm/kvm-common.h index de1ada2..70a95c2 100644 --- a/libkvm/kvm-common.h +++ b/libkvm/kvm-common.h @@ -66,6 +66,7 @@ struct kvm_context { #ifdef KVM_CAP_IRQ_ROUTING struct kvm_irq_routing *irq_routes; int nr_allocated_irq_routes; + int max_used_gsi; #endif }; diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c index e9bae23..d38ca00 100644 --- a/libkvm/libkvm.c +++ b/libkvm/libkvm.c @@ -421,7 +421,7 @@ int kvm_check_extension(kvm_context_t kvm, int ext) ret = ioctl(kvm->fd, KVM_CHECK_EXTENSION, ext); if (ret > 0) - return 1; + return ret; return 0; } @@ -1292,6 +1292,9 @@ int kvm_add_routing_entry(kvm_context_t kvm, new->type = entry->type; new->flags = entry->flags; new->u = entry->u; + + if (entry->gsi > kvm->max_used_gsi) + kvm->max_used_gsi = entry->gsi; return 0; #else return -ENOSYS; @@ -1395,3 +1398,15 @@ int kvm_commit_irq_routes(kvm_context_t kvm) return -ENOSYS; #endif } + +int kvm_get_irq_route_gsi(kvm_context_t kvm) +{ + 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; + else + return -ENOSPC; + } else + return KVM_IOAPIC_NUM_PINS; +} + diff --git a/libkvm/libkvm.h b/libkvm/libkvm.h index 51f4d08..9a7cbc6 100644 --- a/libkvm/libkvm.h +++ b/libkvm/libkvm.h @@ -846,4 +846,12 @@ int kvm_del_routing_entry(kvm_context_t kvm, */ int kvm_commit_irq_routes(kvm_context_t kvm); +/*! + * \brief Get unused GSI number for irq routing table + * + * Get unused GSI number for irq routing table + * + * \param kvm Pointer to the current kvm_context + */ +int kvm_get_irq_route_gsi(kvm_context_t kvm); #endif