qom: Consolidate OBJECT_{DEFINE|DECLARE}_SIMPLE_TYPE*

[PATCH 9/9] ui/console-vc: Consolidate OBJECT_DEFINE_SIMPLE_TYPE

Zhao Liu posted 9 patches 6 months ago

Download mbox

Maintainers: Paolo Bonzini <pbonzini@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Magnus Damm <magnus.damm@gmail.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>, Nicholas Piggin <npiggin@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Peter Maydell <peter.maydell@linaro.org>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Richard Henderson <richard.henderson@linaro.org>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Thomas Huth <thuth@redhat.com>

Expand all Fold all

[PATCH 9/9] ui/console-vc: Consolidate OBJECT_DEFINE_SIMPLE_TYPE

Posted by Zhao Liu 6 months ago

The QOM types of QemuTextConsole and QemuFixedTextConsole are declared
by OBJECT_DECLARE_SIMPLE_TYPE, which means they don't need the class!

Therefore, use OBJECT_DEFINE_SIMPLE_TYPE to implement the type, then
there's no need for class definition.

Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
 ui/console-vc.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/ui/console-vc.c b/ui/console-vc.c
index 830842064d69..1b2c6951c275 100644
--- a/ui/console-vc.c
+++ b/ui/console-vc.c
@@ -70,17 +70,19 @@ typedef struct QemuTextConsole {
     Fifo8 out_fifo;
 } QemuTextConsole;
 
-typedef QemuConsoleClass QemuTextConsoleClass;
-
-OBJECT_DEFINE_TYPE(QemuTextConsole, qemu_text_console, QEMU_TEXT_CONSOLE, QEMU_CONSOLE)
+OBJECT_DEFINE_SIMPLE_TYPE(QemuTextConsole,
+                          qemu_text_console,
+                          QEMU_TEXT_CONSOLE,
+                          QEMU_CONSOLE)
 
 typedef struct QemuFixedTextConsole {
     QemuTextConsole parent;
 } QemuFixedTextConsole;
 
-typedef QemuTextConsoleClass QemuFixedTextConsoleClass;
-
-OBJECT_DEFINE_TYPE(QemuFixedTextConsole, qemu_fixed_text_console, QEMU_FIXED_TEXT_CONSOLE, QEMU_TEXT_CONSOLE)
+OBJECT_DEFINE_SIMPLE_TYPE(QemuFixedTextConsole,
+                          qemu_fixed_text_console,
+                          QEMU_FIXED_TEXT_CONSOLE,
+                          QEMU_TEXT_CONSOLE)
 
 struct VCChardev {
     Chardev parent;
-- 
2.34.1

Re: [PATCH 9/9] ui/console-vc: Consolidate OBJECT_DEFINE_SIMPLE_TYPE

Posted by Philippe Mathieu-Daudé 6 months ago

On 14/5/25 10:49, Zhao Liu wrote:
> The QOM types of QemuTextConsole and QemuFixedTextConsole are declared
> by OBJECT_DECLARE_SIMPLE_TYPE, which means they don't need the class!
> 
> Therefore, use OBJECT_DEFINE_SIMPLE_TYPE to implement the type, then
> there's no need for class definition.
> 
> Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
> Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
> ---
>   ui/console-vc.c | 14 ++++++++------
>   1 file changed, 8 insertions(+), 6 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>