test-aio: test timers on Windows too

[qemu.git] / tests / test-qmp-output-visitor.c

diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c
index f31d168d63612c5e08061d19c5020766b66fc002..74020de5e73eef84bb0b21defaa362a5dff3bee2 100644 (file)
--- a/tests/test-qmp-output-visitor.c
+++ b/tests/test-qmp-output-visitor.c
@@ -45,11 +45,11 @@ static void test_visitor_out_int(TestOutputVisitorData *data,
                                  const void *unused)
 {
     int64_t value = -42;
                                  const void *unused)
 {
     int64_t value = -42;

-    Error *errp = NULL;
+    Error *err = NULL;

     QObject *obj;
 
     QObject *obj;
 

-    visit_type_int(data->ov, &value, NULL, &errp);
-    g_assert(!errp);
+    visit_type_int(data->ov, &value, NULL, &err);
+    g_assert(!err);

 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);
 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);


@@ -62,12 +62,12 @@ static void test_visitor_out_int(TestOutputVisitorData *data,
 static void test_visitor_out_bool(TestOutputVisitorData *data,
                                   const void *unused)
 {
 static void test_visitor_out_bool(TestOutputVisitorData *data,
                                   const void *unused)
 {

-    Error *errp = NULL;
+    Error *err = NULL;

     bool value = true;
     QObject *obj;
 
     bool value = true;
     QObject *obj;
 

-    visit_type_bool(data->ov, &value, NULL, &errp);
-    g_assert(!errp);
+    visit_type_bool(data->ov, &value, NULL, &err);
+    g_assert(!err);

 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);
 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);


@@ -81,11 +81,11 @@ static void test_visitor_out_number(TestOutputVisitorData *data,
                                     const void *unused)
 {
     double value = 3.14;
                                     const void *unused)
 {
     double value = 3.14;

-    Error *errp = NULL;
+    Error *err = NULL;

     QObject *obj;
 
     QObject *obj;
 

-    visit_type_number(data->ov, &value, NULL, &errp);
-    g_assert(!errp);
+    visit_type_number(data->ov, &value, NULL, &err);
+    g_assert(!err);

 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);
 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);


@@ -99,11 +99,11 @@ static void test_visitor_out_string(TestOutputVisitorData *data,
                                     const void *unused)
 {
     char *string = (char *) "Q E M U";
                                     const void *unused)
 {
     char *string = (char *) "Q E M U";

-    Error *errp = NULL;
+    Error *err = NULL;

     QObject *obj;
 
     QObject *obj;
 

-    visit_type_str(data->ov, &string, NULL, &errp);
-    g_assert(!errp);
+    visit_type_str(data->ov, &string, NULL, &err);
+    g_assert(!err);

 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);
 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);


@@ -117,12 +117,12 @@ static void test_visitor_out_no_string(TestOutputVisitorData *data,
                                        const void *unused)
 {
     char *string = NULL;
                                        const void *unused)
 {
     char *string = NULL;

-    Error *errp = NULL;
+    Error *err = NULL;

     QObject *obj;
 
     /* A null string should return "" */
     QObject *obj;
 
     /* A null string should return "" */

-    visit_type_str(data->ov, &string, NULL, &errp);
-    g_assert(!errp);
+    visit_type_str(data->ov, &string, NULL, &err);
+    g_assert(!err);

 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);
 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);


