From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 47C73C433E0 for ; Mon, 15 Feb 2021 22:30:30 +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 D5A9F64DF4 for ; Mon, 15 Feb 2021 22:30:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5A9F64DF4 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]:38372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBmNx-0004zg-0s for qemu-devel@archiver.kernel.org; Mon, 15 Feb 2021 17:30:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBmNH-0004Tu-SN for qemu-devel@nongnu.org; Mon, 15 Feb 2021 17:29:47 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:38012 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 1lBmNG-0008Aa-CI for qemu-devel@nongnu.org; Mon, 15 Feb 2021 17:29:47 -0500 Received: from host109-153-84-1.range109-153.btcentralplus.com ([109.153.84.1] helo=[192.168.1.65]) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1lBmNV-0001Xv-Ld; Mon, 15 Feb 2021 22:30:07 +0000 To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu References: <20210209193018.31339-1-mark.cave-ayland@ilande.co.uk> <20210209193018.31339-4-mark.cave-ayland@ilande.co.uk> <743ad0ea-6b85-29cb-8f92-60b4d9f0e9de@amsat.org> From: Mark Cave-Ayland Message-ID: <4cdbc056-fc58-15f7-b480-860b1821974e@ilande.co.uk> Date: Mon, 15 Feb 2021 22:29:33 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <743ad0ea-6b85-29cb-8f92-60b4d9f0e9de@amsat.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 109.153.84.1 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: Re: [PATCH v2 03/42] esp: QOMify the internal ESP device state 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-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, 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" On 12/02/2021 18:51, Philippe Mathieu-Daudé wrote: > On 2/9/21 8:29 PM, Mark Cave-Ayland wrote: >> Make this new QOM device state a child device of both the sysbus-esp and esp-pci >> implementations. >> >> Signed-off-by: Mark Cave-Ayland >> --- >> hw/scsi/esp-pci.c | 48 +++++++++++++++++++++++++++++++------------ >> hw/scsi/esp.c | 45 +++++++++++++++++++++++++++++++++------- >> include/hw/scsi/esp.h | 5 +++++ >> 3 files changed, 78 insertions(+), 20 deletions(-) > > Please setup scripts/git.orderfile ;) I will have to take a look at this at some point - it has been on my TODO list for a while :) >> @@ -354,9 +365,11 @@ static void esp_pci_scsi_realize(PCIDevice *dev, Error **errp) >> { >> PCIESPState *pci = PCI_ESP(dev); >> DeviceState *d = DEVICE(dev); >> - ESPState *s = &pci->esp; >> + ESPState *s = ESP(&pci->esp); >> uint8_t *pci_conf; >> >> + qdev_realize(DEVICE(s), NULL, errp); > > if (!qdev_realize(DEVICE(s), NULL, errp)) { > return; > } > >> pci_conf = dev->config; >> >> /* Interrupt pin A */ >> @@ -375,11 +388,19 @@ static void esp_pci_scsi_realize(PCIDevice *dev, Error **errp) >> scsi_bus_new(&s->bus, sizeof(s->bus), d, &esp_pci_scsi_info, NULL); >> } > ... > >> @@ -956,7 +958,9 @@ static void sysbus_esp_realize(DeviceState *dev, Error **errp) >> { >> SysBusDevice *sbd = SYS_BUS_DEVICE(dev); >> SysBusESPState *sysbus = SYSBUS_ESP(dev); >> - ESPState *s = &sysbus->esp; >> + ESPState *s = ESP(&sysbus->esp); >> + >> + qdev_realize(DEVICE(s), NULL, errp); > > if (!qdev_realize(DEVICE(s), NULL, errp)) { > return; > } > > With both if(): > Reviewed-by: Philippe Mathieu-Daudé Great! I've added the if() statements and added your R-B to the patch. ATB, Mark.