Re: [patch 4/5] pc: drop unnecessary memory un-assignment

Avi Kivity
2011-08-02T11:28:11Z

On 08/01/2011 06:27 PM, Marcelo Tosatti wrote:
> As noted by the original commit. Probably kept in qemu-kvm
> due to a mismerge.
>
> commit 7d0adcd6d57149d4e9ec66f3a1c171df2bea2775
> Author: aurel32<aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
> Date: Fri Oct 24 13:12:42 2008 +0000
>
> hw/pc: don't register the memory hole as unassigned twice
>
> Since revision 5228, we don't register the memory hole (0xa00000 to
> 0xfffff) anymore. As a consequence, we don't need to register it again
> as unassigned.
>
> Signed-off-by: Aurelien Jarno<aurelien@aurel32.net>
>
> Signed-off-by: Marcelo Tosatti<mtosatti@redhat.com>
>
> Index: qemu-kvm/hw/pc.c
> ===================================================================
> --- qemu-kvm.orig/hw/pc.c
> +++ qemu-kvm/hw/pc.c
> @@ -1013,8 +1013,6 @@ void pc_memory_init(const char *kernel_f
> isa_bios_size = bios_size;
> if (isa_bios_size> (128 * 1024))
> isa_bios_size = 128 * 1024;
> - cpu_register_physical_memory(0xd0000, (192 * 1024) - isa_bios_size,
> - IO_MEM_UNASSIGNED);
> cpu_register_physical_memory(0x100000 - isa_bios_size,
> isa_bios_size,
> (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM);
>
>

I noticed the same thing on the large upstream merge - this code is now
gone.

--
error compiling committee.c: too many arguments to function