[Qemu-devel] [PATCH 06/24] Remove local ram_size that hides global one

[Qemu-devel] [PATCH 06/24] Remove local ram_size that hides global one

[Christian Borntraeger]

From: Heinz Graalfs <graalfs@linux.vnet.ibm.com>

The global variable 'ram_size' is hidden by the local variable
declaration in s390_init()

Signed-off-by: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 hw/s390-virtio.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index ebec844..78477af 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;
-- 
1.7.10.1

Re: [Qemu-devel] [PATCH 06/24] Remove local ram_size that hides global one

[Alexander Graf]

On 13.11.2012, at 13:11, Christian Borntraeger wrote:

> From: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
> 
> The global variable 'ram_size' is hidden by the local variable
> declaration in s390_init()

That's the point of Eduardo's patch, no? Or do we need access to the global to change its value afterwards? If so, please write a reasonable patch description that actually explains the problem.


Alex

> 
> Signed-off-by: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> hw/s390-virtio.c |    1 -
> 1 file changed, 1 deletion(-)
> 
> diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
> index ebec844..78477af 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;
> -- 
> 1.7.10.1
> 

Re: [Qemu-devel] [PATCH 06/24] Remove local ram_size that hides global one

[Peter Maydell]

On 19 November 2012 13:14, Alexander Graf <agraf@suse.de> wrote:
>
> On 13.11.2012, at 13:11, Christian Borntraeger wrote:
>
>> From: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
>>
>> The global variable 'ram_size' is hidden by the local variable
>> declaration in s390_init()
>
> That's the point of Eduardo's patch, no? Or do we need access
> to the global to change its value afterwards?

The function later does:
    /* lets propagate the changed ram size into the global variable. */
    ram_size = my_ram_size;

which frankly I think is pretty nasty but then we've never
had a very good mechanism for specifying board-specific
restrictions around the memory size.

-- PMM

Re: [Qemu-devel] [PATCH 06/24] Remove local ram_size that hides global one

[Eduardo Habkost]

On Mon, Nov 19, 2012 at 02:14:27PM +0100, Alexander Graf wrote:
> 
> On 13.11.2012, at 13:11, Christian Borntraeger wrote:
> 
> > From: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
> > 
> > The global variable 'ram_size' is hidden by the local variable
> > declaration in s390_init()
> 
> That's the point of Eduardo's patch, no? Or do we need access to the global to change its value afterwards? If so, please write a reasonable patch description that actually explains the problem.
> 

Actually, I wanted to keep the existing behavior (whatever it was), and
use local variables to replace the old function parameters, and change
nothing else. Most machines used a local variable named 'ram_size', but
the parameter to s390_init() was named 'my_ram_size'.

So, considering that this at least restores the previous behavior:

Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>


> 
> Alex
> 
> > 
> > Signed-off-by: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
> > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> > ---
> > hw/s390-virtio.c |    1 -
> > 1 file changed, 1 deletion(-)
> > 
> > diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
> > index ebec844..78477af 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;
> > -- 
> > 1.7.10.1
> > 
> 

-- 
Eduardo

Re: [Qemu-devel] [PATCH 06/24] Remove local ram_size that hides global one

[Alexander Graf]

On 19.11.2012, at 14:35, Eduardo Habkost wrote:

> On Mon, Nov 19, 2012 at 02:14:27PM +0100, Alexander Graf wrote:
>> 
>> On 13.11.2012, at 13:11, Christian Borntraeger wrote:
>> 
>>> From: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
>>> 
>>> The global variable 'ram_size' is hidden by the local variable
>>> declaration in s390_init()
>> 
>> That's the point of Eduardo's patch, no? Or do we need access to the global to change its value afterwards? If so, please write a reasonable patch description that actually explains the problem.
>> 
> 
> Actually, I wanted to keep the existing behavior (whatever it was), and
> use local variables to replace the old function parameters, and change
> nothing else. Most machines used a local variable named 'ram_size', but
> the parameter to s390_init() was named 'my_ram_size'.
> 
> So, considering that this at least restores the previous behavior:
> 
> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

Yup, Heinz, please resend with a patch description that actually tells us what the problem is.


Alex

[Qemu-devel] [PATCH 1/1] s390: Fix ram_size updating in machine init

[Christian Borntraeger]

From: Heinz Graalfs <graalfs@linux.vnet.ibm.com>

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>
---
 hw/s390-virtio.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index ebec844..78477af 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;
-- 
1.7.10.1

Re: [Qemu-devel] [PATCH 1/1] s390: Fix ram_size updating in machine init

[Alexander Graf]

On 20.11.2012, at 10:28, Christian Borntraeger wrote:

> From: Heinz Graalfs <graalfs@linux.vnet.ibm.com>
> 
> 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>

Thanks, applied to s390-next.


Alex

> ---
> hw/s390-virtio.c |    1 -
> 1 file changed, 1 deletion(-)
> 
> diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
> index ebec844..78477af 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;
> -- 
> 1.7.10.1
>