added cpu_model parameter to cpu_init()

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3562 c046a42c-6fe2-441c-8c8c-71466251a162

2 files changed, 2 insertions, 6 deletions

diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index ef0953b263..56b0497f12 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -147,7 +147,7 @@ typedef struct CPUCRISState {
 	CPU_COMMON
 } CPUCRISState;
 
-CPUCRISState *cpu_cris_init(void);
+CPUCRISState *cpu_cris_init(const char *cpu_model);
 int cpu_cris_exec(CPUCRISState *s);
 void cpu_cris_close(CPUCRISState *s);
 void do_interrupt(CPUCRISState *env);
@@ -201,10 +201,6 @@ enum {
 #define CRIS_SSP    0
 #define CRIS_USP    1
 
-typedef struct cris_def_t cris_def_t;
-
-int cpu_cris_set_model(CPUCRISState *env, const char * name);
-
 void cris_set_irq_level(CPUCRISState *env, int level, uint8_t vector);
 void cris_set_macsr(CPUCRISState *env, uint32_t val);
 void cris_switch_sp(CPUCRISState *env);
diff --git a/target-cris/translate.c b/target-cris/translate.c
index 40caef0734..44ba804f25 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -2488,7 +2488,7 @@ void cpu_dump_state (CPUState *env, FILE *f,
 
 }
 
-CPUCRISState *cpu_cris_init (void)
+CPUCRISState *cpu_cris_init (const char *cpu_model)
 {
 	CPUCRISState *env;