From a489d1951cd9cc91c5954214fcf6ae0f9d2d4292 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 16 Sep 2020 14:25:18 -0400 Subject: Use OBJECT_DECLARE_TYPE when possible This converts existing DECLARE_OBJ_CHECKERS usage to OBJECT_DECLARE_TYPE when possible. $ ./scripts/codeconverter/converter.py -i \ --pattern=AddObjectDeclareType $(git grep -l '' -- '*.[ch]') Signed-off-by: Eduardo Habkost Reviewed-by: Cédric Le Goater Acked-by: Paul Durrant Message-Id: <20200916182519.415636-5-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- include/net/can_host.h | 5 +---- include/net/filter.h | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'include/net') diff --git a/include/net/can_host.h b/include/net/can_host.h index 18979c2e2d..4e3ce3f954 100644 --- a/include/net/can_host.h +++ b/include/net/can_host.h @@ -32,10 +32,7 @@ #include "qom/object.h" #define TYPE_CAN_HOST "can-host" -typedef struct CanHostClass CanHostClass; -typedef struct CanHostState CanHostState; -DECLARE_OBJ_CHECKERS(CanHostState, CanHostClass, - CAN_HOST, TYPE_CAN_HOST) +OBJECT_DECLARE_TYPE(CanHostState, CanHostClass, CAN_HOST) struct CanHostState { ObjectClass oc; diff --git a/include/net/filter.h b/include/net/filter.h index e7e593128a..27ffc630df 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -15,9 +15,7 @@ #include "net/queue.h" #define TYPE_NETFILTER "netfilter" -typedef struct NetFilterClass NetFilterClass; -DECLARE_OBJ_CHECKERS(NetFilterState, NetFilterClass, - NETFILTER, TYPE_NETFILTER) +OBJECT_DECLARE_TYPE(NetFilterState, NetFilterClass, NETFILTER) typedef void (FilterSetup) (NetFilterState *nf, Error **errp); typedef void (FilterCleanup) (NetFilterState *nf); -- cgit v1.2.3-55-g7522