From nobody Mon Feb 9 08:41:14 2026 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=1584134707; cv=none; d=zohomail.com; s=zohoarc; b=JmheT2e8XO0WOrArztuZjXP4Q5hpFNf16pAuazKAG/je4QFEsbpDfrINd6zAkvrAWct+vmPD1sF+vqMdr/9666zTxolOFuUkNPKSY7lOir/m2z1BnorF4naAWwppAD/q3ud5K8EiCae2QCe0RgfyIHxsoxvVkrmEOGb+hp5R+ps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584134707; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=u8C/2HK2rrZ4u4B/6bRfpdrmxkeZKa9Ot0A0hZUtP9E=; b=WzoOxXQamGPb743+CN0VclaQtC0x0146AmfE3eafT9loIwYxYVKesWrcJ+u7JOKdDWuvAfuKefzOYRIfzyFqz8vAoL1h4ibs9HKR0Sl7NKi+CXhVV91icG6YNeILr9QDfykn2Np9583GGYsF2nM2jqRAv3uFgC7Ipg+Lxtu8aYA= 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 1584134707662702.2168396578065; Fri, 13 Mar 2020 14:25:07 -0700 (PDT) Received: from localhost ([::1]:37664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCrnm-0002eI-Id for importer@patchew.org; Fri, 13 Mar 2020 17:25:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46625) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jCrly-0007lx-Mr for qemu-devel@nongnu.org; Fri, 13 Mar 2020 17:23:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jCrlw-0000Kq-0Q for qemu-devel@nongnu.org; Fri, 13 Mar 2020 17:23:14 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:57645) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jCrlr-0008UM-Ec; Fri, 13 Mar 2020 17:23:09 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 019D7747E13; Fri, 13 Mar 2020 22:23:06 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 71609747E04; Fri, 13 Mar 2020 22:23:05 +0100 (CET) Message-Id: <3240656814c804513de08bdbbf318f2f590df241.1584134074.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 2/8] hw/ide: Get rid of piix4_init function Date: Fri, 13 Mar 2020 22:14:34 +0100 To: qemu-devel@nongnu.org, qemu-block@nongnu.org X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 152.66.115.2 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: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , John Snow , Mark Cave-Ayland , hpoussin@reactos.org, Aleksandar Markovic , Paolo Bonzini , philmd@redhat.com, Artyom Tarasenko , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This removes pci_piix4_ide_init() function similar to clean up done to other ide devices. Signed-off-by: BALATON Zoltan --- hw/ide/piix.c | 12 +----------- hw/isa/piix4.c | 5 ++++- include/hw/ide.h | 1 - 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 8bcd6b72c2..3b2de4c312 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -208,17 +208,6 @@ static void pci_piix_ide_exitfn(PCIDevice *dev) } } =20 -/* hd_table must contain 4 block drivers */ -/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ -PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) -{ - PCIDevice *dev; - - dev =3D pci_create_simple(bus, devfn, "piix4-ide"); - pci_ide_create_devs(dev, hd_table); - return dev; -} - /* NOTE: for the PIIX3, the IRQs and IOports are hardcoded */ static void piix3_ide_class_init(ObjectClass *klass, void *data) { @@ -247,6 +236,7 @@ static const TypeInfo piix3_ide_xen_info =3D { .class_init =3D piix3_ide_class_init, }; =20 +/* NOTE: for the PIIX4, the IRQs and IOports are hardcoded */ static void piix4_ide_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 7edec5e149..0ab4787658 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -35,6 +35,7 @@ #include "hw/timer/i8254.h" #include "hw/rtc/mc146818rtc.h" #include "hw/ide.h" +#include "hw/ide/pci.h" #include "migration/vmstate.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" @@ -255,10 +256,12 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **i= sa_bus, *isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0")); } =20 + pci =3D pci_create_simple(pci_bus, pci->devfn + 1, "piix4-ide"); hd =3D g_new(DriveInfo *, ide_drives); ide_drive_get(hd, ide_drives); - pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1); + pci_ide_create_devs(pci, hd); g_free(hd); + pci_create_simple(pci_bus, pci->devfn + 2, "piix4-usb-uhci"); if (smbus) { *smbus =3D piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100, diff --git a/include/hw/ide.h b/include/hw/ide.h index 883bbaeb9b..21bd8f23f1 100644 --- a/include/hw/ide.h +++ b/include/hw/ide.h @@ -12,7 +12,6 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int ioba= se2, int isairq, DriveInfo *hd0, DriveInfo *hd1); =20 /* ide-pci.c */ -PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn= ); int pci_piix3_xen_ide_unplug(DeviceState *dev, bool aux); =20 /* ide-mmio.c */ --=20 2.21.1