From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Tue, 8 Jul 2008 10:36:50 +0000 (+0100)
Subject: Actually allocate phys_ram_dirty (!)
X-Git-Tag: xen-3.3.0-rc1~53
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4ec2ce63d3e3d28f759c7e7f16cc5f80c2d77c6b;p=qemu-xen-3.3-testing.git

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 b428d255..41573d94 100644
--- 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 e51addb3..798b7354 100644
--- 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 1b6bfb99..e22de1ae 100644
--- 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 c48e4524..22377566 100644
--- 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);