[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [BACKPORT qemu-xen 3/3] xen: start PCI hole at 0xe0000000 (
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [BACKPORT qemu-xen 3/3] xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional) |
Date: |
Wed, 5 Jun 2013 13:07:33 +0100 |
We are currently setting the PCI hole to start at HVM_BELOW_4G_RAM_END,
that is 0xf0000000.
Start the PCI hole at 0xe0000000 instead, that is the same value used by
pc_init1 and qemu-xen-traditional.
upstream-commit-id: 9f24a8030a70ea4954b5b8c48f606012f086f65f
Signed-off-by: Stefano Stabellini <address@hidden>
---
hw/pc.h | 3 +++
hw/pc_piix.c | 6 +++---
xen-all.c | 12 ++++++------
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/hw/pc.h b/hw/pc.h
index 2237e86..30856a2 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -78,6 +78,9 @@ extern int fd_bootchk;
void pc_register_ferr_irq(qemu_irq irq);
void pc_acpi_smi_interrupt(void *opaque, int irq, int level);
+#define QEMU_BELOW_4G_RAM_END 0xe0000000
+#define QEMU_BELOW_4G_MMIO_LENGTH ((1ULL << 32) - QEMU_BELOW_4G_RAM_END)
+
void pc_cpus_init(const char *cpu_model);
void *pc_memory_init(MemoryRegion *system_memory,
const char *kernel_filename,
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index aa3e7f4..711a22d 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -92,9 +92,9 @@ static void pc_init1(MemoryRegion *system_memory,
kvmclock_create();
}
- if (ram_size >= 0xe0000000 ) {
- above_4g_mem_size = ram_size - 0xe0000000;
- below_4g_mem_size = 0xe0000000;
+ if (ram_size >= QEMU_BELOW_4G_RAM_END ) {
+ above_4g_mem_size = ram_size - QEMU_BELOW_4G_RAM_END;
+ below_4g_mem_size = QEMU_BELOW_4G_RAM_END;
} else {
above_4g_mem_size = 0;
below_4g_mem_size = ram_size;
diff --git a/xen-all.c b/xen-all.c
index daf43b9..d5a2edc 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -160,18 +160,18 @@ static void xen_ram_init(ram_addr_t ram_size)
ram_addr_t block_len;
block_len = ram_size;
- if (ram_size >= HVM_BELOW_4G_RAM_END) {
+ if (ram_size >= QEMU_BELOW_4G_RAM_END) {
/* Xen does not allocate the memory continuously, and keep a hole at
- * HVM_BELOW_4G_MMIO_START of HVM_BELOW_4G_MMIO_LENGTH
+ * QEMU_BELOW_4G_RAM_END of QEMU_BELOW_4G_MMIO_LENGTH
*/
- block_len += HVM_BELOW_4G_MMIO_LENGTH;
+ block_len += QEMU_BELOW_4G_MMIO_LENGTH;
}
memory_region_init_ram(&ram_memory, "xen.ram", block_len);
vmstate_register_ram_global(&ram_memory);
- if (ram_size >= HVM_BELOW_4G_RAM_END) {
- above_4g_mem_size = ram_size - HVM_BELOW_4G_RAM_END;
- below_4g_mem_size = HVM_BELOW_4G_RAM_END;
+ if (ram_size >= QEMU_BELOW_4G_RAM_END) {
+ above_4g_mem_size = ram_size - QEMU_BELOW_4G_RAM_END;
+ below_4g_mem_size = QEMU_BELOW_4G_RAM_END;
} else {
below_4g_mem_size = ram_size;
}
--
1.7.2.5