[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/31] qom: Use typedef for Visitor
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 21/31] qom: Use typedef for Visitor |
Date: |
Tue, 9 Feb 2016 12:37:53 +0100 |
From: Eric Blake <address@hidden>
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 <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/misc/edu.c | 4 ++--
hw/virtio/virtio-balloon.c | 6 +++---
include/qom/object.h | 9 ++++-----
qom/object.c | 4 ++--
target-i386/cpu.c | 4 ++--
5 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/hw/misc/edu.c b/hw/misc/edu.c
index 2639c64..65e8f20 100644
--- a/hw/misc/edu.c
+++ b/hw/misc/edu.c
@@ -363,8 +363,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 06912bb..7d05d3f 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -113,7 +113,7 @@ static void balloon_stats_poll_cb(void *opaque)
s->stats_vq_elem = NULL;
}
-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;
@@ -151,7 +151,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)
{
@@ -159,7 +159,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/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 <stdint.h>
#include <stdbool.h>
#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/qom/object.c b/qom/object.c
index 5904081..3506a98 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -2185,7 +2185,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;
@@ -2193,7 +2193,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)
--
2.4.3
- [Qemu-devel] [PULL 16/31] qapi-visit: Kill unused visit_end_union(), (continued)
- [Qemu-devel] [PULL 16/31] qapi-visit: Kill unused visit_end_union(), Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 14/31] qapi: Improve generated event use of qapi visitor, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 17/31] qapi: Prefer type_int64 over type_int in visitors, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 27/31] qapi: Drop unused error argument for list and implicit struct, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 25/31] qapi: Drop unused 'kind' for struct/enum visit, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 23/31] qom: Swap 'name' next to visitor in ObjectPropertyAccessor, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 04/31] tests: Use Python 2.6 "except E as ..." syntax, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 22/31] qapi: Swap visit_* arguments for consistent 'name' placement, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 15/31] qapi: Track all failures between visit_start/stop, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 11/31] hmp: Cache use of qapi visitor, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 21/31] qom: Use typedef for Visitor,
Markus Armbruster <=
- [Qemu-devel] [PULL 24/31] qapi: Swap 'name' in visit_* callbacks to match public API, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 06/31] qapi: Avoid use of misnamed DO_UPCAST(), Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 19/31] qapi: Consolidate visitor small integer callbacks, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 18/31] qapi: Make all visitors supply uint64 callbacks, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 31/31] qapi: Add missing JSON files in build dependencies, Markus Armbruster, 2016/02/09
- Re: [Qemu-devel] [PULL 00/31] QAPI patches for 2016-02-09, Peter Maydell, 2016/02/09