Commit 8046f374 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/tod: factor out TOD into separate device 



Let's treat this like a separate device. TCG will have to store the
actual state/time later on.

Include cpu-qom.h in kvm_s390x.h (due to S390CPU) to compile tod-kvm.c.

Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20180627134410.4901-4-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 4ab6a1fe

hw/s390x/Makefile.objs

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ obj-$(CONFIG_PCI) += s390-pci-bus.o s390-pci-inst.o 
obj-$(call lnot,$(CONFIG_PCI)) += s390-pci-stub.o

obj-y += s390-skeys.o

obj-y += s390-stattrib.o

obj-y += tod.o

obj-$(CONFIG_KVM) += tod-kvm.o

obj-$(CONFIG_TCG) += tod-qemu.o

obj-$(CONFIG_KVM) += s390-skeys-kvm.o

obj-$(CONFIG_KVM) += s390-stattrib-kvm.o

obj-y += s390-ccw.o

hw/s390x/s390-virtio-ccw.c

+3 −54
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "migration/register.h"

#include "cpu_models.h"

#include "hw/nmi.h"

#include "hw/s390x/tod.h"



S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)

{
@@ -187,58 +188,6 @@ static void s390_memory_init(ram_addr_t mem_size) 
    s390_stattrib_init();

}



#define S390_TOD_CLOCK_VALUE_MISSING    0x00

#define S390_TOD_CLOCK_VALUE_PRESENT    0x01



static void gtod_save(QEMUFile *f, void *opaque)

{

    uint64_t tod_low;

    uint8_t tod_high;

    int r;



    r = s390_get_clock(&tod_high, &tod_low);

    if (r) {

        warn_report("Unable to get guest clock for migration: %s",

                    strerror(-r));

        error_printf("Guest clock will not be migrated "

                     "which could cause the guest to hang.");

        qemu_put_byte(f, S390_TOD_CLOCK_VALUE_MISSING);

        return;

    }



    qemu_put_byte(f, S390_TOD_CLOCK_VALUE_PRESENT);

    qemu_put_byte(f, tod_high);

    qemu_put_be64(f, tod_low);

}



static int gtod_load(QEMUFile *f, void *opaque, int version_id)

{

    uint64_t tod_low;

    uint8_t tod_high;

    int r;



    if (qemu_get_byte(f) == S390_TOD_CLOCK_VALUE_MISSING) {

        warn_report("Guest clock was not migrated. This could "

                    "cause the guest to hang.");

        return 0;

    }



    tod_high = qemu_get_byte(f);

    tod_low = qemu_get_be64(f);



    r = s390_set_clock(&tod_high, &tod_low);

    if (r) {

        error_report("Unable to set KVM guest TOD clock: %s", strerror(-r));

    }



    return r;

}



static SaveVMHandlers savevm_gtod = {

    .save_state = gtod_save,

    .load_state = gtod_load,

};



static void s390_init_ipl_dev(const char *kernel_filename,

                              const char *kernel_cmdline,

                              const char *initrd_filename, const char *firmware,
@@ -363,8 +312,8 @@ static void ccw_init(MachineState *machine) 
        s390_create_sclpconsole("sclplmconsole", serial_hd(1));

    }



    /* Register savevm handler for guest TOD clock */

    register_savevm_live(NULL, "todclock", 0, 1, &savevm_gtod, NULL);

    /* init the TOD clock */

    s390_init_tod();

}



