[v1] PS2 device QOMification - part 2

[PATCH 04/40] pl050: introduce new PL050_KBD_DEVICE QOM type

Posted by Mark Cave-Ayland 3 years, 7 months ago

This will be soon be used to hold the underlying PS2_KBD_DEVICE object.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/input/pl050.c         | 3 ++-
 include/hw/input/pl050.h | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/hw/input/pl050.c b/hw/input/pl050.c
index 0d91b0eaea..7f4ac99081 100644
--- a/hw/input/pl050.c
+++ b/hw/input/pl050.c
@@ -182,9 +182,10 @@ static void pl050_mouse_init(Object *obj)
 }
 
 static const TypeInfo pl050_kbd_info = {
-    .name          = "pl050_keyboard",
+    .name          = TYPE_PL050_KBD_DEVICE,
     .parent        = TYPE_PL050,
     .instance_init = pl050_kbd_init,
+    .instance_size = sizeof(PL050KbdState),
 };
 
 static const TypeInfo pl050_mouse_info = {
diff --git a/include/hw/input/pl050.h b/include/hw/input/pl050.h
index c1f6c5a1fb..9ce8794bd0 100644
--- a/include/hw/input/pl050.h
+++ b/include/hw/input/pl050.h
@@ -32,4 +32,11 @@ struct PL050State {
     bool is_mouse;
 };
 
+#define TYPE_PL050_KBD_DEVICE "pl050_keyboard"
+OBJECT_DECLARE_SIMPLE_TYPE(PL050KbdState, PL050_KBD_DEVICE)
+
+struct PL050KbdState {
+    PL050State parent_obj;
+};
+
 #endif
-- 
2.30.2

Re: [PATCH 04/40] pl050: introduce new PL050_KBD_DEVICE QOM type

Posted by Peter Maydell 3 years, 7 months ago

On Wed, 29 Jun 2022 at 13:40, Mark Cave-Ayland
<mark.cave-ayland@ilande.co.uk> wrote:
>
> This will be soon be used to hold the underlying PS2_KBD_DEVICE object.
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> ---
>  hw/input/pl050.c         | 3 ++-
>  include/hw/input/pl050.h | 7 +++++++
>  2 files changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/hw/input/pl050.c b/hw/input/pl050.c
> index 0d91b0eaea..7f4ac99081 100644
> --- a/hw/input/pl050.c
> +++ b/hw/input/pl050.c
> @@ -182,9 +182,10 @@ static void pl050_mouse_init(Object *obj)
>  }
>
>  static const TypeInfo pl050_kbd_info = {
> -    .name          = "pl050_keyboard",
> +    .name          = TYPE_PL050_KBD_DEVICE,
>      .parent        = TYPE_PL050,
>      .instance_init = pl050_kbd_init,
> +    .instance_size = sizeof(PL050KbdState),
>  };

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM