[PATCH for-6.2 0/6] qom: Fix broken OBJECT_CHECK usage

[PATCH for-6.2 0/6] qom: Fix broken OBJECT_CHECK usage

[Eduardo Habkost]

This series removes some broken OBJECT_CHECK macros and fix cases
where OBJECT_CHECK is being used directly in the code.

Eduardo Habkost (6):
  acpi: Delete broken ACPI_GED_X86 macro
  sbsa_gwdt: Delete broken SBSA_*CLASS macros
  s390-sclp-events-bus: Set instance_size
  s390-sclp-events-bus: Use OBJECT_DECLARE_SIMPLE_TYPE
  s390x: event-facility: Use SCLP_EVENT_BUS macro
  Use PCI_HOST_BRIDGE macro

 include/hw/acpi/generic_event_device.h | 2 --
 include/hw/watchdog/sbsa_gwdt.h        | 4 ----
 hw/i386/acpi-build.c                   | 8 ++------
 hw/pci-host/i440fx.c                   | 4 +---
 hw/s390x/event-facility.c              | 4 +++-
 5 files changed, 6 insertions(+), 16 deletions(-)

-- 
2.31.1

[PATCH for-6.2 1/6] acpi: Delete broken ACPI_GED_X86 macro

[Eduardo Habkost]

The macro never worked and never will, because the
AcpiGedX86State type never existed.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: qemu-devel@nongnu.org
---
 include/hw/acpi/generic_event_device.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
index 6bed92e8fc5..d49217c445f 100644
--- a/include/hw/acpi/generic_event_device.h
+++ b/include/hw/acpi/generic_event_device.h
@@ -70,8 +70,6 @@
 OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)
 
 #define TYPE_ACPI_GED_X86 "acpi-ged-x86"
-#define ACPI_GED_X86(obj) \
-    OBJECT_CHECK(AcpiGedX86State, (obj), TYPE_ACPI_GED_X86)
 
 #define ACPI_GED_EVT_SEL_OFFSET    0x0
 #define ACPI_GED_EVT_SEL_LEN       0x4
-- 
2.31.1

[PATCH for-6.2 2/6] sbsa_gwdt: Delete broken SBSA_*CLASS macros

[Eduardo Habkost]

Those macros never worked and never will, because the
SBSA_GWDTClass type never existed.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Shashi Mallela <shashi.mallela@linaro.org>
---
 include/hw/watchdog/sbsa_gwdt.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/hw/watchdog/sbsa_gwdt.h b/include/hw/watchdog/sbsa_gwdt.h
index 70b137de301..dcb13bc29dc 100644
--- a/include/hw/watchdog/sbsa_gwdt.h
+++ b/include/hw/watchdog/sbsa_gwdt.h
@@ -19,10 +19,6 @@
 #define TYPE_WDT_SBSA "sbsa_gwdt"
 #define SBSA_GWDT(obj) \
     OBJECT_CHECK(SBSA_GWDTState, (obj), TYPE_WDT_SBSA)
-#define SBSA_GWDT_CLASS(klass) \
-    OBJECT_CLASS_CHECK(SBSA_GWDTClass, (klass), TYPE_WDT_SBSA)
-#define SBSA_GWDT_GET_CLASS(obj) \
-    OBJECT_GET_CLASS(SBSA_GWDTClass, (obj), TYPE_WDT_SBSA)
 
 /* SBSA Generic Watchdog register definitions */
 /* refresh frame */
-- 
2.31.1

[PATCH for-6.2 3/6] s390-sclp-events-bus: Set instance_size

[Eduardo Habkost]

We have a SCLPEventsBus struct defined, but the struct is not
used at the TypeInfo definition.  This works today but will break
silently if anybody adds a new field to SCLPEventsBus.

Set instance_size properly to avoid problems in the future.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: qemu-s390x@nongnu.org
Cc: qemu-devel@nongnu.org
---
 hw/s390x/event-facility.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index ed92ce510d9..0a65e16cdd9 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -332,6 +332,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
 static const TypeInfo sclp_events_bus_info = {
     .name = TYPE_SCLP_EVENTS_BUS,
     .parent = TYPE_BUS,
+    .instance_size = sizeof(SCLPEventsBus),
 };
 
 static void command_handler(SCLPEventFacility *ef, SCCB *sccb, uint64_t code)