static void s390_cpu_plug(HotplugHandler *hotplug_dev,

hw/s390x/tod-kvm.c

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 * TOD (Time Of Day) clock - KVM implementation

 *

 * Copyright 2018 Red Hat, Inc.

 * Author(s): David Hildenbrand <david@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/s390x/tod.h"

#include "kvm_s390x.h"



static void kvm_s390_tod_get(const S390TODState *td, S390TOD *tod, Error **errp)

{

    int r;



    r = kvm_s390_get_clock_ext(&tod->high, &tod->low);

    if (r == -ENXIO) {

        r = kvm_s390_get_clock(&tod->high, &tod->low);

    }

    if (r) {

        error_setg(errp, "Unable to get KVM guest TOD clock: %s",

                   strerror(-r));

    }

}



static void kvm_s390_tod_set(S390TODState *td, const S390TOD *tod, Error **errp)

{

    int r;



    r = kvm_s390_set_clock_ext(tod->high, tod->low);

    if (r == -ENXIO) {

        r = kvm_s390_set_clock(tod->high, tod->low);

    }

    if (r) {

        error_setg(errp, "Unable to set KVM guest TOD clock: %s",

                   strerror(-r));

    }

}



static void kvm_s390_tod_class_init(ObjectClass *oc, void *data)

{

    S390TODClass *tdc = S390_TOD_CLASS(oc);



    tdc->get = kvm_s390_tod_get;

    tdc->set = kvm_s390_tod_set;

}



static TypeInfo kvm_s390_tod_info = {

    .name = TYPE_KVM_S390_TOD,

    .parent = TYPE_S390_TOD,

    .instance_size = sizeof(S390TODState),

    .class_init = kvm_s390_tod_class_init,

    .class_size = sizeof(S390TODClass),

};



static void register_types(void)

{

    type_register_static(&kvm_s390_tod_info);

}

type_init(register_types);

hw/s390x/tod-qemu.c

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * TOD (Time Of Day) clock - QEMU implementation

 *

 * Copyright 2018 Red Hat, Inc.

 * Author(s): David Hildenbrand <david@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/s390x/tod.h"



static void qemu_s390_tod_get(const S390TODState *td, S390TOD *tod,

                              Error **errp)

{

    /* FIXME */

    tod->high = 0;

    tod->low = 0;

}



static void qemu_s390_tod_set(S390TODState *td, const S390TOD *tod,

                              Error **errp)

{

    /* FIXME */

}



static void qemu_s390_tod_class_init(ObjectClass *oc, void *data)

{

    S390TODClass *tdc = S390_TOD_CLASS(oc);



    tdc->get = qemu_s390_tod_get;

    tdc->set = qemu_s390_tod_set;

}



static TypeInfo qemu_s390_tod_info = {

    .name = TYPE_QEMU_S390_TOD,

    .parent = TYPE_S390_TOD,

    .instance_size = sizeof(S390TODState),

    .class_init = qemu_s390_tod_class_init,

    .class_size = sizeof(S390TODClass),

};



static void register_types(void)

{

    type_register_static(&qemu_s390_tod_info);

}

type_init(register_types);

hw/s390x/tod.c

0 → 100644
+119 −0
Original line number Diff line number Diff line 
/*

 * TOD (Time Of Day) clock

 *

 * Copyright 2018 Red Hat, Inc.

 * Author(s): David Hildenbrand <david@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include "hw/s390x/tod.h"

#include "qapi/error.h"

#include "qemu/error-report.h"

#include "sysemu/kvm.h"

#include "migration/register.h"



void s390_init_tod(void)

{

    Object *obj;



    if (kvm_enabled()) {

        obj = object_new(TYPE_KVM_S390_TOD);

    } else {

        obj = object_new(TYPE_QEMU_S390_TOD);

    }

    object_property_add_child(qdev_get_machine(), TYPE_S390_TOD, obj, NULL);

    object_unref(obj);



    qdev_init_nofail(DEVICE(obj));

}



#define S390_TOD_CLOCK_VALUE_MISSING    0x00

#define S390_TOD_CLOCK_VALUE_PRESENT    0x01



static void s390_tod_save(QEMUFile *f, void *opaque)

{

    S390TODState *td = opaque;

    S390TODClass *tdc = S390_TOD_GET_CLASS(td);

    Error *err = NULL;

    S390TOD tod;



    tdc->get(td, &tod, &err);

    if (err) {

        warn_report_err(err);

        error_printf("Guest clock will not be migrated "

                     "which could cause the guest to hang.");

        qemu_put_byte(f, S390_TOD_CLOCK_VALUE_MISSING);

        return;

    }



    qemu_put_byte(f, S390_TOD_CLOCK_VALUE_PRESENT);

    qemu_put_byte(f, tod.high);

    qemu_put_be64(f, tod.low);

}



static int s390_tod_load(QEMUFile *f, void *opaque, int version_id)

{

    S390TODState *td = opaque;

    S390TODClass *tdc = S390_TOD_GET_CLASS(td);

    Error *err = NULL;

    S390TOD tod;



    if (qemu_get_byte(f) == S390_TOD_CLOCK_VALUE_MISSING) {

        warn_report("Guest clock was not migrated. This could "

                    "cause the guest to hang.");

        return 0;

    }



    tod.high = qemu_get_byte(f);

    tod.low = qemu_get_be64(f);



    tdc->set(td, &tod, &err);

    if (err) {

        error_report_err(err);

        return -1;

    }

    return 0;

}



static SaveVMHandlers savevm_tod = {

    .save_state = s390_tod_save,

    .load_state = s390_tod_load,

};



static void s390_tod_realize(DeviceState *dev, Error **errp)

{

    S390TODState *td = S390_TOD(dev);



    /* Legacy migration interface */

    register_savevm_live(NULL, "todclock", 0, 1, &savevm_tod, td);

}



static void s390_tod_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->desc = "TOD (Time Of Day) Clock";

    dc->realize = s390_tod_realize;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);



    /* We only have one TOD clock in the system attached to the machine */

    dc->user_creatable = false;

}



static TypeInfo s390_tod_info = {

    .name = TYPE_S390_TOD,

    .parent = TYPE_DEVICE,

    .instance_size = sizeof(S390TODState),

    .class_init = s390_tod_class_init,

    .class_size = sizeof(S390TODClass),

    .abstract = true,

};



static void register_types(void)

{

    type_register_static(&s390_tod_info);

}

type_init(register_types);