From nobody Tue Feb 10 05:45:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574264557; cv=none; d=zoho.com; s=zohoarc; b=gqvYIEywQgRDc68CcwXDS24kqrF/XGFzofcUHMLGdXZa6yt9+kqxwlau9TvRfWBEO5Rd166ym/qXiRFQVdSYe0DYyzEij3fSHl/xkiEwnfx2xBodjM8EuTUVldDMt5z1v6HHoahrGgrilaAgypBrK2tSl4xjem/k/g0h0NiEa0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574264557; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tLPNQ0lU7tbB+5rt3ylST9obxLlvq+ff1WfwDeQkDfk=; b=jB/xwXRcmzwXrTsyhm00FMSWXCPbNN000KWgd0Gwh3MdAITocGgfDMdTdki7u6yEd4UoQ4mk6Xkx84F5UWvNtHK8fETHfSDJA4DdCdoJSVxsrP0DT0p/6881+xakwUytxTwcGQmC3PxjnA4ECrP79Y4O5BumEhj0gGWQ091aKSA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574264557042688.5263281536263; Wed, 20 Nov 2019 07:42:37 -0800 (PST) Received: from localhost ([::1]:59538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXS7n-00036G-Jl for importer@patchew.org; Wed, 20 Nov 2019 10:42:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34551) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXRuZ-0003lm-Ui for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:28:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXRuY-0007n5-SB for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:28:55 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:30619 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iXRuY-0007n0-OV for qemu-devel@nongnu.org; Wed, 20 Nov 2019 10:28:54 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-172-757NWRkaPfaR3mA7vLsvlQ-1; Wed, 20 Nov 2019 10:28:53 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E6932107ACC4; Wed, 20 Nov 2019 15:28:51 +0000 (UTC) Received: from localhost (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EB60503F1; Wed, 20 Nov 2019 15:28:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574263734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tLPNQ0lU7tbB+5rt3ylST9obxLlvq+ff1WfwDeQkDfk=; b=fC0YTecolR4zPFUwJLp1gSVR/YqpJVQsfGkMsOpahUkKHx9Yilg7stvVMhejZ+S2S9erii gpUGuh9G4IYJSCCkd7GTs4yPhbp0sOLP58waSX2i8ckVIOam5Di9cTaaPXkw3Skhc9w4D2 Qn2Inwn1MMQPuoh+M774z8mwSRpgsWs= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH v4 20/37] mips: use sysbus_mmio_get_region() instead of internal fields Date: Wed, 20 Nov 2019 19:24:25 +0400 Message-Id: <20191120152442.26657-21-marcandre.lureau@redhat.com> In-Reply-To: <20191120152442.26657-1-marcandre.lureau@redhat.com> References: <20191120152442.26657-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 757NWRkaPfaR3mA7vLsvlQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, "Michael S. Tsirkin" , Aleksandar Markovic , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Register the memory region with sysbus_init_mmio() and look it up with sysbus_mmio_get_region() to avoid accessing internal device fields. Suggested-by: Peter Maydell Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Aleksandar Markovic Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/serial.c | 1 + hw/mips/mips_mipssim.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/char/serial.c b/hw/char/serial.c index 23f0b02516..02c545ff8c 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -993,6 +993,7 @@ static void serial_io_realize(DeviceState *dev, Error *= *errp) qdev_init_nofail(DEVICE(s)); =20 memory_region_init_io(&s->io, NULL, &serial_io_ops, s, "serial", 8); + sysbus_init_mmio(SYS_BUS_DEVICE(sio), &s->io); sysbus_init_irq(SYS_BUS_DEVICE(sio), &s->irq); } =20 diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c index 2c2c7f25b2..84c03dd035 100644 --- a/hw/mips/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c @@ -227,7 +227,8 @@ mips_mipssim_init(MachineState *machine) qdev_set_legacy_instance_id(dev, 0x3f8, 2); qdev_init_nofail(dev); sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, env->irq[4]); - sysbus_add_io(SYS_BUS_DEVICE(dev), 0x3f8, &SERIAL_IO(dev)->serial.= io); + sysbus_add_io(SYS_BUS_DEVICE(dev), 0x3f8, + sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0)); } =20 if (nd_table[0].used) --=20 2.24.0