diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/can/can_socketcan.c | 4 | ||||
| -rw-r--r-- | net/colo-compare.c | 4 | ||||
| -rw-r--r-- | net/dump.c | 4 | ||||
| -rw-r--r-- | net/filter-buffer.c | 4 | ||||
| -rw-r--r-- | net/filter-mirror.c | 8 | ||||
| -rw-r--r-- | net/filter-replay.c | 4 | ||||
| -rw-r--r-- | net/filter-rewriter.c | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/net/can/can_socketcan.c b/net/can/can_socketcan.c index 0082aa6..f933bd2 100644 --- a/net/can/can_socketcan.c +++ b/net/can/can_socketcan.c @@ -48,8 +48,8 @@ #define TYPE_CAN_HOST_SOCKETCAN "can-host-socketcan" typedef struct CanHostSocketCAN CanHostSocketCAN; -#define CAN_HOST_SOCKETCAN(obj) \ - OBJECT_CHECK(CanHostSocketCAN, (obj), TYPE_CAN_HOST_SOCKETCAN) +DECLARE_INSTANCE_CHECKER(CanHostSocketCAN, CAN_HOST_SOCKETCAN, + TYPE_CAN_HOST_SOCKETCAN) #define CAN_READ_BUF_LEN 5 struct CanHostSocketCAN { diff --git a/net/colo-compare.c b/net/colo-compare.c index be3ca5f..bc3808f 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -37,8 +37,8 @@ #define TYPE_COLO_COMPARE "colo-compare" typedef struct CompareState CompareState; -#define COLO_COMPARE(obj) \ - OBJECT_CHECK(CompareState, (obj), TYPE_COLO_COMPARE) +DECLARE_INSTANCE_CHECKER(CompareState, COLO_COMPARE, + TYPE_COLO_COMPARE) static QTAILQ_HEAD(, CompareState) net_compares = QTAILQ_HEAD_INITIALIZER(net_compares); @@ -141,8 +141,8 @@ static int net_dump_state_init(DumpState *s, const char *filename, #define TYPE_FILTER_DUMP "filter-dump" typedef struct NetFilterDumpState NetFilterDumpState; -#define FILTER_DUMP(obj) \ - OBJECT_CHECK(NetFilterDumpState, (obj), TYPE_FILTER_DUMP) +DECLARE_INSTANCE_CHECKER(NetFilterDumpState, FILTER_DUMP, + TYPE_FILTER_DUMP) struct NetFilterDumpState { NetFilterState nfs; diff --git a/net/filter-buffer.c b/net/filter-buffer.c index 78f7f0b..6ade7a1 100644 --- a/net/filter-buffer.c +++ b/net/filter-buffer.c @@ -19,8 +19,8 @@ #define TYPE_FILTER_BUFFER "filter-buffer" typedef struct FilterBufferState FilterBufferState; -#define FILTER_BUFFER(obj) \ - OBJECT_CHECK(FilterBufferState, (obj), TYPE_FILTER_BUFFER) +DECLARE_INSTANCE_CHECKER(FilterBufferState, FILTER_BUFFER, + TYPE_FILTER_BUFFER) struct FilterBufferState { NetFilterState parent_obj; diff --git a/net/filter-mirror.c b/net/filter-mirror.c index 3fd3b90..088d4dc 100644 --- a/net/filter-mirror.c +++ b/net/filter-mirror.c @@ -23,12 +23,12 @@ #define TYPE_FILTER_MIRROR "filter-mirror" typedef struct MirrorState MirrorState; -#define FILTER_MIRROR(obj) \ - OBJECT_CHECK(MirrorState, (obj), TYPE_FILTER_MIRROR) +DECLARE_INSTANCE_CHECKER(MirrorState, FILTER_MIRROR, + TYPE_FILTER_MIRROR) #define TYPE_FILTER_REDIRECTOR "filter-redirector" -#define FILTER_REDIRECTOR(obj) \ - OBJECT_CHECK(MirrorState, (obj), TYPE_FILTER_REDIRECTOR) +DECLARE_INSTANCE_CHECKER(MirrorState, FILTER_REDIRECTOR, + TYPE_FILTER_REDIRECTOR) #define REDIRECTOR_MAX_LEN NET_BUFSIZE diff --git a/net/filter-replay.c b/net/filter-replay.c index a0b99aa..78696c1 100644 --- a/net/filter-replay.c +++ b/net/filter-replay.c @@ -24,8 +24,8 @@ #define TYPE_FILTER_REPLAY "filter-replay" typedef struct NetFilterReplayState NetFilterReplayState; -#define FILTER_REPLAY(obj) \ - OBJECT_CHECK(NetFilterReplayState, (obj), TYPE_FILTER_REPLAY) +DECLARE_INSTANCE_CHECKER(NetFilterReplayState, FILTER_REPLAY, + TYPE_FILTER_REPLAY) struct NetFilterReplayState { NetFilterState nfs; diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index c28d959..113e293 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -25,8 +25,8 @@ #define TYPE_FILTER_REWRITER "filter-rewriter" typedef struct RewriterState RewriterState; -#define FILTER_COLO_REWRITER(obj) \ - OBJECT_CHECK(RewriterState, (obj), TYPE_FILTER_REWRITER) +DECLARE_INSTANCE_CHECKER(RewriterState, FILTER_COLO_REWRITER, + TYPE_FILTER_REWRITER) #define FAILOVER_MODE_ON true #define FAILOVER_MODE_OFF false |