From patchwork Wed Apr 11 21:30:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 151909 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 3C571B7063 for ; Thu, 12 Apr 2012 08:41:34 +1000 (EST) Received: from localhost ([::1]:34600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI58t-0000Zc-I2 for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 17:31:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI57v-0006ot-MY for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:30:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SI57t-0002Xf-Ry for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:30:55 -0400 Received: from mail-wg0-f53.google.com ([74.125.82.53]:57372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI57t-0002Vt-J4 for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:30:53 -0400 Received: by mail-wg0-f53.google.com with SMTP id fm10so1220918wgb.10 for ; Wed, 11 Apr 2012 14:30:52 -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=KrKMPsgwgh4dR3XzKTh23TNSdMke726pzJIRQ844yp0=; b=QC9hYVRnNIEAJbvcOZowskC/XkzemnI07M04cNb209GC+1/Np1ZTf1/6o/QX3xPl6W ZlORwQX6gaG0k92EImwVRLDfmeuDjIdkOg09jjLN4FMXKEDDC2xDsYr8st64kC1fKfZd 7jfXXLr2Q1f5G6R61AKpwH2Dd7owb6X/XRIr4FenSA0mZiEimdJKzmyzGck2SpuvgUwP k8FrjadOfiCyXhlk9IUSrQXO1NiPOsJm32eVSa7X4AtZvlxUV1C4VJ0ICT76IenZKMa0 wQsYvuh8wcFKG3AGQg7UVPPDFfmFWzwFJcpzhIqbI3Lvp4Sji38CcgtBnonjVipmmwik aZTA== Received: by 10.216.137.30 with SMTP id x30mr682wei.34.1334179852703; Wed, 11 Apr 2012 14:30:52 -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.30.50 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Apr 2012 14:30:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 11 Apr 2012 23:30:23 +0200 Message-Id: <1334179842-6061-5-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.53 Cc: aliguori@us.ibm.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 05/24] qdev: push "type" property up to Object 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 Now that Object is a type, add an instance_init function and push the "type" property from qdev to there. Signed-off-by: Paolo Bonzini Reviewed-by: Andreas Färber --- hw/qdev.c | 6 ------ qom/object.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 0d3c0fc..bb6c1aa 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -510,11 +510,6 @@ char* qdev_get_fw_dev_path(DeviceState *dev) return strdup(path); } -static char *qdev_get_type(Object *obj, Error **errp) -{ - return g_strdup(object_get_typename(obj)); -} - /** * Legacy property handling */ @@ -630,7 +625,6 @@ static void device_initfn(Object *obj) 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)); } diff --git a/qom/object.c b/qom/object.c index 585619d..f3ffaa6 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1215,6 +1215,16 @@ void object_property_add_str(Object *obj, const char *name, prop, errp); } +static char *qdev_get_type(Object *obj, Error **errp) +{ + return g_strdup(object_get_typename(obj)); +} + +static void object_instance_init(Object *obj) +{ + object_property_add_str(obj, "type", qdev_get_type, NULL, NULL); +} + static void register_types(void) { static TypeInfo interface_info = { @@ -1226,6 +1236,7 @@ static void register_types(void) static TypeInfo object_info = { .name = TYPE_OBJECT, .instance_size = sizeof(Object), + .instance_init = object_instance_init, .abstract = true, };