[v1] qom: Automated conversion of type checking boilerplate

[PATCH 12/41] virtio-ccw: Fix definition of VIRTIO_CCW_BUS_GET_CLASS

Eduardo Habkost posted 41 patches 5 years, 5 months ago

Diff against v2 v3 v4
Download mbox

Maintainers: Michael Rolnik <mrolnik@gmail.com>, Li Zhijian <lizhijian@cn.fujitsu.com>, Colin Xu <colin.xu@intel.com>, Alberto Garcia <berto@igalia.com>, Juan Quintela <quintela@redhat.com>, Paul Burton <pburton@wavecomp.com>, Andrew Baumann <Andrew.Baumann@microsoft.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, David Gibson <david@gibson.dropbear.id.au>, Eric Farman <farman@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Fam Zheng <fam@euphon.net>, Samuel Thibault <samuel.thibault@ens-lyon.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Hannes Reinecke <hare@suse.com>, Anthony Perard <anthony.perard@citrix.com>, Anup Patel <anup.patel@wdc.com>, Ben Warren <ben@skyportsystems.com>, BALATON Zoltan <balaton@eik.bme.hu>, Christian Borntraeger <borntraeger@de.ibm.com>, Stefan Hajnoczi <stefanha@redhat.com>, Wenchao Wang <wenchao.wang@intel.com>, Magnus Damm <magnus.damm@gmail.com>, Peter Chubb <peter.chubb@nicta.com.au>, Igor Mammedov <imammedo@redhat.com>, Jan Kiszka <jan.kiszka@web.de>, Greg Kurz <groug@kaod.org>, Richard Henderson <rth@twiddle.net>, "Hervé Poussineau" <hpoussin@reactos.org>, Peter Xu <peterx@redhat.com>, Sagar Karandikar <sagark@eecs.berkeley.edu>, Eduardo Habkost <ehabkost@redhat.com>, "Cédric Le Goater" <clg@kaod.org>, Michael Walle <michael@walle.cc>, Beniamino Galvani <b.galvani@gmail.com>, Rob Herring <robh@kernel.org>, Tony Krowiak <akrowiak@linux.ibm.com>, "Alex Bennée" <alex.bennee@linaro.org>, Antony Pavlov <antonynpavlov@gmail.com>, Jason Wang <jasowang@redhat.com>, Guan Xuetao <gxt@mprc.pku.edu.cn>, Jiaxun Yang <jiaxun.yang@flygoat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, Christian Schoenebeck <qemu_oss@crudebyte.com>, Jiri Pirko <jiri@resnulli.us>, Xiao Guangrong <xiaoguangrong.eric@gmail.com>, Max Reitz <mreitz@redhat.com>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, Andrey Smirnov <andrew.smirnov@gmail.com>, Subbaraya Sundeep <sundeep.lkml@gmail.com>, Thomas Huth <huth@tuxfamily.org>, Radoslaw Biernacki <rad@semihalf.com>, Leif Lindholm <leif@nuviainc.com>, Igor Mitsyanko <i.mitsyanko@gmail.com>, Kevin Wolf <kwolf@redhat.com>, Keith Busch <kbusch@kernel.org>, Thomas Huth <thuth@redhat.com>, Anthony Green <green@moxielogic.com>, Amit Shah <amit@kernel.org>, Marek Vasut <marex@denx.de>, Aurelien Jarno <aurelien@aurel32.net>, Pavel Dovgalyuk <pavel.dovgaluk@ispras.ru>, Yuval Shaia <yuval.shaia.ml@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Artyom Tarasenko <atar4qemu@gmail.com>, Max Filippov <jcmvbkbc@gmail.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Sarah Harris <S.E.Harris@kent.ac.uk>, Gerd Hoffmann <kraxel@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, John Snow <jsnow@redhat.com>, Zhang Chen <chen.zhang@intel.com>, "Michael S. Tsirkin" <mst@redhat.com>, Helge Deller <deller@gmx.de>, Matthew Rosato <mjrosato@linux.ibm.com>, Sergio Lopez <slp@redhat.com>, Huacai Chen <chenhc@lemote.com>, Andrew Jeffery <andrew@aj.id.au>, Laurent Vivier <laurent@vivier.eu>, Paul Durrant <paul@xen.org>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Sven Schnelle <svens@stackframe.org>, Stefan Berger <stefanb@linux.ibm.com>, Peter Maydell <peter.maydell@linaro.org>, Joel Stanley <joel@jms.id.au>, Jean-Christophe Dubois <jcd@tribudubois.net>, Cornelia Huck <cohuck@redhat.com>, Stafford Horne <shorne@gmail.com>, Raphael Norwitz <raphael.norwitz@nutanix.com>, Laurent Vivier <lvivier@redhat.com>, Alex Williamson <alex.williamson@redhat.com>, Eric Auger <eric.auger@redhat.com>, Fabien Chouteau <chouteau@adacore.com>, Roman Bolshakov <r.bolshakov@yadro.com>, Cameron Esfahani <dirty@apple.com>, Stefano Stabellini <sstabellini@kernel.org>, Corey Minyard <cminyard@mvista.com>, "Gonglei (Arei)" <arei.gonglei@huawei.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, David Hildenbrand <david@redhat.com>, KONRAD Frederic <frederic.konrad@adacore.com>, Andrzej Zaborowski <balrogg@gmail.com>, Jiri Slaby <jslaby@suse.cz>, Sunil Muthuswamy <sunilmut@microsoft.com>, Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>, Chris Wulff <crwulff@gmail.com>, Pierre Morel <pmorel@linux.ibm.com>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Alistair Francis <alistair@alistair23.me>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Alistair Francis <Alistair.Francis@wdc.com>, Laszlo Ersek <lersek@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Niek Linnenbank <nieklinnenbank@gmail.com>, Palmer Dabbelt <palmer@dabbelt.com>

