test: QOM interface casting
PATCH 1/1 test: QOM interface casting
Add basic regression testing for QOM Interface usage.
---
v2:
- Peter Crosthwaite <[email protected]>
* s/Parent/parent_obj/
* s/parent/parent_class/
- Peter Maydell <[email protected]>
* s/interfacei/interface/
* tests/Makefile split too long line
- Andreas Färber <[email protected]>
* consolidate QOM core object files in dedicated variable
* add SoB and commit message
--- tests/Makefile | 6 ++- tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletions(-) create mode 100644 tests/check-qom-interface.c
tests/Makefile +5 -1
@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF) +gcov-files-check-qdict-y = object/object.c check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
@@ -137,6 +139,7 @@ test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o $(test-obj-y): QEMU_INCLUDES += -Itests QEMU_CFLAGS += -I$(SRC_PATH)/tests +qom-core-obj = qom/object.o qom/qom-qobject.o qom/container.o tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386
@@ -146,6 +149,7 @@ tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a tests/check-qlist$(EXESUF): tests/check-qlist.o libqemuutil.a tests/check-qfloat$(EXESUF): tests/check-qfloat.o libqemuutil.a tests/check-qjson$(EXESUF): tests/check-qjson.o libqemuutil.a libqemustub.a +tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(qom-core-obj) libqemuutil.a tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-aio$(EXESUF): tests/test-aio.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-throttle$(EXESUF): tests/test-throttle.o $(block-obj-y) libqemuutil.a libqemustub.a
@@ -159,7 +163,7 @@ tests/test-int128$(EXESUF): tests/test-int128.o tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ hw/core/qdev.o hw/core/qdev-properties.o \ hw/core/irq.o \ - qom/object.o qom/container.o qom/qom-qobject.o \ + $(qom-core-obj) \ $(test-qapi-obj-y) \ libqemuutil.a libqemustub.a
tests/check-qom-interface.c new file +102 -0
102 lines not on this page · raw message
Signature · 1 line
1.7.1
Quoted 4 lines · Igor Mammedov
Add basic regression testing for QOM Interface usage.
+/*
+ * OQM interface test.
Still says "OQM" not "QOM"...
thanks
-- PMM
Am 20.12.2013 14:26, schrieb Igor Mammedov:
Quoted 25 lines
Add basic regression testing for QOM Interface usage.
Signed-off-by Igor Mammedov <[email protected]>---
v2:
- Peter Crosthwaite <[email protected]>
* s/Parent/parent_obj/
* s/parent/parent_class/
- Peter Maydell <[email protected]>
* s/interfacei/interface/
* tests/Makefile split too long line
- Andreas Färber <[email protected]>
* consolidate QOM core object files in dedicated variable
* add SoB and commit message--- tests/Makefile | 6 ++- tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletions(-) create mode 100644 tests/check-qom-interface.ctests/Makefile +0
-0
tests/Makefile check-unit-y += tests/test-int128$(EXESUF) · line 55
Quoted 4 lines
tests/Makefile +1
-0@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF)
Surely needs to be +=.
tests/Makefile check-unit-y += tests/test-int128$(EXESUF) · line 56
Quoted 1 line
tests/Makefile +1
-0+gcov-files-check-qdict-y = object/object.c
Copy&paste? ("qdict")
Also "qom/object.c".
Quoted 62 lines
tests/Makefile +3
-1check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh@@ -137,6 +139,7 @@ test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o $(test-obj-y): QEMU_INCLUDES += -Itests QEMU_CFLAGS += -I$(SRC_PATH)/tests +qom-core-obj = qom/object.o qom/qom-qobject.o qom/container.o tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386@@ -146,6 +149,7 @@ tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a tests/check-qlist$(EXESUF): tests/check-qlist.o libqemuutil.a tests/check-qfloat$(EXESUF): tests/check-qfloat.o libqemuutil.a tests/check-qjson$(EXESUF): tests/check-qjson.o libqemuutil.a libqemustub.a +tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(qom-core-obj) libqemuutil.a tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-aio$(EXESUF): tests/test-aio.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-throttle$(EXESUF): tests/test-throttle.o $(block-obj-y) libqemuutil.a libqemustub.a@@ -159,7 +163,7 @@ tests/test-int128$(EXESUF): tests/test-int128.o tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ hw/core/qdev.o hw/core/qdev-properties.o \ hw/core/irq.o \ - qom/object.o qom/container.o qom/qom-qobject.o \ + $(qom-core-obj) \ $(test-qapi-obj-y) \ libqemuutil.a libqemustub.atests/check-qom-interface.c new file +28
-0@@ -0,0 +1,102 @@ +/* +* OQM interface test. +* +* Copyright (C) 2013 Red Hat Inc. +* +* Authors: +* Igor Mammedov <[email protected]> +* +* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. +* See the COPYING.LIB file in the top-level directory. +*/ +#include <glib.h> + +#include "qom/object.h" +#include "qemu/module.h" + + +#define TYPE_TEST_IF "test-interface" +#define TEST_IF_CLASS (klass) \ + OBJECT_CLASS_CHECK(TestIfClass, (klass), TYPE_TEST_IF) +#define TEST_IF_GET_CLASS (obj) \ + OBJECT_GET_CLASS(TestIfClass, (obj), TYPE_TEST_IF) +#define TEST_IF (obj) \ + INTERFACE_CHECK(TestIf, (obj), TYPE_TEST_IF) + +typedef struct TestIf { +Object parent_obj; +}TestIf ;
tests/check-qom-interface.c line 38
Quoted 10 lines
tests/check-qom-interface.c new file +10
-0+ +typedef struct TestIfClass { +InterfaceClass parent_class; + +uint32_t test; +}TestIfClass ; + +static const TypeInfo test_if_info = { + .name =TYPE_TEST_IF , + .parent =TYPE_INTERFACE ,
TestIf is not assigned here - no bug but let's set a consistent example.
Quoted 14 lines
tests/check-qom-interface.c new file +14
-0+ .class_size = sizeof(TestIfClass), +}; + +#define PATTERN 0xFAFBFCFD +static void test_class_init (ObjectClass *oc,void *data) +{ +TestIfClass *tc =TEST_IF_CLASS (oc); + +g_assert (tc); + tc->test =PATTERN ; +} + +#define TYPE_DIRECT_IMPL "direct-impl" +static const TypeInfo direct_impl_info = {
tests/check-qom-interface.c line 62
Quoted 10 lines
tests/check-qom-interface.c new file +10
-0+ .name = TYPE_DIRECT_IMPL, + .parent = TYPE_OBJECT, + .class_init = test_class_init, + .interfaces = (InterfaceInfo []) { + {TYPE_TEST_IF }, + { } + } +}; + +#define TYPE_INTERMEDIATE_IMPL "intermediate-impl"
I'd insert a white line here and above.
tests/check-qom-interface.c line 72
Quoted 10 lines
tests/check-qom-interface.c new file +10
-0+static const TypeInfo intermediate_impl_info = { + .name =TYPE_INTERMEDIATE_IMPL , + .parent =TYPE_DIRECT_IMPL , +}; + +static void test_interface_impl (const char *type) +{ +Object *obj =object_new (type); +TestIf *iobj =TEST_IF (obj); +TestIfClass *ico =TEST_IF_GET_CLASS (iobj);
What's the o in ico for BTW?
Quoted 16 lines
tests/check-qom-interface.c new file +16
-0+ +g_assert (iobj); +g_assert (ico->test ==PATTERN ); +} + +static void interface_direct_test (void ) +{ +test_interface_impl (TYPE_DIRECT_IMPL ); +} + +static void interface_intermediate_test (void ) +{ +test_interface_impl (TYPE_INTERMEDIATE_IMPL ); +} + +int main (int argc,char **argv)
tests/check-qom-interface.c line 98
Quoted 10 lines
tests/check-qom-interface.c new file +10
-0+{ +g_test_init (&argc, &argv,NULL ); + +module_call_init (MODULE_INIT_QOM ); +type_register_static (&test_if_info); +type_register_static (&direct_impl_info); +type_register_static (&intermediate_impl_info); + +g_test_add_func ("/interface/direct_impl" , interface_direct_test); + g_test_add_func("/interface/intermediate_impl",
Would it make sense to call it /qom/interface/... or /qom-interface/...? Doesn't really matter though as long as it's unique, I guess.
tests/check-qom-interface.c line 102
Quoted 4 lines
tests/check-qom-interface.c new file +4
-0+ interface_intermediate_test); + +return g_test_run (); +}
Regards,
Andreas
Signature · 2 lines
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Quoted 21 lines · On Fri, 20 Dec 2013 14:58:07 +0100 Andreas Färber <[email protected]> wrote:
Am 20.12.2013 14:26, schrieb Igor Mammedov:
Quoted 20 lines
Add basic regression testing for QOM Interface usage.
Signed-off-by Igor Mammedov <[email protected]>---
v2:
- Peter Crosthwaite <[email protected]>
* s/Parent/parent_obj/
* s/parent/parent_class/
- Peter Maydell <[email protected]>
* s/interfacei/interface/
* tests/Makefile split too long line
- Andreas Färber <[email protected]>
* consolidate QOM core object files in dedicated variable
* add SoB and commit message--- tests/Makefile | 6 ++- tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletions(-) create mode 100644 tests/check-qom-interface.c
Quoted 11 lines
tests/Makefile check-unit-y += tests/test-int128$(EXESUF) · line 55
Quoted 9 lines
tests/Makefile +1
-0@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF)Surely needs to be +=.
fixed.
Quoted 5 lines
tests/Makefile check-unit-y += tests/test-int128$(EXESUF) · line 56
Quoted 2 lines
tests/Makefile +1
-0+gcov-files-check-qdict-y = object/object.cCopy&paste? ("qdict")
Also "qom/object.c".
fixed
Quoted 67 lines
Quoted 67 lines
tests/Makefile +3
-1check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh@@ -137,6 +139,7 @@ test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o $(test-obj-y): QEMU_INCLUDES += -Itests QEMU_CFLAGS += -I$(SRC_PATH)/tests +qom-core-obj = qom/object.o qom/qom-qobject.o qom/container.o tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386@@ -146,6 +149,7 @@ tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a tests/check-qlist$(EXESUF): tests/check-qlist.o libqemuutil.a tests/check-qfloat$(EXESUF): tests/check-qfloat.o libqemuutil.a tests/check-qjson$(EXESUF): tests/check-qjson.o libqemuutil.a libqemustub.a +tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(qom-core-obj) libqemuutil.a tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-aio$(EXESUF): tests/test-aio.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-throttle$(EXESUF): tests/test-throttle.o $(block-obj-y) libqemuutil.a libqemustub.a@@ -159,7 +163,7 @@ tests/test-int128$(EXESUF): tests/test-int128.o tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ hw/core/qdev.o hw/core/qdev-properties.o \ hw/core/irq.o \ - qom/object.o qom/container.o qom/qom-qobject.o \ + $(qom-core-obj) \ $(test-qapi-obj-y) \ libqemuutil.a libqemustub.atests/check-qom-interface.c new file +32
-0@@ -0,0 +1,102 @@ +/* +* OQM interface test. +* +* Copyright (C) 2013 Red Hat Inc. +* +* Authors: +* Igor Mammedov <[email protected]> +* +* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. +* See the COPYING.LIB file in the top-level directory. +*/ +#include <glib.h> + +#include "qom/object.h" +#include "qemu/module.h" + + +#define TYPE_TEST_IF "test-interface" +#define TEST_IF_CLASS (klass) \ + OBJECT_CLASS_CHECK(TestIfClass, (klass), TYPE_TEST_IF) +#define TEST_IF_GET_CLASS (obj) \ + OBJECT_GET_CLASS(TestIfClass, (obj), TYPE_TEST_IF) +#define TEST_IF (obj) \ + INTERFACE_CHECK(TestIf, (obj), TYPE_TEST_IF) + +typedef struct TestIf { +Object parent_obj; +}TestIf ; + +typedef struct TestIfClass { + InterfaceClass parent_class; +
Quoted 8 lines
tests/check-qom-interface.c line 38
Quoted 6 lines
tests/check-qom-interface.c new file +6
-0+uint32_t test; +} TestIfClass; + +static const TypeInfo test_if_info = { + .name =TYPE_TEST_IF , + .parent =TYPE_INTERFACE ,TestIf is not assigned here - no bug but let's set a consistent example.
What do you mean?
Quoted 19 lines
Quoted 19 lines
tests/check-qom-interface.c new file +18
-0+ .class_size = sizeof(TestIfClass), +}; + +#define PATTERN 0xFAFBFCFD +static void test_class_init (ObjectClass *oc,void *data) +{ +TestIfClass *tc =TEST_IF_CLASS (oc); + +g_assert (tc); + tc->test =PATTERN ; +} + +#define TYPE_DIRECT_IMPL "direct-impl" +static const TypeInfo direct_impl_info = { + .name =TYPE_DIRECT_IMPL , + .parent =TYPE_OBJECT , + .class_init = test_class_init, + .interfaces = (InterfaceInfo []) {
Quoted 8 lines
tests/check-qom-interface.c line 62
Quoted 6 lines
tests/check-qom-interface.c new file +6
-0+ { TYPE_TEST_IF }, + { } + } +}; + +#define TYPE_INTERMEDIATE_IMPL "intermediate-impl"I'd insert a white line here and above.
sure
Quoted 13 lines
tests/check-qom-interface.c line 72
Quoted 11 lines
tests/check-qom-interface.c new file +10
-0+static const TypeInfo intermediate_impl_info = { + .name =TYPE_INTERMEDIATE_IMPL , + .parent =TYPE_DIRECT_IMPL , +}; + +static void test_interface_impl (const char *type) +{ +Object *obj =object_new (type); +TestIf *iobj =TEST_IF (obj); +TestIfClass *ico =TEST_IF_GET_CLASS (iobj);What's the o in ico for BTW?
InterfaceClassObject ...
Quoted 21 lines
Quoted 21 lines
tests/check-qom-interface.c new file +20
-0+ +g_assert (iobj); +g_assert (ico->test ==PATTERN ); +} + +static void interface_direct_test (void ) +{ +test_interface_impl (TYPE_DIRECT_IMPL ); +} + +static void interface_intermediate_test (void ) +{ +test_interface_impl (TYPE_INTERMEDIATE_IMPL ); +} + +int main (int argc,char **argv) +{ +g_test_init (&argc, &argv,NULL ); + +module_call_init (MODULE_INIT_QOM );
Quoted 8 lines
tests/check-qom-interface.c line 98
Quoted 6 lines
tests/check-qom-interface.c new file +6
-0+type_register_static (&test_if_info); +type_register_static (&direct_impl_info); +type_register_static (&intermediate_impl_info); + +g_test_add_func ("/interface/direct_impl" , interface_direct_test); + g_test_add_func("/interface/intermediate_impl",Would it make sense to call it /qom/interface/... or /qom-interface/...?
sure, I'll amend it.
Quoted 10 lines
Doesn't really matter though as long as it's unique, I guess.
tests/check-qom-interface.c line 102
Quoted 4 lines
tests/check-qom-interface.c new file +4
-0+ interface_intermediate_test); + +return g_test_run (); +}Regards,
Andreas
Quoted 162 lines · Igor Mammedov
Quoted 21 lines · On Fri, 20 Dec 2013 14:58:07 +0100 Andreas Färber <[email protected]> wrote:
Am 20.12.2013 14:26, schrieb Igor Mammedov:
Quoted 20 lines
Add basic regression testing for QOM Interface usage.
Signed-off-by Igor Mammedov <[email protected]>---
v2:
- Peter Crosthwaite <[email protected]>
* s/Parent/parent_obj/
* s/parent/parent_class/
- Peter Maydell <[email protected]>
* s/interfacei/interface/
* tests/Makefile split too long line
- Andreas Färber <[email protected]>
* consolidate QOM core object files in dedicated variable
* add SoB and commit message--- tests/Makefile | 6 ++- tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletions(-) create mode 100644 tests/check-qom-interface.cQuoted 11 lines
tests/Makefile check-unit-y += tests/test-int128$(EXESUF) · line 55
Quoted 9 lines
tests/Makefile +1
-0@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF)Surely needs to be +=.
fixed.
Quoted 5 lines
tests/Makefile check-unit-y += tests/test-int128$(EXESUF) · line 56
Quoted 2 lines
tests/Makefile +1
-0+gcov-files-check-qdict-y = object/object.cCopy&paste? ("qdict")
Also "qom/object.c".fixed
Quoted 67 lines
Quoted 67 lines
tests/Makefile +3
-1check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh@@ -137,6 +139,7 @@ test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o $(test-obj-y): QEMU_INCLUDES += -Itests QEMU_CFLAGS += -I$(SRC_PATH)/tests +qom-core-obj = qom/object.o qom/qom-qobject.o qom/container.o tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386@@ -146,6 +149,7 @@ tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a tests/check-qlist$(EXESUF): tests/check-qlist.o libqemuutil.a tests/check-qfloat$(EXESUF): tests/check-qfloat.o libqemuutil.a tests/check-qjson$(EXESUF): tests/check-qjson.o libqemuutil.a libqemustub.a +tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(qom-core-obj) libqemuutil.a tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-aio$(EXESUF): tests/test-aio.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-throttle$(EXESUF): tests/test-throttle.o $(block-obj-y) libqemuutil.a libqemustub.a@@ -159,7 +163,7 @@ tests/test-int128$(EXESUF): tests/test-int128.o tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ hw/core/qdev.o hw/core/qdev-properties.o \ hw/core/irq.o \ - qom/object.o qom/container.o qom/qom-qobject.o \ + $(qom-core-obj) \ $(test-qapi-obj-y) \ libqemuutil.a libqemustub.atests/check-qom-interface.c new file +32
-0@@ -0,0 +1,102 @@ +/* +* OQM interface test. +* +* Copyright (C) 2013 Red Hat Inc. +* +* Authors: +* Igor Mammedov <[email protected]> +* +* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. +* See the COPYING.LIB file in the top-level directory. +*/ +#include <glib.h> + +#include "qom/object.h" +#include "qemu/module.h" + + +#define TYPE_TEST_IF "test-interface" +#define TEST_IF_CLASS (klass) \ + OBJECT_CLASS_CHECK(TestIfClass, (klass), TYPE_TEST_IF) +#define TEST_IF_GET_CLASS (obj) \ + OBJECT_GET_CLASS(TestIfClass, (obj), TYPE_TEST_IF) +#define TEST_IF (obj) \ + INTERFACE_CHECK(TestIf, (obj), TYPE_TEST_IF) + +typedef struct TestIf { +Object parent_obj; +}TestIf ; + +typedef struct TestIfClass { + InterfaceClass parent_class; +Quoted 8 lines
tests/check-qom-interface.c line 38
Quoted 6 lines
tests/check-qom-interface.c new file +6
-0+uint32_t test; +} TestIfClass; + +static const TypeInfo test_if_info = { + .name =TYPE_TEST_IF , + .parent =TYPE_INTERFACE ,TestIf is not assigned here - no bug but let's set a consistent example.
What do you mean?
Quoted 19 lines
Quoted 19 lines
tests/check-qom-interface.c new file +18
-0+ .class_size = sizeof(TestIfClass), +}; + +#define PATTERN 0xFAFBFCFD +static void test_class_init (ObjectClass *oc,void *data) +{ +TestIfClass *tc =TEST_IF_CLASS (oc); + +g_assert (tc); + tc->test =PATTERN ; +} + +#define TYPE_DIRECT_IMPL "direct-impl" +static const TypeInfo direct_impl_info = { + .name =TYPE_DIRECT_IMPL , + .parent =TYPE_OBJECT , + .class_init = test_class_init, + .interfaces = (InterfaceInfo []) {Quoted 8 lines
tests/check-qom-interface.c line 62
Quoted 6 lines
tests/check-qom-interface.c new file +6
-0+ { TYPE_TEST_IF }, + { } + } +}; + +#define TYPE_INTERMEDIATE_IMPL "intermediate-impl"I'd insert a white line here and above.
sure
Quoted 13 lines
tests/check-qom-interface.c line 72
Quoted 11 lines
tests/check-qom-interface.c new file +10
-0+static const TypeInfo intermediate_impl_info = { + .name =TYPE_INTERMEDIATE_IMPL , + .parent =TYPE_DIRECT_IMPL , +}; + +static void test_interface_impl (const char *type) +{ +Object *obj =object_new (type); +TestIf *iobj =TEST_IF (obj); +TestIfClass *ico =TEST_IF_GET_CLASS (iobj);What's the o in ico for BTW?
Quoted 2 lines
InterfaceClassObject ...
This seems strange to me. In some other code I rmbr just using lower case acronym versions of the type to keep it all consistent. This means you could use "tic" for TestIfClass.
Regards,
Peter
Quoted 43 lines
Quoted 21 lines
Quoted 21 lines
tests/check-qom-interface.c new file +20
-0+ +g_assert (iobj); +g_assert (ico->test ==PATTERN ); +} + +static void interface_direct_test (void ) +{ +test_interface_impl (TYPE_DIRECT_IMPL ); +} + +static void interface_intermediate_test (void ) +{ +test_interface_impl (TYPE_INTERMEDIATE_IMPL ); +} + +int main (int argc,char **argv) +{ +g_test_init (&argc, &argv,NULL ); + +module_call_init (MODULE_INIT_QOM );Quoted 8 lines
tests/check-qom-interface.c line 98
Quoted 6 lines
tests/check-qom-interface.c new file +6
-0+type_register_static (&test_if_info); +type_register_static (&direct_impl_info); +type_register_static (&intermediate_impl_info); + +g_test_add_func ("/interface/direct_impl" , interface_direct_test); + g_test_add_func("/interface/intermediate_impl",Would it make sense to call it /qom/interface/... or /qom-interface/...?
sure, I'll amend it.
Quoted 10 lines
Doesn't really matter though as long as it's unique, I guess.
tests/check-qom-interface.c line 102
Quoted 4 lines
tests/check-qom-interface.c new file +4
-0+ interface_intermediate_test); + +return g_test_run (); +}Regards,
Andreas
On Fri, 20 Dec 2013 14:26:11 +0100
Igor Mammedov <[email protected]> wrote:
Andreas,
test shows that commit:
"qom: Do not register interface "types" in the type table "
https://github.com/afaerber/qemu-cpu/commit/7f00136ff5534ee651f4f10475170b8db18e5c03
regresses QOM Interface in case where interface is implemented in not a leaf class, leading to abort.
Quoted 166 lines
Add basic regression testing for QOM Interface usage.
Signed-off-by Igor Mammedov <[email protected]>---
v2:
- Peter Crosthwaite <[email protected]>
* s/Parent/parent_obj/
* s/parent/parent_class/
- Peter Maydell <[email protected]>
* s/interfacei/interface/
* tests/Makefile split too long line
- Andreas Färber <[email protected]>
* consolidate QOM core object files in dedicated variable
* add SoB and commit message--- tests/Makefile | 6 ++- tests/check-qom-interface.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletions(-) create mode 100644 tests/check-qom-interface.ctests/Makefile +5
-1@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF) +gcov-files-check-qdict-y = object/object.c check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh@@ -137,6 +139,7 @@ test-qapi-obj-y = tests/test-qapi-visit.o tests/test-qapi-types.o $(test-obj-y): QEMU_INCLUDES += -Itests QEMU_CFLAGS += -I$(SRC_PATH)/tests +qom-core-obj = qom/object.o qom/qom-qobject.o qom/container.o tests/test-x86-cpuid.o: QEMU_INCLUDES += -I$(SRC_PATH)/target-i386@@ -146,6 +149,7 @@ tests/check-qdict$(EXESUF): tests/check-qdict.o libqemuutil.a tests/check-qlist$(EXESUF): tests/check-qlist.o libqemuutil.a tests/check-qfloat$(EXESUF): tests/check-qfloat.o libqemuutil.a tests/check-qjson$(EXESUF): tests/check-qjson.o libqemuutil.a libqemustub.a +tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(qom-core-obj) libqemuutil.a tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-aio$(EXESUF): tests/test-aio.o $(block-obj-y) libqemuutil.a libqemustub.a tests/test-throttle$(EXESUF): tests/test-throttle.o $(block-obj-y) libqemuutil.a libqemustub.a@@ -159,7 +163,7 @@ tests/test-int128$(EXESUF): tests/test-int128.o tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \ hw/core/qdev.o hw/core/qdev-properties.o \ hw/core/irq.o \ - qom/object.o qom/container.o qom/qom-qobject.o \ + $(qom-core-obj) \ $(test-qapi-obj-y) \ libqemuutil.a libqemustub.atests/check-qom-interface.c new file +102
-0@@ -0,0 +1,102 @@ +/* +* OQM interface test. +* +* Copyright (C) 2013 Red Hat Inc. +* +* Authors: +* Igor Mammedov <[email protected]> +* +* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. +* See the COPYING.LIB file in the top-level directory. +*/ +#include <glib.h> + +#include "qom/object.h" +#include "qemu/module.h" + + +#define TYPE_TEST_IF "test-interface" +#define TEST_IF_CLASS (klass) \ + OBJECT_CLASS_CHECK(TestIfClass, (klass), TYPE_TEST_IF) +#define TEST_IF_GET_CLASS (obj) \ + OBJECT_GET_CLASS(TestIfClass, (obj), TYPE_TEST_IF) +#define TEST_IF (obj) \ + INTERFACE_CHECK(TestIf, (obj), TYPE_TEST_IF) + +typedef struct TestIf { +Object parent_obj; +}TestIf ; + +typedef struct TestIfClass { +InterfaceClass parent_class; + +uint32_t test; +}TestIfClass ; + +static const TypeInfo test_if_info = { + .name =TYPE_TEST_IF , + .parent =TYPE_INTERFACE , + .class_size =sizeof (TestIfClass), +}; + +#define PATTERN 0xFAFBFCFD +static void test_class_init (ObjectClass *oc,void *data) +{ +TestIfClass *tc =TEST_IF_CLASS (oc); + +g_assert (tc); + tc->test =PATTERN ; +} + +#define TYPE_DIRECT_IMPL "direct-impl" +static const TypeInfo direct_impl_info = { + .name =TYPE_DIRECT_IMPL , + .parent =TYPE_OBJECT , + .class_init = test_class_init, + .interfaces = (InterfaceInfo []) { + {TYPE_TEST_IF }, + { } + } +}; + +#define TYPE_INTERMEDIATE_IMPL "intermediate-impl" +static const TypeInfo intermediate_impl_info = { + .name =TYPE_INTERMEDIATE_IMPL , + .parent =TYPE_DIRECT_IMPL , +}; + +static void test_interface_impl (const char *type) +{ +Object *obj =object_new (type); +TestIf *iobj =TEST_IF (obj); +TestIfClass *ico =TEST_IF_GET_CLASS (iobj); + +g_assert (iobj); +g_assert (ico->test ==PATTERN ); +} + +static void interface_direct_test (void ) +{ +test_interface_impl (TYPE_DIRECT_IMPL ); +} + +static void interface_intermediate_test (void ) +{ +test_interface_impl (TYPE_INTERMEDIATE_IMPL ); +} + +int main (int argc,char **argv) +{ +g_test_init (&argc, &argv,NULL ); + +module_call_init (MODULE_INIT_QOM ); +type_register_static (&test_if_info); +type_register_static (&direct_impl_info); +type_register_static (&intermediate_impl_info); + +g_test_add_func ("/interface/direct_impl" , interface_direct_test); +g_test_add_func ("/interface/intermediate_impl" , + interface_intermediate_test); + +return g_test_run (); +}
Il 20/12/2013 16:14, Igor Mammedov ha scritto:
Quoted 9 lines
Andreas,
test shows that commit:
"qom: Do not register interface "types" in the type table "
https://github.com/afaerber/qemu-cpu/commit/7f00136ff5534ee651f4f10475170b8db18e5c03regresses QOM Interface in case where interface is implemented in not a leaf class, leading to abort.
Just sent a patch for this.
Paolo
Il 20/12/2013 14:26, Igor Mammedov ha scritto:
tests/Makefile check-unit-y += tests/test-int128$(EXESUF) · line 56
Quoted 9 lines
index 379cdd9..89f8eff 100644
tests/Makefile +2
-0@@ -52,6 +52,8 @@ check-unit-y += tests/test-int128$(EXESUF) gcov-files-test-int128-y = check-unit-y += tests/test-bitops$(EXESUF) check-unit-y += tests/test-qdev-global-props$(EXESUF) +check-unit-y = tests/check-qom-interface$(EXESUF) +gcov-files-check-qdict-y = object/object.c
The "=" needs to be a "+=" and the gcov-files-check-qdict-y variable is wrong (both in name and in content; it should be qom/object.c).
The test itself is good and, as you mentioned on IRC, spots a bug.
Paolo
Quoted 2 lines
tests/Makefile +0
-0check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh