From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Andreas Färber" <afaerber@suse.de>,
qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 04/11] target-i386: Rename cpu_x86_init() to cpu_x86_init_user()
Date: Wed, 25 Feb 2015 16:58:19 -0300 [thread overview]
Message-ID: <1424894306-26740-5-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1424894306-26740-1-git-send-email-ehabkost@redhat.com>
The function is used only for CONFIG_USER, so make its purpose clear.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
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 356f97e..8f18556 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2135,7 +2135,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 478450c..41d7f0a 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -982,7 +982,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);
@@ -1173,7 +1173,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;
}
--
2.1.0
next prev parent reply other threads:[~2015-02-25 19:58 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-25 19:58 [Qemu-devel] [PULL 00/11] X86 patches Eduardo Habkost
2015-02-25 19:58 ` [Qemu-devel] [PULL 01/11] target-i386: Simplify listflags() function Eduardo Habkost
2015-02-25 19:58 ` [Qemu-devel] [PULL 02/11] target-i386: Eliminate unnecessary get_cpuid_vendor() function Eduardo Habkost
2015-02-25 19:58 ` [Qemu-devel] [PULL 03/11] target-i386: Move topology.h to include/hw/i386 Eduardo Habkost
2015-02-25 19:58 ` Eduardo Habkost [this message]
2015-02-25 22:06 ` [Qemu-devel] [PULL 04/11] target-i386: Rename cpu_x86_init() to cpu_x86_init_user() Andreas Färber
2015-02-26 15:59 ` Eduardo Habkost
2015-02-27 14:10 ` Andreas Färber
2015-02-27 19:01 ` Eduardo Habkost
2015-02-27 19:10 ` Andreas Färber
2015-02-25 19:58 ` [Qemu-devel] [PULL 05/11] target-i386: Eliminate cpu_init() function Eduardo Habkost
2015-02-25 22:08 ` Andreas Färber
2015-02-26 16:03 ` Eduardo Habkost
2015-02-27 14:19 ` Andreas Färber
2015-02-25 19:58 ` [Qemu-devel] [PULL 06/11] target-i386: Simplify error handling on cpu_x86_init_user() Eduardo Habkost
2015-02-25 19:58 ` [Qemu-devel] [PULL 07/11] target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id Eduardo Habkost
2015-02-25 19:58 ` [Qemu-devel] [PULL 08/11] linux-user: Check for cpu_init() errors Eduardo Habkost
2015-02-25 22:23 ` Andreas Färber
2015-02-25 23:27 ` Peter Maydell
2015-02-26 16:06 ` Eduardo Habkost
2015-02-26 22:44 ` Peter Maydell
2015-02-26 22:51 ` Eduardo Habkost
2015-02-26 23:00 ` Peter Maydell
2015-02-26 23:11 ` Eduardo Habkost
2015-02-26 23:23 ` Peter Maydell
2015-02-27 17:38 ` Eduardo Habkost
2015-02-25 19:58 ` [Qemu-devel] [PULL 09/11] target-i386: Set APIC ID using cpu_index on CONFIG_USER Eduardo Habkost
2015-02-25 19:58 ` [Qemu-devel] [PULL 10/11] target-i386: Require APIC ID to be explicitly set before CPU realize Eduardo Habkost
2015-02-25 19:58 ` [Qemu-devel] [PULL 11/11] target-i386: Move APIC ID compatibility code to pc.c Eduardo Habkost
2015-03-02 15:19 ` [Qemu-devel] [PULL 00/11] X86 patches Peter Maydell
2015-03-02 15:26 ` Andreas Färber
2015-03-02 15:30 ` Peter Maydell
2015-03-02 16:18 ` Andreas Färber
2015-03-02 16:22 ` Peter Maydell
2015-03-02 17:10 ` Andreas Färber
2015-03-03 1:28 ` Peter Maydell
2015-03-02 18:38 ` Eduardo Habkost
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424894306-26740-5-git-send-email-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=afaerber@suse.de \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).