| Message ID | 20101213212436.2472.16686.stgit@s20.home |
|---|---|
| State | New |
| Headers | show |
On 12/13/2010 11:24 PM, Alex Williamson wrote: > Register the actual VM RAM using the new API > > > @@ -913,14 +913,11 @@ void pc_memory_init(ram_addr_t ram_size, > /* allocate RAM */ > ram_addr = qemu_ram_alloc(NULL, "pc.ram", > below_4g_mem_size + above_4g_mem_size); > - cpu_register_physical_memory(0, 0xa0000, ram_addr); > - cpu_register_physical_memory(0x100000, > - below_4g_mem_size - 0x100000, > - ram_addr + 0x100000); > + ram_register(0, below_4g_mem_size, ram_addr); > What's the impact of this? Won't it conflict with BIOS memory registration? What about VGA? In terms of patch hygiene, it should be in a separate patch titled "register 0xa0000-0x100000 as RAM" or something. It's a much more drastic change than making use of the new RAM API.
On Tue, 2010-12-14 at 11:18 +0200, Avi Kivity wrote: > On 12/13/2010 11:24 PM, Alex Williamson wrote: > > Register the actual VM RAM using the new API > > > > > > @@ -913,14 +913,11 @@ void pc_memory_init(ram_addr_t ram_size, > > /* allocate RAM */ > > ram_addr = qemu_ram_alloc(NULL, "pc.ram", > > below_4g_mem_size + above_4g_mem_size); > > - cpu_register_physical_memory(0, 0xa0000, ram_addr); > > - cpu_register_physical_memory(0x100000, > > - below_4g_mem_size - 0x100000, > > - ram_addr + 0x100000); > > + ram_register(0, below_4g_mem_size, ram_addr); > > > > What's the impact of this? Won't it conflict with BIOS memory > registration? What about VGA? > > In terms of patch hygiene, it should be in a separate patch titled > "register 0xa0000-0x100000 as RAM" or something. It's a much more > drastic change than making use of the new RAM API. As we discussed in the v2 patch, the chipset can selectively switch regions within this range to point at VGA, ROM, or RAM, but there's always physical RAM backing the space, even when it's mapping isn't active. VGA and ROM will be overlay the RAM mapping. I'm fine with splitting this into two patches for debug-ability, but the change is reflective of following the RAM API and registering all of "RAM". Maybe it would be sufficient to make such a note explicit in this commit log? Thanks, Alex
On 12/14/2010 09:16 AM, Alex Williamson wrote: > On Tue, 2010-12-14 at 11:18 +0200, Avi Kivity wrote: > >> On 12/13/2010 11:24 PM, Alex Williamson wrote: >> >>> Register the actual VM RAM using the new API >>> >>> >>> @@ -913,14 +913,11 @@ void pc_memory_init(ram_addr_t ram_size, >>> /* allocate RAM */ >>> ram_addr = qemu_ram_alloc(NULL, "pc.ram", >>> below_4g_mem_size + above_4g_mem_size); >>> - cpu_register_physical_memory(0, 0xa0000, ram_addr); >>> - cpu_register_physical_memory(0x100000, >>> - below_4g_mem_size - 0x100000, >>> - ram_addr + 0x100000); >>> + ram_register(0, below_4g_mem_size, ram_addr); >>> >>> >> What's the impact of this? Won't it conflict with BIOS memory >> registration? What about VGA? >> There is no "conflict". Memory registration can punch through previous registrations. And the QEMU SMM code switches the VGA area back and forth between memory mapped and normal ram depending on the mode. This presents no functional change, just structures RAM allocation to closer reflect the way things actually work. Regards, Anthony Liguori >> In terms of patch hygiene, it should be in a separate patch titled >> "register 0xa0000-0x100000 as RAM" or something. It's a much more >> drastic change than making use of the new RAM API. >> > As we discussed in the v2 patch, the chipset can selectively switch > regions within this range to point at VGA, ROM, or RAM, but there's > always physical RAM backing the space, even when it's mapping isn't > active. VGA and ROM will be overlay the RAM mapping. I'm fine with > splitting this into two patches for debug-ability, but the change is > reflective of following the RAM API and registering all of "RAM". Maybe > it would be sufficient to make such a note explicit in this commit log? > Thanks, > > Alex > >
diff --git a/hw/pc.c b/hw/pc.c index e1b2667..87adca2 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -913,14 +913,11 @@ void pc_memory_init(ram_addr_t ram_size, /* allocate RAM */ ram_addr = qemu_ram_alloc(NULL, "pc.ram", below_4g_mem_size + above_4g_mem_size); - cpu_register_physical_memory(0, 0xa0000, ram_addr); - cpu_register_physical_memory(0x100000, - below_4g_mem_size - 0x100000, - ram_addr + 0x100000); + ram_register(0, below_4g_mem_size, ram_addr); #if TARGET_PHYS_ADDR_BITS > 32 if (above_4g_mem_size > 0) { - cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size, - ram_addr + below_4g_mem_size); + ram_register(0x100000000ULL, above_4g_mem_size, + ram_addr + below_4g_mem_size); } #endif
Register the actual VM RAM using the new API Signed-off-by: Alex Williamson <alex.williamson@redhat.com> --- hw/pc.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)