4c315c2766
Several devices don't survive object_unref(object_new(T)): they crash or hang during cleanup, or they leave dangling pointers behind. This breaks at least device-list-properties, because qmp_device_list_properties() needs to create a device to find its properties. Broken in commitf4eb32b
"qmp: show QOM properties in device-list-properties", v2.1. Example reproducer: $ qemu-system-aarch64 -nodefaults -display none -machine none -S -qmp stdio {"QMP": {"version": {"qemu": {"micro": 50, "minor": 4, "major": 2}, "package": ""}, "capabilities": []}} { "execute": "qmp_capabilities" } {"return": {}} { "execute": "device-list-properties", "arguments": { "typename": "pxa2xx-pcmcia" } } qemu-system-aarch64: /home/armbru/work/qemu/memory.c:1307: memory_region_finalize: Assertion `((&mr->subregions)->tqh_first == ((void *)0))' failed. Aborted (core dumped) [Exit 134 (SIGABRT)] Unfortunately, I can't fix the problems in these devices right now. Instead, add DeviceClass member cannot_destroy_with_object_finalize_yet to mark them: * Hang during cleanup (didn't debug, so I can't say why): "realview_pci", "versatile_pci". * Dangling pointer in cpus: most CPUs, plus "allwinner-a10", "digic", "fsl,imx25", "fsl,imx31", "xlnx,zynqmp", because they create such CPUs * Assert kvm_enabled(): "host-x86_64-cpu", host-i386-cpu", "host-powerpc64-cpu", "host-embedded-powerpc-cpu", "host-powerpc-cpu" (the powerpc ones can't currently reach the assertion, because the CPUs are only registered when KVM is enabled, but the assertion is arguably in the wrong place all the same) Make qmp_device_list_properties() fail cleanly when the device is so marked. This improves device-list-properties from "crashes, hangs or leaves dangling pointers behind" to "fails". Not a complete fix, just a better-than-nothing work-around. In the above reproducer, device-list-properties now fails with "Can't list properties of device 'pxa2xx-pcmcia'". This also protects -device FOO,help, which uses the same machinery since commitef52358
"qdev-monitor: include QOM properties in -device FOO, help output", v2.2. Example reproducer: $ qemu-system-aarch64 -machine none -device pxa2xx-pcmcia,help Before: qemu-system-aarch64: .../memory.c:1307: memory_region_finalize: Assertion `((&mr->subregions)->tqh_first == ((void *)0))' failed. After: Can't list properties of device 'pxa2xx-pcmcia' Cc: "Andreas Färber" <afaerber@suse.de> Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com> Cc: Alexander Graf <agraf@suse.de> Cc: Anthony Green <green@moxielogic.com> Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> Cc: Blue Swirl <blauwirbel@gmail.com> Cc: Eduardo Habkost <ehabkost@redhat.com> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn> Cc: Jia Liu <proljc@gmail.com> Cc: Leon Alrae <leon.alrae@imgtec.com> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Michael Walle <michael@walle.cc> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Peter Maydell <peter.maydell@linaro.org> Cc: Richard Henderson <rth@twiddle.net> Cc: qemu-ppc@nongnu.org Cc: qemu-stable@nongnu.org Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <1443689999-12182-10-git-send-email-armbru@redhat.com>
184 lines
4.5 KiB
C
184 lines
4.5 KiB
C
/*
|
|
* QEMU Moxie CPU
|
|
*
|
|
* Copyright (c) 2013 Anthony Green
|
|
*
|
|
* 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 General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "cpu.h"
|
|
#include "qemu-common.h"
|
|
#include "migration/vmstate.h"
|
|
#include "machine.h"
|
|
|
|
static void moxie_cpu_set_pc(CPUState *cs, vaddr value)
|
|
{
|
|
MoxieCPU *cpu = MOXIE_CPU(cs);
|
|
|
|
cpu->env.pc = value;
|
|
}
|
|
|
|
static bool moxie_cpu_has_work(CPUState *cs)
|
|
{
|
|
return cs->interrupt_request & CPU_INTERRUPT_HARD;
|
|
}
|
|
|
|
static void moxie_cpu_reset(CPUState *s)
|
|
{
|
|
MoxieCPU *cpu = MOXIE_CPU(s);
|
|
MoxieCPUClass *mcc = MOXIE_CPU_GET_CLASS(cpu);
|
|
CPUMoxieState *env = &cpu->env;
|
|
|
|
mcc->parent_reset(s);
|
|
|
|
memset(env, 0, sizeof(CPUMoxieState));
|
|
env->pc = 0x1000;
|
|
|
|
tlb_flush(s, 1);
|
|
}
|
|
|
|
static void moxie_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
{
|
|
CPUState *cs = CPU(dev);
|
|
MoxieCPUClass *mcc = MOXIE_CPU_GET_CLASS(dev);
|
|
|
|
qemu_init_vcpu(cs);
|
|
cpu_reset(cs);
|
|
|
|
mcc->parent_realize(dev, errp);
|
|
}
|
|
|
|
static void moxie_cpu_initfn(Object *obj)
|
|
{
|
|
CPUState *cs = CPU(obj);
|
|
MoxieCPU *cpu = MOXIE_CPU(obj);
|
|
static int inited;
|
|
|
|
cs->env_ptr = &cpu->env;
|
|
cpu_exec_init(cs, &error_abort);
|
|
|
|
if (tcg_enabled() && !inited) {
|
|
inited = 1;
|
|
moxie_translate_init();
|
|
}
|
|
}
|
|
|
|
static ObjectClass *moxie_cpu_class_by_name(const char *cpu_model)
|
|
{
|
|
ObjectClass *oc;
|
|
|
|
if (cpu_model == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
oc = object_class_by_name(cpu_model);
|
|
if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_MOXIE_CPU) ||
|
|
object_class_is_abstract(oc))) {
|
|
return NULL;
|
|
}
|
|
return oc;
|
|
}
|
|
|
|
static void moxie_cpu_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
CPUClass *cc = CPU_CLASS(oc);
|
|
MoxieCPUClass *mcc = MOXIE_CPU_CLASS(oc);
|
|
|
|
mcc->parent_realize = dc->realize;
|
|
dc->realize = moxie_cpu_realizefn;
|
|
|
|
mcc->parent_reset = cc->reset;
|
|
cc->reset = moxie_cpu_reset;
|
|
|
|
cc->class_by_name = moxie_cpu_class_by_name;
|
|
|
|
cc->has_work = moxie_cpu_has_work;
|
|
cc->do_interrupt = moxie_cpu_do_interrupt;
|
|
cc->dump_state = moxie_cpu_dump_state;
|
|
cc->set_pc = moxie_cpu_set_pc;
|
|
#ifdef CONFIG_USER_ONLY
|
|
cc->handle_mmu_fault = moxie_cpu_handle_mmu_fault;
|
|
#else
|
|
cc->get_phys_page_debug = moxie_cpu_get_phys_page_debug;
|
|
cc->vmsd = &vmstate_moxie_cpu;
|
|
#endif
|
|
|
|
/*
|
|
* Reason: moxie_cpu_initfn() calls cpu_exec_init(), which saves
|
|
* the object in cpus -> dangling pointer after final
|
|
* object_unref().
|
|
*/
|
|
dc->cannot_destroy_with_object_finalize_yet = true;
|
|
}
|
|
|
|
static void moxielite_initfn(Object *obj)
|
|
{
|
|
/* Set cpu feature flags */
|
|
}
|
|
|
|
static void moxie_any_initfn(Object *obj)
|
|
{
|
|
/* Set cpu feature flags */
|
|
}
|
|
|
|
typedef struct MoxieCPUInfo {
|
|
const char *name;
|
|
void (*initfn)(Object *obj);
|
|
} MoxieCPUInfo;
|
|
|
|
static const MoxieCPUInfo moxie_cpus[] = {
|
|
{ .name = "MoxieLite", .initfn = moxielite_initfn },
|
|
{ .name = "any", .initfn = moxie_any_initfn },
|
|
};
|
|
|
|
MoxieCPU *cpu_moxie_init(const char *cpu_model)
|
|
{
|
|
return MOXIE_CPU(cpu_generic_init(TYPE_MOXIE_CPU, cpu_model));
|
|
}
|
|
|
|
static void cpu_register(const MoxieCPUInfo *info)
|
|
{
|
|
TypeInfo type_info = {
|
|
.parent = TYPE_MOXIE_CPU,
|
|
.instance_size = sizeof(MoxieCPU),
|
|
.instance_init = info->initfn,
|
|
.class_size = sizeof(MoxieCPUClass),
|
|
};
|
|
|
|
type_info.name = g_strdup_printf("%s-" TYPE_MOXIE_CPU, info->name);
|
|
type_register(&type_info);
|
|
g_free((void *)type_info.name);
|
|
}
|
|
|
|
static const TypeInfo moxie_cpu_type_info = {
|
|
.name = TYPE_MOXIE_CPU,
|
|
.parent = TYPE_CPU,
|
|
.instance_size = sizeof(MoxieCPU),
|
|
.instance_init = moxie_cpu_initfn,
|
|
.class_size = sizeof(MoxieCPUClass),
|
|
.class_init = moxie_cpu_class_init,
|
|
};
|
|
|
|
static void moxie_cpu_register_types(void)
|
|
{
|
|
int i;
|
|
type_register_static(&moxie_cpu_type_info);
|
|
for (i = 0; i < ARRAY_SIZE(moxie_cpus); i++) {
|
|
cpu_register(&moxie_cpus[i]);
|
|
}
|
|
}
|
|
|
|
type_init(moxie_cpu_register_types)
|