From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gu Zheng <guz.fnst@cn.fujitsu.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 1/8] target-i386: Rename cpu_x86_init() to cpu_x86_init_user()
Date: Fri, 19 Dec 2014 00:41:17 -0200 [thread overview]
Message-ID: <1418956884-24022-2-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1418956884-24022-1-git-send-email-ehabkost@redhat.com>
The function is used only for CONFIG_USER, so make its purpose clear.
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 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
next prev parent reply other threads:[~2014-12-19 2:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-19 2:41 [Qemu-devel] [PATCH 0/8] target-i386: Simplify APIC ID initialization, move compat code to pc.c Eduardo Habkost
2014-12-19 2:41 ` Eduardo Habkost [this message]
2014-12-19 2:41 ` [Qemu-devel] [PATCH 2/8] target-i386: Eliminate cpu_init() function Eduardo Habkost
2014-12-19 2:41 ` [Qemu-devel] [PATCH 3/8] target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id Eduardo Habkost
2014-12-19 2:41 ` [Qemu-devel] [PATCH 4/8] target-i386: Keep track of apic-id setting Eduardo Habkost
2014-12-19 11:23 ` Paolo Bonzini
2014-12-19 13:04 ` Eduardo Habkost
2014-12-19 2:41 ` [Qemu-devel] [PATCH 5/8] target-i386: Set APIC ID using cpu_index on CONFIG_USER Eduardo Habkost
2014-12-19 11:22 ` Paolo Bonzini
2014-12-19 16:29 ` Eduardo Habkost
2014-12-19 2:41 ` [Qemu-devel] [PATCH 6/8] target-i386: Don't set APIC ID on instance_init Eduardo Habkost
2014-12-19 2:41 ` [Qemu-devel] [PATCH 7/8] target-i386: Move topology.h to hw/i386/topology.h Eduardo Habkost
2014-12-19 11:24 ` Paolo Bonzini
2014-12-19 13:05 ` Eduardo Habkost
2014-12-19 2:41 ` [Qemu-devel] [PATCH 8/8] target-i386: Move APIC ID compatibility code to pc.c 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=1418956884-24022-2-git-send-email-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=guz.fnst@cn.fujitsu.com \
--cc=imammedo@redhat.com \
--cc=pbonzini@redhat.com \
--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).