ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

armv7m: Forward idau property to CPU object 

Create an "idau" property on the armv7m container object which
we can forward to the CPU object. Annoyingly, we can't use
object_property_add_alias() because the CPU object we want to
forward to doesn't exist until the armv7m container is realized.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20180220180325.29818-6-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-03-02 10:45:36 +00:00
parent 181962fd69
commit c60c1b0d5a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/arm/armv7m.c
View File

@ -19,6 +19,7 @@
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "target/arm/idau.h"
/* Bitbanded IO. Each word corresponds to a single bit. */ /* Bitbanded IO. Each word corresponds to a single bit. */
@ -162,6 +163,13 @@ static void armv7m_realize(DeviceState *dev, Error **errp)
object_property_set_link(OBJECT(s->cpu), OBJECT(&s->container), "memory", object_property_set_link(OBJECT(s->cpu), OBJECT(&s->container), "memory",
&error_abort); &error_abort);
if (object_property_find(OBJECT(s->cpu), "idau", NULL)) {
object_property_set_link(OBJECT(s->cpu), s->idau, "idau", &err);
if (err != NULL) {
error_propagate(errp, err);
return;
}
}
object_property_set_bool(OBJECT(s->cpu), true, "realized", &err); object_property_set_bool(OBJECT(s->cpu), true, "realized", &err);
if (err != NULL) { if (err != NULL) {
error_propagate(errp, err); error_propagate(errp, err);
@ -217,6 +225,7 @@ static Property armv7m_properties[] = {
DEFINE_PROP_STRING("cpu-type", ARMv7MState, cpu_type), DEFINE_PROP_STRING("cpu-type", ARMv7MState, cpu_type),
DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION, DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION,
MemoryRegion *), MemoryRegion *),
DEFINE_PROP_LINK("idau", ARMv7MState, idau, TYPE_IDAU_INTERFACE, Object *),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };

3
include/hw/arm/armv7m.h
View File

@ -12,6 +12,7 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/intc/armv7m_nvic.h" #include "hw/intc/armv7m_nvic.h"
#include "target/arm/idau.h"
#define TYPE_BITBAND "ARM,bitband-memory" #define TYPE_BITBAND "ARM,bitband-memory"
#define BITBAND(obj) OBJECT_CHECK(BitBandState, (obj), TYPE_BITBAND) #define BITBAND(obj) OBJECT_CHECK(BitBandState, (obj), TYPE_BITBAND)
@ -40,6 +41,7 @@ typedef struct {
* + Property "memory": MemoryRegion defining the physical address space * + Property "memory": MemoryRegion defining the physical address space
* that CPU accesses see. (The NVIC, bitbanding and other CPU-internal * that CPU accesses see. (The NVIC, bitbanding and other CPU-internal
* devices will be automatically layered on top of this view.) * devices will be automatically layered on top of this view.)
* + Property "idau": IDAU interface (forwarded to CPU object)
*/ */
typedef struct ARMv7MState { typedef struct ARMv7MState {
/*< private >*/ /*< private >*/
@ -58,6 +60,7 @@ typedef struct ARMv7MState {
char *cpu_type; char *cpu_type;
/* MemoryRegion the board provides to us (with its devices, RAM, etc) */ /* MemoryRegion the board provides to us (with its devices, RAM, etc) */
MemoryRegion *board_memory; MemoryRegion *board_memory;
Object *idau;
} ARMv7MState; } ARMv7MState;
#endif #endif