From patchwork Wed Feb 20 05:29:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 221949 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 298842C0082 for ; Wed, 20 Feb 2013 16:30:45 +1100 (EST) Received: from localhost ([::1]:49696 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U82GR-0004U1-Aj for incoming@patchwork.ozlabs.org; Wed, 20 Feb 2013 00:30:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:35351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U82GE-0004Nt-5D for qemu-devel@nongnu.org; Wed, 20 Feb 2013 00:30:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U82GC-0004Hx-5j for qemu-devel@nongnu.org; Wed, 20 Feb 2013 00:30:30 -0500 Received: from mail-pb0-f41.google.com ([209.85.160.41]:62219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U82GB-0004Hr-V3 for qemu-devel@nongnu.org; Wed, 20 Feb 2013 00:30:28 -0500 Received: by mail-pb0-f41.google.com with SMTP id um15so2673188pbc.0 for ; Tue, 19 Feb 2013 21:30:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references:x-gm-message-state; bh=jiKTYM4BupU8QCY+AU/Z/bW/VqPONMUaex71fGzwWIU=; b=c6lf582+UEo2sxC4P11m7vU25XG1F8weJjQMzOI8z37e+ECb0HY99KPb1SZ0wAjodC dGP6WnfAhdKa9kWwux4x6GJnLpCb45KSR+6VzI5/aVrlieYEBzJoqLFl7dd1WXjYR3Sj 3iuRmnunsL3Wbq2ph7qj58WGYYDGAVUZ6yOYWO2nvK0F3J7+wCzPxI2oqT7iYmC3S1pg u6gZ8B6BXCZ35+CHQDgMusmV4GzfLbc0TbCsqcTXxoP2DpOI4PL3imtR3ujnvvckckSg wtaIaZLe9IJgbOdLqm2dKV/ZGJJJxX8DjxqZIm5tWWQW9PiQqF/Llp50daTnpeZUNKNM QgaA== X-Received: by 10.66.147.39 with SMTP id th7mr567059pab.136.1361338227185; Tue, 19 Feb 2013 21:30:27 -0800 (PST) Received: from localhost ([1.128.17.184]) by mx.google.com with ESMTPS id ax3sm20410826pbd.42.2013.02.19.21.30.23 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Tue, 19 Feb 2013 21:30:26 -0800 (PST) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Wed, 20 Feb 2013 15:29:55 +1000 Message-Id: <39c6213ff89afdff8709597c67011fabee910fda.1361337686.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQkrSuxexEkHcUHnGfqvdxwlR+Bn+6wm/Ft66K8k0NNosH0uA6IFZjRtOhknxWacBNyBnviE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.160.41 Cc: edgar.iglesias@gmail.com, Peter Crosthwaite , peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH v1 2/6] i2c: Add no_init version of i2c_create_slave 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 Add a version of i2c_create_slave that does not qdev init the created device. This give the machine model a chance to set properites of the created device before qdev_init time. Based on equivalent function in ssi.c. Signed-off-by: Peter Crosthwaite --- hw/i2c.c | 11 ++++++++++- hw/i2c.h | 2 ++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/hw/i2c.c b/hw/i2c.c index a9004e6..db2a5d9 100644 --- a/hw/i2c.c +++ b/hw/i2c.c @@ -216,12 +216,21 @@ static int i2c_slave_qdev_init(DeviceState *dev) return sc->init(s); } -DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr) + +DeviceState *i2c_create_slave_no_init(i2c_bus *bus, const char *name, + uint8_t addr) { DeviceState *dev; dev = qdev_create(&bus->qbus, name); qdev_prop_set_uint8(dev, "address", addr); + return dev; +} + +DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr) +{ + DeviceState *dev = i2c_create_slave_no_init(bus, name, addr); + qdev_init_nofail(dev); return dev; } diff --git a/hw/i2c.h b/hw/i2c.h index 0021125..9f761bc 100644 --- a/hw/i2c.h +++ b/hw/i2c.h @@ -68,6 +68,8 @@ int i2c_recv(i2c_bus *bus); #define FROM_I2C_SLAVE(type, dev) DO_UPCAST(type, i2c, dev) DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr); +DeviceState *i2c_create_slave_no_init(i2c_bus *bus, const char *name, + uint8_t addr); /* wm8750.c */ void wm8750_data_req_set(DeviceState *dev,