From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUgng-0002Z4-6p for qemu-devel@nongnu.org; Thu, 18 Sep 2014 14:51:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUgna-0006K5-2G for qemu-devel@nongnu.org; Thu, 18 Sep 2014 14:51:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUgnZ-0006JM-Qh for qemu-devel@nongnu.org; Thu, 18 Sep 2014 14:51:22 -0400 Date: Thu, 18 Sep 2014 21:54:33 +0300 From: "Michael S. Tsirkin" Message-ID: <1411066387-30889-8-git-send-email-mst@redhat.com> References: <1411066387-30889-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1411066387-30889-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v3 07/15] qdev: Rename qdev_prop_check_global() to qdev_prop_check_globals() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Eduardo Habkost , Stefan Hajnoczi , Don Slutz , Anthony Liguori , Igor Mammedov , Paolo Bonzini , =?us-ascii?B?PT9VVEYtOD9xP0FuZHJlYXM9MjBGPUMzPUE0cmJlcj89?= From: Eduardo Habkost Signed-off-by: Eduardo Habkost Acked-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/qdev-properties.h | 2 +- hw/core/qdev-properties.c | 2 +- tests/test-qdev-global-props.c | 2 +- vl.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 77fe3a1..ae56ee5 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/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 3d12560..9075453 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/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index 26d8cb2..e1b008a 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 9c9acf5..2aaa558 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); -- MST