if (cpu_list_data->model) {
Object *obj;
S390CPU *sc;
- obj = object_new(object_class_get_name(klass));
+ obj = object_new_with_class(klass);
sc = S390_CPU(obj);
if (sc->model) {
info->has_unavailable_features = true;
.list = NULL,
};
- list_data.model = get_max_cpu_model(errp);
- if (*errp) {
- error_free(*errp);
- *errp = NULL;
- }
+ list_data.model = get_max_cpu_model(NULL);
object_class_foreach(create_cpu_model_list, TYPE_S390_CPU, false,
&list_data);
static void cpu_model_from_info(S390CPUModel *model, const CpuModelInfo *info,
Error **errp)
{
+ Error *err = NULL;
const QDict *qdict = NULL;
const QDictEntry *e;
Visitor *visitor;
error_setg(errp, "The CPU definition '%s' requires KVM", info->name);
return;
}
- obj = object_new(object_class_get_name(oc));
+ obj = object_new_with_class(oc);
cpu = S390_CPU(obj);
if (!cpu->model) {
if (qdict) {
visitor = qobject_input_visitor_new(info->props);
- visit_start_struct(visitor, NULL, NULL, 0, errp);
- if (*errp) {
+ if (!visit_start_struct(visitor, NULL, NULL, 0, &err)) {
+ error_propagate(errp, err);
visit_free(visitor);
object_unref(obj);
return;
}
for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
- object_property_set(obj, visitor, e->key, errp);
- if (*errp) {
+ object_property_set(obj, e->key, visitor, &err);
+ if (err) {
break;
}
}
- if (!*errp) {
- visit_check_struct(visitor, errp);
+ if (!err) {
+ visit_check_struct(visitor, &err);
}
visit_end_struct(visitor, NULL);
visit_free(visitor);
- if (*errp) {
+ if (err) {
+ error_propagate(errp, err);
object_unref(obj);
return;
}
CpuModelInfo *model,
Error **errp)
{
+ Error *err = NULL;
CpuModelExpansionInfo *expansion_info = NULL;
S390CPUModel s390_model;
bool delta_changes = false;
/* convert it to our internal representation */
- cpu_model_from_info(&s390_model, model, errp);
- if (*errp) {
+ cpu_model_from_info(&s390_model, model, &err);
+ if (err) {
+ error_propagate(errp, err);
return NULL;
}
CpuModelInfo *infob,
Error **errp)
{
+ Error *err = NULL;
CpuModelCompareResult feat_result, gen_result;
CpuModelCompareInfo *compare_info;
S390FeatBitmap missing, added;
S390CPUModel modela, modelb;
/* convert both models to our internal representation */
- cpu_model_from_info(&modela, infoa, errp);
- if (*errp) {
+ cpu_model_from_info(&modela, infoa, &err);
+ if (err) {
+ error_propagate(errp, err);
return NULL;
}
- cpu_model_from_info(&modelb, infob, errp);
- if (*errp) {
+ cpu_model_from_info(&modelb, infob, &err);
+ if (err) {
+ error_propagate(errp, err);
return NULL;
}
compare_info = g_new0(CpuModelCompareInfo, 1);
CpuModelInfo *infob,
Error **errp)
{
+ Error *err = NULL;
CpuModelBaselineInfo *baseline_info;
S390CPUModel modela, modelb, model;
uint16_t cpu_type;
uint8_t max_gen;
/* convert both models to our internal representation */
- cpu_model_from_info(&modela, infoa, errp);
- if (*errp) {
+ cpu_model_from_info(&modela, infoa, &err);
+ if (err) {
+ error_propagate(errp, err);
return NULL;
}
- cpu_model_from_info(&modelb, infob, errp);
- if (*errp) {
+ cpu_model_from_info(&modelb, infob, &err);
+ if (err) {
+ error_propagate(errp, err);
return NULL;
}
static S390CPUModel *get_max_cpu_model(Error **errp)
{
+ Error *err = NULL;
static S390CPUModel max_model;
static bool cached;
}
if (kvm_enabled()) {
- kvm_s390_get_host_cpu_model(&max_model, errp);
+ kvm_s390_get_host_cpu_model(&max_model, &err);
} else {
max_model.def = s390_find_cpu_def(QEMU_MAX_CPU_TYPE, QEMU_MAX_CPU_GEN,
QEMU_MAX_CPU_EC_GA, NULL);
bitmap_copy(max_model.features, qemu_max_cpu_feat, S390_FEAT_MAX);
- }
- if (!*errp) {
- cached = true;
- return &max_model;
}
- return NULL;
+ if (err) {
+ error_propagate(errp, err);
+ return NULL;
+ }
+ cached = true;
+ return &max_model;
}
static inline void apply_cpu_model(const S390CPUModel *model, Error **errp)
{
#ifndef CONFIG_USER_ONLY
+ Error *err = NULL;
static S390CPUModel applied_model;
static bool applied;
}
if (kvm_enabled()) {
- kvm_s390_apply_cpu_model(model, errp);
+ kvm_s390_apply_cpu_model(model, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
}
- if (!*errp) {
- applied = true;
- if (model) {
- applied_model = *model;
- }
+ applied = true;
+ if (model) {
+ applied_model = *model;
}
#endif
}
void s390_realize_cpu_model(CPUState *cs, Error **errp)
{
+ Error *err = NULL;
S390CPUClass *xcc = S390_CPU_GET_CLASS(cs);
S390CPU *cpu = S390_CPU(cs);
const S390CPUModel *max_model;
}
max_model = get_max_cpu_model(errp);
- if (*errp) {
+ if (!max_model) {
error_prepend(errp, "CPU models are not available: ");
return;
}
cpu->model->cpu_ver = max_model->cpu_ver;
check_consistency(cpu->model);
- check_compatibility(max_model, cpu->model, errp);
- if (*errp) {
+ check_compatibility(max_model, cpu->model, &err);
+ if (err) {
+ error_propagate(errp, err);
return;
}
static void set_feature(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
+ Error *err = NULL;
S390Feat feat = (S390Feat) opaque;
DeviceState *dev = DEVICE(obj);
S390CPU *cpu = S390_CPU(obj);
return;
}
- visit_type_bool(v, name, &value, errp);
- if (*errp) {
+ if (!visit_type_bool(v, name, &value, &err)) {
+ error_propagate(errp, err);
return;
}
if (value) {
static void set_feature_group(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
+ Error *err = NULL;
S390FeatGroup group = (S390FeatGroup) opaque;
const S390FeatGroupDef *def = s390_feat_group_def(group);
DeviceState *dev = DEVICE(obj);
return;
}
- visit_type_bool(v, name, &value, errp);
- if (*errp) {
+ if (!visit_type_bool(v, name, &value, &err)) {
+ error_propagate(errp, err);
return;
}
if (value) {
for (feat = 0; feat < S390_FEAT_MAX; feat++) {
const S390FeatDef *def = s390_feat_def(feat);
object_property_add(obj, def->name, "bool", get_feature,
- set_feature, NULL, (void *) feat, NULL);
- object_property_set_description(obj, def->name, def->desc , NULL);
+ set_feature, NULL, (void *) feat);
+ object_property_set_description(obj, def->name, def->desc);
}
for (group = 0; group < S390_FEAT_GROUP_MAX; group++) {
const S390FeatGroupDef *def = s390_feat_group_def(group);
object_property_add(obj, def->name, "bool", get_feature_group,
- set_feature_group, NULL, (void *) group, NULL);
- object_property_set_description(obj, def->name, def->desc , NULL);
+ set_feature_group, NULL, (void *) group);
+ object_property_set_description(obj, def->name, def->desc);
}
}
void s390_cpu_model_class_register_props(ObjectClass *oc)
{
object_class_property_add_bool(oc, "migration-safe", get_is_migration_safe,
- NULL, NULL);
+ NULL);
object_class_property_add_bool(oc, "static", get_is_static,
- NULL, NULL);
- object_class_property_add_str(oc, "description", get_description, NULL,
- NULL);
+ NULL);
+ object_class_property_add_str(oc, "description", get_description, NULL);
}
#ifdef CONFIG_KVM