[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/37] cpu: Add model resolution support to CPUClass
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 21/37] cpu: Add model resolution support to CPUClass |
Date: |
Mon, 28 Jan 2013 17:18:38 +0100 |
Introduce CPUClass::class_by_name and add a default implementation.
Hook up the alpha and ppc implementations.
Introduce a wrapper function cpu_class_by_name().
Signed-off-by: Andreas Färber <address@hidden>
---
include/qom/cpu.h | 15 +++++++++++++++
qom/cpu.c | 13 +++++++++++++
target-alpha/cpu.c | 8 ++++++++
target-ppc/translate_init.c | 2 ++
4 Dateien geändert, 38 Zeilen hinzugefügt(+)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 773caf9..8097692 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -40,6 +40,8 @@ typedef struct CPUState CPUState;
/**
* CPUClass:
+ * @class_by_name: Callback to map -cpu command line model name to an
+ * instantiatable CPU type.
* @reset: Callback to reset the #CPUState to its initial state.
*
* Represents a CPU family or model.
@@ -49,6 +51,8 @@ typedef struct CPUClass {
DeviceClass parent_class;
/*< public >*/
+ ObjectClass *(*class_by_name)(const char *cpu_model);
+
void (*reset)(CPUState *cpu);
} CPUClass;
@@ -108,6 +112,17 @@ struct CPUState {
void cpu_reset(CPUState *cpu);
/**
+ * cpu_class_by_name:
+ * @typename: The CPU base type.
+ * @cpu_model: The model string without any parameters.
+ *
+ * Looks up a CPU #ObjectClass matching name @cpu_model.
+ *
+ * Returns: A #CPUClass or %NULL if not matching class is found.
+ */
+ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model);
+
+/**
* qemu_cpu_has_work:
* @cpu: The vCPU to check.
*
diff --git a/qom/cpu.c b/qom/cpu.c
index 49e5134..8fb538b 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -34,11 +34,24 @@ static void cpu_common_reset(CPUState *cpu)
{
}
+ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model)
+{
+ CPUClass *cc = CPU_CLASS(object_class_by_name(typename));
+
+ return cc->class_by_name(cpu_model);
+}
+
+static ObjectClass *cpu_common_class_by_name(const char *cpu_model)
+{
+ return NULL;
+}
+
static void cpu_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
CPUClass *k = CPU_CLASS(klass);
+ k->class_by_name = cpu_common_class_by_name;
k->reset = cpu_common_reset;
dc->no_user = 1;
}
diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
index 40e9809..3ac0fde 100644
--- a/target-alpha/cpu.c
+++ b/target-alpha/cpu.c
@@ -244,6 +244,13 @@ static void alpha_cpu_initfn(Object *obj)
env->fen = 1;
}
+static void alpha_cpu_class_init(ObjectClass *oc, void *data)
+{
+ CPUClass *cc = CPU_CLASS(oc);
+
+ cc->class_by_name = alpha_cpu_class_by_name;
+}
+
static const TypeInfo alpha_cpu_type_info = {
.name = TYPE_ALPHA_CPU,
.parent = TYPE_CPU,
@@ -251,6 +258,7 @@ static const TypeInfo alpha_cpu_type_info = {
.instance_init = alpha_cpu_initfn,
.abstract = true,
.class_size = sizeof(AlphaCPUClass),
+ .class_init = alpha_cpu_class_init,
};
static void alpha_cpu_register_types(void)
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 4f767c9..e143af5 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -10578,6 +10578,8 @@ static void ppc_cpu_class_init(ObjectClass *oc, void
*data)
pcc->parent_reset = cc->reset;
cc->reset = ppc_cpu_reset;
+
+ cc->class_by_name = ppc_cpu_class_by_name;
}
static const TypeInfo ppc_cpu_type_info = {
--
1.7.10.4
- [Qemu-devel] [PATCH 04/37] target-i386: Don't set any KVM flag by default if KVM is disabled, (continued)
- [Qemu-devel] [PATCH 04/37] target-i386: Don't set any KVM flag by default if KVM is disabled, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 11/37] pc: Set fw_cfg data based on APIC ID calculation, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 05/37] pc: Reverse pc_init_pci() compatibility logic, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 09/37] fw_cfg: Remove FW_CFG_MAX_CPUS from fw_cfg_init(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 03/37] kvm: Add fake KVM_FEATURE_CLOCKSOURCE_STABLE_BIT for builds without KVM, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 10/37] cpus.h: Make constant smp_cores/smp_threads available on *-user, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 07/37] target-i386: kvm: Set vcpu_id to APIC ID instead of CPU index, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 08/37] target-i386: Introduce x86_cpu_apic_id_from_index() function, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 02/37] target-openrisc: Clean up triple QOM casts, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 18/37] target-i386: Remove vendor_override field from CPUX86State, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 21/37] cpu: Add model resolution support to CPUClass,
Andreas Färber <=
- [Qemu-devel] [PATCH 13/37] pc: Generate APIC IDs according to CPU topology, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 14/37] target-i386: Simplify cpu_x86_find_by_name(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 19/37] target-i386: Set custom features/properties without intermediate x86_def_t, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 12/37] target-i386: Topology & APIC ID utility functions, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 16/37] target-i386: Print deprecation warning if xlevel < 0x80000000, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 15/37] target-i386: Drop redundant list of CPU definitions, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 17/37] target-i386: Replace uint32_t vendor fields by vendor string in x86_def_t, Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 25/37] target-openrisc: Detect attempt to instantiate non-CPU type in cpu_init(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 22/37] target-arm: Detect attempt to instantiate non-CPU type in cpu_init(), Andreas Färber, 2013/01/28
- [Qemu-devel] [PATCH 28/37] target-alpha: Catch attempt to instantiate abstract type in cpu_init(), Andreas Färber, 2013/01/28