From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1nVh-0001wi-Gu for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:41:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y1nVb-0002Uw-7f for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:41:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39334) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y1nVb-0002Uq-0E for qemu-devel@nongnu.org; Thu, 18 Dec 2014 21:41:39 -0500 From: Eduardo Habkost Date: Fri, 19 Dec 2014 00:41:17 -0200 Message-Id: <1418956884-24022-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1418956884-24022-1-git-send-email-ehabkost@redhat.com> References: <1418956884-24022-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 1/8] target-i386: Rename cpu_x86_init() to cpu_x86_init_user() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gu Zheng , Igor Mammedov , Paolo Bonzini The function is used only for CONFIG_USER, so make its purpose clear. Signed-off-by: Eduardo Habkost --- target-i386/cpu.c | 2 +- target-i386/cpu.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index b81ac5c..91f80ed 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2150,7 +2150,7 @@ out: return cpu; } -X86CPU *cpu_x86_init(const char *cpu_model) +X86CPU *cpu_x86_init_user(const char *cpu_model) { Error *error = NULL; X86CPU *cpu; diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 3ecff96..9250a9c 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1036,7 +1036,7 @@ typedef struct CPUX86State { #include "cpu-qom.h" -X86CPU *cpu_x86_init(const char *cpu_model); +X86CPU *cpu_x86_init_user(const char *cpu_model); X86CPU *cpu_x86_create(const char *cpu_model, DeviceState *icc_bridge, Error **errp); int cpu_x86_exec(CPUX86State *s); @@ -1227,7 +1227,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); static inline CPUX86State *cpu_init(const char *cpu_model) { - X86CPU *cpu = cpu_x86_init(cpu_model); + X86CPU *cpu = cpu_x86_init_user(cpu_model); if (cpu == NULL) { return NULL; } -- 1.9.3