generalize parsing of cpu_model (part 4)
v4 cover generalize parsing of cpu_model (part 4)
v4:
- drop not needed leftover from previous impl. hunk in arm CPU_RESOLVING_TYPE patch
- squash CPU_RESOLVING_TYPE patches into one
- move test cases from CPU_RESOLVING_TYPE patches into test patch
- silence microblaze(el) test waring as its cpu doesn't work with 'none' machine
- ensure that cpu_common_parse_features() could be called only once
- add new test target 'hppa' that were merged since v4
v3:
- use qtest_startf() instead of qtest_start()
- rename tests/machine-none.c to tests/machine-none-test.c
- introduce first CPU_RESOLVING_TYPE for all targets and only then use it parse_cpu_model()
- stop abusing mc->default_cpu_type as resolving cpu type, move cpu_parse_cpu_model() in to exec.c and embed in CPU_RESOLVING_TYPE, so that callers won't have to know about unnecessary detail
v2:
- implemented new approach only for x86/ARM (will be done for all targets if approach seems acceptable)
- add test case for '-M none -cpu FOO' case
- redefine TARGET_DEFAULT_CPU_TYPE into CPU_RESOLVING_TYPE
- scrape off default cpu_model refactoring, so it would cause less conflicts with Laurent's series where he tries to rework defaults to use ELF hints of executed program
Series is finishing work on generalizing cpu_model parsing and limiting parts that deal with inconsistent cpu_model naming to "-cpu" CLI option in vl.c, bsd|linux-user/main.c CLI and default cpu_model processing and FOO_cpu_class_by_name() callbacks.
It introduces CPU_RESOLVING_TYPE which must be defined by each target and is used by helper parse_cpu_model() (former cpu_parse_cpu_model()) to get access to target specific FOO_cpu_class_by_name() callback.
Igor Mammedov (5):
nios2: 10m50_devboard: replace cpu_model with cpu_type
tests: add machine 'none' with -cpu test
cpu: add CPU_RESOLVING_TYPE macro
Use cpu_create(type) instead of cpu_init(cpu_model)
cpu: get rid of unused cpu_init() defines
include/hw/boards.h | 1 - include/qom/cpu.h | 16 +------- target/alpha/cpu.h | 3 +- target/arm/cpu.h | 3 +- target/cris/cpu.h | 3 +- target/hppa/cpu.h | 2 +- target/i386/cpu.h | 3 +- target/lm32/cpu.h | 3 +- target/m68k/cpu.h | 3 +- target/microblaze/cpu.h | 2 +- target/mips/cpu.h | 3 +- target/moxie/cpu.h | 3 +- target/nios2/cpu.h | 2 +- target/openrisc/cpu.h | 3 +- target/ppc/cpu.h | 3 +- target/s390x/cpu.h | 3 +- target/sh4/cpu.h | 3 +- target/sparc/cpu.h | 5 +-- target/tilegx/cpu.h | 2 +- target/tricore/cpu.h | 3 +- target/unicore32/cpu.h | 3 +- target/xtensa/cpu.h | 3 +- bsd-user/main.c | 4 +- exec.c | 23 +++++++++++ hw/core/null-machine.c | 6 +-- hw/nios2/10m50_devboard.c | 2 +- linux-user/main.c | 8 +++- qom/cpu.c | 47 ++-------------------- tests/Makefile.include | 2 + tests/machine-none-test.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ vl.c | 10 ++--- 31 files changed, 167 insertions(+), 110 deletions(-) create mode 100644 tests/machine-none-test.c
Signature · 1 line
2.7.4
PATCH v4 1/5 nios2: 10m50_devboard: replace cpu_model with cpu_type
use cpu_create() instead of being removed cpu_generic_init()
--- hw/nios2/10m50_devboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/nios2/10m50_devboard.c +1 -1
@@ -75,7 +75,7 @@ static void nios2_10m50_ghrd_init(MachineState *machine) phys_ram_alias);/* Create CPU -- FIXME */ - cpu =NIOS2_CPU (cpu_generic_init (TYPE_NIOS2_CPU ,"nios2" )); + cpu =NIOS2_CPU (cpu_create (TYPE_NIOS2_CPU ));/* Register: CPU interrupt controller (PIC) */ cpu_irq =nios2_cpu_pic_init (cpu);
Signature · 1 line
2.7.4
PATCH v4 2/5 tests: add machine 'none' with -cpu test
In reply to Igor MammedovCheck that "$QEMU -M none -cpu FOO" starts QEMU without error
---
v2:
- rename file to machine-none-test.c (Thomas Huth <[email protected]>)
- use qtest_startf()/instead of qtest_start() (Thomas Huth <[email protected]>)
v4:
- squash in test hunks from v3 CPU_RESOLVING_TYPE patches (Eduardo Habkost <[email protected]>)
- silence warning about commented out microblaze(el) test as its cpu makes 'none' machine abort, but keep FIXME comments and leave it upto microblaze to fix thing (CCed)
--- tests/Makefile.include | 2 + tests/machine-none-test.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 tests/machine-none-test.c
tests/Makefile.include +2 -0
@@ -385,6 +385,7 @@ check-qtest-s390x-y += tests/virtio-console-test$(EXESUF) check-qtest-s390x-y += tests/virtio-serial-test$(EXESUF) check-qtest-s390x-y += tests/cpu-plug-test$(EXESUF) +check-qtest-generic-y += tests/machine-none-test$(EXESUF) check-qtest-generic-y += tests/qom-test$(EXESUF) check-qtest-generic-y += tests/test-hmp$(EXESUF)
@@ -788,6 +789,7 @@ tests/display-vga-test$(EXESUF): tests/display-vga-test.o tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o tests/qom-test$(EXESUF): tests/qom-test.o tests/test-hmp$(EXESUF): tests/test-hmp.o +tests/machine-none-test$(EXESUF): tests/machine-none-test.o tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-virtio-obj-y) tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y) tests/nvme-test$(EXESUF): tests/nvme-test.o
tests/machine-none-test.c new file +100 -0
100 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v4 3/5 cpu: add CPU_RESOLVING_TYPE macro
In reply to Igor Mammedovit will be used for providing to cpu name resolving class for parsing cpu model for system and user emulation code.
Along with change add target to null-machine tests, so that when switch to CPU_RESOLVING_TYPE happens, it would ensure that null-machine usecase still works.
---
v2:
- use cortex-a57 for aarch64 test (Andrew Jones <[email protected]>)
- fix conflict due to cortex-a57 change in aarch64 entry
in previous patch
v4:
- drop removal of default cpu_model in linux-user/main.c the was left there after dropping *-user parts from v3 (Eduardo Habkost <[email protected]>)
--- target/alpha/cpu.h | 1 + target/arm/cpu.h | 1 + target/cris/cpu.h | 1 + target/hppa/cpu.h | 1 + target/i386/cpu.h | 1 + target/lm32/cpu.h | 1 + target/m68k/cpu.h | 1 + target/microblaze/cpu.h | 1 + target/mips/cpu.h | 1 + target/moxie/cpu.h | 1 + target/nios2/cpu.h | 1 + target/openrisc/cpu.h | 1 + target/ppc/cpu.h | 1 + target/s390x/cpu.h | 1 + target/sh4/cpu.h | 1 + target/sparc/cpu.h | 1 + target/tilegx/cpu.h | 1 + target/tricore/cpu.h | 1 + target/unicore32/cpu.h | 1 + target/xtensa/cpu.h | 1 + 20 files changed, 20 insertions(+)
target/alpha/cpu.h +1 -0
@@ -472,6 +472,7 @@ void alpha_translate_init(void);#define ALPHA_CPU_TYPE_SUFFIX "-" TYPE_ALPHA_CPU#define ALPHA_CPU_TYPE_NAME (model) model ALPHA_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_ALPHA_CPUvoid alpha_cpu_list (FILE *f,fprintf_function cpu_fprintf);/* you can call this signal handler from your SIGBUS and SIGSEGV
target/arm/cpu.h +1 -0
@@ -2172,6 +2172,7 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,#define ARM_CPU_TYPE_SUFFIX "-" TYPE_ARM_CPU#define ARM_CPU_TYPE_NAME (name) (name ARM_CPU_TYPE_SUFFIX) +#define CPU_RESOLVING_TYPE TYPE_ARM_CPU#define cpu_signal_handler cpu_arm_signal_handler#define cpu_list arm_cpu_list
target/cris/cpu.h +1 -0
@@ -271,6 +271,7 @@ enum {#define CRIS_CPU_TYPE_SUFFIX "-" TYPE_CRIS_CPU#define CRIS_CPU_TYPE_NAME (name) (name CRIS_CPU_TYPE_SUFFIX) +#define CPU_RESOLVING_TYPE TYPE_CRIS_CPU#define cpu_signal_handler cpu_cris_signal_handler
target/hppa/cpu.h +1 -0
@@ -268,6 +268,7 @@ static inline int cpu_mmu_index(CPUHPPAState *env, bool ifetch)void hppa_translate_init (void );#define cpu_init (cpu_model) cpu_generic_init(TYPE_HPPA_CPU, cpu_model) +#define CPU_RESOLVING_TYPE TYPE_HPPA_CPUvoid hppa_cpu_list (FILE *f,fprintf_function cpu_fprintf);
target/i386/cpu.h +1 -0
@@ -1568,6 +1568,7 @@ uint64_t cpu_get_tsc(CPUX86State *env);#define X86_CPU_TYPE_SUFFIX "-" TYPE_X86_CPU#define X86_CPU_TYPE_NAME (name) (name X86_CPU_TYPE_SUFFIX) +#define CPU_RESOLVING_TYPE TYPE_X86_CPU#ifdef TARGET_X86_64 #define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu64")
target/lm32/cpu.h +1 -0
@@ -259,6 +259,7 @@ bool lm32_cpu_do_semihosting(CPUState *cs);#define LM32_CPU_TYPE_SUFFIX "-" TYPE_LM32_CPU#define LM32_CPU_TYPE_NAME (model) model LM32_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_LM32_CPU#define cpu_list lm32_cpu_list#define cpu_signal_handler cpu_lm32_signal_handler
target/m68k/cpu.h +1 -0
@@ -530,6 +530,7 @@ enum {#define M68K_CPU_TYPE_SUFFIX "-" TYPE_M68K_CPU#define M68K_CPU_TYPE_NAME (model) model M68K_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_M68K_CPU#define cpu_signal_handler cpu_m68k_signal_handler#define cpu_list m68k_cpu_list
target/microblaze/cpu.h +1 -0
@@ -344,6 +344,7 @@ int cpu_mb_signal_handler(int host_signum, void *pinfo,#define TARGET_VIRT_ADDR_SPACE_BITS 32#define cpu_init (cpu_model) cpu_generic_init(TYPE_MICROBLAZE_CPU, cpu_model) +#define CPU_RESOLVING_TYPE TYPE_MICROBLAZE_CPU#define cpu_signal_handler cpu_mb_signal_handler
target/mips/cpu.h +1 -0
@@ -743,6 +743,7 @@ int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);#define MIPS_CPU_TYPE_SUFFIX "-" TYPE_MIPS_CPU#define MIPS_CPU_TYPE_NAME (model) model MIPS_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_MIPS_CPUbool cpu_supports_cps_smp (const char *cpu_type);bool cpu_supports_isa (const char *cpu_type,unsigned int isa);
target/moxie/cpu.h +1 -0
@@ -124,6 +124,7 @@ int cpu_moxie_signal_handler(int host_signum, void *pinfo,#define MOXIE_CPU_TYPE_SUFFIX "-" TYPE_MOXIE_CPU#define MOXIE_CPU_TYPE_NAME (model) model MOXIE_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_MOXIE_CPU#define cpu_signal_handler cpu_moxie_signal_handler
target/nios2/cpu.h +1 -0
@@ -232,6 +232,7 @@ void nios2_check_interrupts(CPUNios2State *env);#endif #define cpu_init (cpu_model) cpu_generic_init(TYPE_NIOS2_CPU, cpu_model) +#define CPU_RESOLVING_TYPE TYPE_NIOS2_CPU#define cpu_gen_code cpu_nios2_gen_code#define cpu_signal_handler cpu_nios2_signal_handler
target/openrisc/cpu.h +1 -0
@@ -394,6 +394,7 @@ int cpu_openrisc_get_phys_data(OpenRISCCPU *cpu,#define OPENRISC_CPU_TYPE_SUFFIX "-" TYPE_OPENRISC_CPU#define OPENRISC_CPU_TYPE_NAME (model) model OPENRISC_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_OPENRISC_CPU#include "exec/cpu-all.h"
target/ppc/cpu.h +1 -0
@@ -1380,6 +1380,7 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, uint32_t val);#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU#define POWERPC_CPU_TYPE_NAME (model) model POWERPC_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU#define cpu_signal_handler cpu_ppc_signal_handler#define cpu_list ppc_cpu_list
target/s390x/cpu.h +1 -0
@@ -732,6 +732,7 @@ void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, uint8_t ec_ga,#define S390_CPU_TYPE_SUFFIX "-" TYPE_S390_CPU#define S390_CPU_TYPE_NAME (name) (name S390_CPU_TYPE_SUFFIX) +#define CPU_RESOLVING_TYPE TYPE_S390_CPU/* you can call this signal handler from your SIGBUS and SIGSEGV signal handlers to inform the virtual CPU of exceptions. non zero
target/sh4/cpu.h +1 -0
@@ -278,6 +278,7 @@ void cpu_load_tlb(CPUSH4State * env);#define SUPERH_CPU_TYPE_SUFFIX "-" TYPE_SUPERH_CPU#define SUPERH_CPU_TYPE_NAME (model) model SUPERH_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_SUPERH_CPU#define cpu_signal_handler cpu_sh4_signal_handler#define cpu_list sh4_cpu_list
target/sparc/cpu.h +1 -0
@@ -660,6 +660,7 @@ int cpu_sparc_signal_handler(int host_signum, void *pinfo, void *puc);#define SPARC_CPU_TYPE_SUFFIX "-" TYPE_SPARC_CPU#define SPARC_CPU_TYPE_NAME (model) model SPARC_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_SPARC_CPU#define cpu_signal_handler cpu_sparc_signal_handler#define cpu_list sparc_cpu_list
target/tilegx/cpu.h +1 -0
@@ -165,6 +165,7 @@ void tilegx_tcg_init(void);int cpu_tilegx_signal_handler (int host_signum,void *pinfo,void *puc);#define cpu_init (cpu_model) cpu_generic_init(TYPE_TILEGX_CPU, cpu_model) +#define CPU_RESOLVING_TYPE TYPE_TILEGX_CPU#define cpu_signal_handler cpu_tilegx_signal_handler
target/tricore/cpu.h +1 -0
@@ -415,6 +415,7 @@ static inline void cpu_get_tb_cpu_state(CPUTriCoreState *env, target_ulong *pc,#define TRICORE_CPU_TYPE_SUFFIX "-" TYPE_TRICORE_CPU#define TRICORE_CPU_TYPE_NAME (model) model TRICORE_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_TRICORE_CPU/* helpers.c */ int cpu_tricore_handle_mmu_fault(CPUState *cpu, target_ulong address,
target/unicore32/cpu.h +1 -0
@@ -169,6 +169,7 @@ static inline int cpu_mmu_index(CPUUniCore32State *env, bool ifetch)#define UNICORE32_CPU_TYPE_SUFFIX "-" TYPE_UNICORE32_CPU#define UNICORE32_CPU_TYPE_NAME (model) model UNICORE32_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_UNICORE32_CPUstatic inline void cpu_get_tb_cpu_state (CPUUniCore32State *env,target_ulong *pc,target_ulong *cs_base,uint32_t *flags)
target/xtensa/cpu.h +1 -0
@@ -500,6 +500,7 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,#define XTENSA_CPU_TYPE_SUFFIX "-" TYPE_XTENSA_CPU#define XTENSA_CPU_TYPE_NAME (model) model XTENSA_CPU_TYPE_SUFFIX +#define CPU_RESOLVING_TYPE TYPE_XTENSA_CPU#ifdef TARGET_WORDS_BIGENDIAN #define XTENSA_DEFAULT_CPU_MODEL "fsf"
Signature · 1 line
2.7.4
Re: [Qemu-devel] [PATCH v4 3/5] cpu: add CPU_RESOLVING_TYPE macro
Quoted 11 lines · Igor Mammedov
it will be used for providing to cpu name resolving class for parsing cpu model for system and user emulation code.
Along with change add target to null-machine tests, so that when switch to
CPU_RESOLVING_TYPEhappens, it would ensure that null-machine usecase still works.Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Laurent Vivier <[email protected]> (m68k)
Quoted 8 lines
---
v2:
- use cortex-a57 for aarch64 test (Andrew Jones <[email protected]>)
- fix conflict due to cortex-a57 change in aarch64 entry
in previous patch
v4:
- drop removal of defaultcpu_modelinlinux-user/main.cthe was left there after dropping *-user parts from v3 (Eduardo Habkost <[email protected]>)
So, this macro is only used to find the providers of CPUClass::class_by_name. All the classes that set class_by_name (except TYPE_CPU) are present in the patch.
About TYPE_CPU: shouldn't we get rid of cpu_common_class_by_name and just add assert(cc->parse_features) to parse_cpu_model()?
Signature · 1 line
Eduardo
PATCH 1/1 cpu: drop unnecessary NULL check and cpu_common_class_by_name()
both do nothing as for the first all callers
parse_cpu_model() and qmp_query_cpu_model_()
should provide non NULL value, so just abort if it's not so.
While at it drop cpu_common_class_by_name() which is not need any more as every target has CPUClass::class_by_name callback by now, though abort in case a new arch will forget to define one.
---
isn't really tested but it compiles and passes make check
qom/cpu.c | 14 ++------------ target/i386/cpu.c | 8 +------- 2 files changed, 3 insertions(+), 19 deletions(-)
qom/cpu.c +2 -12
@@ -286,21 +286,12 @@ static bool cpu_common_has_work(CPUState *cs)ObjectClass *cpu_class_by_name (const char *typename,const char *cpu_model) { -CPUClass *cc; - -if (!cpu_model) { -return NULL ; - } - cc =CPU_CLASS (object_class_by_name (typename)); +CPUClass *cc =CPU_CLASS (object_class_by_name (typename)); +assert (cpu_model && cc->class_by_name);return cc->class_by_name (cpu_model); } -static ObjectClass *cpu_common_class_by_name (const char *cpu_model) -{ -return NULL ; -} -static void cpu_common_parse_features (const char *typename,char *features,Error **errp) {
@@ -418,7 +409,6 @@ static void cpu_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass);CPUClass *k =CPU_CLASS (klass); - k->class_by_name = cpu_common_class_by_name; k->parse_features = cpu_common_parse_features; k->reset = cpu_common_reset; k->get_arch_id = cpu_common_get_arch_id;
target/i386/cpu.c +1 -7
@@ -740,13 +740,7 @@ static char *x86_cpu_type_name(const char *model_name)static ObjectClass *x86_cpu_class_by_name (const char *cpu_model) {ObjectClass *oc; -char *typename; - -if (cpu_model ==NULL ) { -return NULL ; - } - - typename =x86_cpu_type_name (cpu_model); +char *typename =x86_cpu_type_name (cpu_model); oc =object_class_by_name (typename);g_free (typename);return oc;
Signature · 1 line
2.7.4
Re: [Qemu-devel] [PATCH] cpu: drop unnecessary NULL check and cpu_common_class_by_name()
Quoted 9 lines · Igor Mammedov
both do nothing as for the first all callers
parse_cpu_model()andqmp_query_cpu_model_()
should provide non NULL value, so just abort if it's not so.While at it drop
cpu_common_class_by_name()which is not need any more as every target hasCPUClass::class_by_namecallback by now, though abort in case a new arch will forget to define one.Signed-off-by Igor Mammedov <[email protected]>
Signature · 1 line
Eduardo
PATCH 1/1 fixup! cpu: add CPU_RESOLVING_TYPE macro
In reply to Igor MammedovQuoted 11 lines · Igor Mammedov
it will be used for providing to cpu name resolving class for parsing cpu model for system and user emulation code.
Along with change add target to null-machine tests, so that when switch to
CPU_RESOLVING_TYPEhappens, it would ensure that null-machine usecase still works.Signed-off-by Igor Mammedov <[email protected]>Reviewed-by Laurent Vivier <[email protected]> (m68k)
Squashing this before sending a new pull request.
--- target/riscv/cpu.h | 1 + 1 file changed, 1 insertion(+)
target/riscv/cpu.h +1 -0
@@ -46,6 +46,7 @@#define RISCV_CPU_TYPE_SUFFIX "-" TYPE_RISCV_CPU#define RISCV_CPU_TYPE_NAME (name) (name RISCV_CPU_TYPE_SUFFIX) +#define CPU_RESOLVING_TYPE TYPE_RISCV_CPU#define TYPE_RISCV_CPU_ANY RISCV_CPU_TYPE_NAME("any")#define TYPE_RISCV_CPU_RV32GCSU_V1_09_1 RISCV_CPU_TYPE_NAME("rv32gcsu-v1.9.1")
Signature · 1 line
2.14.3
PATCH v4 4/5 Use cpu_create(type) instead of cpu_init(cpu_model)
In reply to Igor MammedovWith all targets defining CPU_RESOLVING_TYPE, refactor cpu_parse_cpu_model(type, cpu_model) to parse_cpu_model(cpu_model) so that callers won't have to know internal resolving cpu type. Place it in exec.c so it could be called from both target independed vl.c and *-user/main.c.
That allows us to stop abusing cpu type from
MachineClass::default_cpu_type
as resolver class in vl.c which were confusing part of cpu_parse_cpu_model().
Also with new parse_cpu_model(), the last users of cpu_init() in null-machine.c and bsd/linux-user targets could be switched to cpu_create() API and cpu_init() API will be removed by follow up patch.
With no longer users left remove MachineState::cpu_model field, new code should use MachineState::cpu_type instead and leave cpu_model parsing to generic code in vl.c.
---
v4:
- actually remove no longer used MachineState::cpu_model field that I've lost somewhere during respins
- squash in [PATCH v3 25/25] cpu: get rid of cpu_generic_init() as after rework/rebase cpu_generic_init() is being removed by this patch and only check removal was left in 25/25, which should be removed together with cpu_generic_init() in this patch
- assert(!cpu_globals_initialized) in cpu_common_parse_features() (Eduardo Habkost <[email protected]>)
--- include/hw/boards.h | 1 - include/qom/cpu.h | 16 ++-------------- bsd-user/main.c | 4 +++- exec.c | 23 +++++++++++++++++++++++ hw/core/null-machine.c | 6 +++--- linux-user/main.c | 8 ++++++-- qom/cpu.c | 47 ++++------------------------------------------- vl.c | 10 +++------- 8 files changed, 44 insertions(+), 71 deletions(-)
include/hw/boards.h +0 -1
@@ -251,7 +251,6 @@ struct MachineState {char *kernel_filename;char *kernel_cmdline;char *initrd_filename; -const char *cpu_model;const char *cpu_type;AccelState *accelerator;CPUArchIdList *possible_cpus;
include/qom/cpu.h +2 -14
@@ -661,8 +661,7 @@ ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model);CPUState *cpu_create (const char *typename);/** -* cpu_parse_cpu_model: -* @typename: The CPU base type or CPU type. +* parse_cpu_model: * @cpu_model: The model string including optional parameters. * * processes optional parameters and registers them as global properties
@@ -670,18 +669,7 @@ CPUState *cpu_create(const char *typename);* Returns: type of CPU to create or prints error and terminates process * if an error occurred. */ -const char *cpu_parse_cpu_model (const char *typename,const char *cpu_model); - -/** -* cpu_generic_init: -* @typename: The CPU base type. -* @cpu_model: The model string including optional parameters. -* -* Instantiates a CPU, processes optional parameters and realizes the CPU. -* -* Returns: A #CPUState or %NULL if an error occurred. -*/ -CPUState *cpu_generic_init (const char *typename,const char *cpu_model); +const char *parse_cpu_model (const char *cpu_model);/** * cpu_has_work:
bsd-user/main.c +3 -1
@@ -723,6 +723,7 @@ int main(int argc, char **argv) {const char *filename;const char *cpu_model; +const char *cpu_type;const char *log_file =NULL ;const char *log_mask =NULL ;struct target_pt_regs regs1, *regs = ®s1;
@@ -900,7 +901,8 @@ int main(int argc, char **argv)tcg_exec_init (0 );/* NOTE: we need to init the CPU at this stage to get qemu_host_page_size */ - cpu =cpu_init (cpu_model); + cpu_type =parse_cpu_model (cpu_model); + cpu =create (cpu_type); env = cpu->env_ptr;#if defined(TARGET_SPARC ) || defined(TARGET_PPC )cpu_reset (cpu);
exec.c +23 -0
@@ -817,6 +817,29 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp)#endif } +const char *parse_cpu_model (const char *cpu_model) +{ +ObjectClass *oc; +CPUClass *cc; +gchar **model_pieces; +const char *cpu_type; + + model_pieces =g_strsplit (cpu_model,"," ,2 ); + + oc =cpu_class_by_name (CPU_RESOLVING_TYPE , model_pieces[0 ]); +if (oc ==NULL ) { +error_report ("unable to find CPU model '%s'" , model_pieces[0 ]); +g_strfreev (model_pieces); +exit (EXIT_FAILURE ); + } + + cpu_type =object_class_get_name (oc); + cc =CPU_CLASS (oc); + cc->parse_features (cpu_type, model_pieces[1 ], &error_fatal); +g_strfreev (model_pieces); +return cpu_type; +} +#if defined(CONFIG_USER_ONLY )static void breakpoint_invalidate (CPUState *cpu,target_ulong pc) {
hw/core/null-machine.c +3 -3
@@ -24,9 +24,9 @@ static void machine_none_init(MachineState *mch) {CPUState *cpu =NULL ; -/* Initialize CPU (if a model has been specified) */ -if (mch->cpu_model) { - cpu =cpu_init (mch->cpu_model); +/* Initialize CPU (if user asked for it) */ +if (mch->cpu_type) { + cpu =cpu_create (mch->cpu_type);if (!cpu) {error_report ("Unable to initialize CPU" );exit (1 );
linux-user/main.c +6 -2
@@ -44,6 +44,7 @@ static const char *argv0;static int gdbstub_port;static envlist_t *envlist;static const char *cpu_model; +static const char *cpu_type;unsigned long mmap_min_addr;unsigned long guest_base;int have_guest_base;
@@ -3872,7 +3873,7 @@ void init_task_state(TaskState *ts)CPUArchState *cpu_copy (CPUArchState *env) {CPUState *cpu =ENV_GET_CPU (env); -CPUState *new_cpu =cpu_init (cpu_model); +CPUState *new_cpu =cpu_create (cpu_type);CPUArchState *new_env = new_cpu->env_ptr;CPUBreakpoint *bp;CPUWatchpoint *wp;
@@ -4384,10 +4385,13 @@ int main(int argc, char **argv, char **envp) cpu_model ="any" ;#endif } + cpu_type =parse_cpu_model (cpu_model); +tcg_exec_init (0 );/* NOTE: we need to init the CPU at this stage to get qemu_host_page_size */ - cpu =cpu_init (cpu_model); + + cpu =cpu_create (cpu_type); env = cpu->env_ptr;cpu_reset (cpu);
qom/cpu.c +4 -43
64 lines not on this page · raw message
vl.c +3 -7
@@ -4594,15 +4594,11 @@ int main(int argc, char **argv, char **envp) current_machine->maxram_size = maxram_size; current_machine->ram_slots = ram_slots; current_machine->boot_order = boot_order; - current_machine->cpu_model = cpu_model;/* parse features once if machine provides default cpu_type */ -if (machine_class->default_cpu_type) { - current_machine->cpu_type = machine_class->default_cpu_type; -if (cpu_model) { - current_machine->cpu_type = -cpu_parse_cpu_model (machine_class->default_cpu_type, cpu_model); - } + current_machine->cpu_type = machine_class->default_cpu_type; +if (cpu_model) { + current_machine->cpu_type =parse_cpu_model (cpu_model); }parse_numa_opts (current_machine);
Signature · 1 line
2.7.4
PATCH v4 5/5 cpu: get rid of unused cpu_init() defines
In reply to Igor Mammedovcpu_init(cpu_model) were replaced by cpu_create(cpu_type) so no users are left, remove it.
--- target/alpha/cpu.h | 2 -- target/arm/cpu.h | 2 -- target/cris/cpu.h | 2 -- target/hppa/cpu.h | 1 - target/i386/cpu.h | 2 -- target/lm32/cpu.h | 2 -- target/m68k/cpu.h | 2 -- target/microblaze/cpu.h | 1 - target/mips/cpu.h | 2 -- target/moxie/cpu.h | 2 -- target/nios2/cpu.h | 1 - target/openrisc/cpu.h | 2 -- target/ppc/cpu.h | 2 -- target/s390x/cpu.h | 2 -- target/sh4/cpu.h | 2 -- target/sparc/cpu.h | 4 ---- target/tilegx/cpu.h | 1 - target/tricore/cpu.h | 2 -- target/unicore32/cpu.h | 2 -- target/xtensa/cpu.h | 2 -- 20 files changed, 38 deletions(-)
target/alpha/cpu.h +0 -2
@@ -468,8 +468,6 @@ enum {void alpha_translate_init (void ); -#define cpu_init (cpu_model) cpu_generic_init(TYPE_ALPHA_CPU, cpu_model) -#define ALPHA_CPU_TYPE_SUFFIX "-" TYPE_ALPHA_CPU#define ALPHA_CPU_TYPE_NAME (model) model ALPHA_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_ALPHA_CPU
target/arm/cpu.h +0 -2
@@ -2168,8 +2168,6 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,return unmasked || pstate_unmasked; } -#define cpu_init (cpu_model) cpu_generic_init(TYPE_ARM_CPU, cpu_model) -#define ARM_CPU_TYPE_SUFFIX "-" TYPE_ARM_CPU#define ARM_CPU_TYPE_NAME (name) (name ARM_CPU_TYPE_SUFFIX)#define CPU_RESOLVING_TYPE TYPE_ARM_CPU
target/cris/cpu.h +0 -2
@@ -267,8 +267,6 @@ enum {#define TARGET_PHYS_ADDR_SPACE_BITS 32#define TARGET_VIRT_ADDR_SPACE_BITS 32 -#define cpu_init (cpu_model) cpu_generic_init(TYPE_CRIS_CPU, cpu_model) -#define CRIS_CPU_TYPE_SUFFIX "-" TYPE_CRIS_CPU#define CRIS_CPU_TYPE_NAME (name) (name CRIS_CPU_TYPE_SUFFIX)#define CPU_RESOLVING_TYPE TYPE_CRIS_CPU
target/hppa/cpu.h +0 -1
@@ -267,7 +267,6 @@ static inline int cpu_mmu_index(CPUHPPAState *env, bool ifetch)void hppa_translate_init (void ); -#define cpu_init (cpu_model) cpu_generic_init(TYPE_HPPA_CPU, cpu_model)#define CPU_RESOLVING_TYPE TYPE_HPPA_CPUvoid hppa_cpu_list (FILE *f,fprintf_function cpu_fprintf);
target/i386/cpu.h +0 -2
@@ -1564,8 +1564,6 @@ 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_generic_init(TYPE_X86_CPU, cpu_model) -#define X86_CPU_TYPE_SUFFIX "-" TYPE_X86_CPU#define X86_CPU_TYPE_NAME (name) (name X86_CPU_TYPE_SUFFIX)#define CPU_RESOLVING_TYPE TYPE_X86_CPU
target/lm32/cpu.h +0 -2
@@ -255,8 +255,6 @@ 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_generic_init(TYPE_LM32_CPU, cpu_model) -#define LM32_CPU_TYPE_SUFFIX "-" TYPE_LM32_CPU#define LM32_CPU_TYPE_NAME (model) model LM32_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_LM32_CPU
target/m68k/cpu.h +0 -2
@@ -526,8 +526,6 @@ enum {#define TARGET_PHYS_ADDR_SPACE_BITS 32#define TARGET_VIRT_ADDR_SPACE_BITS 32 -#define cpu_init (cpu_model) cpu_generic_init(TYPE_M68K_CPU, cpu_model) -#define M68K_CPU_TYPE_SUFFIX "-" TYPE_M68K_CPU#define M68K_CPU_TYPE_NAME (model) model M68K_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_M68K_CPU
target/microblaze/cpu.h +0 -1
@@ -343,7 +343,6 @@ 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_generic_init(TYPE_MICROBLAZE_CPU, cpu_model)#define CPU_RESOLVING_TYPE TYPE_MICROBLAZE_CPU#define cpu_signal_handler cpu_mb_signal_handler
target/mips/cpu.h +0 -2
@@ -739,8 +739,6 @@ enum {int cpu_mips_signal_handler (int host_signum,void *pinfo,void *puc); -#define cpu_init (cpu_model) cpu_generic_init(TYPE_MIPS_CPU, cpu_model) -#define MIPS_CPU_TYPE_SUFFIX "-" TYPE_MIPS_CPU#define MIPS_CPU_TYPE_NAME (model) model MIPS_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_MIPS_CPU
target/moxie/cpu.h +0 -2
@@ -120,8 +120,6 @@ void moxie_translate_init(void);int cpu_moxie_signal_handler (int host_signum,void *pinfo,void *puc); -#define cpu_init (cpu_model) cpu_generic_init(TYPE_MOXIE_CPU, cpu_model) -#define MOXIE_CPU_TYPE_SUFFIX "-" TYPE_MOXIE_CPU#define MOXIE_CPU_TYPE_NAME (model) model MOXIE_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_MOXIE_CPU
target/nios2/cpu.h +0 -1
@@ -231,7 +231,6 @@ void nios2_check_interrupts(CPUNios2State *env);# define TARGET_VIRT_ADDR_SPACE_BITS 32#endif -#define cpu_init (cpu_model) cpu_generic_init(TYPE_NIOS2_CPU, cpu_model)#define CPU_RESOLVING_TYPE TYPE_NIOS2_CPU#define cpu_gen_code cpu_nios2_gen_code
target/openrisc/cpu.h +0 -2
@@ -390,8 +390,6 @@ int cpu_openrisc_get_phys_data(OpenRISCCPU *cpu, int *prot, target_ulong address, int rw);#endif -#define cpu_init (cpu_model) cpu_generic_init(TYPE_OPENRISC_CPU, cpu_model) -#define OPENRISC_CPU_TYPE_SUFFIX "-" TYPE_OPENRISC_CPU#define OPENRISC_CPU_TYPE_NAME (model) model OPENRISC_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_OPENRISC_CPU
target/ppc/cpu.h +0 -2
@@ -1376,8 +1376,6 @@ 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_generic_init(TYPE_POWERPC_CPU, cpu_model) -#define POWERPC_CPU_TYPE_SUFFIX "-" TYPE_POWERPC_CPU#define POWERPC_CPU_TYPE_NAME (model) model POWERPC_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU
target/s390x/cpu.h +0 -2
@@ -728,8 +728,6 @@ void s390_set_qemu_cpu_model(uint16_t type, uint8_t gen, uint8_t ec_ga,/* helper.c */ -#define cpu_init (cpu_model) cpu_generic_init(TYPE_S390_CPU, cpu_model) -#define S390_CPU_TYPE_SUFFIX "-" TYPE_S390_CPU#define S390_CPU_TYPE_NAME (name) (name S390_CPU_TYPE_SUFFIX)#define CPU_RESOLVING_TYPE TYPE_S390_CPU
target/sh4/cpu.h +0 -2
@@ -274,8 +274,6 @@ int cpu_sh4_is_cached(CPUSH4State * env, target_ulong addr);void cpu_load_tlb (CPUSH4State * env); -#define cpu_init (cpu_model) cpu_generic_init(TYPE_SUPERH_CPU, cpu_model) -#define SUPERH_CPU_TYPE_SUFFIX "-" TYPE_SUPERH_CPU#define SUPERH_CPU_TYPE_NAME (model) model SUPERH_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_SUPERH_CPU
target/sparc/cpu.h +0 -4
@@ -654,10 +654,6 @@ hwaddr cpu_get_phys_page_nofault(CPUSPARCState *env, target_ulong addr,#endif int cpu_sparc_signal_handler (int host_signum,void *pinfo,void *puc); -#ifndef NO_CPU_IO_DEFS -#define cpu_init (cpu_model) cpu_generic_init(TYPE_SPARC_CPU, cpu_model) -#endif -#define SPARC_CPU_TYPE_SUFFIX "-" TYPE_SPARC_CPU#define SPARC_CPU_TYPE_NAME (model) model SPARC_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_SPARC_CPU
target/tilegx/cpu.h +0 -1
@@ -164,7 +164,6 @@ 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); -#define cpu_init (cpu_model) cpu_generic_init(TYPE_TILEGX_CPU, cpu_model)#define CPU_RESOLVING_TYPE TYPE_TILEGX_CPU#define cpu_signal_handler cpu_tilegx_signal_handler
target/tricore/cpu.h +0 -2
@@ -411,8 +411,6 @@ static inline void cpu_get_tb_cpu_state(CPUTriCoreState *env, target_ulong *pc, *flags =0 ; } -#define cpu_init (cpu_model) cpu_generic_init(TYPE_TRICORE_CPU, cpu_model) -#define TRICORE_CPU_TYPE_SUFFIX "-" TYPE_TRICORE_CPU#define TRICORE_CPU_TYPE_NAME (model) model TRICORE_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_TRICORE_CPU
target/unicore32/cpu.h +0 -2
@@ -165,8 +165,6 @@ static inline int cpu_mmu_index(CPUUniCore32State *env, bool ifetch)#include "exec/cpu-all.h" -#define cpu_init (cpu_model) cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model) -#define UNICORE32_CPU_TYPE_SUFFIX "-" TYPE_UNICORE32_CPU#define UNICORE32_CPU_TYPE_NAME (model) model UNICORE32_CPU_TYPE_SUFFIX#define CPU_RESOLVING_TYPE TYPE_UNICORE32_CPU
target/xtensa/cpu.h +0 -2
@@ -514,8 +514,6 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, vaddr addr,#define XTENSA_DEFAULT_CPU_NOMMU_TYPE \ XTENSA_CPU_TYPE_NAME(XTENSA_DEFAULT_CPU_NOMMU_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);void xtensa_finalize_config (XtensaConfig *config);
Signature · 1 line
2.7.4
Eduardo Habkost
AppliedQueued on machine-next, thanks!
Signature · 1 line
Eduardo