diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-28 13:19:16 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-28 13:19:16 -0600 |
| commit | 0a6b2ac0cf92a4411cce38a22703d7a34a5b3601 (patch) | |
| tree | 517583dce5d47ccae0fde7f98ffd2d2f474b442c | |
| parent | 7e68494b0be4310c48996e9334373ef5771e3d15 (diff) | |
| parent | 773de5c786a6050bbf3b33c0e29d1bd519a40b4b (diff) | |
Merge remote-tracking branch 'agraf/s390-for-upstream-1.3' into staging
* agraf/s390-for-upstream-1.3:
sclp: Fix uninitialized var in handle_write_event_buf().
s390: Fix ram_size updating in machine init
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/s390-virtio.c | 1 | ||||
| -rw-r--r-- | hw/s390x/event-facility.c | 3 |
2 files changed, 2 insertions, 2 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; diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 93676602a7..bc9cea9e1b 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); |