| Message ID | 20200608160044.15531-19-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/qdev: Warn when using pre-qdev/QOM devices | expand |
On 08/06/20 18:00, Philippe Mathieu-Daudé wrote: > This code hasn't been QOM'ified yet. Warn the user. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/input/ps2.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/hw/input/ps2.c b/hw/input/ps2.c > index f8746d2f52..0d84061cae 100644 > --- a/hw/input/ps2.c > +++ b/hw/input/ps2.c > @@ -30,7 +30,7 @@ > #include "ui/input.h" > #include "sysemu/reset.h" > #include "sysemu/runstate.h" > - > +#include "hw/qdev-deprecated.h" > #include "trace.h" > > /* debug PC keyboard */ > @@ -1136,6 +1136,8 @@ void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg) > { > PS2KbdState *s = (PS2KbdState *)g_malloc0(sizeof(PS2KbdState)); > > + qdev_warn_deprecated_function_used(); > + > trace_ps2_kbd_init(s); > s->common.update_irq = update_irq; > s->common.update_arg = update_arg; > @@ -1158,6 +1160,8 @@ void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg) > { > PS2MouseState *s = (PS2MouseState *)g_malloc0(sizeof(PS2MouseState)); > > + qdev_warn_deprecated_function_used(); > + > trace_ps2_mouse_init(s); > s->common.update_irq = update_irq; > s->common.update_arg = update_arg; > While the keyboard and mouse are not QOM-ified, of the controllers (i8042, lasips2, pl050) only lasips2 is not. I would warn there. Paolo
diff --git a/hw/input/ps2.c b/hw/input/ps2.c index f8746d2f52..0d84061cae 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -30,7 +30,7 @@ #include "ui/input.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" - +#include "hw/qdev-deprecated.h" #include "trace.h" /* debug PC keyboard */ @@ -1136,6 +1136,8 @@ void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg) { PS2KbdState *s = (PS2KbdState *)g_malloc0(sizeof(PS2KbdState)); + qdev_warn_deprecated_function_used(); + trace_ps2_kbd_init(s); s->common.update_irq = update_irq; s->common.update_arg = update_arg; @@ -1158,6 +1160,8 @@ void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg) { PS2MouseState *s = (PS2MouseState *)g_malloc0(sizeof(PS2MouseState)); + qdev_warn_deprecated_function_used(); + trace_ps2_mouse_init(s); s->common.update_irq = update_irq; s->common.update_arg = update_arg;
This code hasn't been QOM'ified yet. Warn the user. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/input/ps2.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)