cpu: Partially revert "cpu: Change qemu_init_vcpu() argument to CPUState"
authorAndreas Färber <afaerber@suse.de>
Sat, 27 Jul 2013 00:53:25 +0000 (02:53 +0200)
committerAndreas Färber <afaerber@suse.de>
Mon, 29 Jul 2013 13:29:15 +0000 (15:29 +0200)
commit14a10fc39923b3af07c8c46d22cb20843bee3a72
tree5dc9c362f2ef73a3f28e62483e14d0602e439b33
parentfdc43322c978d78e79e692872dcec7b4f6a447f1
cpu: Partially revert "cpu: Change qemu_init_vcpu() argument to CPUState"

Commit c643bed99 moved qemu_init_vcpu() calls to common CPUState code.
This causes x86 cpu-add to fail with "KVM: setting VAPIC address failed".

The reason for the failure is that CPUClass::kvm_fd is not yet
initialized in the following call graph:
->x86_cpu_realizefn
 ->x86_cpu_apic_realize
  ->qdev_init
   ->device_set_realized
    ->device_reset (hotplugged == 1)
     ->apic_reset_common
      ->vapic_base_update
       ->kvm_apic_vapic_base_update
This causes attempted KVM vCPU ioctls to fail.

By contrast, in the non-hotplug case the APIC is reset much later, when
the vCPU is already initialized.

As a quick and safe solution, move the qemu_init_vcpu() call back into
the targets' realize functions.

Reported-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Acked-by: Igor Mammedov <imammedo@redhat.com> (for i386)
Tested-by: Jia Liu <proljc@gmail.com> (for openrisc)
Signed-off-by: Andreas Färber <afaerber@suse.de>
17 files changed:
qom/cpu.c
target-alpha/cpu.c
target-arm/cpu.c
target-cris/cpu.c
target-i386/cpu.c
target-lm32/cpu.c
target-m68k/cpu.c
target-microblaze/cpu.c
target-mips/cpu.c
target-moxie/cpu.c
target-openrisc/cpu.c
target-ppc/translate_init.c
target-s390x/cpu.c
target-sh4/cpu.c
target-sparc/cpu.c
target-unicore32/cpu.c
target-xtensa/cpu.c