From db1015e92e04835c9eb50c29625fe566d1202dbd Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Thu, 3 Sep 2020 16:43:22 -0400 Subject: Move QOM typedefs and add missing includes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some typedefs and macros are defined after the type check macros. This makes it difficult to automatically replace their definitions with OBJECT_DECLARE_TYPE. Patch generated using: $ ./scripts/codeconverter/converter.py -i \ --pattern=QOMStructTypedefSplit $(git grep -l '' -- '*.[ch]') which will split "typdef struct { ... } TypedefName" declarations. Followed by: $ ./scripts/codeconverter/converter.py -i --pattern=MoveSymbols \ $(git grep -l '' -- '*.[ch]') which will: - move the typedefs and #defines above the type check macros - add missing #include "qom/object.h" lines if necessary Reviewed-by: Daniel P. Berrangé Reviewed-by: Juan Quintela Message-Id: <20200831210740.126168-9-ehabkost@redhat.com> Reviewed-by: Juan Quintela Message-Id: <20200831210740.126168-10-ehabkost@redhat.com> Message-Id: <20200831210740.126168-11-ehabkost@redhat.com> Signed-off-by: Eduardo Habkost --- tests/check-qom-interface.c | 5 +++-- tests/test-qdev-global-props.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/check-qom-interface.c b/tests/check-qom-interface.c index 2177f0dce5..bfa9ad5d19 100644 --- a/tests/check-qom-interface.c +++ b/tests/check-qom-interface.c @@ -16,6 +16,7 @@ #define TYPE_TEST_IF "test-interface" +typedef struct TestIfClass TestIfClass; #define TEST_IF_CLASS(klass) \ OBJECT_CLASS_CHECK(TestIfClass, (klass), TYPE_TEST_IF) #define TEST_IF_GET_CLASS(obj) \ @@ -25,11 +26,11 @@ typedef struct TestIf TestIf; -typedef struct TestIfClass { +struct TestIfClass { InterfaceClass parent_class; uint32_t test; -} TestIfClass; +}; static const TypeInfo test_if_info = { .name = TYPE_TEST_IF, diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index 1e6b0f33ff..c3e210a9ef 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -31,6 +31,7 @@ #define TYPE_STATIC_PROPS "static_prop_type" +typedef struct MyType MyType; #define STATIC_TYPE(obj) \ OBJECT_CHECK(MyType, (obj), TYPE_STATIC_PROPS) @@ -38,12 +39,12 @@ #define PROP_DEFAULT 100 -typedef struct MyType { +struct MyType { DeviceState parent_obj; uint32_t prop1; uint32_t prop2; -} MyType; +}; static Property static_props[] = { DEFINE_PROP_UINT32("prop1", MyType, prop1, PROP_DEFAULT), -- cgit v1.2.3