From patchwork Wed Apr 11 21:30:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 151911 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 9C3D9B7069 for ; Thu, 12 Apr 2012 08:42:58 +1000 (EST) Received: from localhost ([::1]:34601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI58t-0000Zd-Ai for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 17:31:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI585-0007LK-Rb for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:31:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SI583-0002Zr-PT for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:31:05 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:35576) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI583-0002YG-HB for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:31:03 -0400 Received: by mail-we0-f173.google.com with SMTP id p12so992253wer.4 for ; Wed, 11 Apr 2012 14:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=xuywGb0PG7l+xYg6SfcXZ++Gj/Qxa3vQlGOQIzV81DE=; b=ISfFpBl/vUoS87UMGlciWVtZ34Bfa1+Z1aS3i8eJpZcZ8lwxOI4rYZ57MF0qWIo6Q7 L+iY6eg9zyzXhlgb3QP/Ox3FSO+InzEN9w6ozo4u69SiNnHrJGaw5uO3zDc1XLpaVH4e ZMhThZkvJBYzGUaMkx0/ip2/CvVcenZSw6soW/CpytfDhbuqQmFv8WdXYCAgCdMKROIQ vkp9fKQTC4kjJoXdUpEbU5qmU07HhH3Zg2T65lJg7BrLPFD5MFHcrfN5J5zt/1AY1xIO /kRk8U+Bo7zupcpGi2/s+A5nx+rzpnrRuqwunhPfUTwf/WElRHKsNDOUYvKyRNib7COA EADg== Received: by 10.180.80.70 with SMTP id p6mr9846484wix.21.1334179862671; Wed, 11 Apr 2012 14:31:02 -0700 (PDT) Received: from yakj.lan (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id h8sm13849678wix.4.2012.04.11.14.31.01 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Apr 2012 14:31:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 11 Apr 2012 23:30:30 +0200 Message-Id: <1334179842-6061-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.9.3 In-Reply-To: <1334179793-5914-1-git-send-email-pbonzini@redhat.com> References: <1334179793-5914-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 Cc: aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 12/24] qdev: remove qdev_prop_set_defaults 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 Fold its functionality in qdev_property_add_static. Signed-off-by: Paolo Bonzini --- hw/qdev-properties.c | 22 ---------------------- hw/qdev.c | 26 +++++++++++++++++++++++--- hw/qdev.h | 1 - 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index bf46075..60fef9a 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -1084,28 +1084,6 @@ void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value) *ptr = value; } -void qdev_prop_set_defaults(DeviceState *dev, Property *props) -{ - Object *obj = OBJECT(dev); - if (!props) - return; - for (; props->name; props++) { - Error *errp = NULL; - if (props->qtype == QTYPE_NONE) { - continue; - } - if (props->qtype == QTYPE_QBOOL) { - object_property_set_bool(obj, props->defval, props->name, &errp); - } else if (props->info->enum_table) { - object_property_set_str(obj, props->info->enum_table[props->defval], - props->name, &errp); - } else if (props->qtype == QTYPE_QINT) { - object_property_set_int(obj, props->defval, props->name, &errp); - } - assert_no_error(errp); - } -} - static QTAILQ_HEAD(, GlobalProperty) global_props = QTAILQ_HEAD_INITIALIZER(global_props); static void qdev_prop_register_global(GlobalProperty *prop) diff --git a/hw/qdev.c b/hw/qdev.c index fb3b961..f371248 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -571,6 +571,9 @@ void qdev_property_add_legacy(DeviceState *dev, Property *prop, void qdev_property_add_static(DeviceState *dev, Property *prop, Error **errp) { + Error *local_err = NULL; + Object *obj = OBJECT(dev); + /* * TODO qdev_prop_ptr does not have getters or setters. It must * go now that it can be replaced with links. The test should be @@ -580,10 +583,28 @@ void qdev_property_add_static(DeviceState *dev, Property *prop, return; } - object_property_add(OBJECT(dev), prop->name, prop->info->name, + object_property_add(obj, prop->name, prop->info->name, prop->info->get, prop->info->set, prop->info->release, - prop, errp); + prop, &local_err); + + if (local_err) { + error_propagate(errp, local_err); + return; + } + if (prop->qtype == QTYPE_NONE) { + return; + } + + if (prop->qtype == QTYPE_QBOOL) { + object_property_set_bool(obj, prop->defval, prop->name, &local_err); + } else if (prop->info->enum_table) { + object_property_set_str(obj, prop->info->enum_table[prop->defval], + prop->name, &local_err); + } else if (prop->qtype == QTYPE_QINT) { + object_property_set_int(obj, prop->defval, prop->name, &local_err); + } + assert_no_error(local_err); } static void device_initfn(Object *obj) @@ -606,7 +627,6 @@ static void device_initfn(Object *obj) qdev_property_add_legacy(dev, prop, NULL); qdev_property_add_static(dev, prop, NULL); } - qdev_prop_set_defaults(dev, DEVICE_CLASS(class)->props); class = object_class_get_parent(class); } while (class != object_class_by_name(TYPE_DEVICE)); qdev_prop_set_globals(dev); diff --git a/hw/qdev.h b/hw/qdev.h index 3bef10c..aea53c8 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -307,7 +307,6 @@ void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *value); void qdev_prop_set_enum(DeviceState *dev, const char *name, int value); /* FIXME: Remove opaque pointer properties. */ void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value); -void qdev_prop_set_defaults(DeviceState *dev, Property *props); void qdev_prop_register_global_list(GlobalProperty *props); void qdev_prop_set_globals(DeviceState *dev);