From patchwork Mon Sep 28 21:15:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [6/6] Initialize in-kernel irqchip Date: Mon, 28 Sep 2009 11:15:17 -0000 From: Glauber Costa X-Patchwork-Id: 34400 Message-Id: <1254172517-28216-7-git-send-email-glommer@redhat.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com 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 --- kvm-all.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 50616d1..30df418 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -453,6 +453,22 @@ int kvm_set_irq(int irq, int level, int *status) return 1; } + +static int kvm_create_irqchip(KVMState *s) +{ + int ret; + + 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; + + return 0; +} #endif int kvm_init(int smp_cpus) @@ -536,6 +552,11 @@ int kvm_init(int smp_cpus) } #endif +#if defined(CONFIG_IOTHREAD) && defined(KVM_CAP_IRQCHIP) + ret = kvm_create_irqchip(s); + if (ret < 0) + goto err; +#endif ret = kvm_arch_init(s, smp_cpus); if (ret < 0) goto err;