diff options
| author | Heinz Graalfs <graalfs@linux.vnet.ibm.com> | 2012-11-19 23:28:34 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-11-26 20:16:26 +0100 |
| commit | 8c7c3c58e3e33c80d1eef1514db3c705a4de692e (patch) | |
| tree | cbbd33c5e0e7e670e9046411152041eb995dd360 | |
| parent | cab1e8f3e37d8e883c270e3afd9c7c1c18332f0e (diff) | |
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 <graalfs@linux.vnet.ibm.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/s390-virtio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 685cb5413e..ca1bb09816 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; |