* [Qemu-devel] [PULL 01/29] qom: Remove unused errp parameter from can_be_deleted()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 02/29] cpu: cpu_by_arch_id() helper Eduardo Habkost
` (28 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
The errp argument is ignored by all implementations of the
method, and user_creatable_del() would break if any
implementation set an error (because it calls error_setg(errp) if
the function returns false). Remove the unused parameter.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170829220337.23427-1-ehabkost@redhat.com>
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/qom/object_interfaces.h | 5 ++---
backends/cryptodev.c | 2 +-
backends/hostmem.c | 2 +-
qom/object_interfaces.c | 6 +++---
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
index fdd7603c84..d63c1c28f8 100644
--- a/include/qom/object_interfaces.h
+++ b/include/qom/object_interfaces.h
@@ -51,7 +51,7 @@ typedef struct UserCreatableClass {
/* <public> */
void (*complete)(UserCreatable *uc, Error **errp);
- bool (*can_be_deleted)(UserCreatable *uc, Error **errp);
+ bool (*can_be_deleted)(UserCreatable *uc);
} UserCreatableClass;
/**
@@ -68,12 +68,11 @@ void user_creatable_complete(Object *obj, Error **errp);
/**
* user_creatable_can_be_deleted:
* @uc: the object whose can_be_deleted() method is called if implemented
- * @errp: if an error occurs, a pointer to an area to store the error
*
* Wrapper to call can_be_deleted() method if one of types it's inherited
* from implements USER_CREATABLE interface.
*/
-bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp);
+bool user_creatable_can_be_deleted(UserCreatable *uc);
/**
* user_creatable_add_type:
diff --git a/backends/cryptodev.c b/backends/cryptodev.c
index 1764c179fe..67edfa5328 100644
--- a/backends/cryptodev.c
+++ b/backends/cryptodev.c
@@ -215,7 +215,7 @@ bool cryptodev_backend_is_ready(CryptoDevBackend *backend)
}
static bool
-cryptodev_backend_can_be_deleted(UserCreatable *uc, Error **errp)
+cryptodev_backend_can_be_deleted(UserCreatable *uc)
{
return !cryptodev_backend_is_used(CRYPTODEV_BACKEND(uc));
}
diff --git a/backends/hostmem.c b/backends/hostmem.c
index 4606b73849..34550b9067 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -342,7 +342,7 @@ out:
}
static bool
-host_memory_backend_can_be_deleted(UserCreatable *uc, Error **errp)
+host_memory_backend_can_be_deleted(UserCreatable *uc)
{
if (host_memory_backend_is_mapped(MEMORY_BACKEND(uc))) {
return false;
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index ff27e0669e..3bb8959f09 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -23,13 +23,13 @@ void user_creatable_complete(Object *obj, Error **errp)
}
}
-bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp)
+bool user_creatable_can_be_deleted(UserCreatable *uc)
{
UserCreatableClass *ucc = USER_CREATABLE_GET_CLASS(uc);
if (ucc->can_be_deleted) {
- return ucc->can_be_deleted(uc, errp);
+ return ucc->can_be_deleted(uc);
} else {
return true;
}
@@ -178,7 +178,7 @@ void user_creatable_del(const char *id, Error **errp)
return;
}
- if (!user_creatable_can_be_deleted(USER_CREATABLE(obj), errp)) {
+ if (!user_creatable_can_be_deleted(USER_CREATABLE(obj))) {
error_setg(errp, "object '%s' is in use, can not be deleted", id);
return;
}
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 02/29] cpu: cpu_by_arch_id() helper
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 01/29] qom: Remove unused errp parameter from can_be_deleted() Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 03/29] hmp: allow apic-id for "info lapic" Eduardo Habkost
` (27 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
The helper can be used for CPU object lookup using the CPU's
arch-specific ID (the one returned by CPUClass::get_arch_id()).
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
[Yi Wang: Added documentation comments]
Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
Signed-off-by: Yun Liu <liu.yunh@zte.com.cn>
[ehabkost: extracted cpu_by_arch_id() to a separate patch]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/qom/cpu.h | 10 ++++++++++
qom/cpu.c | 11 ++++++++---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 25eefea7ab..b7ac9491c8 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -755,6 +755,16 @@ CPUState *qemu_get_cpu(int index);
bool cpu_exists(int64_t id);
/**
+ * cpu_by_arch_id:
+ * @id: Guest-exposed CPU ID of the CPU to obtain.
+ *
+ * Get a CPU with matching @id.
+ *
+ * Returns: The CPU or %NULL if there is no matching CPU.
+ */
+CPUState *cpu_by_arch_id(int64_t id);
+
+/**
* cpu_throttle_set:
* @new_throttle_pct: Percent of sleep time. Valid range is 1 to 99.
*
diff --git a/qom/cpu.c b/qom/cpu.c
index 4f38db0dac..e6210d5949 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -34,7 +34,7 @@
CPUInterruptHandler cpu_interrupt_handler;
-bool cpu_exists(int64_t id)
+CPUState *cpu_by_arch_id(int64_t id)
{
CPUState *cpu;
@@ -42,10 +42,15 @@ bool cpu_exists(int64_t id)
CPUClass *cc = CPU_GET_CLASS(cpu);
if (cc->get_arch_id(cpu) == id) {
- return true;
+ return cpu;
}
}
- return false;
+ return NULL;
+}
+
+bool cpu_exists(int64_t id)
+{
+ return !!cpu_by_arch_id(id);
}
CPUState *cpu_generic_init(const char *typename, const char *cpu_model)
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 03/29] hmp: allow apic-id for "info lapic"
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 01/29] qom: Remove unused errp parameter from can_be_deleted() Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 02/29] cpu: cpu_by_arch_id() helper Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 04/29] target-i386/cpu: Add new EPYC CPU model Eduardo Habkost
` (26 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Yi Wang
From: Yi Wang <wang.yi59@zte.com.cn>
Add [apic-id] support for hmp command "info lapic", which is
useful when debugging ipi and so on. Current behavior is not
changed when the parameter isn't specified.
Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
Signed-off-by: Yun Liu <liu.yunh@zte.com.cn>
Message-Id: <1501049917-4701-3-git-send-email-wang.yi59@zte.com.cn>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/i386/monitor.c | 10 +++++++++-
hmp-commands-info.hx | 7 ++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index 77ead60437..fe7d57b6aa 100644
--- a/target/i386/monitor.c
+++ b/target/i386/monitor.c
@@ -632,7 +632,15 @@ const MonitorDef *target_monitor_defs(void)
void hmp_info_local_apic(Monitor *mon, const QDict *qdict)
{
- CPUState *cs = mon_get_cpu();
+ CPUState *cs;
+
+ if (qdict_haskey(qdict, "apic-id")) {
+ int id = qdict_get_try_int(qdict, "apic-id", 0);
+ cs = cpu_by_arch_id(id);
+ } else {
+ cs = mon_get_cpu();
+ }
+
if (!cs) {
monitor_printf(mon, "No CPU available\n");
diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
index d9df238a5f..4ab7fcee98 100644
--- a/hmp-commands-info.hx
+++ b/hmp-commands-info.hx
@@ -115,9 +115,10 @@ ETEXI
#if defined(TARGET_I386)
{
.name = "lapic",
- .args_type = "",
- .params = "",
- .help = "show local apic state",
+ .args_type = "apic-id:i?",
+ .params = "[apic-id]",
+ .help = "show local apic state (apic-id: local apic to read, default is which of current CPU)",
+
.cmd = hmp_info_local_apic,
},
#endif
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 04/29] target-i386/cpu: Add new EPYC CPU model
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (2 preceding siblings ...)
2017-09-01 15:02 ` [Qemu-devel] [PULL 03/29] hmp: allow apic-id for "info lapic" Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 05/29] qom: cpu: fix parsed feature string length Eduardo Habkost
` (25 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell
Cc: qemu-devel, Brijesh Singh, Paolo Bonzini, Richard Henderson,
Tom Lendacky
From: Brijesh Singh <brijesh.singh@amd.com>
Add a new base CPU model called 'EPYC' to model processors from AMD EPYC
family (which includes EPYC 76xx,75xx,74xx, 73xx and 72xx).
The following features bits have been added/removed compare to Opteron_G5
Added: monitor, movbe, rdrand, mmxext, ffxsr, rdtscp, cr8legacy, osvw,
fsgsbase, bmi1, avx2, smep, bmi2, rdseed, adx, smap, clfshopt, sha
xsaveopt, xsavec, xgetbv1, arat
Removed: xop, fma4, tbm
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Tom Lendacky <Thomas.Lendacky@amd.com>
Signed-off-by: Brijesh Singh <brijesh.singh@amd.com>
Message-Id: <20170815170051.127257-1-brijesh.singh@amd.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/i386/cpu.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ddc45abd70..6617e01a72 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -1522,6 +1522,50 @@ static X86CPUDefinition builtin_x86_defs[] = {
.xlevel = 0x8000001A,
.model_id = "AMD Opteron 63xx class CPU",
},
+ {
+ .name = "EPYC",
+ .level = 0xd,
+ .vendor = CPUID_VENDOR_AMD,
+ .family = 23,
+ .model = 1,
+ .stepping = 2,
+ .features[FEAT_1_EDX] =
+ CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | CPUID_CLFLUSH |
+ CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA | CPUID_PGE |
+ CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 | CPUID_MCE |
+ CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE | CPUID_DE |
+ CPUID_VME | CPUID_FP87,
+ .features[FEAT_1_ECX] =
+ CPUID_EXT_RDRAND | CPUID_EXT_F16C | CPUID_EXT_AVX |
+ CPUID_EXT_XSAVE | CPUID_EXT_AES | CPUID_EXT_POPCNT |
+ CPUID_EXT_MOVBE | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
+ CPUID_EXT_CX16 | CPUID_EXT_FMA | CPUID_EXT_SSSE3 |
+ CPUID_EXT_MONITOR | CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3,
+ .features[FEAT_8000_0001_EDX] =
+ CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_PDPE1GB |
+ CPUID_EXT2_FFXSR | CPUID_EXT2_MMXEXT | CPUID_EXT2_NX |
+ CPUID_EXT2_SYSCALL,
+ .features[FEAT_8000_0001_ECX] =
+ CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH |
+ CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM |
+ CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
+ .features[FEAT_7_0_EBX] =
+ CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_AVX2 |
+ CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_RDSEED |
+ CPUID_7_0_EBX_ADX | CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_CLFLUSHOPT |
+ CPUID_7_0_EBX_SHA_NI,
+ /* Missing: XSAVES (not supported by some Linux versions,
+ * including v4.1 to v4.12).
+ * KVM doesn't yet expose any XSAVES state save component.
+ */
+ .features[FEAT_XSAVE] =
+ CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
+ CPUID_XSAVE_XGETBV1,
+ .features[FEAT_6_EAX] =
+ CPUID_6_EAX_ARAT,
+ .xlevel = 0x8000000A,
+ .model_id = "AMD EPYC Processor",
+ },
};
typedef struct PropValue {
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 05/29] qom: cpu: fix parsed feature string length
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (3 preceding siblings ...)
2017-09-01 15:02 ` [Qemu-devel] [PULL 04/29] target-i386/cpu: Add new EPYC CPU model Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 06/29] sparc: convert cpu models to SPARC cpu subclasses Eduardo Habkost
` (24 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
since commit ( 9262685b cpu: Factor out cpu_generic_init() )
features parsed by it were truncated only to the 1st feature
after CPU name due to fact that
featurestr = strtok(NULL, ",");
cc->parse_features(cpu, featurestr, &err);
would extract exactly one feature and parse_features() callback
would parse it and only it leaving the rest of features ignored.
Reuse approach from x86 custom impl. i.e. replace strtok() token
parsing with g_strsplit(), which would split feature string in
2 parts name and features list and pass the later to
parse_features() callback.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <1503592308-93913-2-git-send-email-imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
qom/cpu.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/qom/cpu.c b/qom/cpu.c
index e6210d5949..deb8880930 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -55,28 +55,26 @@ bool cpu_exists(int64_t id)
CPUState *cpu_generic_init(const char *typename, const char *cpu_model)
{
- char *str, *name, *featurestr;
CPUState *cpu = NULL;
ObjectClass *oc;
CPUClass *cc;
Error *err = NULL;
+ gchar **model_pieces;
- str = g_strdup(cpu_model);
- name = strtok(str, ",");
+ model_pieces = g_strsplit(cpu_model, ",", 2);
- oc = cpu_class_by_name(typename, name);
+ oc = cpu_class_by_name(typename, model_pieces[0]);
if (oc == NULL) {
- g_free(str);
+ g_strfreev(model_pieces);
return NULL;
}
cc = CPU_CLASS(oc);
- featurestr = strtok(NULL, ",");
/* TODO: all callers of cpu_generic_init() need to be converted to
* call parse_features() only once, before calling cpu_generic_init().
*/
- cc->parse_features(object_class_get_name(oc), featurestr, &err);
- g_free(str);
+ cc->parse_features(object_class_get_name(oc), model_pieces[1], &err);
+ g_strfreev(model_pieces);
if (err != NULL) {
goto out;
}
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 06/29] sparc: convert cpu models to SPARC cpu subclasses
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (4 preceding siblings ...)
2017-09-01 15:02 ` [Qemu-devel] [PULL 05/29] qom: cpu: fix parsed feature string length Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 07/29] sparc: embed sparc_def_t into CPUSPARCState Eduardo Habkost
` (23 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
QOMfy cpu models handling introducing propper cpu types
for each cpu model.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-3-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/sparc/cpu-qom.h | 2 +
target/sparc/cpu.c | 120 +++++++++++++++++++++++++++++++++----------------
2 files changed, 83 insertions(+), 39 deletions(-)
diff --git a/target/sparc/cpu-qom.h b/target/sparc/cpu-qom.h
index f63af728ee..af6d57a9e0 100644
--- a/target/sparc/cpu-qom.h
+++ b/target/sparc/cpu-qom.h
@@ -35,6 +35,7 @@
#define SPARC_CPU_GET_CLASS(obj) \
OBJECT_GET_CLASS(SPARCCPUClass, (obj), TYPE_SPARC_CPU)
+typedef struct sparc_def_t sparc_def_t;
/**
* SPARCCPUClass:
* @parent_realize: The parent class' realize handler.
@@ -49,6 +50,7 @@ typedef struct SPARCCPUClass {
DeviceRealize parent_realize;
void (*parent_reset)(CPUState *cpu);
+ sparc_def_t *cpu_def;
} SPARCCPUClass;
typedef struct SPARCCPU SPARCCPU;
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index d606eb53f4..a82fc238f4 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -25,8 +25,6 @@
//#define DEBUG_FEATURES
-static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model);
-
/* CPUClass::reset() */
static void sparc_cpu_reset(CPUState *s)
{
@@ -111,17 +109,9 @@ static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model)
{
CPUSPARCState *env = &cpu->env;
char *s = g_strdup(cpu_model);
- char *featurestr, *name = strtok(s, ",");
- sparc_def_t def1, *def = &def1;
+ char *featurestr = strtok(s, ",");
Error *err = NULL;
- if (cpu_sparc_find_by_name(def, name) < 0) {
- g_free(s);
- return -1;
- }
-
- env->def = g_memdup(def, sizeof(*def));
-
featurestr = strtok(NULL, ",");
sparc_cpu_parse_features(CPU(cpu), featurestr, &err);
g_free(s);
@@ -130,18 +120,18 @@ static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model)
return -1;
}
- env->version = def->iu_version;
- env->fsr = def->fpu_version;
- env->nwindows = def->nwindows;
+ env->version = env->def->iu_version;
+ env->fsr = env->def->fpu_version;
+ env->nwindows = env->def->nwindows;
#if !defined(TARGET_SPARC64)
- env->mmuregs[0] |= def->mmu_version;
+ env->mmuregs[0] |= env->def->mmu_version;
cpu_sparc_set_id(env, 0);
- env->mxccregs[7] |= def->mxcc_version;
+ env->mxccregs[7] |= env->def->mxcc_version;
#else
- env->mmu_version = def->mmu_version;
- env->maxtl = def->maxtl;
- env->version |= def->maxtl << 8;
- env->version |= def->nwindows - 1;
+ env->mmu_version = env->def->mmu_version;
+ env->maxtl = env->def->maxtl;
+ env->version |= env->def->maxtl << 8;
+ env->version |= env->def->nwindows - 1;
#endif
return 0;
}
@@ -149,8 +139,18 @@ static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model)
SPARCCPU *cpu_sparc_init(const char *cpu_model)
{
SPARCCPU *cpu;
+ ObjectClass *oc;
+ char *str, *name;
+
+ str = g_strdup(cpu_model);
+ name = strtok(str, ",");
+ oc = cpu_class_by_name(TYPE_SPARC_CPU, name);
+ g_free(str);
+ if (oc == NULL) {
+ return NULL;
+ }
- cpu = SPARC_CPU(object_new(TYPE_SPARC_CPU));
+ cpu = SPARC_CPU(object_new(object_class_get_name(oc)));
if (cpu_sparc_register(cpu, cpu_model) < 0) {
object_unref(OBJECT(cpu));
@@ -553,23 +553,6 @@ static void add_flagname_to_bitmaps(const char *flagname, uint32_t *features)
error_report("CPU feature %s not found", flagname);
}
-static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *name)
-{
- unsigned int i;
- const sparc_def_t *def = NULL;
-
- for (i = 0; i < ARRAY_SIZE(sparc_defs); i++) {
- if (strcasecmp(name, sparc_defs[i].name) == 0) {
- def = &sparc_defs[i];
- }
- }
- if (!def) {
- return -1;
- }
- memcpy(cpu_def, def, sizeof(*def));
- return 0;
-}
-
static void sparc_cpu_parse_features(CPUState *cs, char *features,
Error **errp)
{
@@ -796,6 +779,36 @@ static bool sparc_cpu_has_work(CPUState *cs)
cpu_interrupts_enabled(env);
}
+static char *sparc_cpu_type_name(const char *cpu_model)
+{
+ char *name = g_strdup_printf("%s-" TYPE_SPARC_CPU, cpu_model);
+ char *s = name;
+
+ /* SPARC cpu model names happen to have whitespaces,
+ * as type names shouldn't have spaces replace them with '-'
+ */
+ while ((s = strchr(s, ' '))) {
+ *s = '-';
+ }
+
+ return name;
+}
+
+static ObjectClass *sparc_cpu_class_by_name(const char *cpu_model)
+{
+ ObjectClass *oc;
+ char *typename;
+
+ if (cpu_model == NULL) {
+ return NULL;
+ }
+
+ typename = sparc_cpu_type_name(cpu_model);
+ oc = object_class_by_name(typename);
+ g_free(typename);
+ return oc;
+}
+
static void sparc_cpu_realizefn(DeviceState *dev, Error **errp)
{
CPUState *cs = CPU(dev);
@@ -825,6 +838,7 @@ static void sparc_cpu_initfn(Object *obj)
{
CPUState *cs = CPU(obj);
SPARCCPU *cpu = SPARC_CPU(obj);
+ SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(obj);
CPUSPARCState *env = &cpu->env;
cs->env_ptr = env;
@@ -832,6 +846,8 @@ static void sparc_cpu_initfn(Object *obj)
if (tcg_enabled()) {
gen_intermediate_code_init(env);
}
+
+ env->def = g_memdup(scc->cpu_def, sizeof(*scc->cpu_def));
}
static void sparc_cpu_uninitfn(Object *obj)
@@ -854,6 +870,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data)
scc->parent_reset = cc->reset;
cc->reset = sparc_cpu_reset;
+ cc->class_by_name = sparc_cpu_class_by_name;
cc->has_work = sparc_cpu_has_work;
cc->do_interrupt = sparc_cpu_do_interrupt;
cc->cpu_exec_interrupt = sparc_cpu_exec_interrupt;
@@ -888,14 +905,39 @@ static const TypeInfo sparc_cpu_type_info = {
.instance_size = sizeof(SPARCCPU),
.instance_init = sparc_cpu_initfn,
.instance_finalize = sparc_cpu_uninitfn,
- .abstract = false,
+ .abstract = true,
.class_size = sizeof(SPARCCPUClass),
.class_init = sparc_cpu_class_init,
};
+static void sparc_cpu_cpudef_class_init(ObjectClass *oc, void *data)
+{
+ SPARCCPUClass *scc = SPARC_CPU_CLASS(oc);
+ scc->cpu_def = data;
+}
+
+static void sparc_register_cpudef_type(const struct sparc_def_t *def)
+{
+ char *typename = sparc_cpu_type_name(def->name);
+ TypeInfo ti = {
+ .name = typename,
+ .parent = TYPE_SPARC_CPU,
+ .class_init = sparc_cpu_cpudef_class_init,
+ .class_data = (void *)def,
+ };
+
+ type_register(&ti);
+ g_free(typename);
+}
+
static void sparc_cpu_register_types(void)
{
+ int i;
+
type_register_static(&sparc_cpu_type_info);
+ for (i = 0; i < ARRAY_SIZE(sparc_defs); i++) {
+ sparc_register_cpudef_type(&sparc_defs[i]);
+ }
}
type_init(sparc_cpu_register_types)
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 07/29] sparc: embed sparc_def_t into CPUSPARCState
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (5 preceding siblings ...)
2017-09-01 15:02 ` [Qemu-devel] [PULL 06/29] sparc: convert cpu models to SPARC cpu subclasses Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 08/29] sparc: convert cpu features to qdev properties Eduardo Habkost
` (22 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
Make CPUSPARCState::def embedded so it would be allocated as part
of cpu instance and we won't have to worry about cleaning def pointer
up mannualy on cpu destruction.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-4-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
linux-user/sparc/target_syscall.h | 2 +-
target/sparc/cpu.h | 8 ++++----
target/sparc/cpu.c | 39 ++++++++++++++++-----------------------
target/sparc/int32_helper.c | 2 +-
target/sparc/int64_helper.c | 2 +-
target/sparc/ldst_helper.c | 14 +++++++-------
target/sparc/mmu_helper.c | 2 +-
target/sparc/translate.c | 2 +-
target/sparc/win_helper.c | 4 ++--
9 files changed, 34 insertions(+), 41 deletions(-)
diff --git a/linux-user/sparc/target_syscall.h b/linux-user/sparc/target_syscall.h
index f97aa6b075..5f09abfe89 100644
--- a/linux-user/sparc/target_syscall.h
+++ b/linux-user/sparc/target_syscall.h
@@ -31,7 +31,7 @@ struct target_pt_regs {
static inline abi_ulong target_shmlba(CPUSPARCState *env)
{
- if (!(env->def->features & CPU_FEATURE_FLUSH)) {
+ if (!(env->def.features & CPU_FEATURE_FLUSH)) {
return 64 * 1024;
} else {
return 256 * 1024;
diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
index 95a36a4bdc..0e41916a52 100644
--- a/target/sparc/cpu.h
+++ b/target/sparc/cpu.h
@@ -529,7 +529,7 @@ struct CPUSPARCState {
#define SOFTINT_INTRMASK (0xFFFE)
#define SOFTINT_REG_MASK (SOFTINT_STIMER|SOFTINT_INTRMASK|SOFTINT_TIMER)
#endif
- sparc_def_t *def;
+ sparc_def_t def;
void *irq_manager;
void (*qemu_irq_ack)(CPUSPARCState *env, void *irq_manager, int intno);
@@ -679,7 +679,7 @@ int cpu_sparc_signal_handler(int host_signum, void *pinfo, void *puc);
#if defined (TARGET_SPARC64)
static inline int cpu_has_hypervisor(CPUSPARCState *env1)
{
- return env1->def->features & CPU_FEATURE_HYPV;
+ return env1->def.features & CPU_FEATURE_HYPV;
}
static inline int cpu_hypervisor_mode(CPUSPARCState *env1)
@@ -788,14 +788,14 @@ static inline void cpu_get_tb_cpu_state(CPUSPARCState *env, target_ulong *pc,
if (env->pstate & PS_AM) {
flags |= TB_FLAG_AM_ENABLED;
}
- if ((env->def->features & CPU_FEATURE_FLOAT)
+ if ((env->def.features & CPU_FEATURE_FLOAT)
&& (env->pstate & PS_PEF)
&& (env->fprs & FPRS_FEF)) {
flags |= TB_FLAG_FPU_ENABLED;
}
flags |= env->asi << TB_FLAG_ASI_SHIFT;
#else
- if ((env->def->features & CPU_FEATURE_FLOAT) && env->psref) {
+ if ((env->def.features & CPU_FEATURE_FLOAT) && env->psref) {
flags |= TB_FLAG_FPU_ENABLED;
}
#endif
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index a82fc238f4..281a99f8dd 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -66,7 +66,7 @@ static void sparc_cpu_reset(CPUState *s)
env->lsu = 0;
#else
env->mmuregs[0] &= ~(MMU_E | MMU_NF);
- env->mmuregs[0] |= env->def->mmu_bm;
+ env->mmuregs[0] |= env->def.mmu_bm;
#endif
env->pc = 0;
env->npc = env->pc + 4;
@@ -120,18 +120,18 @@ static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model)
return -1;
}
- env->version = env->def->iu_version;
- env->fsr = env->def->fpu_version;
- env->nwindows = env->def->nwindows;
+ env->version = env->def.iu_version;
+ env->fsr = env->def.fpu_version;
+ env->nwindows = env->def.nwindows;
#if !defined(TARGET_SPARC64)
- env->mmuregs[0] |= env->def->mmu_version;
+ env->mmuregs[0] |= env->def.mmu_version;
cpu_sparc_set_id(env, 0);
- env->mxccregs[7] |= env->def->mxcc_version;
+ env->mxccregs[7] |= env->def.mxcc_version;
#else
- env->mmu_version = env->def->mmu_version;
- env->maxtl = env->def->maxtl;
- env->version |= env->def->maxtl << 8;
- env->version |= env->def->nwindows - 1;
+ env->mmu_version = env->def.mmu_version;
+ env->maxtl = env->def.maxtl;
+ env->version |= env->def.maxtl << 8;
+ env->version |= env->def.nwindows - 1;
#endif
return 0;
}
@@ -557,7 +557,7 @@ static void sparc_cpu_parse_features(CPUState *cs, char *features,
Error **errp)
{
SPARCCPU *cpu = SPARC_CPU(cs);
- sparc_def_t *cpu_def = cpu->env.def;
+ sparc_def_t *cpu_def = &cpu->env.def;
char *featurestr;
uint32_t plus_features = 0;
uint32_t minus_features = 0;
@@ -818,8 +818,8 @@ static void sparc_cpu_realizefn(DeviceState *dev, Error **errp)
SPARCCPU *cpu = SPARC_CPU(dev);
CPUSPARCState *env = &cpu->env;
- if ((env->def->features & CPU_FEATURE_FLOAT)) {
- env->def->features |= CPU_FEATURE_FLOAT128;
+ if ((env->def.features & CPU_FEATURE_FLOAT)) {
+ env->def.features |= CPU_FEATURE_FLOAT128;
}
#endif
@@ -847,15 +847,9 @@ static void sparc_cpu_initfn(Object *obj)
gen_intermediate_code_init(env);
}
- env->def = g_memdup(scc->cpu_def, sizeof(*scc->cpu_def));
-}
-
-static void sparc_cpu_uninitfn(Object *obj)
-{
- SPARCCPU *cpu = SPARC_CPU(obj);
- CPUSPARCState *env = &cpu->env;
-
- g_free(env->def);
+ if (scc->cpu_def) {
+ env->def = *scc->cpu_def;
+ }
}
static void sparc_cpu_class_init(ObjectClass *oc, void *data)
@@ -904,7 +898,6 @@ static const TypeInfo sparc_cpu_type_info = {
.parent = TYPE_CPU,
.instance_size = sizeof(SPARCCPU),
.instance_init = sparc_cpu_initfn,
- .instance_finalize = sparc_cpu_uninitfn,
.abstract = true,
.class_size = sizeof(SPARCCPUClass),
.class_init = sparc_cpu_class_init,
diff --git a/target/sparc/int32_helper.c b/target/sparc/int32_helper.c
index eec9a4d49f..c7724928c0 100644
--- a/target/sparc/int32_helper.c
+++ b/target/sparc/int32_helper.c
@@ -108,7 +108,7 @@ void sparc_cpu_do_interrupt(CPUState *cs)
#if !defined(CONFIG_USER_ONLY)
if (env->psret == 0) {
if (cs->exception_index == 0x80 &&
- env->def->features & CPU_FEATURE_TA0_SHUTDOWN) {
+ env->def.features & CPU_FEATURE_TA0_SHUTDOWN) {
qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
} else {
cpu_abort(cs, "Trap 0x%02x while interrupts disabled, Error state",
diff --git a/target/sparc/int64_helper.c b/target/sparc/int64_helper.c
index f942973c22..f3e7f32de6 100644
--- a/target/sparc/int64_helper.c
+++ b/target/sparc/int64_helper.c
@@ -147,7 +147,7 @@ void sparc_cpu_do_interrupt(CPUState *cs)
}
}
- if (env->def->features & CPU_FEATURE_GL) {
+ if (env->def.features & CPU_FEATURE_GL) {
tsptr->tstate |= (env->gl & 7ULL) << 40;
cpu_gl_switch_gregs(env, env->gl + 1);
env->gl++;
diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c
index 57968d9143..fb489cb5fd 100644
--- a/target/sparc/ldst_helper.c
+++ b/target/sparc/ldst_helper.c
@@ -513,7 +513,7 @@ uint64_t helper_ld_asi(CPUSPARCState *env, target_ulong addr,
case 0x00: /* Leon3 Cache Control */
case 0x08: /* Leon3 Instruction Cache config */
case 0x0C: /* Leon3 Date Cache config */
- if (env->def->features & CPU_FEATURE_CACHE_CTRL) {
+ if (env->def.features & CPU_FEATURE_CACHE_CTRL) {
ret = leon3_cache_control_ld(env, addr, size);
}
break;
@@ -736,7 +736,7 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, uint64_t val,
case 0x00: /* Leon3 Cache Control */
case 0x08: /* Leon3 Instruction Cache config */
case 0x0C: /* Leon3 Date Cache config */
- if (env->def->features & CPU_FEATURE_CACHE_CTRL) {
+ if (env->def.features & CPU_FEATURE_CACHE_CTRL) {
leon3_cache_control_st(env, addr, val, size);
}
break;
@@ -904,15 +904,15 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, uint64_t val,
/* Mappings generated during no-fault mode
are invalid in normal mode. */
if ((oldreg ^ env->mmuregs[reg])
- & (MMU_NF | env->def->mmu_bm)) {
+ & (MMU_NF | env->def.mmu_bm)) {
tlb_flush(CPU(cpu));
}
break;
case 1: /* Context Table Pointer Register */
- env->mmuregs[reg] = val & env->def->mmu_ctpr_mask;
+ env->mmuregs[reg] = val & env->def.mmu_ctpr_mask;
break;
case 2: /* Context Register */
- env->mmuregs[reg] = val & env->def->mmu_cxr_mask;
+ env->mmuregs[reg] = val & env->def.mmu_cxr_mask;
if (oldreg != env->mmuregs[reg]) {
/* we flush when the MMU context changes because
QEMU has no MMU context support */
@@ -923,11 +923,11 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, uint64_t val,
case 4: /* Synchronous Fault Address Register */
break;
case 0x10: /* TLB Replacement Control Register */
- env->mmuregs[reg] = val & env->def->mmu_trcr_mask;
+ env->mmuregs[reg] = val & env->def.mmu_trcr_mask;
break;
case 0x13: /* Synchronous Fault Status Register with Read
and Clear */
- env->mmuregs[3] = val & env->def->mmu_sfsr_mask;
+ env->mmuregs[3] = val & env->def.mmu_sfsr_mask;
break;
case 0x14: /* Synchronous Fault Address Register */
env->mmuregs[4] = val;
diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c
index 8b4664d996..126ea5e3ee 100644
--- a/target/sparc/mmu_helper.c
+++ b/target/sparc/mmu_helper.c
@@ -95,7 +95,7 @@ static int get_physical_address(CPUSPARCState *env, hwaddr *physical,
if (mmu_idx == MMU_PHYS_IDX) {
*page_size = TARGET_PAGE_SIZE;
/* Boot mode: instruction fetches are taken from PROM */
- if (rw == 2 && (env->mmuregs[0] & env->def->mmu_bm)) {
+ if (rw == 2 && (env->mmuregs[0] & env->def.mmu_bm)) {
*physical = env->prom_addr | (address & 0x7ffffULL);
*prot = PAGE_READ | PAGE_EXEC;
return 0;
diff --git a/target/sparc/translate.c b/target/sparc/translate.c
index 3bde47be83..6290705b11 100644
--- a/target/sparc/translate.c
+++ b/target/sparc/translate.c
@@ -5756,7 +5756,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock * tb)
dc->npc = (target_ulong) tb->cs_base;
dc->cc_op = CC_OP_DYNAMIC;
dc->mem_idx = tb->flags & TB_FLAG_MMU_MASK;
- dc->def = env->def;
+ dc->def = &env->def;
dc->fpu_enabled = tb_fpu_enabled(tb->flags);
dc->address_mask_32bit = tb_am_enabled(tb->flags);
dc->singlestep = (cs->singlestep_enabled || singlestep);
diff --git a/target/sparc/win_helper.c b/target/sparc/win_helper.c
index 154279ecda..8290a21142 100644
--- a/target/sparc/win_helper.c
+++ b/target/sparc/win_helper.c
@@ -295,7 +295,7 @@ void helper_wrcwp(CPUSPARCState *env, target_ulong new_cwp)
static inline uint64_t *get_gregset(CPUSPARCState *env, uint32_t pstate)
{
- if (env->def->features & CPU_FEATURE_GL) {
+ if (env->def.features & CPU_FEATURE_GL) {
return env->glregs + (env->gl & 7) * 8;
}
@@ -343,7 +343,7 @@ void cpu_change_pstate(CPUSPARCState *env, uint32_t new_pstate)
uint32_t pstate_regs, new_pstate_regs;
uint64_t *src, *dst;
- if (env->def->features & CPU_FEATURE_GL) {
+ if (env->def.features & CPU_FEATURE_GL) {
/* PS_AG, IG and MG are not implemented in this case */
new_pstate &= ~(PS_AG | PS_IG | PS_MG);
env->pstate = new_pstate;
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 08/29] sparc: convert cpu features to qdev properties
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (6 preceding siblings ...)
2017-09-01 15:02 ` [Qemu-devel] [PULL 07/29] sparc: embed sparc_def_t into CPUSPARCState Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 09/29] sparc: move adhoc CPUSPARCState initialization to realize time Eduardo Habkost
` (21 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
SPARC is the last target that uses legacy way of parsing
and initializing cpu features, drop legacy approach and
convert features to properties so that SPARC could as minimum
benefit from generic cpu_generic_init(), common with
x86 +-feat parser
PS:
the main purpose is to remove legacy way of cpu creation as
a blocker for unifying cpu creation code across targets.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-5-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/sparc/cpu.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index 281a99f8dd..82ab5ad8d9 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -22,6 +22,8 @@
#include "cpu.h"
#include "qemu/error-report.h"
#include "exec/exec-all.h"
+#include "hw/qdev-properties.h"
+#include "qapi/visitor.h"
//#define DEBUG_FEATURES
@@ -852,6 +854,69 @@ static void sparc_cpu_initfn(Object *obj)
}
}
+static void sparc_get_nwindows(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
+{
+ SPARCCPU *cpu = SPARC_CPU(obj);
+ int64_t value = cpu->env.def.nwindows;
+
+ visit_type_int(v, name, &value, errp);
+}
+
+static void sparc_set_nwindows(Object *obj, Visitor *v, const char *name,
+ void *opaque, Error **errp)
+{
+ const int64_t min = MIN_NWINDOWS;
+ const int64_t max = MAX_NWINDOWS;
+ SPARCCPU *cpu = SPARC_CPU(obj);
+ Error *err = NULL;
+ int64_t value;
+
+ visit_type_int(v, name, &value, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+
+ if (value < min || value > max) {
+ error_setg(errp, "Property %s.%s doesn't take value %" PRId64
+ " (minimum: %" PRId64 ", maximum: %" PRId64 ")",
+ object_get_typename(obj), name ? name : "null",
+ value, min, max);
+ return;
+ }
+ cpu->env.def.nwindows = value;
+}
+
+static PropertyInfo qdev_prop_nwindows = {
+ .name = "int",
+ .get = sparc_get_nwindows,
+ .set = sparc_set_nwindows,
+};
+
+static Property sparc_cpu_properties[] = {
+ DEFINE_PROP_BIT("float", SPARCCPU, env.def.features, 0, false),
+ DEFINE_PROP_BIT("float128", SPARCCPU, env.def.features, 1, false),
+ DEFINE_PROP_BIT("swap", SPARCCPU, env.def.features, 2, false),
+ DEFINE_PROP_BIT("mul", SPARCCPU, env.def.features, 3, false),
+ DEFINE_PROP_BIT("div", SPARCCPU, env.def.features, 4, false),
+ DEFINE_PROP_BIT("flush", SPARCCPU, env.def.features, 5, false),
+ DEFINE_PROP_BIT("fsqrt", SPARCCPU, env.def.features, 6, false),
+ DEFINE_PROP_BIT("fmul", SPARCCPU, env.def.features, 7, false),
+ DEFINE_PROP_BIT("vis1", SPARCCPU, env.def.features, 8, false),
+ DEFINE_PROP_BIT("vis2", SPARCCPU, env.def.features, 9, false),
+ DEFINE_PROP_BIT("fsmuld", SPARCCPU, env.def.features, 10, false),
+ DEFINE_PROP_BIT("hypv", SPARCCPU, env.def.features, 11, false),
+ DEFINE_PROP_BIT("cmt", SPARCCPU, env.def.features, 12, false),
+ DEFINE_PROP_BIT("gl", SPARCCPU, env.def.features, 13, false),
+ DEFINE_PROP_UNSIGNED("iu-version", SPARCCPU, env.def.iu_version, 0,
+ qdev_prop_uint64, target_ulong),
+ DEFINE_PROP_UINT32("fpu-version", SPARCCPU, env.def.fpu_version, 0),
+ DEFINE_PROP_UINT32("mmu-version", SPARCCPU, env.def.mmu_version, 0),
+ { .name = "nwindows", .info = &qdev_prop_nwindows },
+ DEFINE_PROP_END_OF_LIST()
+};
+
static void sparc_cpu_class_init(ObjectClass *oc, void *data)
{
SPARCCPUClass *scc = SPARC_CPU_CLASS(oc);
@@ -860,6 +925,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data)
scc->parent_realize = dc->realize;
dc->realize = sparc_cpu_realizefn;
+ dc->props = sparc_cpu_properties;
scc->parent_reset = cc->reset;
cc->reset = sparc_cpu_reset;
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 09/29] sparc: move adhoc CPUSPARCState initialization to realize time
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (7 preceding siblings ...)
2017-09-01 15:02 ` [Qemu-devel] [PULL 08/29] sparc: convert cpu features to qdev properties Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 10/29] sparc: make cpu feature parsing property based Eduardo Habkost
` (20 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
SPARCCPU::env was initialized from previously set properties
(with help of sparc_cpu_parse_features) in cpu_sparc_register().
However there is not reason to keep it there as this task is
typically done at realize time. So move post properties
initialization into sparc_cpu_realizefn, which brings
cpu_sparc_init() closer to cpu_generic_init().
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-6-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/sparc/cpu.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index 82ab5ad8d9..9dfc15007d 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -109,7 +109,6 @@ static void sparc_cpu_parse_features(CPUState *cs, char *features,
static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model)
{
- CPUSPARCState *env = &cpu->env;
char *s = g_strdup(cpu_model);
char *featurestr = strtok(s, ",");
Error *err = NULL;
@@ -122,19 +121,6 @@ static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model)
return -1;
}
- env->version = env->def.iu_version;
- env->fsr = env->def.fpu_version;
- env->nwindows = env->def.nwindows;
-#if !defined(TARGET_SPARC64)
- env->mmuregs[0] |= env->def.mmu_version;
- cpu_sparc_set_id(env, 0);
- env->mxccregs[7] |= env->def.mxcc_version;
-#else
- env->mmu_version = env->def.mmu_version;
- env->maxtl = env->def.maxtl;
- env->version |= env->def.maxtl << 8;
- env->version |= env->def.nwindows - 1;
-#endif
return 0;
}
@@ -816,15 +802,29 @@ static void sparc_cpu_realizefn(DeviceState *dev, Error **errp)
CPUState *cs = CPU(dev);
SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(dev);
Error *local_err = NULL;
-#if defined(CONFIG_USER_ONLY)
SPARCCPU *cpu = SPARC_CPU(dev);
CPUSPARCState *env = &cpu->env;
+#if defined(CONFIG_USER_ONLY)
if ((env->def.features & CPU_FEATURE_FLOAT)) {
env->def.features |= CPU_FEATURE_FLOAT128;
}
#endif
+ env->version = env->def.iu_version;
+ env->fsr = env->def.fpu_version;
+ env->nwindows = env->def.nwindows;
+#if !defined(TARGET_SPARC64)
+ env->mmuregs[0] |= env->def.mmu_version;
+ cpu_sparc_set_id(env, 0);
+ env->mxccregs[7] |= env->def.mxcc_version;
+#else
+ env->mmu_version = env->def.mmu_version;
+ env->maxtl = env->def.maxtl;
+ env->version |= env->def.maxtl << 8;
+ env->version |= env->def.nwindows - 1;
+#endif
+
cpu_exec_realizefn(cs, &local_err);
if (local_err != NULL) {
error_propagate(errp, local_err);
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 10/29] sparc: make cpu feature parsing property based
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (8 preceding siblings ...)
2017-09-01 15:02 ` [Qemu-devel] [PULL 09/29] sparc: move adhoc CPUSPARCState initialization to realize time Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:02 ` [Qemu-devel] [PULL 11/29] sparc: replace cpu_sparc_init() with cpu_generic_init() Eduardo Habkost
` (19 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
with features converted to properties we can use the same
approach as x86 for features parsing and drop legacy
approach that manipulated CPU instance directly.
New sparc_cpu_parse_features() will allow only +-feat
and explicitly disable feat=on|off syntax for now.
With that in place and sparc_cpu_parse_features() providing
generic CPUClass::parse_features callback, the cpu_sparc_init()
will do the same job as cpu_generic_init() so replace content
of cpu_sparc_init() with it.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503672460-109436-1-git-send-email-imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/sparc/cpu.c | 215 ++++++++++++++++++++---------------------------------
1 file changed, 82 insertions(+), 133 deletions(-)
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index 9dfc15007d..29296b2411 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -104,50 +104,99 @@ static void cpu_sparc_disas_set_info(CPUState *cpu, disassemble_info *info)
#endif
}
-static void sparc_cpu_parse_features(CPUState *cs, char *features,
- Error **errp);
+static void
+cpu_add_feat_as_prop(const char *typename, const char *name, const char *val)
+{
+ GlobalProperty *prop = g_new0(typeof(*prop), 1);
+ prop->driver = typename;
+ prop->property = g_strdup(name);
+ prop->value = g_strdup(val);
+ prop->errp = &error_fatal;
+ qdev_prop_register_global(prop);
+}
-static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model)
+/* Parse "+feature,-feature,feature=foo" CPU feature string */
+static void sparc_cpu_parse_features(const char *typename, char *features,
+ Error **errp)
{
- char *s = g_strdup(cpu_model);
- char *featurestr = strtok(s, ",");
- Error *err = NULL;
+ GList *l, *plus_features = NULL, *minus_features = NULL;
+ char *featurestr; /* Single 'key=value" string being parsed */
+ static bool cpu_globals_initialized;
- featurestr = strtok(NULL, ",");
- sparc_cpu_parse_features(CPU(cpu), featurestr, &err);
- g_free(s);
- if (err) {
- error_report_err(err);
- return -1;
+ if (cpu_globals_initialized) {
+ return;
}
+ cpu_globals_initialized = true;
- return 0;
-}
+ if (!features) {
+ return;
+ }
-SPARCCPU *cpu_sparc_init(const char *cpu_model)
-{
- SPARCCPU *cpu;
- ObjectClass *oc;
- char *str, *name;
+ for (featurestr = strtok(features, ",");
+ featurestr;
+ featurestr = strtok(NULL, ",")) {
+ const char *name;
+ const char *val = NULL;
+ char *eq = NULL;
- str = g_strdup(cpu_model);
- name = strtok(str, ",");
- oc = cpu_class_by_name(TYPE_SPARC_CPU, name);
- g_free(str);
- if (oc == NULL) {
- return NULL;
- }
+ /* Compatibility syntax: */
+ if (featurestr[0] == '+') {
+ plus_features = g_list_append(plus_features,
+ g_strdup(featurestr + 1));
+ continue;
+ } else if (featurestr[0] == '-') {
+ minus_features = g_list_append(minus_features,
+ g_strdup(featurestr + 1));
+ continue;
+ }
- cpu = SPARC_CPU(object_new(object_class_get_name(oc)));
+ eq = strchr(featurestr, '=');
+ name = featurestr;
+ if (eq) {
+ *eq++ = 0;
+ val = eq;
+
+ /*
+ * Temporarily, only +feat/-feat will be supported
+ * for boolean properties until we remove the
+ * minus-overrides-plus semantics and just follow
+ * the order options appear on the command-line.
+ *
+ * TODO: warn if user is relying on minus-override-plus semantics
+ * TODO: remove minus-override-plus semantics after
+ * warning for a few releases
+ */
+ if (!strcasecmp(val, "on") ||
+ !strcasecmp(val, "off") ||
+ !strcasecmp(val, "true") ||
+ !strcasecmp(val, "false")) {
+ error_setg(errp, "Boolean properties in format %s=%s"
+ " are not supported", name, val);
+ return;
+ }
+ } else {
+ error_setg(errp, "Unsupported property format: %s", name);
+ return;
+ }
+ cpu_add_feat_as_prop(typename, name, val);
+ }
- if (cpu_sparc_register(cpu, cpu_model) < 0) {
- object_unref(OBJECT(cpu));
- return NULL;
+ for (l = plus_features; l; l = l->next) {
+ const char *name = l->data;
+ cpu_add_feat_as_prop(typename, name, "on");
}
+ g_list_free_full(plus_features, g_free);
- object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
+ for (l = minus_features; l; l = l->next) {
+ const char *name = l->data;
+ cpu_add_feat_as_prop(typename, name, "off");
+ }
+ g_list_free_full(minus_features, g_free);
+}
- return cpu;
+SPARCCPU *cpu_sparc_init(const char *cpu_model)
+{
+ return SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
}
void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu)
@@ -528,107 +577,6 @@ static void print_features(FILE *f, fprintf_function cpu_fprintf,
}
}
-static void add_flagname_to_bitmaps(const char *flagname, uint32_t *features)
-{
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(feature_name); i++) {
- if (feature_name[i] && !strcmp(flagname, feature_name[i])) {
- *features |= 1 << i;
- return;
- }
- }
- error_report("CPU feature %s not found", flagname);
-}
-
-static void sparc_cpu_parse_features(CPUState *cs, char *features,
- Error **errp)
-{
- SPARCCPU *cpu = SPARC_CPU(cs);
- sparc_def_t *cpu_def = &cpu->env.def;
- char *featurestr;
- uint32_t plus_features = 0;
- uint32_t minus_features = 0;
- uint64_t iu_version;
- uint32_t fpu_version, mmu_version, nwindows;
-
- featurestr = features ? strtok(features, ",") : NULL;
- while (featurestr) {
- char *val;
-
- if (featurestr[0] == '+') {
- add_flagname_to_bitmaps(featurestr + 1, &plus_features);
- } else if (featurestr[0] == '-') {
- add_flagname_to_bitmaps(featurestr + 1, &minus_features);
- } else if ((val = strchr(featurestr, '='))) {
- *val = 0; val++;
- if (!strcmp(featurestr, "iu_version")) {
- char *err;
-
- iu_version = strtoll(val, &err, 0);
- if (!*val || *err) {
- error_setg(errp, "bad numerical value %s", val);
- return;
- }
- cpu_def->iu_version = iu_version;
-#ifdef DEBUG_FEATURES
- fprintf(stderr, "iu_version %" PRIx64 "\n", iu_version);
-#endif
- } else if (!strcmp(featurestr, "fpu_version")) {
- char *err;
-
- fpu_version = strtol(val, &err, 0);
- if (!*val || *err) {
- error_setg(errp, "bad numerical value %s", val);
- return;
- }
- cpu_def->fpu_version = fpu_version;
-#ifdef DEBUG_FEATURES
- fprintf(stderr, "fpu_version %x\n", fpu_version);
-#endif
- } else if (!strcmp(featurestr, "mmu_version")) {
- char *err;
-
- mmu_version = strtol(val, &err, 0);
- if (!*val || *err) {
- error_setg(errp, "bad numerical value %s", val);
- return;
- }
- cpu_def->mmu_version = mmu_version;
-#ifdef DEBUG_FEATURES
- fprintf(stderr, "mmu_version %x\n", mmu_version);
-#endif
- } else if (!strcmp(featurestr, "nwindows")) {
- char *err;
-
- nwindows = strtol(val, &err, 0);
- if (!*val || *err || nwindows > MAX_NWINDOWS ||
- nwindows < MIN_NWINDOWS) {
- error_setg(errp, "bad numerical value %s", val);
- return;
- }
- cpu_def->nwindows = nwindows;
-#ifdef DEBUG_FEATURES
- fprintf(stderr, "nwindows %d\n", nwindows);
-#endif
- } else {
- error_setg(errp, "unrecognized feature %s", featurestr);
- return;
- }
- } else {
- error_setg(errp, "feature string `%s' not in format "
- "(+feature|-feature|feature=xyz)", featurestr);
- return;
- }
- featurestr = strtok(NULL, ",");
- }
- cpu_def->features |= plus_features;
- cpu_def->features &= ~minus_features;
-#ifdef DEBUG_FEATURES
- print_features(stderr, fprintf, cpu_def->features, NULL);
-#endif
-}
-
void sparc_cpu_list(FILE *f, fprintf_function cpu_fprintf)
{
unsigned int i;
@@ -931,6 +879,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data)
cc->reset = sparc_cpu_reset;
cc->class_by_name = sparc_cpu_class_by_name;
+ cc->parse_features = sparc_cpu_parse_features;
cc->has_work = sparc_cpu_has_work;
cc->do_interrupt = sparc_cpu_do_interrupt;
cc->cpu_exec_interrupt = sparc_cpu_exec_interrupt;
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 11/29] sparc: replace cpu_sparc_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (9 preceding siblings ...)
2017-09-01 15:02 ` [Qemu-devel] [PULL 10/29] sparc: make cpu feature parsing property based Eduardo Habkost
@ 2017-09-01 15:02 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 12/29] s390x: replace cpu_s390x_init() " Eduardo Habkost
` (18 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:02 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-8-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/sparc/cpu.h | 3 +--
hw/sparc/leon3.c | 2 +-
hw/sparc/sun4m.c | 2 +-
hw/sparc64/sparc64.c | 2 +-
target/sparc/cpu.c | 5 -----
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
index 0e41916a52..b45cfb4708 100644
--- a/target/sparc/cpu.h
+++ b/target/sparc/cpu.h
@@ -579,7 +579,6 @@ void cpu_raise_exception_ra(CPUSPARCState *, int, uintptr_t) QEMU_NORETURN;
#ifndef NO_CPU_IO_DEFS
/* cpu_init.c */
-SPARCCPU *cpu_sparc_init(const char *cpu_model);
void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu);
void sparc_cpu_list(FILE *f, fprintf_function cpu_fprintf);
/* mmu_helper.c */
@@ -656,7 +655,7 @@ hwaddr cpu_get_phys_page_nofault(CPUSPARCState *env, target_ulong addr,
int cpu_sparc_signal_handler(int host_signum, void *pinfo, void *puc);
#ifndef NO_CPU_IO_DEFS
-#define cpu_init(cpu_model) CPU(cpu_sparc_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_SPARC_CPU, cpu_model)
#endif
#define cpu_signal_handler cpu_sparc_signal_handler
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index d5ff188d9e..56512ecd00 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -126,7 +126,7 @@ static void leon3_generic_hw_init(MachineState *machine)
cpu_model = "LEON3";
}
- cpu = cpu_sparc_init(cpu_model);
+ cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "qemu: Unable to find Sparc CPU definition\n");
exit(1);
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 89dd8a96c3..cf47dca83a 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -797,7 +797,7 @@ static void cpu_devinit(const char *cpu_model, unsigned int id,
SPARCCPU *cpu;
CPUSPARCState *env;
- cpu = cpu_sparc_init(cpu_model);
+ cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "qemu: Unable to find Sparc CPU definition\n");
exit(1);
diff --git a/hw/sparc64/sparc64.c b/hw/sparc64/sparc64.c
index 4e4fdab065..ecf38a45da 100644
--- a/hw/sparc64/sparc64.c
+++ b/hw/sparc64/sparc64.c
@@ -353,7 +353,7 @@ SPARCCPU *sparc64_cpu_devinit(const char *cpu_model,
if (cpu_model == NULL) {
cpu_model = default_cpu_model;
}
- cpu = cpu_sparc_init(cpu_model);
+ cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to find Sparc CPU definition\n");
exit(1);
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index 29296b2411..0806d699e6 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -194,11 +194,6 @@ static void sparc_cpu_parse_features(const char *typename, char *features,
g_list_free_full(minus_features, g_free);
}
-SPARCCPU *cpu_sparc_init(const char *cpu_model)
-{
- return SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
-}
-
void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu)
{
#if !defined(TARGET_SPARC64)
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 12/29] s390x: replace cpu_s390x_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (10 preceding siblings ...)
2017-09-01 15:02 ` [Qemu-devel] [PULL 11/29] sparc: replace cpu_sparc_init() with cpu_generic_init() Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 13/29] alpha: replace cpu_alpha_init() " Eduardo Habkost
` (17 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
cpu_s390x_init() is used only *-user targets indirectly
via cpu_init() macro and has a hack to assign ids to created
cpus (I'm not sure if 'id' really matters to *-user emulation).
So to on safe side, instead of having custom wrapper to do numbering
replace it with cpu_generic_init() and use S390CPUClass::next_cpu_id
which could serve the same purpose as static variable and move cpu->id
initialization to s390_cpu_initfn for CONFIG_USER_ONLY use-case.
PS:
ifdef is ugly but it allows us to hide s390x detail that isn't
set by *-user targets and reuse generic cpu creation utility
for btoh machine and user emulation.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <1504185578-80843-1-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/s390x/cpu.h | 3 +--
target/s390x/cpu.c | 7 +++++++
target/s390x/helper.c | 14 --------------
3 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 4ec338077e..0bd97a5670 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -688,8 +688,7 @@ const char *s390_default_cpu_model_name(void);
/* helper.c */
-S390CPU *cpu_s390x_init(const char *cpu_model);
-#define cpu_init(model) CPU(cpu_s390x_init(model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_S390_CPU, cpu_model)
S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp);
/* you can call this signal handler from your SIGBUS and SIGSEGV
signal handlers to inform the virtual CPU of exceptions. non zero
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 7267b60d41..74b3e4fd0d 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -306,6 +306,13 @@ static void s390_cpu_initfn(Object *obj)
inited = true;
s390x_translate_init();
}
+
+#if defined(CONFIG_USER_ONLY)
+ {
+ S390CPUClass *scc = S390_CPU_GET_CLASS(obj);
+ cpu->id = scc->next_cpu_id;
+ }
+#endif
}
static void s390_cpu_finalize(Object *obj)
diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index 3adb9de122..ba29504476 100644
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -129,20 +129,6 @@ out:
return cpu;
}
-S390CPU *cpu_s390x_init(const char *cpu_model)
-{
- Error *err = NULL;
- S390CPU *cpu;
- /* Use to track CPU ID for linux-user only */
- static int64_t next_cpu_id;
-
- cpu = s390x_new_cpu(cpu_model, next_cpu_id++, &err);
- if (err) {
- error_report_err(err);
- }
- return cpu;
-}
-
#ifndef CONFIG_USER_ONLY
hwaddr s390_cpu_get_phys_page_debug(CPUState *cs, vaddr vaddr)
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 13/29] alpha: replace cpu_alpha_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (11 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 12/29] s390x: replace cpu_s390x_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 14/29] hppa: replace cpu_hppa_init() " Eduardo Habkost
` (16 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
cpu_alpha_init() used to provide default fallback if invalid
(i.e. non existent) cpu_model were provided.
dp264 machine provides its own default so sole user of fallback
is [bsd|linux]-user targets which specifies 'any' cpu model that
fallbacks to "ev67" in cpu_alpha_init(). Push fallback handling
into alpha_cpu_class_by_name() and replace cpu_alpha_init() with
cpu_generic_init().
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Richard Henderson <rth@twiddle.net>
Message-Id: <1503592308-93913-10-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/alpha/cpu.h | 4 +---
hw/alpha/dp264.c | 8 ++++++--
target/alpha/cpu.c | 20 +++++---------------
3 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h
index e95be2b34b..0738e97d6d 100644
--- a/target/alpha/cpu.h
+++ b/target/alpha/cpu.h
@@ -468,9 +468,7 @@ enum {
void alpha_translate_init(void);
-AlphaCPU *cpu_alpha_init(const char *cpu_model);
-
-#define cpu_init(cpu_model) CPU(cpu_alpha_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_ALPHA_CPU, cpu_model)
void alpha_cpu_list(FILE *f, fprintf_function cpu_fprintf);
/* you can call this signal handler from your SIGBUS and SIGSEGV
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 3b307ad873..1c5a177102 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -51,7 +51,7 @@ static int clipper_pci_map_irq(PCIDevice *d, int irq_num)
static void clipper_init(MachineState *machine)
{
ram_addr_t ram_size = machine->ram_size;
- const char *cpu_model = machine->cpu_model;
+ const char *cpu_model = machine->cpu_model ? machine->cpu_model : "ev67";
const char *kernel_filename = machine->kernel_filename;
const char *kernel_cmdline = machine->kernel_cmdline;
const char *initrd_filename = machine->initrd_filename;
@@ -67,7 +67,11 @@ static void clipper_init(MachineState *machine)
/* Create up to 4 cpus. */
memset(cpus, 0, sizeof(cpus));
for (i = 0; i < smp_cpus; ++i) {
- cpus[i] = cpu_alpha_init(cpu_model ? cpu_model : "ev67");
+ cpus[i] = ALPHA_CPU(cpu_generic_init(TYPE_ALPHA_CPU, cpu_model));
+ if (!cpus[i]) {
+ error_report("Unable to find CPU definition");
+ exit(1);
+ }
}
cpus[0]->env.trap_arg0 = ram_size;
diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c
index 76150f48d3..1ea597b9dd 100644
--- a/target/alpha/cpu.c
+++ b/target/alpha/cpu.c
@@ -155,24 +155,14 @@ static ObjectClass *alpha_cpu_class_by_name(const char *cpu_model)
if (oc != NULL && object_class_is_abstract(oc)) {
oc = NULL;
}
- return oc;
-}
-
-AlphaCPU *cpu_alpha_init(const char *cpu_model)
-{
- AlphaCPU *cpu;
- ObjectClass *cpu_class;
- cpu_class = alpha_cpu_class_by_name(cpu_model);
- if (cpu_class == NULL) {
- /* Default to ev67; no reason not to emulate insns by default. */
- cpu_class = object_class_by_name(TYPE("ev67"));
+ /* TODO: remove match everything nonsense */
+ /* Default to ev67; no reason not to emulate insns by default. */
+ if (!oc) {
+ oc = object_class_by_name(TYPE("ev67"));
}
- cpu = ALPHA_CPU(object_new(object_class_get_name(cpu_class)));
-
- object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
- return cpu;
+ return oc;
}
static void ev4_cpu_initfn(Object *obj)
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 14/29] hppa: replace cpu_hppa_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (12 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 13/29] alpha: replace cpu_alpha_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 15/29] m68k: replace cpu_m68k_init() " Eduardo Habkost
` (15 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
drop custom cpu_hppa_init() in favor of cpu_generic_init(),
to make cpu_generic_init() work all we need is to provide
cc->class_by_name callback that would resolve any cpu_model
to the sole TYPE_HPPA_CPU to match current behaviour.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Richard Henderson <rth@twiddle.net>
Message-Id: <1503592308-93913-11-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/hppa/cpu.h | 4 +---
target/hppa/cpu.c | 11 +++--------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index 4cf4ac65e3..8d14077763 100644
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -112,9 +112,7 @@ static inline int cpu_mmu_index(CPUHPPAState *env, bool ifetch)
void hppa_translate_init(void);
-HPPACPU *cpu_hppa_init(const char *cpu_model);
-
-#define cpu_init(cpu_model) CPU(cpu_hppa_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_HPPA_CPU, cpu_model)
void hppa_cpu_list(FILE *f, fprintf_function cpu_fprintf);
diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c
index 30299e990d..a477b452f0 100644
--- a/target/hppa/cpu.c
+++ b/target/hppa/cpu.c
@@ -112,15 +112,9 @@ static void hppa_cpu_initfn(Object *obj)
hppa_translate_init();
}
-HPPACPU *cpu_hppa_init(const char *cpu_model)
+static ObjectClass *hppa_cpu_class_by_name(const char *cpu_model)
{
- HPPACPU *cpu;
-
- cpu = HPPA_CPU(object_new(TYPE_HPPA_CPU));
-
- object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
-
- return cpu;
+ return object_class_by_name(TYPE_HPPA_CPU);
}
static void hppa_cpu_class_init(ObjectClass *oc, void *data)
@@ -132,6 +126,7 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data)
acc->parent_realize = dc->realize;
dc->realize = hppa_cpu_realizefn;
+ cc->class_by_name = hppa_cpu_class_by_name;
cc->do_interrupt = hppa_cpu_do_interrupt;
cc->cpu_exec_interrupt = hppa_cpu_exec_interrupt;
cc->dump_state = hppa_cpu_dump_state;
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 15/29] m68k: replace cpu_m68k_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (13 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 14/29] hppa: replace cpu_hppa_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 16/29] microblaze: replace cpu_mb_init() " Eduardo Habkost
` (14 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
call register_m68k_insns() at realize time which makes
cpu_m68k_init() typical object creation function.
As result we can replace it with cpu_generic_init()
which does the same job, reducing code duplication a bit.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: Thomas Huth <huth@tuxfamily.org>
Acked-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <1503592308-93913-12-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/m68k/cpu.h | 3 +--
hw/m68k/an5206.c | 2 +-
hw/m68k/mcf5208.c | 2 +-
target/m68k/cpu.c | 2 ++
target/m68k/helper.c | 20 --------------------
5 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 38a7e11b92..d9365476e5 100644
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -163,7 +163,6 @@ int m68k_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
void m68k_tcg_init(void);
void m68k_cpu_init_gdb(M68kCPU *cpu);
-M68kCPU *cpu_m68k_init(const char *cpu_model);
/* you can call this signal handler from your SIGBUS and SIGSEGV
signal handlers to inform the virtual CPU of exceptions. non zero
is returned if the signal was handled by the virtual CPU. */
@@ -322,7 +321,7 @@ void register_m68k_insns (CPUM68KState *env);
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
-#define cpu_init(cpu_model) CPU(cpu_m68k_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_M68K_CPU, cpu_model)
#define cpu_signal_handler cpu_m68k_signal_handler
#define cpu_list m68k_cpu_list
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index c76244176f..7b9b15d6c4 100644
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -42,7 +42,7 @@ static void an5206_init(MachineState *machine)
if (!cpu_model) {
cpu_model = "m5206";
}
- cpu = cpu_m68k_init(cpu_model);
+ cpu = M68K_CPU(cpu_generic_init(TYPE_M68K_CPU, cpu_model));
if (!cpu) {
error_report("Unable to find m68k CPU definition");
exit(1);
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index f4b1387c0d..1a0f18073a 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -232,7 +232,7 @@ static void mcf5208evb_init(MachineState *machine)
if (!cpu_model) {
cpu_model = "m5208";
}
- cpu = cpu_m68k_init(cpu_model);
+ cpu = M68K_CPU(cpu_generic_init(TYPE_M68K_CPU, cpu_model));
if (!cpu) {
fprintf(stderr, "Unable to find m68k CPU definition\n");
exit(1);
diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
index a14b6dda7f..55bf24bae6 100644
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@ -230,6 +230,8 @@ static void m68k_cpu_realizefn(DeviceState *dev, Error **errp)
M68kCPUClass *mcc = M68K_CPU_GET_CLASS(dev);
Error *local_err = NULL;
+ register_m68k_insns(&cpu->env);
+
cpu_exec_realizefn(cs, &local_err);
if (local_err != NULL) {
error_propagate(errp, local_err);
diff --git a/target/m68k/helper.c b/target/m68k/helper.c
index caae29100c..7e50ff5871 100644
--- a/target/m68k/helper.c
+++ b/target/m68k/helper.c
@@ -156,26 +156,6 @@ static int m68k_fpu_gdb_set_reg(CPUM68KState *env, uint8_t *mem_buf, int n)
return 0;
}
-M68kCPU *cpu_m68k_init(const char *cpu_model)
-{
- M68kCPU *cpu;
- CPUM68KState *env;
- ObjectClass *oc;
-
- oc = cpu_class_by_name(TYPE_M68K_CPU, cpu_model);
- if (oc == NULL) {
- return NULL;
- }
- cpu = M68K_CPU(object_new(object_class_get_name(oc)));
- env = &cpu->env;
-
- register_m68k_insns(env);
-
- object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
-
- return cpu;
-}
-
void m68k_cpu_init_gdb(M68kCPU *cpu)
{
CPUState *cs = CPU(cpu);
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 16/29] microblaze: replace cpu_mb_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (14 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 15/29] m68k: replace cpu_m68k_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 17/29] nios2: replace cpu_nios2_init() " Eduardo Habkost
` (13 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
cpu_mb_init() always falls back to TYPE_MICROBLAZE_CPU object
regardless of cpu_model. Put fallback logic into
mb_cpu_class_by_name() which would translate any cpu_model
into TYPE_MICROBLAZE_CPU class and replace cpu_mb_init()
with cpu_generic_init().
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-13-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/microblaze/cpu.h | 3 +--
target/microblaze/cpu.c | 6 ++++++
target/microblaze/translate.c | 11 -----------
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h
index 5ce4c82657..52b6b6aec7 100644
--- a/target/microblaze/cpu.h
+++ b/target/microblaze/cpu.h
@@ -331,7 +331,6 @@ int mb_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
int mb_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
void mb_tcg_init(void);
-MicroBlazeCPU *cpu_mb_init(const char *cpu_model);
/* you can call this signal handler from your SIGBUS and SIGSEGV
signal handlers to inform the virtual CPU of exceptions. non zero
is returned if the signal was handled by the virtual CPU. */
@@ -344,7 +343,7 @@ int cpu_mb_signal_handler(int host_signum, void *pinfo,
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
-#define cpu_init(cpu_model) CPU(cpu_mb_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_MICROBLAZE_CPU, cpu_model)
#define cpu_signal_handler cpu_mb_signal_handler
diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c
index f85ff01b39..ddffe86e9b 100644
--- a/target/microblaze/cpu.c
+++ b/target/microblaze/cpu.c
@@ -253,6 +253,11 @@ static Property mb_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
+static ObjectClass *mb_cpu_class_by_name(const char *cpu_model)
+{
+ return object_class_by_name(TYPE_MICROBLAZE_CPU);
+}
+
static void mb_cpu_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
@@ -265,6 +270,7 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)
mcc->parent_reset = cc->reset;
cc->reset = mb_cpu_reset;
+ cc->class_by_name = mb_cpu_class_by_name;
cc->has_work = mb_cpu_has_work;
cc->do_interrupt = mb_cpu_do_interrupt;
cc->cpu_exec_interrupt = mb_cpu_exec_interrupt;
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index a24373c0be..83e2ef4960 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -1845,17 +1845,6 @@ void mb_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf,
cpu_fprintf(f, "\n\n");
}
-MicroBlazeCPU *cpu_mb_init(const char *cpu_model)
-{
- MicroBlazeCPU *cpu;
-
- cpu = MICROBLAZE_CPU(object_new(TYPE_MICROBLAZE_CPU));
-
- object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
-
- return cpu;
-}
-
void mb_tcg_init(void)
{
int i;
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 17/29] nios2: replace cpu_nios2_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (15 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 16/29] microblaze: replace cpu_mb_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 18/29] tilegx: replace cpu_tilegx_init() " Eduardo Habkost
` (12 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
cpu_nios2_init() always falls back to TYPE_NIOS2_CPU object
regardless of cpu_model. Put fallback logic into
nios2_cpu_class_by_name() which would translate any cpu_model
into TYPE_NIOS2_CPU class and replace cpu_nios2_init()
with cpu_generic_init()
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-14-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/nios2/cpu.h | 3 +--
hw/nios2/10m50_devboard.c | 2 +-
target/nios2/cpu.c | 9 +++------
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h
index 13931f3f0b..50d803a217 100644
--- a/target/nios2/cpu.h
+++ b/target/nios2/cpu.h
@@ -212,7 +212,6 @@ static inline Nios2CPU *nios2_env_get_cpu(CPUNios2State *env)
#define ENV_OFFSET offsetof(Nios2CPU, env)
void nios2_tcg_init(void);
-Nios2CPU *cpu_nios2_init(const char *cpu_model);
void nios2_cpu_do_interrupt(CPUState *cs);
int cpu_nios2_signal_handler(int host_signum, void *pinfo, void *puc);
void dump_mmu(FILE *f, fprintf_function cpu_fprintf, CPUNios2State *env);
@@ -229,7 +228,7 @@ void nios2_check_interrupts(CPUNios2State *env);
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
-#define cpu_init(cpu_model) CPU(cpu_nios2_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_NIOS2_CPU, cpu_model)
#define cpu_gen_code cpu_nios2_gen_code
#define cpu_signal_handler cpu_nios2_signal_handler
diff --git a/hw/nios2/10m50_devboard.c b/hw/nios2/10m50_devboard.c
index b6868b8233..e4007f6d7f 100644
--- a/hw/nios2/10m50_devboard.c
+++ b/hw/nios2/10m50_devboard.c
@@ -75,7 +75,7 @@ static void nios2_10m50_ghrd_init(MachineState *machine)
phys_ram_alias);
/* Create CPU -- FIXME */
- cpu = cpu_nios2_init("nios2");
+ cpu = NIOS2_CPU(cpu_generic_init(TYPE_NIOS2_CPU, "nios2"));
/* Register: CPU interrupt controller (PIC) */
cpu_irq = nios2_cpu_pic_init(cpu);
diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c
index d56bb7245a..5b02fb67ea 100644
--- a/target/nios2/cpu.c
+++ b/target/nios2/cpu.c
@@ -83,13 +83,9 @@ static void nios2_cpu_initfn(Object *obj)
}
}
-Nios2CPU *cpu_nios2_init(const char *cpu_model)
+static ObjectClass *nios2_cpu_class_by_name(const char *cpu_model)
{
- Nios2CPU *cpu = NIOS2_CPU(object_new(TYPE_NIOS2_CPU));
-
- object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
-
- return cpu;
+ return object_class_by_name(TYPE_NIOS2_CPU);
}
static void nios2_cpu_realizefn(DeviceState *dev, Error **errp)
@@ -203,6 +199,7 @@ static void nios2_cpu_class_init(ObjectClass *oc, void *data)
ncc->parent_reset = cc->reset;
cc->reset = nios2_cpu_reset;
+ cc->class_by_name = nios2_cpu_class_by_name;
cc->has_work = nios2_cpu_has_work;
cc->do_interrupt = nios2_cpu_do_interrupt;
cc->cpu_exec_interrupt = nios2_cpu_exec_interrupt;
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 18/29] tilegx: replace cpu_tilegx_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (16 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 17/29] nios2: replace cpu_nios2_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 19/29] xtensa: replace cpu_xtensa_init() " Eduardo Habkost
` (11 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
cpu_tilegx_init() always falls back to TYPE_TILEGX_CPU object
regardless of cpu_model. Put fallback logic into
tilegx_cpu_class_by_name() which would translate any cpu_model
into TYPE_TILEGX_CPU class and replace cpu_tilegx_init()
with cpu_generic_init().
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-15-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/tilegx/cpu.h | 4 +---
target/tilegx/cpu.c | 11 +++--------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/target/tilegx/cpu.h b/target/tilegx/cpu.h
index f32be49f65..71cea04589 100644
--- a/target/tilegx/cpu.h
+++ b/target/tilegx/cpu.h
@@ -164,9 +164,7 @@ static inline TileGXCPU *tilegx_env_get_cpu(CPUTLGState *env)
void tilegx_tcg_init(void);
int cpu_tilegx_signal_handler(int host_signum, void *pinfo, void *puc);
-TileGXCPU *cpu_tilegx_init(const char *cpu_model);
-
-#define cpu_init(cpu_model) CPU(cpu_tilegx_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_TILEGX_CPU, cpu_model)
#define cpu_signal_handler cpu_tilegx_signal_handler
diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c
index 45326398cc..7345f5a8b5 100644
--- a/target/tilegx/cpu.c
+++ b/target/tilegx/cpu.c
@@ -52,15 +52,9 @@ static void tilegx_cpu_dump_state(CPUState *cs, FILE *f,
env->pc, env->spregs[TILEGX_SPR_CMPEXCH]);
}
-TileGXCPU *cpu_tilegx_init(const char *cpu_model)
+static ObjectClass *tilegx_cpu_class_by_name(const char *cpu_model)
{
- TileGXCPU *cpu;
-
- cpu = TILEGX_CPU(object_new(TYPE_TILEGX_CPU));
-
- object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
-
- return cpu;
+ return object_class_by_name(TYPE_TILEGX_CPU);
}
static void tilegx_cpu_set_pc(CPUState *cs, vaddr value)
@@ -159,6 +153,7 @@ static void tilegx_cpu_class_init(ObjectClass *oc, void *data)
tcc->parent_reset = cc->reset;
cc->reset = tilegx_cpu_reset;
+ cc->class_by_name = tilegx_cpu_class_by_name;
cc->has_work = tilegx_cpu_has_work;
cc->do_interrupt = tilegx_cpu_do_interrupt;
cc->cpu_exec_interrupt = tilegx_cpu_exec_interrupt;
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 19/29] xtensa: replace cpu_xtensa_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (17 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 18/29] tilegx: replace cpu_tilegx_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 20/29] tricore: replace cpu_tricore_init() " Eduardo Habkost
` (10 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
call xtensa_irq_init() at realize time which makes
cpu_xtensa_init() like generic cpu creation function.
As result we can replace it with cpu_generic_init()
which does the same job, reducing code duplication a bit.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-16-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/xtensa/cpu.h | 4 +---
hw/xtensa/sim.c | 2 +-
hw/xtensa/xtfpga.c | 2 +-
target/xtensa/cpu.c | 3 +++
target/xtensa/helper.c | 22 ----------------------
5 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index ee29fb1a14..48033313c5 100644
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -475,9 +475,7 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
#define XTENSA_DEFAULT_CPU_MODEL "dc232b"
#endif
-XtensaCPU *cpu_xtensa_init(const char *cpu_model);
-
-#define cpu_init(cpu_model) CPU(cpu_xtensa_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_XTENSA_CPU, cpu_model)
void xtensa_translate_init(void);
void xtensa_breakpoint_handler(CPUState *cs);
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 249cd1e8c9..1b4767f58b 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -84,7 +84,7 @@ static void xtensa_sim_init(MachineState *machine)
}
for (n = 0; n < smp_cpus; n++) {
- cpu = cpu_xtensa_init(cpu_model);
+ cpu = XTENSA_CPU(cpu_generic_init(TYPE_XTENSA_CPU, cpu_model));
if (cpu == NULL) {
error_report("unable to find CPU definition '%s'",
cpu_model);
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 635a4d4ec3..182ec1e31c 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -232,7 +232,7 @@ static void lx_init(const LxBoardDesc *board, MachineState *machine)
}
for (n = 0; n < smp_cpus; n++) {
- cpu = cpu_xtensa_init(cpu_model);
+ cpu = XTENSA_CPU(cpu_generic_init(TYPE_XTENSA_CPU, cpu_model));
if (cpu == NULL) {
error_report("unable to find CPU definition '%s'",
cpu_model);
diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index cd7f95823f..85897df0a8 100644
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -100,9 +100,12 @@ static ObjectClass *xtensa_cpu_class_by_name(const char *cpu_model)
static void xtensa_cpu_realizefn(DeviceState *dev, Error **errp)
{
CPUState *cs = CPU(dev);
+ XtensaCPU *cpu = XTENSA_CPU(dev);
XtensaCPUClass *xcc = XTENSA_CPU_GET_CLASS(dev);
Error *local_err = NULL;
+ xtensa_irq_init(&cpu->env);
+
cpu_exec_realizefn(cs, &local_err);
if (local_err != NULL) {
error_propagate(errp, local_err);
diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c
index bcd0b7738d..e8fba20918 100644
--- a/target/xtensa/helper.c
+++ b/target/xtensa/helper.c
@@ -113,28 +113,6 @@ void xtensa_breakpoint_handler(CPUState *cs)
}
}
-XtensaCPU *cpu_xtensa_init(const char *cpu_model)
-{
- ObjectClass *oc;
- XtensaCPU *cpu;
- CPUXtensaState *env;
-
- oc = cpu_class_by_name(TYPE_XTENSA_CPU, cpu_model);
- if (oc == NULL) {
- return NULL;
- }
-
- cpu = XTENSA_CPU(object_new(object_class_get_name(oc)));
- env = &cpu->env;
-
- xtensa_irq_init(env);
-
- object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
-
- return cpu;
-}
-
-
void xtensa_cpu_list(FILE *f, fprintf_function cpu_fprintf)
{
XtensaConfigList *core = xtensa_cores;
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 20/29] tricore: replace cpu_tricore_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (18 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 19/29] xtensa: replace cpu_xtensa_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 21/29] sh4: replace cpu_sh4_init() " Eduardo Habkost
` (9 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-17-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/tricore/cpu.h | 4 +---
hw/tricore/tricore_testboard.c | 2 +-
target/tricore/helper.c | 5 -----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
index a3493a123c..bc53c40774 100644
--- a/target/tricore/cpu.h
+++ b/target/tricore/cpu.h
@@ -411,9 +411,7 @@ static inline void cpu_get_tb_cpu_state(CPUTriCoreState *env, target_ulong *pc,
*flags = 0;
}
-TriCoreCPU *cpu_tricore_init(const char *cpu_model);
-
-#define cpu_init(cpu_model) CPU(cpu_tricore_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_TRICORE_CPU, cpu_model)
/* helpers.c */
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 6c574231d5..3fcd8bb70e 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -74,7 +74,7 @@ static void tricore_testboard_init(MachineState *machine, int board_id)
if (!machine->cpu_model) {
machine->cpu_model = "tc1796";
}
- cpu = cpu_tricore_init(machine->cpu_model);
+ cpu = TRICORE_CPU(cpu_generic_init(TYPE_TRICORE_CPU, machine->cpu_model));
if (!cpu) {
error_report("Unable to find CPU definition");
exit(1);
diff --git a/target/tricore/helper.c b/target/tricore/helper.c
index 3118905eca..378c2a4a76 100644
--- a/target/tricore/helper.c
+++ b/target/tricore/helper.c
@@ -78,11 +78,6 @@ int cpu_tricore_handle_mmu_fault(CPUState *cs, target_ulong address,
return ret;
}
-TriCoreCPU *cpu_tricore_init(const char *cpu_model)
-{
- return TRICORE_CPU(cpu_generic_init(TYPE_TRICORE_CPU, cpu_model));
-}
-
static void tricore_cpu_list_entry(gpointer data, gpointer user_data)
{
ObjectClass *oc = data;
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 21/29] sh4: replace cpu_sh4_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (19 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 20/29] tricore: replace cpu_tricore_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 22/29] arm: replace cpu_arm_init() " Eduardo Habkost
` (8 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-18-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/sh4/cpu.h | 3 +--
hw/sh4/r2d.c | 2 +-
hw/sh4/shix.c | 2 +-
target/sh4/cpu.c | 5 -----
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h
index 3c47f0de89..79f85d3365 100644
--- a/target/sh4/cpu.h
+++ b/target/sh4/cpu.h
@@ -238,7 +238,6 @@ void superh_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,
int mmu_idx, uintptr_t retaddr);
void sh4_translate_init(void);
-SuperHCPU *cpu_sh4_init(const char *cpu_model);
int cpu_sh4_signal_handler(int host_signum, void *pinfo,
void *puc);
int superh_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw,
@@ -269,7 +268,7 @@ int cpu_sh4_is_cached(CPUSH4State * env, target_ulong addr);
void cpu_load_tlb(CPUSH4State * env);
-#define cpu_init(cpu_model) CPU(cpu_sh4_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_SUPERH_CPU, cpu_model)
#define cpu_signal_handler cpu_sh4_signal_handler
#define cpu_list sh4_cpu_list
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index a0462adb97..22bc534e5f 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -246,7 +246,7 @@ static void r2d_init(MachineState *machine)
cpu_model = "SH7751R";
}
- cpu = cpu_sh4_init(cpu_model);
+ cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index e22eaf0c8f..7f8a4b6484 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -56,7 +56,7 @@ static void shix_init(MachineState *machine)
if (!cpu_model)
cpu_model = "any";
- cpu = cpu_sh4_init(cpu_model);
+ cpu = SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
index 8536f6d002..6ce7cba5a9 100644
--- a/target/sh4/cpu.c
+++ b/target/sh4/cpu.c
@@ -156,11 +156,6 @@ static ObjectClass *superh_cpu_class_by_name(const char *cpu_model)
return oc;
}
-SuperHCPU *cpu_sh4_init(const char *cpu_model)
-{
- return SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));
-}
-
static void sh7750r_cpu_initfn(Object *obj)
{
SuperHCPU *cpu = SUPERH_CPU(obj);
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 22/29] arm: replace cpu_arm_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (20 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 21/29] sh4: replace cpu_sh4_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 23/29] cris: replace cpu_cris_init() " Eduardo Habkost
` (7 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1503592308-93913-19-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/arm/cpu.h | 3 +--
hw/arm/musicpal.c | 2 +-
hw/arm/omap1.c | 2 +-
hw/arm/omap2.c | 2 +-
hw/arm/pxa2xx.c | 4 ++--
hw/arm/strongarm.c | 2 +-
target/arm/helper.c | 5 -----
7 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index b39d64aa0b..5932ef1e22 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -748,7 +748,6 @@ int aarch64_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
#endif
-ARMCPU *cpu_arm_init(const char *cpu_model);
target_ulong do_arm_semihosting(CPUARMState *env);
void aarch64_sync_32_to_64(CPUARMState *env);
void aarch64_sync_64_to_32(CPUARMState *env);
@@ -2001,7 +2000,7 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,
return unmasked || pstate_unmasked;
}
-#define cpu_init(cpu_model) CPU(cpu_arm_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_ARM_CPU, cpu_model)
#define cpu_signal_handler cpu_arm_signal_handler
#define cpu_list arm_cpu_list
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 7e8ab3184c..a8b3d463fc 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -1593,7 +1593,7 @@ static void musicpal_init(MachineState *machine)
if (!cpu_model) {
cpu_model = "arm926";
}
- cpu = cpu_arm_init(cpu_model);
+ cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, cpu_model));
if (!cpu) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 3d15ff6779..400ba30c94 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -3863,7 +3863,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegion *system_memory,
/* Core */
s->mpu_model = omap310;
- s->cpu = cpu_arm_init(core);
+ s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, core));
if (s->cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index bbf0b7e188..ece25ae744 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -2261,7 +2261,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegion *sysmem,
/* Core */
s->mpu_model = omap2420;
- s->cpu = cpu_arm_init(core ?: "arm1136-r2");
+ s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, core ?: "arm1136-r2"));
if (s->cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index 194b0bc808..b0ac3cfd64 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -2066,7 +2066,7 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space,
if (!revision)
revision = "pxa270";
- s->cpu = cpu_arm_init(revision);
+ s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, revision));
if (s->cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
@@ -2196,7 +2196,7 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size)
s = g_new0(PXA2xxState, 1);
- s->cpu = cpu_arm_init("pxa255");
+ s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, "pxa255"));
if (s->cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 6a45dcc009..884242b2dc 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -1597,7 +1597,7 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem,
exit(1);
}
- s->cpu = cpu_arm_init(rev);
+ s->cpu = ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, rev));
if (!s->cpu) {
error_report("Unable to find CPU definition");
diff --git a/target/arm/helper.c b/target/arm/helper.c
index fa60040361..0ec92d3214 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -5233,11 +5233,6 @@ void register_cp_regs_for_features(ARMCPU *cpu)
}
}
-ARMCPU *cpu_arm_init(const char *cpu_model)
-{
- return ARM_CPU(cpu_generic_init(TYPE_ARM_CPU, cpu_model));
-}
-
void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
{
CPUState *cs = CPU(cpu);
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 23/29] cris: replace cpu_cris_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (21 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 22/29] arm: replace cpu_arm_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 24/29] x86: replace cpu_x86_init() " Eduardo Habkost
` (6 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-20-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/cris/cpu.h | 3 +--
hw/cris/axis_dev88.c | 2 +-
target/cris/cpu.c | 5 -----
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/target/cris/cpu.h b/target/cris/cpu.h
index 920e1c33ba..5d822dee16 100644
--- a/target/cris/cpu.h
+++ b/target/cris/cpu.h
@@ -216,7 +216,6 @@ int crisv10_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
int cris_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg);
int cris_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
-CRISCPU *cpu_cris_init(const char *cpu_model);
/* you can call this signal handler from your SIGBUS and SIGSEGV
signal handlers to inform the virtual CPU of exceptions. non zero
is returned if the signal was handled by the virtual CPU. */
@@ -268,7 +267,7 @@ enum {
#define TARGET_PHYS_ADDR_SPACE_BITS 32
#define TARGET_VIRT_ADDR_SPACE_BITS 32
-#define cpu_init(cpu_model) CPU(cpu_cris_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_CRIS_CPU, cpu_model)
#define cpu_signal_handler cpu_cris_signal_handler
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 80674f6bbb..5eb552bce2 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -271,7 +271,7 @@ void axisdev88_init(MachineState *machine)
if (cpu_model == NULL) {
cpu_model = "crisv32";
}
- cpu = cpu_cris_init(cpu_model);
+ cpu = CRIS_CPU(cpu_generic_init(TYPE_CRIS_CPU, cpu_model));
env = &cpu->env;
/* allocate RAM */
diff --git a/target/cris/cpu.c b/target/cris/cpu.c
index 5f766f09d6..ceebfed79b 100644
--- a/target/cris/cpu.c
+++ b/target/cris/cpu.c
@@ -89,11 +89,6 @@ static ObjectClass *cris_cpu_class_by_name(const char *cpu_model)
return oc;
}
-CRISCPU *cpu_cris_init(const char *cpu_model)
-{
- return CRIS_CPU(cpu_generic_init(TYPE_CRIS_CPU, cpu_model));
-}
-
/* Sort alphabetically by VR. */
static gint cris_cpu_list_compare(gconstpointer a, gconstpointer b)
{
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 24/29] x86: replace cpu_x86_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (22 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 23/29] cris: replace cpu_cris_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 25/29] lm32: replace cpu_lm32_init() " Eduardo Habkost
` (5 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-21-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/i386/cpu.h | 3 +--
target/i386/cpu.c | 5 -----
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 051867399b..525d35d836 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1327,7 +1327,6 @@ int x86_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
void x86_cpu_exec_enter(CPUState *cpu);
void x86_cpu_exec_exit(CPUState *cpu);
-X86CPU *cpu_x86_init(const char *cpu_model);
void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf);
int cpu_x86_support_mca_broadcast(CPUX86State *env);
@@ -1507,7 +1506,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);
#define PHYS_ADDR_MASK MAKE_64BIT_MASK(0, TCG_PHYS_ADDR_BITS)
-#define cpu_init(cpu_model) CPU(cpu_x86_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_X86_CPU, cpu_model)
#define cpu_signal_handler cpu_x86_signal_handler
#define cpu_list x86_cpu_list
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 6617e01a72..f81576d11d 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -2686,11 +2686,6 @@ static gchar *x86_gdb_arch_name(CPUState *cs)
#endif
}
-X86CPU *cpu_x86_init(const char *cpu_model)
-{
- return X86_CPU(cpu_generic_init(TYPE_X86_CPU, cpu_model));
-}
-
static void x86_cpu_cpudef_class_init(ObjectClass *oc, void *data)
{
X86CPUDefinition *cpudef = data;
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 25/29] lm32: replace cpu_lm32_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (23 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 24/29] x86: replace cpu_x86_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 26/29] moxie: replace cpu_moxie_init() " Eduardo Habkost
` (4 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Michael Walle <michael@walle.cc>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-22-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/lm32/cpu.h | 3 +--
hw/lm32/lm32_boards.c | 4 ++--
hw/lm32/milkymist.c | 2 +-
target/lm32/helper.c | 5 -----
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/target/lm32/cpu.h b/target/lm32/cpu.h
index 1d972cb26b..de265b50d1 100644
--- a/target/lm32/cpu.h
+++ b/target/lm32/cpu.h
@@ -238,7 +238,6 @@ static inline lm32_wp_t lm32_wp_type(uint32_t dc, int idx)
return (dc >> (idx+1)*2) & 0x3;
}
-LM32CPU *cpu_lm32_init(const char *cpu_model);
/* you can call this signal handler from your SIGBUS and SIGSEGV
signal handlers to inform the virtual CPU of exceptions. non zero
is returned if the signal was handled by the virtual CPU. */
@@ -256,7 +255,7 @@ void lm32_watchpoint_insert(CPULM32State *env, int index, target_ulong address,
void lm32_watchpoint_remove(CPULM32State *env, int index);
bool lm32_cpu_do_semihosting(CPUState *cs);
-#define cpu_init(cpu_model) CPU(cpu_lm32_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_LM32_CPU, cpu_model)
#define cpu_list lm32_cpu_list
#define cpu_signal_handler cpu_lm32_signal_handler
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index 8f0c3079d6..eccf0ac5a1 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -104,7 +104,7 @@ static void lm32_evr_init(MachineState *machine)
if (cpu_model == NULL) {
cpu_model = "lm32-full";
}
- cpu = cpu_lm32_init(cpu_model);
+ cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);
exit(1);
@@ -205,7 +205,7 @@ static void lm32_uclinux_init(MachineState *machine)
if (cpu_model == NULL) {
cpu_model = "lm32-full";
}
- cpu = cpu_lm32_init(cpu_model);
+ cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);
exit(1);
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 5cae0f19dd..dffd8797bb 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -111,7 +111,7 @@ milkymist_init(MachineState *machine)
if (cpu_model == NULL) {
cpu_model = "lm32-full";
}
- cpu = cpu_lm32_init(cpu_model);
+ cpu = LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);
exit(1);
diff --git a/target/lm32/helper.c b/target/lm32/helper.c
index 891da18c30..929cc36c14 100644
--- a/target/lm32/helper.c
+++ b/target/lm32/helper.c
@@ -219,11 +219,6 @@ bool lm32_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
return false;
}
-LM32CPU *cpu_lm32_init(const char *cpu_model)
-{
- return LM32_CPU(cpu_generic_init(TYPE_LM32_CPU, cpu_model));
-}
-
/* Some soc ignores the MSB on the address bus. Thus creating a shadow memory
* area. As a general rule, 0x00000000-0x7fffffff is cached, whereas
* 0x80000000-0xffffffff is not cached and used to access IO devices. */
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 26/29] moxie: replace cpu_moxie_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (24 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 25/29] lm32: replace cpu_lm32_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 27/29] openrisc: replace cpu_openrisc_init() " Eduardo Habkost
` (3 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-23-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/moxie/cpu.h | 3 +--
hw/moxie/moxiesim.c | 2 +-
target/moxie/cpu.c | 5 -----
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h
index 8991aaef9a..75decaadd6 100644
--- a/target/moxie/cpu.h
+++ b/target/moxie/cpu.h
@@ -112,7 +112,6 @@ static inline MoxieCPU *moxie_env_get_cpu(CPUMoxieState *env)
#define ENV_OFFSET offsetof(MoxieCPU, env)
-MoxieCPU *cpu_moxie_init(const char *cpu_model);
void moxie_cpu_do_interrupt(CPUState *cs);
void moxie_cpu_dump_state(CPUState *cpu, FILE *f,
fprintf_function cpu_fprintf, int flags);
@@ -121,7 +120,7 @@ void moxie_translate_init(void);
int cpu_moxie_signal_handler(int host_signum, void *pinfo,
void *puc);
-#define cpu_init(cpu_model) CPU(cpu_moxie_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_MOXIE_CPU, cpu_model)
#define cpu_signal_handler cpu_moxie_signal_handler
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index df3f1249ae..4c27b45c46 100644
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -118,7 +118,7 @@ static void moxiesim_init(MachineState *machine)
if (cpu_model == NULL) {
cpu_model = "MoxieLite-moxie-cpu";
}
- cpu = cpu_moxie_init(cpu_model);
+ cpu = MOXIE_CPU(cpu_generic_init(TYPE_MOXIE_CPU, cpu_model));
if (!cpu) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c
index 927b1a1e44..748d02f29e 100644
--- a/target/moxie/cpu.c
+++ b/target/moxie/cpu.c
@@ -150,11 +150,6 @@ static const MoxieCPUInfo moxie_cpus[] = {
{ .name = "any", .initfn = moxie_any_initfn },
};
-MoxieCPU *cpu_moxie_init(const char *cpu_model)
-{
- return MOXIE_CPU(cpu_generic_init(TYPE_MOXIE_CPU, cpu_model));
-}
-
static void cpu_register(const MoxieCPUInfo *info)
{
TypeInfo type_info = {
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 27/29] openrisc: replace cpu_openrisc_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (25 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 26/29] moxie: replace cpu_moxie_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 28/29] unicore32: replace uc32_cpu_init() " Eduardo Habkost
` (2 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Stafford Horne <shorne@gmail.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-24-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/openrisc/cpu.h | 4 +---
hw/openrisc/openrisc_sim.c | 2 +-
target/openrisc/cpu.c | 5 -----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h
index 2721432c4f..f51b89a11c 100644
--- a/target/openrisc/cpu.h
+++ b/target/openrisc/cpu.h
@@ -347,8 +347,6 @@ static inline OpenRISCCPU *openrisc_env_get_cpu(CPUOpenRISCState *env)
#define ENV_OFFSET offsetof(OpenRISCCPU, env)
-OpenRISCCPU *cpu_openrisc_init(const char *cpu_model);
-
void cpu_openrisc_list(FILE *f, fprintf_function cpu_fprintf);
void openrisc_cpu_do_interrupt(CPUState *cpu);
bool openrisc_cpu_exec_interrupt(CPUState *cpu, int int_req);
@@ -390,7 +388,7 @@ int cpu_openrisc_get_phys_data(OpenRISCCPU *cpu,
int *prot, target_ulong address, int rw);
#endif
-#define cpu_init(cpu_model) CPU(cpu_openrisc_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_OPENRISC_CPU, cpu_model)
#include "exec/cpu-all.h"
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index e1eeffc490..243d8020db 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -109,7 +109,7 @@ static void openrisc_sim_init(MachineState *machine)
}
for (n = 0; n < smp_cpus; n++) {
- cpu = cpu_openrisc_init(cpu_model);
+ cpu = OPENRISC_CPU(cpu_generic_init(TYPE_OPENRISC_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition!\n");
exit(1);
diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c
index 1d6330cbcc..a979f0bf8b 100644
--- a/target/openrisc/cpu.c
+++ b/target/openrisc/cpu.c
@@ -210,11 +210,6 @@ static void openrisc_cpu_register_types(void)
}
}
-OpenRISCCPU *cpu_openrisc_init(const char *cpu_model)
-{
- return OPENRISC_CPU(cpu_generic_init(TYPE_OPENRISC_CPU, cpu_model));
-}
-
/* Sort alphabetically by type name, except for "any". */
static gint openrisc_cpu_list_compare(gconstpointer a, gconstpointer b)
{
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 28/29] unicore32: replace uc32_cpu_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (26 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 27/29] openrisc: replace cpu_openrisc_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-01 15:03 ` [Qemu-devel] [PULL 29/29] ppc: replace cpu_ppc_init() " Eduardo Habkost
2017-09-04 8:41 ` [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Peter Maydell
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-25-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/unicore32/cpu.h | 4 +---
hw/unicore32/puv3.c | 2 +-
target/unicore32/helper.c | 5 -----
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/target/unicore32/cpu.h b/target/unicore32/cpu.h
index 7b5b405e79..7724108281 100644
--- a/target/unicore32/cpu.h
+++ b/target/unicore32/cpu.h
@@ -165,9 +165,7 @@ static inline int cpu_mmu_index(CPUUniCore32State *env, bool ifetch)
#include "exec/cpu-all.h"
-UniCore32CPU *uc32_cpu_init(const char *cpu_model);
-
-#define cpu_init(cpu_model) CPU(uc32_cpu_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model)
static inline void cpu_get_tb_cpu_state(CPUUniCore32State *env, target_ulong *pc,
target_ulong *cs_base, uint32_t *flags)
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index ff62efb4df..eb9862fa2f 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -127,7 +127,7 @@ static void puv3_init(MachineState *machine)
cpu_model = "UniCore-II";
}
- cpu = uc32_cpu_init(cpu_model);
+ cpu = UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model));
if (!cpu) {
error_report("Unable to find CPU definition");
exit(1);
diff --git a/target/unicore32/helper.c b/target/unicore32/helper.c
index f9239dc7b8..309dcd1ae1 100644
--- a/target/unicore32/helper.c
+++ b/target/unicore32/helper.c
@@ -27,11 +27,6 @@
#define DPRINTF(fmt, ...) do {} while (0)
#endif
-UniCore32CPU *uc32_cpu_init(const char *cpu_model)
-{
- return UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model));
-}
-
#ifndef CONFIG_USER_ONLY
void helper_cp0_set(CPUUniCore32State *env, uint32_t val, uint32_t creg,
uint32_t cop)
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PULL 29/29] ppc: replace cpu_ppc_init() with cpu_generic_init()
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (27 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 28/29] unicore32: replace uc32_cpu_init() " Eduardo Habkost
@ 2017-09-01 15:03 ` Eduardo Habkost
2017-09-04 8:41 ` [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Peter Maydell
29 siblings, 0 replies; 31+ messages in thread
From: Eduardo Habkost @ 2017-09-01 15:03 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, Igor Mammedov
From: Igor Mammedov <imammedo@redhat.com>
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1503592308-93913-26-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/ppc/cpu.h | 3 +--
hw/ppc/e500.c | 3 ++-
hw/ppc/mac_newworld.c | 3 ++-
hw/ppc/mac_oldworld.c | 3 ++-
hw/ppc/ppc440_bamboo.c | 2 +-
hw/ppc/ppc4xx_devs.c | 2 +-
hw/ppc/prep.c | 5 +++--
hw/ppc/virtex_ml507.c | 2 +-
target/ppc/translate_init.c | 5 -----
9 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 46d3dd88f6..12f09492fb 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1276,7 +1276,6 @@ extern const struct VMStateDescription vmstate_ppc_cpu;
#endif
/*****************************************************************************/
-PowerPCCPU *cpu_ppc_init(const char *cpu_model);
void ppc_translate_init(void);
const char *ppc_cpu_lookup_alias(const char *alias);
/* you can call this signal handler from your SIGBUS and SIGSEGV
@@ -1353,7 +1352,7 @@ static inline uint64_t ppc_dump_gpr(CPUPPCState *env, int gprn)
int ppc_dcr_read (ppc_dcr_t *dcr_env, int dcrn, uint32_t *valp);
int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val);
-#define cpu_init(cpu_model) CPU(cpu_ppc_init(cpu_model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)
#define cpu_signal_handler cpu_ppc_signal_handler
#define cpu_list ppc_cpu_list
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 62f1857206..f0596f34ff 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -819,7 +819,8 @@ void ppce500_init(MachineState *machine, PPCE500Params *params)
CPUState *cs;
qemu_irq *input;
- cpu = cpu_ppc_init(machine->cpu_model);
+ cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,
+ machine->cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to initialize CPU!\n");
exit(1);
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 3056d5f075..d466634997 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -187,7 +187,8 @@ static void ppc_core99_init(MachineState *machine)
#endif
}
for (i = 0; i < smp_cpus; i++) {
- cpu = cpu_ppc_init(machine->cpu_model);
+ cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,
+ machine->cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC CPU definition\n");
exit(1);
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index f2ae60a360..fcac399562 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -116,7 +116,8 @@ static void ppc_heathrow_init(MachineState *machine)
if (machine->cpu_model == NULL)
machine->cpu_model = "G3";
for (i = 0; i < smp_cpus; i++) {
- cpu = cpu_ppc_init(machine->cpu_model);
+ cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,
+ machine->cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC CPU definition\n");
exit(1);
diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
index 9d997bf743..ca26398036 100644
--- a/hw/ppc/ppc440_bamboo.c
+++ b/hw/ppc/ppc440_bamboo.c
@@ -186,7 +186,7 @@ static void bamboo_init(MachineState *machine)
if (machine->cpu_model == NULL) {
machine->cpu_model = "440EP";
}
- cpu = cpu_ppc_init(machine->cpu_model);
+ cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, machine->cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to initialize CPU!\n");
exit(1);
diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c
index e7f413e49d..6b38ed7bc7 100644
--- a/hw/ppc/ppc4xx_devs.c
+++ b/hw/ppc/ppc4xx_devs.c
@@ -56,7 +56,7 @@ PowerPCCPU *ppc4xx_init(const char *cpu_model,
CPUPPCState *env;
/* init CPUs */
- cpu = cpu_ppc_init(cpu_model);
+ cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC %s CPU definition\n",
cpu_model);
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 36d3dcd89a..00f3321a60 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -520,7 +520,8 @@ static void ppc_prep_init(MachineState *machine)
if (machine->cpu_model == NULL)
machine->cpu_model = "602";
for (i = 0; i < smp_cpus; i++) {
- cpu = cpu_ppc_init(machine->cpu_model);
+ cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU,
+ machine->cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC CPU definition\n");
exit(1);
@@ -724,7 +725,7 @@ static void ibm_40p_init(MachineState *machine)
if (!machine->cpu_model) {
machine->cpu_model = "604";
}
- cpu = cpu_ppc_init(machine->cpu_model);
+ cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, machine->cpu_model));
if (!cpu) {
error_report("could not initialize CPU '%s'",
machine->cpu_model);
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index fdbcf22a0c..d5fdc16b59 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -96,7 +96,7 @@ static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size,
CPUPPCState *env;
qemu_irq *irqs;
- cpu = cpu_ppc_init(cpu_model);
+ cpu = POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model));
if (cpu == NULL) {
fprintf(stderr, "Unable to initialize CPU!\n");
exit(1);
diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c
index 8fb407ed73..43be9a8331 100644
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -10271,11 +10271,6 @@ const char *ppc_cpu_lookup_alias(const char *alias)
return NULL;
}
-PowerPCCPU *cpu_ppc_init(const char *cpu_model)
-{
- return POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model));
-}
-
PowerPCCPUClass *ppc_cpu_get_family_class(PowerPCCPUClass *pcc)
{
ObjectClass *oc = OBJECT_CLASS(pcc);
--
2.13.5
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01
2017-09-01 15:02 [Qemu-devel] [PULL 00/29] x86 & cpu queue, 2017-09-01 Eduardo Habkost
` (28 preceding siblings ...)
2017-09-01 15:03 ` [Qemu-devel] [PULL 29/29] ppc: replace cpu_ppc_init() " Eduardo Habkost
@ 2017-09-04 8:41 ` Peter Maydell
29 siblings, 0 replies; 31+ messages in thread
From: Peter Maydell @ 2017-09-04 8:41 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: QEMU Developers
On 1 September 2017 at 16:02, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The following changes since commit 223cd0e13f2e46078d7b573f0b8402bfbee339be:
>
> Merge remote-tracking branch 'remotes/elmarco/tags/tidy-pull-request' into staging (2017-08-31 15:52:43 +0100)
>
> are available in the git repository at:
>
> git://github.com/ehabkost/qemu.git tags/x86-and-machine-pull-request
>
> for you to fetch changes up to 84efa64c6092232dec06583d2ce104587a70e7fc:
>
> ppc: replace cpu_ppc_init() with cpu_generic_init() (2017-09-01 11:54:25 -0300)
>
> ----------------------------------------------------------------
> x86, cpu queue, 2017-09-01
>
> CPU creation refactor plus x86 patches.
>
> ----------------------------------------------------------------
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread