Skip to content

Commit

Permalink
qom: Use typedef for Visitor
Browse files Browse the repository at this point in the history
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 <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-18-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
  • Loading branch information
ebblake authored and Markus Armbruster committed Feb 8, 2016
1 parent 395a233 commit 4fa4549
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions hw/misc/edu.c
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions hw/virtio/virtio-balloon.c
Expand Up @@ -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;
Expand Down Expand Up @@ -151,15 +151,15 @@ static void balloon_stats_get_all(Object *obj, struct Visitor *v,
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)
{
VirtIOBalloon *s = opaque;
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)
{
Expand Down
9 changes: 4 additions & 5 deletions include/qom/object.h
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);

/**
Expand Down Expand Up @@ -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);

/**
Expand Down
4 changes: 2 additions & 2 deletions qom/object.c
Expand Up @@ -2185,15 +2185,15 @@ 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;

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;
Expand Down
4 changes: 2 additions & 2 deletions target-i386/cpu.c
Expand Up @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit 4fa4549

Please sign in to comment.