cpu: Partially revert "cpu: Change qemu_init_vcpu() argument to CPUState"
Commit c643bed9 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>
Showing
- qom/cpu.c 0 additions, 2 deletionsqom/cpu.c
- target-alpha/cpu.c 3 additions, 0 deletionstarget-alpha/cpu.c
- target-arm/cpu.c 3 additions, 1 deletiontarget-arm/cpu.c
- target-cris/cpu.c 3 additions, 2 deletionstarget-cris/cpu.c
- target-i386/cpu.c 3 additions, 1 deletiontarget-i386/cpu.c
- target-lm32/cpu.c 4 additions, 2 deletionstarget-lm32/cpu.c
- target-m68k/cpu.c 3 additions, 1 deletiontarget-m68k/cpu.c
- target-microblaze/cpu.c 3 additions, 2 deletionstarget-microblaze/cpu.c
- target-mips/cpu.c 3 additions, 2 deletionstarget-mips/cpu.c
- target-moxie/cpu.c 3 additions, 2 deletionstarget-moxie/cpu.c
- target-openrisc/cpu.c 3 additions, 2 deletionstarget-openrisc/cpu.c
- target-ppc/translate_init.c 2 additions, 0 deletionstarget-ppc/translate_init.c
- target-s390x/cpu.c 3 additions, 2 deletionstarget-s390x/cpu.c
- target-sh4/cpu.c 3 additions, 2 deletionstarget-sh4/cpu.c
- target-sparc/cpu.c 2 additions, 0 deletionstarget-sparc/cpu.c
- target-unicore32/cpu.c 2 additions, 0 deletionstarget-unicore32/cpu.c
- target-xtensa/cpu.c 2 additions, 0 deletionstarget-xtensa/cpu.c
Loading
Please register or sign in to comment