-- 
2.31.1

[PATCH for-6.2 4/6] s390-sclp-events-bus: Use OBJECT_DECLARE_SIMPLE_TYPE

[Eduardo Habkost]

We have a SCLPEventsBus struct type defined, but no QOM type
checkers are declared for the type.

Use OBJECT_DECLARE_SIMPLE_TYPE to declare the struct type and
have a SCLP_EVENT_BUS typecast wrapper defined.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Thomas Huth <thuth@redhat.com>
Cc: qemu-s390x@nongnu.org
Cc: qemu-devel@nongnu.org
---
 hw/s390x/event-facility.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 0a65e16cdd9..9f7883d6e20 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -328,6 +328,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
 /* qemu object creation and initialization functions */
 
 #define TYPE_SCLP_EVENTS_BUS "s390-sclp-events-bus"
+OBJECT_DECLARE_SIMPLE_TYPE(SCLPEventsBus, SCLP_EVENT_BUS)
 
 static const TypeInfo sclp_events_bus_info = {
     .name = TYPE_SCLP_EVENTS_BUS,
-- 
2.31.1

[PATCH for-6.2 5/6] s390x: event-facility: Use SCLP_EVENT_BUS macro

[Eduardo Habkost]

Use the SCLP_EVENT_BUS macro instead of manually calling
OBJECT_CHECK.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: qemu-s390x@nongnu.org
Cc: qemu-devel@nongnu.org
---
 hw/s390x/event-facility.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 9f7883d6e20..bc706bd19b4 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -532,7 +532,7 @@ BusState *sclp_get_event_facility_bus(void)
     SCLPEventsBus *sbus;
 
     busobj = object_resolve_path_type("", TYPE_SCLP_EVENTS_BUS, NULL);
-    sbus = OBJECT_CHECK(SCLPEventsBus, busobj, TYPE_SCLP_EVENTS_BUS);
+    sbus = SCLP_EVENT_BUS(busobj);
     if (!sbus) {
         return NULL;
     }
-- 
2.31.1

[PATCH for-6.2 6/6] Use PCI_HOST_BRIDGE macro

[Eduardo Habkost]

OBJECT_CHECK(PciHostState, ..., TYPE_PCI_HOST_BRIDGE) is exactly
what the PCI_HOST_BRIDGE macro does.  We can just use the macro
instead of using OBJECT_CHECK manually.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Cc: qemu-devel@nongnu.org
---
 hw/i386/acpi-build.c | 8 ++------
 hw/pci-host/i440fx.c | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index a33ac8b91e1..3c6bbb1beb3 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -303,13 +303,9 @@ Object *acpi_get_i386_pci_host(void)
 {
     PCIHostState *host;
 
-    host = OBJECT_CHECK(PCIHostState,
-                        object_resolve_path("/machine/i440fx", NULL),
-                        TYPE_PCI_HOST_BRIDGE);
+    host = PCI_HOST_BRIDGE(object_resolve_path("/machine/i440fx", NULL));
     if (!host) {
-        host = OBJECT_CHECK(PCIHostState,
-                            object_resolve_path("/machine/q35", NULL),
-                            TYPE_PCI_HOST_BRIDGE);
+        host = PCI_HOST_BRIDGE(object_resolve_path("/machine/q35", NULL));
     }
 
     return OBJECT(host);
diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
index 28c9bae8994..cd87e21a9b2 100644
--- a/hw/pci-host/i440fx.c
+++ b/hw/pci-host/i440fx.c
@@ -316,9 +316,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type,
 
 PCIBus *find_i440fx(void)
 {
-    PCIHostState *s = OBJECT_CHECK(PCIHostState,
-                                   object_resolve_path("/machine/i440fx", NULL),
-                                   TYPE_PCI_HOST_BRIDGE);
+    PCIHostState *s = PCI_HOST_BRIDGE(object_resolve_path("/machine/i440fx", NULL));
     return s ? s->bus : NULL;
 }
 
-- 
2.31.1

Re: [PATCH for-6.2 4/6] s390-sclp-events-bus: Use OBJECT_DECLARE_SIMPLE_TYPE

[Eduardo Habkost]

On Thu, Aug 05, 2021 at 03:34:29PM -0400, Eduardo Habkost wrote:
> We have a SCLPEventsBus struct type defined, but no QOM type
> checkers are declared for the type.
> 
> Use OBJECT_DECLARE_SIMPLE_TYPE to declare the struct type and
> have a SCLP_EVENT_BUS typecast wrapper defined.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
>  hw/s390x/event-facility.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
> index 0a65e16cdd9..9f7883d6e20 100644
> --- a/hw/s390x/event-facility.c
> +++ b/hw/s390x/event-facility.c
> @@ -328,6 +328,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
>  /* qemu object creation and initialization functions */
>  
>  #define TYPE_SCLP_EVENTS_BUS "s390-sclp-events-bus"
> +OBJECT_DECLARE_SIMPLE_TYPE(SCLPEventsBus, SCLP_EVENT_BUS)

Oops, a typo (should be SCLP_EVENTS_BUS instead).  I will submit
v2 later as a standalone patch.

-- 
Eduardo

[PATCH for-6.2 v2] s390-sclp-events-bus: Use OBJECT_DECLARE_SIMPLE_TYPE

[Eduardo Habkost]

We have a SCLPEventsBus struct type defined, but no QOM type
checkers are declared for the type.

Use OBJECT_DECLARE_SIMPLE_TYPE to declare the struct type and
have a SCLP_EVENT_BUS typecast wrapper defined.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Changes v1 -> v2:
* v1 was previously submitted as part of series:
  [PATCH for-6.2 0/6] qom: Fix broken OBJECT_CHECK usage
  at https://lore.kernel.org/qemu-devel/20210805193431.307761-5-ehabkost@redhat.com
* Fix typo (s/SCLP_EVENT_BUS/SCLP_EVENTS_BUS/)

Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Thomas Huth <thuth@redhat.com>
Cc: qemu-s390x@nongnu.org
Cc: qemu-devel@nongnu.org
---
 hw/s390x/event-facility.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index ed92ce510d9..4bfd0b194b4 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -328,6 +328,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
 /* qemu object creation and initialization functions */
 
 #define TYPE_SCLP_EVENTS_BUS "s390-sclp-events-bus"
+OBJECT_DECLARE_SIMPLE_TYPE(SCLPEventsBus, SCLP_EVENTS_BUS)
 
 static const TypeInfo sclp_events_bus_info = {
     .name = TYPE_SCLP_EVENTS_BUS,
-- 
2.31.1

Re: [PATCH for-6.2 v2] s390-sclp-events-bus: Use OBJECT_DECLARE_SIMPLE_TYPE

[Thomas Huth]

On 06/08/2021 04.46, Eduardo Habkost wrote:
> We have a SCLPEventsBus struct type defined, but no QOM type
> checkers are declared for the type.
> 
> Use OBJECT_DECLARE_SIMPLE_TYPE to declare the struct type and
> have a SCLP_EVENT_BUS typecast wrapper defined.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Changes v1 -> v2:
> * v1 was previously submitted as part of series:
>    [PATCH for-6.2 0/6] qom: Fix broken OBJECT_CHECK usage
>    at https://lore.kernel.org/qemu-devel/20210805193431.307761-5-ehabkost@redhat.com
> * Fix typo (s/SCLP_EVENT_BUS/SCLP_EVENTS_BUS/)
> 
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
>   hw/s390x/event-facility.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
> index ed92ce510d9..4bfd0b194b4 100644
> --- a/hw/s390x/event-facility.c
> +++ b/hw/s390x/event-facility.c
> @@ -328,6 +328,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
>   /* qemu object creation and initialization functions */
>   
>   #define TYPE_SCLP_EVENTS_BUS "s390-sclp-events-bus"
> +OBJECT_DECLARE_SIMPLE_TYPE(SCLPEventsBus, SCLP_EVENTS_BUS)
>   
>   static const TypeInfo sclp_events_bus_info = {
>       .name = TYPE_SCLP_EVENTS_BUS,
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH for-6.2 5/6] s390x: event-facility: Use SCLP_EVENT_BUS macro

[Thomas Huth]

On 05/08/2021 21.34, Eduardo Habkost wrote:
> Use the SCLP_EVENT_BUS macro instead of manually calling
> OBJECT_CHECK.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
>   hw/s390x/event-facility.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
> index 9f7883d6e20..bc706bd19b4 100644
> --- a/hw/s390x/event-facility.c
> +++ b/hw/s390x/event-facility.c
> @@ -532,7 +532,7 @@ BusState *sclp_get_event_facility_bus(void)
>       SCLPEventsBus *sbus;
>   
>       busobj = object_resolve_path_type("", TYPE_SCLP_EVENTS_BUS, NULL);
> -    sbus = OBJECT_CHECK(SCLPEventsBus, busobj, TYPE_SCLP_EVENTS_BUS);
> +    sbus = SCLP_EVENT_BUS(busobj);
>       if (!sbus) {
>           return NULL;
>       }
> 

I think this could be merged with the previous patch. Anyway:
Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH for-6.2 3/6] s390-sclp-events-bus: Set instance_size

[Thomas Huth]

On 05/08/2021 21.34, Eduardo Habkost wrote:
> We have a SCLPEventsBus struct defined, but the struct is not
> used at the TypeInfo definition.  This works today but will break
> silently if anybody adds a new field to SCLPEventsBus.
> 
> Set instance_size properly to avoid problems in the future.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
>   hw/s390x/event-facility.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
> index ed92ce510d9..0a65e16cdd9 100644
> --- a/hw/s390x/event-facility.c
> +++ b/hw/s390x/event-facility.c
> @@ -332,6 +332,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
>   static const TypeInfo sclp_events_bus_info = {
>       .name = TYPE_SCLP_EVENTS_BUS,
>       .parent = TYPE_BUS,
> +    .instance_size = sizeof(SCLPEventsBus),
>   };
>   
>   static void command_handler(SCLPEventFacility *ef, SCCB *sccb, uint64_t code)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH for-6.2 v2] s390-sclp-events-bus: Use OBJECT_DECLARE_SIMPLE_TYPE

[David Hildenbrand]

On 06.08.21 04:46, Eduardo Habkost wrote:
> We have a SCLPEventsBus struct type defined, but no QOM type
> checkers are declared for the type.
> 
> Use OBJECT_DECLARE_SIMPLE_TYPE to declare the struct type and
> have a SCLP_EVENT_BUS typecast wrapper defined.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Changes v1 -> v2:
> * v1 was previously submitted as part of series:
>    [PATCH for-6.2 0/6] qom: Fix broken OBJECT_CHECK usage
>    at https://lore.kernel.org/qemu-devel/20210805193431.307761-5-ehabkost@redhat.com
> * Fix typo (s/SCLP_EVENT_BUS/SCLP_EVENTS_BUS/)
> 
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
>   hw/s390x/event-facility.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
> index ed92ce510d9..4bfd0b194b4 100644
> --- a/hw/s390x/event-facility.c
> +++ b/hw/s390x/event-facility.c
> @@ -328,6 +328,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
>   /* qemu object creation and initialization functions */
>   
>   #define TYPE_SCLP_EVENTS_BUS "s390-sclp-events-bus"
> +OBJECT_DECLARE_SIMPLE_TYPE(SCLPEventsBus, SCLP_EVENTS_BUS)
>   
>   static const TypeInfo sclp_events_bus_info = {
>       .name = TYPE_SCLP_EVENTS_BUS,
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David / dhildenb

Re: [PATCH for-6.2 5/6] s390x: event-facility: Use SCLP_EVENT_BUS macro

[David Hildenbrand]

On 06.08.21 06:15, Thomas Huth wrote:
> On 05/08/2021 21.34, Eduardo Habkost wrote:
>> Use the SCLP_EVENT_BUS macro instead of manually calling
>> OBJECT_CHECK.
>>
>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>> ---
>> Cc: Cornelia Huck <cohuck@redhat.com>
>> Cc: Thomas Huth <thuth@redhat.com>
>> Cc: Halil Pasic <pasic@linux.ibm.com>
>> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
>> Cc: Richard Henderson <richard.henderson@linaro.org>
>> Cc: David Hildenbrand <david@redhat.com>
>> Cc: qemu-s390x@nongnu.org
>> Cc: qemu-devel@nongnu.org
>> ---
>>    hw/s390x/event-facility.c | 2 +-
>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
>> index 9f7883d6e20..bc706bd19b4 100644
>> --- a/hw/s390x/event-facility.c
>> +++ b/hw/s390x/event-facility.c
>> @@ -532,7 +532,7 @@ BusState *sclp_get_event_facility_bus(void)
>>        SCLPEventsBus *sbus;
>>    
>>        busobj = object_resolve_path_type("", TYPE_SCLP_EVENTS_BUS, NULL);
>> -    sbus = OBJECT_CHECK(SCLPEventsBus, busobj, TYPE_SCLP_EVENTS_BUS);
>> +    sbus = SCLP_EVENT_BUS(busobj);
>>        if (!sbus) {
>>            return NULL;
>>        }
>>
> 
> I think this could be merged with the previous patch. Anyway:
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 

+1

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David / dhildenb

Re: [PATCH for-6.2 3/6] s390-sclp-events-bus: Set instance_size

[David Hildenbrand]

On 05.08.21 21:34, Eduardo Habkost wrote:
> We have a SCLPEventsBus struct defined, but the struct is not
> used at the TypeInfo definition.  This works today but will break
> silently if anybody adds a new field to SCLPEventsBus.
> 
> Set instance_size properly to avoid problems in the future.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
>   hw/s390x/event-facility.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
> index ed92ce510d9..0a65e16cdd9 100644
> --- a/hw/s390x/event-facility.c
> +++ b/hw/s390x/event-facility.c
> @@ -332,6 +332,7 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
>   static const TypeInfo sclp_events_bus_info = {
>       .name = TYPE_SCLP_EVENTS_BUS,
>       .parent = TYPE_BUS,
> +    .instance_size = sizeof(SCLPEventsBus),
>   };
>   
>   static void command_handler(SCLPEventFacility *ef, SCCB *sccb, uint64_t code)
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David / dhildenb

Re: [PATCH for-6.2 1/6] acpi: Delete broken ACPI_GED_X86 macro

[Igor Mammedov]

On Thu,  5 Aug 2021 15:34:26 -0400
Eduardo Habkost <ehabkost@redhat.com> wrote:

> The macro never worked and never will, because the
> AcpiGedX86State type never existed.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: qemu-devel@nongnu.org
> ---
>  include/hw/acpi/generic_event_device.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/include/hw/acpi/generic_event_device.h b/include/hw/acpi/generic_event_device.h
> index 6bed92e8fc5..d49217c445f 100644
> --- a/include/hw/acpi/generic_event_device.h
> +++ b/include/hw/acpi/generic_event_device.h
> @@ -70,8 +70,6 @@
>  OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, ACPI_GED)
>  
>  #define TYPE_ACPI_GED_X86 "acpi-ged-x86"
> -#define ACPI_GED_X86(obj) \
> -    OBJECT_CHECK(AcpiGedX86State, (obj), TYPE_ACPI_GED_X86)
>  
>  #define ACPI_GED_EVT_SEL_OFFSET    0x0
>  #define ACPI_GED_EVT_SEL_LEN       0x4

Re: [PATCH for-6.2 6/6] Use PCI_HOST_BRIDGE macro

[Igor Mammedov]

On Thu,  5 Aug 2021 15:34:31 -0400
Eduardo Habkost <ehabkost@redhat.com> wrote:

> OBJECT_CHECK(PciHostState, ..., TYPE_PCI_HOST_BRIDGE) is exactly
> what the PCI_HOST_BRIDGE macro does.  We can just use the macro
> instead of using OBJECT_CHECK manually.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
> Cc: "Michael S. Tsirkin" <mst@redhat.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
> Cc: qemu-devel@nongnu.org
> ---
>  hw/i386/acpi-build.c | 8 ++------
>  hw/pci-host/i440fx.c | 4 +---
>  2 files changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index a33ac8b91e1..3c6bbb1beb3 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -303,13 +303,9 @@ Object *acpi_get_i386_pci_host(void)
>  {
>      PCIHostState *host;
>  
> -    host = OBJECT_CHECK(PCIHostState,
> -                        object_resolve_path("/machine/i440fx", NULL),
> -                        TYPE_PCI_HOST_BRIDGE);
> +    host = PCI_HOST_BRIDGE(object_resolve_path("/machine/i440fx", NULL));
>      if (!host) {
> -        host = OBJECT_CHECK(PCIHostState,
> -                            object_resolve_path("/machine/q35", NULL),
> -                            TYPE_PCI_HOST_BRIDGE);
> +        host = PCI_HOST_BRIDGE(object_resolve_path("/machine/q35", NULL));
>      }
>      return OBJECT(host);
> diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
> index 28c9bae8994..cd87e21a9b2 100644
> --- a/hw/pci-host/i440fx.c
> +++ b/hw/pci-host/i440fx.c
> @@ -316,9 +316,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type,
>  
>  PCIBus *find_i440fx(void)
>  {
> -    PCIHostState *s = OBJECT_CHECK(PCIHostState,
> -                                   object_resolve_path("/machine/i440fx", NULL),
> -                                   TYPE_PCI_HOST_BRIDGE);
> +    PCIHostState *s = PCI_HOST_BRIDGE(object_resolve_path("/machine/i440fx", NULL));
>      return s ? s->bus : NULL;
>  }
>  

Re: [PATCH for-6.2 3/6] s390-sclp-events-bus: Set instance_size

[Cornelia Huck]

On Thu, Aug 05 2021, Eduardo Habkost <ehabkost@redhat.com> wrote:

> We have a SCLPEventsBus struct defined, but the struct is not
> used at the TypeInfo definition.  This works today but will break
> silently if anybody adds a new field to SCLPEventsBus.
>
> Set instance_size properly to avoid problems in the future.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
>  hw/s390x/event-facility.c | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

(I assume that you'll queue the whole series yourself? Or should we pick
the s390x parts separately?)

Re: [PATCH for-6.2 v2] s390-sclp-events-bus: Use OBJECT_DECLARE_SIMPLE_TYPE

[Cornelia Huck]

On Thu, Aug 05 2021, Eduardo Habkost <ehabkost@redhat.com> wrote:

> We have a SCLPEventsBus struct type defined, but no QOM type
> checkers are declared for the type.
>
> Use OBJECT_DECLARE_SIMPLE_TYPE to declare the struct type and
> have a SCLP_EVENT_BUS typecast wrapper defined.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> Changes v1 -> v2:
> * v1 was previously submitted as part of series:
>   [PATCH for-6.2 0/6] qom: Fix broken OBJECT_CHECK usage
>   at https://lore.kernel.org/qemu-devel/20210805193431.307761-5-ehabkost@redhat.com
> * Fix typo (s/SCLP_EVENT_BUS/SCLP_EVENTS_BUS/)
>
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Cornelia Huck <cohuck@redhat.com>
> Cc: Halil Pasic <pasic@linux.ibm.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: qemu-s390x@nongnu.org
> Cc: qemu-devel@nongnu.org
> ---
>  hw/s390x/event-facility.c | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Re: [PATCH for-6.2 5/6] s390x: event-facility: Use SCLP_EVENT_BUS macro

[Cornelia Huck]

On Fri, Aug 06 2021, David Hildenbrand <david@redhat.com> wrote:

> On 06.08.21 06:15, Thomas Huth wrote:
>> On 05/08/2021 21.34, Eduardo Habkost wrote:
>>> Use the SCLP_EVENT_BUS macro instead of manually calling
>>> OBJECT_CHECK.
>>>
>>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>>> ---
>>> Cc: Cornelia Huck <cohuck@redhat.com>
>>> Cc: Thomas Huth <thuth@redhat.com>
>>> Cc: Halil Pasic <pasic@linux.ibm.com>
>>> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
>>> Cc: Richard Henderson <richard.henderson@linaro.org>
>>> Cc: David Hildenbrand <david@redhat.com>
>>> Cc: qemu-s390x@nongnu.org
>>> Cc: qemu-devel@nongnu.org
>>> ---
>>>    hw/s390x/event-facility.c | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>> I think this could be merged with the previous patch. Anyway:
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>> 
>
> +1
>
> Reviewed-by: David Hildenbrand <david@redhat.com>

+1 :)

Reviewed-by: Cornelia Huck <cohuck@redhat.com>

Re: [PATCH for-6.2 1/6] acpi: Delete broken ACPI_GED_X86 macro

[Gerd Hoffmann]

On Thu, Aug 05, 2021 at 03:34:26PM -0400, Eduardo Habkost wrote:
> The macro never worked and never will, because the
> AcpiGedX86State type never existed.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

> -#define ACPI_GED_X86(obj) \
> -    OBJECT_CHECK(AcpiGedX86State, (obj), TYPE_ACPI_GED_X86)

Oops.  Leftover from an earlier patch revision where the struct did
actually exist.  Thanks for cleaning up.

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

take care,
  Gerd