From nobody Fri May 3 04:17:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515898008343782.3984048184913; Sat, 13 Jan 2018 18:46:48 -0800 (PST) Received: from localhost ([::1]:58650 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaYJo-0003RS-FW for importer@patchew.org; Sat, 13 Jan 2018 21:46:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaYIf-00031N-IX for qemu-devel@nongnu.org; Sat, 13 Jan 2018 21:45:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaYIe-0003Dv-Oj for qemu-devel@nongnu.org; Sat, 13 Jan 2018 21:45:33 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:45296) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaYIe-0003DG-Fg for qemu-devel@nongnu.org; Sat, 13 Jan 2018 21:45:32 -0500 Received: by mail-qt0-x244.google.com with SMTP id x27so2485688qtm.12 for ; Sat, 13 Jan 2018 18:45:32 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id j49sm6356416qtc.61.2018.01.13.18.45.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jan 2018 18:45:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8y45K7wC+sh9g3X5BUNU5iHfJs0eDF4PADHdrJEk0Ks=; b=B+BN/kl8vd1nHAE7iBXhbRoBqxBrbHynmGsTzm+MSohxaPgrQlUN5TLxSAd2/x8MPs fB8SrH5tpw9c2wb/Ic5RS3mi+OdpP1/Xqk4EXU3unmPhFpfRwG7GsON5mjqm7/ryX8cd zCoisstnhC3zXLm+S25FmJR0qbvF+S4dXVvNTC3SKifIqq6sJgTy2gBi4d0oQ9zmy4aB kMByxEcX3gRQAMfB4vbcuHXEXPnH/TNiBSAnSmZPKXUTGqFBK+z5g6Ix07GtI+mjfDsc TUk/sBPIaHXeIXaYQDrpyECOILPRREhUyh9oTHOpLP9dNUOirIz1FyuDG9LjfJmY55DP 1lRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=8y45K7wC+sh9g3X5BUNU5iHfJs0eDF4PADHdrJEk0Ks=; b=a0Y1huNlJvXLRGrs29P6vWfxl6lDYndNguEqwZ2q2R+8bYnT3I1eCmMB8P3u8sqML8 wAw6UiPeWjHyl2To6/c7+NTBLPC8KcqQhCApexf2Fk9urt7pzWuKexPFOFSYfjeeGqnO wBa1Hc2b+IenZh14qn6/279T8KkmsxHVUfBwl0XsIQ41wB+S6QzXGyXzxWIMYoxvWuZh Hw7KeDXgsj0ZgcAbl+kZFqLuZiWFPGXYy7iIfh5281CRc06uVLvnKa0vosssYtKj9ZoR Af0FUIfoSN6231uNHs7O/AMXSq2BSrtqnZ7wFmfP1i8Vbm1eoQzhdyYqup768LsdRK99 Z0cA== X-Gm-Message-State: AKwxytfcl6qIslcJeVdijYQfXjCtGOunEcCrZD7lgcfyA3pNGlw9PBk7 9JyFGa+cl/4ZrBhffBtsI58= X-Google-Smtp-Source: ACJfBotXs0H5338ByAn3Jsj6MIiD0ku9B157qvYdHT5FmQhjpt6G2mn/WkPtY8acbH7fy9p55xMZcg== X-Received: by 10.200.112.10 with SMTP id x10mr176507qtm.295.1515897931872; Sat, 13 Jan 2018 18:45:31 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Andreas=20F=C3=A4rber?= , KONRAD Frederic Date: Sat, 13 Jan 2018 23:45:24 -0300 Message-Id: <20180114024524.28821-1-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH] hw/i2c: QOM'ify i2c slave X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Corey Minyard , qemu-devel@nongnu.org, Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i2c/core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 59068f157e..c84dbfb884 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -8,6 +8,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/i2c/i2c.h" =20 typedef struct I2CNode I2CNode; @@ -276,16 +277,15 @@ const VMStateDescription vmstate_i2c_slave =3D { } }; =20 -static int i2c_slave_qdev_init(DeviceState *dev) +static void i2c_slave_realize(DeviceState *dev, Error **errp) { I2CSlave *s =3D I2C_SLAVE(dev); I2CSlaveClass *sc =3D I2C_SLAVE_GET_CLASS(s); =20 - if (sc->init) { - return sc->init(s); + if (sc->init && sc->init(s)) { + error_setg(errp, "i2c slave initialization failed"); + return; } - - return 0; } =20 DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) @@ -301,7 +301,7 @@ DeviceState *i2c_create_slave(I2CBus *bus, const char *= name, uint8_t addr) static void i2c_slave_class_init(ObjectClass *klass, void *data) { DeviceClass *k =3D DEVICE_CLASS(klass); - k->init =3D i2c_slave_qdev_init; + k->realize =3D i2c_slave_realize; set_bit(DEVICE_CATEGORY_MISC, k->categories); k->bus_type =3D TYPE_I2C_BUS; k->props =3D i2c_props; --=20 2.15.1