From 00d52414c1ec5a73eee0db3784166c38cf03cedd Mon Sep 17 00:00:00 2001
From: Igor Mammedov <imammedo@redhat.com>
Date: Mon, 5 Mar 2018 00:44:14 -0500
Subject: [PATCH] mips: replace cpu_mips_init() with cpu_generic_init()

now cpu_mips_init() reimplements subset of cpu_generic_init()
tasks, so just drop it and use cpu_generic_init() directly.

Backports commit c4c8146cfd0fc3f95418fbc82a2eded594675022 from qemu
---
 qemu/header_gen.py           |  1 -
 qemu/hw/mips/mips_r4k.c      |  2 +-
 qemu/target/mips/cpu.h       |  2 +-
 qemu/target/mips/translate.c | 17 -----------------
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/qemu/header_gen.py b/qemu/header_gen.py
index 48096d17..81a1836a 100644
--- a/qemu/header_gen.py
+++ b/qemu/header_gen.py
@@ -3506,7 +3506,6 @@ mips_symbols = (
     'cpu_mips_exec',
     'cpu_mips_get_count',
     'cpu_mips_get_random',
-    'cpu_mips_init',
     'cpu_mips_kseg0_to_phys',
     'cpu_mips_kvm_um_phys_to_kseg0',
     'cpu_mips_phys_to_kseg0',
diff --git a/qemu/hw/mips/mips_r4k.c b/qemu/hw/mips/mips_r4k.c
index 4e3ca015..f6b86684 100644
--- a/qemu/hw/mips/mips_r4k.c
+++ b/qemu/hw/mips/mips_r4k.c
@@ -36,7 +36,7 @@ static int mips_r4k_init(struct uc_struct *uc, MachineState *machine)
 #endif
     }
 
-    uc->cpu = (void*) cpu_mips_init(uc, cpu_model);
+    uc->cpu = cpu_generic_init(uc, TYPE_MIPS_CPU, cpu_model);
     if (uc->cpu == NULL) {
         fprintf(stderr, "Unable to find CPU definition\n");
         return -1;
diff --git a/qemu/target/mips/cpu.h b/qemu/target/mips/cpu.h
index 94acb1c8..d7341800 100644
--- a/qemu/target/mips/cpu.h
+++ b/qemu/target/mips/cpu.h
@@ -744,8 +744,8 @@ enum {
  */
 #define CPU_INTERRUPT_WAKE CPU_INTERRUPT_TGT_INT_0
 
+#define cpu_init(uc, cpu_model) cpu_generic_init(uc, TYPE_MIPS_CPU, cpu_model)
 int cpu_mips_exec(struct uc_struct *uc, CPUState *cpu);
-MIPSCPU *cpu_mips_init(struct uc_struct *uc, const char *cpu_model);
 int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc);
 bool cpu_supports_isa(const char *cpu_model, unsigned int isa);
 void cpu_set_exception_base(struct uc_struct *uc, int vp_index, target_ulong address);
diff --git a/qemu/target/mips/translate.c b/qemu/target/mips/translate.c
index ca677b55..9aa19fea 100644
--- a/qemu/target/mips/translate.c
+++ b/qemu/target/mips/translate.c
@@ -20727,23 +20727,6 @@ void cpu_mips_realize_env(CPUMIPSState *env)
     mvp_init(env, env->cpu_model);
 }
 
-MIPSCPU *cpu_mips_init(struct uc_struct *uc, const char *cpu_model)
-{
-    ObjectClass *oc;
-    MIPSCPU *cpu;
-
-    oc = cpu_class_by_name(uc, TYPE_MIPS_CPU, cpu_model);
-    if (oc == NULL) {
-        return NULL;
-    }
-
-    cpu = MIPS_CPU(uc, object_new(uc, object_class_get_name(oc)));
-
-    object_property_set_bool(uc, OBJECT(cpu), true, "realized", NULL);
-
-    return cpu;
-}
-
 bool cpu_supports_isa(const char *cpu_model, unsigned int isa)
 {
     const mips_def_t *def = cpu_mips_find_by_name(cpu_model);