[07/16] qemu-kvm: Fold kvm_get_gsi_count into kvm_create_irqchip

Commit Message

Jan Kiszka May 13, 2011, 12:14 p.m. UTC

Signed-off-by: Jan Kiszka <[e-mail]>
---
 qemu-kvm.c |   11 +----------
 qemu-kvm.h |   11 -----------
 2 files changed, 1 insertions(+), 21 deletions(-)

Patch

diff --git a/qemu-kvm.c b/qemu-kvm.c
index 196c516..8b98ec8 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -217,7 +217,7 @@  static int kvm_init_irq_routing(kvm_context_t kvm)
 #ifdef KVM_CAP_IRQ_ROUTING
     int r, gsi_count;
 
-    gsi_count = kvm_get_gsi_count(kvm);
+    gsi_count = kvm_check_extension(kvm_state, KVM_CAP_IRQ_ROUTING);
     if (gsi_count > 0) {
         int gsi_bits, i;
 
@@ -590,15 +590,6 @@  int kvm_has_gsi_routing(void)
     return r;
 }
 
-int kvm_get_gsi_count(kvm_context_t kvm)
-{
-#ifdef KVM_CAP_IRQ_ROUTING
-    return kvm_check_extension(kvm_state, KVM_CAP_IRQ_ROUTING);
-#else
-    return -EINVAL;
-#endif
-}
-
 int kvm_clear_gsi_routes(void)
 {
 #ifdef KVM_CAP_IRQ_ROUTING
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 40d607b..693d554 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -306,17 +306,6 @@  int kvm_deassign_pci_device(kvm_context_t kvm,
 #endif
 
 /*!
- * \brief Determines the number of gsis that can be routed
- *
- * Returns the number of distinct gsis that can be routed by kvm.  This is
- * also the number of distinct routes (if a gsi has two routes, than another
- * gsi cannot be used...)
- *
- * \param kvm Pointer to the current kvm_context
- */
-int kvm_get_gsi_count(kvm_context_t kvm);
-
-/*!
  * \brief Clears the temporary irq routing table
  *
  * Clears the temporary irq routing table.  Nothing is committed to the