From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1R7N-00010y-BI for qemu-devel@nongnu.org; Fri, 01 Feb 2013 19:38:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1R7L-0007rI-3k for qemu-devel@nongnu.org; Fri, 01 Feb 2013 19:38:05 -0500 Received: from cantor2.suse.de ([195.135.220.15]:51145 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1R7K-0007UO-Qt for qemu-devel@nongnu.org; Fri, 01 Feb 2013 19:38:03 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 2 Feb 2013 01:37:05 +0100 Message-Id: <1359765428-27805-2-git-send-email-afaerber@suse.de> In-Reply-To: <1359765428-27805-1-git-send-email-afaerber@suse.de> References: <1359765428-27805-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-cpu-next v3 1/4] target-i386: Move cpu_x86_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, imammedo@redhat.com, ehabkost@redhat.com, anthony@codemonkey.ws, =?UTF-8?q?Andreas=20F=C3=A4rber?= Consolidate CPU functions in cpu.c. Allows to make cpu_x86_register() static. No functional changes. Signed-off-by: Andreas F=C3=A4rber --- target-i386/cpu.c | 26 +++++++++++++++++++++++++- target-i386/cpu.h | 1 - target-i386/helper.c | 24 ------------------------ 3 Dateien ge=C3=A4ndert, 25 Zeilen hinzugef=C3=BCgt(+), 26 Zeilen entfer= nt(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index ea0ce0b..e74802b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1516,7 +1516,7 @@ static void filter_features_for_kvm(X86CPU *cpu) } #endif =20 -int cpu_x86_register(X86CPU *cpu, const char *cpu_model) +static int cpu_x86_register(X86CPU *cpu, const char *cpu_model) { CPUX86State *env =3D &cpu->env; x86_def_t def1, *def =3D &def1; @@ -1576,6 +1576,30 @@ out: return 0; } =20 +X86CPU *cpu_x86_init(const char *cpu_model) +{ + X86CPU *cpu; + CPUX86State *env; + Error *error =3D NULL; + + cpu =3D X86_CPU(object_new(TYPE_X86_CPU)); + env =3D &cpu->env; + env->cpu_model_str =3D cpu_model; + + if (cpu_x86_register(cpu, cpu_model) < 0) { + object_delete(OBJECT(cpu)); + return NULL; + } + + object_property_set_bool(OBJECT(cpu), true, "realized", &error); + if (error) { + error_free(error); + object_delete(OBJECT(cpu)); + return NULL; + } + return cpu; +} + #if !defined(CONFIG_USER_ONLY) =20 void cpu_clear_apic_feature(CPUX86State *env) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 9e6e1a6..7577e4f 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1002,7 +1002,6 @@ int cpu_x86_signal_handler(int host_signum, void *p= info, void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); -int cpu_x86_register(X86CPU *cpu, const char *cpu_model); void cpu_clear_apic_feature(CPUX86State *env); void host_cpuid(uint32_t function, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *e= dx); diff --git a/target-i386/helper.c b/target-i386/helper.c index 29217ef..4bf9db7 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1267,30 +1267,6 @@ int cpu_x86_get_descr_debug(CPUX86State *env, unsi= gned int selector, return 1; } =20 -X86CPU *cpu_x86_init(const char *cpu_model) -{ - X86CPU *cpu; - CPUX86State *env; - Error *error =3D NULL; - - cpu =3D X86_CPU(object_new(TYPE_X86_CPU)); - env =3D &cpu->env; - env->cpu_model_str =3D cpu_model; - - if (cpu_x86_register(cpu, cpu_model) < 0) { - object_delete(OBJECT(cpu)); - return NULL; - } - - object_property_set_bool(OBJECT(cpu), true, "realized", &error); - if (error) { - error_free(error); - object_delete(OBJECT(cpu)); - return NULL; - } - return cpu; -} - #if !defined(CONFIG_USER_ONLY) void do_cpu_init(X86CPU *cpu) { --=20 1.7.10.4