Commit 8c7c3c58 authored by Heinz Graalfs's avatar Heinz Graalfs Committed by Alexander Graf
Browse files

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
  5f072e1f
  (create struct for machine initialization arguments)

Signed-off-by: default avatarHeinz Graalfs <graalfs@linux.vnet.ibm.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent cab1e8f3

hw/s390-virtio.c

+0 −1
Original line number Diff line number Diff line
@@ -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;