Re: [Qemu-devel] [PATCH] hw: fix to display correct memory size

[Alexander Graf]

On 23.08.2013, at 15:57, Yongbok Kim wrote:

> A parenthesis placed inappropriately caused displaying
> wrong memory size bigger than 4GB.
> 
> Signed-off-by: Yongbok Kim <address@hidden>

Acked-by: Alexander Graf <address@hidden>

I think this should easily go in through the qemu-trivial queue.


Alex

> ---
> hw/mips/mips_malta.c  |    2 +-
> hw/mips/mips_r4k.c    |    2 +-
> hw/ppc/mac_oldworld.c |    2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index f8d064c..23ac1ca 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -954,7 +954,7 @@ void mips_malta_init(QEMUMachineInitArgs *args)
>     if (ram_size > (256 << 20)) {
>         fprintf(stderr,
>                 "qemu: Too much memory for this machine: %d MB, maximum 256 
> MB\n",
> -                ((unsigned int)ram_size / (1 << 20)));
> +                (unsigned int)(ram_size / (1 << 20)));
>         exit(1);
>     }
>     memory_region_init_ram(ram, NULL, "mips_malta.ram", ram_size);
> diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
> index 044f232..e8108ac 100644
> --- a/hw/mips/mips_r4k.c
> +++ b/hw/mips/mips_r4k.c
> @@ -201,7 +201,7 @@ void mips_r4k_init(QEMUMachineInitArgs *args)
>     if (ram_size > (256 << 20)) {
>         fprintf(stderr,
>                 "qemu: Too much memory for this machine: %d MB, maximum 256 
> MB\n",
> -                ((unsigned int)ram_size / (1 << 20)));
> +                (unsigned int)(ram_size / (1 << 20)));
>         exit(1);
>     }
>     memory_region_init_ram(ram, NULL, "mips_r4k.ram", ram_size);
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 42bb9d5..d7d1758 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -124,7 +124,7 @@ static void ppc_heathrow_init(QEMUMachineInitArgs *args)
>     if (ram_size > (2047 << 20)) {
>         fprintf(stderr,
>                 "qemu: Too much memory for this machine: %d MB, maximum 2047 
> MB\n",
> -                ((unsigned int)ram_size / (1 << 20)));
> +                (unsigned int)(ram_size / (1 << 20)));
>         exit(1);
>     }
> 
> -- 
> 1.7.4
> 
>