From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1xA-0001fD-HR for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wy-0005sR-2h for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35662 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wx-0005rk-TC for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:24 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:08:19 +0200 Message-Id: <1337742502-28565-57-git-send-email-afaerber@suse.de> In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> References: <1337742502-28565-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 qom-next 56/59] sun4u: Pass SPARCCPU to cpu_set_ivec_irq() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed for moving halted field to CPUState. Signed-off-by: Andreas F=C3=A4rber --- hw/sun4u.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index d41e80a..56c3ddf 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -321,7 +321,8 @@ static void cpu_kick_irq(SPARCCPU *cpu) =20 static void cpu_set_ivec_irq(void *opaque, int irq, int level) { - CPUSPARCState *env =3D opaque; + SPARCCPU *cpu =3D opaque; + CPUSPARCState *env =3D &cpu->env; =20 if (level) { if (!(env->ivec_status & 0x20)) { @@ -802,7 +803,6 @@ static void sun4uv_init(MemoryRegion *address_space_m= em, const struct hwdef *hwdef) { SPARCCPU *cpu; - CPUSPARCState *env; M48t59State *nvram; unsigned int i; uint64_t initrd_addr, initrd_size, kernel_addr, kernel_size, kernel_= entry; @@ -815,14 +815,13 @@ static void sun4uv_init(MemoryRegion *address_space= _mem, =20 /* init CPUs */ cpu =3D cpu_devinit(cpu_model, hwdef); - env =3D &cpu->env; =20 /* set up devices */ ram_init(0, RAM_size); =20 prom_init(hwdef->prom_addr, bios_name); =20 - ivec_irqs =3D qemu_allocate_irqs(cpu_set_ivec_irq, env, IVEC_MAX); + ivec_irqs =3D qemu_allocate_irqs(cpu_set_ivec_irq, cpu, IVEC_MAX); pci_bus =3D pci_apb_init(APB_SPECIAL_BASE, APB_MEM_BASE, ivec_irqs, = &pci_bus2, &pci_bus3, &pbm_irqs); pci_vga_init(pci_bus); --=20 1.7.7