SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lasips2: remove the qdev base property and the lasips2_properties array

Browse Source 
The base property was only needed for use by vmstate_register() in order to
preserve migration compatibility. Now that the lasips2 migration state is
registered through the DeviceClass vmsd field, the base property and also
the lasips2_properties array can be removed completely as they are no longer
required.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tested-by: Helge Deller <deller@gmx.de>
Acked-by: Helge Deller <deller@gmx.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220712215251.7944-14-mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Mark Cave-Ayland 2022-07-12 22:52:24 +01:00
parent 17b8013acb
commit 4040ee5bdd
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/hppa/machine.c
View File

@ -280,8 +280,7 @@ static void machine_hppa_init(MachineState *machine)
} }
/* PS/2 Keyboard/Mouse */ /* PS/2 Keyboard/Mouse */
dev = DEVICE(lasips2_initfn(LASI_PS2KBD_HPA, dev = DEVICE(lasips2_initfn(qdev_get_gpio_in(lasi_dev,
qdev_get_gpio_in(lasi_dev,
LASI_IRQ_PS2KBD_HPA))); LASI_IRQ_PS2KBD_HPA)));
memory_region_add_subregion(addr_space, LASI_PS2KBD_HPA, memory_region_add_subregion(addr_space, LASI_PS2KBD_HPA,
sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), sysbus_mmio_get_region(SYS_BUS_DEVICE(dev),

9
hw/input/lasips2.c
View File

@ -255,12 +255,11 @@ static void lasips2_set_mouse_irq(void *opaque, int n, int level)
lasips2_update_irq(port->parent); lasips2_update_irq(port->parent);
} }
LASIPS2State *lasips2_initfn(hwaddr base, qemu_irq irq) LASIPS2State *lasips2_initfn(qemu_irq irq)
{ {
DeviceState *dev; DeviceState *dev;
dev = qdev_new(TYPE_LASIPS2); dev = qdev_new(TYPE_LASIPS2);
qdev_prop_set_uint64(dev, "base", base);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
@ -307,18 +306,12 @@ static void lasips2_init(Object *obj)
"ps2-mouse-input-irq", 1); "ps2-mouse-input-irq", 1);
} }
static Property lasips2_properties[] = {
DEFINE_PROP_UINT64("base", LASIPS2State, base, UINT64_MAX),
DEFINE_PROP_END_OF_LIST(),
};
static void lasips2_class_init(ObjectClass *klass, void *data) static void lasips2_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
dc->realize = lasips2_realize; dc->realize = lasips2_realize;
dc->vmsd = &vmstate_lasips2; dc->vmsd = &vmstate_lasips2;
device_class_set_props(dc, lasips2_properties);
set_bit(DEVICE_CATEGORY_INPUT, dc->categories); set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
} }

3
include/hw/input/lasips2.h
View File

@ -39,7 +39,6 @@ typedef struct LASIPS2Port {
struct LASIPS2State { struct LASIPS2State {
SysBusDevice parent_obj; SysBusDevice parent_obj;
hwaddr base;
LASIPS2Port kbd; LASIPS2Port kbd;
LASIPS2Port mouse; LASIPS2Port mouse;
qemu_irq irq; qemu_irq irq;
@ -48,6 +47,6 @@ struct LASIPS2State {
#define TYPE_LASIPS2 "lasips2" #define TYPE_LASIPS2 "lasips2"
OBJECT_DECLARE_SIMPLE_TYPE(LASIPS2State, LASIPS2) OBJECT_DECLARE_SIMPLE_TYPE(LASIPS2State, LASIPS2)
LASIPS2State *lasips2_initfn(hwaddr base, qemu_irq irq); LASIPS2State *lasips2_initfn(qemu_irq irq);
#endif /* HW_INPUT_LASIPS2_H */ #endif /* HW_INPUT_LASIPS2_H */