aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-07-29 09:42:12 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-07-29 09:42:12 -0500
commit3046c984049070ab5843da1753ce3a22e25b52cd (patch)
treeeb706dd61603bbce9d669fb2f35bd06688cdf396 /vl.c
parente374560232776d4141866abc9f520c132b394926 (diff)
parent679f4f8b178e7c66fbc2f39c905374ee8663d5d8 (diff)
downloadqemu-3046c984049070ab5843da1753ce3a22e25b52cd.zip
qemu-3046c984049070ab5843da1753ce3a22e25b52cd.tar.gz
qemu-3046c984049070ab5843da1753ce3a22e25b52cd.tar.bz2
Merge remote-tracking branch 'agraf/xen-next' into staging
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/vl.c b/vl.c
index 73316cf..426cea7 100644
--- a/vl.c
+++ b/vl.c
@@ -2454,11 +2454,6 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- /* On 32-bit hosts, QEMU is limited by virtual address space */
- if (value > (2047 << 20) && HOST_LONG_BITS == 32) {
- fprintf(stderr, "qemu: at most 2047 MB RAM can be simulated\n");
- exit(1);
- }
if (value != (uint64_t)(ram_addr_t)value) {
fprintf(stderr, "qemu: ram size too large\n");
exit(1);
@@ -3116,8 +3111,17 @@ int main(int argc, char **argv, char **envp)
exit(1);
/* init the memory */
- if (ram_size == 0)
+ if (ram_size == 0) {
ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
+ }
+
+ if (!xen_enabled()) {
+ /* On 32-bit hosts, QEMU is limited by virtual address space */
+ if (ram_size > (2047 << 20) && HOST_LONG_BITS == 32) {
+ fprintf(stderr, "qemu: at most 2047 MB RAM can be simulated\n");
+ exit(1);
+ }
+ }
/* init the dynamic translator */
cpu_exec_init_all(tb_size * 1024 * 1024);