All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] kvm-all.c: Move init of irqchip_inject_ioctl out of kvm_irqchip_create()
@ 2012-08-15 11:08 ` Peter Maydell
  0 siblings, 0 replies; 14+ messages in thread
From: Peter Maydell @ 2012-08-15 11:08 UTC (permalink / raw)
  To: qemu-devel; +Cc: Marcelo Tosatti, Jan Kiszka, Avi Kivity, kvm, patches

Move the init of the irqchip_inject_ioctl field of KVMState out of
kvm_irqchip_create() and into kvm_init(), so that kvm_set_irq()
can be used even when no irqchip is created (for architectures
that support async interrupt notification even without an in
kernel irqchip).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Changes v1->v2: move whe whole chunk of init code, for both
KVM_IRQ_LINE and KVM_IRQ_LINE_STATUS possibilities.

 kvm-all.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/kvm-all.c b/kvm-all.c
index 34b02c1..72d84a2 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1200,10 +1200,6 @@ static int kvm_irqchip_create(KVMState *s)
         return ret;
     }
 
-    s->irqchip_inject_ioctl = KVM_IRQ_LINE;
-    if (kvm_check_extension(s, KVM_CAP_IRQ_INJECT_STATUS)) {
-        s->irqchip_inject_ioctl = KVM_IRQ_LINE_STATUS;
-    }
     kvm_kernel_irqchip = true;
     /* If we have an in-kernel IRQ chip then we must have asynchronous
      * interrupt delivery (though the reverse is not necessarily true)
@@ -1350,6 +1346,11 @@ int kvm_init(void)
     s->direct_msi = (kvm_check_extension(s, KVM_CAP_SIGNAL_MSI) > 0);
 #endif
 
+    s->irqchip_inject_ioctl = KVM_IRQ_LINE;
+    if (kvm_check_extension(s, KVM_CAP_IRQ_INJECT_STATUS)) {
+        s->irqchip_inject_ioctl = KVM_IRQ_LINE_STATUS;
+    }
+
     ret = kvm_arch_init(s);
     if (ret < 0) {
         goto err;
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2012-08-23 14:13 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-15 11:08 [PATCH v2] kvm-all.c: Move init of irqchip_inject_ioctl out of kvm_irqchip_create() Peter Maydell
2012-08-15 11:08 ` [Qemu-devel] " Peter Maydell
2012-08-15 18:34 ` Marcelo Tosatti
2012-08-15 18:34   ` Marcelo Tosatti
2012-08-21  8:19 ` Jan Kiszka
2012-08-21  8:19   ` [Qemu-devel] " Jan Kiszka
2012-08-21  8:25   ` Peter Maydell
2012-08-21  8:25     ` [Qemu-devel] " Peter Maydell
2012-08-21 10:27     ` Jan Kiszka
2012-08-21 10:27       ` [Qemu-devel] " Jan Kiszka
2012-08-23  9:13       ` Marcelo Tosatti
2012-08-23  9:13         ` [Qemu-devel] " Marcelo Tosatti
2012-08-23 14:13         ` Peter Maydell
2012-08-23 14:13           ` [Qemu-devel] " Peter Maydell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.