tests/qtest: Make qtest_has_accel() generic
cover tests/qtest: Make qtest_has_accel() generic
In preparation of running QTests using HVF on Darwin, make qtest_has_accel() generic.
Note, this also allow running other accelerators such Xen, WHPX, ...
Philippe Mathieu-Daudé (2):
tests/qtest: Extract qtest_qom_has_concrete_type() helper tests/qtest: Make qtest_has_accel() generic
tests/qtest/libqtest.c | 110 +++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 49 deletions(-)
Signature · 1 line
2.47.1
PATCH 1/2 tests/qtest: Extract qtest_qom_has_concrete_type() helper
Extract qtest_qom_has_concrete_type() out of qtest_has_device() in order to re-use it in the following commit.
--- tests/qtest/libqtest.c | 89 ++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 38 deletions(-)
tests/qtest/libqtest.c +51 -38
@@ -978,6 +978,56 @@ const char *qtest_get_arch(void)return end +1 ; } +static bool qtest_qom_has_concrete_type (const char *parent_typename, +const char *child_typename, +QList **cached_list) +{ +QList *list = cached_list ? *cached_list :NULL ; +const QListEntry *p; +QObject *qobj; +QString *qstr; +QDict *devinfo; +int idx; + +if (!list) { +QDict *resp; +QDict *args; +QTestState *qts =qtest_init ("-machine none" ); + + args =qdict_new (); +qdict_put_bool (args,"abstract" , false); +qdict_put_str (args,"implements" , parent_typename); + + resp =qtest_qmp (qts,"{'execute': 'qom-list-types', 'arguments': %p }" , + args); +g_assert (qdict_haskey (resp,"return" )); + list =qdict_get_qlist (resp,"return" ); +qobject_ref (list); +qobject_unref (resp); + +qtest_quit (qts); + +if (cached_list) { + *cached_list = list; + } + } + +for (p =qlist_first (list), idx =0 ; p; p =qlist_next (p), idx++) { + devinfo =qobject_to (QDict,qlist_entry_obj (p)); +g_assert (devinfo); + + qobj =qdict_get (devinfo,"name" ); +g_assert (qobj); + qstr =qobject_to (QString, qobj); +g_assert (qstr); +if (g_str_equal (qstring_get_str (qstr), child_typename)) { +return true; + } + } + +return false; +} +bool qtest_has_accel (const char *accel_name) {if (g_str_equal (accel_name,"tcg" )) {
@@ -1757,45 +1807,8 @@ bool qtest_has_machine(const char *machine)bool qtest_has_device (const char *device) {static QList *list; -const QListEntry *p; -QObject *qobj; -QString *qstr; -QDict *devinfo; -int idx; -if (!list) { -QDict *resp; -QDict *args; -QTestState *qts =qtest_init ("-machine none" ); - - args =qdict_new (); -qdict_put_bool (args,"abstract" , false); -qdict_put_str (args,"implements" ,"device" ); - - resp =qtest_qmp (qts,"{'execute': 'qom-list-types', 'arguments': %p }" , - args); -g_assert (qdict_haskey (resp,"return" )); - list =qdict_get_qlist (resp,"return" ); -qobject_ref (list); -qobject_unref (resp); - -qtest_quit (qts); - } - -for (p =qlist_first (list), idx =0 ; p; p =qlist_next (p), idx++) { - devinfo =qobject_to (QDict,qlist_entry_obj (p)); -g_assert (devinfo); - - qobj =qdict_get (devinfo,"name" ); -g_assert (qobj); - qstr =qobject_to (QString, qobj); -g_assert (qstr); -if (g_str_equal (qstring_get_str (qstr), device)) { -return true; - } - } - -return false; +return qtest_qom_has_concrete_type ("device" , device, &list); }/*
Signature · 1 line
2.47.1
Re: [PATCH 1/2] tests/qtest: Extract qtest_qom_has_concrete_type() helper
Quoted 7 lines · Philippe Mathieu-Daudé
Extract
qtest_qom_has_concrete_type()out ofqtest_has_device()in order to re-use it in the following commit.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/qtest/libqtest.c | 89 ++++++++++++++++++++++++------------------ 1 file changed, 51 insertions(+), 38 deletions(-)
PATCH 2/2 tests/qtest: Make qtest_has_accel() generic
In reply to Philippe Mathieu-DaudéSince commit b14a0b7469f ("accel: Use QOM classes for accel types") accelerators are registered as QOM objects. Use QOM as a generic API to query for available accelerators. This is in particular useful to query hardware accelerators such HFV, Xen or WHPX which otherwise have their definitions poisoned in "exec/poison.h".
--- tests/qtest/libqtest.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
tests/qtest/libqtest.c +10 -11
@@ -30,6 +30,7 @@#include "libqtest.h" #include "libqmp.h" +#include "qemu/accel.h" #include "qemu/ctype.h" #include "qemu/cutils.h" #include "qemu/sockets.h"
@@ -1030,13 +1031,10 @@ static bool qtest_qom_has_concrete_type(const char *parent_typename,bool qtest_has_accel (const char *accel_name) { -if (g_str_equal (accel_name,"tcg" )) { -#if defined(CONFIG_TCG ) -return true; -#else -return false; -#endif - }else if (g_str_equal (accel_name,"kvm" )) { +static QList *list; + g_autofree char *accel_type = NULL; + +if (g_str_equal (accel_name,"kvm" )) {int i;const char *arch =qtest_get_arch ();const char *targets[] = {CONFIG_KVM_TARGETS };
@@ -1048,11 +1046,12 @@ bool qtest_has_accel(const char *accel_name) } } } - }else { -/* not implemented */ -g_assert_not_reached (); +return false; } -return false; + + accel_type =g_strdup_printf ("%s%s" , accel_name,ACCEL_CLASS_SUFFIX ); + +return qtest_qom_has_concrete_type ("accel" , accel_type, &list); }bool qtest_get_irq (QTestState *s,int num)
Signature · 1 line
2.47.1
Quoted 46 lines · Philippe Mathieu-Daudé
Since commit
b14a0b7469f("accel: Use QOM classes for accel types") accelerators are registered as QOM objects. Use QOM as a generic API to query for available accelerators. This is in particular useful to query hardware accelerators such HFV, Xen or WHPX which otherwise have their definitions poisoned in "exec/poison.h".Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/qtest/libqtest.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)tests/qtest/libqtest.c +5
-8@@ -30,6 +30,7 @@#include "libqtest.h" #include "libqmp.h" +#include "qemu/accel.h" #include "qemu/ctype.h" #include "qemu/cutils.h" #include "qemu/sockets.h" @@ -1030,13 +1031,10 @@ static bool qtest_qom_has_concrete_type(const char *parent_typename,bool qtest_has_accel (const char *accel_name) { -if (g_str_equal (accel_name,"tcg" )) { -#if defined(CONFIG_TCG ) -return true; -#else -return false; -#endif - }else if (g_str_equal (accel_name,"kvm" )) { +static QList *list; + g_autofree char *accel_type = NULL; + +if (g_str_equal (accel_name,"kvm" )) {int i;const char *arch =qtest_get_arch ();const char *targets[] = {CONFIG_KVM_TARGETS };@@ -1048,11 +1046,12 @@ bool qtest_has_accel(const char *accel_name) } } } - }else {
tests/qtest/libqtest.c bool qtest_has_accel(const char *accel_name) · line 1055
Quoted 10 lines
tests/qtest/libqtest.c +5
-3-/* not implemented */ -g_assert_not_reached (); +return false; } -return false; + + accel_type =g_strdup_printf ("%s%s" , accel_name,ACCEL_CLASS_SUFFIX ); + +return qtest_qom_has_concrete_type ("accel" , accel_type, &list); }
Nice!
Quoted 43 lines · Philippe Mathieu-Daudé
Since commit
b14a0b7469f("accel: Use QOM classes for accel types") accelerators are registered as QOM objects. Use QOM as a generic API to query for available accelerators. This is in particular useful to query hardware accelerators such HFV, Xen or WHPX which otherwise have their definitions poisoned in "exec/poison.h".Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- tests/qtest/libqtest.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)tests/qtest/libqtest.c +5
-7@@ -30,6 +30,7 @@#include "libqtest.h" #include "libqmp.h" +#include "qemu/accel.h" #include "qemu/ctype.h" #include "qemu/cutils.h" #include "qemu/sockets.h" @@ -1030,13 +1031,10 @@ static bool qtest_qom_has_concrete_type(const char *parent_typename,bool qtest_has_accel (const char *accel_name) { -if (g_str_equal (accel_name,"tcg" )) { -#if defined(CONFIG_TCG ) -return true; -#else -return false; -#endif - }else if (g_str_equal (accel_name,"kvm" )) { +static QList *list; + g_autofree char *accel_type = NULL; + +if (g_str_equal (accel_name,"kvm" )) {int i;const char *arch =qtest_get_arch ();const char *targets[] = {CONFIG_KVM_TARGETS };@@ -1048,11 +1046,12 @@ bool qtest_has_accel(const char *accel_name) }
tests/qtest/libqtest.c bool qtest_has_accel(const char *accel_name) · line 1052
Quoted 10 lines
tests/qtest/libqtest.c +3
-4} } - }else { -/* not implemented */ -g_assert_not_reached (); +return false; } -return false; + + accel_type =g_strdup_printf ("%s%s" , accel_name,ACCEL_CLASS_SUFFIX );
g_strconcat() will make this a bit shorter.
Quoted 5 lines
tests/qtest/libqtest.c +2
-0+ +return qtest_qom_has_concrete_type ("accel" , accel_type, &list); }bool qtest_get_irq (QTestState *s,int num)