From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvZ24-0007B8-7S for qemu-devel@nongnu.org; Sat, 06 Jul 2013 16:24:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UvYx4-0003Jp-1q for qemu-devel@nongnu.org; Sat, 06 Jul 2013 16:19:38 -0400 Message-ID: <51D87BC6.2090600@suse.de> Date: Sat, 06 Jul 2013 22:19:18 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1372536117-28167-1-git-send-email-afaerber@suse.de> <1372536117-28167-34-git-send-email-afaerber@suse.de> In-Reply-To: <1372536117-28167-34-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH RFC qom-cpu 33/41] cpu: Turn cpu_get_phys_page_debug() into a CPUClass hook List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Filippov Cc: Peter Maydell , Anthony Green , qemu-devel@nongnu.org, Alexander Graf , Blue Swirl , Michael Walle , qemu-ppc , Paul Brook , "Edgar E. Iglesias" , jan.kiszka@web.de, Guan Xuetao , Aurelien Jarno , Richard Henderson Am 29.06.2013 22:01, schrieb Andreas F=C3=A4rber: > Since all targets now assign a softmmu-only field, we can drop helpers > cpu_class_set_{do_unassigned_access,vmsd}() and device_class_set_vmsd()= . >=20 > Prepares for changing cpu_memory_rw_debug() argument to CPUState. >=20 > Signed-off-by: Andreas F=C3=A4rber The following fixup for xtensa is required. This demonstrates how dangerous it is to pass void* arguments directly into functions - please always use a typed local variable to enforce type checks. Andreas diff --git a/hw/xtensa/xtensa_lx60.c b/hw/xtensa/xtensa_lx60.c index 650dd31..a079774 100644 --- a/hw/xtensa/xtensa_lx60.c +++ b/hw/xtensa/xtensa_lx60.c @@ -144,9 +144,11 @@ static void lx60_net_init(MemoryRegion *address_spac= e, memory_region_add_subregion(address_space, buffers, ram); } -static uint64_t translate_phys_addr(void *env, uint64_t addr) +static uint64_t translate_phys_addr(void *opaque, uint64_t addr) { - return cpu_get_phys_page_debug(env, addr); + XtensaCPU *cpu =3D opaque; + + return cpu_get_phys_page_debug(CPU(cpu), addr); } static void lx60_reset(void *opaque) @@ -252,7 +254,7 @@ static void lx_init(const LxBoardDesc *board, QEMUMachineInitArgs *args) } uint64_t elf_entry; uint64_t elf_lowaddr; - int success =3D load_elf(kernel_filename, translate_phys_addr, e= nv, + int success =3D load_elf(kernel_filename, translate_phys_addr, c= pu, &elf_entry, &elf_lowaddr, NULL, be, ELF_MACHINE, 0); if (success > 0) { env->pc =3D elf_entry; diff --git a/hw/xtensa/xtensa_sim.c b/hw/xtensa/xtensa_sim.c index 5241f8d..a4194cfb 100644 --- a/hw/xtensa/xtensa_sim.c +++ b/hw/xtensa/xtensa_sim.c @@ -32,9 +32,11 @@ #include "exec/memory.h" #include "exec/address-spaces.h" -static uint64_t translate_phys_addr(void *env, uint64_t addr) +static uint64_t translate_phys_addr(void *opaque, uint64_t addr) { - return cpu_get_phys_page_debug(env, addr); + XtensaCPU *cpu =3D opaque; + + return cpu_get_phys_page_debug(CPU(cpu), addr); } static void sim_reset(void *opaque) @@ -88,10 +90,10 @@ static void xtensa_sim_init(QEMUMachineInitArgs *args= ) uint64_t elf_entry; uint64_t elf_lowaddr; #ifdef TARGET_WORDS_BIGENDIAN - int success =3D load_elf(kernel_filename, translate_phys_addr, e= nv, + int success =3D load_elf(kernel_filename, translate_phys_addr, c= pu, &elf_entry, &elf_lowaddr, NULL, 1, ELF_MACHINE, 0); #else - int success =3D load_elf(kernel_filename, translate_phys_addr, e= nv, + int success =3D load_elf(kernel_filename, translate_phys_addr, c= pu, &elf_entry, &elf_lowaddr, NULL, 0, ELF_MACHINE, 0); #endif if (success > 0) { --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg