From nobody Thu Apr 25 07:16:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581670087667537.2488140489318; Fri, 14 Feb 2020 00:48:07 -0800 (PST) Received: from localhost ([::1]:36182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Wdp-0007Ms-AW for importer@patchew.org; Fri, 14 Feb 2020 03:48:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40584) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2WcC-0005ki-MP for qemu-devel@nongnu.org; Fri, 14 Feb 2020 03:46:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2WcB-0001kw-Kr for qemu-devel@nongnu.org; Fri, 14 Feb 2020 03:46:24 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:47860 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j2WcB-0001jd-FE for qemu-devel@nongnu.org; Fri, 14 Feb 2020 03:46:23 -0500 Received: from host86-175-83-30.range86-175.btcentralplus.com ([86.175.83.30] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1j2WcH-0008V4-Fu; Fri, 14 Feb 2020 08:46:33 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, rth@twiddle.net, jsnow@redhat.com Date: Fri, 14 Feb 2020 08:46:06 +0000 Message-Id: <20200214084607.20471-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214084607.20471-1-mark.cave-ayland@ilande.co.uk> References: <20200214084607.20471-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.175.83.30 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 1/2] dp264: use pci_create() to initialise the cmd646 device X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:41c9:1:41f::167 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Remove the call to pci_cmd646_ide_init() since global device init functions are deprecated in preference of using qdev directly. Signed-off-by: Mark Cave-Ayland Reviewed-by: Richard Henderson --- hw/alpha/dp264.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index a8f9a89cc4..e91989bf9a 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -16,6 +16,7 @@ #include "sysemu/sysemu.h" #include "hw/rtc/mc146818rtc.h" #include "hw/ide.h" +#include "hw/ide/pci.h" #include "hw/timer/i8254.h" #include "hw/isa/superio.h" #include "hw/dma/i8257.h" @@ -100,9 +101,14 @@ static void clipper_init(MachineState *machine) /* IDE disk setup. */ { DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + PCIDevice *pci_dev; + ide_drive_get(hd, ARRAY_SIZE(hd)); =20 - pci_cmd646_ide_init(pci_bus, hd, 0); + pci_dev =3D pci_create(pci_bus, -1, "cmd646-ide"); + qdev_prop_set_uint32(DEVICE(pci_dev), "secondary", 0); + qdev_init_nofail(DEVICE(pci_dev)); + pci_ide_create_devs(pci_dev, hd); } =20 /* Load PALcode. Given that this is not "real" cpu palcode, --=20 2.20.1 From nobody Thu Apr 25 07:16:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581670146375471.471726591019; Fri, 14 Feb 2020 00:49:06 -0800 (PST) Received: from localhost ([::1]:36198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Wem-000059-AW for importer@patchew.org; Fri, 14 Feb 2020 03:49:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40606) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2WcG-0005p3-Vo for qemu-devel@nongnu.org; Fri, 14 Feb 2020 03:46:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2WcF-0001pk-TN for qemu-devel@nongnu.org; Fri, 14 Feb 2020 03:46:28 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:47866 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j2WcF-0001pB-Nl for qemu-devel@nongnu.org; Fri, 14 Feb 2020 03:46:27 -0500 Received: from host86-175-83-30.range86-175.btcentralplus.com ([86.175.83.30] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1j2WcL-0008V4-D7; Fri, 14 Feb 2020 08:46:39 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, rth@twiddle.net, jsnow@redhat.com Date: Fri, 14 Feb 2020 08:46:07 +0000 Message-Id: <20200214084607.20471-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214084607.20471-1-mark.cave-ayland@ilande.co.uk> References: <20200214084607.20471-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.175.83.30 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 2/2] cmd646: remove unused pci_cmd646_ide_init() function X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:41c9:1:41f::167 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland Reviewed-by: Richard Henderson --- hw/ide/cmd646.c | 12 ------------ include/hw/ide.h | 2 -- 2 files changed, 14 deletions(-) diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 335c060673..d953932104 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -317,18 +317,6 @@ static void pci_cmd646_ide_exitfn(PCIDevice *dev) } } =20 -void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, - int secondary_ide_enabled) -{ - PCIDevice *dev; - - dev =3D pci_create(bus, -1, "cmd646-ide"); - qdev_prop_set_uint32(&dev->qdev, "secondary", secondary_ide_enabled); - qdev_init_nofail(&dev->qdev); - - pci_ide_create_devs(dev, hd_table); -} - static Property cmd646_ide_properties[] =3D { DEFINE_PROP_UINT32("secondary", PCIIDEState, secondary, 0), DEFINE_PROP_END_OF_LIST(), diff --git a/include/hw/ide.h b/include/hw/ide.h index 28d8a06439..0c7080ed92 100644 --- a/include/hw/ide.h +++ b/include/hw/ide.h @@ -12,8 +12,6 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int ioba= se2, int isairq, DriveInfo *hd0, DriveInfo *hd1); =20 /* ide-pci.c */ -void pci_cmd646_ide_init(PCIBus *bus, DriveInfo **hd_table, - int secondary_ide_enabled); PCIDevice *pci_piix3_xen_ide_init(PCIBus *bus, DriveInfo **hd_table, int d= evfn); PCIDevice *pci_piix3_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn= ); PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn= ); --=20 2.20.1