Received: from eggs.gnu.org ([2001:4830:134:3::10]:41470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aP9QJ-0003cx-Uj for qemu-devel@nongnu.org; Fri, 29 Jan 2016 08:49:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aP9QI-0001Kl-LB for qemu-devel@nongnu.org; Fri, 29 Jan 2016 08:49:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aP9QI-0001KX-EP for qemu-devel@nongnu.org; Fri, 29 Jan 2016 08:49:14 -0500 From: Eric Blake Date: Fri, 29 Jan 2016 06:48:53 -0700 Message-Id: <1454075341-13658-18-git-send-email-eblake@redhat.com> In-Reply-To: <1454075341-13658-1-git-send-email-eblake@redhat.com> References: <1454075341-13658-1-git-send-email-eblake@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v10 17/25] qom: Use typedef for Visitor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , "Michael S. Tsirkin" , armbru@redhat.com, Paolo Bonzini , marcandre.lureau@redhat.com, Jiri Slaby , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson No need to repeat 'struct Visitor' when we already have it in typedefs.h. Omitting the redundant 'struct' also makes a later patch easier to search for all object property callbacks that are associated with a Visitor. Signed-off-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau --- v10: no change v9: no change v8: new patch --- include/qom/object.h | 9 ++++----- hw/misc/edu.c | 4 ++-- hw/virtio/virtio-balloon.c | 6 +++--- qom/object.c | 4 ++-- target-i386/cpu.c | 4 ++-- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/include/qom/object.h b/include/qom/object.h index d0dafe9..3e7e99d 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -18,10 +18,9 @@ #include #include #include "qemu/queue.h" +#include "qemu/typedefs.h" #include "qapi/error.h" -struct Visitor; - struct TypeImpl; typedef struct TypeImpl *Type; @@ -298,7 +297,7 @@ typedef struct InterfaceInfo InterfaceInfo; * Called when trying to get/set a property. */ typedef void (ObjectPropertyAccessor)(Object *obj, - struct Visitor *v, + Visitor *v, void *opaque, const char *name, Error **errp); @@ -1025,7 +1024,7 @@ void object_unparent(Object *obj); * * Reads a property from a object. */ -void object_property_get(Object *obj, struct Visitor *v, const char *nam= e, +void object_property_get(Object *obj, Visitor *v, const char *name, Error **errp); /** @@ -1161,7 +1160,7 @@ void object_property_get_uint16List(Object *obj, co= nst char *name, * * Writes a property to a object. */ -void object_property_set(Object *obj, struct Visitor *v, const char *nam= e, +void object_property_set(Object *obj, Visitor *v, const char *name, Error **errp); /** diff --git a/hw/misc/edu.c b/hw/misc/edu.c index 43d5b18..a7171eb 100644 --- a/hw/misc/edu.c +++ b/hw/misc/edu.c @@ -362,8 +362,8 @@ static void pci_edu_uninit(PCIDevice *pdev) timer_del(&edu->dma_timer); } -static void edu_obj_uint64(Object *obj, struct Visitor *v, void *opaque, - const char *name, Error **errp) +static void edu_obj_uint64(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { uint64_t *val =3D opaque; diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index ba1d393..02e2bb9 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -110,7 +110,7 @@ static void balloon_stats_poll_cb(void *opaque) virtio_notify(vdev, s->svq); } -static void balloon_stats_get_all(Object *obj, struct Visitor *v, +static void balloon_stats_get_all(Object *obj, Visitor *v, void *opaque, const char *name, Error = **errp) { Error *err =3D NULL; @@ -148,7 +148,7 @@ out: error_propagate(errp, err); } -static void balloon_stats_get_poll_interval(Object *obj, struct Visitor = *v, +static void balloon_stats_get_poll_interval(Object *obj, Visitor *v, void *opaque, const char *na= me, Error **errp) { @@ -156,7 +156,7 @@ static void balloon_stats_get_poll_interval(Object *o= bj, struct Visitor *v, visit_type_int(v, &s->stats_poll_interval, name, errp); } -static void balloon_stats_set_poll_interval(Object *obj, struct Visitor = *v, +static void balloon_stats_set_poll_interval(Object *obj, Visitor *v, void *opaque, const char *na= me, Error **errp) { diff --git a/qom/object.c b/qom/object.c index 5ff97ab..4d7d8c8 100644 --- a/qom/object.c +++ b/qom/object.c @@ -2184,7 +2184,7 @@ typedef struct { char *target_name; } AliasProperty; -static void property_get_alias(Object *obj, struct Visitor *v, void *opa= que, +static void property_get_alias(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { AliasProperty *prop =3D opaque; @@ -2192,7 +2192,7 @@ static void property_get_alias(Object *obj, struct = Visitor *v, void *opaque, object_property_get(prop->target_obj, v, prop->target_name, errp); } -static void property_set_alias(Object *obj, struct Visitor *v, void *opa= que, +static void property_set_alias(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { AliasProperty *prop =3D opaque; diff --git a/target-i386/cpu.c b/target-i386/cpu.c index b255644..60bfa80 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2945,7 +2945,7 @@ typedef struct BitProperty { } BitProperty; static void x86_cpu_get_bit_prop(Object *obj, - struct Visitor *v, + Visitor *v, void *opaque, const char *name, Error **errp) @@ -2956,7 +2956,7 @@ static void x86_cpu_get_bit_prop(Object *obj, } static void x86_cpu_set_bit_prop(Object *obj, - struct Visitor *v, + Visitor *v, void *opaque, const char *name, Error **errp) --=20 2.5.0