From nobody Thu Nov 13 21:53:48 2025 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=1583089652; cv=none; d=zohomail.com; s=zohoarc; b=kAVSlLaMmZC57S4beoQhLYL7CSPf6bWwmhdQrBdzHeL5RsJVskl3LTxkfLdABd8nuHfYT3zxKEPym6gy77HYCHQTapW28dM3mViLk4yQQ8QfaqdaZJCZLn0AFMfFGfd9+WwCJBAtiY4w+uAvNPrXCzw6Q9rsOFekxbz1GeZD5nU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583089652; 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=1SUV29y2njeMESQ+yM94L1YFnSFupe8yKOc8a8ltWIk=; b=L7V6i5LnSkD7fI14z0QVChZ9n671+XNxpSJkdjh8vEW3IsB8OdOAfxM7r77ehSjRbmVIYWL7cMtakAwEhvc4hm1y8+zDOqWC0ZJhuJVo6exzKxLVjsZcElJya0V+wV2NVt1/2IySt2bn/TDMuy4fcSfm5lgs5UoRtjT9mH0UaNg= 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 1583089652526538.5990907265356; Sun, 1 Mar 2020 11:07:32 -0800 (PST) Received: from localhost ([::1]:51180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8Tw3-0002xw-Ec for importer@patchew.org; Sun, 01 Mar 2020 14:07:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41983) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8TuC-0000lp-1O for qemu-devel@nongnu.org; Sun, 01 Mar 2020 14:05:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8TuB-0001DW-1V for qemu-devel@nongnu.org; Sun, 01 Mar 2020 14:05:35 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:53064 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 1j8TuA-0001DK-SJ for qemu-devel@nongnu.org; Sun, 01 Mar 2020 14:05:34 -0500 Received: from host86-135-55-139.range86-135.btcentralplus.com ([86.135.55.139] 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 1j8TuP-0008Fy-1r; Sun, 01 Mar 2020 19:05:55 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, rth@twiddle.net, jsnow@redhat.com Date: Sun, 1 Mar 2020 19:05:19 +0000 Message-Id: <20200301190520.18520-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200301190520.18520-1-mark.cave-ayland@ilande.co.uk> References: <20200301190520.18520-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.135.55.139 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/alpha/dp264.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 8d71a30617..50e75aeee3 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,13 @@ 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_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 Nov 13 21:53:48 2025 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=1583089596; cv=none; d=zohomail.com; s=zohoarc; b=P6LkFg5e6q4zsX3mELiZGG7JDHClKZYYDs6tfcTwUyaidHEW41sLAxzoU6IIIZhDvLmBUVG0HIAugM/6rVhta9F8tVLvMfjupoR0g5Sds54i7ZTCDk5IVMALlih5dzo4CcfJ4QriEm+i+DgFBdl+CnNLsjZBarag9CMgW4Ku/kA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583089596; 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=XslHXAhGYvEeNx5zMmen7B6/iJ/1RNKoKemAmIOhbbFvI+uR2PfRhVrl2fkuGRNmEyMySfnKlaISPtxPzeG4uN0odMIaZkvwdTIkKiVistRfZpiWkrvlKLzVaUa3uu5JjKT6qR9LNAoYrqgVMhGt/jrZLln/2foZMKcyAwVB+xo= 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 1583089596021809.4613811705569; Sun, 1 Mar 2020 11:06:36 -0800 (PST) Received: from localhost ([::1]:51168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8Tv8-0001lo-Tp for importer@patchew.org; Sun, 01 Mar 2020 14:06:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41995) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8TuF-0000p7-PS for qemu-devel@nongnu.org; Sun, 01 Mar 2020 14:05:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8TuE-0001E7-Nt for qemu-devel@nongnu.org; Sun, 01 Mar 2020 14:05:39 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:53070 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 1j8TuE-0001Dz-II for qemu-devel@nongnu.org; Sun, 01 Mar 2020 14:05:38 -0500 Received: from host86-135-55-139.range86-135.btcentralplus.com ([86.135.55.139] 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 1j8TuV-0008Fy-Bj; Sun, 01 Mar 2020 19:05:59 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, rth@twiddle.net, jsnow@redhat.com Date: Sun, 1 Mar 2020 19:05:20 +0000 Message-Id: <20200301190520.18520-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200301190520.18520-1-mark.cave-ayland@ilande.co.uk> References: <20200301190520.18520-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.135.55.139 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 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