Revert "xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional)"

This reverts commit 4597594c61add43725bd207bb498268a058f9cfb.

Changing the start of the PCI hole requires a corresponding change in
hvmloader and libxc. Revert the commit for the moment.

diff --git a/hw/pc.h b/hw/pc.h
index 30856a2c2d05e83f56a67447b5023f591d16c35a..2237e86446af120036dbcb0902d1da383c5c5bc6 100644 (file)
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -78,9 +78,6 @@ 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 711a22daa1df3a906c12881ae78d7acc7f7f9c41..aa3e7f40dcc27139ff399e8c9020dbe7952c8039 100644 (file)
--- 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 >= 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;
+    if (ram_size >= 0xe0000000 ) {
+        above_4g_mem_size = ram_size - 0xe0000000;
+        below_4g_mem_size = 0xe0000000;
     } else {
         above_4g_mem_size = 0;
         below_4g_mem_size = ram_size;

diff --git a/xen-all.c b/xen-all.c
index d5a2edc88a80108fe91255951f636cc8d88166c5..daf43b99d00db4ea64d9b8588ec401d092f6f1ea 100644 (file)
--- 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 >= QEMU_BELOW_4G_RAM_END) {
+    if (ram_size >= HVM_BELOW_4G_RAM_END) {
         /* Xen does not allocate the memory continuously, and keep a hole at
-         * QEMU_BELOW_4G_RAM_END of QEMU_BELOW_4G_MMIO_LENGTH
+         * HVM_BELOW_4G_MMIO_START of HVM_BELOW_4G_MMIO_LENGTH
          */
-        block_len += QEMU_BELOW_4G_MMIO_LENGTH;
+        block_len += HVM_BELOW_4G_MMIO_LENGTH;
     }
     memory_region_init_ram(&ram_memory, "xen.ram", block_len);
     vmstate_register_ram_global(&ram_memory);
 
-    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;
+    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;
     } else {
         below_4g_mem_size = ram_size;
     }