> > diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c > > index a63d990e4e8e..1a1c09612271 100644 > > --- a/target/s390x/cpu_models.c > > +++ b/target/s390x/cpu_models.c > > @@ -503,6 +503,7 @@ static void error_prepend_missing_feat(const char > > *name, void *opaque) > > static void check_compatibility(const S390CPUModel *max_model, > > const S390CPUModel *model, Error **errp) > > { > > + ERRP_GUARD(); > > S390FeatBitmap missing; > > if (model->def->gen > max_model->def->gen) { > > @@ -566,6 +567,7 @@ S390CPUModel *get_max_cpu_model(Error **errp) > > void s390_realize_cpu_model(CPUState *cs, Error **errp) > > { > > + ERRP_GUARD(); > > Error *err = NULL; > > I think that function could use an additional clean-up now: Remove the local > "err" variable and use "errp" only instead. >
Thanks! It's cleaner. Will do this. Regards, Zhao