@@ -1239,6 +1239,8 @@ static void machine_initfn(Object *obj)
ms->smp_cache.props[i].topology = CPU_TOPOLOGY_LEVEL_DEFAULT;
}
+ ms->topo = NULL;
+
machine_copy_boot_config(ms, &(BootConfiguration){ 0 });
}
@@ -138,3 +138,37 @@ static void cpu_slot_register_types(void)
}
type_init(cpu_slot_register_types)
+
+void machine_plug_cpu_slot(MachineState *ms)
+{
+ MachineClass *mc = MACHINE_GET_CLASS(ms);
+ CPUSlot *slot;
+
+ slot = CPU_SLOT(qdev_new(TYPE_CPU_SLOT));
+ set_bit(CPU_TOPOLOGY_LEVEL_THREAD, slot->supported_levels);
+ set_bit(CPU_TOPOLOGY_LEVEL_CORE, slot->supported_levels);
+ set_bit(CPU_TOPOLOGY_LEVEL_SOCKET, slot->supported_levels);
+
+ /*
+ * Now just consider the levels that x86 supports.
+ * TODO: Supports other levels.
+ */
+ if (mc->smp_props.modules_supported) {
+ set_bit(CPU_TOPOLOGY_LEVEL_MODULE, slot->supported_levels);
+ }
+
+ if (mc->smp_props.dies_supported) {
+ set_bit(CPU_TOPOLOGY_LEVEL_DIE, slot->supported_levels);
+ }
+
+ ms->topo = slot;
+ object_property_add_child(container_get(OBJECT(ms), "/peripheral"),
+ "cpu-slot", OBJECT(ms->topo));
+ DEVICE(ms->topo)->id = g_strdup_printf("%s", "cpu-slot");
+
+ sysbus_realize(SYS_BUS_DEVICE(slot), &error_abort);
+
+ if (mc->get_hotplug_handler) {
+ qbus_set_hotplug_handler(BUS(&slot->bus), OBJECT(ms));
+ }
+}
@@ -10,6 +10,7 @@
#include "qemu/module.h"
#include "qom/object.h"
#include "hw/core/cpu.h"
+#include "hw/cpu/cpu-slot.h"
#define TYPE_MACHINE_SUFFIX "-machine"
@@ -152,6 +153,8 @@ typedef struct {
* @modules_supported - whether modules are supported by the machine
* @cache_supported - whether cache topologies (l1d, l1i, l2 and l3) are
* supported by the machine
+ * @topo_tree_supported - whether QOM topology tree is supported by the
+ * machine
*/
typedef struct {
bool prefer_sockets;
@@ -162,6 +165,7 @@ typedef struct {
bool drawers_supported;
bool modules_supported;
bool cache_supported[CACHE_LEVEL_AND_TYPE__MAX];
+ bool topo_tree_supported;
} SMPCompatProps;
/**
@@ -431,6 +435,11 @@ struct MachineState {
CPUArchIdList *possible_cpus;
CpuTopology smp;
SmpCache smp_cache;
+ /*
+ * TODO: get rid of "smp" and merge it into "topo" when all arches
+ * support QOM topology.
+ */
+ CPUSlot *topo;
struct NVDIMMState *nvdimms_state;
struct NumaState *numa_state;
};
@@ -69,4 +69,6 @@ struct CPUSlot {
DeviceListener listener;
};
+void machine_plug_cpu_slot(MachineState *ms);
+
#endif /* CPU_SLOT_H */
@@ -2151,6 +2151,10 @@ static void qemu_create_machine(QDict *qdict)
false, &error_abort);
qobject_unref(default_opts);
}
+
+ if (machine_class->smp_props.topo_tree_supported) {
+ machine_plug_cpu_slot(current_machine);
+ }
}
static int global_init_func(void *opaque, QemuOpts *opts, Error **errp)
With CPU slot support, the machine can manage the CPU topology tree. To enable hot-plug support for topology devices, use the machine as the hotplug handler for the CPU bus. Additionally, since not all machines support the topology tree from the start, add a "topo_tree_supported" flag to indicate whether a machine supports the topology tree. And create the CPU slot as the topology root only for machines that support it. Signed-off-by: Zhao Liu <zhao1.liu@intel.com> --- hw/core/machine.c | 2 ++ hw/cpu/cpu-slot.c | 34 ++++++++++++++++++++++++++++++++++ include/hw/boards.h | 9 +++++++++ include/hw/cpu/cpu-slot.h | 2 ++ system/vl.c | 4 ++++ 5 files changed, 51 insertions(+)