From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiNDX-0005RW-6T for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:23:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiNDT-0000L2-D9 for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:23:31 -0400 Received: from e06smtp09.uk.ibm.com ([195.75.94.105]:41980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiNDT-0000Kk-33 for qemu-devel@nongnu.org; Tue, 22 Mar 2016 10:23:27 -0400 Received: from localhost by e06smtp09.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 22 Mar 2016 14:23:24 -0000 From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 22 Mar 2016 15:23:13 +0100 Message-Id: <1458656593-7735-1-git-send-email-clg@fr.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] ppc: move POWER8 Book4 regs in their own routine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: Thomas Huth , Cedric Le Goater , qemu-ppc@nongnu.org, qemu-devel@nongnu.org commit fce55481360d "ppc: A couple more dummy POWER8 Book4 regs" squashed in to rapidly a set of POWER8 Book4 regs in the wrong routine. This patch introduces the missing gen_spr_power8_book4() routine to fix their location. Signed-off-by: Cédric Le Goater --- target-ppc/translate_init.c | 8 ++++++++ 1 file changed, 8 insertions(+) Index: qemu-dgibson-for-2.6.git/target-ppc/translate_init.c =================================================================== --- qemu-dgibson-for-2.6.git.orig/target-ppc/translate_init.c +++ qemu-dgibson-for-2.6.git/target-ppc/translate_init.c @@ -8018,6 +8018,13 @@ static void gen_spr_power8_ic(CPUPPCStat &spr_read_generic, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, 0); +#endif +} + +static void gen_spr_power8_book4(CPUPPCState *env) +{ + /* Add a number of P8 book4 registers */ +#if !defined(CONFIG_USER_ONLY) spr_register_kvm(env, SPR_ACOP, "ACOP", SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, @@ -8086,6 +8093,7 @@ static void init_proc_book3s_64(CPUPPCSt gen_spr_power8_pspb(env); gen_spr_vtb(env); gen_spr_power8_ic(env); + gen_spr_power8_book4(env); } if (version < BOOK3S_CPU_POWER8) { gen_spr_book3s_dbg(env);