From patchwork Sat Feb 4 08:02:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 139540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 03C92104792 for ; Sat, 4 Feb 2012 19:28:01 +1100 (EST) Received: from localhost ([::1]:55276 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RtayP-0006Sz-1H for incoming@patchwork.ozlabs.org; Sat, 04 Feb 2012 03:27:53 -0500 Received: from eggs.gnu.org ([140.186.70.92]:34893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtaaq-0002Dq-6c for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rtaak-0005Jg-PF for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:31 -0500 Received: from mail-we0-f173.google.com ([74.125.82.173]:45017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtaai-00057i-Uw for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:25 -0500 Received: by mail-we0-f173.google.com with SMTP id h12so3839010wer.4 for ; Sat, 04 Feb 2012 00:03:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=LG4lQxS3Va3F/X9ymnqos/Xm//AZQO6ltnuyyLN3Q04=; b=LzV+HDgUiP4xnRJi6KtapLdxIjkCN/7RvTkw+258Qe/dWBZ97umwxKx6M/8vZyC5jO BRsDhTv5grc+T5U/Y82wYbsvxg9jekVvPE83Zp1Gk1h3zV7Y4w+lq70pFV7dBFzfKGu1 p6sFLDHm91KTUAhS/qc0AliLEQRqBfA1pwDXg= Received: by 10.216.137.129 with SMTP id y1mr439965wei.59.1328342604294; Sat, 04 Feb 2012 00:03:24 -0800 (PST) Received: from yakj.usersys.redhat.com.ACCOR.COM (218.104-246-81.adsl-static.isp.belgacom.be. [81.246.104.218]) by mx.google.com with ESMTPS id m8sm24963019wia.11.2012.02.04.00.03.23 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 04 Feb 2012 00:03:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 4 Feb 2012 09:02:54 +0100 Message-Id: <1328342577-25732-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1328342577-25732-1-git-send-email-pbonzini@redhat.com> References: <1328342577-25732-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 Subject: [Qemu-devel] [PATCH v2 24/27] qdev: initialize properties via QOM 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 Similarly, use the object properties also to set the default values of the qdev properties. This requires reordering registration and initialization. Signed-off-by: Paolo Bonzini Reviewed-by: Anthony Liguori --- hw/qdev-properties.c | 29 ++++++++++++++--------------- hw/qdev.c | 4 ++-- hw/qdev.h | 11 +++++++---- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index b3cd2a8..49bed30 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -26,17 +26,6 @@ static void bit_prop_set(DeviceState *dev, Property *props, bool val) *p &= ~mask; } -static void qdev_prop_cpy(DeviceState *dev, Property *props, void *src) -{ - if (props->info->type == PROP_TYPE_BIT) { - bool *defval = src; - bit_prop_set(dev, props, *defval); - } else { - char *dst = qdev_get_prop_ptr(dev, props); - memcpy(dst, src, props->info->size); - } -} - /* Bit */ static int parse_bit(DeviceState *dev, Property *prop, const char *str) { @@ -1241,13 +1230,23 @@ void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value) void qdev_prop_set_defaults(DeviceState *dev, Property *props) { + Object *obj = OBJECT(dev); if (!props) return; - while (props->name) { - if (props->defval) { - qdev_prop_cpy(dev, props, props->defval); + for (; props->name; props++) { + Error *errp = NULL; + if (props->qtype == QTYPE_NONE) { + continue; } - props++; + 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(!errp); } } diff --git a/hw/qdev.c b/hw/qdev.c index f719f14..dc1d1a1 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -86,11 +86,11 @@ void qdev_set_parent_bus(DeviceState *dev, BusState *bus) dev->parent_bus = bus; QTAILQ_INSERT_HEAD(&bus->children, dev, sibling); - qdev_prop_set_defaults(dev, dev->parent_bus->info->props); for (prop = qdev_get_bus_info(dev)->props; prop && prop->name; prop++) { qdev_property_add_legacy(dev, prop, NULL); qdev_property_add_static(dev, prop, NULL); } + qdev_prop_set_defaults(dev, dev->parent_bus->info->props); } /* Create a new device. This only initializes the device state structure @@ -612,13 +612,13 @@ static void device_initfn(Object *obj) dev->instance_id_alias = -1; dev->state = DEV_STATE_CREATED; - qdev_prop_set_defaults(dev, qdev_get_props(dev)); for (prop = qdev_get_props(dev); prop && prop->name; prop++) { qdev_property_add_legacy(dev, prop, NULL); qdev_property_add_static(dev, prop, NULL); } object_property_add_str(OBJECT(dev), "type", qdev_get_type, NULL, NULL); + qdev_prop_set_defaults(dev, qdev_get_props(dev)); } /* Unlink device from bus and free the structure. */ diff --git a/hw/qdev.h b/hw/qdev.h index 9ccd5c3..a3bcf0b 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -112,8 +112,9 @@ struct Property { const char *name; PropertyInfo *info; int offset; - int bitnr; - void *defval; + uint8_t bitnr; + uint8_t qtype; + int64_t defval; }; enum PropertyType { @@ -255,7 +256,8 @@ extern PropertyInfo qdev_prop_pci_devfn; .info = &(_prop), \ .offset = offsetof(_state, _field) \ + type_check(_type,typeof_field(_state, _field)), \ - .defval = (_type[]) { _defval }, \ + .qtype = QTYPE_QINT, \ + .defval = (_type)_defval, \ } #define DEFINE_PROP_BIT(_name, _state, _field, _bit, _defval) { \ .name = (_name), \ @@ -263,7 +265,8 @@ extern PropertyInfo qdev_prop_pci_devfn; .bitnr = (_bit), \ .offset = offsetof(_state, _field) \ + type_check(uint32_t,typeof_field(_state, _field)), \ - .defval = (bool[]) { (_defval) }, \ + .qtype = QTYPE_QBOOL, \ + .defval = (bool)_defval, \ } #define DEFINE_PROP_UINT8(_n, _s, _f, _d) \