[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/18] cpu: Abstract CPU core type
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 07/18] cpu: Abstract CPU core type |
Date: |
Fri, 17 Jun 2016 16:36:28 +1000 |
From: Bharata B Rao <address@hidden>
Add an abstract CPU core type that could be used by machines that want
to define and hotplug CPUs in core granularity.
Signed-off-by: Bharata B Rao <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
[Integer core property]
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
[dwg: changed property names to 'core-id' and 'nr-threads']
Signed-off-by: David Gibson <address@hidden>
---
hw/cpu/Makefile.objs | 1 +
hw/cpu/core.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++
include/hw/cpu/core.h | 31 ++++++++++++++++++
3 files changed, 120 insertions(+)
create mode 100644 hw/cpu/core.c
create mode 100644 include/hw/cpu/core.h
diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs
index 0954a18..942a4bb 100644
--- a/hw/cpu/Makefile.objs
+++ b/hw/cpu/Makefile.objs
@@ -2,4 +2,5 @@ obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o
obj-$(CONFIG_REALVIEW) += realview_mpcore.o
obj-$(CONFIG_A9MPCORE) += a9mpcore.o
obj-$(CONFIG_A15MPCORE) += a15mpcore.o
+obj-y += core.o
diff --git a/hw/cpu/core.c b/hw/cpu/core.c
new file mode 100644
index 0000000..eff90c1
--- /dev/null
+++ b/hw/cpu/core.c
@@ -0,0 +1,88 @@
+/*
+ * CPU core abstract device
+ *
+ * Copyright (C) 2016 Bharata B Rao <address@hidden>
+ *
+ * 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 "hw/cpu/core.h"
+#include "qapi/visitor.h"
+#include "qapi/error.h"
+#include "sysemu/cpus.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;
+ }
+
+ 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)
+{
+ CPUCore *core = CPU_CORE(obj);
+
+ object_property_add(obj, "core-id", "int", core_prop_get_core_id,
+ core_prop_set_core_id, NULL, NULL, NULL);
+ object_property_add(obj, "nr-threads", "int", core_prop_get_nr_threads,
+ core_prop_set_nr_threads, NULL, NULL, NULL);
+ core->nr_threads = smp_threads;
+}
+
+static const TypeInfo cpu_core_type_info = {
+ .name = TYPE_CPU_CORE,
+ .parent = TYPE_DEVICE,
+ .abstract = true,
+ .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)
diff --git a/include/hw/cpu/core.h b/include/hw/cpu/core.h
new file mode 100644
index 0000000..4540a7d
--- /dev/null
+++ b/include/hw/cpu/core.h
@@ -0,0 +1,31 @@
+/*
+ * CPU core abstract device
+ *
+ * Copyright (C) 2016 Bharata B Rao <address@hidden>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#ifndef HW_CPU_CORE_H
+#define HW_CPU_CORE_H
+
+#include "qemu/osdep.h"
+#include "hw/qdev.h"
+
+#define TYPE_CPU_CORE "cpu-core"
+
+#define CPU_CORE(obj) \
+ OBJECT_CHECK(CPUCore, (obj), TYPE_CPU_CORE)
+
+typedef struct CPUCore {
+ /*< private >*/
+ DeviceState parent_obj;
+
+ /*< public >*/
+ int core_id;
+ int nr_threads;
+} CPUCore;
+
+#define CPU_CORE_PROP_CORE_ID "core-id"
+
+#endif
--
2.5.5
- [Qemu-devel] [PULL 00/18] ppc-for-2.7 queue 20160617, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 06/18] qdev: hotplug: Introduce HotplugHandler.pre_plug() callback, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 12/18] spapr: Move spapr_cpu_init() to spapr_cpu_core.c, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 05/18] target-ppc: Fix rlwimi, rlwinm, rlwnm, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 01/18] hw/ppc/spapr: Silence deprecation message in qtest mode, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 02/18] ppc / sparc: Add a tester for checking whether OpenBIOS runs successfully, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 04/18] vfio: Fix broken EEH, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 08/18] xics, xics_kvm: Handle CPU unplug correctly, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 07/18] cpu: Abstract CPU core type,
David Gibson <=
- [Qemu-devel] [PULL 15/18] spapr: CPU hot unplug support, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 11/18] spapr: Abstract CPU core device and type specific core devices, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 10/18] qom: API to get instance_size of a type, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 16/18] QMP: Add query-hotpluggable-cpus, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 09/18] spapr_drc: Prevent detach racing against attach for CPU DR, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 14/18] spapr: CPU hotplug support, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 18/18] spapr: implement query-hotpluggable-cpus callback, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 13/18] spapr: convert boot CPUs into CPU core devices, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 03/18] target-ppc: Bug in BookE wait instruction, David Gibson, 2016/06/17
- [Qemu-devel] [PULL 17/18] hmp: Add 'info hotpluggable-cpus' HMP command, David Gibson, 2016/06/17