[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] vl.c: Check the asked ram_size later.
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 8/9] vl.c: Check the asked ram_size later. |
Date: |
Wed, 27 Jul 2011 15:30:56 +0200 |
From: Anthony PERARD <address@hidden>
As a Xen guest can have more than 2GB of RAM on a 32bit host, we move
the conditions after than we now if we run one Xen or not.
[agraf] separate xen branch from ram_size check
Signed-off-by: Anthony PERARD <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
vl.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/vl.c b/vl.c
index 4b6688b..d8c7c01 100644
--- a/vl.c
+++ b/vl.c
@@ -2440,11 +2440,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);
@@ -3099,8 +3094,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);
--
1.6.0.2
- [Qemu-devel] [PULL 0/9] xen patch queue 2011-07-26, Alexander Graf, 2011/07/27
- [Qemu-devel] [PATCH 8/9] vl.c: Check the asked ram_size later.,
Alexander Graf <=
- [Qemu-devel] [PATCH 5/9] xen: make xen_enabled even more clever, Alexander Graf, 2011/07/27
- [Qemu-devel] [PATCH 6/9] cpu-common: Have a ram_addr_t of uint64 with Xen., Alexander Graf, 2011/07/27
- [Qemu-devel] [PATCH 1/9] xen: introduce xen_change_state_handler, Alexander Graf, 2011/07/27
- [Qemu-devel] [PATCH 3/9] exec.c: Use ram_addr_t in cpu_physical_memory_rw(...)., Alexander Graf, 2011/07/27
- [Qemu-devel] [PATCH 2/9] xen: Fix xen_enabled()., Alexander Graf, 2011/07/27
- [Qemu-devel] [PATCH 4/9] xen: remove CONFIG_XEN_MAPCACHE, Alexander Graf, 2011/07/27
- [Qemu-devel] [PATCH 7/9] xen: Fix the memory registration to reflect of what is done by Xen., Alexander Graf, 2011/07/27
- [Qemu-devel] [PATCH 9/9] xen: implement unplug protocol in xen_platform, Alexander Graf, 2011/07/27
- Re: [Qemu-devel] [PULL 0/9] xen patch queue 2011-07-26, Anthony Liguori, 2011/07/29