[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/8] kvm: x86: q35: Add support for -machine kernel_i
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 1/8] kvm: x86: q35: Add support for -machine kernel_irqchip=split for q35 |
Date: |
Tue, 15 Mar 2016 18:35:03 +0100 |
From: Rita Sinha <address@hidden>
The split IRQ chip mode via KVM_CAP_SPLIT_IRQCHIP was introduced with commit
15eafc2e60 but was broken for q35. This patch makes kernel_irqchip=split
functional for q35.
Signed-off-by: Rita Sinha <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Jan Kiszka <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/i386/pc_q35.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 17915b0..9ee939b 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -39,6 +39,7 @@
#include "hw/kvm/clock.h"
#include "hw/pci-host/q35.h"
#include "exec/address-spaces.h"
+#include "hw/i386/pc.h"
#include "hw/i386/ich9.h"
#include "hw/smbios/smbios.h"
#include "hw/ide/pci.h"
@@ -146,7 +147,7 @@ static void pc_q35_init(MachineState *machine)
/* irq lines */
gsi_state = g_malloc0(sizeof(*gsi_state));
- if (kvm_irqchip_in_kernel()) {
+ if (kvm_ioapic_in_kernel()) {
kvm_pc_setup_irq_routing(pcmc->pci_enabled);
gsi = qemu_allocate_irqs(kvm_pc_gsi_handler, gsi_state,
GSI_NUM_PINS);
@@ -193,7 +194,7 @@ static void pc_q35_init(MachineState *machine)
/*end early*/
isa_bus_irqs(isa_bus, gsi);
- if (kvm_irqchip_in_kernel()) {
+ if (kvm_pic_in_kernel()) {
i8259 = kvm_i8259_init(isa_bus);
} else if (xen_enabled()) {
i8259 = xen_interrupt_controller_init();
--
1.8.3.1
- [Qemu-devel] [PULL 0/8] Memory, icount, chardev, KVM changes for 2016-03-15, Paolo Bonzini, 2016/03/15
- [Qemu-devel] [PULL 2/8] update-linux-headers: Add userfaultfd.h, Paolo Bonzini, 2016/03/15
- [Qemu-devel] [PULL 1/8] kvm: x86: q35: Add support for -machine kernel_irqchip=split for q35,
Paolo Bonzini <=
- [Qemu-devel] [PULL 4/8] exec: Fix memory allocation when memory path isn't on hugetlbfs, Paolo Bonzini, 2016/03/15
- [Qemu-devel] [PULL 3/8] exec: Fix memory allocation when memory path names new file, Paolo Bonzini, 2016/03/15
- [Qemu-devel] [PULL 5/8] exec: fix early return from ram_block_add, Paolo Bonzini, 2016/03/15
- [Qemu-devel] [PULL 7/8] icount: remove obsolete warp call, Paolo Bonzini, 2016/03/15
- [Qemu-devel] [PULL 8/8] icount: decouple warp calls, Paolo Bonzini, 2016/03/15
- [Qemu-devel] [PULL 6/8] replay: character devices, Paolo Bonzini, 2016/03/15
- Re: [Qemu-devel] [PULL 0/8] Memory, icount, chardev, KVM changes for 2016-03-15, Peter Maydell, 2016/03/16