Merge commit '608911acac53f08dfaaf1878f56d4e32ee572ce4' into upstream-merge

Merge commit '608911acac53f08dfaaf1878f56d4e32ee572ce4' into upstream-merge

* commit '608911acac53f08dfaaf1878f56d4e32ee572ce4': (28 commits)
  pc: Use cpu_x86_init() to obtain X86CPU
  target-i386: Let cpu_x86_init() return X86CPU
  target-i386: Pass X86CPU to do_cpu_{init,sipi}()
  microblaze_boot: Pass MicroBlazeCPU to microblaze_load_kernel()
  petalogix_s3adsp1800_mmu: Use cpu_mb_init() to obtain MicroBlazeCPU
  petalogix_ml605: Use cpu_mb_init() to obtain MicroBlazeCPU
  target-microblaze: Let cpu_mb_init() return MicroBlazeCPU
  cris-boot: Pass CRISCPU to main_cpu_reset().
  cris-boot: Pass CRISCPU to cris_load_image()
  axis_dev88: Use cpu_cris_init() to obtain CRISCPU
  target-cris: Let cpu_cris_init() return CRISCPU
  target-cris: Reindent cpu_cris_init()
  xtensa_lx60: Pass XtensaCPU to lx60_reset()
  xtensa_lx60: Use cpu_xtensa_init() to obtain XtensaCPU
  xtensa_sim: Pass XtensaCPU to sim_reset()
  xtensa_sim: Use cpu_xtensa_init() to obtain XtensaCPU
  target-xtensa: Let cpu_xtensa_init() return XtensaCPU
  milkymist: Store LM32 in ResetInfo
  milkymist: Use cpu_lm32_init() to obtain LM32CPU
  lm32_boards: Store LM32CPU in ResetInfo
  ...

Conflicts:
	hw/pc.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>