tests/qom-test: Test qom-list on link properties

But don't test their properties, otherwise we will recurse forever.
Their properties are already tested when we encounter them as child
properties elsewhere in the hierarchy, like /machine/unattached/...

This would have caught the crash fixed by 92b3eead

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 tests/qom-test.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

ping

On 04/11/2014 06:07 PM, Cole Robinson wrote:
> But don't test their properties, otherwise we will recurse forever.
> Their properties are already tested when we encounter them as child
> properties elsewhere in the hierarchy, like /machine/unattached/...
> 
> This would have caught the crash fixed by 92b3eead
> 
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
>  tests/qom-test.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/qom-test.c b/tests/qom-test.c
> index 6d9a00b..d8d1d8d 100644
> --- a/tests/qom-test.c
> +++ b/tests/qom-test.c
> @@ -44,7 +44,7 @@ static bool is_blacklisted(const char *arch, const char *mach)
>      return false;
>  }
>  
> -static void test_properties(const char *path)
> +static void test_properties(const char *path, bool recurse)
>  {
>      char *child_path;
>      QDict *response, *tuple;
> @@ -56,14 +56,21 @@ static void test_properties(const char *path)
>                     "  'arguments': { 'path': '%s' } }", path);
>      g_assert(response);
>  
> +    if (!recurse) {
> +        return;
> +    }
> +
>      g_assert(qdict_haskey(response, "return"));
>      list = qobject_to_qlist(qdict_get(response, "return"));
>      QLIST_FOREACH_ENTRY(list, entry) {
>          tuple = qobject_to_qdict(qlist_entry_obj(entry));
> -        if (strstart(qdict_get_str(tuple, "type"), "child<", NULL)) {
> +        bool is_child = strstart(qdict_get_str(tuple, "type"), "child<", NULL);
> +        bool is_link = strstart(qdict_get_str(tuple, "type"), "link<", NULL);
> +
> +        if (is_child || is_link) {
>              child_path = g_strdup_printf("%s/%s",
>                                           path, qdict_get_str(tuple, "name"));
> -            test_properties(child_path);
> +            test_properties(child_path, is_child);
>              g_free(child_path);
>          } else {
>              const char *prop = qdict_get_str(tuple, "name");
> @@ -87,7 +94,7 @@ static void test_machine(gconstpointer data)
>      args = g_strdup_printf("-machine %s", machine);
>      qtest_start(args);
>  
> -    test_properties("/machine");
> +    test_properties("/machine", true);
>  
>      response = qmp("{ 'execute': 'quit' }");
>      g_assert(qdict_haskey(response, "return"));
>

Am 12.04.2014 00:07, schrieb Cole Robinson:
> But don't test their properties, otherwise we will recurse forever.
> Their properties are already tested when we encounter them as child
> properties elsewhere in the hierarchy, like /machine/unattached/...
> 
> This would have caught the crash fixed by 92b3eead
> 
> Signed-off-by: Cole Robinson <crobinso@redhat.com>
> ---
>  tests/qom-test.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)

Sorry, slipped through... Tested and applied now:
https://github.com/afaerber/qemu-cpu/commits/qom-next

Thanks,
Andreas