From patchwork Fri Jan 29 13:48:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 8163381 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 225BA9F38B for ; Fri, 29 Jan 2016 13:53:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 643082038A for ; Fri, 29 Jan 2016 13:53:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 78A8720221 for ; Fri, 29 Jan 2016 13:53:19 +0000 (UTC) Received: from localhost ([::1]:34249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aP9UE-0002Tf-So for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Jan 2016 08:53:18 -0500 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 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 0DD488E220; Fri, 29 Jan 2016 13:49:13 +0000 (UTC) Received: from red.redhat.com (ovpn-113-130.phx2.redhat.com [10.3.113.130]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0TDn5FR019157; Fri, 29 Jan 2016 08:49:13 -0500 From: Eric Blake To: qemu-devel@nongnu.org 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 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 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 Subject: [Qemu-devel] [PATCH v10 17/25] qom: Use typedef for Visitor X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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é 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 *name, +void object_property_get(Object *obj, Visitor *v, const char *name, Error **errp); /** @@ -1161,7 +1160,7 @@ void object_property_get_uint16List(Object *obj, const char *name, * * Writes a property to a object. */ -void object_property_set(Object *obj, struct Visitor *v, const char *name, +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 = 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 = 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 *name, Error **errp) { @@ -156,7 +156,7 @@ static void balloon_stats_get_poll_interval(Object *obj, 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 *name, 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 *opaque, +static void property_get_alias(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { AliasProperty *prop = 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 *opaque, +static void property_set_alias(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { AliasProperty *prop = 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)