From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFHGk-0000TS-1l for qemu-devel@nongnu.org; Fri, 30 Aug 2013 01:29:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFHGa-0004rS-1s for qemu-devel@nongnu.org; Fri, 30 Aug 2013 01:29:13 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:40242) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFHGZ-0004qr-EP for qemu-devel@nongnu.org; Fri, 30 Aug 2013 01:29:03 -0400 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 30 Aug 2013 15:15:00 +1000 From: Alexey Kardashevskiy Date: Fri, 30 Aug 2013 15:28:24 +1000 Message-Id: <1377840513-24882-4-git-send-email-aik@ozlabs.ru> In-Reply-To: <1377840513-24882-1-git-send-email-aik@ozlabs.ru> References: <1377840513-24882-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v4 03/12] spapr: move cpu_setup after kvmppc_set_papr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Alexander Graf , qemu-ppc@nongnu.org, Paul Mackerras , =?UTF-8?q?Andreas=20F=C3=A4rber?= , David Gibson This moves the xics_cpu_setup() call after kvmppc_set_papr() in order to get VCPUs initialized as this is required by upcoming XICS-KVM. Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index c927ad5..2f759b3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1187,8 +1187,6 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args) } env = &cpu->env; - xics_cpu_setup(spapr->icp, cpu); - /* Set time-base frequency to 512 MHz */ cpu_ppc_tb_init(env, TIMEBASE_FREQ); @@ -1202,6 +1200,8 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args) kvmppc_set_papr(cpu); } + xics_cpu_setup(spapr->icp, cpu); + qemu_register_reset(spapr_cpu_reset, cpu); } -- 1.8.4.rc4