[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] kvm-all.c: Move init of irqchip_inject_ioctl ou
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 2/9] kvm-all.c: Move init of irqchip_inject_ioctl out of kvm_irqchip_create() |
Date: |
Tue, 11 Sep 2012 18:26:30 -0300 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
kvm-all.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index 39cff55..f9873db 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1237,10 +1237,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)
@@ -1389,6 +1385,11 @@ int kvm_init(void)
s->intx_set_mask = kvm_check_extension(s, KVM_CAP_PCI_2_3);
+ 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.6.4
- [Qemu-devel] [PATCH 0/9] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2012/09/11
- [Qemu-devel] [PATCH 3/9] memory: Flush coalesced MMIO on selected region access, Marcelo Tosatti, 2012/09/11
- [Qemu-devel] [PATCH 2/9] kvm-all.c: Move init of irqchip_inject_ioctl out of kvm_irqchip_create(),
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 7/9] VGA: Flush coalesced MMIO on related MMIO/PIO accesses, Marcelo Tosatti, 2012/09/11
- [Qemu-devel] [PATCH 9/9] kvm: Rename irqchip_inject_ioctl to irq_set_ioctl, Marcelo Tosatti, 2012/09/11
- [Qemu-devel] [PATCH 5/9] memory: Fold memory_region_update_topology into memory_region_transaction_commit, Marcelo Tosatti, 2012/09/11
- [Qemu-devel] [PATCH 1/9] update-linux-headers.sh: Don't hard code list of architectures, Marcelo Tosatti, 2012/09/11
- [Qemu-devel] [PATCH 8/9] kvm: Stop flushing coalesced MMIO on vmexit, Marcelo Tosatti, 2012/09/11
- [Qemu-devel] [PATCH 6/9] memory: Flush coalesced MMIO on mapping and state changes, Marcelo Tosatti, 2012/09/11
- [Qemu-devel] [PATCH 4/9] memory: Use transaction_begin/commit also for single-step operations, Marcelo Tosatti, 2012/09/11
- Re: [Qemu-devel] [PATCH 0/9] [PULL] qemu-kvm.git uq/master queue, Anthony Liguori, 2012/09/17