From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3Uz-0008GW-GB for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3Ux-0000bI-Mr for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:49 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55210 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3Ux-0000b4-Cv for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:47 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:05 +0200 Message-Id: <1336318514-30906-6-git-send-email-afaerber@suse.de> In-Reply-To: <1336318514-30906-1-git-send-email-afaerber@suse.de> References: <1336318514-30906-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 for-next 05/74] pc: Use cpu_x86_init() to obtain X86CPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Needed for pc_cpu_reset(). Also change return type to X86CPU. Signed-off-by: Andreas F=C3=A4rber --- hw/pc.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index 4d34a33..4715f7a 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -940,21 +940,23 @@ static void pc_cpu_reset(void *opaque) env->halted =3D !cpu_is_bsp(env); } =20 -static CPUX86State *pc_new_cpu(const char *cpu_model) +static X86CPU *pc_new_cpu(const char *cpu_model) { + X86CPU *cpu; CPUX86State *env; =20 - env =3D cpu_init(cpu_model); - if (!env) { + cpu =3D cpu_x86_init(cpu_model); + if (cpu =3D=3D NULL) { fprintf(stderr, "Unable to find x86 CPU definition\n"); exit(1); } + env =3D &cpu->env; if ((env->cpuid_features & CPUID_APIC) || smp_cpus > 1) { env->apic_state =3D apic_init(env, env->cpuid_apic_id); } qemu_register_reset(pc_cpu_reset, env); pc_cpu_reset(env); - return env; + return cpu; } =20 void pc_cpus_init(const char *cpu_model) --=20 1.7.7