From nobody Wed Feb 11 03:43:51 2026 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 1524173467146741.9698093458388; Thu, 19 Apr 2018 14:31:07 -0700 (PDT) Received: from localhost ([::1]:50177 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9H90-0005IE-8c for importer@patchew.org; Thu, 19 Apr 2018 17:31:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9H5k-0002ZP-AW for qemu-devel@nongnu.org; Thu, 19 Apr 2018 17:27:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9H5i-0007ro-RK for qemu-devel@nongnu.org; Thu, 19 Apr 2018 17:27:44 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:45000) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9H5i-0007rb-LX for qemu-devel@nongnu.org; Thu, 19 Apr 2018 17:27:42 -0400 Received: by mail-qk0-x243.google.com with SMTP id h200so6325788qke.11 for ; Thu, 19 Apr 2018 14:27:42 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id c137sm3571570qkb.2.2018.04.19.14.27.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 14:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UJNJ4lkjbCpLTwnANDMb8az/iSkbjEuJVSivFgSLzNE=; b=Rx6PqNsObdm7ck9lbCql71EtioLrTKIJk4WqMIE7VHKmNJfLqDJjGy1heNzlN7z7Lf oDNoE41LQnYFAtJJxZugLI1v9sTAaSH0c+LbEkXfYG/cOd4Lg7nagwtPx0vx03fDSNXt fVdC6M9RZklGJMlNJICsZOgaZAbAVf3k4m9OdYCbOz8WpPx9Nd3DwNK5Sg+pHYD9btlA HvxiAh7mtjCPPYq2wqcJRx6Hc3w9jRUN2rt4STV4y4fz78/Mov5kJAFLO8TmcDdYcfwe 7NEdABbTpNW3akceQwH36cJvFgVHMNf67qicCbDe2wr0Y2lJtq5CZq0Ie7jyssY+RiaY xZZg== 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 :in-reply-to:references:mime-version:content-transfer-encoding; bh=UJNJ4lkjbCpLTwnANDMb8az/iSkbjEuJVSivFgSLzNE=; b=sB4UpWbcuk2s7HvucY1SiUu28NUoEN7PCcQpVpPLFSpCVuUIKp/sHGBdKCMv0Bb+VD vkkWeahazSwiFlqPAUOrvaUakGP2h1Of4VUicYtOhIz68NtED8QuVlHBRtDZzD1UWmXO ZVBcTJFT3P70/UuXklckPho6G+U45h5++vL1jld/WZl8KkKvZor2erS3QF8HLlO7tLpy GimahqMp/XWR5Lm5tewPQP+ueRcUdLQaKXvGKjCjIFpIQYeb+z4ZOw8p2pMIqCqTiH+E iuPuXB9Eb/dI1P7RPj1iGQIhTpXemur7oPVs/1DOsrkf+osimi4jcI+sFsJnowzMt/c2 1X0Q== X-Gm-Message-State: ALQs6tA4IkI6+90E0HemB1WdvKJqWKvebsy/TfDx11wI5u0/JY6a+NEb V6lZJTRGDjsr7wbEIqKjx4k= X-Google-Smtp-Source: AB8JxZpcExiq/8KD2ptvz+K3RkUt/tHtlj3iqvE+E4tiT+ruUvdnBu50wqFCKDvFqBw+4ZE/C7e7Dw== X-Received: by 10.55.136.3 with SMTP id k3mr7815139qkd.126.1524173262008; Thu, 19 Apr 2018 14:27:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Eduardo Habkost , Markus Armbruster Date: Thu, 19 Apr 2018 18:27:25 -0300 Message-Id: <20180419212727.26095-3-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180419212727.26095-1-f4bug@amsat.org> References: <20180419212727.26095-1-f4bug@amsat.org> 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:c09::243 Subject: [Qemu-devel] [PATCH v3 2/4] hw/i2c: Use DeviceClass::realize instead of I2CSlaveClass::init 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 , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Gerd Hoffmann , Paolo Bonzini 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 I2CSlaveClass::init is no more used, remove it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster --- include/hw/i2c/i2c.h | 3 --- hw/audio/wm8750.c | 8 +++----- hw/display/ssd0303.c | 9 ++++----- hw/gpio/max7310.c | 9 ++++----- hw/i2c/core.c | 13 ------------- hw/input/lm832x.c | 9 ++++----- hw/misc/tmp105.c | 7 +++---- hw/misc/tmp421.c | 8 +++----- hw/nvram/eeprom_at24c.c | 24 +++++++++++------------- hw/timer/twl92230.c | 11 ++++------- 10 files changed, 36 insertions(+), 65 deletions(-) diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index d727379b48..5dc166158b 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -28,9 +28,6 @@ typedef struct I2CSlave I2CSlave; typedef struct I2CSlaveClass { DeviceClass parent_class; =20 - /* Callbacks provided by the device. */ - int (*init)(I2CSlave *dev); - /* Master to slave. Returns non-zero for a NAK, 0 for success. */ int (*send)(I2CSlave *s, uint8_t data); =20 diff --git a/hw/audio/wm8750.c b/hw/audio/wm8750.c index 416a78e869..f4aa838f62 100644 --- a/hw/audio/wm8750.c +++ b/hw/audio/wm8750.c @@ -617,14 +617,12 @@ static const VMStateDescription vmstate_wm8750 =3D { } }; =20 -static int wm8750_init(I2CSlave *i2c) +static void wm8750_realize(DeviceState *dev, Error **errp) { - WM8750State *s =3D WM8750(i2c); + WM8750State *s =3D WM8750(dev); =20 AUD_register_card(CODEC, &s->card); wm8750_reset(I2C_SLAVE(s)); - - return 0; } =20 #if 0 @@ -707,7 +705,7 @@ static void wm8750_class_init(ObjectClass *klass, void = *data) DeviceClass *dc =3D DEVICE_CLASS(klass); I2CSlaveClass *sc =3D I2C_SLAVE_CLASS(klass); =20 - sc->init =3D wm8750_init; + dc->realize =3D wm8750_realize; sc->event =3D wm8750_event; sc->recv =3D wm8750_rx; sc->send =3D wm8750_tx; diff --git a/hw/display/ssd0303.c b/hw/display/ssd0303.c index 68a80b9d64..eb90ba26be 100644 --- a/hw/display/ssd0303.c +++ b/hw/display/ssd0303.c @@ -297,13 +297,12 @@ static const GraphicHwOps ssd0303_ops =3D { .gfx_update =3D ssd0303_update_display, }; =20 -static int ssd0303_init(I2CSlave *i2c) +static void ssd0303_realize(DeviceState *dev, Error **errp) { - ssd0303_state *s =3D SSD0303(i2c); + ssd0303_state *s =3D SSD0303(dev); =20 - s->con =3D graphic_console_init(DEVICE(i2c), 0, &ssd0303_ops, s); + s->con =3D graphic_console_init(dev, 0, &ssd0303_ops, s); qemu_console_resize(s->con, 96 * MAGNIFY, 16 * MAGNIFY); - return 0; } =20 static void ssd0303_class_init(ObjectClass *klass, void *data) @@ -311,7 +310,7 @@ static void ssd0303_class_init(ObjectClass *klass, void= *data) DeviceClass *dc =3D DEVICE_CLASS(klass); I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); =20 - k->init =3D ssd0303_init; + dc->realize =3D ssd0303_realize; k->event =3D ssd0303_event; k->recv =3D ssd0303_recv; k->send =3D ssd0303_send; diff --git a/hw/gpio/max7310.c b/hw/gpio/max7310.c index 4c203ef5c6..a560e3afd2 100644 --- a/hw/gpio/max7310.c +++ b/hw/gpio/max7310.c @@ -182,14 +182,13 @@ static void max7310_gpio_set(void *opaque, int line, = int level) =20 /* MAX7310 is SMBus-compatible (can be used with only SMBus protocols), * but also accepts sequences that are not SMBus so return an I2C device. = */ -static int max7310_init(I2CSlave *i2c) +static void max7310_realize(DeviceState *dev, Error **errp) { - MAX7310State *s =3D MAX7310(i2c); + I2CSlave *i2c =3D I2C_SLAVE(dev); + MAX7310State *s =3D MAX7310(dev); =20 qdev_init_gpio_in(&i2c->qdev, max7310_gpio_set, 8); qdev_init_gpio_out(&i2c->qdev, s->handler, 8); - - return 0; } =20 static void max7310_class_init(ObjectClass *klass, void *data) @@ -197,7 +196,7 @@ static void max7310_class_init(ObjectClass *klass, void= *data) DeviceClass *dc =3D DEVICE_CLASS(klass); I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); =20 - k->init =3D max7310_init; + dc->realize =3D max7310_realize; k->event =3D max7310_event; k->recv =3D max7310_rx; k->send =3D max7310_tx; diff --git a/hw/i2c/core.c b/hw/i2c/core.c index cfccefca3d..ab72d5bf2b 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -258,18 +258,6 @@ const VMStateDescription vmstate_i2c_slave =3D { } }; =20 -static int i2c_slave_qdev_init(DeviceState *dev) -{ - I2CSlave *s =3D I2C_SLAVE(dev); - I2CSlaveClass *sc =3D I2C_SLAVE_GET_CLASS(s); - - if (sc->init) { - return sc->init(s); - } - - return 0; -} - DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr) { DeviceState *dev; @@ -283,7 +271,6 @@ 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; set_bit(DEVICE_CATEGORY_MISC, k->categories); k->bus_type =3D TYPE_I2C_BUS; k->props =3D i2c_props; diff --git a/hw/input/lm832x.c b/hw/input/lm832x.c index d39953126b..74da30d9ca 100644 --- a/hw/input/lm832x.c +++ b/hw/input/lm832x.c @@ -464,20 +464,19 @@ static const VMStateDescription vmstate_lm_kbd =3D { }; =20 =20 -static int lm8323_init(I2CSlave *i2c) +static void lm8323_realize(DeviceState *dev, Error **errp) { - LM823KbdState *s =3D LM8323(i2c); + LM823KbdState *s =3D LM8323(dev); =20 s->model =3D 0x8323; s->pwm.tm[0] =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, lm_kbd_pwm0_tick, s); s->pwm.tm[1] =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, lm_kbd_pwm1_tick, s); s->pwm.tm[2] =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, lm_kbd_pwm2_tick, s); - qdev_init_gpio_out(DEVICE(i2c), &s->nirq, 1); + qdev_init_gpio_out(dev, &s->nirq, 1); =20 lm_kbd_reset(s); =20 qemu_register_reset((void *) lm_kbd_reset, s); - return 0; } =20 void lm832x_key_event(DeviceState *dev, int key, int state) @@ -505,7 +504,7 @@ static void lm8323_class_init(ObjectClass *klass, void = *data) DeviceClass *dc =3D DEVICE_CLASS(klass); I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); =20 - k->init =3D lm8323_init; + dc->realize =3D lm8323_realize; k->event =3D lm_i2c_event; k->recv =3D lm_i2c_rx; k->send =3D lm_i2c_tx; diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c index 9e22d64e36..0918f3a6ea 100644 --- a/hw/misc/tmp105.c +++ b/hw/misc/tmp105.c @@ -229,15 +229,14 @@ static void tmp105_reset(I2CSlave *i2c) tmp105_interrupt_update(s); } =20 -static int tmp105_init(I2CSlave *i2c) +static void tmp105_realize(DeviceState *dev, Error **errp) { + I2CSlave *i2c =3D I2C_SLAVE(dev); TMP105State *s =3D TMP105(i2c); =20 qdev_init_gpio_out(&i2c->qdev, &s->pin, 1); =20 tmp105_reset(&s->i2c); - - return 0; } =20 static void tmp105_initfn(Object *obj) @@ -252,7 +251,7 @@ static void tmp105_class_init(ObjectClass *klass, void = *data) DeviceClass *dc =3D DEVICE_CLASS(klass); I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); =20 - k->init =3D tmp105_init; + dc->realize =3D tmp105_realize; k->event =3D tmp105_event; k->recv =3D tmp105_rx; k->send =3D tmp105_tx; diff --git a/hw/misc/tmp421.c b/hw/misc/tmp421.c index 4a505abbce..c234044305 100644 --- a/hw/misc/tmp421.c +++ b/hw/misc/tmp421.c @@ -335,13 +335,11 @@ static void tmp421_reset(I2CSlave *i2c) s->status =3D 0; } =20 -static int tmp421_init(I2CSlave *i2c) +static void tmp421_realize(DeviceState *dev, Error **errp) { - TMP421State *s =3D TMP421(i2c); + TMP421State *s =3D TMP421(dev); =20 tmp421_reset(&s->i2c); - - return 0; } =20 static void tmp421_initfn(Object *obj) @@ -366,7 +364,7 @@ static void tmp421_class_init(ObjectClass *klass, void = *data) I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); TMP421Class *sc =3D TMP421_CLASS(klass); =20 - k->init =3D tmp421_init; + dc->realize =3D tmp421_realize; k->event =3D tmp421_event; k->recv =3D tmp421_rx; k->send =3D tmp421_tx; diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index 22183f5360..27cd01e615 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -116,31 +116,29 @@ int at24c_eeprom_send(I2CSlave *s, uint8_t data) return 0; } =20 -static -int at24c_eeprom_init(I2CSlave *i2c) +static void at24c_eeprom_realize(DeviceState *dev, Error **errp) { - EEPROMState *ee =3D AT24C_EE(i2c); - - ee->mem =3D g_malloc0(ee->rsize); + EEPROMState *ee =3D AT24C_EE(dev); =20 if (ee->blk) { int64_t len =3D blk_getlength(ee->blk); =20 if (len !=3D ee->rsize) { - ERR(TYPE_AT24C_EE " : Backing file size %lu !=3D %u\n", - (unsigned long)len, (unsigned)ee->rsize); - exit(1); + error_setg(errp, "%s: Backing file size %" PRId64 " !=3D %u", + TYPE_AT24C_EE, len, ee->rsize); + return; } =20 if (blk_set_perm(ee->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_WRIT= E, BLK_PERM_ALL, &error_fatal) < 0) { - ERR(TYPE_AT24C_EE - " : Backing file incorrect permission\n"); - exit(1); + error_setg(errp, "%s: Backing file incorrect permission", + TYPE_AT24C_EE); + return; } } - return 0; + + ee->mem =3D g_malloc0(ee->rsize); } =20 static @@ -178,7 +176,7 @@ void at24c_eeprom_class_init(ObjectClass *klass, void *= data) DeviceClass *dc =3D DEVICE_CLASS(klass); I2CSlaveClass *k =3D I2C_SLAVE_CLASS(klass); =20 - k->init =3D &at24c_eeprom_init; + dc->realize =3D &at24c_eeprom_realize; k->event =3D &at24c_eeprom_event; k->recv =3D &at24c_eeprom_recv; k->send =3D &at24c_eeprom_send; diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index ef116c636c..3b43b46199 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -853,10 +853,9 @@ static const VMStateDescription vmstate_menelaus =3D { } }; =20 -static int twl92230_init(I2CSlave *i2c) +static void twl92230_realize(DeviceState *dev, Error **errp) { - DeviceState *dev =3D DEVICE(i2c); - MenelausState *s =3D TWL92230(i2c); + MenelausState *s =3D TWL92230(dev); =20 s->rtc.hz_tm =3D timer_new_ms(rtc_clock, menelaus_rtc_hz, s); /* Three output pins plus one interrupt pin. */ @@ -865,9 +864,7 @@ static int twl92230_init(I2CSlave *i2c) /* Three input pins plus one power-button pin. */ qdev_init_gpio_in(dev, menelaus_gpio_set, 4); =20 - menelaus_reset(i2c); - - return 0; + menelaus_reset(I2C_SLAVE(dev)); } =20 static void twl92230_class_init(ObjectClass *klass, void *data) @@ -875,7 +872,7 @@ static void twl92230_class_init(ObjectClass *klass, voi= d *data) DeviceClass *dc =3D DEVICE_CLASS(klass); I2CSlaveClass *sc =3D I2C_SLAVE_CLASS(klass); =20 - sc->init =3D twl92230_init; + dc->realize =3D twl92230_realize; sc->event =3D menelaus_event; sc->recv =3D menelaus_rx; sc->send =3D menelaus_tx; --=20 2.17.0