From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sds4h-0002ra-Lq for qemu-devel@nongnu.org; Sun, 10 Jun 2012 20:01:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sds4f-0006QL-Ss for qemu-devel@nongnu.org; Sun, 10 Jun 2012 20:01:39 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44009 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sds4f-0006QC-Mi for qemu-devel@nongnu.org; Sun, 10 Jun 2012 20:01:37 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 11 Jun 2012 02:00:55 +0200 Message-Id: <1339372859-30148-24-git-send-email-afaerber@suse.de> In-Reply-To: <1339372859-30148-1-git-send-email-afaerber@suse.de> References: <1339372859-30148-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 23/27] xen_machine_pv: 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: "open list:X86" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Stefano Stabellini Needed for moving halted field to CPUState. Signed-off-by: Andreas F=C3=A4rber Tested-by: Stefano Stabellini --- hw/xen_machine_pv.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/xen_machine_pv.c b/hw/xen_machine_pv.c index 7eee770..4b72aa7 100644 --- a/hw/xen_machine_pv.c +++ b/hw/xen_machine_pv.c @@ -36,6 +36,7 @@ static void xen_init_pv(ram_addr_t ram_size, const char *initrd_filename, const char *cpu_model) { + X86CPU *cpu; CPUX86State *env; DriveInfo *dinfo; int i; @@ -48,7 +49,8 @@ static void xen_init_pv(ram_addr_t ram_size, cpu_model =3D "qemu32"; #endif } - env =3D cpu_init(cpu_model); + cpu =3D cpu_x86_init(cpu_model); + env =3D &cpu->env; env->halted =3D 1; =20 /* Initialize backend core & drivers */ --=20 1.7.7