From patchwork Sun Sep 20 08:20:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Cave-Ayland X-Patchwork-Id: 273246 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C056C43465 for ; Sun, 20 Sep 2020 08:22:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2698C20809 for ; Sun, 20 Sep 2020 08:22:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2698C20809 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ilande.co.uk Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJubu-00050n-5Z for qemu-devel@archiver.kernel.org; Sun, 20 Sep 2020 04:22:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJuaO-0003O6-Jf; Sun, 20 Sep 2020 04:20:42 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:56512 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJuaL-0003pO-0N; Sun, 20 Sep 2020 04:20:40 -0400 Received: from host81-154-161-117.range81-154.btcentralplus.com ([81.154.161.117] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kJuak-0006Dn-QA; Sun, 20 Sep 2020 09:21:07 +0100 From: Mark Cave-Ayland To: armbru@redhat.com, david@gibson.dropbear.id.au, atar4qemu@gmail.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Sun, 20 Sep 2020 09:20:12 +0100 Message-Id: <20200920082018.16135-1-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 81.154.161.117 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 0/6] QOM minor fixes X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This series started off as a fix for the nd_table misuse in the sparc32-ledma device as pointed out by Markus, and then I remembered there was similar issue around the use of serial_hd() in macio. The last patch is one I've had sitting in a local branch for a while and is a mistake I made during the original sabre.c split which seems appropriate to include here. Signed-off-by: Mark Cave-Ayland Mark Cave-Ayland (6): sparc32-dma: use object_initialize_child() for espdma and ledma child objects sparc32-ledma: use object_initialize_child() for lance child object sparc32-espdma: use object_initialize_child() for esp child object sparc32-ledma: don't reference nd_table directly within the device macio: don't reference serial_hd() directly within the device sabre: don't call sysbus_mmio_map() in sabre_realize() hw/dma/sparc32_dma.c | 49 +++++++++++++++++----------------- hw/misc/macio/macio.c | 5 +--- hw/pci-host/sabre.c | 8 ------ hw/ppc/mac_newworld.c | 6 +++++ hw/ppc/mac_oldworld.c | 6 +++++ hw/sparc/sun4m.c | 21 +++++++++------ hw/sparc64/sun4u.c | 7 +++++ include/hw/sparc/sparc32_dma.h | 8 +++--- 8 files changed, 61 insertions(+), 49 deletions(-) Reviewed-by: Philippe Mathieu-Daudé