14a10fc399
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>
130 lines
3.3 KiB
C
130 lines
3.3 KiB
C
/*
|
|
* QEMU MIPS CPU
|
|
*
|
|
* Copyright (c) 2012 SUSE LINUX Products GmbH
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see
|
|
* <http://www.gnu.org/licenses/lgpl-2.1.html>
|
|
*/
|
|
|
|
#include "cpu.h"
|
|
#include "qemu-common.h"
|
|
|
|
|
|
static void mips_cpu_set_pc(CPUState *cs, vaddr value)
|
|
{
|
|
MIPSCPU *cpu = MIPS_CPU(cs);
|
|
CPUMIPSState *env = &cpu->env;
|
|
|
|
env->active_tc.PC = value & ~(target_ulong)1;
|
|
if (value & 1) {
|
|
env->hflags |= MIPS_HFLAG_M16;
|
|
} else {
|
|
env->hflags &= ~(MIPS_HFLAG_M16);
|
|
}
|
|
}
|
|
|
|
static void mips_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb)
|
|
{
|
|
MIPSCPU *cpu = MIPS_CPU(cs);
|
|
CPUMIPSState *env = &cpu->env;
|
|
|
|
env->active_tc.PC = tb->pc;
|
|
env->hflags &= ~MIPS_HFLAG_BMASK;
|
|
env->hflags |= tb->flags & MIPS_HFLAG_BMASK;
|
|
}
|
|
|
|
/* CPUClass::reset() */
|
|
static void mips_cpu_reset(CPUState *s)
|
|
{
|
|
MIPSCPU *cpu = MIPS_CPU(s);
|
|
MIPSCPUClass *mcc = MIPS_CPU_GET_CLASS(cpu);
|
|
CPUMIPSState *env = &cpu->env;
|
|
|
|
mcc->parent_reset(s);
|
|
|
|
memset(env, 0, offsetof(CPUMIPSState, breakpoints));
|
|
tlb_flush(env, 1);
|
|
|
|
cpu_state_reset(env);
|
|
}
|
|
|
|
static void mips_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
{
|
|
CPUState *cs = CPU(dev);
|
|
MIPSCPUClass *mcc = MIPS_CPU_GET_CLASS(dev);
|
|
|
|
cpu_reset(cs);
|
|
qemu_init_vcpu(cs);
|
|
|
|
mcc->parent_realize(dev, errp);
|
|
}
|
|
|
|
static void mips_cpu_initfn(Object *obj)
|
|
{
|
|
CPUState *cs = CPU(obj);
|
|
MIPSCPU *cpu = MIPS_CPU(obj);
|
|
CPUMIPSState *env = &cpu->env;
|
|
|
|
cs->env_ptr = env;
|
|
cpu_exec_init(env);
|
|
|
|
if (tcg_enabled()) {
|
|
mips_tcg_init();
|
|
}
|
|
}
|
|
|
|
static void mips_cpu_class_init(ObjectClass *c, void *data)
|
|
{
|
|
MIPSCPUClass *mcc = MIPS_CPU_CLASS(c);
|
|
CPUClass *cc = CPU_CLASS(c);
|
|
DeviceClass *dc = DEVICE_CLASS(c);
|
|
|
|
mcc->parent_realize = dc->realize;
|
|
dc->realize = mips_cpu_realizefn;
|
|
|
|
mcc->parent_reset = cc->reset;
|
|
cc->reset = mips_cpu_reset;
|
|
|
|
cc->do_interrupt = mips_cpu_do_interrupt;
|
|
cc->dump_state = mips_cpu_dump_state;
|
|
cc->set_pc = mips_cpu_set_pc;
|
|
cc->synchronize_from_tb = mips_cpu_synchronize_from_tb;
|
|
cc->gdb_read_register = mips_cpu_gdb_read_register;
|
|
cc->gdb_write_register = mips_cpu_gdb_write_register;
|
|
#ifndef CONFIG_USER_ONLY
|
|
cc->do_unassigned_access = mips_cpu_unassigned_access;
|
|
cc->get_phys_page_debug = mips_cpu_get_phys_page_debug;
|
|
#endif
|
|
|
|
cc->gdb_num_core_regs = 73;
|
|
}
|
|
|
|
static const TypeInfo mips_cpu_type_info = {
|
|
.name = TYPE_MIPS_CPU,
|
|
.parent = TYPE_CPU,
|
|
.instance_size = sizeof(MIPSCPU),
|
|
.instance_init = mips_cpu_initfn,
|
|
.abstract = false,
|
|
.class_size = sizeof(MIPSCPUClass),
|
|
.class_init = mips_cpu_class_init,
|
|
};
|
|
|
|
static void mips_cpu_register_types(void)
|
|
{
|
|
type_register_static(&mips_cpu_type_info);
|
|
}
|
|
|
|
type_init(mips_cpu_register_types)
|