From patchwork Mon May 6 17:50:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 241737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 96CD22C00BD for ; Tue, 7 May 2013 03:51:04 +1000 (EST) Received: from localhost ([::1]:36654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZPZ0-0008JW-Rh for incoming@patchwork.ozlabs.org; Mon, 06 May 2013 13:51:02 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZPYY-0008Il-Mh for qemu-devel@nongnu.org; Mon, 06 May 2013 13:50:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UZPYX-000391-Gs for qemu-devel@nongnu.org; Mon, 06 May 2013 13:50:34 -0400 Received: from cantor2.suse.de ([195.135.220.15]:39394 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UZPYX-00038f-7B for qemu-devel@nongnu.org; Mon, 06 May 2013 13:50:33 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 9DD43A3B99; Mon, 6 May 2013 19:50:32 +0200 (CEST) Message-ID: <5187ED65.9060808@suse.de> Date: Mon, 06 May 2013 19:50:29 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Organization: SUSE LINUX Products GmbH User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: qemu-devel@nongnu.org References: <1367424440-16687-1-git-send-email-afaerber@suse.de> <1367424440-16687-3-git-send-email-afaerber@suse.de> In-Reply-To: <1367424440-16687-3-git-send-email-afaerber@suse.de> X-Enigmail-Version: 1.6a1pre X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: imammedo@redhat.com, ehabkost@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com Subject: Re: [Qemu-devel] [PATCH qom-cpu for-1.5 2/4] qdev: Introduce qdev_prop_set_custom_globals() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Am 01.05.2013 18:07, schrieb Andreas Färber: > Reuse it in qdev_prop_set_globals(). > > Signed-off-by: Andreas Färber > --- > hw/core/qdev-properties.c | 35 ++++++++++++++++++++++++----------- > include/hw/qdev-properties.h | 2 ++ > 2 files changed, 26 insertions(+), 11 deletions(-) Igor suggested to avoid "custom", so renaming to qdev_prop_set_globals_for_type(): Property *prop, const char *value); diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 68d1bff..3a324fb 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1099,15 +1099,15 @@ void qdev_prop_register_global_list(GlobalProperty *props) } } -void qdev_prop_set_custom_globals(DeviceState *dev, const char *driver, - Error **errp) +void qdev_prop_set_globals_for_type(DeviceState *dev, const char *typename, + Error **errp) { GlobalProperty *prop; QTAILQ_FOREACH(prop, &global_props, next) { Error *err = NULL; - if (strcmp(driver, prop->driver) != 0) { + if (strcmp(typename, prop->driver) != 0) { continue; } qdev_prop_parse(dev, prop->property, prop->value, &err); @@ -1125,7 +1125,8 @@ void qdev_prop_set_globals(DeviceState *dev, Error **errp) do { Error *err = NULL; - qdev_prop_set_custom_globals(dev, object_class_get_name(class), &err); + qdev_prop_set_globals_for_type(dev, object_class_get_name(class), + &err); if (err != NULL) { error_propagate(errp, err); return; diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 833300c..39448b7 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -169,8 +169,8 @@ 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, Error **errp); -void qdev_prop_set_custom_globals(DeviceState *dev, const char *driver, - Error **errp); +void qdev_prop_set_globals_for_type(DeviceState *dev, const char *typename, + Error **errp); void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev,