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>
203 lines
5.3 KiB
C
203 lines
5.3 KiB
C
/*
|
|
* QEMU S/390 CPU
|
|
*
|
|
* Copyright (c) 2009 Ulrich Hecht
|
|
* Copyright (c) 2011 Alexander Graf
|
|
* Copyright (c) 2012 SUSE LINUX Products GmbH
|
|
* Copyright (c) 2012 IBM Corp.
|
|
*
|
|
* 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>
|
|
* Contributions after 2012-12-11 are licensed under the terms of the
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
|
*/
|
|
|
|
#include "cpu.h"
|
|
#include "qemu-common.h"
|
|
#include "qemu/timer.h"
|
|
#include "hw/hw.h"
|
|
#ifndef CONFIG_USER_ONLY
|
|
#include "sysemu/arch_init.h"
|
|
#endif
|
|
|
|
#define CR0_RESET 0xE0UL
|
|
#define CR14_RESET 0xC2000000UL;
|
|
|
|
/* generate CPU information for cpu -? */
|
|
void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf)
|
|
{
|
|
#ifdef CONFIG_KVM
|
|
(*cpu_fprintf)(f, "s390 %16s\n", "host");
|
|
#endif
|
|
}
|
|
|
|
#ifndef CONFIG_USER_ONLY
|
|
CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
|
|
{
|
|
CpuDefinitionInfoList *entry;
|
|
CpuDefinitionInfo *info;
|
|
|
|
info = g_malloc0(sizeof(*info));
|
|
info->name = g_strdup("host");
|
|
|
|
entry = g_malloc0(sizeof(*entry));
|
|
entry->value = info;
|
|
|
|
return entry;
|
|
}
|
|
#endif
|
|
|
|
static void s390_cpu_set_pc(CPUState *cs, vaddr value)
|
|
{
|
|
S390CPU *cpu = S390_CPU(cs);
|
|
|
|
cpu->env.psw.addr = value;
|
|
}
|
|
|
|
/* CPUClass::reset() */
|
|
static void s390_cpu_reset(CPUState *s)
|
|
{
|
|
S390CPU *cpu = S390_CPU(s);
|
|
S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
|
|
CPUS390XState *env = &cpu->env;
|
|
|
|
s390_del_running_cpu(cpu);
|
|
|
|
scc->parent_reset(s);
|
|
|
|
memset(env, 0, offsetof(CPUS390XState, breakpoints));
|
|
|
|
/* architectured initial values for CR 0 and 14 */
|
|
env->cregs[0] = CR0_RESET;
|
|
env->cregs[14] = CR14_RESET;
|
|
/* set halted to 1 to make sure we can add the cpu in
|
|
* s390_ipl_cpu code, where CPUState::halted is set back to 0
|
|
* after incrementing the cpu counter */
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
s->halted = 1;
|
|
#endif
|
|
tlb_flush(env, 1);
|
|
}
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
static void s390_cpu_machine_reset_cb(void *opaque)
|
|
{
|
|
S390CPU *cpu = opaque;
|
|
|
|
cpu_reset(CPU(cpu));
|
|
}
|
|
#endif
|
|
|
|
static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
{
|
|
CPUState *cs = CPU(dev);
|
|
S390CPUClass *scc = S390_CPU_GET_CLASS(dev);
|
|
|
|
qemu_init_vcpu(cs);
|
|
cpu_reset(cs);
|
|
|
|
scc->parent_realize(dev, errp);
|
|
}
|
|
|
|
static void s390_cpu_initfn(Object *obj)
|
|
{
|
|
CPUState *cs = CPU(obj);
|
|
S390CPU *cpu = S390_CPU(obj);
|
|
CPUS390XState *env = &cpu->env;
|
|
static bool inited;
|
|
static int cpu_num = 0;
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
struct tm tm;
|
|
#endif
|
|
|
|
cs->env_ptr = env;
|
|
cpu_exec_init(env);
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
qemu_register_reset(s390_cpu_machine_reset_cb, cpu);
|
|
qemu_get_timedate(&tm, 0);
|
|
env->tod_offset = TOD_UNIX_EPOCH +
|
|
(time2tod(mktimegm(&tm)) * 1000000000ULL);
|
|
env->tod_basetime = 0;
|
|
env->tod_timer = qemu_new_timer_ns(vm_clock, s390x_tod_timer, cpu);
|
|
env->cpu_timer = qemu_new_timer_ns(vm_clock, s390x_cpu_timer, cpu);
|
|
/* set CPUState::halted state to 1 to avoid decrementing the running
|
|
* cpu counter in s390_cpu_reset to a negative number at
|
|
* initial ipl */
|
|
cs->halted = 1;
|
|
#endif
|
|
env->cpu_num = cpu_num++;
|
|
env->ext_index = -1;
|
|
|
|
if (tcg_enabled() && !inited) {
|
|
inited = true;
|
|
s390x_translate_init();
|
|
}
|
|
}
|
|
|
|
static void s390_cpu_finalize(Object *obj)
|
|
{
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
S390CPU *cpu = S390_CPU(obj);
|
|
|
|
qemu_unregister_reset(s390_cpu_machine_reset_cb, cpu);
|
|
#endif
|
|
}
|
|
|
|
static const VMStateDescription vmstate_s390_cpu = {
|
|
.name = "cpu",
|
|
.unmigratable = 1,
|
|
};
|
|
|
|
static void s390_cpu_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
S390CPUClass *scc = S390_CPU_CLASS(oc);
|
|
CPUClass *cc = CPU_CLASS(scc);
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
scc->parent_realize = dc->realize;
|
|
dc->realize = s390_cpu_realizefn;
|
|
|
|
scc->parent_reset = cc->reset;
|
|
cc->reset = s390_cpu_reset;
|
|
|
|
cc->do_interrupt = s390_cpu_do_interrupt;
|
|
cc->dump_state = s390_cpu_dump_state;
|
|
cc->set_pc = s390_cpu_set_pc;
|
|
cc->gdb_read_register = s390_cpu_gdb_read_register;
|
|
cc->gdb_write_register = s390_cpu_gdb_write_register;
|
|
#ifndef CONFIG_USER_ONLY
|
|
cc->get_phys_page_debug = s390_cpu_get_phys_page_debug;
|
|
#endif
|
|
dc->vmsd = &vmstate_s390_cpu;
|
|
cc->gdb_num_core_regs = S390_NUM_REGS;
|
|
}
|
|
|
|
static const TypeInfo s390_cpu_type_info = {
|
|
.name = TYPE_S390_CPU,
|
|
.parent = TYPE_CPU,
|
|
.instance_size = sizeof(S390CPU),
|
|
.instance_init = s390_cpu_initfn,
|
|
.instance_finalize = s390_cpu_finalize,
|
|
.abstract = false,
|
|
.class_size = sizeof(S390CPUClass),
|
|
.class_init = s390_cpu_class_init,
|
|
};
|
|
|
|
static void s390_cpu_register_types(void)
|
|
{
|
|
type_register_static(&s390_cpu_type_info);
|
|
}
|
|
|
|
type_init(s390_cpu_register_types)
|