From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37261) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adGoG-0007S5-08 for qemu-devel@nongnu.org; Tue, 08 Mar 2016 07:32:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adGoB-0001m9-RD for qemu-devel@nongnu.org; Tue, 08 Mar 2016 07:32:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adGoB-0001m5-M4 for qemu-devel@nongnu.org; Tue, 08 Mar 2016 07:32:15 -0500 References: <1457378525-16455-1-git-send-email-rita.sinha89@gmail.com> <56DDD596.7080708@web.de> From: Paolo Bonzini Message-ID: <56DEC64B.8070304@redhat.com> Date: Tue, 8 Mar 2016 13:32:11 +0100 MIME-Version: 1.0 In-Reply-To: <56DDD596.7080708@web.de> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2] kvm: x86: q35: Add support for -machine kernel_irqchip=split for q35 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka , Rita Sinha , qemu-devel@nongnu.org On 07/03/2016 20:25, Jan Kiszka wrote: > On 2016-03-07 20:22, Rita Sinha wrote: >> 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 >> --- >> 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 46522c9..fcc127b 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" >> @@ -145,7 +146,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); >> @@ -192,7 +193,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(); >> > > Reviewed-by: Jan Kiszka > Applied, thanks to both! Paolo