From nobody Sat Apr 27 15:03:08 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515898437309961.2736061936652; Sat, 13 Jan 2018 18:53:57 -0800 (PST) Received: from localhost ([::1]:59091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaYQe-0005kc-IF for importer@patchew.org; Sat, 13 Jan 2018 21:53:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaYPc-0005G6-29 for qemu-devel@nongnu.org; Sat, 13 Jan 2018 21:52:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaYPZ-00029U-14 for qemu-devel@nongnu.org; Sat, 13 Jan 2018 21:52:44 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:32875) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaYPY-00028o-SJ for qemu-devel@nongnu.org; Sat, 13 Jan 2018 21:52:40 -0500 Received: by mail-qt0-x242.google.com with SMTP id e2so10540222qti.0 for ; Sat, 13 Jan 2018 18:52:40 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a27sm4270623qkj.94.2018.01.13.18.52.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jan 2018 18:52:39 -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=+0ALZVWnGdJqI/NF2ojkVXS5Vd6U+di9b7AxnDoVHO0=; b=X3Ff1t/Mtz6CkOdLYephnDieNjIkz86sYqVra2sFeT/ysmOwZxgJZ1de5FAxykpEy/ 4HDvWQgMKHmxZD6Qg1jrX2Ka4nzCr79giL5ify0HqUzViXV5MQD+g+cUH3yevmkTRIs3 mBY4qnJF1OaOzYmT2dsmYVCI2nRb0e8Ac8wotPHWSjjCuLAaEWvjRvJqFiYYlWy1Zsey LOOS1/cAhKraU8cLIpOMHDtenef5ZpVHrW43vH4xcmK87KBK0Ld8plak4Qvd5murvzGs BOakD+cQ/JTsRyMg4I/zYHBMfYzRzA9IP6T26eAAvxF9g6CryM6FbkEprG6kiadTszpj sSZQ== 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=+0ALZVWnGdJqI/NF2ojkVXS5Vd6U+di9b7AxnDoVHO0=; b=AAFu6K43rQeYtf/06+lEDbQQjYhaXtaTTmZvMGlwh0i8ZMhsvclpjZzhr8ZAv5KHCs 6tAYtHxKpEiXf+aQnX0d+m8Yi5cGmGYZiNuSs+RgQzSpigbbAM6I+bP+QJhB4KnLBgEV cVh5GN3YiEvYWNqRmGG7YLTa444GC37TMTMzM3ijBkSPdLQbVmY3qeV0VVuNKImeyXkg NFoKRBwOOcBWFDuokz/1fCxogWiPog948aPZqsCdT8ZXqJDzNWBHBeUj9xoYaUU6TLpj IANqJNq2LUgmQ+UUVDeSj5g4zWT9mHZJGHwFL9TKJNo8yCL9zAzpeqdwjp8MXIU+Dnx4 gU6g== X-Gm-Message-State: AKwxytdCqy1FriiK9LVIVuZAuYZalFJ0oHOo8cLG596fl+Z/T9tgBYxx GFRXuAIs97K6Yi5mptfu5cA= X-Google-Smtp-Source: ACJfBouCuRCy2F4kf8HyhjUd6yd0uC6Smpdk5cGlBXpIsPpVRd/E3EXp56myWjzVxyEpjOG7aBAQBw== X-Received: by 10.237.62.81 with SMTP id m17mr25553756qtf.88.1515898360314; Sat, 13 Jan 2018 18:52:40 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Eduardo Habkost , Marcel Apfelbaum Date: Sat, 13 Jan 2018 23:52:34 -0300 Message-Id: <20180114025234.29436-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::242 Subject: [Qemu-devel] [PATCH] sysbus: convert init() to realize() 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: Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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/core/sysbus.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index 5d0887f499..0531eb60ce 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -18,6 +18,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/sysbus.h" #include "monitor/monitor.h" #include "exec/address-spaces.h" @@ -200,15 +201,15 @@ void sysbus_init_ioports(SysBusDevice *dev, uint32_t = ioport, uint32_t size) } } =20 -static int sysbus_device_init(DeviceState *dev) +static void sysbus_device_realize(DeviceState *dev, Error **errp) { SysBusDevice *sd =3D SYS_BUS_DEVICE(dev); SysBusDeviceClass *sbc =3D SYS_BUS_DEVICE_GET_CLASS(sd); =20 - if (!sbc->init) { - return 0; + if (sbc->init && sbc->init(sd)) { + error_setg(errp, "sysbus device initialization failed"); + return; } - return sbc->init(sd); } =20 DeviceState *sysbus_create_varargs(const char *name, @@ -324,7 +325,7 @@ MemoryRegion *sysbus_address_space(SysBusDevice *dev) static void sysbus_device_class_init(ObjectClass *klass, void *data) { DeviceClass *k =3D DEVICE_CLASS(klass); - k->init =3D sysbus_device_init; + k->realize =3D sysbus_device_realize; k->bus_type =3D TYPE_SYSTEM_BUS; /* * device_add plugs devices into a suitable bus. For "real" buses, --=20 2.15.1