From patchwork Mon Jun 20 15:53:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9187989 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 91F2E607D1 for ; Mon, 20 Jun 2016 15:58:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8133A2766D for ; Mon, 20 Jun 2016 15:58:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7617E2780C; Mon, 20 Jun 2016 15:58:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2338C2766D for ; Mon, 20 Jun 2016 15:58:38 +0000 (UTC) Received: from localhost ([::1]:44558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bF1av-0002zp-6Z for patchwork-qemu-devel@patchwork.kernel.org; Mon, 20 Jun 2016 11:58:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bF1WO-000718-Uu for qemu-devel@nongnu.org; Mon, 20 Jun 2016 11:54:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bF1WM-0005Ji-W4 for qemu-devel@nongnu.org; Mon, 20 Jun 2016 11:53:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46115) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bF1WM-0005Jb-Nc for qemu-devel@nongnu.org; Mon, 20 Jun 2016 11:53:54 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 444F13F77F1 for ; Mon, 20 Jun 2016 15:53:54 +0000 (UTC) Received: from localhost (vpn1-7-222.gru2.redhat.com [10.97.7.222]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u5KFrr2d010923; Mon, 20 Jun 2016 11:53:53 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org, Markus Armbruster Date: Mon, 20 Jun 2016 12:53:02 -0300 Message-Id: <1466437983-27133-10-git-send-email-ehabkost@redhat.com> In-Reply-To: <1466437983-27133-1-git-send-email-ehabkost@redhat.com> References: <1466437983-27133-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 20 Jun 2016 15:53:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 09/10] qdev: Remove qdev_prop_register_global_list() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcel Apfelbaum , Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The function is not used by any QEMU code, except for the test-qdev-global-props unit test. Signed-off-by: Eduardo Habkost Reviewed-by: Marcel Apfelbaum Reviewed-by: Markus Armbruster --- Changes v1 -> v2: * (New patch in series) --- hw/core/qdev-properties.c | 9 --------- include/hw/qdev-properties.h | 1 - tests/test-qdev-global-props.c | 12 ++++++------ 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 733cc45..cf1d47f 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1027,15 +1027,6 @@ void qdev_prop_register_global(GlobalProperty *prop) global_props = g_list_append(global_props, prop); } -void qdev_prop_register_global_list(GlobalProperty *props) -{ - int i; - - for (i = 0; props[i].driver != NULL; i++) { - qdev_prop_register_global(props+i); - } -} - static void qdev_prop_set_globals_for_type(DeviceState *dev, const char *typename) { diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 3bd5ea9..3d25c00 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -190,7 +190,6 @@ void qdev_prop_set_enum(DeviceState *dev, const char *name, int value); 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); void qdev_prop_set_globals(DeviceState *dev); void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev, Property *prop, const char *value); diff --git a/tests/test-qdev-global-props.c b/tests/test-qdev-global-props.c index 37394fa..29c704f 100644 --- a/tests/test-qdev-global-props.c +++ b/tests/test-qdev-global-props.c @@ -78,12 +78,9 @@ static void test_static_prop(void) static void test_static_globalprop(void) { MyType *mt; - static GlobalProperty props[] = { - { TYPE_STATIC_PROPS, "prop1", "200" }, - {} - }; + static GlobalProperty prop = { TYPE_STATIC_PROPS, "prop1", "200" }; - qdev_prop_register_global_list(props); + qdev_prop_register_global(&prop); mt = STATIC_TYPE(object_new(TYPE_STATIC_PROPS)); qdev_init_nofail(DEVICE(mt)); @@ -182,6 +179,7 @@ static const TypeInfo nondevice_type = { static void test_dynamic_globalprop(void) { MyType *mt; + int i; static GlobalProperty props[] = { { TYPE_DYNAMIC_PROPS, "prop1", "101", }, { TYPE_DYNAMIC_PROPS, "prop2", "102", }, @@ -190,7 +188,9 @@ static void test_dynamic_globalprop(void) {} }; - qdev_prop_register_global_list(props); + for (i = 0; props[i].driver; i++) { + qdev_prop_register_global(props + i); + } mt = DYNAMIC_TYPE(object_new(TYPE_DYNAMIC_PROPS)); qdev_init_nofail(DEVICE(mt));