On Fri, 23 Feb 2018 15:27:02 +0100
Christian Borntraeger <borntrae...@de.ibm.com> wrote:
[...]
> > +/* copy up to dst_len bytes and fill the rest of dst with zeroes
> > */
>
> you just moved this function but shouldnt it be
>
> src_len bytes and fill will zeroes until dst_len?
true, will fix
[...]
> > @@ -356,6 +369,34 @@ static void command_handler(SCLPEventFacility
> > *ef, SCCB *sccb, uint64_t code) }
> > }
> >
> > +static bool vmstate_event_facility_mask_length_needed(void *opaque)
> > +{
> > + SCLPEventFacility *ef = opaque;
> > +
> > + return ef->allow_all_mask_sizes;
> > +}
> > +
> > +static int vmstate_event_facility_mask_length_pre_load(void
> > *opaque) +{
> > + SCLPEventFacility *ef = opaque;
> > +
> > + ef->allow_all_mask_sizes = false;
> > + return 0;
> > +}
>
> why do we need this? Shouldnt the value be set solely by the machine
> version?
will fix
> > +
> > +static const VMStateDescription vmstate_event_facility_mask_length
> > = {
> > + .name = "vmstate-event-facility/mask_length",
> > + .version_id = 0,
> > + .minimum_version_id = 0,
> > + .needed = vmstate_event_facility_mask_length_needed,
> > + .pre_load = vmstate_event_facility_mask_length_pre_load,
> > + .fields = (VMStateField[]) {
> > + VMSTATE_BOOL(allow_all_mask_sizes, SCLPEventFacility),
>
> same here. Do we really need to migrate "allow_all_mask_sizes" ?
> Shouldnt that only depend on machine <= 2.11?
will fix
> > + VMSTATE_UINT16(mask_length, SCLPEventFacility),
> > + VMSTATE_END_OF_LIST()
> > + }
> > +};
> > +
> > static const VMStateDescription vmstate_event_facility = {
> > .name = "vmstate-event-facility",
> > .version_id = 0,
> > @@ -363,15 +404,39 @@ static const VMStateDescription
> > vmstate_event_facility = { .fields = (VMStateField[]) {
> > VMSTATE_UINT32(receive_mask, SCLPEventFacility),
> > VMSTATE_END_OF_LIST()
> > + },
> > + .subsections = (const VMStateDescription * []) {
> > + &vmstate_event_facility_mask_length,
> > + NULL
> > }
> > };
> >
> > +static void sclp_event_set_allow_all_mask_sizes(Object *obj, bool
> > value,
> > + Error
> > **errp) +{
> > + SCLPEventFacility *ef = (SCLPEventFacility *)obj;
> > +
> > + ef->allow_all_mask_sizes = value;
> > +}
> > +
> > +static bool sclp_event_get_allow_all_mask_sizes(Object *obj, Error
> > **e) +{
> > + SCLPEventFacility *ef = (SCLPEventFacility *)obj;
> > +
> > + return ef->allow_all_mask_sizes;
> > +}
> > +
> > static void init_event_facility(Object *obj)
> > {
> > SCLPEventFacility *event_facility = EVENT_FACILITY(obj);
> > DeviceState *sdev = DEVICE(obj);
> > Object *new;
> >
> > + event_facility->mask_length = 4;
> > + event_facility->allow_all_mask_sizes = true;
> > + object_property_add_bool(obj, "allow_all_mask_sizes",
> > + sclp_event_get_allow_all_mask_sizes,
> > + sclp_event_set_allow_all_mask_sizes,
> > NULL); /* Spawn a new bus for SCLP events */
> > qbus_create_inplace(&event_facility->sbus,
> > sizeof(event_facility->sbus), TYPE_SCLP_EVENTS_BUS, sdev, NULL);
> > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> > index 8b3053f..e9309fd 100644
> > --- a/hw/s390x/s390-virtio-ccw.c
> > +++ b/hw/s390x/s390-virtio-ccw.c
> > @@ -29,6 +29,7 @@
> > #include "s390-pci-bus.h"
> > #include "hw/s390x/storage-keys.h"
> > #include "hw/s390x/storage-attributes.h"
> > +#include "hw/s390x/event-facility.h"
> > #include "hw/compat.h"
> > #include "ipl.h"
> > #include "hw/s390x/s390-virtio-ccw.h"
> > @@ -671,7 +672,12 @@ bool css_migration_enabled(void)
> > type_init(ccw_machine_register_##suffix)
> >
> > #define CCW_COMPAT_2_11 \
> > - HW_COMPAT_2_11
> > + HW_COMPAT_2_11 \
> > + {\
> > + .driver = TYPE_SCLP_EVENT_FACILITY,\
> > + .property = "allow_all_mask_sizes",\
> > + .value = "off",\
> > + },
> >
> > #define CCW_COMPAT_2_10 \
> > HW_COMPAT_2_10
> >
>
> Otherwise looks good.
