This makes it clearer that the pointer is a reference to the LASIPS2 container device rather than an implied part of the QOM hierarchy.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> --- hw/input/lasips2.c | 6 +++--- include/hw/input/lasips2.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index 5ceb38c1af..0f392e2bee 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -222,7 +222,7 @@ static uint64_t lasips2_reg_read(void *opaque, hwaddr addr, unsigned size) } } - if (port->parent->int_status) { + if (port->lasips2->int_status) { ret |= LASIPS2_STATUS_CMPINTR; } break; @@ -368,7 +368,7 @@ static void lasips2_kbd_port_init(Object *obj) memory_region_init_io(&lp->reg, obj, &lasips2_reg_ops, lp, "lasips2-kbd", 0x100); lp->id = 0; - lp->parent = container_of(s, LASIPS2State, kbd_port); + lp->lasips2 = container_of(s, LASIPS2State, kbd_port); } static void lasips2_kbd_port_class_init(ObjectClass *klass, void *data) @@ -405,7 +405,7 @@ static void lasips2_mouse_port_init(Object *obj) memory_region_init_io(&lp->reg, obj, &lasips2_reg_ops, lp, "lasips2-mouse", 0x100); lp->id = 1; - lp->parent = container_of(s, LASIPS2State, mouse_port); + lp->lasips2 = container_of(s, LASIPS2State, mouse_port); } static void lasips2_mouse_port_class_init(ObjectClass *klass, void *data) diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h index 7199f16622..9fe9e63a66 100644 --- a/include/hw/input/lasips2.h +++ b/include/hw/input/lasips2.h @@ -37,7 +37,7 @@ typedef struct LASIPS2State LASIPS2State; struct LASIPS2Port { DeviceState parent_obj; - LASIPS2State *parent; + LASIPS2State *lasips2; MemoryRegion reg; PS2State *ps2dev; uint8_t id; -- 2.30.2