Commit 661725da authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150714' into staging 



s390x fixes for 2.4:
- virtio migration regression
- missing diag288 watchdog resets

# gpg: Signature made Tue Jul 14 18:17:54 2015 BST using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"

* remotes/cohuck/tags/s390x-20150714:
  s390/virtio-ccw: Fix migration
  watchdog/diag288: correctly register for system reset requests

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f3947986 2af9170c

hw/s390x/s390-virtio-ccw.c

+5 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ typedef struct S390CcwMachineState { 


void io_subsystem_reset(void)

{

    DeviceState *css, *sclp, *flic;

    DeviceState *css, *sclp, *flic, *diag288;



    css = DEVICE(object_resolve_path_type("", "virtual-css-bridge", NULL));

    if (css) {
@@ -51,6 +51,10 @@ void io_subsystem_reset(void) 
    if (flic) {

        qdev_reset_all(flic);

    }

    diag288 = DEVICE(object_resolve_path_type("", "diag288", NULL));

    if (diag288) {

        qdev_reset_all(diag288);

    }

}



static int virtio_ccw_hcall_notify(const uint64_t *args)

hw/s390x/virtio-ccw.c

+1 −1
Original line number Diff line number Diff line
@@ -1508,12 +1508,12 @@ static int virtio_ccw_load_config(DeviceState *d, QEMUFile *f) 
    qemu_get_be16s(f, &vdev->config_vector);

    dev->routes.adapter.ind_offset = qemu_get_be64(f);

    dev->thinint_isc = qemu_get_byte(f);

    dev->revision = qemu_get_be32(f);

    if (s->thinint_active) {

        return css_register_io_adapter(CSS_IO_ADAPTER_VIRTIO,

                                       dev->thinint_isc, true, false,

                                       &dev->routes.adapter.adapter_id);

    }

    dev->revision = qemu_get_be32(f);



    return 0;

}

hw/watchdog/wdt_diag288.c

+8 −0
Original line number Diff line number Diff line
@@ -40,6 +40,13 @@ static void wdt_diag288_reset(DeviceState *dev) 
    timer_del(diag288->timer);

}



static void diag288_reset(void *opaque)

{

    DeviceState *diag288 = opaque;



    wdt_diag288_reset(diag288);

}



static void diag288_timer_expired(void *dev)

{

    qemu_log_mask(CPU_LOG_RESET, "Watchdog timer expired.\n");
@@ -80,6 +87,7 @@ static void wdt_diag288_realize(DeviceState *dev, Error **errp) 
{

    DIAG288State *diag288 = DIAG288(dev);



    qemu_register_reset(diag288_reset, diag288);

    diag288->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, diag288_timer_expired,

                                  dev);

}