Skip to contentSkip to conversation

hw/isa/superio: Clean suspicious QOM types

PATCH In review Philippe Mathieu-Daudé 2 participants 4 messages Aug 22, 2020 – Aug 26, 2020

lore
Share & tools
lore
#0 lore raw

v2 cover hw/isa/superio: Clean suspicious QOM types

Fix SuperI/O QOM issues reported here:
https://www.mail-archive.com/[email protected]/msg731954.html

Supersedes: <[email protected]>

Eduardo Habkost (1):
hw/isa/superio: Do not enforce class_size when inherited from parent

Philippe Mathieu-Daudé (1):
hw/isa/superio: Set abstract TYPE_ISA_SUPERIO instance size

 hw/isa/isa-superio.c       | 2 +-
 hw/isa/smc37c669-superio.c | 2 --
 hw/isa/vt82c686.c          | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 1/2 hw/isa/superio: Set abstract TYPE_ISA_SUPERIO instance size

Instead of setting the instance size on each implementations, set it on the abstract parent, so we are sure no implementation will forget to set it.

---
 hw/isa/isa-superio.c       | 2 +-
 hw/isa/smc37c669-superio.c | 1 -
 hw/isa/vt82c686.c          | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)
hw/isa/isa-superio.c +1 -1
index e2e47d8fd99..83eb21ebb2a 100644
@@ -182,6 +182,7 @@ static const TypeInfo isa_superio_type_info = {
     .name = TYPE_ISA_SUPERIO,
     .parent = TYPE_ISA_DEVICE,
     .abstract = true,
+    .instance_size = sizeof(ISASuperIODevice),
     .class_size = sizeof(ISASuperIOClass),
     .class_init = isa_superio_class_init,
 };
@@ -200,7 +201,6 @@ static void fdc37m81x_class_init(ObjectClass *klass, void *data)
 static const TypeInfo fdc37m81x_type_info = {
     .name          = TYPE_FDC37M81X_SUPERIO,
     .parent        = TYPE_ISA_SUPERIO,
-    .instance_size = sizeof(ISASuperIODevice),
     .class_init    = fdc37m81x_class_init,
 };
 
hw/isa/smc37c669-superio.c +0 -1
index 18287741cb4..9e59dc16039 100644
@@ -103,7 +103,6 @@ static void smc37c669_class_init(ObjectClass *klass, void *data)
 static const TypeInfo smc37c669_type_info = {
     .name          = TYPE_SMC37C669_SUPERIO,
     .parent        = TYPE_ISA_SUPERIO,
-    .instance_size = sizeof(ISASuperIODevice),
     .class_size    = sizeof(ISASuperIOClass),
     .class_init    = smc37c669_class_init,
 };
hw/isa/vt82c686.c +0 -1
index 18160ca445d..a4b84d405d0 100644
@@ -533,7 +533,6 @@ static void vt82c686b_superio_class_init(ObjectClass *klass, void *data)
 static const TypeInfo via_superio_info = {
     .name          = TYPE_VT82C686B_SUPERIO,
     .parent        = TYPE_ISA_SUPERIO,
-    .instance_size = sizeof(ISASuperIODevice),
     .class_size    = sizeof(ISASuperIOClass),
     .class_init    = vt82c686b_superio_class_init,
 };
Signature · 1 line
2.26.2
Reviewed-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] hw/isa/superio: Set abstract TYPE_ISA_SUPERIO instance size

Quoted 6 lines · Philippe Mathieu-Daudé

Instead of setting the instance size on each implementations, set it on the abstract parent, so we are sure no implementation will forget to set it.

Thanks!

Quoted 53 lines
---
 hw/isa/isa-superio.c       | 2 +-
 hw/isa/smc37c669-superio.c | 1 -
 hw/isa/vt82c686.c          | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)
hw/isa/isa-superio.c +1 -1
index e2e47d8fd99..83eb21ebb2a 100644
@@ -182,6 +182,7 @@ static const TypeInfo isa_superio_type_info = {
     .name = TYPE_ISA_SUPERIO,
     .parent = TYPE_ISA_DEVICE,
     .abstract = true,
+    .instance_size = sizeof(ISASuperIODevice),
     .class_size = sizeof(ISASuperIOClass),
     .class_init = isa_superio_class_init,
 };
@@ -200,7 +201,6 @@ static void fdc37m81x_class_init(ObjectClass *klass, void *data)
 static const TypeInfo fdc37m81x_type_info = {
     .name          = TYPE_FDC37M81X_SUPERIO,
     .parent        = TYPE_ISA_SUPERIO,
-    .instance_size = sizeof(ISASuperIODevice),
     .class_init    = fdc37m81x_class_init,
 };
 
hw/isa/smc37c669-superio.c +0 -1
index 18287741cb4..9e59dc16039 100644
@@ -103,7 +103,6 @@ static void smc37c669_class_init(ObjectClass *klass, void *data)
 static const TypeInfo smc37c669_type_info = {
     .name          = TYPE_SMC37C669_SUPERIO,
     .parent        = TYPE_ISA_SUPERIO,
-    .instance_size = sizeof(ISASuperIODevice),
     .class_size    = sizeof(ISASuperIOClass),
     .class_init    = smc37c669_class_init,
 };
hw/isa/vt82c686.c +0 -1
index 18160ca445d..a4b84d405d0 100644
@@ -533,7 +533,6 @@ static void vt82c686b_superio_class_init(ObjectClass *klass, void *data)
 static const TypeInfo via_superio_info = {
     .name          = TYPE_VT82C686B_SUPERIO,
     .parent        = TYPE_ISA_SUPERIO,
-    .instance_size = sizeof(ISASuperIODevice),
     .class_size    = sizeof(ISASuperIOClass),
     .class_init    = vt82c686b_superio_class_init,
 };
Signature · 1 line
2.26.2
Signature · 1 line
Eduardo
#3 lore raw

PATCH v2 2/2 hw/isa/superio: Do not enforce class_size when inherited from parent

In reply to Philippe Mathieu-Daudé

From: Eduardo Habkost <[email protected]>

When a class inherits from an abstract parent, its class_size is already initialized to its parent size. If the class is not extended, it is pointless to set the class_size field again.

---
 hw/isa/smc37c669-superio.c | 1 -
 hw/isa/vt82c686.c          | 1 -
 2 files changed, 2 deletions(-)
hw/isa/smc37c669-superio.c +0 -1
index 9e59dc16039..18cdc641e13 100644
@@ -103,7 +103,6 @@ static void smc37c669_class_init(ObjectClass *klass, void *data)
 static const TypeInfo smc37c669_type_info = {
     .name          = TYPE_SMC37C669_SUPERIO,
     .parent        = TYPE_ISA_SUPERIO,
-    .class_size    = sizeof(ISASuperIOClass),
     .class_init    = smc37c669_class_init,
 };
 
hw/isa/vt82c686.c +0 -1
index a4b84d405d0..49f2b21cebe 100644
@@ -533,7 +533,6 @@ static void vt82c686b_superio_class_init(ObjectClass *klass, void *data)
 static const TypeInfo via_superio_info = {
     .name          = TYPE_VT82C686B_SUPERIO,
     .parent        = TYPE_ISA_SUPERIO,
-    .class_size    = sizeof(ISASuperIOClass),
     .class_init    = vt82c686b_superio_class_init,
 };
 
Signature · 1 line
2.26.2