Commit 0a6b2ac0 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 7e68494b 773de5c7

hw/s390-virtio.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

hw/s390x/event-facility.c

+2 −1
Original line number Diff line number Diff line
@@ -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);