From patchwork Wed Apr 11 21:30:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 151925 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 E8631B7058 for ; Thu, 12 Apr 2012 09:16:30 +1000 (EST) Received: from localhost ([::1]:35643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI59M-000150-PL for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 17:32:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI58O-0008Ii-Si for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:31:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SI58M-0002fx-Tn for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:31:24 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:57046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI58M-0002Yo-Lh for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:31:22 -0400 Received: by mail-wg0-f41.google.com with SMTP id ds1so4435982wgb.4 for ; Wed, 11 Apr 2012 14:31:21 -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=sW7HmnWaoblJZBX2CE60+iFzrf8bAA5hx7sL0uSNlkY=; b=MHeRX5xIrXV/3d8eaarqCoiChOCKVbfDgCOCy1tzaOrqY7ts1vDEDuFAiTFwc6CMlo gJN1yckZN3rWaWjWmHrqQjFiY+EPG7gk9c3HAUUYqQqz5emLRQtbo1LCRJnh2QFc/32E 35p5zLRSisUGRH/VHuR7VH9zeNiaxY3uU2Y36/NzlvCYTtcMUV73gwmkttffLV6SfUBK wzTEKopcf8i8ARhCOWZWsouSP9qDVj1xe6rTOKCwgDQXiqLntm8/V/xywElmTirvHFmw Xe2SHFQMcyRLBx8X+GZnnTYn6PzozKwbF4czriQTpsct4Py7q5D2dYEMXsJ/H26QrBIH lqRQ== Received: by 10.216.144.6 with SMTP id m6mr8726690wej.43.1334179881791; Wed, 11 Apr 2012 14:31:21 -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.20 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Apr 2012 14:31:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 11 Apr 2012 23:30:41 +0200 Message-Id: <1334179842-6061-23-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.41 Cc: aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 23/24] qdev: implement qdev_init on top of realize 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 Finally, switch the qdev_init function to simply set the "realized" property to true. The old contents of qdev_init become the realize and realize_children methods. Signed-off-by: Paolo Bonzini --- hw/qdev.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 38e3831..8641d29 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -119,17 +119,17 @@ DeviceState *qdev_try_create(BusState *bus, const char *type) calling this function. On failure, destroy the device and return negative value. Return 0 on success. */ -int qdev_init(DeviceState *dev) +static void device_realize(Object *obj, Error **errp) { + DeviceState *dev = DEVICE(obj); DeviceClass *dc = DEVICE_GET_CLASS(dev); int rc; - assert(!object_is_realized(OBJECT(dev))); - rc = dc->init(dev); if (rc < 0) { qdev_free(dev); - return rc; + error_set(errp, QERR_INVALID_PARAMETER_COMBINATION); + return; } if (!OBJECT(dev)->parent) { @@ -146,11 +146,28 @@ int qdev_init(DeviceState *dev) dev->instance_id_alias, dev->alias_required_for_version); } - OBJECT(dev)->state = OBJECT_STATE_REALIZED; +} + +static void device_realize_children(Object *obj, Error **errp) +{ + DeviceState *dev = DEVICE(obj); + Error *err = NULL; + + object_realize_children(OBJECT(dev), &err); + if (err) { + error_propagate(errp, err); + return; + } if (dev->hotplugged) { device_reset(dev); } - return 0; +} + +int qdev_init(DeviceState *dev) +{ + Error *err = NULL; + object_property_set_bool(OBJECT(dev), true, "realized", &err); + return err ? -EINVAL : 0; } void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, @@ -628,6 +645,12 @@ Object *qdev_get_machine(void) return dev; } +static void device_class_init(ObjectClass *klass, void *data) +{ + klass->realize = device_realize; + klass->realize_children = device_realize_children; +} + static TypeInfo device_type_info = { .name = TYPE_DEVICE, .parent = TYPE_OBJECT, @@ -636,6 +659,7 @@ static TypeInfo device_type_info = { .instance_finalize = device_finalize, .abstract = true, .class_size = sizeof(DeviceClass), + .class_init = device_class_init, }; static void qdev_register_types(void)