Now that we have all devices set up, this patch initializes the irqchip.
This is dependant on the io-thread, since we need someone to pull ourselves
out of the halted state.
I believe this should be the default when we are running over the io-thread.
Later on, I plan to post a patch that makes it optional.
Signed-off-by: Glauber Costa <glommer@xxxxxxxxxx>
---
kvm-all.c | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index 0527e0f..3038465 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -592,6 +592,25 @@ int kvm_set_irq(int irq, int level, int *status)
return kvm_arch_set_irq(kvm_state, irq, level, status);
}
+static int kvm_create_irqchip(KVMState *s)
+{
+ int ret = 0;
+
+ if (!kvm_use_kernel_chip)
+ return ret;
+#if defined(CONFIG_IOTHREAD)
+ if (!kvm_check_extension(s, KVM_CAP_IRQCHIP))
+ return -1;
+
+ ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP);
+ if (ret < 0)
+ return ret;
+
+ s->irqchip_in_kernel = 1;
+#endif
+ return ret;
+}
+
int kvm_init(int smp_cpus)
{
static const char upgrade_note[] =
@@ -683,6 +702,10 @@ int kvm_init(int smp_cpus)
s->vcpu_events = kvm_check_extension(s, KVM_CAP_VCPU_EVENTS);
#endif
+ ret = kvm_create_irqchip(s);
+ if (ret < 0)
+ goto err;
+
ret = kvm_arch_init(s, smp_cpus);
if (ret < 0)
goto err;
--
1.6.6
--
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
