haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

vmmouse: replace PROP_PTR with PROP_LINK

Browse source 
While at it, use the expected type.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-10-17 17:06:05 +02:00
parent 0ed40f16a1
commit 0fe4bb3241
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/i386/pc.c
View file

@ -1156,9 +1156,9 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
vmmouse = NULL; vmmouse = NULL;
} }
if (vmmouse) { if (vmmouse) {
DeviceState *dev = DEVICE(vmmouse); object_property_set_link(OBJECT(vmmouse), OBJECT(i8042),
qdev_prop_set_ptr(dev, "ps2_mouse", i8042); "i8042", &error_abort);
qdev_init_nofail(dev); qdev_init_nofail(DEVICE(vmmouse));
} }
port92 = isa_create_simple(isa_bus, TYPE_PORT92); port92 = isa_create_simple(isa_bus, TYPE_PORT92);

8
hw/i386/vmmouse.c
View file

@ -66,7 +66,7 @@ typedef struct VMMouseState
uint16_t status; uint16_t status;
uint8_t absolute; uint8_t absolute;
QEMUPutMouseEntry *entry; QEMUPutMouseEntry *entry;
void *ps2_mouse; ISAKBDState *i8042;
} VMMouseState; } VMMouseState;
static uint32_t vmmouse_get_status(VMMouseState *s) static uint32_t vmmouse_get_status(VMMouseState *s)
@ -105,7 +105,7 @@ static void vmmouse_mouse_event(void *opaque, int x, int y, int dz, int buttons_
/* need to still generate PS2 events to notify driver to /* need to still generate PS2 events to notify driver to
read from queue */ read from queue */
i8042_isa_mouse_fake_event(s->ps2_mouse); i8042_isa_mouse_fake_event(s->i8042);
} }
static void vmmouse_remove_handler(VMMouseState *s) static void vmmouse_remove_handler(VMMouseState *s)
@ -275,7 +275,7 @@ static void vmmouse_realizefn(DeviceState *dev, Error **errp)
} }
static Property vmmouse_properties[] = { static Property vmmouse_properties[] = {
DEFINE_PROP_PTR("ps2_mouse", VMMouseState, ps2_mouse), DEFINE_PROP_LINK("i8042", VMMouseState, i8042, TYPE_I8042, ISAKBDState *),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
@ -287,8 +287,6 @@ static void vmmouse_class_initfn(ObjectClass *klass, void *data)
dc->reset = vmmouse_reset; dc->reset = vmmouse_reset;
dc->vmsd = &vmstate_vmmouse; dc->vmsd = &vmstate_vmmouse;
dc->props = vmmouse_properties; dc->props = vmmouse_properties;
/* Reason: pointer property "ps2_mouse" */
dc->user_creatable = false;
} }
static const TypeInfo vmmouse_info = { static const TypeInfo vmmouse_info = {

8
hw/input/pckbd.c
View file

@ -482,17 +482,15 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042) #define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)
typedef struct ISAKBDState { struct ISAKBDState {
ISADevice parent_obj; ISADevice parent_obj;
KBDState kbd; KBDState kbd;
MemoryRegion io[2]; MemoryRegion io[2];
} ISAKBDState; };
void i8042_isa_mouse_fake_event(void *opaque) void i8042_isa_mouse_fake_event(ISAKBDState *isa)
{ {
ISADevice *dev = opaque;
ISAKBDState *isa = I8042(dev);
KBDState *s = &isa->kbd; KBDState *s = &isa->kbd;
ps2_mouse_fake_event(s->mouse); ps2_mouse_fake_event(s->mouse);

4
include/hw/input/i8042.h
View file

@ -14,10 +14,12 @@
#define I8042_A20_LINE "a20" #define I8042_A20_LINE "a20"
typedef struct ISAKBDState ISAKBDState;
void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
MemoryRegion *region, ram_addr_t size, MemoryRegion *region, ram_addr_t size,
hwaddr mask); hwaddr mask);
void i8042_isa_mouse_fake_event(void *opaque); void i8042_isa_mouse_fake_event(ISAKBDState *isa);
void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out); void i8042_setup_a20_line(ISADevice *dev, qemu_irq a20_out);
#endif /* HW_INPUT_I8042_H */ #endif /* HW_INPUT_I8042_H */