diff options
| author | Andreas Färber | 2013-07-27 02:53:25 +0200 |
|---|---|---|
| committer | Andreas Färber | 2013-07-29 15:29:15 +0200 |
| commit | 14a10fc39923b3af07c8c46d22cb20843bee3a72 (patch) | |
| tree | 5dc9c362f2ef73a3f28e62483e14d0602e439b33 /target-openrisc | |
| parent | Merge remote-tracking branch 'sstabellini/xen-130729' into staging (diff) | |
| download | qemu-14a10fc39923b3af07c8c46d22cb20843bee3a72.tar.gz qemu-14a10fc39923b3af07c8c46d22cb20843bee3a72.tar.xz qemu-14a10fc39923b3af07c8c46d22cb20843bee3a72.zip | |
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>
Diffstat (limited to 'target-openrisc')
| -rw-r--r-- | target-openrisc/cpu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c index aa269fb7a6..075f00a897 100644 --- a/target-openrisc/cpu.c +++ b/target-openrisc/cpu.c @@ -66,10 +66,11 @@ static inline void set_feature(OpenRISCCPU *cpu, int feature) static void openrisc_cpu_realizefn(DeviceState *dev, Error **errp) { - OpenRISCCPU *cpu = OPENRISC_CPU(dev); + CPUState *cs = CPU(dev); OpenRISCCPUClass *occ = OPENRISC_CPU_GET_CLASS(dev); - cpu_reset(CPU(cpu)); + qemu_init_vcpu(cs); + cpu_reset(cs); occ->parent_realize(dev, errp); } |