[Xen-changelog] [qemu-upstream-unstable] s390: Fix ram_size updating in machine init

[patchbot@xxxxxxx]

commit 8c7c3c58e3e33c80d1eef1514db3c705a4de692e
Author: Heinz Graalfs <graalfs@xxxxxxxxxxxxxxxxxx>
Date:   Mon Nov 19 23:28:34 2012 +0000

    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@xxxxxxxxxxxxxxxxxx>
    Reviewed-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
    Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
    Signed-off-by: Alexander Graf <agraf@xxxxxxx>
---
 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 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;
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog