diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-08-08 16:03:30 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-09-18 21:51:24 +0300 |
| commit | d828c430eb7dd481d6399f8b56e9641e47a40cea (patch) | |
| tree | f874fc831e88d73a6979ccce2434c20a1912b3f4 | |
| parent | 08ac80cd614ca4c81cc8799749977d5ff02d4ea5 (diff) | |
| download | focaccia-qemu-d828c430eb7dd481d6399f8b56e9641e47a40cea.tar.gz focaccia-qemu-d828c430eb7dd481d6399f8b56e9641e47a40cea.zip | |
qdev: Rename qdev_prop_check_global() to qdev_prop_check_globals()
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/core/qdev-properties.c | 2 | ||||
| -rw-r--r-- | include/hw/qdev-properties.h | 2 | ||||
| -rw-r--r-- | tests/test-qdev-global-props.c | 2 | ||||
| -rw-r--r-- | vl.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 3d12560f43..9075453f2d 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -955,7 +955,7 @@ void qdev_prop_register_global_list(GlobalProperty *props) } } -int qdev_prop_check_global(void) +int qdev_prop_check_globals(void) { GlobalProperty *prop; int ret = 0; diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 77fe3a12b7..ae56ee59a4 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -177,7 +177,7 @@ void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value); void qdev_prop_register_global(GlobalProperty *prop); void qdev_prop_register_global_list(GlobalProperty *props); -int qdev_prop_check_global(void); +int qdev_prop_check_globals(void); void qdev_prop_set_globals(DeviceState *dev, Error **errp); void qdev_prop_set_globals_for_type(DeviceState *dev, const char *typename, Error **errp); diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index 26d8cb2da7..e1b008af11 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -224,7 +224,7 @@ static void test_dynamic_globalprop_subprocess(void) g_assert_cmpuint(mt->prop1, ==, 101); g_assert_cmpuint(mt->prop2, ==, 102); - all_used = qdev_prop_check_global(); + all_used = qdev_prop_check_globals(); g_assert_cmpuint(all_used, ==, 1); g_assert(!props[0].not_used); g_assert(!props[1].not_used); diff --git a/vl.c b/vl.c index 9c9acf5e65..2aaa558893 100644 --- a/vl.c +++ b/vl.c @@ -4541,7 +4541,7 @@ int main(int argc, char **argv, char **envp) } } - qdev_prop_check_global(); + qdev_prop_check_globals(); if (vmstate_dump_file) { /* dump and exit */ dump_vmstate_json_to_file(vmstate_dump_file); |