@@ -135,13 +135,13 @@ static void test_visitor_out_no_string(TestOutputVisitorData *data,
 static void test_visitor_out_enum(TestOutputVisitorData *data,
                                   const void *unused)
 {
 static void test_visitor_out_enum(TestOutputVisitorData *data,
                                   const void *unused)
 {

-    Error *errp = NULL;
+    Error *err = NULL;

     QObject *obj;
     EnumOne i;
 
     for (i = 0; i < ENUM_ONE_MAX; i++) {
     QObject *obj;
     EnumOne i;
 
     for (i = 0; i < ENUM_ONE_MAX; i++) {

-        visit_type_EnumOne(data->ov, &i, "unused", &errp);
-        g_assert(!errp);
+        visit_type_EnumOne(data->ov, &i, "unused", &err);
+        g_assert(!err);

 
         obj = qmp_output_get_qobject(data->qov);
         g_assert(obj != NULL);
 
         obj = qmp_output_get_qobject(data->qov);
         g_assert(obj != NULL);


@@ -156,13 +156,13 @@ static void test_visitor_out_enum_errors(TestOutputVisitorData *data,
                                          const void *unused)
 {
     EnumOne i, bad_values[] = { ENUM_ONE_MAX, -1 };
                                          const void *unused)
 {
     EnumOne i, bad_values[] = { ENUM_ONE_MAX, -1 };

-    Error *errp;
+    Error *err;

 
     for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) {
 
     for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) {

-        errp = NULL;
-        visit_type_EnumOne(data->ov, &bad_values[i], "unused", &errp);
-        g_assert(errp);
-        error_free(errp);
+        err = NULL;
+        visit_type_EnumOne(data->ov, &bad_values[i], "unused", &err);
+        g_assert(err);
+        error_free(err);

     }
 }
 
     }
 }
 


@@ -176,14 +176,30 @@ typedef struct TestStruct
 static void visit_type_TestStruct(Visitor *v, TestStruct **obj,
                                   const char *name, Error **errp)
 {
 static void visit_type_TestStruct(Visitor *v, TestStruct **obj,
                                   const char *name, Error **errp)
 {

+    Error *err = NULL;
+

     visit_start_struct(v, (void **)obj, "TestStruct", name, sizeof(TestStruct),
     visit_start_struct(v, (void **)obj, "TestStruct", name, sizeof(TestStruct),

-                       errp);
+                       &err);
+    if (err) {
+        goto out;
+    }

 
 

-    visit_type_int(v, &(*obj)->integer, "integer", errp);
-    visit_type_bool(v, &(*obj)->boolean, "boolean", errp);
-    visit_type_str(v, &(*obj)->string, "string", errp);
+    visit_type_int(v, &(*obj)->integer, "integer", &err);
+    if (err) {
+        goto out_end;
+    }
+    visit_type_bool(v, &(*obj)->boolean, "boolean", &err);
+    if (err) {
+        goto out_end;
+    }
+    visit_type_str(v, &(*obj)->string, "string", &err);

 
 

-    visit_end_struct(v, errp);
+out_end:
+    error_propagate(errp, err);
+    err = NULL;
+    visit_end_struct(v, &err);
+out:
+    error_propagate(errp, err);

 }
 
 static void test_visitor_out_struct(TestOutputVisitorData *data,
 }
 
 static void test_visitor_out_struct(TestOutputVisitorData *data,


@@ -193,12 +209,12 @@ static void test_visitor_out_struct(TestOutputVisitorData *data,
                                .boolean = false,
                                .string = (char *) "foo"};
     TestStruct *p = &test_struct;
                                .boolean = false,
                                .string = (char *) "foo"};
     TestStruct *p = &test_struct;

-    Error *errp = NULL;
+    Error *err = NULL;

     QObject *obj;
     QDict *qdict;
 
     QObject *obj;
     QDict *qdict;
 

-    visit_type_TestStruct(data->ov, &p, NULL, &errp);
-    g_assert(!errp);
+    visit_type_TestStruct(data->ov, &p, NULL, &err);
+    g_assert(!err);

 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);
 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);


@@ -217,7 +233,7 @@ static void test_visitor_out_struct_nested(TestOutputVisitorData *data,
                                            const void *unused)
 {
     int64_t value = 42;
                                            const void *unused)
 {
     int64_t value = 42;

-    Error *errp = NULL;
+    Error *err = NULL;

     UserDefNested *ud2;
     QObject *obj;
     QDict *qdict, *dict1, *dict2, *dict3, *userdef;
     UserDefNested *ud2;
     QObject *obj;
     QDict *qdict, *dict1, *dict2, *dict3, *userdef;


@@ -231,17 +247,19 @@ static void test_visitor_out_struct_nested(TestOutputVisitorData *data,
     ud2->dict1.string1 = g_strdup(strings[1]);
     ud2->dict1.dict2.userdef1 = g_malloc0(sizeof(UserDefOne));
     ud2->dict1.dict2.userdef1->string = g_strdup(string);
     ud2->dict1.string1 = g_strdup(strings[1]);
     ud2->dict1.dict2.userdef1 = g_malloc0(sizeof(UserDefOne));
     ud2->dict1.dict2.userdef1->string = g_strdup(string);

-    ud2->dict1.dict2.userdef1->integer = value;
+    ud2->dict1.dict2.userdef1->base = g_new0(UserDefZero, 1);
+    ud2->dict1.dict2.userdef1->base->integer = value;

     ud2->dict1.dict2.string2 = g_strdup(strings[2]);
 
     ud2->dict1.has_dict3 = true;
     ud2->dict1.dict3.userdef2 = g_malloc0(sizeof(UserDefOne));
     ud2->dict1.dict3.userdef2->string = g_strdup(string);
     ud2->dict1.dict2.string2 = g_strdup(strings[2]);
 
     ud2->dict1.has_dict3 = true;
     ud2->dict1.dict3.userdef2 = g_malloc0(sizeof(UserDefOne));
     ud2->dict1.dict3.userdef2->string = g_strdup(string);

-    ud2->dict1.dict3.userdef2->integer = value;
+    ud2->dict1.dict3.userdef2->base = g_new0(UserDefZero, 1);
+    ud2->dict1.dict3.userdef2->base->integer = value;

     ud2->dict1.dict3.string3 = g_strdup(strings[3]);
 
     ud2->dict1.dict3.string3 = g_strdup(strings[3]);
 

-    visit_type_UserDefNested(data->ov, &ud2, "unused", &errp);
-    g_assert(!errp);
+    visit_type_UserDefNested(data->ov, &ud2, "unused", &err);
+    g_assert(!err);

 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);
 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);


@@ -279,17 +297,18 @@ static void test_visitor_out_struct_errors(TestOutputVisitorData *data,
                                            const void *unused)
 {
     EnumOne bad_values[] = { ENUM_ONE_MAX, -1 };
                                            const void *unused)
 {
     EnumOne bad_values[] = { ENUM_ONE_MAX, -1 };

-    UserDefOne u = { 0 }, *pu = &u;
-    Error *errp;
+    UserDefZero b;
+    UserDefOne u = { .base = &b }, *pu = &u;
+    Error *err;

     int i;
 
     for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) {
     int i;
 
     for (i = 0; i < ARRAY_SIZE(bad_values) ; i++) {

-        errp = NULL;
+        err = NULL;

         u.has_enum1 = true;
         u.enum1 = bad_values[i];
         u.has_enum1 = true;
         u.enum1 = bad_values[i];

-        visit_type_UserDefOne(data->ov, &pu, "unused", &errp);
-        g_assert(errp);
-        error_free(errp);
+        visit_type_UserDefOne(data->ov, &pu, "unused", &err);
+        g_assert(err);
+        error_free(err);

     }
 }
 
     }
 }
 


