[PATCH v2 4/9] qemu-kvm: Use upstream kvm_irqchip_create

[Jan Kiszka <jan.kiszka@xxxxxxxxxxx>]

Drop kvm_create_irqchip in favor of the equivalent upstream version.
This also allows to drop the kvm_irqchip global variable.

Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx>
---
 kvm-all.c  |   15 ---------------
 qemu-kvm.c |   29 -----------------------------
 qemu-kvm.h |    3 ---
 vl.c       |    1 -
 4 files changed, 0 insertions(+), 48 deletions(-)

diff --git a/kvm-all.c b/kvm-all.c
index afcad44..606bd02 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -843,7 +843,6 @@ static void kvm_init_irq_routing(KVMState *s)
 
 static int kvm_irqchip_create(KVMState *s)
 {
-#ifdef UNUSED_UPSTREAM_KVM
     QemuOptsList *list = qemu_find_opts("machine");
     int ret;
 
@@ -867,7 +866,6 @@ static int kvm_irqchip_create(KVMState *s)
     s->irqchip_in_kernel = 1;
 
     kvm_init_irq_routing(s);
-#endif
 
     return 0;
 }
@@ -881,7 +879,6 @@ int kvm_init(void)
     const KVMCapabilityInfo *missing_cap;
     int ret;
     int i;
-    QemuOptsList *list;
 
     s = g_malloc0(sizeof(KVMState));
 
@@ -968,13 +965,6 @@ int kvm_init(void)
     s->pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2);
 #endif
 
-    list = qemu_find_opts("machine");
-    if (!QTAILQ_EMPTY(&list->head) &&
-        !qemu_opt_get_bool(QTAILQ_FIRST(&list->head),
-                           "kernel_irqchip", false)) {
-        kvm_irqchip = 0;
-    }
-
     ret = kvm_arch_init(s);
     if (ret < 0) {
         goto err;
@@ -990,11 +980,6 @@ int kvm_init(void)
 
     s->many_ioeventfds = kvm_check_many_ioeventfds();
 
-    ret = kvm_create_irqchip(s);
-    if (ret < 0) {
-        return ret;
-    }
-
     cpu_interrupt_handler = kvm_handle_interrupt;
 
     return 0;
diff --git a/qemu-kvm.c b/qemu-kvm.c
index 37af80f..8f1b760 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -41,35 +41,6 @@ static inline void clear_gsi(KVMState *s, unsigned int gsi)
     }
 }
 
-int kvm_create_irqchip(KVMState *s)
-{
-#ifdef KVM_CAP_IRQCHIP
-    int r;
-
-    if (!kvm_irqchip || !kvm_check_extension(s, KVM_CAP_IRQCHIP)) {
-        return 0;
-    }
-
-    r = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP);
-    if (r < 0) {
-        fprintf(stderr, "Create kernel PIC irqchip failed\n");
-        return r;
-    }
-
-    s->irqchip_inject_ioctl = KVM_IRQ_LINE;
-#if defined(KVM_CAP_IRQ_INJECT_STATUS) && defined(KVM_IRQ_LINE_STATUS)
-    if (kvm_check_extension(s, KVM_CAP_IRQ_INJECT_STATUS)) {
-        s->irqchip_inject_ioctl = KVM_IRQ_LINE_STATUS;
-    }
-#endif
-    s->irqchip_in_kernel = 1;
-
-    kvm_init_irq_routing(s);
-#endif
-
-    return 0;
-}
-
 #ifdef KVM_CAP_IRQCHIP
 
 int kvm_set_irq(int irq, int level, int *status)
diff --git a/qemu-kvm.h b/qemu-kvm.h
index 6235800..cd5e3cc 100644
--- a/qemu-kvm.h
+++ b/qemu-kvm.h
@@ -32,8 +32,6 @@
 
 #include "kvm.h"
 
-int kvm_create_irqchip(KVMState *s);
-
 /*!
  * \brief Dump in kernel IRQCHIP contents
  *
@@ -243,7 +241,6 @@ int kvm_arch_set_ioport_access(unsigned long start, unsigned long size,
 
 int kvm_create_pit(KVMState *s);
 
-extern int kvm_irqchip;
 extern int kvm_pit_reinject;
 extern unsigned int kvm_shadow_memory;
 
diff --git a/vl.c b/vl.c
index c3b4037..98d29ce 100644
--- a/vl.c
+++ b/vl.c
@@ -2173,7 +2173,6 @@ static void free_and_trace(gpointer mem)
 }
 
 #ifdef CONFIG_KVM_OPTIONS
-int kvm_irqchip = 1;
 int kvm_pit_reinject = 1;
 #endif
 
-- 
1.7.3.4

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html