public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] fix -kernel option
@ 2007-12-07 17:01 Glauber de Oliveira Costa
       [not found] ` <11970469043041-git-send-email-gcosta-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
  0 siblings, 1 reply; 13+ messages in thread
From: Glauber de Oliveira Costa @ 2007-12-07 17:01 UTC (permalink / raw)
  To: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
  Cc: avi-atKUWr5tajBWk0Htik3J/w, Glauber de Oliveira Costa

Currently, the -kernel option is not working.

Reason is, because we're registering chunks for regions 0-0xa0000 and
0x100000-ram_size, the phys_ram_addr + PA is broken.
The real fix should be to rewrite all the load_linux() code to not rely
on this, but meanwhile, filling in the gap up to 0xc0000 - the beginning
of extended memory - makes it work again

Signed-off-by: Glauber de Oliveira Costa <gcosta-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 qemu/hw/pc.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index 6c71b09..e4a5f2d 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -725,13 +725,18 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, int boot_device,
 #ifdef USE_KVM
  #ifdef KVM_CAP_USER_MEMORY
     if (kvm_allowed && kvm_qemu_check_extension(KVM_CAP_USER_MEMORY)) {
+        ram_addr = qemu_ram_alloc(0xa0000);
+        cpu_register_physical_memory(0, 0xa0000, ram_addr);
+        kvm_cpu_register_physical_memory(0, 0xa0000, ram_addr);
+
+	/* move the pointer up to 0xc0000, which is the next
+           address we'll touch */
+        qemu_ram_alloc(0x20000);
+
         ram_addr = qemu_ram_alloc(ram_size - 0x100000);
         cpu_register_physical_memory(0x100000, ram_size - 0x100000, ram_addr);
         kvm_cpu_register_physical_memory(0x100000, ram_size - 0x100000,
                                          ram_addr);
-        ram_addr = qemu_ram_alloc(0xa0000);
-        cpu_register_physical_memory(0, 0xa0000, ram_addr);
-        kvm_cpu_register_physical_memory(0, 0xa0000, ram_addr);
     } else
  #endif
 #endif
-- 
1.5.0.6


-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2007-12-10 17:56 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-07 17:01 [PATCH] fix -kernel option Glauber de Oliveira Costa
     [not found] ` <11970469043041-git-send-email-gcosta-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2007-12-07 17:14   ` Anthony Liguori
     [not found]     ` <47597F62.6060600-rdkfGonbjUSkNkDKm+mE6A@public.gmane.org>
2007-12-07 17:45       ` Izik Eidus
     [not found]         ` <475986AD.90506-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-12-07 18:38           ` Anthony Liguori
     [not found]             ` <47599313.3060708-rdkfGonbjUSkNkDKm+mE6A@public.gmane.org>
2007-12-07 18:45               ` Izik Eidus
2007-12-07 20:04               ` Luca Tettamanti
2007-12-09  8:54       ` Avi Kivity
2007-12-07 17:49   ` Izik Eidus
2007-12-09 14:00   ` Dor Laor
     [not found]     ` <475BF50F.5020001-atKUWr5tajBWk0Htik3J/w@public.gmane.org>
2007-12-09 13:59       ` Izik Eidus
2007-12-10 16:17       ` Glauber de Oliveira Costa
     [not found]         ` <475D6686.4070202-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2007-12-10 17:56           ` Dor Laor
2007-12-09 14:04   ` Uri Lublin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox