| Message ID | 20181107123652.23417-2-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Generalize machine compatibility properties | expand |
On Wed, 7 Nov 2018 16:36:39 +0400 Marc-André Lureau <marcandre.lureau@redhat.com> wrote: > Instead, it returns 1 if an error was detected, which is the case for: > > /qdev/properties/dynamic/global/subprocess: > warning: global dynamic-prop-type-bad.prop3 has invalid class name > warning: global nohotplug-type.prop5=105 not used > warning: global nondevice-type.prop6 has invalid class name > > Clarify the function return value. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > tests/test-qdev-global-props.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c > index d81b0862d5..ccdf6c57c1 100644 > --- a/tests/test-qdev-global-props.c > +++ b/tests/test-qdev-global-props.c > @@ -214,7 +214,7 @@ static void test_dynamic_globalprop_subprocess(void) > { TYPE_NONDEVICE, "prop6", "106", true }, > {} > }; > - int all_used; > + int global_error; > > qdev_prop_register_global_list(props); > > @@ -223,8 +223,8 @@ static void test_dynamic_globalprop_subprocess(void) > > g_assert_cmpuint(mt->prop1, ==, 101); > g_assert_cmpuint(mt->prop2, ==, 102); > - all_used = qdev_prop_check_globals(); > - g_assert_cmpuint(all_used, ==, 1); > + global_error = qdev_prop_check_globals(); > + g_assert_cmpuint(global_error, ==, 1); > g_assert(props[0].used); > g_assert(props[1].used); > g_assert(!props[2].used); > @@ -259,7 +259,7 @@ static void test_dynamic_globalprop_nouser_subprocess(void) > { TYPE_NONDEVICE, "prop6", "106" }, > {} > }; > - int all_used; > + int global_error; > > qdev_prop_register_global_list(props); > > @@ -268,8 +268,8 @@ static void test_dynamic_globalprop_nouser_subprocess(void) > > g_assert_cmpuint(mt->prop1, ==, 101); > g_assert_cmpuint(mt->prop2, ==, 102); > - all_used = qdev_prop_check_globals(); > - g_assert_cmpuint(all_used, ==, 0); > + global_error = qdev_prop_check_globals(); > + g_assert_cmpuint(global_error, ==, 0); > g_assert(props[0].used); > g_assert(props[1].used); > g_assert(!props[2].used);
diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index d81b0862d5..ccdf6c57c1 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -214,7 +214,7 @@ static void test_dynamic_globalprop_subprocess(void) { TYPE_NONDEVICE, "prop6", "106", true }, {} }; - int all_used; + int global_error; qdev_prop_register_global_list(props); @@ -223,8 +223,8 @@ static void test_dynamic_globalprop_subprocess(void) g_assert_cmpuint(mt->prop1, ==, 101); g_assert_cmpuint(mt->prop2, ==, 102); - all_used = qdev_prop_check_globals(); - g_assert_cmpuint(all_used, ==, 1); + global_error = qdev_prop_check_globals(); + g_assert_cmpuint(global_error, ==, 1); g_assert(props[0].used); g_assert(props[1].used); g_assert(!props[2].used); @@ -259,7 +259,7 @@ static void test_dynamic_globalprop_nouser_subprocess(void) { TYPE_NONDEVICE, "prop6", "106" }, {} }; - int all_used; + int global_error; qdev_prop_register_global_list(props); @@ -268,8 +268,8 @@ static void test_dynamic_globalprop_nouser_subprocess(void) g_assert_cmpuint(mt->prop1, ==, 101); g_assert_cmpuint(mt->prop2, ==, 102); - all_used = qdev_prop_check_globals(); - g_assert_cmpuint(all_used, ==, 0); + global_error = qdev_prop_check_globals(); + g_assert_cmpuint(global_error, ==, 0); g_assert(props[0].used); g_assert(props[1].used); g_assert(!props[2].used);
Instead, it returns 1 if an error was detected, which is the case for: /qdev/properties/dynamic/global/subprocess: warning: global dynamic-prop-type-bad.prop3 has invalid class name warning: global nohotplug-type.prop5=105 not used warning: global nondevice-type.prop6 has invalid class name Clarify the function return value. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- tests/test-qdev-global-props.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)