[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 13/37] qom: Use typedef for Visitor
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v9 13/37] qom: Use typedef for Visitor |
Date: |
Tue, 19 Jan 2016 09:10:21 -0700 |
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>
---
v9: no change
v8: new patch
---
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 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 1ce987a..9cc7cf9 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;
@@ -149,7 +149,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)
{
@@ -157,7 +157,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 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 0d447b5..13c5b69 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -2921,7 +2921,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)
@@ -2932,7 +2932,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.5.0
- Re: [Qemu-devel] [PATCH v9 05/37] vl: Improve use of qapi visitor, (continued)
[Qemu-devel] [PATCH v9 03/37] qapi: Drop dead dealloc visitor variable, Eric Blake, 2016/01/19
[Qemu-devel] [PATCH v9 01/37] qobject: Document more shortcomings in our number handling, Eric Blake, 2016/01/19
[Qemu-devel] [PATCH v9 13/37] qom: Use typedef for Visitor,
Eric Blake <=
[Qemu-devel] [PATCH v9 02/37] qapi: Avoid use of misnamed DO_UPCAST(), Eric Blake, 2016/01/19
[Qemu-devel] [PATCH v9 12/37] qapi: Don't cast Enum* to int*, Eric Blake, 2016/01/19
[Qemu-devel] [PATCH v9 10/37] qapi: Make all visitors supply uint64 callbacks, Eric Blake, 2016/01/19