diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-15 17:56:14 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-15 17:56:14 +0000 |
| commit | 4caecccbc13b23c1e7344046f6d0c346be6297a3 (patch) | |
| tree | 6f19bd16f31096206358078e9d0d933117d3bbd2 /hw | |
| parent | a6cdb77f816961f929d7934643febd2852230135 (diff) | |
| parent | e76d1798faa6d29f54c0930a034b67f3ecdb947d (diff) | |
| download | qemu-4caecccbc13b23c1e7344046f6d0c346be6297a3.zip qemu-4caecccbc13b23c1e7344046f6d0c346be6297a3.tar.gz qemu-4caecccbc13b23c1e7344046f6d0c346be6297a3.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* Miscellaneous exec.c fixes (Markus, myself)
* Q35 support for -machine kernel_irqchip=split (Rita)
* Chardev replay support (Pavel)
* icount "warping" cleanups (Pavel)
# gpg: Signature made Tue 15 Mar 2016 17:24:08 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
* remotes/bonzini/tags/for-upstream:
icount: decouple warp calls
icount: remove obsolete warp call
replay: character devices
exec: fix early return from ram_block_add
exec: Fix memory allocation when memory path isn't on hugetlbfs
exec: Fix memory allocation when memory path names new file
update-linux-headers: Add userfaultfd.h
kvm: x86: q35: Add support for -machine kernel_irqchip=split for q35
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc_q35.c | 5 |
1 files 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(); |