From patchwork Fri Oct 5 00:08:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 189373 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 111362C0316 for ; Fri, 5 Oct 2012 10:09:36 +1000 (EST) Received: from localhost ([::1]:49095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJvTx-0002oa-Ti for incoming@patchwork.ozlabs.org; Thu, 04 Oct 2012 20:09:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJvTg-0002e7-Rz for qemu-devel@nongnu.org; Thu, 04 Oct 2012 20:09:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJvTf-0001iB-7o for qemu-devel@nongnu.org; Thu, 04 Oct 2012 20:09:16 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:42758) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJvTf-0001gF-1e for qemu-devel@nongnu.org; Thu, 04 Oct 2012 20:09:15 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so1027227pad.4 for ; Thu, 04 Oct 2012 17:09:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=+dyLPT3VGxme0bCyg2QdkSaUPJjTb7iPluzl5pA95PI=; b=dU8JRIsheezbdD8OgPqHwGIhWYgHnB3Ki5nupjXhEc+wNqKTaQMYDS/B8IWpw4dyUi eO/xS0ASa6x01FPIVWEaexzSQo3kpnFSkcqXOY5ufm5eueRbPKDh95ICPkOUJV/cUIH2 GHBzjraSRka6rBKITo151rveadSCF3/cbCigu4/WKysJ2j3bvr+sd70f4wz0huKFmrQP FEivAkgoFVRcnx44C6M4XjufuTdhozEJziObRTUpnx7FqEYY3d2DmOtw5/DxjPnpTfo+ L+zzQPbrp7iZoJyDte81K584ov5QEzmbUrTR2r5MYChLJOHUN1fA6MMqz/oH4bjhxEXb FRcg== Received: by 10.66.87.105 with SMTP id w9mr17322962paz.5.1349395754219; Thu, 04 Oct 2012 17:09:14 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id qd6sm5076619pbb.34.2012.10.04.17.09.11 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Oct 2012 17:09:13 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org, edgar.iglesias@gmail.com, blauwirbel@gmail.com, aliguori@us.ibm.com Date: Fri, 5 Oct 2012 10:08:48 +1000 Message-Id: <1349395739-26502-4-git-send-email-peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1349395739-26502-1-git-send-email-peter.crosthwaite@xilinx.com> References: <1349395739-26502-1-git-send-email-peter.crosthwaite@xilinx.com> X-Gm-Message-State: ALoCoQlE/EbyHj8jiPnfecpgIEUN5N/TNARqV1+8zRxbwNMH7k/aRDAzQllZSKa1lIA6O6TXM4jL X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: peter.crosthwaite@petalogix.com Subject: [Qemu-devel] [PATCH 03/14] ssi: Added create_slave_no_init() 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 From: Peter A. G. Crosthwaite Slave creation function that can be used to create an SSI slave without qdev_init() being called. This give machine models a chance to set properties. Signed-off-by: Peter A. G. Crosthwaite --- hw/ssi.c | 9 +++++++-- hw/ssi.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/ssi.c b/hw/ssi.c index 2e4f2fe..c47419d 100644 --- a/hw/ssi.c +++ b/hw/ssi.c @@ -86,10 +86,15 @@ static TypeInfo ssi_slave_info = { .abstract = true, }; +DeviceState *ssi_create_slave_no_init(SSIBus *bus, const char *name) +{ + return qdev_create(&bus->qbus, name); +} + DeviceState *ssi_create_slave(SSIBus *bus, const char *name) { - DeviceState *dev; - dev = qdev_create(&bus->qbus, name); + DeviceState *dev = ssi_create_slave_no_init(bus, name); + qdev_init_nofail(dev); return dev; } diff --git a/hw/ssi.h b/hw/ssi.h index 65b159d..2bde9f5 100644 --- a/hw/ssi.h +++ b/hw/ssi.h @@ -76,6 +76,7 @@ extern const VMStateDescription vmstate_ssi_slave; } DeviceState *ssi_create_slave(SSIBus *bus, const char *name); +DeviceState *ssi_create_slave_no_init(SSIBus *bus, const char *name); /* Master interface. */ SSIBus *ssi_create_bus(DeviceState *parent, const char *name);