diff options
| author | Alexey Kardashevskiy | 2013-09-26 08:18:37 +0200 |
|---|---|---|
| committer | Alexander Graf | 2013-10-25 23:25:46 +0200 |
| commit | 24408a7d2b459bed3697367b81ada76518ca96ef (patch) | |
| tree | 06a2cb5144c88363841063cb7f667ee83be41079 | |
| parent | xics: move reset and cpu_setup (diff) | |
| download | qemu-24408a7d2b459bed3697367b81ada76518ca96ef.tar.gz qemu-24408a7d2b459bed3697367b81ada76518ca96ef.tar.xz qemu-24408a7d2b459bed3697367b81ada76518ca96ef.zip | |
spapr: move cpu_setup after kvmppc_set_papr
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 <aik@ozlabs.ru>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/ppc/spapr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 259df92092..a276377496 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1184,8 +1184,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); @@ -1199,6 +1197,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); } |