From nobody Mon Feb 9 06:09:01 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=1584458688; cv=none; d=zohomail.com; s=zohoarc; b=E/ls0coBk9/AFPn1cEHIsvLVwHCc2XVsQVy6V9EyqQwIKhQ4XFpQM2IeTmZVYjk0YNJ0ONekrpiaqf/koZqo1eQpEmxjZ+WdJKYEV0UdPSVYGC244bgSUuXPtG3dTl/1TRK8SrkvR+5P5hgCQwYQL9SEZ+2pY05cgTfs9g8a3xM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584458688; h=Content-Type:Content-Transfer-Encoding:Cc: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=56N9YOjCJGmgtWr8WAV+DPfANWjML//eRnHB7yERwpw=; b=QVDHHAi9MM3FORsKyhyceOyqnh+QT8ydFKgxQvca/i3lKu29QzoDMUAB1ABxIYtfLpcVtjJU5sAn4kZKLD7aLnJ7n2UUhe8Tj8WO+GGc5OYuYBNG2QuuAPKLlqGtlQMn5bWW5cuSjnRmeWG5EQsakA8fjehd4K+hi4Za/8lRDJs= 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 1584458688042404.13791673708363; Tue, 17 Mar 2020 08:24:48 -0700 (PDT) Received: from localhost ([::1]:34672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEE5G-0005r4-TX for importer@patchew.org; Tue, 17 Mar 2020 11:24:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58752) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEDui-0007CK-Aa for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:13:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEDug-0001bu-Vx for qemu-devel@nongnu.org; Tue, 17 Mar 2020 11:13:52 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:49476) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEDub-0000sU-8W; Tue, 17 Mar 2020 11:13:47 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id DB025747E18; Tue, 17 Mar 2020 16:13:42 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 60F62747E07; Tue, 17 Mar 2020 16:13:42 +0100 (CET) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v3 3/8] hw/ide: Get rid of piix4_init function Date: Tue, 17 Mar 2020 16:05:37 +0100 MIME-Version: 1.0 To: qemu-devel@nongnu.org, qemu-block@nongnu.org Content-Transfer-Encoding: quoted-printable 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 , Markus Armbruster , 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-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 Reviewed-by: Mark Cave-Ayland Reviewed-by: Markus Armbruster --- hw/ide/piix.c | 12 +----------- hw/isa/piix4.c | 4 +++- include/hw/ide.h | 1 - 3 files changed, 4 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 2cbdcd7700..706eb5be69 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" @@ -256,9 +257,10 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **is= a_bus, *isa_bus =3D ISA_BUS(qdev_get_child_bus(dev, "isa.0")); } =20 + pci =3D pci_create_simple(pci_bus, devfn + 1, "piix4-ide"); hd =3D g_new(DriveInfo *, ide_drives); ide_drive_get(hd, ide_drives); - pci_piix4_ide_init(pci_bus, hd, devfn + 1); + pci_ide_create_devs(pci, hd); g_free(hd); =20 pci_create_simple(pci_bus, devfn + 2, "piix4-usb-uhci"); 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