d2623129a7
The only way object_property_add() can fail is when a property with the same name already exists. Since our property names are all hardcoded, failure is a programming error, and the appropriate way to handle it is passing &error_abort. Same for its variants, except for object_property_add_child(), which additionally fails when the child already has a parent. Parentage is also under program control, so this is a programming error, too. We have a bit over 500 callers. Almost half of them pass &error_abort, slightly fewer ignore errors, one test case handles errors, and the remaining few callers pass them to their own callers. The previous few commits demonstrated once again that ignoring programming errors is a bad idea. Of the few ones that pass on errors, several violate the Error API. The Error ** argument must be NULL, &error_abort, &error_fatal, or a pointer to a variable containing NULL. Passing an argument of the latter kind twice without clearing it in between is wrong: if the first call sets an error, it no longer points to NULL for the second call. ich9_pm_add_properties(), sparc32_ledma_realize(), sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize() are wrong that way. When the one appropriate choice of argument is &error_abort, letting users pick the argument is a bad idea. Drop parameter @errp and assert the preconditions instead. There's one exception to "duplicate property name is a programming error": the way object_property_add() implements the magic (and undocumented) "automatic arrayification". Don't drop @errp there. Instead, rename object_property_add() to object_property_try_add(), and add the obvious wrapper object_property_add(). Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20200505152926.18877-15-armbru@redhat.com> [Two semantic rebase conflicts resolved]
107 lines
2.7 KiB
C
107 lines
2.7 KiB
C
/*
|
|
* CPU core abstract device
|
|
*
|
|
* Copyright (C) 2016 Bharata B Rao <bharata@linux.vnet.ibm.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/cpu/core.h"
|
|
#include "qapi/visitor.h"
|
|
#include "qemu/module.h"
|
|
#include "qapi/error.h"
|
|
#include "sysemu/cpus.h"
|
|
#include "hw/boards.h"
|
|
|
|
static void core_prop_get_core_id(Object *obj, Visitor *v, const char *name,
|
|
void *opaque, Error **errp)
|
|
{
|
|
CPUCore *core = CPU_CORE(obj);
|
|
int64_t value = core->core_id;
|
|
|
|
visit_type_int(v, name, &value, errp);
|
|
}
|
|
|
|
static void core_prop_set_core_id(Object *obj, Visitor *v, const char *name,
|
|
void *opaque, Error **errp)
|
|
{
|
|
CPUCore *core = CPU_CORE(obj);
|
|
Error *local_err = NULL;
|
|
int64_t value;
|
|
|
|
visit_type_int(v, name, &value, &local_err);
|
|
if (local_err) {
|
|
error_propagate(errp, local_err);
|
|
return;
|
|
}
|
|
|
|
if (value < 0) {
|
|
error_setg(errp, "Invalid core id %"PRId64, value);
|
|
return;
|
|
}
|
|
|
|
core->core_id = value;
|
|
}
|
|
|
|
static void core_prop_get_nr_threads(Object *obj, Visitor *v, const char *name,
|
|
void *opaque, Error **errp)
|
|
{
|
|
CPUCore *core = CPU_CORE(obj);
|
|
int64_t value = core->nr_threads;
|
|
|
|
visit_type_int(v, name, &value, errp);
|
|
}
|
|
|
|
static void core_prop_set_nr_threads(Object *obj, Visitor *v, const char *name,
|
|
void *opaque, Error **errp)
|
|
{
|
|
CPUCore *core = CPU_CORE(obj);
|
|
Error *local_err = NULL;
|
|
int64_t value;
|
|
|
|
visit_type_int(v, name, &value, &local_err);
|
|
if (local_err) {
|
|
error_propagate(errp, local_err);
|
|
return;
|
|
}
|
|
|
|
core->nr_threads = value;
|
|
}
|
|
|
|
static void cpu_core_instance_init(Object *obj)
|
|
{
|
|
MachineState *ms = MACHINE(qdev_get_machine());
|
|
CPUCore *core = CPU_CORE(obj);
|
|
|
|
object_property_add(obj, "core-id", "int", core_prop_get_core_id,
|
|
core_prop_set_core_id, NULL, NULL);
|
|
object_property_add(obj, "nr-threads", "int", core_prop_get_nr_threads,
|
|
core_prop_set_nr_threads, NULL, NULL);
|
|
core->nr_threads = ms->smp.threads;
|
|
}
|
|
|
|
static void cpu_core_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
set_bit(DEVICE_CATEGORY_CPU, dc->categories);
|
|
}
|
|
|
|
static const TypeInfo cpu_core_type_info = {
|
|
.name = TYPE_CPU_CORE,
|
|
.parent = TYPE_DEVICE,
|
|
.abstract = true,
|
|
.class_init = cpu_core_class_init,
|
|
.instance_size = sizeof(CPUCore),
|
|
.instance_init = cpu_core_instance_init,
|
|
};
|
|
|
|
static void cpu_core_register_types(void)
|
|
{
|
|
type_register_static(&cpu_core_type_info);
|
|
}
|
|
|
|
type_init(cpu_core_register_types)
|