diff options
| author | Alexey Korolev <akorolex@gmail.com> | 2013-02-22 16:58:44 +1300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-02-27 17:23:22 +0200 |
| commit | 7feb640cf32d86f91f5a624136345eb6a63eab42 (patch) | |
| tree | 42face6a4260bb03af364e356f760d7516139b6a /target-i386/cpu.c | |
| parent | 2af234e61d59f39ae16ba882271e7c4fef2c41c1 (diff) | |
Fix guest OS hang when 64bit PCI bar present
This patch addresses the issue fully described here:
http://lists.nongnu.org/archive/html/qemu-devel/2013-02/msg01804.html
Linux kernels prior to 2.6.36 do not disable the PCI device during
enumeration process. Since lower and higher parts of a 64bit BAR
are programmed separately this leads to qemu receiving a request to occupy
a completely wrong address region for a short period of time.
We have found that the boot process screws up completely if kvm-apic range
is overlapped even for a short period of time (it is fine for other
regions though).
This patch raises the priority of the kvm-apic memory region, so it is
never pushed out by PCI devices. The patch is quite safe as it does not
touch memory manager.
Signed-off-by: Alexey Korolev <akorolex@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'target-i386/cpu.c')
| -rw-r--r-- | target-i386/cpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 5582e5f4e6..8fb736a5b4 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2088,7 +2088,8 @@ static void x86_cpu_apic_init(X86CPU *cpu, Error **errp) /* NOTE: the APIC is directly connected to the CPU - it is not on the global memory bus. */ /* XXX: what if the base changes? */ - sysbus_mmio_map(SYS_BUS_DEVICE(env->apic_state), 0, MSI_ADDR_BASE); + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(env->apic_state), 0, + MSI_ADDR_BASE, 0x1000); apic_mapped = 1; } } |