[Qemu-devel] [PULL 1.3 0/2] s390 1.3 patch queue 2012-11-26

[Qemu-devel] [PULL 1.3 0/2] s390 1.3 patch queue 2012-11-26

[Alexander Graf]

Hi Blue / Aurelien,

This is my current patch queue for s390 with patches that should go in for 1.3.
Please pull.

Alex


The following changes since commit cab1e8f3e37d8e883c270e3afd9c7c1c18332f0e:
  Anthony Liguori (1):
        Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

are available in the git repository at:

  git://repo.or.cz/qemu/agraf.git s390-for-upstream-1.3

Cornelia Huck (1):
      sclp: Fix uninitialized var in handle_write_event_buf().

Heinz Graalfs (1):
      s390: Fix ram_size updating in machine init

 hw/s390-virtio.c          |    1 -
 hw/s390x/event-facility.c |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

[Alexander Graf]

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>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 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;
-- 
1.6.0.2

[Qemu-devel] [PATCH 2/2] sclp: Fix uninitialized var in handle_write_event_buf().

[Alexander Graf]

From: Cornelia Huck <cornelia.huck@de.ibm.com>

Some gcc versions rightly complain about a possibly unitialized rc,
so let's move setting it before the QTAILQ_FOREACH().

Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/s390x/event-facility.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 9367660..bc9cea9 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -112,12 +112,13 @@ static uint16_t handle_write_event_buf(SCLPEventFacility *ef,
     SCLPEvent *event;
     SCLPEventClass *ec;
 
+    rc = SCLP_RC_INVALID_FUNCTION;
+
     QTAILQ_FOREACH(kid, &ef->sbus.qbus.children, sibling) {
         DeviceState *qdev = kid->child;
         event = (SCLPEvent *) qdev;
         ec = SCLP_EVENT_GET_CLASS(event);
 
-        rc = SCLP_RC_INVALID_FUNCTION;
         if (ec->write_event_data &&
             ec->event_type() == event_buf->type) {
             rc = ec->write_event_data(event, event_buf);
-- 
1.6.0.2

Re: [Qemu-devel] [PULL 1.3 0/2] s390 1.3 patch queue 2012-11-26

[Anthony Liguori]

Alexander Graf <agraf@suse.de> writes:

> Hi Blue / Aurelien,
>
> This is my current patch queue for s390 with patches that should go in for 1.3.
> Please pull.
>
> Alex
>

Pulled. Thanks.

Regards,

Anthony Liguori

>
> The following changes since commit cab1e8f3e37d8e883c270e3afd9c7c1c18332f0e:
>   Anthony Liguori (1):
>         Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
>
> are available in the git repository at:
>
>   git://repo.or.cz/qemu/agraf.git s390-for-upstream-1.3
>
> Cornelia Huck (1):
>       sclp: Fix uninitialized var in handle_write_event_buf().
>
> Heinz Graalfs (1):
>       s390: Fix ram_size updating in machine init
>
>  hw/s390-virtio.c          |    1 -
>  hw/s390x/event-facility.c |    3 ++-
>  2 files changed, 2 insertions(+), 2 deletions(-)