* [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers
@ 2017-08-18 10:08 Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 01/27] sparc: convert cpu models to SPARC cpu subclasses Igor Mammedov
` (26 more replies)
0 siblings, 27 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
ChangeLog:
* rebase on top of rc3
* drop MIPS CPU QOMifying patches as it's superseeded
by another series: "[PATCH 0/8] QOMify MIPS cpu"
https://lists.gnu.org/archive/html/qemu-devel/2017-08/msg03041.html
* new patch to hide plus/minus features handling inside of feature parsing:
"target-i386: cpu: convert plus/minus properties to global properties"
* SPARC: make base CPU class abstract
While looking at ways to to get rid of ad-hoc cpu_model
parsing in every machine/*-user and unifying -cpu option
parsing, making it generic, I've noticed that most of
the targets have cpu_FOO_init() helper that does nothing
except of calling cpu_generic_init() and a few that do
additional ad-hoc cpu initialization outside of QOM model.
The most of the later could be easily fixed and
the 2 remaining mips/sparc targets are missing proper
conversion of cpu models to cpu subclasses and/or
cpu features to properties, with that fixed it's
possible get rid of custom cpu_FOO_init() helpers and
reuse cpu_generic_init() instead (which reduces code
size quite a bit).
That's what this series (1st part of cpu_model unification) does.
Patches:
* 1-8: complete QOMifying SPARC cpu including features into properties
conversion and cpu models into classes so it could use
cpu_generic_init() to create cpus.
above patches care only about completing CPU QOMinfication and
might be not pretty or clean as they could be,
but leave cleanups and follow up code simplification is way out of scope
and (might|should) be done on top by respective maintainers or someone
who cares about it.
* the rest of the patches are just replacing custom cpu_FOO_init()
with cpu_generic_init() and sometimes dealing with target
specific oddities in handling cpu name to typename conversion
git tree for testing/viewing:
https://github.com/imammedo/qemu.git cpu_init_def_target_cpu_V2
https://github.com/imammedo/qemu/commits/cpu_init_def_target_cpu_V2
Ref to v1:
https://lists.gnu.org/archive/html/qemu-devel/2017-07/msg04414.html
PS:
SPARC are the only targets that received 'heavy' refactoring
so I've treated them with more manual testing the rest of series if
slightly tested /make check for softmmu targets and running busybox for
the most of *-linux targets /, and not regressions were noticed.
And now about follow up series, as end result of unificathion,
I'm looking for:
- replacing many ad-hoc ways of specifying default cpu with
a one generic way
- cpu_model parsing done with common cpu_model_helper that
will be called from 3 places: generic machine code and [linux|bsd]-user
- cpu_model_helper returning cpu type name that
the rest of the code will deal with
- get rid of cpu_init() and leave only cpu_generic_init() throughout the tree
- make cpu_model_helper usable at pre machine_init() time
so that commands like hotplugable-cpus could be used
in with HMP/QMP preconfiguration interface I'm working on.
(it's the real reason why I'm doing all of of this)
Igor Mammedov (27):
sparc: convert cpu models to SPARC cpu subclasses
sparc: embed sparc_def_t into CPUSPARCState
sparc: convert cpu features to qdev properties
sparc: move adhoc CPUSPARCState initialization to realize time
target-i386: cpu: convert plus/minus properties to global properties
x86: extract legacy cpu features format parser
sparc: replace custom cpu feature parsing with
cpu_legacy_parse_featurestr()
sparc: replace cpu_sparc_init() with cpu_generic_init()
s390x: replace cpu_s390x_init() with cpu_generic_init()
alpha: replace cpu_alpha_init() with cpu_generic_init()
hppa: replace cpu_hppa_init() with cpu_generic_init()
m68k: replace cpu_m68k_init() with cpu_generic_init()
microblaze: replace cpu_mb_init() with cpu_generic_init()
nios2: replace cpu_nios2_init() with cpu_generic_init()
tilegx: replace cpu_tilegx_init() with cpu_generic_init()
xtensa: replace cpu_xtensa_init() with cpu_generic_init()
tricore: replace cpu_tricore_init() with cpu_generic_init()
sh4: replace cpu_sh4_init() with cpu_generic_init()
arm: replace cpu_arm_init() with cpu_generic_init()
cris: replace cpu_cris_init() with cpu_generic_init()
x86: replace cpu_x86_init() with cpu_generic_init()
lm32: replace cpu_lm32_init() with cpu_generic_init()
moxie: replace cpu_moxie_init() with cpu_generic_init()
openrisc: replace cpu_openrisc_init() with cpu_generic_init()
unicore32: replace uc32_cpu_init() with cpu_generic_init()
ppc: replace cpu_ppc_init() with cpu_generic_init()
fix build failure in nbd_read_reply_entry()
include/qom/cpu.h | 2 +
linux-user/sparc/target_syscall.h | 2 +-
target/alpha/cpu.h | 4 +-
target/arm/cpu.h | 3 +-
target/cris/cpu.h | 3 +-
target/hppa/cpu.h | 4 +-
target/i386/cpu.h | 3 +-
target/lm32/cpu.h | 3 +-
target/m68k/cpu.h | 3 +-
target/microblaze/cpu.h | 3 +-
target/moxie/cpu.h | 3 +-
target/nios2/cpu.h | 3 +-
target/openrisc/cpu.h | 4 +-
target/ppc/cpu.h | 3 +-
target/s390x/cpu.h | 3 +-
target/sh4/cpu.h | 3 +-
target/sparc/cpu-qom.h | 2 +
target/sparc/cpu.h | 11 +-
target/tilegx/cpu.h | 4 +-
target/tricore/cpu.h | 4 +-
target/unicore32/cpu.h | 4 +-
target/xtensa/cpu.h | 4 +-
block/nbd-client.c | 2 +-
default-configs/i386-bsd-user.mak | 1 +
default-configs/i386-linux-user.mak | 1 +
default-configs/i386-softmmu.mak | 1 +
default-configs/sparc-bsd-user.mak | 1 +
default-configs/sparc-linux-user.mak | 1 +
default-configs/sparc-softmmu.mak | 1 +
default-configs/sparc32plus-linux-user.mak | 1 +
default-configs/sparc64-bsd-user.mak | 1 +
default-configs/sparc64-linux-user.mak | 1 +
default-configs/sparc64-softmmu.mak | 1 +
default-configs/x86_64-bsd-user.mak | 1 +
default-configs/x86_64-linux-user.mak | 1 +
default-configs/x86_64-softmmu.mak | 1 +
hw/alpha/dp264.c | 8 +-
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 +-
hw/cris/axis_dev88.c | 2 +-
hw/lm32/lm32_boards.c | 4 +-
hw/lm32/milkymist.c | 2 +-
hw/m68k/an5206.c | 2 +-
hw/m68k/mcf5208.c | 2 +-
hw/moxie/moxiesim.c | 2 +-
hw/nios2/10m50_devboard.c | 2 +-
hw/openrisc/openrisc_sim.c | 2 +-
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 +-
hw/sh4/r2d.c | 2 +-
hw/sh4/shix.c | 2 +-
hw/sparc/leon3.c | 2 +-
hw/sparc/sun4m.c | 2 +-
hw/sparc64/sparc64.c | 2 +-
hw/tricore/tricore_testboard.c | 2 +-
hw/unicore32/puv3.c | 2 +-
hw/xtensa/sim.c | 2 +-
hw/xtensa/xtfpga.c | 2 +-
target/alpha/cpu.c | 20 +-
target/arm/helper.c | 5 -
target/cris/cpu.c | 5 -
target/hppa/cpu.c | 11 +-
target/i386/cpu.c | 170 +--------------
target/lm32/helper.c | 5 -
target/m68k/cpu.c | 2 +
target/m68k/helper.c | 20 --
target/microblaze/cpu.c | 6 +
target/microblaze/translate.c | 11 -
target/moxie/cpu.c | 5 -
target/nios2/cpu.c | 9 +-
target/openrisc/cpu.c | 5 -
target/ppc/translate_init.c | 5 -
target/s390x/cpu.c | 7 +
target/s390x/helper.c | 14 --
target/sh4/cpu.c | 5 -
target/sparc/cpu.c | 329 +++++++++++++----------------
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 +-
target/tilegx/cpu.c | 11 +-
target/tricore/helper.c | 5 -
target/unicore32/helper.c | 5 -
target/xtensa/cpu.c | 3 +
target/xtensa/helper.c | 22 --
util/Makefile.objs | 1 +
util/legacy_cpu_features_parser.c | 161 ++++++++++++++
97 files changed, 443 insertions(+), 594 deletions(-)
create mode 100644 util/legacy_cpu_features_parser.c
--
2.7.4
^ permalink raw reply [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 01/27] sparc: convert cpu models to SPARC cpu subclasses
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 19:00 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 02/27] sparc: embed sparc_def_t into CPUSPARCState Igor Mammedov
` (25 subsequent siblings)
26 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
Cc: Mark Cave-Ayland, Artyom Tarasenko, Philippe Mathieu-Daudé
QOMfy cpu models handling introducing propper cpu types
for each cpu model.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
with this and conversion of features to properties,
it would be possible to replace cpu_sparc_init() with
cpu_generic_init() and reuse common -cpu handling
infrastructure.
CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Artyom Tarasenko <atar4qemu@gmail.com>
CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
v2:
* make base class abstract (Philippe Mathieu-Daudé <f4bug@amsat.org>)
---
target/sparc/cpu-qom.h | 2 +
target/sparc/cpu.c | 121 +++++++++++++++++++++++++++++++++----------------
2 files changed, 84 insertions(+), 39 deletions(-)
diff --git a/target/sparc/cpu-qom.h b/target/sparc/cpu-qom.h
index f63af72..af6d57a 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 d606eb5..2994c09 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,19 @@ 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);
+ if (oc == NULL) {
+ g_free(str);
+ return NULL;
+ }
+ g_free(str);
- 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 +554,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 +780,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 +839,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 +847,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 +871,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 +906,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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 02/27] sparc: embed sparc_def_t into CPUSPARCState
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 01/27] sparc: convert cpu models to SPARC cpu subclasses Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-24 2:45 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties Igor Mammedov
` (24 subsequent siblings)
26 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
Cc: Riku Voipio, Laurent Vivier, Mark Cave-Ayland, Artyom Tarasenko
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>
---
Embedded CPUSPARCState::def also needed for follow up patch
to use its fields with static qdev properties.
CC: Riku Voipio <riku.voipio@iki.fi>
CC: Laurent Vivier <laurent@vivier.eu>
CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Artyom Tarasenko <atar4qemu@gmail.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 f97aa6b..5f09abf 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 95a36a4..0e41916 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 2994c09..f4e7343 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;
}
@@ -558,7 +558,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;
@@ -819,8 +819,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
@@ -848,15 +848,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)
@@ -905,7 +899,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 eec9a4d..c772492 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 f942973..f3e7f32 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 57968d9..fb489cb 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 8b4664d..126ea5e 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 3bde47b..6290705 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 154279e..8290a21 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 01/27] sparc: convert cpu models to SPARC cpu subclasses Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 02/27] sparc: embed sparc_def_t into CPUSPARCState Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 18:24 ` Eduardo Habkost
2017-08-24 13:32 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 04/27] sparc: move adhoc CPUSPARCState initialization to realize time Igor Mammedov
` (23 subsequent siblings)
26 siblings, 2 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Mark Cave-Ayland, Artyom Tarasenko, Eduardo Habkost
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>
---
CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Artyom Tarasenko <atar4qemu@gmail.com>
CC: 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 f4e7343..e735d73 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
@@ -853,6 +855,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);
@@ -861,6 +926,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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 04/27] sparc: move adhoc CPUSPARCState initialization to realize time
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (2 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-24 2:47 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 05/27] target-i386: cpu: convert plus/minus properties to global properties Igor Mammedov
` (22 subsequent siblings)
26 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Mark Cave-Ayland, Artyom Tarasenko
SPARCCPU::env was initialized from previosuly 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>
---
CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Artyom Tarasenko <atar4qemu@gmail.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 e735d73..7f74b1c 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;
}
@@ -817,15 +803,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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 05/27] target-i386: cpu: convert plus/minus properties to global properties
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (3 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 04/27] sparc: move adhoc CPUSPARCState initialization to realize time Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser Igor Mammedov
` (21 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Eduardo Habkost, Mark Cave-Ayland,
Artyom Tarasenko, Philippe Mathieu-Daudé
Since
(commit d4a606b3 i386: Don't override -cpu options on -cpu host/max)
it became possible to delete hack where it was necessary to
postpone applying plus/minus features to realize time
after max_features were applied to keep legacy +-feat
override semantics.
with above commit it's possible to convert +-feat to a set
of GlobalProperty items and keep +-feat override semantics,
these properties should be added to global list at the end
to override properties that were set with feat=on|off syntax.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
CC: Richard Henderson <rth@twiddle.net>
CC: Eduardo Habkost <ehabkost@redhat.com>
CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Artyom Tarasenko <atar4qemu@gmail.com>
CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/i386/cpu.c | 108 ++++++++++++++++++++----------------------------------
1 file changed, 40 insertions(+), 68 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ddc45ab..84f552d 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -2058,23 +2058,32 @@ static const char *x86_cpu_feature_name(FeatureWord w, int bitnr)
return feature_word_info[w].feat_names[bitnr];
}
-/* Compatibily hack to maintain legacy +-feat semantic,
- * where +-feat overwrites any feature set by
- * feat=on|feat even if the later is parsed after +-feat
- * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
- */
-static GList *plus_features, *minus_features;
-
static gint compare_string(gconstpointer a, gconstpointer b)
{
return g_strcmp0(a, b);
}
-/* Parse "+feature,-feature,feature=foo" CPU feature string
- */
+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);
+}
+
+/* Parse "+feature,-feature,feature=foo" CPU feature string */
static void x86_cpu_parse_featurestr(const char *typename, char *features,
Error **errp)
{
+ /* Compatibily hack to maintain legacy +-feat semantic,
+ * where +-feat overwrites any feature set by
+ * feat=on|feat even if the later is parsed after +-feat
+ * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
+ */
+ GList *l, *plus_features = NULL, *minus_features = NULL;
char *featurestr; /* Single 'key=value" string being parsed */
static bool cpu_globals_initialized;
bool ambiguous = false;
@@ -2095,7 +2104,6 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
const char *val = NULL;
char *eq = NULL;
char num[32];
- GlobalProperty *prop;
/* Compatibility syntax: */
if (featurestr[0] == '+') {
@@ -2147,21 +2155,32 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features,
name = "tsc-frequency";
}
- 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);
+ cpu_add_feat_as_prop(typename, name, val);
}
if (ambiguous) {
warn_report("Compatibility of ambiguous CPU model "
"strings won't be kept on future QEMU versions");
}
+
+ for (l = plus_features; l; l = l->next) {
+ const char *name = l->data;
+ cpu_add_feat_as_prop(typename, name, "on");
+ }
+ if (plus_features) {
+ g_list_free_full(plus_features, g_free);
+ }
+
+ for (l = minus_features; l; l = l->next) {
+ const char *name = l->data;
+ cpu_add_feat_as_prop(typename, name, "off");
+ }
+ if (minus_features) {
+ g_list_free_full(minus_features, g_free);
+ }
}
-static void x86_cpu_expand_features(X86CPU *cpu, Error **errp);
+static void x86_cpu_expand_features(X86CPU *cpu);
static int x86_cpu_filter_features(X86CPU *cpu);
/* Check for missing features that may prevent the CPU class from
@@ -2172,7 +2191,6 @@ static void x86_cpu_class_check_missing_features(X86CPUClass *xcc,
{
X86CPU *xc;
FeatureWord w;
- Error *err = NULL;
strList **next = missing_feats;
if (xcc->kvm_required && !kvm_enabled()) {
@@ -2184,18 +2202,7 @@ static void x86_cpu_class_check_missing_features(X86CPUClass *xcc,
xc = X86_CPU(object_new(object_class_get_name(OBJECT_CLASS(xcc))));
- x86_cpu_expand_features(xc, &err);
- if (err) {
- /* Errors at x86_cpu_expand_features should never happen,
- * but in case it does, just report the model as not
- * runnable at all using the "type" property.
- */
- strList *new = g_new0(strList, 1);
- new->value = g_strdup("type");
- *next = new;
- next = &new->next;
- }
-
+ x86_cpu_expand_features(xc);
x86_cpu_filter_features(xc);
for (w = 0; w < FEATURE_WORDS; w++) {
@@ -2559,11 +2566,7 @@ static X86CPU *x86_cpu_from_model(const char *model, QDict *props, Error **errp)
}
}
- x86_cpu_expand_features(xc, &err);
- if (err) {
- goto out;
- }
-
+ x86_cpu_expand_features(xc);
out:
if (err) {
error_propagate(errp, err);
@@ -3453,18 +3456,11 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu)
/* Expand CPU configuration data, based on configured features
* and host/accelerator capabilities when appropriate.
*/
-static void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
+static void x86_cpu_expand_features(X86CPU *cpu)
{
CPUX86State *env = &cpu->env;
FeatureWord w;
- GList *l;
- Error *local_err = NULL;
- /*TODO: Now cpu->max_features doesn't overwrite features
- * set using QOM properties, and we can convert
- * plus_features & minus_features to global properties
- * inside x86_cpu_parse_featurestr() too.
- */
if (cpu->max_features) {
for (w = 0; w < FEATURE_WORDS; w++) {
/* Override only features that weren't set explicitly
@@ -3476,22 +3472,6 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
}
}
- for (l = plus_features; l; l = l->next) {
- const char *prop = l->data;
- object_property_set_bool(OBJECT(cpu), true, prop, &local_err);
- if (local_err) {
- goto out;
- }
- }
-
- for (l = minus_features; l; l = l->next) {
- const char *prop = l->data;
- object_property_set_bool(OBJECT(cpu), false, prop, &local_err);
- if (local_err) {
- goto out;
- }
- }
-
if (!kvm_enabled() || !cpu->expose_kvm) {
env->features[FEAT_KVM] = 0;
}
@@ -3527,11 +3507,6 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
if (env->cpuid_xlevel2 == UINT32_MAX) {
env->cpuid_xlevel2 = env->cpuid_min_xlevel2;
}
-
-out:
- if (local_err != NULL) {
- error_propagate(errp, local_err);
- }
}
/*
@@ -3587,10 +3562,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
return;
}
- x86_cpu_expand_features(cpu, &local_err);
- if (local_err) {
- goto out;
- }
+ x86_cpu_expand_features(cpu);
if (x86_cpu_filter_features(cpu) &&
(cpu->check_cpuid || cpu->enforce_cpuid)) {
--
2.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (4 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 05/27] target-i386: cpu: convert plus/minus properties to global properties Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 18:08 ` Eduardo Habkost
2017-08-23 14:34 ` Eduardo Habkost
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 07/27] sparc: replace custom cpu feature parsing with cpu_legacy_parse_featurestr() Igor Mammedov
` (20 subsequent siblings)
26 siblings, 2 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
Cc: Richard Henderson, Eduardo Habkost, Mark Cave-Ayland,
Artyom Tarasenko, Philippe Mathieu-Daudé
Move cpu_model +-feat parsing into a separate file so that it
could be reused later for parsing similar format of sparc target
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
CC: Richard Henderson <rth@twiddle.net>
CC: Eduardo Habkost <ehabkost@redhat.com>
CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Artyom Tarasenko <atar4qemu@gmail.com>
CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
include/qom/cpu.h | 2 +
default-configs/i386-bsd-user.mak | 1 +
default-configs/i386-linux-user.mak | 1 +
default-configs/i386-softmmu.mak | 1 +
default-configs/x86_64-bsd-user.mak | 1 +
default-configs/x86_64-linux-user.mak | 1 +
default-configs/x86_64-softmmu.mak | 1 +
target/i386/cpu.c | 125 +-------------------------
util/Makefile.objs | 1 +
util/legacy_cpu_features_parser.c | 161 ++++++++++++++++++++++++++++++++++
10 files changed, 171 insertions(+), 124 deletions(-)
create mode 100644 util/legacy_cpu_features_parser.c
diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 25eefea..30247dc 100644
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -1038,4 +1038,6 @@ extern const struct VMStateDescription vmstate_cpu_common;
#define UNASSIGNED_CPU_INDEX -1
+void cpu_legacy_parse_featurestr(const char *typename, char *features,
+ Error **errp);
#endif
diff --git a/default-configs/i386-bsd-user.mak b/default-configs/i386-bsd-user.mak
index af1b31a..b28a05f 100644
--- a/default-configs/i386-bsd-user.mak
+++ b/default-configs/i386-bsd-user.mak
@@ -1 +1,2 @@
# Default configuration for i386-bsd-user
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/i386-linux-user.mak b/default-configs/i386-linux-user.mak
index 8657e68..c136967 100644
--- a/default-configs/i386-linux-user.mak
+++ b/default-configs/i386-linux-user.mak
@@ -1 +1,2 @@
# Default configuration for i386-linux-user
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index d2ab2f6..e3e7c0e 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -59,3 +59,4 @@ CONFIG_SMBIOS=y
CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
CONFIG_PXB=y
CONFIG_ACPI_VMGENID=y
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/x86_64-bsd-user.mak b/default-configs/x86_64-bsd-user.mak
index 73e5d34..952323c 100644
--- a/default-configs/x86_64-bsd-user.mak
+++ b/default-configs/x86_64-bsd-user.mak
@@ -1 +1,2 @@
# Default configuration for x86_64-bsd-user
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/x86_64-linux-user.mak b/default-configs/x86_64-linux-user.mak
index bec1d9e..b513ef2 100644
--- a/default-configs/x86_64-linux-user.mak
+++ b/default-configs/x86_64-linux-user.mak
@@ -1 +1,2 @@
# Default configuration for x86_64-linux-user
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 9bde2f1..6594ddf 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -59,3 +59,4 @@ CONFIG_SMBIOS=y
CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
CONFIG_PXB=y
CONFIG_ACPI_VMGENID=y
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 84f552d..ac60c1a 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -17,7 +17,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
-#include "qemu/cutils.h"
#include "cpu.h"
#include "exec/exec-all.h"
@@ -2030,13 +2029,6 @@ static const PropertyInfo qdev_prop_spinlocks = {
/* Convert all '_' in a feature string option name to '-', to make feature
* name conform to QOM property naming rule, which uses '-' instead of '_'.
*/
-static inline void feat2prop(char *s)
-{
- while ((s = strchr(s, '_'))) {
- *s = '-';
- }
-}
-
/* Return the feature property name for a feature flag bit */
static const char *x86_cpu_feature_name(FeatureWord w, int bitnr)
{
@@ -2058,126 +2050,11 @@ static const char *x86_cpu_feature_name(FeatureWord w, int bitnr)
return feature_word_info[w].feat_names[bitnr];
}
-static gint compare_string(gconstpointer a, gconstpointer b)
-{
- return g_strcmp0(a, b);
-}
-
-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);
-}
-
/* Parse "+feature,-feature,feature=foo" CPU feature string */
static void x86_cpu_parse_featurestr(const char *typename, char *features,
Error **errp)
{
- /* Compatibily hack to maintain legacy +-feat semantic,
- * where +-feat overwrites any feature set by
- * feat=on|feat even if the later is parsed after +-feat
- * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
- */
- GList *l, *plus_features = NULL, *minus_features = NULL;
- char *featurestr; /* Single 'key=value" string being parsed */
- static bool cpu_globals_initialized;
- bool ambiguous = false;
-
- if (cpu_globals_initialized) {
- return;
- }
- cpu_globals_initialized = true;
-
- if (!features) {
- return;
- }
-
- for (featurestr = strtok(features, ",");
- featurestr;
- featurestr = strtok(NULL, ",")) {
- const char *name;
- const char *val = NULL;
- char *eq = NULL;
- char num[32];
-
- /* 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;
- }
-
- eq = strchr(featurestr, '=');
- if (eq) {
- *eq++ = 0;
- val = eq;
- } else {
- val = "on";
- }
-
- feat2prop(featurestr);
- name = featurestr;
-
- if (g_list_find_custom(plus_features, name, compare_string)) {
- warn_report("Ambiguous CPU model string. "
- "Don't mix both \"+%s\" and \"%s=%s\"",
- name, name, val);
- ambiguous = true;
- }
- if (g_list_find_custom(minus_features, name, compare_string)) {
- warn_report("Ambiguous CPU model string. "
- "Don't mix both \"-%s\" and \"%s=%s\"",
- name, name, val);
- ambiguous = true;
- }
-
- /* Special case: */
- if (!strcmp(name, "tsc-freq")) {
- int ret;
- uint64_t tsc_freq;
-
- ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
- if (ret < 0 || tsc_freq > INT64_MAX) {
- error_setg(errp, "bad numerical value %s", val);
- return;
- }
- snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
- val = num;
- name = "tsc-frequency";
- }
-
- cpu_add_feat_as_prop(typename, name, val);
- }
-
- if (ambiguous) {
- warn_report("Compatibility of ambiguous CPU model "
- "strings won't be kept on future QEMU versions");
- }
-
- for (l = plus_features; l; l = l->next) {
- const char *name = l->data;
- cpu_add_feat_as_prop(typename, name, "on");
- }
- if (plus_features) {
- g_list_free_full(plus_features, g_free);
- }
-
- for (l = minus_features; l; l = l->next) {
- const char *name = l->data;
- cpu_add_feat_as_prop(typename, name, "off");
- }
- if (minus_features) {
- g_list_free_full(minus_features, g_free);
- }
+ cpu_legacy_parse_featurestr(typename, features, errp);
}
static void x86_cpu_expand_features(X86CPU *cpu);
diff --git a/util/Makefile.objs b/util/Makefile.objs
index 50a55ec..14e28f7 100644
--- a/util/Makefile.objs
+++ b/util/Makefile.objs
@@ -45,3 +45,4 @@ util-obj-y += qht.o
util-obj-y += range.o
util-obj-y += stats64.o
util-obj-y += systemd.o
+util-obj-$(CONFIG_LEGACY_CPU_FEATURES) += legacy_cpu_features_parser.o
diff --git a/util/legacy_cpu_features_parser.c b/util/legacy_cpu_features_parser.c
new file mode 100644
index 0000000..6b352a3
--- /dev/null
+++ b/util/legacy_cpu_features_parser.c
@@ -0,0 +1,161 @@
+/* Support for legacy -cpu cpu,features CLI option with +-feat syntax,
+ * used by x86/sparc targets
+ *
+ * Author: Andreas Färber <afaerber@suse.de>
+ * Author: Andre Przywara <andre.przywara@amd.com>
+ * Author: Eduardo Habkost <ehabkost@redhat.com>
+ * Author: Igor Mammedov <imammedo@redhat.com>
+ * Author: Paolo Bonzini <pbonzini@redhat.com>
+ * Author: Markus Armbruster <armbru@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qemu/cutils.h"
+#include "qom/cpu.h"
+#include "qemu/error-report.h"
+#include "hw/qdev-properties.h"
+
+static inline void feat2prop(char *s)
+{
+ while ((s = strchr(s, '_'))) {
+ *s = '-';
+ }
+}
+
+static gint compare_string(gconstpointer a, gconstpointer b)
+{
+ return g_strcmp0(a, b);
+}
+
+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);
+}
+
+/* DO NOT USE WITH NEW CODE
+ * Parse "+feature,-feature,feature=foo" CPU feature string
+ */
+void cpu_legacy_parse_featurestr(const char *typename, char *features,
+ Error **errp)
+{
+ /* Compatibily hack to maintain legacy +-feat semantic,
+ * where +-feat overwrites any feature set by
+ * feat=on|feat even if the later is parsed after +-feat
+ * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
+ */
+ GList *l, *plus_features = NULL, *minus_features = NULL;
+ char *featurestr; /* Single 'key=value" string being parsed */
+ static bool cpu_globals_initialized;
+ bool ambiguous = false;
+
+ if (cpu_globals_initialized) {
+ return;
+ }
+ cpu_globals_initialized = true;
+
+ if (!features) {
+ return;
+ }
+
+ for (featurestr = strtok(features, ",");
+ featurestr;
+ featurestr = strtok(NULL, ",")) {
+ const char *name;
+ const char *val = NULL;
+ char *eq = NULL;
+ char num[32];
+
+ /* 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;
+ }
+
+ eq = strchr(featurestr, '=');
+ if (eq) {
+ *eq++ = 0;
+ val = eq;
+ } else {
+ val = "on";
+ }
+
+ feat2prop(featurestr);
+ name = featurestr;
+
+ if (g_list_find_custom(plus_features, name, compare_string)) {
+ warn_report("Ambiguous CPU model string. "
+ "Don't mix both \"+%s\" and \"%s=%s\"",
+ name, name, val);
+ ambiguous = true;
+ }
+ if (g_list_find_custom(minus_features, name, compare_string)) {
+ warn_report("Ambiguous CPU model string. "
+ "Don't mix both \"-%s\" and \"%s=%s\"",
+ name, name, val);
+ ambiguous = true;
+ }
+
+ /* Special case: */
+ if (!strcmp(name, "tsc-freq")) {
+ int ret;
+ uint64_t tsc_freq;
+
+ ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
+ if (ret < 0 || tsc_freq > INT64_MAX) {
+ error_setg(errp, "bad numerical value %s", val);
+ return;
+ }
+ snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
+ val = num;
+ name = "tsc-frequency";
+ }
+
+ cpu_add_feat_as_prop(typename, name, val);
+ }
+
+ if (ambiguous) {
+ warn_report("Compatibility of ambiguous CPU model "
+ "strings won't be kept on future QEMU versions");
+ }
+
+ for (l = plus_features; l; l = l->next) {
+ const char *name = l->data;
+ cpu_add_feat_as_prop(typename, name, "on");
+ }
+ if (plus_features) {
+ g_list_free_full(plus_features, g_free);
+ }
+
+ for (l = minus_features; l; l = l->next) {
+ const char *name = l->data;
+ cpu_add_feat_as_prop(typename, name, "off");
+ }
+ if (minus_features) {
+ g_list_free_full(minus_features, g_free);
+ }
+}
--
2.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 07/27] sparc: replace custom cpu feature parsing with cpu_legacy_parse_featurestr()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (5 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-24 13:27 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init() Igor Mammedov
` (19 subsequent siblings)
26 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
Cc: Riku Voipio, Laurent Vivier, Mark Cave-Ayland, Artyom Tarasenko
with features converted to properties we can reuse shared
with x86 cpu_legacy_parse_featurestr() for features parsing
and drop legacy parser that manipulated CPU directly.
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>
---
CC: Riku Voipio <riku.voipio@iki.fi>
CC: Laurent Vivier <laurent@vivier.eu>
CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Artyom Tarasenko <atar4qemu@gmail.com>
v2:
* use new cpu_legacy_parse_featurestr() without
plus_features/minus_features
* drop cpu_legacy_apply_features() as it's been removed in
previuos patch and new cpu_legacy_parse_featurestr()
does its job
---
default-configs/sparc-bsd-user.mak | 1 +
default-configs/sparc-linux-user.mak | 1 +
default-configs/sparc-softmmu.mak | 1 +
default-configs/sparc32plus-linux-user.mak | 1 +
default-configs/sparc64-bsd-user.mak | 1 +
default-configs/sparc64-linux-user.mak | 1 +
default-configs/sparc64-softmmu.mak | 1 +
target/sparc/cpu.c | 146 +----------------------------
8 files changed, 12 insertions(+), 141 deletions(-)
diff --git a/default-configs/sparc-bsd-user.mak b/default-configs/sparc-bsd-user.mak
index 21e0950..caea9ea 100644
--- a/default-configs/sparc-bsd-user.mak
+++ b/default-configs/sparc-bsd-user.mak
@@ -1 +1,2 @@
# Default configuration for sparc-bsd-user
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/sparc-linux-user.mak b/default-configs/sparc-linux-user.mak
index 9c716d1..0f23504 100644
--- a/default-configs/sparc-linux-user.mak
+++ b/default-configs/sparc-linux-user.mak
@@ -1 +1,2 @@
# Default configuration for sparc-linux-user
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 004b0f4..d8fa9fd 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -18,3 +18,4 @@ CONFIG_GRLIB=y
CONFIG_STP2000=y
CONFIG_ECCMEMCTL=y
CONFIG_SUN4M=y
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/sparc32plus-linux-user.mak b/default-configs/sparc32plus-linux-user.mak
index 432e880..e3cc16b 100644
--- a/default-configs/sparc32plus-linux-user.mak
+++ b/default-configs/sparc32plus-linux-user.mak
@@ -1 +1,2 @@
# Default configuration for sparc32plus-linux-user
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/sparc64-bsd-user.mak b/default-configs/sparc64-bsd-user.mak
index b8b9eea..25bfa1f 100644
--- a/default-configs/sparc64-bsd-user.mak
+++ b/default-configs/sparc64-bsd-user.mak
@@ -1 +1,2 @@
# Default configuration for sparc64-bsd-user
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/sparc64-linux-user.mak b/default-configs/sparc64-linux-user.mak
index bf1bdd6..7c8a9f0 100644
--- a/default-configs/sparc64-linux-user.mak
+++ b/default-configs/sparc64-linux-user.mak
@@ -1 +1,2 @@
# Default configuration for sparc64-linux-user
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index d07876a..658546a 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -16,3 +16,4 @@ CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y
CONFIG_EMPTY_SLOT=y
CONFIG_SUN4V_RTC=y
+CONFIG_LEGACY_CPU_FEATURES=y
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index 7f74b1c..fd01cbf 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -104,51 +104,15 @@ 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 int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model)
+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;
-
- featurestr = strtok(NULL, ",");
- sparc_cpu_parse_features(CPU(cpu), featurestr, &err);
- g_free(s);
- if (err) {
- error_report_err(err);
- return -1;
- }
-
- return 0;
+ cpu_legacy_parse_featurestr(typename, features, errp);
}
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);
- if (oc == NULL) {
- g_free(str);
- return NULL;
- }
- g_free(str);
-
- cpu = SPARC_CPU(object_new(object_class_get_name(oc)));
-
- if (cpu_sparc_register(cpu, cpu_model) < 0) {
- object_unref(OBJECT(cpu));
- return NULL;
- }
-
- object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
-
- return cpu;
+ return SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
}
void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu)
@@ -529,107 +493,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;
@@ -932,6 +795,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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (6 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 07/27] sparc: replace custom cpu feature parsing with cpu_legacy_parse_featurestr() Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 19:57 ` Philippe Mathieu-Daudé
2017-08-24 2:49 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 09/27] s390x: replace cpu_s390x_init() " Igor Mammedov
` (18 subsequent siblings)
26 siblings, 2 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Fabien Chouteau, Mark Cave-Ayland, Artyom Tarasenko
it's just a wrapper, drop it and use cpu_generic_init() directly
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
CC: Fabien Chouteau <chouteau@adacore.com>
CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Artyom Tarasenko <atar4qemu@gmail.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 0e41916..b45cfb4 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 d5ff188..56512ec 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 89dd8a9..cf47dca 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 4e4fdab..ecf38a4 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 fd01cbf..2917021 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -110,11 +110,6 @@ static void sparc_cpu_parse_features(const char *typename, char *features,
cpu_legacy_parse_featurestr(typename, features, errp);
}
-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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 09/27] s390x: replace cpu_s390x_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (7 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init() Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 10/27] alpha: replace cpu_alpha_init() " Igor Mammedov
` (17 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
perhaps cpu->id isn't need by CONFIG_USER_ONLY but I'd leave to it
s390x maintainers to deal with it.
---
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 29fdd5d..7891d68 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -474,7 +474,6 @@ static inline bool get_per_in_range(CPUS390XState *env, uint64_t addr)
}
}
-S390CPU *cpu_s390x_init(const char *cpu_model);
S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp);
S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp);
void s390x_translate_init(void);
@@ -638,7 +637,7 @@ static inline unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu)
extern void subsystem_reset(void);
-#define cpu_init(model) CPU(cpu_s390x_init(model))
+#define cpu_init(cpu_model) cpu_generic_init(TYPE_S390_CPU, cpu_model)
#define cpu_signal_handler cpu_s390x_signal_handler
void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf);
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 489bc25..72b0b9e 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -303,6 +303,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 0c989b1..5c23552 100644
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -128,20 +128,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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 10/27] alpha: replace cpu_alpha_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (8 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 09/27] s390x: replace cpu_s390x_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 11/27] hppa: replace cpu_hppa_init() " Igor Mammedov
` (16 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
PS:
tested only linux-user as I don't have bsd box to test on
---
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 e95be2b..0738e97 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 3b307ad..1c5a177 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 76150f4..1ea597b 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 11/27] hppa: replace cpu_hppa_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (9 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 10/27] alpha: replace cpu_alpha_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 12/27] m68k: replace cpu_m68k_init() " Igor Mammedov
` (15 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
tested with linux-user
---
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 4cf4ac6..8d14077 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 30299e9..a477b45 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 12/27] m68k: replace cpu_m68k_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (10 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 11/27] hppa: replace cpu_hppa_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 13/27] microblaze: replace cpu_mb_init() " Igor Mammedov
` (14 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 38a7e11..d936547 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 c762441..7b9b15d 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 f4b1387..1a0f180 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 a14b6dd..55bf24b 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 caae291..7e50ff5 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 13/27] microblaze: replace cpu_mb_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (11 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 12/27] m68k: replace cpu_m68k_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 14/27] nios2: replace cpu_nios2_init() " Igor Mammedov
` (13 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 5ce4c82..52b6b6a 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 f85ff01..ddffe86 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 a24373c..83e2ef4 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 14/27] nios2: replace cpu_nios2_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (12 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 13/27] microblaze: replace cpu_mb_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 15/27] tilegx: replace cpu_tilegx_init() " Igor Mammedov
` (12 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 13931f3..50d803a 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 b6868b8..e4007f6 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 d56bb72..5b02fb6 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 15/27] tilegx: replace cpu_tilegx_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (13 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 14/27] nios2: replace cpu_nios2_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 16/27] xtensa: replace cpu_xtensa_init() " Igor Mammedov
` (11 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 f32be49..71cea04 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 4532639..7345f5a 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 16/27] xtensa: replace cpu_xtensa_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (14 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 15/27] tilegx: replace cpu_tilegx_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-24 13:21 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 17/27] tricore: replace cpu_tricore_init() " Igor Mammedov
` (10 subsequent siblings)
26 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Max Filippov
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>
---
CC: Max Filippov <jcmvbkbc@gmail.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 ee29fb1..4803331 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 249cd1e..1b4767f 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 635a4d4..182ec1e 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 cd7f958..85897df 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 bcd0b77..e8fba20 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 17/27] tricore: replace cpu_tricore_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (15 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 16/27] xtensa: replace cpu_xtensa_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 18/27] sh4: replace cpu_sh4_init() " Igor Mammedov
` (9 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 a3493a1..bc53c40 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 6c57423..3fcd8bb 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 3118905..378c2a4 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 18/27] sh4: replace cpu_sh4_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (16 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 17/27] tricore: replace cpu_tricore_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 19/27] arm: replace cpu_arm_init() " Igor Mammedov
` (8 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 3c47f0d..79f85d3 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 a0462ad..22bc534 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 e22eaf0..7f8a4b6 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 8536f6d..6ce7cba 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 19/27] arm: replace cpu_arm_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (17 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 18/27] sh4: replace cpu_sh4_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-24 13:26 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 20/27] cris: replace cpu_cris_init() " Igor Mammedov
` (7 subsequent siblings)
26 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 b39d64a..5932ef1 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 7e8ab31..a8b3d46 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 3d15ff6..400ba30 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 bbf0b7e..ece25ae 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 194b0bc..b0ac3cf 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 6a45dcc..884242b 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 fa60040..0ec92d3 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 20/27] cris: replace cpu_cris_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (18 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 19/27] arm: replace cpu_arm_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 21/27] x86: replace cpu_x86_init() " Igor Mammedov
` (6 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 920e1c3..5d822de 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 80674f6..5eb552b 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 5f766f0..ceebfed 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 21/27] x86: replace cpu_x86_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (19 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 20/27] cris: replace cpu_cris_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 22/27] lm32: replace cpu_lm32_init() " Igor Mammedov
` (5 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 0518673..525d35d 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 ac60c1a..217aade 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -2522,11 +2522,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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 22/27] lm32: replace cpu_lm32_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (20 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 21/27] x86: replace cpu_x86_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 23/27] moxie: replace cpu_moxie_init() " Igor Mammedov
` (4 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 1d972cb..de265b5 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 8f0c307..eccf0ac 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 5cae0f1..dffd879 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 891da18..929cc36 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 23/27] moxie: replace cpu_moxie_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (21 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 22/27] lm32: replace cpu_lm32_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 24/27] openrisc: replace cpu_openrisc_init() " Igor Mammedov
` (3 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 8991aae..75decaa 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 df3f124..4c27b45 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 927b1a1..748d02f 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 24/27] openrisc: replace cpu_openrisc_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (22 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 23/27] moxie: replace cpu_moxie_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 25/27] unicore32: replace uc32_cpu_init() " Igor Mammedov
` (2 subsequent siblings)
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 2721432..f51b89a 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 e1eeffc..243d802 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 1d6330c..a979f0b 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 25/27] unicore32: replace uc32_cpu_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (23 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 24/27] openrisc: replace cpu_openrisc_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 26/27] ppc: replace cpu_ppc_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 27/27] fix build failure in nbd_read_reply_entry() Igor Mammedov
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 7b5b405..7724108 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 ff62efb..eb9862f 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 f9239dc..309dcd1 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 26/27] ppc: replace cpu_ppc_init() with cpu_generic_init()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (24 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 25/27] unicore32: replace uc32_cpu_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 27/27] fix build failure in nbd_read_reply_entry() Igor Mammedov
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
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>
---
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 46d3dd8..12f0949 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 62f1857..f0596f3 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 3056d5f..d466634 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 f2ae60a..fcac399 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 9d997bf..ca26398 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 e7f413e..6b38ed7 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 36d3dcd..00f3321 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 fdbcf22..d5fdc16 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 8fb407e..43be9a8 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.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* [Qemu-devel] [PATCH for-2.11 27/27] fix build failure in nbd_read_reply_entry()
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
` (25 preceding siblings ...)
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 26/27] ppc: replace cpu_ppc_init() " Igor Mammedov
@ 2017-08-18 10:08 ` Igor Mammedov
26 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-18 10:08 UTC (permalink / raw)
To: qemu-devel
travis builds fail at HEAD at rc3 master with
block/nbd-client.c: In function ‘nbd_read_reply_entry’:
block/nbd-client.c:110:8: error: ‘ret’ may be used uninitialized in this function [-Werror=uninitialized]
fix it by initializing 'ret' to 0
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
block/nbd-client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/nbd-client.c b/block/nbd-client.c
index 422ecb4..02c8e20 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -70,7 +70,7 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)
{
NBDClientSession *s = opaque;
uint64_t i;
- int ret;
+ int ret = 0;
Error *local_err = NULL;
while (!s->quit) {
--
2.7.4
^ permalink raw reply related [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser Igor Mammedov
@ 2017-08-18 18:08 ` Eduardo Habkost
2017-08-21 11:06 ` Igor Mammedov
2017-08-23 14:34 ` Eduardo Habkost
1 sibling, 1 reply; 56+ messages in thread
From: Eduardo Habkost @ 2017-08-18 18:08 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Philippe Mathieu-Daudé,
Mark Cave-Ayland, Artyom Tarasenko, Richard Henderson
On Fri, Aug 18, 2017 at 12:08:38PM +0200, Igor Mammedov wrote:
> Move cpu_model +-feat parsing into a separate file so that it
> could be reused later for parsing similar format of sparc target
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
[...]
> diff --git a/include/qom/cpu.h b/include/qom/cpu.h
> index 25eefea..30247dc 100644
> --- a/include/qom/cpu.h
> +++ b/include/qom/cpu.h
> @@ -1038,4 +1038,6 @@ extern const struct VMStateDescription vmstate_cpu_common;
>
> #define UNASSIGNED_CPU_INDEX -1
>
> +void cpu_legacy_parse_featurestr(const char *typename, char *features,
> + Error **errp);
> #endif
> diff --git a/default-configs/i386-bsd-user.mak b/default-configs/i386-bsd-user.mak
> index af1b31a..b28a05f 100644
> --- a/default-configs/i386-bsd-user.mak
> +++ b/default-configs/i386-bsd-user.mak
> @@ -1 +1,2 @@
> # Default configuration for i386-bsd-user
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/i386-linux-user.mak b/default-configs/i386-linux-user.mak
> index 8657e68..c136967 100644
> --- a/default-configs/i386-linux-user.mak
> +++ b/default-configs/i386-linux-user.mak
> @@ -1 +1,2 @@
> # Default configuration for i386-linux-user
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
> index d2ab2f6..e3e7c0e 100644
> --- a/default-configs/i386-softmmu.mak
> +++ b/default-configs/i386-softmmu.mak
> @@ -59,3 +59,4 @@ CONFIG_SMBIOS=y
> CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
> CONFIG_PXB=y
> CONFIG_ACPI_VMGENID=y
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/x86_64-bsd-user.mak b/default-configs/x86_64-bsd-user.mak
> index 73e5d34..952323c 100644
> --- a/default-configs/x86_64-bsd-user.mak
> +++ b/default-configs/x86_64-bsd-user.mak
> @@ -1 +1,2 @@
> # Default configuration for x86_64-bsd-user
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/x86_64-linux-user.mak b/default-configs/x86_64-linux-user.mak
> index bec1d9e..b513ef2 100644
> --- a/default-configs/x86_64-linux-user.mak
> +++ b/default-configs/x86_64-linux-user.mak
> @@ -1 +1,2 @@
> # Default configuration for x86_64-linux-user
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
> index 9bde2f1..6594ddf 100644
> --- a/default-configs/x86_64-softmmu.mak
> +++ b/default-configs/x86_64-softmmu.mak
> @@ -59,3 +59,4 @@ CONFIG_SMBIOS=y
> CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
> CONFIG_PXB=y
> CONFIG_ACPI_VMGENID=y
> +CONFIG_LEGACY_CPU_FEATURES=y
[...]
> diff --git a/util/Makefile.objs b/util/Makefile.objs
> index 50a55ec..14e28f7 100644
> --- a/util/Makefile.objs
> +++ b/util/Makefile.objs
> @@ -45,3 +45,4 @@ util-obj-y += qht.o
> util-obj-y += range.o
> util-obj-y += stats64.o
> util-obj-y += systemd.o
> +util-obj-$(CONFIG_LEGACY_CPU_FEATURES) += legacy_cpu_features_parser.o
Do we really need this? Isn't it easier to just tell the linker
to drop the object file if it's unused?
--
Eduardo
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties Igor Mammedov
@ 2017-08-18 18:24 ` Eduardo Habkost
2017-08-21 11:03 ` Igor Mammedov
2017-08-24 13:32 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 56+ messages in thread
From: Eduardo Habkost @ 2017-08-18 18:24 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, Mark Cave-Ayland, Artyom Tarasenko
On Fri, Aug 18, 2017 at 12:08:35PM +0200, Igor Mammedov wrote:
> 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>
[...]
> ---
> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Artyom Tarasenko <atar4qemu@gmail.com>
> CC: 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 f4e7343..e735d73 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
>
> @@ -853,6 +855,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;
I think it would be much simpler to just validate nwindows at
realize time and use DEFINE_PROP_UINT32 below, but I won't mind
if you really prefer the custom setter.
But I have another question:
> +}
> +
> +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 },
What's the advantage of using a custom PropertyInfo struct if you
can just call object_class_property_add() at
sparc_cpu_class_init()?
> + DEFINE_PROP_END_OF_LIST()
> +};
> +
> static void sparc_cpu_class_init(ObjectClass *oc, void *data)
> {
> SPARCCPUClass *scc = SPARC_CPU_CLASS(oc);
> @@ -861,6 +926,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.7.4
>
>
--
Eduardo
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 01/27] sparc: convert cpu models to SPARC cpu subclasses
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 01/27] sparc: convert cpu models to SPARC cpu subclasses Igor Mammedov
@ 2017-08-18 19:00 ` Philippe Mathieu-Daudé
2017-08-21 10:55 ` Igor Mammedov
0 siblings, 1 reply; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-18 19:00 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel; +Cc: Mark Cave-Ayland, Artyom Tarasenko
Hi Igor,
On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> QOMfy cpu models handling introducing propper cpu types
> for each cpu model.
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> with this and conversion of features to properties,
> it would be possible to replace cpu_sparc_init() with
> cpu_generic_init() and reuse common -cpu handling
> infrastructure.
>
> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Artyom Tarasenko <atar4qemu@gmail.com>
> CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> v2:
> * make base class abstract (Philippe Mathieu-Daudé <f4bug@amsat.org>)
> ---
> target/sparc/cpu-qom.h | 2 +
> target/sparc/cpu.c | 121 +++++++++++++++++++++++++++++++++----------------
> 2 files changed, 84 insertions(+), 39 deletions(-)
>
> diff --git a/target/sparc/cpu-qom.h b/target/sparc/cpu-qom.h
> index f63af72..af6d57a 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 d606eb5..2994c09 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,19 @@ 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, ",");
you can free 'str' once here:
g_free(str);
> + oc = cpu_class_by_name(TYPE_SPARC_CPU, name);
> + if (oc == NULL) {
> + g_free(str);
drop
> + return NULL;
> + }
> + g_free(str);
drop
>
> - 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 +554,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 +780,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 +839,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 +847,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 +871,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 +906,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)
>
Anyway I can't start Aurelien's image [1] with this commit:
$ sparc-softmmu/qemu-system-sparc -hda debian_etch_sparc_small.qcow2
qemu: Unable to find Sparc CPU definition
[1] https://people.debian.org/~aurel32/qemu/sparc/
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init()
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init() Igor Mammedov
@ 2017-08-18 19:57 ` Philippe Mathieu-Daudé
2017-08-21 11:11 ` Igor Mammedov
2017-08-24 2:49 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-18 19:57 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Mark Cave-Ayland, Artyom Tarasenko, Fabien Chouteau
I succeed booting a SPARC image once applying 1 to 8 (this commit),
so not being able to boot the image previously is probably due to patch
order, which mean current order is not bisect-able.
On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> it's just a wrapper, drop it and use cpu_generic_init() directly
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> CC: Fabien Chouteau <chouteau@adacore.com>
> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Artyom Tarasenko <atar4qemu@gmail.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 0e41916..b45cfb4 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 d5ff188..56512ec 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 89dd8a9..cf47dca 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 4e4fdab..ecf38a4 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 fd01cbf..2917021 100644
> --- a/target/sparc/cpu.c
> +++ b/target/sparc/cpu.c
> @@ -110,11 +110,6 @@ static void sparc_cpu_parse_features(const char *typename, char *features,
> cpu_legacy_parse_featurestr(typename, features, errp);
> }
>
> -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)
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 01/27] sparc: convert cpu models to SPARC cpu subclasses
2017-08-18 19:00 ` Philippe Mathieu-Daudé
@ 2017-08-21 10:55 ` Igor Mammedov
2017-08-23 1:12 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-21 10:55 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Mark Cave-Ayland, Artyom Tarasenko
On Fri, 18 Aug 2017 16:00:37 -0300
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> Hi Igor,
>
> On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> > QOMfy cpu models handling introducing propper cpu types
> > for each cpu model.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > with this and conversion of features to properties,
> > it would be possible to replace cpu_sparc_init() with
> > cpu_generic_init() and reuse common -cpu handling
> > infrastructure.
> >
> > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
> >
> > v2:
> > * make base class abstract (Philippe Mathieu-Daudé <f4bug@amsat.org>)
> > ---
> > target/sparc/cpu-qom.h | 2 +
> > target/sparc/cpu.c | 121 +++++++++++++++++++++++++++++++++----------------
> > 2 files changed, 84 insertions(+), 39 deletions(-)
> >
> > diff --git a/target/sparc/cpu-qom.h b/target/sparc/cpu-qom.h
> > index f63af72..af6d57a 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 d606eb5..2994c09 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,19 @@ 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, ",");
>
> you can free 'str' once here:
>
> g_free(str);
>
> > + oc = cpu_class_by_name(TYPE_SPARC_CPU, name);
> > + if (oc == NULL) {
> > + g_free(str);
>
> drop
>
> > + return NULL;
> > + }
> > + g_free(str);
>
> drop
I'll fix it up if I have to respin series (note this function is removed within series)
[...]
> Anyway I can't start Aurelien's image [1] with this commit:
Can't reproduce it locally (either dirty/clean tree rebuild)
with ./configure --enable-debug
> $ sparc-softmmu/qemu-system-sparc -hda debian_etch_sparc_small.qcow2
> qemu: Unable to find Sparc CPU definition
for this kind of error guest image doesn't matter as error happens during machine_init()
> [1] https://people.debian.org/~aurel32/qemu/sparc/
It boots just fine with default CPU model:
./sparc-softmmu/qemu-system-sparc -hda debian_etch_sparc_small.qcow2
and with explicitly specified one:
sparc-softmmu/qemu-system-sparc -cpu "Fujitsu MB86904"
I get from "info qom-tree"
...
/device[0] (Fujitsu-MB86904-sparc-cpu)
...
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties
2017-08-18 18:24 ` Eduardo Habkost
@ 2017-08-21 11:03 ` Igor Mammedov
2017-08-23 13:07 ` Eduardo Habkost
0 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-21 11:03 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: qemu-devel, Mark Cave-Ayland, Artyom Tarasenko
On Fri, 18 Aug 2017 15:24:04 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Fri, Aug 18, 2017 at 12:08:35PM +0200, Igor Mammedov wrote:
> > 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>
> [...]
> > ---
> > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > CC: 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 f4e7343..e735d73 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
> >
> > @@ -853,6 +855,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;
>
> I think it would be much simpler to just validate nwindows at
> realize time and use DEFINE_PROP_UINT32 below, but I won't mind
> if you really prefer the custom setter.
Indeed it would shave off ~12LOC if check is done at realize time,
but I prefer to throw error at the place where it's set.
I'd go for realize approach only if check couldn't be done
at property setting time.
> But I have another question:
>
> > +}
> > +
> > +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 },
>
> What's the advantage of using a custom PropertyInfo struct if you
> can just call object_class_property_add() at
> sparc_cpu_class_init()?
consistentcy with the rest of properties added above
and instead of a zoo of ways to add property within the patch/featureset
>
> > + DEFINE_PROP_END_OF_LIST()
> > +};
> > +
> > static void sparc_cpu_class_init(ObjectClass *oc, void *data)
> > {
> > SPARCCPUClass *scc = SPARC_CPU_CLASS(oc);
> > @@ -861,6 +926,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.7.4
> >
> >
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-18 18:08 ` Eduardo Habkost
@ 2017-08-21 11:06 ` Igor Mammedov
0 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-21 11:06 UTC (permalink / raw)
To: Eduardo Habkost
Cc: qemu-devel, Philippe Mathieu-Daudé,
Mark Cave-Ayland, Artyom Tarasenko, Richard Henderson
On Fri, 18 Aug 2017 15:08:48 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Fri, Aug 18, 2017 at 12:08:38PM +0200, Igor Mammedov wrote:
> > Move cpu_model +-feat parsing into a separate file so that it
> > could be reused later for parsing similar format of sparc target
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> [...]
> > diff --git a/include/qom/cpu.h b/include/qom/cpu.h
> > index 25eefea..30247dc 100644
> > --- a/include/qom/cpu.h
> > +++ b/include/qom/cpu.h
> > @@ -1038,4 +1038,6 @@ extern const struct VMStateDescription vmstate_cpu_common;
> >
> > #define UNASSIGNED_CPU_INDEX -1
> >
> > +void cpu_legacy_parse_featurestr(const char *typename, char *features,
> > + Error **errp);
> > #endif
> > diff --git a/default-configs/i386-bsd-user.mak b/default-configs/i386-bsd-user.mak
> > index af1b31a..b28a05f 100644
> > --- a/default-configs/i386-bsd-user.mak
> > +++ b/default-configs/i386-bsd-user.mak
> > @@ -1 +1,2 @@
> > # Default configuration for i386-bsd-user
> > +CONFIG_LEGACY_CPU_FEATURES=y
> > diff --git a/default-configs/i386-linux-user.mak b/default-configs/i386-linux-user.mak
> > index 8657e68..c136967 100644
> > --- a/default-configs/i386-linux-user.mak
> > +++ b/default-configs/i386-linux-user.mak
> > @@ -1 +1,2 @@
> > # Default configuration for i386-linux-user
> > +CONFIG_LEGACY_CPU_FEATURES=y
> > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
> > index d2ab2f6..e3e7c0e 100644
> > --- a/default-configs/i386-softmmu.mak
> > +++ b/default-configs/i386-softmmu.mak
> > @@ -59,3 +59,4 @@ CONFIG_SMBIOS=y
> > CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
> > CONFIG_PXB=y
> > CONFIG_ACPI_VMGENID=y
> > +CONFIG_LEGACY_CPU_FEATURES=y
> > diff --git a/default-configs/x86_64-bsd-user.mak b/default-configs/x86_64-bsd-user.mak
> > index 73e5d34..952323c 100644
> > --- a/default-configs/x86_64-bsd-user.mak
> > +++ b/default-configs/x86_64-bsd-user.mak
> > @@ -1 +1,2 @@
> > # Default configuration for x86_64-bsd-user
> > +CONFIG_LEGACY_CPU_FEATURES=y
> > diff --git a/default-configs/x86_64-linux-user.mak b/default-configs/x86_64-linux-user.mak
> > index bec1d9e..b513ef2 100644
> > --- a/default-configs/x86_64-linux-user.mak
> > +++ b/default-configs/x86_64-linux-user.mak
> > @@ -1 +1,2 @@
> > # Default configuration for x86_64-linux-user
> > +CONFIG_LEGACY_CPU_FEATURES=y
> > diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
> > index 9bde2f1..6594ddf 100644
> > --- a/default-configs/x86_64-softmmu.mak
> > +++ b/default-configs/x86_64-softmmu.mak
> > @@ -59,3 +59,4 @@ CONFIG_SMBIOS=y
> > CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
> > CONFIG_PXB=y
> > CONFIG_ACPI_VMGENID=y
> > +CONFIG_LEGACY_CPU_FEATURES=y
> [...]
> > diff --git a/util/Makefile.objs b/util/Makefile.objs
> > index 50a55ec..14e28f7 100644
> > --- a/util/Makefile.objs
> > +++ b/util/Makefile.objs
> > @@ -45,3 +45,4 @@ util-obj-y += qht.o
> > util-obj-y += range.o
> > util-obj-y += stats64.o
> > util-obj-y += systemd.o
> > +util-obj-$(CONFIG_LEGACY_CPU_FEATURES) += legacy_cpu_features_parser.o
>
> Do we really need this? Isn't it easier to just tell the linker
> to drop the object file if it's unused?
building unconditionally will make target limited builds to compile file uselessly,
I don't care much about it but opted for a less impact way on build time vs patch size.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init()
2017-08-18 19:57 ` Philippe Mathieu-Daudé
@ 2017-08-21 11:11 ` Igor Mammedov
2017-08-24 2:51 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-21 11:11 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Mark Cave-Ayland, Artyom Tarasenko, Fabien Chouteau
On Fri, 18 Aug 2017 16:57:20 -0300
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> I succeed booting a SPARC image once applying 1 to 8 (this commit),
> so not being able to boot the image previously is probably due to patch
> order, which mean current order is not bisect-able.
I repeated patch by patch (1-8) build/test steps and it works for me
(i.e. compiles and both sparc/sparc64 target machines start as expected)
Could you re-check with clean build and if failure still persist
pin-point exact cause?
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 01/27] sparc: convert cpu models to SPARC cpu subclasses
2017-08-21 10:55 ` Igor Mammedov
@ 2017-08-23 1:12 ` Philippe Mathieu-Daudé
2017-08-24 2:40 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-23 1:12 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, Mark Cave-Ayland, Artyom Tarasenko
>> On 08/18/2017 07:08 AM, Igor Mammedov wrote:
>>> QOMfy cpu models handling introducing propper cpu types
>>> for each cpu model.
>>>
>>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>>> ---
>>> with this and conversion of features to properties,
>>> it would be possible to replace cpu_sparc_init() with
>>> cpu_generic_init() and reuse common -cpu handling
>>> infrastructure.
>>>
>>> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>>> CC: Artyom Tarasenko <atar4qemu@gmail.com>
>>> CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>>
>>> v2:
>>> * make base class abstract (Philippe Mathieu-Daudé <f4bug@amsat.org>)
>>> ---
>>> target/sparc/cpu-qom.h | 2 +
>>> target/sparc/cpu.c | 121 +++++++++++++++++++++++++++++++++----------------
>>> 2 files changed, 84 insertions(+), 39 deletions(-)
>>>
>>> diff --git a/target/sparc/cpu-qom.h b/target/sparc/cpu-qom.h
>>> index f63af72..af6d57a 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 d606eb5..2994c09 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,19 @@ 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, ",");
>>
>> you can free 'str' once here:
>>
>> g_free(str);
>>
>>> + oc = cpu_class_by_name(TYPE_SPARC_CPU, name);
>>> + if (oc == NULL) {
>>> + g_free(str);
>>
>> drop
>>
>>> + return NULL;
>>> + }
>>> + g_free(str);
>>
>> drop
>
> I'll fix it up if I have to respin series (note this function is removed within series)
>
> [...]
>
>
>> Anyway I can't start Aurelien's image [1] with this commit:
> Can't reproduce it locally (either dirty/clean tree rebuild)
> with ./configure --enable-debug
>
>
>> $ sparc-softmmu/qemu-system-sparc -hda debian_etch_sparc_small.qcow2
>> qemu: Unable to find Sparc CPU definition
> for this kind of error guest image doesn't matter as error happens during machine_init()
>
>> [1] https://people.debian.org/~aurel32/qemu/sparc/
> It boots just fine with default CPU model:
>
> ./sparc-softmmu/qemu-system-sparc -hda debian_etch_sparc_small.qcow2
Sorry I'v been distracted by something else :/
I might have done something wrong, I'll test it again tomorrow.
>
> and with explicitly specified one:
>
> sparc-softmmu/qemu-system-sparc -cpu "Fujitsu MB86904"
>
> I get from "info qom-tree"
> ...
> /device[0] (Fujitsu-MB86904-sparc-cpu)
> ...
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties
2017-08-21 11:03 ` Igor Mammedov
@ 2017-08-23 13:07 ` Eduardo Habkost
2017-08-23 14:17 ` Igor Mammedov
0 siblings, 1 reply; 56+ messages in thread
From: Eduardo Habkost @ 2017-08-23 13:07 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, Mark Cave-Ayland, Artyom Tarasenko
On Mon, Aug 21, 2017 at 01:03:07PM +0200, Igor Mammedov wrote:
> On Fri, 18 Aug 2017 15:24:04 -0300
> Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> > On Fri, Aug 18, 2017 at 12:08:35PM +0200, Igor Mammedov wrote:
> > > 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>
> > [...]
> > > ---
> > > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > > CC: 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 f4e7343..e735d73 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
> > >
> > > @@ -853,6 +855,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;
> >
> > I think it would be much simpler to just validate nwindows at
> > realize time and use DEFINE_PROP_UINT32 below, but I won't mind
> > if you really prefer the custom setter.
> Indeed it would shave off ~12LOC if check is done at realize time,
> but I prefer to throw error at the place where it's set.
> I'd go for realize approach only if check couldn't be done
> at property setting time.
I would prefer to avoid custom getters/setters when possible, but
I agree it is better to validate the value as soon as possible
(on the setter instead of realize). If we want to avoid custom
setters, we need to improve the DEFINE_PROP_* interface.
>
>
> > But I have another question:
> >
> > > +}
> > > +
> > > +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 },
> >
> > What's the advantage of using a custom PropertyInfo struct if you
> > can just call object_class_property_add() at
> > sparc_cpu_class_init()?
> consistentcy with the rest of properties added above
> and instead of a zoo of ways to add property within the patch/featureset
Well, both options (custom PropertyInfo and manual
object_class_property_add() call) look bad to me. But improving
the property API to not require a custom setter is out of context
of this series, so:
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
>
> >
> > > + DEFINE_PROP_END_OF_LIST()
> > > +};
> > > +
> > > static void sparc_cpu_class_init(ObjectClass *oc, void *data)
> > > {
> > > SPARCCPUClass *scc = SPARC_CPU_CLASS(oc);
> > > @@ -861,6 +926,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.7.4
> > >
> > >
> >
>
--
Eduardo
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties
2017-08-23 13:07 ` Eduardo Habkost
@ 2017-08-23 14:17 ` Igor Mammedov
0 siblings, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-23 14:17 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: qemu-devel, Mark Cave-Ayland, Artyom Tarasenko
On Wed, 23 Aug 2017 10:07:14 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Mon, Aug 21, 2017 at 01:03:07PM +0200, Igor Mammedov wrote:
> > On Fri, 18 Aug 2017 15:24:04 -0300
> > Eduardo Habkost <ehabkost@redhat.com> wrote:
> >
> > > On Fri, Aug 18, 2017 at 12:08:35PM +0200, Igor Mammedov wrote:
> > > > 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>
> > > [...]
> > > > ---
> > > > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > > > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > > > CC: 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 f4e7343..e735d73 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
> > > >
> > > > @@ -853,6 +855,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;
> > >
> > > I think it would be much simpler to just validate nwindows at
> > > realize time and use DEFINE_PROP_UINT32 below, but I won't mind
> > > if you really prefer the custom setter.
> > Indeed it would shave off ~12LOC if check is done at realize time,
> > but I prefer to throw error at the place where it's set.
> > I'd go for realize approach only if check couldn't be done
> > at property setting time.
>
> I would prefer to avoid custom getters/setters when possible, but
> I agree it is better to validate the value as soon as possible
> (on the setter instead of realize). If we want to avoid custom
> setters, we need to improve the DEFINE_PROP_* interface.
Agreed, we need better properties handling API,
I just never got to actually improving it.
>
> >
> >
> > > But I have another question:
> > >
> > > > +}
> > > > +
> > > > +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 },
> > >
> > > What's the advantage of using a custom PropertyInfo struct if you
> > > can just call object_class_property_add() at
> > > sparc_cpu_class_init()?
> > consistentcy with the rest of properties added above
> > and instead of a zoo of ways to add property within the patch/featureset
>
> Well, both options (custom PropertyInfo and manual
> object_class_property_add() call) look bad to me. But improving
> the property API to not require a custom setter is out of context
> of this series, so:
>
> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Thanks!
>
> >
> > >
> > > > + DEFINE_PROP_END_OF_LIST()
> > > > +};
> > > > +
> > > > static void sparc_cpu_class_init(ObjectClass *oc, void *data)
> > > > {
> > > > SPARCCPUClass *scc = SPARC_CPU_CLASS(oc);
> > > > @@ -861,6 +926,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.7.4
> > > >
> > > >
> > >
> >
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser Igor Mammedov
2017-08-18 18:08 ` Eduardo Habkost
@ 2017-08-23 14:34 ` Eduardo Habkost
2017-08-23 16:29 ` Igor Mammedov
1 sibling, 1 reply; 56+ messages in thread
From: Eduardo Habkost @ 2017-08-23 14:34 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Philippe Mathieu-Daudé,
Mark Cave-Ayland, Artyom Tarasenko, Richard Henderson
On Fri, Aug 18, 2017 at 12:08:38PM +0200, Igor Mammedov wrote:
> Move cpu_model +-feat parsing into a separate file so that it
> could be reused later for parsing similar format of sparc target
>
> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> ---
> CC: Richard Henderson <rth@twiddle.net>
> CC: Eduardo Habkost <ehabkost@redhat.com>
> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Artyom Tarasenko <atar4qemu@gmail.com>
> CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> include/qom/cpu.h | 2 +
> default-configs/i386-bsd-user.mak | 1 +
> default-configs/i386-linux-user.mak | 1 +
> default-configs/i386-softmmu.mak | 1 +
> default-configs/x86_64-bsd-user.mak | 1 +
> default-configs/x86_64-linux-user.mak | 1 +
> default-configs/x86_64-softmmu.mak | 1 +
> target/i386/cpu.c | 125 +-------------------------
> util/Makefile.objs | 1 +
> util/legacy_cpu_features_parser.c | 161 ++++++++++++++++++++++++++++++++++
> 10 files changed, 171 insertions(+), 124 deletions(-)
> create mode 100644 util/legacy_cpu_features_parser.c
>
[...]
> diff --git a/util/legacy_cpu_features_parser.c b/util/legacy_cpu_features_parser.c
> new file mode 100644
> index 0000000..6b352a3
> --- /dev/null
> +++ b/util/legacy_cpu_features_parser.c
> @@ -0,0 +1,161 @@
> +/* Support for legacy -cpu cpu,features CLI option with +-feat syntax,
> + * used by x86/sparc targets
> + *
> + * Author: Andreas Färber <afaerber@suse.de>
> + * Author: Andre Przywara <andre.przywara@amd.com>
> + * Author: Eduardo Habkost <ehabkost@redhat.com>
> + * Author: Igor Mammedov <imammedo@redhat.com>
> + * Author: Paolo Bonzini <pbonzini@redhat.com>
> + * Author: Markus Armbruster <armbru@redhat.com>
IANAL, but I believe a
Copyright (c) <YEAR> <COPYRIGHT HOLDER>
line is needed here.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> +
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> +
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "qemu/cutils.h"
> +#include "qom/cpu.h"
> +#include "qemu/error-report.h"
> +#include "hw/qdev-properties.h"
> +
> +static inline void feat2prop(char *s)
> +{
> + while ((s = strchr(s, '_'))) {
> + *s = '-';
> + }
> +}
> +
> +static gint compare_string(gconstpointer a, gconstpointer b)
> +{
> + return g_strcmp0(a, b);
> +}
> +
> +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);
> +}
> +
> +/* DO NOT USE WITH NEW CODE
> + * Parse "+feature,-feature,feature=foo" CPU feature string
> + */
> +void cpu_legacy_parse_featurestr(const char *typename, char *features,
> + Error **errp)
> +{
> + /* Compatibily hack to maintain legacy +-feat semantic,
> + * where +-feat overwrites any feature set by
> + * feat=on|feat even if the later is parsed after +-feat
> + * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
> + */
> + GList *l, *plus_features = NULL, *minus_features = NULL;
> + char *featurestr; /* Single 'key=value" string being parsed */
> + static bool cpu_globals_initialized;
> + bool ambiguous = false;
> +
> + if (cpu_globals_initialized) {
> + return;
> + }
> + cpu_globals_initialized = true;
> +
> + if (!features) {
> + return;
> + }
> +
> + for (featurestr = strtok(features, ",");
> + featurestr;
> + featurestr = strtok(NULL, ",")) {
> + const char *name;
> + const char *val = NULL;
> + char *eq = NULL;
> + char num[32];
> +
> + /* 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;
> + }
These 6 lines of code (or something equivalent to them) are
supposed to be the only difference to the generic parsing
function. I would simply make this feature (support for
[+-]feature) enabled by a CPUClass::plus_minus_features flag
handled by cpu_common_parse_features().
(But this can be done as a follow-up patch.)
> +
> + eq = strchr(featurestr, '=');
> + if (eq) {
> + *eq++ = 0;
> + val = eq;
> + } else {
> + val = "on";
> + }
> +
> + feat2prop(featurestr);
> + name = featurestr;
> +
> + if (g_list_find_custom(plus_features, name, compare_string)) {
> + warn_report("Ambiguous CPU model string. "
> + "Don't mix both \"+%s\" and \"%s=%s\"",
> + name, name, val);
> + ambiguous = true;
> + }
> + if (g_list_find_custom(minus_features, name, compare_string)) {
> + warn_report("Ambiguous CPU model string. "
> + "Don't mix both \"-%s\" and \"%s=%s\"",
> + name, name, val);
> + ambiguous = true;
> + }
> +
> + /* Special case: */
> + if (!strcmp(name, "tsc-freq")) {
> + int ret;
> + uint64_t tsc_freq;
> +
> + ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
> + if (ret < 0 || tsc_freq > INT64_MAX) {
> + error_setg(errp, "bad numerical value %s", val);
> + return;
> + }
> + snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
> + val = num;
> + name = "tsc-frequency";
> + }
This is x86-specific and should stay in x86-specific code. It
can probably be handled by the tsc-freq setter.
> +
> + cpu_add_feat_as_prop(typename, name, val);
> + }
> +
> + if (ambiguous) {
> + warn_report("Compatibility of ambiguous CPU model "
> + "strings won't be kept on future QEMU versions");
> + }
As noted in the review of the x86 patch that removes the
plus_features/minus_features static variables, this obsolete (and
confusing) property ordering misfeature should be removed before
we make this code generic and reuse it on other architectures.
> +
> + for (l = plus_features; l; l = l->next) {
> + const char *name = l->data;
> + cpu_add_feat_as_prop(typename, name, "on");
> + }
> + if (plus_features) {
> + g_list_free_full(plus_features, g_free);
> + }
> +
> + for (l = minus_features; l; l = l->next) {
> + const char *name = l->data;
> + cpu_add_feat_as_prop(typename, name, "off");
> + }
> + if (minus_features) {
> + g_list_free_full(minus_features, g_free);
> + }
> +}
> --
> 2.7.4
>
>
--
Eduardo
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-23 14:34 ` Eduardo Habkost
@ 2017-08-23 16:29 ` Igor Mammedov
2017-08-23 16:46 ` Eduardo Habkost
0 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-23 16:29 UTC (permalink / raw)
To: Eduardo Habkost
Cc: qemu-devel, Philippe Mathieu-Daudé,
Mark Cave-Ayland, Artyom Tarasenko, Richard Henderson
On Wed, 23 Aug 2017 11:34:14 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Fri, Aug 18, 2017 at 12:08:38PM +0200, Igor Mammedov wrote:
> > Move cpu_model +-feat parsing into a separate file so that it
> > could be reused later for parsing similar format of sparc target
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > CC: Richard Henderson <rth@twiddle.net>
> > CC: Eduardo Habkost <ehabkost@redhat.com>
> > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > ---
> > include/qom/cpu.h | 2 +
> > default-configs/i386-bsd-user.mak | 1 +
> > default-configs/i386-linux-user.mak | 1 +
> > default-configs/i386-softmmu.mak | 1 +
> > default-configs/x86_64-bsd-user.mak | 1 +
> > default-configs/x86_64-linux-user.mak | 1 +
> > default-configs/x86_64-softmmu.mak | 1 +
> > target/i386/cpu.c | 125 +-------------------------
> > util/Makefile.objs | 1 +
> > util/legacy_cpu_features_parser.c | 161 ++++++++++++++++++++++++++++++++++
> > 10 files changed, 171 insertions(+), 124 deletions(-)
> > create mode 100644 util/legacy_cpu_features_parser.c
> >
> [...]
> > diff --git a/util/legacy_cpu_features_parser.c b/util/legacy_cpu_features_parser.c
> > new file mode 100644
> > index 0000000..6b352a3
> > --- /dev/null
> > +++ b/util/legacy_cpu_features_parser.c
> > @@ -0,0 +1,161 @@
> > +/* Support for legacy -cpu cpu,features CLI option with +-feat syntax,
> > + * used by x86/sparc targets
> > + *
> > + * Author: Andreas Färber <afaerber@suse.de>
> > + * Author: Andre Przywara <andre.przywara@amd.com>
> > + * Author: Eduardo Habkost <ehabkost@redhat.com>
> > + * Author: Igor Mammedov <imammedo@redhat.com>
> > + * Author: Paolo Bonzini <pbonzini@redhat.com>
> > + * Author: Markus Armbruster <armbru@redhat.com>
>
> IANAL, but I believe a
> Copyright (c) <YEAR> <COPYRIGHT HOLDER>
> line is needed here.
>
> > + *
> > + * This program is free software; you can redistribute it and/or modify
> > + * it under the terms of the GNU General Public License as published by
> > + * the Free Software Foundation; either version 2 of the License, or
> > + * (at your option) any later version.
> > +
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > + * GNU General Public License for more details.
> > +
> > + * You should have received a copy of the GNU General Public License along
> > + * with this program; if not, see <http://www.gnu.org/licenses/>.
> > + */
> > +
> > +#include "qemu/osdep.h"
> > +#include "qapi/error.h"
> > +#include "qemu/cutils.h"
> > +#include "qom/cpu.h"
> > +#include "qemu/error-report.h"
> > +#include "hw/qdev-properties.h"
> > +
> > +static inline void feat2prop(char *s)
> > +{
> > + while ((s = strchr(s, '_'))) {
> > + *s = '-';
> > + }
> > +}
> > +
> > +static gint compare_string(gconstpointer a, gconstpointer b)
> > +{
> > + return g_strcmp0(a, b);
> > +}
> > +
> > +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);
> > +}
> > +
> > +/* DO NOT USE WITH NEW CODE
> > + * Parse "+feature,-feature,feature=foo" CPU feature string
> > + */
> > +void cpu_legacy_parse_featurestr(const char *typename, char *features,
> > + Error **errp)
> > +{
> > + /* Compatibily hack to maintain legacy +-feat semantic,
> > + * where +-feat overwrites any feature set by
> > + * feat=on|feat even if the later is parsed after +-feat
> > + * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
> > + */
> > + GList *l, *plus_features = NULL, *minus_features = NULL;
> > + char *featurestr; /* Single 'key=value" string being parsed */
> > + static bool cpu_globals_initialized;
> > + bool ambiguous = false;
> > +
> > + if (cpu_globals_initialized) {
> > + return;
> > + }
> > + cpu_globals_initialized = true;
> > +
> > + if (!features) {
> > + return;
> > + }
> > +
> > + for (featurestr = strtok(features, ",");
> > + featurestr;
> > + featurestr = strtok(NULL, ",")) {
> > + const char *name;
> > + const char *val = NULL;
> > + char *eq = NULL;
> > + char num[32];
> > +
> > + /* 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;
> > + }
>
> These 6 lines of code (or something equivalent to them) are
> supposed to be the only difference to the generic parsing
> function. I would simply make this feature (support for
> [+-]feature) enabled by a CPUClass::plus_minus_features flag
> handled by cpu_common_parse_features().
I'd rather keep plus/minus nonsense under the hood separate
legacy function so it get reused unintentionally and keep generic
parser clean.
I didn't have any intent of generalizing +-feat handling
but rather to remove code duplication between the only users
(x86/sparc) that happened to use syntax and share the same semantics.
As an alternative I can copy-past x86 variant into sparc
(modulo x86 harmless fixups), that will add some code duplication
I've tried to avoid with this patch, but it won't cause
misunderstanding about generalizing legacy hacks.
> (But this can be done as a follow-up patch.)
>
> > +
> > + eq = strchr(featurestr, '=');
> > + if (eq) {
> > + *eq++ = 0;
> > + val = eq;
> > + } else {
> > + val = "on";
> > + }
> > +
> > + feat2prop(featurestr);
> > + name = featurestr;
> > +
> > + if (g_list_find_custom(plus_features, name, compare_string)) {
> > + warn_report("Ambiguous CPU model string. "
> > + "Don't mix both \"+%s\" and \"%s=%s\"",
> > + name, name, val);
> > + ambiguous = true;
> > + }
> > + if (g_list_find_custom(minus_features, name, compare_string)) {
> > + warn_report("Ambiguous CPU model string. "
> > + "Don't mix both \"-%s\" and \"%s=%s\"",
> > + name, name, val);
> > + ambiguous = true;
> > + }
> > +
> > + /* Special case: */
> > + if (!strcmp(name, "tsc-freq")) {
> > + int ret;
> > + uint64_t tsc_freq;
> > +
> > + ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
> > + if (ret < 0 || tsc_freq > INT64_MAX) {
> > + error_setg(errp, "bad numerical value %s", val);
> > + return;
> > + }
> > + snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
> > + val = num;
> > + name = "tsc-frequency";
> > + }
>
> This is x86-specific and should stay in x86-specific code. It
> can probably be handled by the tsc-freq setter.
there was reason why it wasn't moved to tsc-frequency setter,
the former is pure integer type of property,
while here we can get suffixed string that scales by 1000.
Short of creating new visitor for KHz (I don't really looking forward to it),
it's simpler to leave fixup alone in legacy parser that's shared only between
x86/sparc as it doesn't conflict with sparc and won't break anything.
> > +
> > + cpu_add_feat_as_prop(typename, name, val);
> > + }
> > +
> > + if (ambiguous) {
> > + warn_report("Compatibility of ambiguous CPU model "
> > + "strings won't be kept on future QEMU versions");
> > + }
>
> As noted in the review of the x86 patch that removes the
> plus_features/minus_features static variables, this obsolete (and
> confusing) property ordering misfeature should be removed before
> we make this code generic and reuse it on other architectures.
As it's been replied removing ordering is behavioral change for
both x86 and sparc, which is not related to series.
If you wish, I'll post a patch that will what you suggest
on top of series.
> > +
> > + for (l = plus_features; l; l = l->next) {
> > + const char *name = l->data;
> > + cpu_add_feat_as_prop(typename, name, "on");
> > + }
> > + if (plus_features) {
> > + g_list_free_full(plus_features, g_free);
> > + }
> > +
> > + for (l = minus_features; l; l = l->next) {
> > + const char *name = l->data;
> > + cpu_add_feat_as_prop(typename, name, "off");
> > + }
> > + if (minus_features) {
> > + g_list_free_full(minus_features, g_free);
> > + }
> > +}
> > --
> > 2.7.4
> >
> >
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-23 16:29 ` Igor Mammedov
@ 2017-08-23 16:46 ` Eduardo Habkost
2017-08-23 17:37 ` Igor Mammedov
0 siblings, 1 reply; 56+ messages in thread
From: Eduardo Habkost @ 2017-08-23 16:46 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Philippe Mathieu-Daudé,
Mark Cave-Ayland, Artyom Tarasenko, Richard Henderson
On Wed, Aug 23, 2017 at 06:29:02PM +0200, Igor Mammedov wrote:
> On Wed, 23 Aug 2017 11:34:14 -0300
> Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> > On Fri, Aug 18, 2017 at 12:08:38PM +0200, Igor Mammedov wrote:
> > > Move cpu_model +-feat parsing into a separate file so that it
> > > could be reused later for parsing similar format of sparc target
> > >
> > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > ---
> > > CC: Richard Henderson <rth@twiddle.net>
> > > CC: Eduardo Habkost <ehabkost@redhat.com>
> > > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > > CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > > ---
> > > include/qom/cpu.h | 2 +
> > > default-configs/i386-bsd-user.mak | 1 +
> > > default-configs/i386-linux-user.mak | 1 +
> > > default-configs/i386-softmmu.mak | 1 +
> > > default-configs/x86_64-bsd-user.mak | 1 +
> > > default-configs/x86_64-linux-user.mak | 1 +
> > > default-configs/x86_64-softmmu.mak | 1 +
> > > target/i386/cpu.c | 125 +-------------------------
> > > util/Makefile.objs | 1 +
> > > util/legacy_cpu_features_parser.c | 161 ++++++++++++++++++++++++++++++++++
> > > 10 files changed, 171 insertions(+), 124 deletions(-)
> > > create mode 100644 util/legacy_cpu_features_parser.c
> > >
> > [...]
> > > diff --git a/util/legacy_cpu_features_parser.c b/util/legacy_cpu_features_parser.c
> > > new file mode 100644
> > > index 0000000..6b352a3
> > > --- /dev/null
> > > +++ b/util/legacy_cpu_features_parser.c
> > > @@ -0,0 +1,161 @@
> > > +/* Support for legacy -cpu cpu,features CLI option with +-feat syntax,
> > > + * used by x86/sparc targets
> > > + *
> > > + * Author: Andreas Färber <afaerber@suse.de>
> > > + * Author: Andre Przywara <andre.przywara@amd.com>
> > > + * Author: Eduardo Habkost <ehabkost@redhat.com>
> > > + * Author: Igor Mammedov <imammedo@redhat.com>
> > > + * Author: Paolo Bonzini <pbonzini@redhat.com>
> > > + * Author: Markus Armbruster <armbru@redhat.com>
> >
> > IANAL, but I believe a
> > Copyright (c) <YEAR> <COPYRIGHT HOLDER>
> > line is needed here.
> >
> > > + *
> > > + * This program is free software; you can redistribute it and/or modify
> > > + * it under the terms of the GNU General Public License as published by
> > > + * the Free Software Foundation; either version 2 of the License, or
> > > + * (at your option) any later version.
> > > +
> > > + * This program is distributed in the hope that it will be useful,
> > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > > + * GNU General Public License for more details.
> > > +
> > > + * You should have received a copy of the GNU General Public License along
> > > + * with this program; if not, see <http://www.gnu.org/licenses/>.
> > > + */
> > > +
> > > +#include "qemu/osdep.h"
> > > +#include "qapi/error.h"
> > > +#include "qemu/cutils.h"
> > > +#include "qom/cpu.h"
> > > +#include "qemu/error-report.h"
> > > +#include "hw/qdev-properties.h"
> > > +
> > > +static inline void feat2prop(char *s)
> > > +{
> > > + while ((s = strchr(s, '_'))) {
> > > + *s = '-';
> > > + }
> > > +}
> > > +
> > > +static gint compare_string(gconstpointer a, gconstpointer b)
> > > +{
> > > + return g_strcmp0(a, b);
> > > +}
> > > +
> > > +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);
> > > +}
> > > +
> > > +/* DO NOT USE WITH NEW CODE
> > > + * Parse "+feature,-feature,feature=foo" CPU feature string
> > > + */
> > > +void cpu_legacy_parse_featurestr(const char *typename, char *features,
> > > + Error **errp)
> > > +{
> > > + /* Compatibily hack to maintain legacy +-feat semantic,
> > > + * where +-feat overwrites any feature set by
> > > + * feat=on|feat even if the later is parsed after +-feat
> > > + * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
> > > + */
> > > + GList *l, *plus_features = NULL, *minus_features = NULL;
> > > + char *featurestr; /* Single 'key=value" string being parsed */
> > > + static bool cpu_globals_initialized;
> > > + bool ambiguous = false;
> > > +
> > > + if (cpu_globals_initialized) {
> > > + return;
> > > + }
> > > + cpu_globals_initialized = true;
> > > +
> > > + if (!features) {
> > > + return;
> > > + }
> > > +
> > > + for (featurestr = strtok(features, ",");
> > > + featurestr;
> > > + featurestr = strtok(NULL, ",")) {
> > > + const char *name;
> > > + const char *val = NULL;
> > > + char *eq = NULL;
> > > + char num[32];
> > > +
> > > + /* 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;
> > > + }
> >
> > These 6 lines of code (or something equivalent to them) are
> > supposed to be the only difference to the generic parsing
> > function. I would simply make this feature (support for
> > [+-]feature) enabled by a CPUClass::plus_minus_features flag
> > handled by cpu_common_parse_features().
> I'd rather keep plus/minus nonsense under the hood separate
> legacy function so it get reused unintentionally and keep generic
> parser clean.
>
> I didn't have any intent of generalizing +-feat handling
> but rather to remove code duplication between the only users
> (x86/sparc) that happened to use syntax and share the same semantics.
Generalizing it to be controlled by a CPUClass flag will make it
easier to refactor the feature parsing later to use the QemuOpts
parser. But I agree there's no need to do that on this series.
(We might even decide to make [+-]feat work on all other
architectures. We already agreed recently that we won't
deprecate it in x86, we could as well enable the same syntax
uniformly across all architectures.)
>
> As an alternative I can copy-past x86 variant into sparc
> (modulo x86 harmless fixups), that will add some code duplication
> I've tried to avoid with this patch, but it won't cause
> misunderstanding about generalizing legacy hacks.
Works for me. We can then cleanup the x86 code and make it use
cpu_legacy_parse_featurestr() later.
>
> > (But this can be done as a follow-up patch.)
> >
> > > +
> > > + eq = strchr(featurestr, '=');
> > > + if (eq) {
> > > + *eq++ = 0;
> > > + val = eq;
> > > + } else {
> > > + val = "on";
> > > + }
> > > +
> > > + feat2prop(featurestr);
> > > + name = featurestr;
> > > +
> > > + if (g_list_find_custom(plus_features, name, compare_string)) {
> > > + warn_report("Ambiguous CPU model string. "
> > > + "Don't mix both \"+%s\" and \"%s=%s\"",
> > > + name, name, val);
> > > + ambiguous = true;
> > > + }
> > > + if (g_list_find_custom(minus_features, name, compare_string)) {
> > > + warn_report("Ambiguous CPU model string. "
> > > + "Don't mix both \"-%s\" and \"%s=%s\"",
> > > + name, name, val);
> > > + ambiguous = true;
> > > + }
> > > +
> > > + /* Special case: */
> > > + if (!strcmp(name, "tsc-freq")) {
> > > + int ret;
> > > + uint64_t tsc_freq;
> > > +
> > > + ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
> > > + if (ret < 0 || tsc_freq > INT64_MAX) {
> > > + error_setg(errp, "bad numerical value %s", val);
> > > + return;
> > > + }
> > > + snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
> > > + val = num;
> > > + name = "tsc-frequency";
> > > + }
> >
> > This is x86-specific and should stay in x86-specific code. It
> > can probably be handled by the tsc-freq setter.
> there was reason why it wasn't moved to tsc-frequency setter,
> the former is pure integer type of property,
> while here we can get suffixed string that scales by 1000.
>
> Short of creating new visitor for KHz (I don't really looking forward to it),
> it's simpler to leave fixup alone in legacy parser that's shared only between
> x86/sparc as it doesn't conflict with sparc and won't break anything.
It doesn't break anything, but it will move x86-specific cruft to
code that is supposed to be generic.
Creating a write-only "tsc-freq" property that accepts a string
isn't hard to do.
If you are not willing to do it in this series, you can write a
generic parser now (without x86-specific cruft), use it only on
sparc, and later we can refactor x86 so it can also use the
generic one.
>
>
> > > +
> > > + cpu_add_feat_as_prop(typename, name, val);
> > > + }
> > > +
> > > + if (ambiguous) {
> > > + warn_report("Compatibility of ambiguous CPU model "
> > > + "strings won't be kept on future QEMU versions");
> > > + }
> >
> > As noted in the review of the x86 patch that removes the
> > plus_features/minus_features static variables, this obsolete (and
> > confusing) property ordering misfeature should be removed before
> > we make this code generic and reuse it on other architectures.
> As it's been replied removing ordering is behavioral change for
> both x86 and sparc, which is not related to series.
> If you wish, I'll post a patch that will what you suggest
> on top of series.
I would agree if sparc also implemented the weird ordering. But
sparc does not implement it (it doesn't support feat=(on|off)
yet). We shouldn't introduce that misfeature in sparc if we're
already planning to remove it.
--
Eduardo
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-23 16:46 ` Eduardo Habkost
@ 2017-08-23 17:37 ` Igor Mammedov
2017-08-23 17:58 ` Eduardo Habkost
0 siblings, 1 reply; 56+ messages in thread
From: Igor Mammedov @ 2017-08-23 17:37 UTC (permalink / raw)
To: Eduardo Habkost
Cc: qemu-devel, Philippe Mathieu-Daudé,
Mark Cave-Ayland, Artyom Tarasenko, Richard Henderson
On Wed, 23 Aug 2017 13:46:38 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Wed, Aug 23, 2017 at 06:29:02PM +0200, Igor Mammedov wrote:
> > On Wed, 23 Aug 2017 11:34:14 -0300
> > Eduardo Habkost <ehabkost@redhat.com> wrote:
> >
> > > On Fri, Aug 18, 2017 at 12:08:38PM +0200, Igor Mammedov wrote:
> > > > Move cpu_model +-feat parsing into a separate file so that it
> > > > could be reused later for parsing similar format of sparc target
> > > >
> > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > > ---
> > > > CC: Richard Henderson <rth@twiddle.net>
> > > > CC: Eduardo Habkost <ehabkost@redhat.com>
> > > > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > > > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > > > CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > > > ---
> > > > include/qom/cpu.h | 2 +
> > > > default-configs/i386-bsd-user.mak | 1 +
> > > > default-configs/i386-linux-user.mak | 1 +
> > > > default-configs/i386-softmmu.mak | 1 +
> > > > default-configs/x86_64-bsd-user.mak | 1 +
> > > > default-configs/x86_64-linux-user.mak | 1 +
> > > > default-configs/x86_64-softmmu.mak | 1 +
> > > > target/i386/cpu.c | 125 +-------------------------
> > > > util/Makefile.objs | 1 +
> > > > util/legacy_cpu_features_parser.c | 161 ++++++++++++++++++++++++++++++++++
> > > > 10 files changed, 171 insertions(+), 124 deletions(-)
> > > > create mode 100644 util/legacy_cpu_features_parser.c
> > > >
> > > [...]
> > > > diff --git a/util/legacy_cpu_features_parser.c b/util/legacy_cpu_features_parser.c
> > > > new file mode 100644
> > > > index 0000000..6b352a3
> > > > --- /dev/null
> > > > +++ b/util/legacy_cpu_features_parser.c
> > > > @@ -0,0 +1,161 @@
> > > > +/* Support for legacy -cpu cpu,features CLI option with +-feat syntax,
> > > > + * used by x86/sparc targets
> > > > + *
> > > > + * Author: Andreas Färber <afaerber@suse.de>
> > > > + * Author: Andre Przywara <andre.przywara@amd.com>
> > > > + * Author: Eduardo Habkost <ehabkost@redhat.com>
> > > > + * Author: Igor Mammedov <imammedo@redhat.com>
> > > > + * Author: Paolo Bonzini <pbonzini@redhat.com>
> > > > + * Author: Markus Armbruster <armbru@redhat.com>
> > >
> > > IANAL, but I believe a
> > > Copyright (c) <YEAR> <COPYRIGHT HOLDER>
> > > line is needed here.
> > >
> > > > + *
> > > > + * This program is free software; you can redistribute it and/or modify
> > > > + * it under the terms of the GNU General Public License as published by
> > > > + * the Free Software Foundation; either version 2 of the License, or
> > > > + * (at your option) any later version.
> > > > +
> > > > + * This program is distributed in the hope that it will be useful,
> > > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > > > + * GNU General Public License for more details.
> > > > +
> > > > + * You should have received a copy of the GNU General Public License along
> > > > + * with this program; if not, see <http://www.gnu.org/licenses/>.
> > > > + */
> > > > +
> > > > +#include "qemu/osdep.h"
> > > > +#include "qapi/error.h"
> > > > +#include "qemu/cutils.h"
> > > > +#include "qom/cpu.h"
> > > > +#include "qemu/error-report.h"
> > > > +#include "hw/qdev-properties.h"
> > > > +
> > > > +static inline void feat2prop(char *s)
> > > > +{
> > > > + while ((s = strchr(s, '_'))) {
> > > > + *s = '-';
> > > > + }
> > > > +}
> > > > +
> > > > +static gint compare_string(gconstpointer a, gconstpointer b)
> > > > +{
> > > > + return g_strcmp0(a, b);
> > > > +}
> > > > +
> > > > +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);
> > > > +}
> > > > +
> > > > +/* DO NOT USE WITH NEW CODE
> > > > + * Parse "+feature,-feature,feature=foo" CPU feature string
> > > > + */
> > > > +void cpu_legacy_parse_featurestr(const char *typename, char *features,
> > > > + Error **errp)
> > > > +{
> > > > + /* Compatibily hack to maintain legacy +-feat semantic,
> > > > + * where +-feat overwrites any feature set by
> > > > + * feat=on|feat even if the later is parsed after +-feat
> > > > + * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
> > > > + */
> > > > + GList *l, *plus_features = NULL, *minus_features = NULL;
> > > > + char *featurestr; /* Single 'key=value" string being parsed */
> > > > + static bool cpu_globals_initialized;
> > > > + bool ambiguous = false;
> > > > +
> > > > + if (cpu_globals_initialized) {
> > > > + return;
> > > > + }
> > > > + cpu_globals_initialized = true;
> > > > +
> > > > + if (!features) {
> > > > + return;
> > > > + }
> > > > +
> > > > + for (featurestr = strtok(features, ",");
> > > > + featurestr;
> > > > + featurestr = strtok(NULL, ",")) {
> > > > + const char *name;
> > > > + const char *val = NULL;
> > > > + char *eq = NULL;
> > > > + char num[32];
> > > > +
> > > > + /* 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;
> > > > + }
> > >
> > > These 6 lines of code (or something equivalent to them) are
> > > supposed to be the only difference to the generic parsing
> > > function. I would simply make this feature (support for
> > > [+-]feature) enabled by a CPUClass::plus_minus_features flag
> > > handled by cpu_common_parse_features().
> > I'd rather keep plus/minus nonsense under the hood separate
> > legacy function so it get reused unintentionally and keep generic
> > parser clean.
> >
> > I didn't have any intent of generalizing +-feat handling
> > but rather to remove code duplication between the only users
> > (x86/sparc) that happened to use syntax and share the same semantics.
>
> Generalizing it to be controlled by a CPUClass flag will make it
> easier to refactor the feature parsing later to use the QemuOpts
> parser. But I agree there's no need to do that on this series.
>
> (We might even decide to make [+-]feat work on all other
> architectures. We already agreed recently that we won't
> deprecate it in x86, we could as well enable the same syntax
> uniformly across all architectures.)
I'd just stick to canonical feat=on|off and keep legacy to x86|sparc,
but it's this to discuss if future and relevant here.
>
> >
> > As an alternative I can copy-past x86 variant into sparc
> > (modulo x86 harmless fixups), that will add some code duplication
> > I've tried to avoid with this patch, but it won't cause
> > misunderstanding about generalizing legacy hacks.
>
> Works for me. We can then cleanup the x86 code and make it use
> cpu_legacy_parse_featurestr() later.
Then, I'll just copy and replace sparc variant with x86 impl.
(removing from the copy x86 only parts and making parser stricter
where possible) and drop 5-6 patches that touched x86 for the purpose
of sharing code.
and respin v3 tomorrow.
>
> >
> > > (But this can be done as a follow-up patch.)
> > >
> > > > +
> > > > + eq = strchr(featurestr, '=');
> > > > + if (eq) {
> > > > + *eq++ = 0;
> > > > + val = eq;
> > > > + } else {
> > > > + val = "on";
> > > > + }
> > > > +
> > > > + feat2prop(featurestr);
> > > > + name = featurestr;
> > > > +
> > > > + if (g_list_find_custom(plus_features, name, compare_string)) {
> > > > + warn_report("Ambiguous CPU model string. "
> > > > + "Don't mix both \"+%s\" and \"%s=%s\"",
> > > > + name, name, val);
> > > > + ambiguous = true;
> > > > + }
> > > > + if (g_list_find_custom(minus_features, name, compare_string)) {
> > > > + warn_report("Ambiguous CPU model string. "
> > > > + "Don't mix both \"-%s\" and \"%s=%s\"",
> > > > + name, name, val);
> > > > + ambiguous = true;
> > > > + }
> > > > +
> > > > + /* Special case: */
> > > > + if (!strcmp(name, "tsc-freq")) {
> > > > + int ret;
> > > > + uint64_t tsc_freq;
> > > > +
> > > > + ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
> > > > + if (ret < 0 || tsc_freq > INT64_MAX) {
> > > > + error_setg(errp, "bad numerical value %s", val);
> > > > + return;
> > > > + }
> > > > + snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
> > > > + val = num;
> > > > + name = "tsc-frequency";
> > > > + }
> > >
> > > This is x86-specific and should stay in x86-specific code. It
> > > can probably be handled by the tsc-freq setter.
> > there was reason why it wasn't moved to tsc-frequency setter,
> > the former is pure integer type of property,
> > while here we can get suffixed string that scales by 1000.
> >
> > Short of creating new visitor for KHz (I don't really looking forward to it),
> > it's simpler to leave fixup alone in legacy parser that's shared only between
> > x86/sparc as it doesn't conflict with sparc and won't break anything.
>
> It doesn't break anything, but it will move x86-specific cruft to
> code that is supposed to be generic.
>
> Creating a write-only "tsc-freq" property that accepts a string
> isn't hard to do.
Nice idea, it might just work.
>
> If you are not willing to do it in this series, you can write a
> generic parser now (without x86-specific cruft), use it only on
> sparc, and later we can refactor x86 so it can also use the
> generic one.
So far, I'm inclined towards opposing +-feat generalizing and keeping
canonical form anywhere except of x86/sparc were we have to tolerate it.
> > > > +
> > > > + cpu_add_feat_as_prop(typename, name, val);
> > > > + }
> > > > +
> > > > + if (ambiguous) {
> > > > + warn_report("Compatibility of ambiguous CPU model "
> > > > + "strings won't be kept on future QEMU versions");
> > > > + }
> > >
> > > As noted in the review of the x86 patch that removes the
> > > plus_features/minus_features static variables, this obsolete (and
> > > confusing) property ordering misfeature should be removed before
> > > we make this code generic and reuse it on other architectures.
> > As it's been replied removing ordering is behavioral change for
> > both x86 and sparc, which is not related to series.
> > If you wish, I'll post a patch that will what you suggest
> > on top of series.
>
> I would agree if sparc also implemented the weird ordering. But
> sparc does not implement it (it doesn't support feat=(on|off)
> yet). We shouldn't introduce that misfeature in sparc if we're
> already planning to remove it.
It didn't have canonic form but it gains this ability with this series.
So we could do better for it by forbidding mixed syntax from starters
(+1 for copy-past) but we have to keep minus overrides plus semantics,
so ambiguous check is still there but it would lead to hard error instead of
warning.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-23 17:37 ` Igor Mammedov
@ 2017-08-23 17:58 ` Eduardo Habkost
2017-08-24 9:18 ` Igor Mammedov
0 siblings, 1 reply; 56+ messages in thread
From: Eduardo Habkost @ 2017-08-23 17:58 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Philippe Mathieu-Daudé,
Mark Cave-Ayland, Artyom Tarasenko, Richard Henderson
On Wed, Aug 23, 2017 at 07:37:39PM +0200, Igor Mammedov wrote:
> On Wed, 23 Aug 2017 13:46:38 -0300
> Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> > On Wed, Aug 23, 2017 at 06:29:02PM +0200, Igor Mammedov wrote:
> > > On Wed, 23 Aug 2017 11:34:14 -0300
> > > Eduardo Habkost <ehabkost@redhat.com> wrote:
> > >
> > > > On Fri, Aug 18, 2017 at 12:08:38PM +0200, Igor Mammedov wrote:
> > > > > Move cpu_model +-feat parsing into a separate file so that it
> > > > > could be reused later for parsing similar format of sparc target
> > > > >
> > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > > > ---
> > > > > CC: Richard Henderson <rth@twiddle.net>
> > > > > CC: Eduardo Habkost <ehabkost@redhat.com>
> > > > > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > > > > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > > > > CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > > > > ---
> > > > > include/qom/cpu.h | 2 +
> > > > > default-configs/i386-bsd-user.mak | 1 +
> > > > > default-configs/i386-linux-user.mak | 1 +
> > > > > default-configs/i386-softmmu.mak | 1 +
> > > > > default-configs/x86_64-bsd-user.mak | 1 +
> > > > > default-configs/x86_64-linux-user.mak | 1 +
> > > > > default-configs/x86_64-softmmu.mak | 1 +
> > > > > target/i386/cpu.c | 125 +-------------------------
> > > > > util/Makefile.objs | 1 +
> > > > > util/legacy_cpu_features_parser.c | 161 ++++++++++++++++++++++++++++++++++
> > > > > 10 files changed, 171 insertions(+), 124 deletions(-)
> > > > > create mode 100644 util/legacy_cpu_features_parser.c
> > > > >
> > > > [...]
> > > > > diff --git a/util/legacy_cpu_features_parser.c b/util/legacy_cpu_features_parser.c
> > > > > new file mode 100644
> > > > > index 0000000..6b352a3
> > > > > --- /dev/null
> > > > > +++ b/util/legacy_cpu_features_parser.c
> > > > > @@ -0,0 +1,161 @@
> > > > > +/* Support for legacy -cpu cpu,features CLI option with +-feat syntax,
> > > > > + * used by x86/sparc targets
> > > > > + *
> > > > > + * Author: Andreas Färber <afaerber@suse.de>
> > > > > + * Author: Andre Przywara <andre.przywara@amd.com>
> > > > > + * Author: Eduardo Habkost <ehabkost@redhat.com>
> > > > > + * Author: Igor Mammedov <imammedo@redhat.com>
> > > > > + * Author: Paolo Bonzini <pbonzini@redhat.com>
> > > > > + * Author: Markus Armbruster <armbru@redhat.com>
> > > >
> > > > IANAL, but I believe a
> > > > Copyright (c) <YEAR> <COPYRIGHT HOLDER>
> > > > line is needed here.
> > > >
> > > > > + *
> > > > > + * This program is free software; you can redistribute it and/or modify
> > > > > + * it under the terms of the GNU General Public License as published by
> > > > > + * the Free Software Foundation; either version 2 of the License, or
> > > > > + * (at your option) any later version.
> > > > > +
> > > > > + * This program is distributed in the hope that it will be useful,
> > > > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > > > > + * GNU General Public License for more details.
> > > > > +
> > > > > + * You should have received a copy of the GNU General Public License along
> > > > > + * with this program; if not, see <http://www.gnu.org/licenses/>.
> > > > > + */
> > > > > +
> > > > > +#include "qemu/osdep.h"
> > > > > +#include "qapi/error.h"
> > > > > +#include "qemu/cutils.h"
> > > > > +#include "qom/cpu.h"
> > > > > +#include "qemu/error-report.h"
> > > > > +#include "hw/qdev-properties.h"
> > > > > +
> > > > > +static inline void feat2prop(char *s)
> > > > > +{
> > > > > + while ((s = strchr(s, '_'))) {
> > > > > + *s = '-';
> > > > > + }
> > > > > +}
> > > > > +
> > > > > +static gint compare_string(gconstpointer a, gconstpointer b)
> > > > > +{
> > > > > + return g_strcmp0(a, b);
> > > > > +}
> > > > > +
> > > > > +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);
> > > > > +}
> > > > > +
> > > > > +/* DO NOT USE WITH NEW CODE
> > > > > + * Parse "+feature,-feature,feature=foo" CPU feature string
> > > > > + */
> > > > > +void cpu_legacy_parse_featurestr(const char *typename, char *features,
> > > > > + Error **errp)
> > > > > +{
> > > > > + /* Compatibily hack to maintain legacy +-feat semantic,
> > > > > + * where +-feat overwrites any feature set by
> > > > > + * feat=on|feat even if the later is parsed after +-feat
> > > > > + * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
> > > > > + */
> > > > > + GList *l, *plus_features = NULL, *minus_features = NULL;
> > > > > + char *featurestr; /* Single 'key=value" string being parsed */
> > > > > + static bool cpu_globals_initialized;
> > > > > + bool ambiguous = false;
> > > > > +
> > > > > + if (cpu_globals_initialized) {
> > > > > + return;
> > > > > + }
> > > > > + cpu_globals_initialized = true;
> > > > > +
> > > > > + if (!features) {
> > > > > + return;
> > > > > + }
> > > > > +
> > > > > + for (featurestr = strtok(features, ",");
> > > > > + featurestr;
> > > > > + featurestr = strtok(NULL, ",")) {
> > > > > + const char *name;
> > > > > + const char *val = NULL;
> > > > > + char *eq = NULL;
> > > > > + char num[32];
> > > > > +
> > > > > + /* 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;
> > > > > + }
> > > >
> > > > These 6 lines of code (or something equivalent to them) are
> > > > supposed to be the only difference to the generic parsing
> > > > function. I would simply make this feature (support for
> > > > [+-]feature) enabled by a CPUClass::plus_minus_features flag
> > > > handled by cpu_common_parse_features().
> > > I'd rather keep plus/minus nonsense under the hood separate
> > > legacy function so it get reused unintentionally and keep generic
> > > parser clean.
> > >
> > > I didn't have any intent of generalizing +-feat handling
> > > but rather to remove code duplication between the only users
> > > (x86/sparc) that happened to use syntax and share the same semantics.
> >
> > Generalizing it to be controlled by a CPUClass flag will make it
> > easier to refactor the feature parsing later to use the QemuOpts
> > parser. But I agree there's no need to do that on this series.
> >
> > (We might even decide to make [+-]feat work on all other
> > architectures. We already agreed recently that we won't
> > deprecate it in x86, we could as well enable the same syntax
> > uniformly across all architectures.)
> I'd just stick to canonical feat=on|off and keep legacy to x86|sparc,
> but it's this to discuss if future and relevant here.
>
> >
> > >
> > > As an alternative I can copy-past x86 variant into sparc
> > > (modulo x86 harmless fixups), that will add some code duplication
> > > I've tried to avoid with this patch, but it won't cause
> > > misunderstanding about generalizing legacy hacks.
> >
> > Works for me. We can then cleanup the x86 code and make it use
> > cpu_legacy_parse_featurestr() later.
> Then, I'll just copy and replace sparc variant with x86 impl.
> (removing from the copy x86 only parts and making parser stricter
> where possible) and drop 5-6 patches that touched x86 for the purpose
> of sharing code.
>
> and respin v3 tomorrow.
I just have one worry about this plan, below:
>
> >
> > >
> > > > (But this can be done as a follow-up patch.)
> > > >
> > > > > +
> > > > > + eq = strchr(featurestr, '=');
> > > > > + if (eq) {
> > > > > + *eq++ = 0;
> > > > > + val = eq;
> > > > > + } else {
> > > > > + val = "on";
> > > > > + }
> > > > > +
> > > > > + feat2prop(featurestr);
> > > > > + name = featurestr;
> > > > > +
> > > > > + if (g_list_find_custom(plus_features, name, compare_string)) {
> > > > > + warn_report("Ambiguous CPU model string. "
> > > > > + "Don't mix both \"+%s\" and \"%s=%s\"",
> > > > > + name, name, val);
> > > > > + ambiguous = true;
> > > > > + }
> > > > > + if (g_list_find_custom(minus_features, name, compare_string)) {
> > > > > + warn_report("Ambiguous CPU model string. "
> > > > > + "Don't mix both \"-%s\" and \"%s=%s\"",
> > > > > + name, name, val);
> > > > > + ambiguous = true;
> > > > > + }
> > > > > +
> > > > > + /* Special case: */
> > > > > + if (!strcmp(name, "tsc-freq")) {
> > > > > + int ret;
> > > > > + uint64_t tsc_freq;
> > > > > +
> > > > > + ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
> > > > > + if (ret < 0 || tsc_freq > INT64_MAX) {
> > > > > + error_setg(errp, "bad numerical value %s", val);
> > > > > + return;
> > > > > + }
> > > > > + snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
> > > > > + val = num;
> > > > > + name = "tsc-frequency";
> > > > > + }
> > > >
> > > > This is x86-specific and should stay in x86-specific code. It
> > > > can probably be handled by the tsc-freq setter.
> > > there was reason why it wasn't moved to tsc-frequency setter,
> > > the former is pure integer type of property,
> > > while here we can get suffixed string that scales by 1000.
> > >
> > > Short of creating new visitor for KHz (I don't really looking forward to it),
> > > it's simpler to leave fixup alone in legacy parser that's shared only between
> > > x86/sparc as it doesn't conflict with sparc and won't break anything.
> >
> > It doesn't break anything, but it will move x86-specific cruft to
> > code that is supposed to be generic.
> >
> > Creating a write-only "tsc-freq" property that accepts a string
> > isn't hard to do.
> Nice idea, it might just work.
>
> >
> > If you are not willing to do it in this series, you can write a
> > generic parser now (without x86-specific cruft), use it only on
> > sparc, and later we can refactor x86 so it can also use the
> > generic one.
> So far, I'm inclined towards opposing +-feat generalizing and keeping
> canonical form anywhere except of x86/sparc were we have to tolerate it.
>
>
> > > > > +
> > > > > + cpu_add_feat_as_prop(typename, name, val);
> > > > > + }
> > > > > +
> > > > > + if (ambiguous) {
> > > > > + warn_report("Compatibility of ambiguous CPU model "
> > > > > + "strings won't be kept on future QEMU versions");
> > > > > + }
> > > >
> > > > As noted in the review of the x86 patch that removes the
> > > > plus_features/minus_features static variables, this obsolete (and
> > > > confusing) property ordering misfeature should be removed before
> > > > we make this code generic and reuse it on other architectures.
> > > As it's been replied removing ordering is behavioral change for
> > > both x86 and sparc, which is not related to series.
> > > If you wish, I'll post a patch that will what you suggest
> > > on top of series.
> >
> > I would agree if sparc also implemented the weird ordering. But
> > sparc does not implement it (it doesn't support feat=(on|off)
> > yet). We shouldn't introduce that misfeature in sparc if we're
> > already planning to remove it.
> It didn't have canonic form but it gains this ability with this series.
> So we could do better for it by forbidding mixed syntax from starters
We don't need to forbid mixed syntax. We can simply apply
[+-]feat and feat=on|off in the same order they appear in the
command-line.
But:
> (+1 for copy-past) but we have to keep minus overrides plus semantics,
> so ambiguous check is still there but it would lead to hard error instead of
> warning.
I forgot about this additional weird semantics
(minus-override-plus). :(
I think we must deprecate the minus-override-plus semantics too
and move to command-line-order eventually (on both x86 and
sparc). But to do that, we need to make the code print a warning
on sparc like we do on x86.
If we don't remove that weird semantics before making sparc
support feat=on|off, we will have to worry about the semantics of
"-feat,feat=on" on top of that. I would simply wait for 2
releases and remove minus-override-plus, before implementing
feat=on|off on sparc, to avoid creating a new set of problems.
Is support for feat=on|off on sparc a must-have for QEMU 2.11?
--
Eduardo
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 01/27] sparc: convert cpu models to SPARC cpu subclasses
2017-08-23 1:12 ` Philippe Mathieu-Daudé
@ 2017-08-24 2:40 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-24 2:40 UTC (permalink / raw)
To: Igor Mammedov; +Cc: qemu-devel, Mark Cave-Ayland, Artyom Tarasenko
On 08/22/2017 10:12 PM, Philippe Mathieu-Daudé wrote:
>>> On 08/18/2017 07:08 AM, Igor Mammedov wrote:
>>>> QOMfy cpu models handling introducing propper cpu types
>>>> for each cpu model.
>>>>
>>>> Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>>>> ---
>>>> with this and conversion of features to properties,
>>>> it would be possible to replace cpu_sparc_init() with
>>>> cpu_generic_init() and reuse common -cpu handling
>>>> infrastructure.
>>>>
>>>> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>>>> CC: Artyom Tarasenko <atar4qemu@gmail.com>
>>>> CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>>>
>>>> v2:
>>>> * make base class abstract (Philippe Mathieu-Daudé
>>>> <f4bug@amsat.org>)
>>>> ---
>>>> target/sparc/cpu-qom.h | 2 +
>>>> target/sparc/cpu.c | 121
>>>> +++++++++++++++++++++++++++++++++----------------
>>>> 2 files changed, 84 insertions(+), 39 deletions(-)
>>>>
>>>> diff --git a/target/sparc/cpu-qom.h b/target/sparc/cpu-qom.h
>>>> index f63af72..af6d57a 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 d606eb5..2994c09 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,19 @@ 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, ",");
>>>
>>> you can free 'str' once here:
>>>
>>> g_free(str);
>>>
>>>> + oc = cpu_class_by_name(TYPE_SPARC_CPU, name);
>>>> + if (oc == NULL) {
>>>> + g_free(str);
>>>
>>> drop
>>>
>>>> + return NULL;
>>>> + }
>>>> + g_free(str);
>>>
>>> drop
>>
>> I'll fix it up if I have to respin series (note this function is
>> removed within series)
Indeed I didn't notice
>>
>> [...]
>>
>>> Anyway I can't start Aurelien's image [1] with this commit:
>> Can't reproduce it locally (either dirty/clean tree rebuild)
>> with ./configure --enable-debug
>>
>>> $ sparc-softmmu/qemu-system-sparc -hda debian_etch_sparc_small.qcow2
>>> qemu: Unable to find Sparc CPU definition
>> for this kind of error guest image doesn't matter as error happens
>> during machine_init()
>>
>>> [1] https://people.debian.org/~aurel32/qemu/sparc/
>> It boots just fine with default CPU model:
>>
>> ./sparc-softmmu/qemu-system-sparc -hda debian_etch_sparc_small.qcow2
Yes, my bad!
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> Sorry I'v been distracted by something else :/
> I might have done something wrong, I'll test it again tomorrow.
>
>>
>> and with explicitly specified one:
>>
>> sparc-softmmu/qemu-system-sparc -cpu "Fujitsu MB86904"
>>
>> I get from "info qom-tree"
>> ...
>> /device[0] (Fujitsu-MB86904-sparc-cpu)
>> ...
>>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 02/27] sparc: embed sparc_def_t into CPUSPARCState
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 02/27] sparc: embed sparc_def_t into CPUSPARCState Igor Mammedov
@ 2017-08-24 2:45 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-24 2:45 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Riku Voipio, Mark Cave-Ayland, Laurent Vivier, Artyom Tarasenko
On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> 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>
> ---
> Embedded CPUSPARCState::def also needed for follow up patch
> to use its fields with static qdev properties.
>
> CC: Riku Voipio <riku.voipio@iki.fi>
> CC: Laurent Vivier <laurent@vivier.eu>
> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Artyom Tarasenko <atar4qemu@gmail.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 f97aa6b..5f09abf 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 95a36a4..0e41916 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 2994c09..f4e7343 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;
> }
> @@ -558,7 +558,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;
> @@ -819,8 +819,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
>
> @@ -848,15 +848,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)
> @@ -905,7 +899,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 eec9a4d..c772492 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 f942973..f3e7f32 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 57968d9..fb489cb 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 8b4664d..126ea5e 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 3bde47b..6290705 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 154279e..8290a21 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;
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 04/27] sparc: move adhoc CPUSPARCState initialization to realize time
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 04/27] sparc: move adhoc CPUSPARCState initialization to realize time Igor Mammedov
@ 2017-08-24 2:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-24 2:47 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel; +Cc: Mark Cave-Ayland, Artyom Tarasenko
On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> SPARCCPU::env was initialized from previosuly set properties
"previously"
> (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>
> ---
> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Artyom Tarasenko <atar4qemu@gmail.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 e735d73..7f74b1c 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;
> }
>
> @@ -817,15 +803,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);
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init()
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init() Igor Mammedov
2017-08-18 19:57 ` Philippe Mathieu-Daudé
@ 2017-08-24 2:49 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-24 2:49 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Mark Cave-Ayland, Artyom Tarasenko, Fabien Chouteau
On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> 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>
> ---
> CC: Fabien Chouteau <chouteau@adacore.com>
> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Artyom Tarasenko <atar4qemu@gmail.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 0e41916..b45cfb4 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 d5ff188..56512ec 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 89dd8a9..cf47dca 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 4e4fdab..ecf38a4 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 fd01cbf..2917021 100644
> --- a/target/sparc/cpu.c
> +++ b/target/sparc/cpu.c
> @@ -110,11 +110,6 @@ static void sparc_cpu_parse_features(const char *typename, char *features,
> cpu_legacy_parse_featurestr(typename, features, errp);
> }
>
> -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)
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init()
2017-08-21 11:11 ` Igor Mammedov
@ 2017-08-24 2:51 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-24 2:51 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Mark Cave-Ayland, Artyom Tarasenko, Fabien Chouteau
On 08/21/2017 08:11 AM, Igor Mammedov wrote:
> Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
>> I succeed booting a SPARC image once applying 1 to 8 (this commit),
>> so not being able to boot the image previously is probably due to patch
>> order, which mean current order is not bisect-able.
>
> I repeated patch by patch (1-8) build/test steps and it works for me
> (i.e. compiles and both sparc/sparc64 target machines start as expected)
>
> Could you re-check with clean build and if failure still persist
> pin-point exact cause?
Sorry Igor, I guess it was some issue on my side (dirty working space
probably).
Regards,
Phil.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-23 17:58 ` Eduardo Habkost
@ 2017-08-24 9:18 ` Igor Mammedov
2017-08-24 13:43 ` Igor Mammedov
2017-08-24 13:45 ` Eduardo Habkost
0 siblings, 2 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-24 9:18 UTC (permalink / raw)
To: Eduardo Habkost
Cc: qemu-devel, Philippe Mathieu-Daudé,
Mark Cave-Ayland, Artyom Tarasenko, Richard Henderson
On Wed, 23 Aug 2017 14:58:39 -0300
Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Wed, Aug 23, 2017 at 07:37:39PM +0200, Igor Mammedov wrote:
> > On Wed, 23 Aug 2017 13:46:38 -0300
> > Eduardo Habkost <ehabkost@redhat.com> wrote:
> >
> > > On Wed, Aug 23, 2017 at 06:29:02PM +0200, Igor Mammedov wrote:
> > > > On Wed, 23 Aug 2017 11:34:14 -0300
> > > > Eduardo Habkost <ehabkost@redhat.com> wrote:
> > > >
> > > > > On Fri, Aug 18, 2017 at 12:08:38PM +0200, Igor Mammedov wrote:
> > > > > > Move cpu_model +-feat parsing into a separate file so that it
> > > > > > could be reused later for parsing similar format of sparc target
> > > > > >
> > > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > > > > ---
> > > > > > CC: Richard Henderson <rth@twiddle.net>
> > > > > > CC: Eduardo Habkost <ehabkost@redhat.com>
> > > > > > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > > > > > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > > > > > CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > > > > > ---
> > > > > > include/qom/cpu.h | 2 +
> > > > > > default-configs/i386-bsd-user.mak | 1 +
> > > > > > default-configs/i386-linux-user.mak | 1 +
> > > > > > default-configs/i386-softmmu.mak | 1 +
> > > > > > default-configs/x86_64-bsd-user.mak | 1 +
> > > > > > default-configs/x86_64-linux-user.mak | 1 +
> > > > > > default-configs/x86_64-softmmu.mak | 1 +
> > > > > > target/i386/cpu.c | 125 +-------------------------
> > > > > > util/Makefile.objs | 1 +
> > > > > > util/legacy_cpu_features_parser.c | 161 ++++++++++++++++++++++++++++++++++
> > > > > > 10 files changed, 171 insertions(+), 124 deletions(-)
> > > > > > create mode 100644 util/legacy_cpu_features_parser.c
> > > > > >
> > > > > [...]
> > > > > > diff --git a/util/legacy_cpu_features_parser.c b/util/legacy_cpu_features_parser.c
> > > > > > new file mode 100644
> > > > > > index 0000000..6b352a3
> > > > > > --- /dev/null
> > > > > > +++ b/util/legacy_cpu_features_parser.c
> > > > > > @@ -0,0 +1,161 @@
> > > > > > +/* Support for legacy -cpu cpu,features CLI option with +-feat syntax,
> > > > > > + * used by x86/sparc targets
> > > > > > + *
> > > > > > + * Author: Andreas Färber <afaerber@suse.de>
> > > > > > + * Author: Andre Przywara <andre.przywara@amd.com>
> > > > > > + * Author: Eduardo Habkost <ehabkost@redhat.com>
> > > > > > + * Author: Igor Mammedov <imammedo@redhat.com>
> > > > > > + * Author: Paolo Bonzini <pbonzini@redhat.com>
> > > > > > + * Author: Markus Armbruster <armbru@redhat.com>
> > > > >
> > > > > IANAL, but I believe a
> > > > > Copyright (c) <YEAR> <COPYRIGHT HOLDER>
> > > > > line is needed here.
> > > > >
> > > > > > + *
> > > > > > + * This program is free software; you can redistribute it and/or modify
> > > > > > + * it under the terms of the GNU General Public License as published by
> > > > > > + * the Free Software Foundation; either version 2 of the License, or
> > > > > > + * (at your option) any later version.
> > > > > > +
> > > > > > + * This program is distributed in the hope that it will be useful,
> > > > > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > > > > > + * GNU General Public License for more details.
> > > > > > +
> > > > > > + * You should have received a copy of the GNU General Public License along
> > > > > > + * with this program; if not, see <http://www.gnu.org/licenses/>.
> > > > > > + */
> > > > > > +
> > > > > > +#include "qemu/osdep.h"
> > > > > > +#include "qapi/error.h"
> > > > > > +#include "qemu/cutils.h"
> > > > > > +#include "qom/cpu.h"
> > > > > > +#include "qemu/error-report.h"
> > > > > > +#include "hw/qdev-properties.h"
> > > > > > +
> > > > > > +static inline void feat2prop(char *s)
> > > > > > +{
> > > > > > + while ((s = strchr(s, '_'))) {
> > > > > > + *s = '-';
> > > > > > + }
> > > > > > +}
> > > > > > +
> > > > > > +static gint compare_string(gconstpointer a, gconstpointer b)
> > > > > > +{
> > > > > > + return g_strcmp0(a, b);
> > > > > > +}
> > > > > > +
> > > > > > +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);
> > > > > > +}
> > > > > > +
> > > > > > +/* DO NOT USE WITH NEW CODE
> > > > > > + * Parse "+feature,-feature,feature=foo" CPU feature string
> > > > > > + */
> > > > > > +void cpu_legacy_parse_featurestr(const char *typename, char *features,
> > > > > > + Error **errp)
> > > > > > +{
> > > > > > + /* Compatibily hack to maintain legacy +-feat semantic,
> > > > > > + * where +-feat overwrites any feature set by
> > > > > > + * feat=on|feat even if the later is parsed after +-feat
> > > > > > + * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
> > > > > > + */
> > > > > > + GList *l, *plus_features = NULL, *minus_features = NULL;
> > > > > > + char *featurestr; /* Single 'key=value" string being parsed */
> > > > > > + static bool cpu_globals_initialized;
> > > > > > + bool ambiguous = false;
> > > > > > +
> > > > > > + if (cpu_globals_initialized) {
> > > > > > + return;
> > > > > > + }
> > > > > > + cpu_globals_initialized = true;
> > > > > > +
> > > > > > + if (!features) {
> > > > > > + return;
> > > > > > + }
> > > > > > +
> > > > > > + for (featurestr = strtok(features, ",");
> > > > > > + featurestr;
> > > > > > + featurestr = strtok(NULL, ",")) {
> > > > > > + const char *name;
> > > > > > + const char *val = NULL;
> > > > > > + char *eq = NULL;
> > > > > > + char num[32];
> > > > > > +
> > > > > > + /* 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;
> > > > > > + }
> > > > >
> > > > > These 6 lines of code (or something equivalent to them) are
> > > > > supposed to be the only difference to the generic parsing
> > > > > function. I would simply make this feature (support for
> > > > > [+-]feature) enabled by a CPUClass::plus_minus_features flag
> > > > > handled by cpu_common_parse_features().
> > > > I'd rather keep plus/minus nonsense under the hood separate
> > > > legacy function so it get reused unintentionally and keep generic
> > > > parser clean.
> > > >
> > > > I didn't have any intent of generalizing +-feat handling
> > > > but rather to remove code duplication between the only users
> > > > (x86/sparc) that happened to use syntax and share the same semantics.
> > >
> > > Generalizing it to be controlled by a CPUClass flag will make it
> > > easier to refactor the feature parsing later to use the QemuOpts
> > > parser. But I agree there's no need to do that on this series.
> > >
> > > (We might even decide to make [+-]feat work on all other
> > > architectures. We already agreed recently that we won't
> > > deprecate it in x86, we could as well enable the same syntax
> > > uniformly across all architectures.)
> > I'd just stick to canonical feat=on|off and keep legacy to x86|sparc,
> > but it's this to discuss if future and relevant here.
> >
> > >
> > > >
> > > > As an alternative I can copy-past x86 variant into sparc
> > > > (modulo x86 harmless fixups), that will add some code duplication
> > > > I've tried to avoid with this patch, but it won't cause
> > > > misunderstanding about generalizing legacy hacks.
> > >
> > > Works for me. We can then cleanup the x86 code and make it use
> > > cpu_legacy_parse_featurestr() later.
> > Then, I'll just copy and replace sparc variant with x86 impl.
> > (removing from the copy x86 only parts and making parser stricter
> > where possible) and drop 5-6 patches that touched x86 for the purpose
> > of sharing code.
> >
> > and respin v3 tomorrow.
>
> I just have one worry about this plan, below:
>
> >
> > >
> > > >
> > > > > (But this can be done as a follow-up patch.)
> > > > >
> > > > > > +
> > > > > > + eq = strchr(featurestr, '=');
> > > > > > + if (eq) {
> > > > > > + *eq++ = 0;
> > > > > > + val = eq;
> > > > > > + } else {
> > > > > > + val = "on";
> > > > > > + }
> > > > > > +
> > > > > > + feat2prop(featurestr);
> > > > > > + name = featurestr;
> > > > > > +
> > > > > > + if (g_list_find_custom(plus_features, name, compare_string)) {
> > > > > > + warn_report("Ambiguous CPU model string. "
> > > > > > + "Don't mix both \"+%s\" and \"%s=%s\"",
> > > > > > + name, name, val);
> > > > > > + ambiguous = true;
> > > > > > + }
> > > > > > + if (g_list_find_custom(minus_features, name, compare_string)) {
> > > > > > + warn_report("Ambiguous CPU model string. "
> > > > > > + "Don't mix both \"-%s\" and \"%s=%s\"",
> > > > > > + name, name, val);
> > > > > > + ambiguous = true;
> > > > > > + }
> > > > > > +
> > > > > > + /* Special case: */
> > > > > > + if (!strcmp(name, "tsc-freq")) {
> > > > > > + int ret;
> > > > > > + uint64_t tsc_freq;
> > > > > > +
> > > > > > + ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
> > > > > > + if (ret < 0 || tsc_freq > INT64_MAX) {
> > > > > > + error_setg(errp, "bad numerical value %s", val);
> > > > > > + return;
> > > > > > + }
> > > > > > + snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
> > > > > > + val = num;
> > > > > > + name = "tsc-frequency";
> > > > > > + }
> > > > >
> > > > > This is x86-specific and should stay in x86-specific code. It
> > > > > can probably be handled by the tsc-freq setter.
> > > > there was reason why it wasn't moved to tsc-frequency setter,
> > > > the former is pure integer type of property,
> > > > while here we can get suffixed string that scales by 1000.
> > > >
> > > > Short of creating new visitor for KHz (I don't really looking forward to it),
> > > > it's simpler to leave fixup alone in legacy parser that's shared only between
> > > > x86/sparc as it doesn't conflict with sparc and won't break anything.
> > >
> > > It doesn't break anything, but it will move x86-specific cruft to
> > > code that is supposed to be generic.
> > >
> > > Creating a write-only "tsc-freq" property that accepts a string
> > > isn't hard to do.
> > Nice idea, it might just work.
> >
> > >
> > > If you are not willing to do it in this series, you can write a
> > > generic parser now (without x86-specific cruft), use it only on
> > > sparc, and later we can refactor x86 so it can also use the
> > > generic one.
> > So far, I'm inclined towards opposing +-feat generalizing and keeping
> > canonical form anywhere except of x86/sparc were we have to tolerate it.
> >
> >
> > > > > > +
> > > > > > + cpu_add_feat_as_prop(typename, name, val);
> > > > > > + }
> > > > > > +
> > > > > > + if (ambiguous) {
> > > > > > + warn_report("Compatibility of ambiguous CPU model "
> > > > > > + "strings won't be kept on future QEMU versions");
> > > > > > + }
> > > > >
> > > > > As noted in the review of the x86 patch that removes the
> > > > > plus_features/minus_features static variables, this obsolete (and
> > > > > confusing) property ordering misfeature should be removed before
> > > > > we make this code generic and reuse it on other architectures.
> > > > As it's been replied removing ordering is behavioral change for
> > > > both x86 and sparc, which is not related to series.
> > > > If you wish, I'll post a patch that will what you suggest
> > > > on top of series.
> > >
> > > I would agree if sparc also implemented the weird ordering. But
> > > sparc does not implement it (it doesn't support feat=(on|off)
> > > yet). We shouldn't introduce that misfeature in sparc if we're
> > > already planning to remove it.
> > It didn't have canonic form but it gains this ability with this series.
> > So we could do better for it by forbidding mixed syntax from starters
>
> We don't need to forbid mixed syntax. We can simply apply
> [+-]feat and feat=on|off in the same order they appear in the
> command-line.
>
> But:
>
> > (+1 for copy-past) but we have to keep minus overrides plus semantics,
> > so ambiguous check is still there but it would lead to hard error instead of
> > warning.
>
> I forgot about this additional weird semantics
> (minus-override-plus). :(
>
> I think we must deprecate the minus-override-plus semantics too
> and move to command-line-order eventually (on both x86 and
> sparc). But to do that, we need to make the code print a warning
> on sparc like we do on x86.
>
> If we don't remove that weird semantics before making sparc
> support feat=on|off, we will have to worry about the semantics of
> "-feat,feat=on" on top of that. I would simply wait for 2
> releases and remove minus-override-plus, before implementing
> feat=on|off on sparc, to avoid creating a new set of problems.
> Is support for feat=on|off on sparc a must-have for QEMU 2.11?
Probably it isn't must have (as far as I can tell now) but
I won't bet on it.
Supporting both ways as far as mix is forbidden is fine,
so I'd 'introduce' feat=on|off (feat=on|off behavior is
inherited from QOM Boolean property, so we would have
to cripple parser intentionally).
Later we can drop minus-override-plus or whatever else,
but outside of this series pls.
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 16/27] xtensa: replace cpu_xtensa_init() with cpu_generic_init()
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 16/27] xtensa: replace cpu_xtensa_init() " Igor Mammedov
@ 2017-08-24 13:21 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-24 13:21 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel; +Cc: Max Filippov
On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> 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: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> CC: Max Filippov <jcmvbkbc@gmail.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 ee29fb1..4803331 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 249cd1e..1b4767f 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 635a4d4..182ec1e 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 cd7f958..85897df 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 bcd0b77..e8fba20 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;
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 19/27] arm: replace cpu_arm_init() with cpu_generic_init()
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 19/27] arm: replace cpu_arm_init() " Igor Mammedov
@ 2017-08-24 13:26 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-24 13:26 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> 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>
> ---
> 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 b39d64a..5932ef1 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 7e8ab31..a8b3d46 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 3d15ff6..400ba30 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 bbf0b7e..ece25ae 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 194b0bc..b0ac3cf 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 6a45dcc..884242b 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 fa60040..0ec92d3 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);
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 07/27] sparc: replace custom cpu feature parsing with cpu_legacy_parse_featurestr()
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 07/27] sparc: replace custom cpu feature parsing with cpu_legacy_parse_featurestr() Igor Mammedov
@ 2017-08-24 13:27 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-24 13:27 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Riku Voipio, Mark Cave-Ayland, Laurent Vivier, Artyom Tarasenko
On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> with features converted to properties we can reuse shared
> with x86 cpu_legacy_parse_featurestr() for features parsing
> and drop legacy parser that manipulated CPU directly.
>
> 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>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> CC: Riku Voipio <riku.voipio@iki.fi>
> CC: Laurent Vivier <laurent@vivier.eu>
> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Artyom Tarasenko <atar4qemu@gmail.com>
>
> v2:
> * use new cpu_legacy_parse_featurestr() without
> plus_features/minus_features
> * drop cpu_legacy_apply_features() as it's been removed in
> previuos patch and new cpu_legacy_parse_featurestr()
> does its job
> ---
> default-configs/sparc-bsd-user.mak | 1 +
> default-configs/sparc-linux-user.mak | 1 +
> default-configs/sparc-softmmu.mak | 1 +
> default-configs/sparc32plus-linux-user.mak | 1 +
> default-configs/sparc64-bsd-user.mak | 1 +
> default-configs/sparc64-linux-user.mak | 1 +
> default-configs/sparc64-softmmu.mak | 1 +
> target/sparc/cpu.c | 146 +----------------------------
> 8 files changed, 12 insertions(+), 141 deletions(-)
>
> diff --git a/default-configs/sparc-bsd-user.mak b/default-configs/sparc-bsd-user.mak
> index 21e0950..caea9ea 100644
> --- a/default-configs/sparc-bsd-user.mak
> +++ b/default-configs/sparc-bsd-user.mak
> @@ -1 +1,2 @@
> # Default configuration for sparc-bsd-user
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/sparc-linux-user.mak b/default-configs/sparc-linux-user.mak
> index 9c716d1..0f23504 100644
> --- a/default-configs/sparc-linux-user.mak
> +++ b/default-configs/sparc-linux-user.mak
> @@ -1 +1,2 @@
> # Default configuration for sparc-linux-user
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
> index 004b0f4..d8fa9fd 100644
> --- a/default-configs/sparc-softmmu.mak
> +++ b/default-configs/sparc-softmmu.mak
> @@ -18,3 +18,4 @@ CONFIG_GRLIB=y
> CONFIG_STP2000=y
> CONFIG_ECCMEMCTL=y
> CONFIG_SUN4M=y
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/sparc32plus-linux-user.mak b/default-configs/sparc32plus-linux-user.mak
> index 432e880..e3cc16b 100644
> --- a/default-configs/sparc32plus-linux-user.mak
> +++ b/default-configs/sparc32plus-linux-user.mak
> @@ -1 +1,2 @@
> # Default configuration for sparc32plus-linux-user
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/sparc64-bsd-user.mak b/default-configs/sparc64-bsd-user.mak
> index b8b9eea..25bfa1f 100644
> --- a/default-configs/sparc64-bsd-user.mak
> +++ b/default-configs/sparc64-bsd-user.mak
> @@ -1 +1,2 @@
> # Default configuration for sparc64-bsd-user
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/sparc64-linux-user.mak b/default-configs/sparc64-linux-user.mak
> index bf1bdd6..7c8a9f0 100644
> --- a/default-configs/sparc64-linux-user.mak
> +++ b/default-configs/sparc64-linux-user.mak
> @@ -1 +1,2 @@
> # Default configuration for sparc64-linux-user
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
> index d07876a..658546a 100644
> --- a/default-configs/sparc64-softmmu.mak
> +++ b/default-configs/sparc64-softmmu.mak
> @@ -16,3 +16,4 @@ CONFIG_MC146818RTC=y
> CONFIG_ISA_TESTDEV=y
> CONFIG_EMPTY_SLOT=y
> CONFIG_SUN4V_RTC=y
> +CONFIG_LEGACY_CPU_FEATURES=y
> diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
> index 7f74b1c..fd01cbf 100644
> --- a/target/sparc/cpu.c
> +++ b/target/sparc/cpu.c
> @@ -104,51 +104,15 @@ 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 int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model)
> +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;
> -
> - featurestr = strtok(NULL, ",");
> - sparc_cpu_parse_features(CPU(cpu), featurestr, &err);
> - g_free(s);
> - if (err) {
> - error_report_err(err);
> - return -1;
> - }
> -
> - return 0;
> + cpu_legacy_parse_featurestr(typename, features, errp);
> }
>
> 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);
> - if (oc == NULL) {
> - g_free(str);
> - return NULL;
> - }
> - g_free(str);
> -
> - cpu = SPARC_CPU(object_new(object_class_get_name(oc)));
> -
> - if (cpu_sparc_register(cpu, cpu_model) < 0) {
> - object_unref(OBJECT(cpu));
> - return NULL;
> - }
> -
> - object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
> -
> - return cpu;
> + return SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
> }
>
> void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu)
> @@ -529,107 +493,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;
> @@ -932,6 +795,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;
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties Igor Mammedov
2017-08-18 18:24 ` Eduardo Habkost
@ 2017-08-24 13:32 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 56+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-08-24 13:32 UTC (permalink / raw)
To: Igor Mammedov, qemu-devel
Cc: Mark Cave-Ayland, Eduardo Habkost, Artyom Tarasenko
On 08/18/2017 07:08 AM, Igor Mammedov wrote:
> 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>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> CC: Artyom Tarasenko <atar4qemu@gmail.com>
> CC: 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 f4e7343..e735d73 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
>
> @@ -853,6 +855,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);
> @@ -861,6 +926,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;
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-24 9:18 ` Igor Mammedov
@ 2017-08-24 13:43 ` Igor Mammedov
2017-08-24 13:45 ` Eduardo Habkost
1 sibling, 0 replies; 56+ messages in thread
From: Igor Mammedov @ 2017-08-24 13:43 UTC (permalink / raw)
To: Eduardo Habkost
Cc: Richard Henderson, Mark Cave-Ayland, qemu-devel,
Artyom Tarasenko, Philippe Mathieu-Daudé
On Thu, 24 Aug 2017 11:18:52 +0200
Igor Mammedov <imammedo@redhat.com> wrote:
> On Wed, 23 Aug 2017 14:58:39 -0300
> Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> > On Wed, Aug 23, 2017 at 07:37:39PM +0200, Igor Mammedov wrote:
> > > On Wed, 23 Aug 2017 13:46:38 -0300
> > > Eduardo Habkost <ehabkost@redhat.com> wrote:
> > >
> > > > On Wed, Aug 23, 2017 at 06:29:02PM +0200, Igor Mammedov wrote:
> > > > > On Wed, 23 Aug 2017 11:34:14 -0300
> > > > > Eduardo Habkost <ehabkost@redhat.com> wrote:
> > > > >
> > > > > > On Fri, Aug 18, 2017 at 12:08:38PM +0200, Igor Mammedov wrote:
> > > > > > > Move cpu_model +-feat parsing into a separate file so that it
> > > > > > > could be reused later for parsing similar format of sparc target
> > > > > > >
> > > > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > > > > > ---
> > > > > > > CC: Richard Henderson <rth@twiddle.net>
> > > > > > > CC: Eduardo Habkost <ehabkost@redhat.com>
> > > > > > > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > > > > > > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > > > > > > CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > > > > > > ---
> > > > > > > include/qom/cpu.h | 2 +
> > > > > > > default-configs/i386-bsd-user.mak | 1 +
> > > > > > > default-configs/i386-linux-user.mak | 1 +
> > > > > > > default-configs/i386-softmmu.mak | 1 +
> > > > > > > default-configs/x86_64-bsd-user.mak | 1 +
> > > > > > > default-configs/x86_64-linux-user.mak | 1 +
> > > > > > > default-configs/x86_64-softmmu.mak | 1 +
> > > > > > > target/i386/cpu.c | 125 +-------------------------
> > > > > > > util/Makefile.objs | 1 +
> > > > > > > util/legacy_cpu_features_parser.c | 161 ++++++++++++++++++++++++++++++++++
> > > > > > > 10 files changed, 171 insertions(+), 124 deletions(-)
> > > > > > > create mode 100644 util/legacy_cpu_features_parser.c
> > > > > > >
> > > > > > [...]
> > > > > > > diff --git a/util/legacy_cpu_features_parser.c b/util/legacy_cpu_features_parser.c
> > > > > > > new file mode 100644
> > > > > > > index 0000000..6b352a3
> > > > > > > --- /dev/null
> > > > > > > +++ b/util/legacy_cpu_features_parser.c
> > > > > > > @@ -0,0 +1,161 @@
> > > > > > > +/* Support for legacy -cpu cpu,features CLI option with +-feat syntax,
> > > > > > > + * used by x86/sparc targets
> > > > > > > + *
> > > > > > > + * Author: Andreas Färber <afaerber@suse.de>
> > > > > > > + * Author: Andre Przywara <andre.przywara@amd.com>
> > > > > > > + * Author: Eduardo Habkost <ehabkost@redhat.com>
> > > > > > > + * Author: Igor Mammedov <imammedo@redhat.com>
> > > > > > > + * Author: Paolo Bonzini <pbonzini@redhat.com>
> > > > > > > + * Author: Markus Armbruster <armbru@redhat.com>
> > > > > >
> > > > > > IANAL, but I believe a
> > > > > > Copyright (c) <YEAR> <COPYRIGHT HOLDER>
> > > > > > line is needed here.
> > > > > >
> > > > > > > + *
> > > > > > > + * This program is free software; you can redistribute it and/or modify
> > > > > > > + * it under the terms of the GNU General Public License as published by
> > > > > > > + * the Free Software Foundation; either version 2 of the License, or
> > > > > > > + * (at your option) any later version.
> > > > > > > +
> > > > > > > + * This program is distributed in the hope that it will be useful,
> > > > > > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > > > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > > > > > > + * GNU General Public License for more details.
> > > > > > > +
> > > > > > > + * You should have received a copy of the GNU General Public License along
> > > > > > > + * with this program; if not, see <http://www.gnu.org/licenses/>.
> > > > > > > + */
> > > > > > > +
> > > > > > > +#include "qemu/osdep.h"
> > > > > > > +#include "qapi/error.h"
> > > > > > > +#include "qemu/cutils.h"
> > > > > > > +#include "qom/cpu.h"
> > > > > > > +#include "qemu/error-report.h"
> > > > > > > +#include "hw/qdev-properties.h"
> > > > > > > +
> > > > > > > +static inline void feat2prop(char *s)
> > > > > > > +{
> > > > > > > + while ((s = strchr(s, '_'))) {
> > > > > > > + *s = '-';
> > > > > > > + }
> > > > > > > +}
> > > > > > > +
> > > > > > > +static gint compare_string(gconstpointer a, gconstpointer b)
> > > > > > > +{
> > > > > > > + return g_strcmp0(a, b);
> > > > > > > +}
> > > > > > > +
> > > > > > > +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);
> > > > > > > +}
> > > > > > > +
> > > > > > > +/* DO NOT USE WITH NEW CODE
> > > > > > > + * Parse "+feature,-feature,feature=foo" CPU feature string
> > > > > > > + */
> > > > > > > +void cpu_legacy_parse_featurestr(const char *typename, char *features,
> > > > > > > + Error **errp)
> > > > > > > +{
> > > > > > > + /* Compatibily hack to maintain legacy +-feat semantic,
> > > > > > > + * where +-feat overwrites any feature set by
> > > > > > > + * feat=on|feat even if the later is parsed after +-feat
> > > > > > > + * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
> > > > > > > + */
> > > > > > > + GList *l, *plus_features = NULL, *minus_features = NULL;
> > > > > > > + char *featurestr; /* Single 'key=value" string being parsed */
> > > > > > > + static bool cpu_globals_initialized;
> > > > > > > + bool ambiguous = false;
> > > > > > > +
> > > > > > > + if (cpu_globals_initialized) {
> > > > > > > + return;
> > > > > > > + }
> > > > > > > + cpu_globals_initialized = true;
> > > > > > > +
> > > > > > > + if (!features) {
> > > > > > > + return;
> > > > > > > + }
> > > > > > > +
> > > > > > > + for (featurestr = strtok(features, ",");
> > > > > > > + featurestr;
> > > > > > > + featurestr = strtok(NULL, ",")) {
> > > > > > > + const char *name;
> > > > > > > + const char *val = NULL;
> > > > > > > + char *eq = NULL;
> > > > > > > + char num[32];
> > > > > > > +
> > > > > > > + /* 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;
> > > > > > > + }
> > > > > >
> > > > > > These 6 lines of code (or something equivalent to them) are
> > > > > > supposed to be the only difference to the generic parsing
> > > > > > function. I would simply make this feature (support for
> > > > > > [+-]feature) enabled by a CPUClass::plus_minus_features flag
> > > > > > handled by cpu_common_parse_features().
> > > > > I'd rather keep plus/minus nonsense under the hood separate
> > > > > legacy function so it get reused unintentionally and keep generic
> > > > > parser clean.
> > > > >
> > > > > I didn't have any intent of generalizing +-feat handling
> > > > > but rather to remove code duplication between the only users
> > > > > (x86/sparc) that happened to use syntax and share the same semantics.
> > > >
> > > > Generalizing it to be controlled by a CPUClass flag will make it
> > > > easier to refactor the feature parsing later to use the QemuOpts
> > > > parser. But I agree there's no need to do that on this series.
> > > >
> > > > (We might even decide to make [+-]feat work on all other
> > > > architectures. We already agreed recently that we won't
> > > > deprecate it in x86, we could as well enable the same syntax
> > > > uniformly across all architectures.)
> > > I'd just stick to canonical feat=on|off and keep legacy to x86|sparc,
> > > but it's this to discuss if future and relevant here.
> > >
> > > >
> > > > >
> > > > > As an alternative I can copy-past x86 variant into sparc
> > > > > (modulo x86 harmless fixups), that will add some code duplication
> > > > > I've tried to avoid with this patch, but it won't cause
> > > > > misunderstanding about generalizing legacy hacks.
> > > >
> > > > Works for me. We can then cleanup the x86 code and make it use
> > > > cpu_legacy_parse_featurestr() later.
> > > Then, I'll just copy and replace sparc variant with x86 impl.
> > > (removing from the copy x86 only parts and making parser stricter
> > > where possible) and drop 5-6 patches that touched x86 for the purpose
> > > of sharing code.
> > >
> > > and respin v3 tomorrow.
> >
> > I just have one worry about this plan, below:
> >
> > >
> > > >
> > > > >
> > > > > > (But this can be done as a follow-up patch.)
> > > > > >
> > > > > > > +
> > > > > > > + eq = strchr(featurestr, '=');
> > > > > > > + if (eq) {
> > > > > > > + *eq++ = 0;
> > > > > > > + val = eq;
> > > > > > > + } else {
> > > > > > > + val = "on";
> > > > > > > + }
> > > > > > > +
> > > > > > > + feat2prop(featurestr);
> > > > > > > + name = featurestr;
> > > > > > > +
> > > > > > > + if (g_list_find_custom(plus_features, name, compare_string)) {
> > > > > > > + warn_report("Ambiguous CPU model string. "
> > > > > > > + "Don't mix both \"+%s\" and \"%s=%s\"",
> > > > > > > + name, name, val);
> > > > > > > + ambiguous = true;
> > > > > > > + }
> > > > > > > + if (g_list_find_custom(minus_features, name, compare_string)) {
> > > > > > > + warn_report("Ambiguous CPU model string. "
> > > > > > > + "Don't mix both \"-%s\" and \"%s=%s\"",
> > > > > > > + name, name, val);
> > > > > > > + ambiguous = true;
> > > > > > > + }
> > > > > > > +
> > > > > > > + /* Special case: */
> > > > > > > + if (!strcmp(name, "tsc-freq")) {
> > > > > > > + int ret;
> > > > > > > + uint64_t tsc_freq;
> > > > > > > +
> > > > > > > + ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
> > > > > > > + if (ret < 0 || tsc_freq > INT64_MAX) {
> > > > > > > + error_setg(errp, "bad numerical value %s", val);
> > > > > > > + return;
> > > > > > > + }
> > > > > > > + snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
> > > > > > > + val = num;
> > > > > > > + name = "tsc-frequency";
> > > > > > > + }
> > > > > >
> > > > > > This is x86-specific and should stay in x86-specific code. It
> > > > > > can probably be handled by the tsc-freq setter.
> > > > > there was reason why it wasn't moved to tsc-frequency setter,
> > > > > the former is pure integer type of property,
> > > > > while here we can get suffixed string that scales by 1000.
> > > > >
> > > > > Short of creating new visitor for KHz (I don't really looking forward to it),
> > > > > it's simpler to leave fixup alone in legacy parser that's shared only between
> > > > > x86/sparc as it doesn't conflict with sparc and won't break anything.
> > > >
> > > > It doesn't break anything, but it will move x86-specific cruft to
> > > > code that is supposed to be generic.
> > > >
> > > > Creating a write-only "tsc-freq" property that accepts a string
> > > > isn't hard to do.
> > > Nice idea, it might just work.
> > >
> > > >
> > > > If you are not willing to do it in this series, you can write a
> > > > generic parser now (without x86-specific cruft), use it only on
> > > > sparc, and later we can refactor x86 so it can also use the
> > > > generic one.
> > > So far, I'm inclined towards opposing +-feat generalizing and keeping
> > > canonical form anywhere except of x86/sparc were we have to tolerate it.
> > >
> > >
> > > > > > > +
> > > > > > > + cpu_add_feat_as_prop(typename, name, val);
> > > > > > > + }
> > > > > > > +
> > > > > > > + if (ambiguous) {
> > > > > > > + warn_report("Compatibility of ambiguous CPU model "
> > > > > > > + "strings won't be kept on future QEMU versions");
> > > > > > > + }
> > > > > >
> > > > > > As noted in the review of the x86 patch that removes the
> > > > > > plus_features/minus_features static variables, this obsolete (and
> > > > > > confusing) property ordering misfeature should be removed before
> > > > > > we make this code generic and reuse it on other architectures.
> > > > > As it's been replied removing ordering is behavioral change for
> > > > > both x86 and sparc, which is not related to series.
> > > > > If you wish, I'll post a patch that will what you suggest
> > > > > on top of series.
> > > >
> > > > I would agree if sparc also implemented the weird ordering. But
> > > > sparc does not implement it (it doesn't support feat=(on|off)
> > > > yet). We shouldn't introduce that misfeature in sparc if we're
> > > > already planning to remove it.
> > > It didn't have canonic form but it gains this ability with this series.
> > > So we could do better for it by forbidding mixed syntax from starters
> >
> > We don't need to forbid mixed syntax. We can simply apply
> > [+-]feat and feat=on|off in the same order they appear in the
> > command-line.
> >
> > But:
> >
> > > (+1 for copy-past) but we have to keep minus overrides plus semantics,
> > > so ambiguous check is still there but it would lead to hard error instead of
> > > warning.
> >
> > I forgot about this additional weird semantics
> > (minus-override-plus). :(
> >
> > I think we must deprecate the minus-override-plus semantics too
> > and move to command-line-order eventually (on both x86 and
> > sparc). But to do that, we need to make the code print a warning
> > on sparc like we do on x86.
> >
> > If we don't remove that weird semantics before making sparc
> > support feat=on|off, we will have to worry about the semantics of
> > "-feat,feat=on" on top of that. I would simply wait for 2
> > releases and remove minus-override-plus, before implementing
> > feat=on|off on sparc, to avoid creating a new set of problems.
> > Is support for feat=on|off on sparc a must-have for QEMU 2.11?
> Probably it isn't must have (as far as I can tell now) but
> I won't bet on it.
>
> Supporting both ways as far as mix is forbidden is fine,
> so I'd 'introduce' feat=on|off (feat=on|off behavior is
> inherited from QOM Boolean property, so we would have
> to cripple parser intentionally).
It looks simpler to support only +-feat with feat=on|off disabled
explicitly, so I'll do it this way as you've suggested.
PS:
found 1 more bug in cpu_generic_init() while testing this,
so +1 patch to fix it
> Later we can drop minus-override-plus or whatever else,
> but outside of this series pls.
>
^ permalink raw reply [flat|nested] 56+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser
2017-08-24 9:18 ` Igor Mammedov
2017-08-24 13:43 ` Igor Mammedov
@ 2017-08-24 13:45 ` Eduardo Habkost
1 sibling, 0 replies; 56+ messages in thread
From: Eduardo Habkost @ 2017-08-24 13:45 UTC (permalink / raw)
To: Igor Mammedov
Cc: qemu-devel, Philippe Mathieu-Daudé,
Mark Cave-Ayland, Artyom Tarasenko, Richard Henderson
On Thu, Aug 24, 2017 at 11:18:52AM +0200, Igor Mammedov wrote:
> On Wed, 23 Aug 2017 14:58:39 -0300
> Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> > On Wed, Aug 23, 2017 at 07:37:39PM +0200, Igor Mammedov wrote:
> > > On Wed, 23 Aug 2017 13:46:38 -0300
> > > Eduardo Habkost <ehabkost@redhat.com> wrote:
> > >
> > > > On Wed, Aug 23, 2017 at 06:29:02PM +0200, Igor Mammedov wrote:
> > > > > On Wed, 23 Aug 2017 11:34:14 -0300
> > > > > Eduardo Habkost <ehabkost@redhat.com> wrote:
> > > > >
> > > > > > On Fri, Aug 18, 2017 at 12:08:38PM +0200, Igor Mammedov wrote:
> > > > > > > Move cpu_model +-feat parsing into a separate file so that it
> > > > > > > could be reused later for parsing similar format of sparc target
> > > > > > >
> > > > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > > > > > > ---
> > > > > > > CC: Richard Henderson <rth@twiddle.net>
> > > > > > > CC: Eduardo Habkost <ehabkost@redhat.com>
> > > > > > > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > > > > > > CC: Artyom Tarasenko <atar4qemu@gmail.com>
> > > > > > > CC: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > > > > > > ---
> > > > > > > include/qom/cpu.h | 2 +
> > > > > > > default-configs/i386-bsd-user.mak | 1 +
> > > > > > > default-configs/i386-linux-user.mak | 1 +
> > > > > > > default-configs/i386-softmmu.mak | 1 +
> > > > > > > default-configs/x86_64-bsd-user.mak | 1 +
> > > > > > > default-configs/x86_64-linux-user.mak | 1 +
> > > > > > > default-configs/x86_64-softmmu.mak | 1 +
> > > > > > > target/i386/cpu.c | 125 +-------------------------
> > > > > > > util/Makefile.objs | 1 +
> > > > > > > util/legacy_cpu_features_parser.c | 161 ++++++++++++++++++++++++++++++++++
> > > > > > > 10 files changed, 171 insertions(+), 124 deletions(-)
> > > > > > > create mode 100644 util/legacy_cpu_features_parser.c
> > > > > > >
> > > > > > [...]
> > > > > > > diff --git a/util/legacy_cpu_features_parser.c b/util/legacy_cpu_features_parser.c
> > > > > > > new file mode 100644
> > > > > > > index 0000000..6b352a3
> > > > > > > --- /dev/null
> > > > > > > +++ b/util/legacy_cpu_features_parser.c
> > > > > > > @@ -0,0 +1,161 @@
> > > > > > > +/* Support for legacy -cpu cpu,features CLI option with +-feat syntax,
> > > > > > > + * used by x86/sparc targets
> > > > > > > + *
> > > > > > > + * Author: Andreas Färber <afaerber@suse.de>
> > > > > > > + * Author: Andre Przywara <andre.przywara@amd.com>
> > > > > > > + * Author: Eduardo Habkost <ehabkost@redhat.com>
> > > > > > > + * Author: Igor Mammedov <imammedo@redhat.com>
> > > > > > > + * Author: Paolo Bonzini <pbonzini@redhat.com>
> > > > > > > + * Author: Markus Armbruster <armbru@redhat.com>
> > > > > >
> > > > > > IANAL, but I believe a
> > > > > > Copyright (c) <YEAR> <COPYRIGHT HOLDER>
> > > > > > line is needed here.
> > > > > >
> > > > > > > + *
> > > > > > > + * This program is free software; you can redistribute it and/or modify
> > > > > > > + * it under the terms of the GNU General Public License as published by
> > > > > > > + * the Free Software Foundation; either version 2 of the License, or
> > > > > > > + * (at your option) any later version.
> > > > > > > +
> > > > > > > + * This program is distributed in the hope that it will be useful,
> > > > > > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > > > > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > > > > > > + * GNU General Public License for more details.
> > > > > > > +
> > > > > > > + * You should have received a copy of the GNU General Public License along
> > > > > > > + * with this program; if not, see <http://www.gnu.org/licenses/>.
> > > > > > > + */
> > > > > > > +
> > > > > > > +#include "qemu/osdep.h"
> > > > > > > +#include "qapi/error.h"
> > > > > > > +#include "qemu/cutils.h"
> > > > > > > +#include "qom/cpu.h"
> > > > > > > +#include "qemu/error-report.h"
> > > > > > > +#include "hw/qdev-properties.h"
> > > > > > > +
> > > > > > > +static inline void feat2prop(char *s)
> > > > > > > +{
> > > > > > > + while ((s = strchr(s, '_'))) {
> > > > > > > + *s = '-';
> > > > > > > + }
> > > > > > > +}
> > > > > > > +
> > > > > > > +static gint compare_string(gconstpointer a, gconstpointer b)
> > > > > > > +{
> > > > > > > + return g_strcmp0(a, b);
> > > > > > > +}
> > > > > > > +
> > > > > > > +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);
> > > > > > > +}
> > > > > > > +
> > > > > > > +/* DO NOT USE WITH NEW CODE
> > > > > > > + * Parse "+feature,-feature,feature=foo" CPU feature string
> > > > > > > + */
> > > > > > > +void cpu_legacy_parse_featurestr(const char *typename, char *features,
> > > > > > > + Error **errp)
> > > > > > > +{
> > > > > > > + /* Compatibily hack to maintain legacy +-feat semantic,
> > > > > > > + * where +-feat overwrites any feature set by
> > > > > > > + * feat=on|feat even if the later is parsed after +-feat
> > > > > > > + * (i.e. "-x2apic,x2apic=on" will result in x2apic disabled)
> > > > > > > + */
> > > > > > > + GList *l, *plus_features = NULL, *minus_features = NULL;
> > > > > > > + char *featurestr; /* Single 'key=value" string being parsed */
> > > > > > > + static bool cpu_globals_initialized;
> > > > > > > + bool ambiguous = false;
> > > > > > > +
> > > > > > > + if (cpu_globals_initialized) {
> > > > > > > + return;
> > > > > > > + }
> > > > > > > + cpu_globals_initialized = true;
> > > > > > > +
> > > > > > > + if (!features) {
> > > > > > > + return;
> > > > > > > + }
> > > > > > > +
> > > > > > > + for (featurestr = strtok(features, ",");
> > > > > > > + featurestr;
> > > > > > > + featurestr = strtok(NULL, ",")) {
> > > > > > > + const char *name;
> > > > > > > + const char *val = NULL;
> > > > > > > + char *eq = NULL;
> > > > > > > + char num[32];
> > > > > > > +
> > > > > > > + /* 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;
> > > > > > > + }
> > > > > >
> > > > > > These 6 lines of code (or something equivalent to them) are
> > > > > > supposed to be the only difference to the generic parsing
> > > > > > function. I would simply make this feature (support for
> > > > > > [+-]feature) enabled by a CPUClass::plus_minus_features flag
> > > > > > handled by cpu_common_parse_features().
> > > > > I'd rather keep plus/minus nonsense under the hood separate
> > > > > legacy function so it get reused unintentionally and keep generic
> > > > > parser clean.
> > > > >
> > > > > I didn't have any intent of generalizing +-feat handling
> > > > > but rather to remove code duplication between the only users
> > > > > (x86/sparc) that happened to use syntax and share the same semantics.
> > > >
> > > > Generalizing it to be controlled by a CPUClass flag will make it
> > > > easier to refactor the feature parsing later to use the QemuOpts
> > > > parser. But I agree there's no need to do that on this series.
> > > >
> > > > (We might even decide to make [+-]feat work on all other
> > > > architectures. We already agreed recently that we won't
> > > > deprecate it in x86, we could as well enable the same syntax
> > > > uniformly across all architectures.)
> > > I'd just stick to canonical feat=on|off and keep legacy to x86|sparc,
> > > but it's this to discuss if future and relevant here.
> > >
> > > >
> > > > >
> > > > > As an alternative I can copy-past x86 variant into sparc
> > > > > (modulo x86 harmless fixups), that will add some code duplication
> > > > > I've tried to avoid with this patch, but it won't cause
> > > > > misunderstanding about generalizing legacy hacks.
> > > >
> > > > Works for me. We can then cleanup the x86 code and make it use
> > > > cpu_legacy_parse_featurestr() later.
> > > Then, I'll just copy and replace sparc variant with x86 impl.
> > > (removing from the copy x86 only parts and making parser stricter
> > > where possible) and drop 5-6 patches that touched x86 for the purpose
> > > of sharing code.
> > >
> > > and respin v3 tomorrow.
> >
> > I just have one worry about this plan, below:
> >
> > >
> > > >
> > > > >
> > > > > > (But this can be done as a follow-up patch.)
> > > > > >
> > > > > > > +
> > > > > > > + eq = strchr(featurestr, '=');
> > > > > > > + if (eq) {
> > > > > > > + *eq++ = 0;
> > > > > > > + val = eq;
> > > > > > > + } else {
> > > > > > > + val = "on";
> > > > > > > + }
> > > > > > > +
> > > > > > > + feat2prop(featurestr);
> > > > > > > + name = featurestr;
> > > > > > > +
> > > > > > > + if (g_list_find_custom(plus_features, name, compare_string)) {
> > > > > > > + warn_report("Ambiguous CPU model string. "
> > > > > > > + "Don't mix both \"+%s\" and \"%s=%s\"",
> > > > > > > + name, name, val);
> > > > > > > + ambiguous = true;
> > > > > > > + }
> > > > > > > + if (g_list_find_custom(minus_features, name, compare_string)) {
> > > > > > > + warn_report("Ambiguous CPU model string. "
> > > > > > > + "Don't mix both \"-%s\" and \"%s=%s\"",
> > > > > > > + name, name, val);
> > > > > > > + ambiguous = true;
> > > > > > > + }
> > > > > > > +
> > > > > > > + /* Special case: */
> > > > > > > + if (!strcmp(name, "tsc-freq")) {
> > > > > > > + int ret;
> > > > > > > + uint64_t tsc_freq;
> > > > > > > +
> > > > > > > + ret = qemu_strtosz_metric(val, NULL, &tsc_freq);
> > > > > > > + if (ret < 0 || tsc_freq > INT64_MAX) {
> > > > > > > + error_setg(errp, "bad numerical value %s", val);
> > > > > > > + return;
> > > > > > > + }
> > > > > > > + snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
> > > > > > > + val = num;
> > > > > > > + name = "tsc-frequency";
> > > > > > > + }
> > > > > >
> > > > > > This is x86-specific and should stay in x86-specific code. It
> > > > > > can probably be handled by the tsc-freq setter.
> > > > > there was reason why it wasn't moved to tsc-frequency setter,
> > > > > the former is pure integer type of property,
> > > > > while here we can get suffixed string that scales by 1000.
> > > > >
> > > > > Short of creating new visitor for KHz (I don't really looking forward to it),
> > > > > it's simpler to leave fixup alone in legacy parser that's shared only between
> > > > > x86/sparc as it doesn't conflict with sparc and won't break anything.
> > > >
> > > > It doesn't break anything, but it will move x86-specific cruft to
> > > > code that is supposed to be generic.
> > > >
> > > > Creating a write-only "tsc-freq" property that accepts a string
> > > > isn't hard to do.
> > > Nice idea, it might just work.
> > >
> > > >
> > > > If you are not willing to do it in this series, you can write a
> > > > generic parser now (without x86-specific cruft), use it only on
> > > > sparc, and later we can refactor x86 so it can also use the
> > > > generic one.
> > > So far, I'm inclined towards opposing +-feat generalizing and keeping
> > > canonical form anywhere except of x86/sparc were we have to tolerate it.
> > >
> > >
> > > > > > > +
> > > > > > > + cpu_add_feat_as_prop(typename, name, val);
> > > > > > > + }
> > > > > > > +
> > > > > > > + if (ambiguous) {
> > > > > > > + warn_report("Compatibility of ambiguous CPU model "
> > > > > > > + "strings won't be kept on future QEMU versions");
> > > > > > > + }
> > > > > >
> > > > > > As noted in the review of the x86 patch that removes the
> > > > > > plus_features/minus_features static variables, this obsolete (and
> > > > > > confusing) property ordering misfeature should be removed before
> > > > > > we make this code generic and reuse it on other architectures.
> > > > > As it's been replied removing ordering is behavioral change for
> > > > > both x86 and sparc, which is not related to series.
> > > > > If you wish, I'll post a patch that will what you suggest
> > > > > on top of series.
> > > >
> > > > I would agree if sparc also implemented the weird ordering. But
> > > > sparc does not implement it (it doesn't support feat=(on|off)
> > > > yet). We shouldn't introduce that misfeature in sparc if we're
> > > > already planning to remove it.
> > > It didn't have canonic form but it gains this ability with this series.
> > > So we could do better for it by forbidding mixed syntax from starters
> >
> > We don't need to forbid mixed syntax. We can simply apply
> > [+-]feat and feat=on|off in the same order they appear in the
> > command-line.
> >
> > But:
> >
> > > (+1 for copy-past) but we have to keep minus overrides plus semantics,
> > > so ambiguous check is still there but it would lead to hard error instead of
> > > warning.
> >
> > I forgot about this additional weird semantics
> > (minus-override-plus). :(
> >
> > I think we must deprecate the minus-override-plus semantics too
> > and move to command-line-order eventually (on both x86 and
> > sparc). But to do that, we need to make the code print a warning
> > on sparc like we do on x86.
> >
> > If we don't remove that weird semantics before making sparc
> > support feat=on|off, we will have to worry about the semantics of
> > "-feat,feat=on" on top of that. I would simply wait for 2
> > releases and remove minus-override-plus, before implementing
> > feat=on|off on sparc, to avoid creating a new set of problems.
> > Is support for feat=on|off on sparc a must-have for QEMU 2.11?
> Probably it isn't must have (as far as I can tell now) but
> I won't bet on it.
>
> Supporting both ways as far as mix is forbidden is fine,
> so I'd 'introduce' feat=on|off (feat=on|off behavior is
> inherited from QOM Boolean property, so we would have
> to cripple parser intentionally).
Yes, if you really want to rewrite the sparc parser now without
changing behavior, I think we shouldn't allow "-feat,feat=on".
But there's no need for the extra work: if we just wait until we
remove the minus-overrides-plus behavior everywhere before
replacing the sparc parser.
>
> Later we can drop minus-override-plus or whatever else,
> but outside of this series pls.
No problem to me. I just don't want this series to create an
additional set of problems to solve on sparc.
--
Eduardo
^ permalink raw reply [flat|nested] 56+ messages in thread
end of thread, other threads:[~2017-08-24 13:45 UTC | newest]
Thread overview: 56+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-18 10:08 [Qemu-devel] [PATCH for-2.11 00/27] complete cpu QOMification and remove cpu_FOO_init() helpers Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 01/27] sparc: convert cpu models to SPARC cpu subclasses Igor Mammedov
2017-08-18 19:00 ` Philippe Mathieu-Daudé
2017-08-21 10:55 ` Igor Mammedov
2017-08-23 1:12 ` Philippe Mathieu-Daudé
2017-08-24 2:40 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 02/27] sparc: embed sparc_def_t into CPUSPARCState Igor Mammedov
2017-08-24 2:45 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 03/27] sparc: convert cpu features to qdev properties Igor Mammedov
2017-08-18 18:24 ` Eduardo Habkost
2017-08-21 11:03 ` Igor Mammedov
2017-08-23 13:07 ` Eduardo Habkost
2017-08-23 14:17 ` Igor Mammedov
2017-08-24 13:32 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 04/27] sparc: move adhoc CPUSPARCState initialization to realize time Igor Mammedov
2017-08-24 2:47 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 05/27] target-i386: cpu: convert plus/minus properties to global properties Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 06/27] x86: extract legacy cpu features format parser Igor Mammedov
2017-08-18 18:08 ` Eduardo Habkost
2017-08-21 11:06 ` Igor Mammedov
2017-08-23 14:34 ` Eduardo Habkost
2017-08-23 16:29 ` Igor Mammedov
2017-08-23 16:46 ` Eduardo Habkost
2017-08-23 17:37 ` Igor Mammedov
2017-08-23 17:58 ` Eduardo Habkost
2017-08-24 9:18 ` Igor Mammedov
2017-08-24 13:43 ` Igor Mammedov
2017-08-24 13:45 ` Eduardo Habkost
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 07/27] sparc: replace custom cpu feature parsing with cpu_legacy_parse_featurestr() Igor Mammedov
2017-08-24 13:27 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 08/27] sparc: replace cpu_sparc_init() with cpu_generic_init() Igor Mammedov
2017-08-18 19:57 ` Philippe Mathieu-Daudé
2017-08-21 11:11 ` Igor Mammedov
2017-08-24 2:51 ` Philippe Mathieu-Daudé
2017-08-24 2:49 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 09/27] s390x: replace cpu_s390x_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 10/27] alpha: replace cpu_alpha_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 11/27] hppa: replace cpu_hppa_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 12/27] m68k: replace cpu_m68k_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 13/27] microblaze: replace cpu_mb_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 14/27] nios2: replace cpu_nios2_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 15/27] tilegx: replace cpu_tilegx_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 16/27] xtensa: replace cpu_xtensa_init() " Igor Mammedov
2017-08-24 13:21 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 17/27] tricore: replace cpu_tricore_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 18/27] sh4: replace cpu_sh4_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 19/27] arm: replace cpu_arm_init() " Igor Mammedov
2017-08-24 13:26 ` Philippe Mathieu-Daudé
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 20/27] cris: replace cpu_cris_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 21/27] x86: replace cpu_x86_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 22/27] lm32: replace cpu_lm32_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 23/27] moxie: replace cpu_moxie_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 24/27] openrisc: replace cpu_openrisc_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 25/27] unicore32: replace uc32_cpu_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 26/27] ppc: replace cpu_ppc_init() " Igor Mammedov
2017-08-18 10:08 ` [Qemu-devel] [PATCH for-2.11 27/27] fix build failure in nbd_read_reply_entry() Igor Mammedov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.