Actually allocate phys_ram_dirty (!)

Previously the plumbing for phys_ram_size was broken.

diff --git a/hw/xen_machine_fv.c b/hw/xen_machine_fv.c
index b428d25525a412734964d4acf4693d92b1b3b413..41573d94e12ce27a7a61ffc715a28d1ff824441e 100644 (file)
--- a/hw/xen_machine_fv.c
+++ b/hw/xen_machine_fv.c
@@ -24,6 +24,7 @@
  */
 
 #include "hw.h"
+#include "pc.h"
 #include "boards.h"
 #include "exec-all.h"
 #include "qemu-xen.h"
@@ -282,6 +283,7 @@ QEMUMachine xenfv_machine = {
     "xenfv",
     "Xen Fully-virtualized PC",
     xen_init_fv,
+    (VGA_RAM_SIZE + BIOS_SIZE) | RAMSIZE_FIXED,
 };
 
 /*

diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c
index e51addb3023132ee570eaf54c2fe94e2541ba7f0..798b73540e36a7a9ed8507f724eb5b8d4bd12a8e 100644 (file)
--- a/hw/xen_machine_pv.c
+++ b/hw/xen_machine_pv.c
@@ -23,6 +23,7 @@
  */
 
 #include "hw.h"
+#include "pc.h"
 #include "xen_console.h"
 #include "xenfb.h"
 #include "sysemu.h"
@@ -76,6 +77,7 @@ QEMUMachine xenpv_machine = {
     "xenpv",
     "Xen Para-virtualized PC",
     xen_init_pv,
+    (VGA_RAM_SIZE + BIOS_SIZE) | RAMSIZE_FIXED,
 };
 
 /*

diff --git a/vl.c b/vl.c
index 1b6bfb99c2b55ff2e35ab61caf307dad3aebc82a..e22de1aee8b7fe16445533e5994c252a314b4c21 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -8636,6 +8636,7 @@ int main(int argc, char **argv)
        }
     }
 
+#endif
     /* init the memory */
     phys_ram_size = machine->ram_require & ~RAMSIZE_FIXED;
 
@@ -8657,6 +8658,7 @@ int main(int argc, char **argv)
         phys_ram_size += ram_size;
     }
 
+#ifndef CONFIG_DM
     phys_ram_base = qemu_vmalloc(phys_ram_size);
     if (!phys_ram_base) {
         fprintf(stderr, "Could not allocate physical memory\n");

diff --git a/xen-config-host.h b/xen-config-host.h
index c48e4524cde33be54ea462779cd72591f04c46f7..2237756603f74ad9e3d60609e4e3d295f4da2361 100644 (file)
--- a/xen-config-host.h
+++ b/xen-config-host.h
@@ -17,6 +17,8 @@ extern int domid;
 # undef bool
 #endif
 
+#define BIOS_SIZE ((256 + 64) * 1024)
+
 #undef CONFIG_GDBSTUB
 
 void main_loop_prepare(void);