2012-02-11 17:26:17 +01:00
|
|
|
/*
|
|
|
|
* QEMU SuperH CPU
|
|
|
|
*
|
2012-04-13 02:16:02 +02:00
|
|
|
* Copyright (c) 2005 Samuel Tardieu
|
2012-02-11 17:26:17 +01:00
|
|
|
* 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>
|
|
|
|
*/
|
|
|
|
|
2016-01-26 19:17:20 +01:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 09:01:28 +01:00
|
|
|
#include "qapi/error.h"
|
2012-02-11 17:26:17 +01:00
|
|
|
#include "cpu.h"
|
|
|
|
#include "qemu-common.h"
|
2013-01-20 19:32:33 +01:00
|
|
|
#include "migration/vmstate.h"
|
2016-03-15 13:18:37 +01:00
|
|
|
#include "exec/exec-all.h"
|
2012-02-11 17:26:17 +01:00
|
|
|
|
|
|
|
|
2013-06-21 19:09:18 +02:00
|
|
|
static void superh_cpu_set_pc(CPUState *cs, vaddr value)
|
|
|
|
{
|
|
|
|
SuperHCPU *cpu = SUPERH_CPU(cs);
|
|
|
|
|
|
|
|
cpu->env.pc = value;
|
|
|
|
}
|
|
|
|
|
2013-06-28 19:31:32 +02:00
|
|
|
static void superh_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb)
|
|
|
|
{
|
|
|
|
SuperHCPU *cpu = SUPERH_CPU(cs);
|
|
|
|
|
|
|
|
cpu->env.pc = tb->pc;
|
2017-07-18 22:02:29 +02:00
|
|
|
cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK;
|
2013-06-28 19:31:32 +02:00
|
|
|
}
|
|
|
|
|
2013-08-25 18:53:55 +02:00
|
|
|
static bool superh_cpu_has_work(CPUState *cs)
|
|
|
|
{
|
|
|
|
return cs->interrupt_request & CPU_INTERRUPT_HARD;
|
|
|
|
}
|
|
|
|
|
2012-02-11 17:26:17 +01:00
|
|
|
/* CPUClass::reset() */
|
|
|
|
static void superh_cpu_reset(CPUState *s)
|
|
|
|
{
|
|
|
|
SuperHCPU *cpu = SUPERH_CPU(s);
|
|
|
|
SuperHCPUClass *scc = SUPERH_CPU_GET_CLASS(cpu);
|
|
|
|
CPUSH4State *env = &cpu->env;
|
|
|
|
|
|
|
|
scc->parent_reset(s);
|
|
|
|
|
2016-11-14 15:19:17 +01:00
|
|
|
memset(env, 0, offsetof(CPUSH4State, end_reset_fields));
|
2012-04-13 02:16:02 +02:00
|
|
|
|
|
|
|
env->pc = 0xA0000000;
|
|
|
|
#if defined(CONFIG_USER_ONLY)
|
|
|
|
env->fpscr = FPSCR_PR; /* value for userspace according to the kernel */
|
|
|
|
set_float_rounding_mode(float_round_nearest_even, &env->fp_status); /* ?! */
|
|
|
|
#else
|
2015-05-25 01:28:56 +02:00
|
|
|
env->sr = (1u << SR_MD) | (1u << SR_RB) | (1u << SR_BL) |
|
|
|
|
(1u << SR_I3) | (1u << SR_I2) | (1u << SR_I1) | (1u << SR_I0);
|
2012-04-13 02:16:02 +02:00
|
|
|
env->fpscr = FPSCR_DN | FPSCR_RM_ZERO; /* CPU reset value according to SH4 manual */
|
|
|
|
set_float_rounding_mode(float_round_to_zero, &env->fp_status);
|
|
|
|
set_flush_to_zero(1, &env->fp_status);
|
|
|
|
#endif
|
|
|
|
set_default_nan_mode(1, &env->fp_status);
|
softfloat: Implement run-time-configurable meaning of signaling NaN bit
This patch modifies SoftFloat library so that it can be configured in
run-time in relation to the meaning of signaling NaN bit, while, at the
same time, strictly preserving its behavior on all existing platforms.
Background:
In floating-point calculations, there is a need for denoting undefined or
unrepresentable values. This is achieved by defining certain floating-point
numerical values to be NaNs (which stands for "not a number"). For additional
reasons, virtually all modern floating-point unit implementations use two
kinds of NaNs: quiet and signaling. The binary representations of these two
kinds of NaNs, as a rule, differ only in one bit (that bit is, traditionally,
the first bit of mantissa).
Up to 2008, standards for floating-point did not specify all details about
binary representation of NaNs. More specifically, the meaning of the bit
that is used for distinguishing between signaling and quiet NaNs was not
strictly prescribed. (IEEE 754-2008 was the first floating-point standard
that defined that meaning clearly, see [1], p. 35) As a result, different
platforms took different approaches, and that presented considerable
challenge for multi-platform emulators like QEMU.
Mips platform represents the most complex case among QEMU-supported
platforms regarding signaling NaN bit. Up to the Release 6 of Mips
architecture, "1" in signaling NaN bit denoted signaling NaN, which is
opposite to IEEE 754-2008 standard. From Release 6 on, Mips architecture
adopted IEEE standard prescription, and "0" denotes signaling NaN. On top of
that, Mips architecture for SIMD (also known as MSA, or vector instructions)
also specifies signaling bit in accordance to IEEE standard. MSA unit can be
implemented with both pre-Release 6 and Release 6 main processor units.
QEMU uses SoftFloat library to implement various floating-point-related
instructions on all platforms. The current QEMU implementation allows for
defining meaning of signaling NaN bit during build time, and is implemented
via preprocessor macro called SNAN_BIT_IS_ONE.
On the other hand, the change in this patch enables SoftFloat library to be
configured in run-time. This configuration is meant to occur during CPU
initialization, at the moment when it is definitely known what desired
behavior for particular CPU (or any additional FPUs) is.
The change is implemented so that it is consistent with existing
implementation of similar cases. This means that structure float_status is
used for passing the information about desired signaling NaN bit on each
invocation of SoftFloat functions. The additional field in float_status is
called snan_bit_is_one, which supersedes macro SNAN_BIT_IS_ONE.
IMPORTANT:
This change is not meant to create any change in emulator behavior or
functionality on any platform. It just provides the means for SoftFloat
library to be used in a more flexible way - in other words, it will just
prepare SoftFloat library for usage related to Mips platform and its
specifics regarding signaling bit meaning, which is done in some of
subsequent patches from this series.
Further break down of changes:
1) Added field snan_bit_is_one to the structure float_status, and
correspondent setter function set_snan_bit_is_one().
2) Constants <float16|float32|float64|floatx80|float128>_default_nan
(used both internally and externally) converted to functions
<float16|float32|float64|floatx80|float128>_default_nan(float_status*).
This is necessary since they are dependent on signaling bit meaning.
At the same time, for the sake of code cleanup and simplicity, constants
<floatx80|float128>_default_nan_<low|high> (used only internally within
SoftFloat library) are removed, as not needed.
3) Added a float_status* argument to SoftFloat library functions
XXX_is_quiet_nan(XXX a_), XXX_is_signaling_nan(XXX a_),
XXX_maybe_silence_nan(XXX a_). This argument must be present in
order to enable correct invocation of new version of functions
XXX_default_nan(). (XXX is <float16|float32|float64|floatx80|float128>
here)
4) Updated code for all platforms to reflect changes in SoftFloat library.
This change is twofolds: it includes modifications of SoftFloat library
functions invocations, and an addition of invocation of function
set_snan_bit_is_one() during CPU initialization, with arguments that
are appropriate for each particular platform. It was established that
all platforms zero their main CPU data structures, so snan_bit_is_one(0)
in appropriate places is not added, as it is not needed.
[1] "IEEE Standard for Floating-Point Arithmetic",
IEEE Computer Society, August 29, 2008.
Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
Signed-off-by: Maciej W. Rozycki <macro@codesourcery.com>
Signed-off-by: Aleksandar Markovic <aleksandar.markovic@imgtec.com>
Tested-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
Tested-by: Leon Alrae <leon.alrae@imgtec.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
[leon.alrae@imgtec.com:
* cherry-picked 2 chunks from patch #2 to fix compilation warnings]
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
2016-06-10 11:57:28 +02:00
|
|
|
set_snan_bit_is_one(1, &env->fp_status);
|
2012-02-11 17:26:17 +01:00
|
|
|
}
|
|
|
|
|
2015-07-12 04:00:03 +02:00
|
|
|
static void superh_cpu_disas_set_info(CPUState *cpu, disassemble_info *info)
|
|
|
|
{
|
|
|
|
info->mach = bfd_mach_sh4;
|
|
|
|
info->print_insn = print_insn_sh;
|
|
|
|
}
|
|
|
|
|
2012-11-19 02:42:18 +01:00
|
|
|
typedef struct SuperHCPUListState {
|
|
|
|
fprintf_function cpu_fprintf;
|
|
|
|
FILE *file;
|
|
|
|
} SuperHCPUListState;
|
|
|
|
|
|
|
|
/* Sort alphabetically by type name. */
|
|
|
|
static gint superh_cpu_list_compare(gconstpointer a, gconstpointer b)
|
|
|
|
{
|
|
|
|
ObjectClass *class_a = (ObjectClass *)a;
|
|
|
|
ObjectClass *class_b = (ObjectClass *)b;
|
|
|
|
const char *name_a, *name_b;
|
|
|
|
|
|
|
|
name_a = object_class_get_name(class_a);
|
|
|
|
name_b = object_class_get_name(class_b);
|
|
|
|
return strcmp(name_a, name_b);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void superh_cpu_list_entry(gpointer data, gpointer user_data)
|
|
|
|
{
|
|
|
|
SuperHCPUListState *s = user_data;
|
2017-10-05 15:50:57 +02:00
|
|
|
const char *typename = object_class_get_name(OBJECT_CLASS(data));
|
|
|
|
int len = strlen(typename) - strlen(SUPERH_CPU_TYPE_SUFFIX);
|
2012-11-19 02:42:18 +01:00
|
|
|
|
2017-10-05 15:50:57 +02:00
|
|
|
(*s->cpu_fprintf)(s->file, "%.*s\n", len, typename);
|
2012-11-19 02:42:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void sh4_cpu_list(FILE *f, fprintf_function cpu_fprintf)
|
|
|
|
{
|
|
|
|
SuperHCPUListState s = {
|
|
|
|
.cpu_fprintf = cpu_fprintf,
|
|
|
|
.file = f,
|
|
|
|
};
|
|
|
|
GSList *list;
|
|
|
|
|
|
|
|
list = object_class_get_list(TYPE_SUPERH_CPU, false);
|
|
|
|
list = g_slist_sort(list, superh_cpu_list_compare);
|
|
|
|
g_slist_foreach(list, superh_cpu_list_entry, &s);
|
|
|
|
g_slist_free(list);
|
|
|
|
}
|
|
|
|
|
|
|
|
static ObjectClass *superh_cpu_class_by_name(const char *cpu_model)
|
|
|
|
{
|
|
|
|
ObjectClass *oc;
|
2017-10-05 15:50:56 +02:00
|
|
|
char *s, *typename = NULL;
|
2012-11-19 02:42:18 +01:00
|
|
|
|
2017-10-05 15:50:56 +02:00
|
|
|
s = g_ascii_strdown(cpu_model, -1);
|
|
|
|
if (strcmp(s, "any") == 0) {
|
|
|
|
oc = object_class_by_name(TYPE_SH7750R_CPU);
|
|
|
|
goto out;
|
2012-11-19 02:42:18 +01:00
|
|
|
}
|
|
|
|
|
2017-10-05 15:50:56 +02:00
|
|
|
typename = g_strdup_printf(SUPERH_CPU_TYPE_NAME("%s"), s);
|
|
|
|
oc = object_class_by_name(typename);
|
|
|
|
if (oc != NULL && object_class_is_abstract(oc)) {
|
|
|
|
oc = NULL;
|
2012-11-19 02:42:18 +01:00
|
|
|
}
|
|
|
|
|
2017-10-05 15:50:56 +02:00
|
|
|
out:
|
|
|
|
g_free(s);
|
|
|
|
g_free(typename);
|
2012-11-19 02:42:18 +01:00
|
|
|
return oc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sh7750r_cpu_initfn(Object *obj)
|
|
|
|
{
|
|
|
|
SuperHCPU *cpu = SUPERH_CPU(obj);
|
|
|
|
CPUSH4State *env = &cpu->env;
|
|
|
|
|
|
|
|
env->id = SH_CPU_SH7750R;
|
|
|
|
env->features = SH_FEATURE_BCR3_AND_BCR4;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sh7750r_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
SuperHCPUClass *scc = SUPERH_CPU_CLASS(oc);
|
|
|
|
|
2012-11-20 16:15:47 +01:00
|
|
|
scc->pvr = 0x00050000;
|
|
|
|
scc->prr = 0x00000100;
|
|
|
|
scc->cvr = 0x00110000;
|
2012-11-19 02:42:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void sh7751r_cpu_initfn(Object *obj)
|
|
|
|
{
|
|
|
|
SuperHCPU *cpu = SUPERH_CPU(obj);
|
|
|
|
CPUSH4State *env = &cpu->env;
|
|
|
|
|
|
|
|
env->id = SH_CPU_SH7751R;
|
|
|
|
env->features = SH_FEATURE_BCR3_AND_BCR4;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sh7751r_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
SuperHCPUClass *scc = SUPERH_CPU_CLASS(oc);
|
|
|
|
|
2012-11-20 16:15:47 +01:00
|
|
|
scc->pvr = 0x04050005;
|
|
|
|
scc->prr = 0x00000113;
|
|
|
|
scc->cvr = 0x00110000; /* Neutered caches, should be 0x20480000 */
|
2012-11-19 02:42:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void sh7785_cpu_initfn(Object *obj)
|
|
|
|
{
|
|
|
|
SuperHCPU *cpu = SUPERH_CPU(obj);
|
|
|
|
CPUSH4State *env = &cpu->env;
|
|
|
|
|
|
|
|
env->id = SH_CPU_SH7785;
|
|
|
|
env->features = SH_FEATURE_SH4A;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sh7785_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
SuperHCPUClass *scc = SUPERH_CPU_CLASS(oc);
|
|
|
|
|
2012-11-20 16:15:47 +01:00
|
|
|
scc->pvr = 0x10300700;
|
|
|
|
scc->prr = 0x00000200;
|
|
|
|
scc->cvr = 0x71440211;
|
2012-11-19 02:42:18 +01:00
|
|
|
}
|
|
|
|
|
2012-04-23 18:16:02 +02:00
|
|
|
static void superh_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
|
{
|
2013-07-27 02:53:25 +02:00
|
|
|
CPUState *cs = CPU(dev);
|
2012-04-23 18:16:02 +02:00
|
|
|
SuperHCPUClass *scc = SUPERH_CPU_GET_CLASS(dev);
|
2016-10-20 13:26:03 +02:00
|
|
|
Error *local_err = NULL;
|
|
|
|
|
|
|
|
cpu_exec_realizefn(cs, &local_err);
|
|
|
|
if (local_err != NULL) {
|
|
|
|
error_propagate(errp, local_err);
|
|
|
|
return;
|
|
|
|
}
|
2012-04-23 18:16:02 +02:00
|
|
|
|
2013-07-27 02:53:25 +02:00
|
|
|
cpu_reset(cs);
|
|
|
|
qemu_init_vcpu(cs);
|
2012-04-23 18:16:02 +02:00
|
|
|
|
|
|
|
scc->parent_realize(dev, errp);
|
|
|
|
}
|
|
|
|
|
2012-04-13 02:32:12 +02:00
|
|
|
static void superh_cpu_initfn(Object *obj)
|
|
|
|
{
|
2013-01-17 12:13:41 +01:00
|
|
|
CPUState *cs = CPU(obj);
|
2012-04-13 02:32:12 +02:00
|
|
|
SuperHCPU *cpu = SUPERH_CPU(obj);
|
|
|
|
CPUSH4State *env = &cpu->env;
|
|
|
|
|
2013-01-17 12:13:41 +01:00
|
|
|
cs->env_ptr = env;
|
2012-04-13 02:32:12 +02:00
|
|
|
|
|
|
|
env->movcal_backup_tail = &(env->movcal_backup);
|
|
|
|
}
|
|
|
|
|
2013-01-20 19:32:33 +01:00
|
|
|
static const VMStateDescription vmstate_sh_cpu = {
|
|
|
|
.name = "cpu",
|
|
|
|
.unmigratable = 1,
|
|
|
|
};
|
|
|
|
|
2012-02-11 17:26:17 +01:00
|
|
|
static void superh_cpu_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
2013-01-20 19:32:33 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
2012-02-11 17:26:17 +01:00
|
|
|
CPUClass *cc = CPU_CLASS(oc);
|
|
|
|
SuperHCPUClass *scc = SUPERH_CPU_CLASS(oc);
|
|
|
|
|
2012-04-23 18:16:02 +02:00
|
|
|
scc->parent_realize = dc->realize;
|
|
|
|
dc->realize = superh_cpu_realizefn;
|
|
|
|
|
2012-02-11 17:26:17 +01:00
|
|
|
scc->parent_reset = cc->reset;
|
|
|
|
cc->reset = superh_cpu_reset;
|
2013-01-20 19:32:33 +01:00
|
|
|
|
2012-11-19 02:42:18 +01:00
|
|
|
cc->class_by_name = superh_cpu_class_by_name;
|
2013-08-25 18:53:55 +02:00
|
|
|
cc->has_work = superh_cpu_has_work;
|
2013-02-02 10:57:51 +01:00
|
|
|
cc->do_interrupt = superh_cpu_do_interrupt;
|
2014-09-13 18:45:23 +02:00
|
|
|
cc->cpu_exec_interrupt = superh_cpu_exec_interrupt;
|
2013-05-27 01:33:50 +02:00
|
|
|
cc->dump_state = superh_cpu_dump_state;
|
2013-06-21 19:09:18 +02:00
|
|
|
cc->set_pc = superh_cpu_set_pc;
|
2013-06-28 19:31:32 +02:00
|
|
|
cc->synchronize_from_tb = superh_cpu_synchronize_from_tb;
|
2013-06-29 04:18:45 +02:00
|
|
|
cc->gdb_read_register = superh_cpu_gdb_read_register;
|
|
|
|
cc->gdb_write_register = superh_cpu_gdb_write_register;
|
2013-08-26 03:01:33 +02:00
|
|
|
#ifdef CONFIG_USER_ONLY
|
|
|
|
cc->handle_mmu_fault = superh_cpu_handle_mmu_fault;
|
|
|
|
#else
|
2017-05-01 23:20:43 +02:00
|
|
|
cc->do_unaligned_access = superh_cpu_do_unaligned_access;
|
2013-06-29 18:55:54 +02:00
|
|
|
cc->get_phys_page_debug = superh_cpu_get_phys_page_debug;
|
|
|
|
#endif
|
2015-07-12 04:00:03 +02:00
|
|
|
cc->disas_set_info = superh_cpu_disas_set_info;
|
2017-10-16 04:02:42 +02:00
|
|
|
cc->tcg_initialize = sh4_translate_init;
|
2015-07-12 04:00:03 +02:00
|
|
|
|
2013-06-28 23:18:47 +02:00
|
|
|
cc->gdb_num_core_regs = 59;
|
qdev: Protect device-list-properties against broken devices
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 commit f4eb32b "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 commit ef52358 "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>
2015-10-01 10:59:58 +02:00
|
|
|
|
2015-07-12 04:00:03 +02:00
|
|
|
dc->vmsd = &vmstate_sh_cpu;
|
2012-02-11 17:26:17 +01:00
|
|
|
}
|
|
|
|
|
2017-10-05 15:50:55 +02:00
|
|
|
#define DEFINE_SUPERH_CPU_TYPE(type_name, cinit, initfn) \
|
|
|
|
{ \
|
|
|
|
.name = type_name, \
|
|
|
|
.parent = TYPE_SUPERH_CPU, \
|
|
|
|
.class_init = cinit, \
|
|
|
|
.instance_init = initfn, \
|
|
|
|
}
|
|
|
|
static const TypeInfo superh_cpu_type_infos[] = {
|
|
|
|
{
|
|
|
|
.name = TYPE_SUPERH_CPU,
|
|
|
|
.parent = TYPE_CPU,
|
|
|
|
.instance_size = sizeof(SuperHCPU),
|
|
|
|
.instance_init = superh_cpu_initfn,
|
|
|
|
.abstract = true,
|
|
|
|
.class_size = sizeof(SuperHCPUClass),
|
|
|
|
.class_init = superh_cpu_class_init,
|
|
|
|
},
|
|
|
|
DEFINE_SUPERH_CPU_TYPE(TYPE_SH7750R_CPU, sh7750r_class_init,
|
|
|
|
sh7750r_cpu_initfn),
|
|
|
|
DEFINE_SUPERH_CPU_TYPE(TYPE_SH7751R_CPU, sh7751r_class_init,
|
|
|
|
sh7751r_cpu_initfn),
|
|
|
|
DEFINE_SUPERH_CPU_TYPE(TYPE_SH7785_CPU, sh7785_class_init,
|
|
|
|
sh7785_cpu_initfn),
|
2012-02-11 17:26:17 +01:00
|
|
|
|
2017-10-05 15:50:55 +02:00
|
|
|
};
|
2012-02-11 17:26:17 +01:00
|
|
|
|
2017-10-05 15:50:55 +02:00
|
|
|
DEFINE_TYPES(superh_cpu_type_infos)
|