@@ -325,7 +344,7 @@ static void test_visitor_out_list(TestOutputVisitorData *data,
     const int max_items = 10;
     bool value_bool = true;
     int value_int = 10;
     const int max_items = 10;
     bool value_bool = true;
     int value_int = 10;

-    Error *errp = NULL;
+    Error *err = NULL;

     QListEntry *entry;
     QObject *obj;
     QList *qlist;
     QListEntry *entry;
     QObject *obj;
     QList *qlist;


@@ -342,8 +361,8 @@ static void test_visitor_out_list(TestOutputVisitorData *data,
         head = p;
     }
 
         head = p;
     }
 

-    visit_type_TestStructList(data->ov, &head, NULL, &errp);
-    g_assert(!errp);
+    visit_type_TestStructList(data->ov, &head, NULL, &err);
+    g_assert(!err);

 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);
 
     obj = qmp_output_get_qobject(data->qov);
     g_assert(obj != NULL);


@@ -391,7 +410,8 @@ static void test_visitor_out_list_qapi_free(TestOutputVisitorData *data,
         p->value->dict1.string1 = g_strdup(string);
         p->value->dict1.dict2.userdef1 = g_malloc0(sizeof(UserDefOne));
         p->value->dict1.dict2.userdef1->string = g_strdup(string);
         p->value->dict1.string1 = g_strdup(string);
         p->value->dict1.dict2.userdef1 = g_malloc0(sizeof(UserDefOne));
         p->value->dict1.dict2.userdef1->string = g_strdup(string);

-        p->value->dict1.dict2.userdef1->integer = 42;
+        p->value->dict1.dict2.userdef1->base = g_new0(UserDefZero, 1);
+        p->value->dict1.dict2.userdef1->base->integer = 42;

         p->value->dict1.dict2.string2 = g_strdup(string);
         p->value->dict1.has_dict3 = false;
 
         p->value->dict1.dict2.string2 = g_strdup(string);
         p->value->dict1.has_dict3 = false;
 


@@ -412,6 +432,7 @@ static void test_visitor_out_union(TestOutputVisitorData *data,
 
     UserDefUnion *tmp = g_malloc0(sizeof(UserDefUnion));
     tmp->kind = USER_DEF_UNION_KIND_A;
 
     UserDefUnion *tmp = g_malloc0(sizeof(UserDefUnion));
     tmp->kind = USER_DEF_UNION_KIND_A;

+    tmp->integer = 41;

     tmp->a = g_malloc0(sizeof(UserDefA));
     tmp->a->boolean = true;
 
     tmp->a = g_malloc0(sizeof(UserDefA));
     tmp->a->boolean = true;
 


@@ -423,6 +444,7 @@ static void test_visitor_out_union(TestOutputVisitorData *data,
     qdict = qobject_to_qdict(arg);
 
     g_assert_cmpstr(qdict_get_str(qdict, "type"), ==, "a");
     qdict = qobject_to_qdict(arg);
 
     g_assert_cmpstr(qdict_get_str(qdict, "type"), ==, "a");

+    g_assert_cmpint(qdict_get_int(qdict, "integer"), ==, 41);

 
     qvalue = qdict_get(qdict, "data");
     g_assert(data != NULL);
 
     qvalue = qdict_get(qdict, "data");
     g_assert(data != NULL);


@@ -434,6 +456,66 @@ static void test_visitor_out_union(TestOutputVisitorData *data,
     QDECREF(qdict);
 }
 
     QDECREF(qdict);
 }
 

+static void test_visitor_out_union_flat(TestOutputVisitorData *data,
+                                        const void *unused)
+{
+    QObject *arg;
+    QDict *qdict;
+
+    Error *err = NULL;
+
+    UserDefFlatUnion *tmp = g_malloc0(sizeof(UserDefFlatUnion));
+    tmp->kind = ENUM_ONE_VALUE1;
+    tmp->string = g_strdup("str");
+    tmp->value1 = g_malloc0(sizeof(UserDefA));
+    /* TODO when generator bug is fixed: tmp->integer = 41; */
+    tmp->value1->boolean = true;
+
+    visit_type_UserDefFlatUnion(data->ov, &tmp, NULL, &err);
+    g_assert(err == NULL);
+    arg = qmp_output_get_qobject(data->qov);
+
+    g_assert(qobject_type(arg) == QTYPE_QDICT);
+    qdict = qobject_to_qdict(arg);
+
+    g_assert_cmpstr(qdict_get_str(qdict, "enum1"), ==, "value1");
+    g_assert_cmpstr(qdict_get_str(qdict, "string"), ==, "str");
+    /* TODO g_assert_cmpint(qdict_get_int(qdict, "integer"), ==, 41); */
+    g_assert_cmpint(qdict_get_bool(qdict, "boolean"), ==, true);
+
+    qapi_free_UserDefFlatUnion(tmp);
+    QDECREF(qdict);
+}
+
+static void test_visitor_out_union_anon(TestOutputVisitorData *data,
+                                        const void *unused)
+{
+    QObject *arg;
+    Error *err = NULL;
+
+    UserDefAnonUnion *tmp = g_malloc0(sizeof(UserDefAnonUnion));
+    tmp->kind = USER_DEF_ANON_UNION_KIND_I;
+    tmp->i = 42;
+
+    visit_type_UserDefAnonUnion(data->ov, &tmp, NULL, &err);
+    g_assert(err == NULL);
+    arg = qmp_output_get_qobject(data->qov);
+
+    g_assert(qobject_type(arg) == QTYPE_QINT);
+    g_assert_cmpint(qint_get_int(qobject_to_qint(arg)), ==, 42);
+
+    qapi_free_UserDefAnonUnion(tmp);
+}
+
+static void test_visitor_out_empty(TestOutputVisitorData *data,
+                                   const void *unused)
+{
+    QObject *arg;
+
+    arg = qmp_output_get_qobject(data->qov);
+    g_assert(!arg);
+}
+

 static void init_native_list(UserDefNativeListUnion *cvalue)
 {
     int i;
 static void init_native_list(UserDefNativeListUnion *cvalue)
 {
     int i;


@@ -782,6 +864,12 @@ int main(int argc, char **argv)
                             &out_visitor_data, test_visitor_out_list_qapi_free);
     output_visitor_test_add("/visitor/output/union",
                             &out_visitor_data, test_visitor_out_union);
                             &out_visitor_data, test_visitor_out_list_qapi_free);
     output_visitor_test_add("/visitor/output/union",
                             &out_visitor_data, test_visitor_out_union);

+    output_visitor_test_add("/visitor/output/union-flat",
+                            &out_visitor_data, test_visitor_out_union_flat);
+    output_visitor_test_add("/visitor/output/union-anon",
+                            &out_visitor_data, test_visitor_out_union_anon);
+    output_visitor_test_add("/visitor/output/empty",
+                            &out_visitor_data, test_visitor_out_empty);

     output_visitor_test_add("/visitor/output/native_list/int",
                             &out_visitor_data, test_visitor_out_native_list_int);
     output_visitor_test_add("/visitor/output/native_list/int8",
     output_visitor_test_add("/visitor/output/native_list/int",
                             &out_visitor_data, test_visitor_out_native_list_int);
     output_visitor_test_add("/visitor/output/native_list/int8",