From: Heinz Graalfs Date: Mon, 19 Nov 2012 23:28:34 +0000 (+0000) Subject: s390: Fix ram_size updating in machine init X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~2972^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c7c3c58e3e33c80d1eef1514db3c705a4de692e;p=sdk%2Femulator%2Fqemu.git s390: Fix ram_size updating in machine init The global variable 'ram_size' is hidden by the local variable declaration in s390_init(). Since we want to update the global ram size in certain cases we must not use a local ram_size variable. - This fixes booting with unusual ram sizes like -m 67001 - This changes behaviour back to the situation before commit 5f072e1f3075bd869e0ace9f2545a85992ac0084 (create struct for machine initialization arguments) Signed-off-by: Heinz Graalfs Reviewed-by: Eduardo Habkost Signed-off-by: Christian Borntraeger Signed-off-by: Alexander Graf --- diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 685cb54..ca1bb09 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -155,7 +155,6 @@ unsigned s390_del_running_cpu(CPUS390XState *env) static void s390_init(QEMUMachineInitArgs *args) { ram_addr_t my_ram_size = args->ram_size; - ram_addr_t ram_size = args->ram_size; const char *cpu_model = args->cpu_model; const char *kernel_filename = args->kernel_filename; const char *kernel_cmdline = args->kernel_cmdline;