From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkv3F-0000pG-6U for qemu-devel@nongnu.org; Thu, 24 Aug 2017 12:32:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkv3D-0007aJ-Bn for qemu-devel@nongnu.org; Thu, 24 Aug 2017 12:32:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54094) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkv3D-0007Zj-5q for qemu-devel@nongnu.org; Thu, 24 Aug 2017 12:32:11 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 344B47F6AC for ; Thu, 24 Aug 2017 16:32:10 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEA251F8 for ; Thu, 24 Aug 2017 16:32:09 +0000 (UTC) From: Igor Mammedov Date: Thu, 24 Aug 2017 18:31:43 +0200 Message-Id: <1503592308-93913-21-git-send-email-imammedo@redhat.com> In-Reply-To: <1503592308-93913-1-git-send-email-imammedo@redhat.com> References: <1503592308-93913-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH for-2.11 v3 20/25] x86: replace cpu_x86_init() with cpu_generic_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org it's just a wrapper, drop it and use cpu_generic_init() directly Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- 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 ddc45ab..abeaaca 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2642,11 +2642,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