| Message ID | 20191205174635.18758-15-vsementsov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | error: prepare for auto propagated local_err | expand |
On 12/5/19 6:46 PM, Vladimir Sementsov-Ogievskiy wrote: > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > Reviewed-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/s390x/event-facility.c | 2 +- > hw/s390x/s390-stattrib.c | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c > index 66205697ae..dc733ee2af 100644 > --- a/hw/s390x/event-facility.c > +++ b/hw/s390x/event-facility.c > @@ -439,7 +439,7 @@ static void sclp_event_set_allow_all_mask_sizes(Object *obj, bool value, > ef->allow_all_mask_sizes = value; > } > > -static bool sclp_event_get_allow_all_mask_sizes(Object *obj, Error **e) > +static bool sclp_event_get_allow_all_mask_sizes(Object *obj, Error **errp) > { > SCLPEventFacility *ef = (SCLPEventFacility *)obj; > > diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c > index bf5ac014c4..58121b9f68 100644 > --- a/hw/s390x/s390-stattrib.c > +++ b/hw/s390x/s390-stattrib.c > @@ -352,7 +352,8 @@ static void s390_stattrib_class_init(ObjectClass *oc, void *data) > dc->realize = s390_stattrib_realize; > } > > -static inline bool s390_stattrib_get_migration_enabled(Object *obj, Error **e) > +static inline bool s390_stattrib_get_migration_enabled(Object *obj, > + Error **errp) > { > S390StAttribState *s = S390_STATTRIB(obj); > >
On 05.12.19 18:46, Vladimir Sementsov-Ogievskiy wrote: > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > Reviewed-by: Cornelia Huck <cohuck@redhat.com> > --- > hw/s390x/event-facility.c | 2 +- > hw/s390x/s390-stattrib.c | 3 ++- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c > index 66205697ae..dc733ee2af 100644 > --- a/hw/s390x/event-facility.c > +++ b/hw/s390x/event-facility.c > @@ -439,7 +439,7 @@ static void sclp_event_set_allow_all_mask_sizes(Object *obj, bool value, > ef->allow_all_mask_sizes = value; > } > > -static bool sclp_event_get_allow_all_mask_sizes(Object *obj, Error **e) > +static bool sclp_event_get_allow_all_mask_sizes(Object *obj, Error **errp) > { > SCLPEventFacility *ef = (SCLPEventFacility *)obj; > > diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c > index bf5ac014c4..58121b9f68 100644 > --- a/hw/s390x/s390-stattrib.c > +++ b/hw/s390x/s390-stattrib.c > @@ -352,7 +352,8 @@ static void s390_stattrib_class_init(ObjectClass *oc, void *data) > dc->realize = s390_stattrib_realize; > } > > -static inline bool s390_stattrib_get_migration_enabled(Object *obj, Error **e) > +static inline bool s390_stattrib_get_migration_enabled(Object *obj, > + Error **errp) > { > S390StAttribState *s = S390_STATTRIB(obj); > > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 66205697ae..dc733ee2af 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -439,7 +439,7 @@ static void sclp_event_set_allow_all_mask_sizes(Object *obj, bool value, ef->allow_all_mask_sizes = value; } -static bool sclp_event_get_allow_all_mask_sizes(Object *obj, Error **e) +static bool sclp_event_get_allow_all_mask_sizes(Object *obj, Error **errp) { SCLPEventFacility *ef = (SCLPEventFacility *)obj; diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index bf5ac014c4..58121b9f68 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -352,7 +352,8 @@ static void s390_stattrib_class_init(ObjectClass *oc, void *data) dc->realize = s390_stattrib_realize; } -static inline bool s390_stattrib_get_migration_enabled(Object *obj, Error **e) +static inline bool s390_stattrib_get_migration_enabled(Object *obj, + Error **errp) { S390StAttribState *s = S390_STATTRIB(obj);