From patchwork Tue Aug 7 19:56:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 175778 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 AD1182C00A6 for ; Wed, 8 Aug 2012 05:56:26 +1000 (EST) Received: from localhost ([::1]:51517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyptA-0002EE-QQ for incoming@patchwork.ozlabs.org; Tue, 07 Aug 2012 15:56:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sypsq-00024C-8I for qemu-devel@nongnu.org; Tue, 07 Aug 2012 15:56:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sypso-0008Pd-RF for qemu-devel@nongnu.org; Tue, 07 Aug 2012 15:56:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sypso-0008Op-JE for qemu-devel@nongnu.org; Tue, 07 Aug 2012 15:56:02 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q77Ju1h2005982 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 7 Aug 2012 15:56:02 -0400 Received: from blackpad.lan.raisama.net (vpn1-5-224.gru2.redhat.com [10.97.5.224]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q77Ju1Im013210; Tue, 7 Aug 2012 15:56:01 -0400 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 2F6FA200488; Tue, 7 Aug 2012 16:56:58 -0300 (BRT) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 7 Aug 2012 16:56:47 -0300 Message-Id: <1344369413-9053-10-git-send-email-ehabkost@redhat.com> In-Reply-To: <1344369413-9053-1-git-send-email-ehabkost@redhat.com> References: <1344369413-9053-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gleb Natapov , Paolo Bonzini Subject: [Qemu-devel] [RFC 09/15] isolate qdev-independent parts of qdev_prop_set_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 Create a qdev-independent function, and use a callback that calls qdev_prop_parse(). Signed-off-by: Eduardo Habkost --- global-properties.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/global-properties.c b/global-properties.c index a1c3581..d99bcee 100644 --- a/global-properties.c +++ b/global-properties.c @@ -17,9 +17,20 @@ void qdev_prop_register_global_list(GlobalProperty *props) } } -void qdev_prop_set_globals(DeviceState *dev) +static void qdev_global_parse(Object *obj, const char *property, + const char *value, Error **errp) +{ + DeviceState *dev = DEVICE(obj); + qdev_prop_parse(dev, property, value, errp); +} + +static void object_set_globals(Object *obj, + void (*parse_fn)(Object *obj, + const char *property, + const char *value, + Error **errp)) { - ObjectClass *class = object_get_class(OBJECT(dev)); + ObjectClass *class = object_get_class(obj); do { GlobalProperty *prop; @@ -28,7 +39,7 @@ void qdev_prop_set_globals(DeviceState *dev) if (strcmp(object_class_get_name(class), prop->driver) != 0) { continue; } - qdev_prop_parse(dev, prop->property, prop->value, &err); + parse_fn(obj, prop->property, prop->value, &err); if (err) { qerror_report_err(err); exit(1); @@ -38,6 +49,11 @@ void qdev_prop_set_globals(DeviceState *dev) } while (class); } +void qdev_prop_set_globals(DeviceState *dev) +{ + return object_set_globals(OBJECT(dev), qdev_global_parse); +} + static int qdev_add_one_global(QemuOpts *opts, void *opaque) { GlobalProperty *g;