There is a newer version of this series

Expand all Fold all

[PATCH 12/41] virtio-ccw: Fix definition of VIRTIO_CCW_BUS_GET_CLASS

Posted by Eduardo Habkost 5 years, 5 months ago

The macro was incorrectly defined using OBJECT_CHECK.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 hw/s390x/virtio-ccw.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h
index c0e3355248..b281896f7d 100644
--- a/hw/s390x/virtio-ccw.h
+++ b/hw/s390x/virtio-ccw.h
@@ -65,9 +65,9 @@ typedef struct VirtioBusClass VirtioCcwBusClass;
 
 #define TYPE_VIRTIO_CCW_BUS "virtio-ccw-bus"
 #define VIRTIO_CCW_BUS(obj) \
-     OBJECT_CHECK(VirtioCcwBus, (obj), TYPE_VIRTIO_CCW_BUS)
+     OBJECT_CHECK(VirtioCcwBusState, (obj), TYPE_VIRTIO_CCW_BUS)
 #define VIRTIO_CCW_BUS_GET_CLASS(obj) \
-    OBJECT_CHECK(VirtioCcwBusState, (obj), TYPE_VIRTIO_CCW_BUS)
+    OBJECT_GET_CLASS(VirtioCcwBusClass, (obj), TYPE_VIRTIO_CCW_BUS)
 #define VIRTIO_CCW_BUS_CLASS(klass) \
     OBJECT_CLASS_CHECK(VirtioCcwBusClass, klass, TYPE_VIRTIO_CCW_BUS)
 
-- 
2.26.2

Re: [PATCH 12/41] virtio-ccw: Fix definition of VIRTIO_CCW_BUS_GET_CLASS

Posted by Cornelia Huck 5 years, 5 months ago

On Thu, 13 Aug 2020 18:25:56 -0400
Eduardo Habkost <ehabkost@redhat.com> wrote:

> The macro was incorrectly defined using OBJECT_CHECK.
> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  hw/s390x/virtio-ccw.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h
> index c0e3355248..b281896f7d 100644
> --- a/hw/s390x/virtio-ccw.h
> +++ b/hw/s390x/virtio-ccw.h
> @@ -65,9 +65,9 @@ typedef struct VirtioBusClass VirtioCcwBusClass;
>  
>  #define TYPE_VIRTIO_CCW_BUS "virtio-ccw-bus"
>  #define VIRTIO_CCW_BUS(obj) \
> -     OBJECT_CHECK(VirtioCcwBus, (obj), TYPE_VIRTIO_CCW_BUS)
> +     OBJECT_CHECK(VirtioCcwBusState, (obj), TYPE_VIRTIO_CCW_BUS)
>  #define VIRTIO_CCW_BUS_GET_CLASS(obj) \
> -    OBJECT_CHECK(VirtioCcwBusState, (obj), TYPE_VIRTIO_CCW_BUS)
> +    OBJECT_GET_CLASS(VirtioCcwBusClass, (obj), TYPE_VIRTIO_CCW_BUS)
>  #define VIRTIO_CCW_BUS_CLASS(klass) \
>      OBJECT_CLASS_CHECK(VirtioCcwBusClass, klass, TYPE_VIRTIO_CCW_BUS)
>  

I was wondering why nobody ever noticed, but it seems that the broken
macros were simply unused. If we keep them for completeness' sake, we
should make sure that they are indeed correct :)

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

Re: [PATCH 12/41] virtio-ccw: Fix definition of VIRTIO_CCW_BUS_GET_CLASS

Posted by Daniel P. Berrangé 5 years, 5 months ago

On Thu, Aug 13, 2020 at 06:25:56PM -0400, Eduardo Habkost wrote:
> The macro was incorrectly defined using OBJECT_CHECK.

Nice demonstration of the benefit of removing this boilerplate
definition !

> 
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  hw/s390x/virtio-ccw.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|