From nobody Sun May 19 00:47:41 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 ARC-Seal: i=1; a=rsa-sha256; t=1583572512; cv=none; d=zohomail.com; s=zohoarc; b=N3URGBNW87gd58W9zvZo4No02QP32MHpR0ekF2tc/yciI3Y4/P5UCVwop12tUC4bvyHPsYBK4b6gr1ZG1HoLyicb1iUijsKri0+AjKHqn8RMay1XD0wuBme3vTdHU0R1bv22imoDEcymgShJTg+U3/avM7YyrmDaUafk+AD/tvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583572512; h=Content-Type:Content-Transfer-Encoding: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=HSywU9oQtUqE4S53v6PTLo4XxubXOEu/RFIXyiMwl+A=; b=NcLRunIckTUL4I83Ihf2Ym/yqp2aVpayxHDHJzc1fjQNV/14U8T603vpwNWnY+GZVoFlYwfRnhLZ9cu5z0FCSSfI+Gej6LRkKHakdAimfMoZNzhAcSbGVcQOXNp1oav/ZTqZPU/8SimTDLfwd1RVlNPbK6HHJl5gsgH8ffWIQLE= ARC-Authentication-Results: i=1; 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 1583572512273454.7688783838141; Sat, 7 Mar 2020 01:15:12 -0800 (PST) Received: from localhost ([::1]:46690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAVY5-0004L2-1Q for importer@patchew.org; Sat, 07 Mar 2020 04:15:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42267) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAVWV-0002UN-Io for qemu-devel@nongnu.org; Sat, 07 Mar 2020 04:13:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAVWU-0003SJ-J9 for qemu-devel@nongnu.org; Sat, 07 Mar 2020 04:13:31 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:37970 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 1jAVWU-0003RU-DT for qemu-devel@nongnu.org; Sat, 07 Mar 2020 04:13:30 -0500 Received: from host86-162-6-80.range86-162.btcentralplus.com ([86.162.6.80] 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 1jAVWk-0006ZF-EU; Sat, 07 Mar 2020 09:13:51 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, rth@twiddle.net, jsnow@redhat.com Date: Sat, 7 Mar 2020 09:13:12 +0000 Message-Id: <20200307091313.24190-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200307091313.24190-1-mark.cave-ayland@ilande.co.uk> References: <20200307091313.24190-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.162.6.80 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 1/2] dp264: use pci_create_simple() 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" 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/alpha/dp264.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index d28f57199f..f24b34b62e 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,12 @@ 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_simple(pci_bus, -1, "cmd646-ide"); + pci_ide_create_devs(pci_dev, hd); } =20 /* Load PALcode. Given that this is not "real" cpu palcode, --=20 2.20.1 From nobody Sun May 19 00:47:41 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 ARC-Seal: i=1; a=rsa-sha256; t=1583572540; cv=none; d=zohomail.com; s=zohoarc; b=NjmayzosDQOnLQ6mRwbzhe83Ho00QD3ZI+X6wiEWryqIiXgiUqKZyXzTRYIDmOumNSgbJc/9IUAJrnFz1Ko7IHvHVt0mRwkupSoAXAKy0i96NYg4tPR+0sAFdufNnsoVGdsv5/bgl2gogphM830ka8Piqc29S0wO0c6SywSkfWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583572540; h=Content-Transfer-Encoding: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=S0mIPvguVf1qsV8biMi/ykGlVmcBZeGxfiDXEYW7EP8=; b=NI8BJhZNAzL/wuk0ZOj58JFVtus+McqR13x1DuqWqwGzeVCTuW383qglzZWtbYcSMqxpNYuVbvYCfLvQkQjJiysYHRLJV0v7aoBTN1Zjrl8xM16znbuemF3cBxNEvBwoby2qNnwwOKhY+fiuQVNZLS5zJ42nYHA46ab4XxEhNRw= ARC-Authentication-Results: i=1; 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 1583572540695526.8034286804932; Sat, 7 Mar 2020 01:15:40 -0800 (PST) Received: from localhost ([::1]:46710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAVYZ-00056o-IK for importer@patchew.org; Sat, 07 Mar 2020 04:15:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42291) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAVWX-0002Yl-RV for qemu-devel@nongnu.org; Sat, 07 Mar 2020 04:13:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAVWW-0003Ul-RC for qemu-devel@nongnu.org; Sat, 07 Mar 2020 04:13:33 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:37974 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 1jAVWW-0003TT-L4 for qemu-devel@nongnu.org; Sat, 07 Mar 2020 04:13:32 -0500 Received: from host86-162-6-80.range86-162.btcentralplus.com ([86.162.6.80] 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 1jAVWp-0006ZF-99; Sat, 07 Mar 2020 09:13:55 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, rth@twiddle.net, jsnow@redhat.com Date: Sat, 7 Mar 2020 09:13:13 +0000 Message-Id: <20200307091313.24190-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200307091313.24190-1-mark.cave-ayland@ilande.co.uk> References: <20200307091313.24190-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.162.6.80 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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