From nobody Mon Feb 9 14:38:06 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513310739370636.9213360968934; Thu, 14 Dec 2017 20:05:39 -0800 (PST) Received: from localhost ([::1]:44298 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePhFN-00075T-Gf for importer@patchew.org; Thu, 14 Dec 2017 23:05:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePgjW-00037I-9i for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:32:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePgjV-00062F-3S for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:32:22 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:41209) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePgjU-00061p-TZ; Thu, 14 Dec 2017 22:32:20 -0500 Received: by mail-qt0-x241.google.com with SMTP id i40so10578923qti.8; Thu, 14 Dec 2017 19:32:20 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id q24sm3794605qkq.63.2017.12.14.19.32.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 19:32:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N6H9yg59qeM1jdHpJr10Qc25eeB4AYjvl7JZqO1h62w=; b=sT+m9kI6Q6nVNq7Qa/Ol+koboonbZxsTCp8xIVx53OhWOv8B4RQsvNwGBf70WV5bku bz8ACMs+xbxOupHzD6ofiwPRkuuQXk6O/At7X+FM4JbaRGh3AOwfFt/TvDCf6wsMo6+c dsg3G+c6LjekaVitKze1/85RDx1e64Cq/uWRhfUFZXpbL06WCNzvTollWdCOEGCouvSG XKzi3iyY5cKzJCLXi233061jh0BQus0rSW+xqDSCgXTIFgMiSD+evaD09o9oVe9Q23Mr y8R2tfDjEymcaIzlUeRD1HlrmrYv/fJ1C3LDKe4zFqHt/mcNh4p4BpT6QJ1G/2Q1tGRV L9Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=N6H9yg59qeM1jdHpJr10Qc25eeB4AYjvl7JZqO1h62w=; b=KG3eDjgSc2AoK8FsSGfYrxIoTWayOMzz8Rl/ZgWj+iwFU5Ph4mXVyXnQBINL0kS3ku jHJCoItbGQzf+CVXVLUuEwWImHMeYSvJya6i0jlZYfXMPGz3mVyb6FbDtRkARSF1TM8V 8RuKNcax0k7mgs+5QCqYq8bxTsuCGQcQYF1zn/zJxKhpTIVHHA/w99GYNhF4dBZeSh4B 1PK1TkbplPDjXKSo/dssRIzk05NNpbV5P488TzsrNrwPbS3zhjC8A3KdYv+BLkmPdbEh rO0Mw8zOpugFZXEhdlPn7gsvFWHXhAyWl7DkA8AWsHWJQjA1Pm9pQXyLJ/Fl0gnAHHDa GIwA== X-Gm-Message-State: AKGB3mIza4E66sqnFgDBqE246OgnkzMPeMVpKfZsEwT6v5669mOROCee qsfhZCRD8HoFHsytgYRBTZc= X-Google-Smtp-Source: ACJfBouzg5eTkJEivpBs8tVZCQVzFSm/aiTwfrIi1qyheVhHzx75BaM3Cq8z648X1mLw4sy3hwZRDA== X-Received: by 10.200.27.36 with SMTP id y33mr20736520qtj.291.1513308740364; Thu, 14 Dec 2017 19:32:20 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Michael S. Tsirkin" , Michael Tokarev Date: Fri, 15 Dec 2017 00:30:03 -0300 Message-Id: <20171215033015.738-32-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171215033015.738-1-f4bug@amsat.org> References: <20171215033015.738-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v4 31/43] hw/timer/i8254: rename pit_init() -> i8254_pit_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , qemu-trivial@nongnu.org, "open list:PReP" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Yongbok Kim , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 and remove the old i386/pc dependency Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Herv=C3=A9 Poussineau --- include/hw/timer/i8254.h | 5 +++-- include/hw/timer/i8254_internal.h | 2 +- hw/alpha/dp264.c | 2 +- hw/i386/pc.c | 2 +- hw/isa/i82378.c | 2 +- hw/mips/mips_fulong2e.c | 2 +- hw/mips/mips_jazz.c | 2 +- hw/mips/mips_malta.c | 2 +- hw/mips/mips_r4k.c | 2 +- hw/timer/i8254.c | 1 - hw/timer/i8254_common.c | 1 - 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/hw/timer/i8254.h b/include/hw/timer/i8254.h index 5adae9fa44..5b12eb918e 100644 --- a/include/hw/timer/i8254.h +++ b/include/hw/timer/i8254.h @@ -26,6 +26,7 @@ #define HW_I8254_H =20 #include "hw/hw.h" +#include "hw/qdev.h" #include "hw/isa/isa.h" =20 #define PIT_FREQ 1193182 @@ -48,8 +49,8 @@ typedef struct PITChannelInfo { #define TYPE_I8254 "isa-pit" #define TYPE_KVM_I8254 "kvm-pit" =20 -static inline ISADevice *pit_init(ISABus *bus, int base, int isa_irq, - qemu_irq alt_irq) +static inline ISADevice *i8254_pit_init(ISABus *bus, int base, int isa_irq, + qemu_irq alt_irq) { DeviceState *dev; ISADevice *d; diff --git a/include/hw/timer/i8254_internal.h b/include/hw/timer/i8254_int= ernal.h index dc09cc0467..c37a438f82 100644 --- a/include/hw/timer/i8254_internal.h +++ b/include/hw/timer/i8254_internal.h @@ -26,8 +26,8 @@ #define QEMU_I8254_INTERNAL_H =20 #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" +#include "qemu/timer.h" =20 typedef struct PITChannelState { int count; /* can be 65536 */ diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index babd6ea514..887a7401f1 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -80,7 +80,7 @@ static void clipper_init(MachineState *machine) /* Since we have an SRM-compatible PALcode, use the SRM epoch. */ rtc_init(isa_bus, 1900, rtc_irq); =20 - pit_init(isa_bus, 0x40, 0, NULL); + i8254_pit_init(isa_bus, 0x40, 0, NULL); isa_create_simple(isa_bus, "i8042"); =20 /* VGA setup. Don't bother loading the bios. */ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 186545d2a4..6a6041573f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1573,7 +1573,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *= gsi, if (kvm_pit_in_kernel()) { pit =3D kvm_pit_init(isa_bus, 0x40); } else { - pit =3D pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq); + pit =3D i8254_pit_init(isa_bus, 0x40, pit_isa_irq, pit_alt_irq= ); } if (hpet) { /* connect PIT to output control line of the HPET */ diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index d20ea4c2ee..a9c15f858d 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -97,7 +97,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) isa_bus_irqs(isabus, s->i8259); =20 /* 1 82C54 (pit) */ - isa =3D pit_init(isabus, 0x40, 0, NULL); + isa =3D i8254_pit_init(isabus, 0x40, 0, NULL); =20 /* speaker */ pcspk_init(isabus, isa); diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 146cf0fccd..2a2a09c9de 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -359,7 +359,7 @@ static void mips_fulong2e_init(MachineState *machine) smbus_eeprom_init(smbus, 1, eeprom_spd, sizeof(eeprom_spd)); =20 /* init other devices */ - pit =3D pit_init(isa_bus, 0x40, 0, NULL); + pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); DMA_init(isa_bus, 0); =20 /* Super I/O */ diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index fe4f17389f..995419344d 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -218,7 +218,7 @@ static void mips_jazz_init(MachineState *machine, i8259 =3D i8259_init(isa_bus, env->irq[4]); isa_bus_irqs(isa_bus, i8259); DMA_init(isa_bus, 0); - pit =3D pit_init(isa_bus, 0x40, 0, NULL); + pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); pcspk_init(isa_bus, pit); =20 /* Video card */ diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index ec6af4a277..88b4733743 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1208,7 +1208,7 @@ void mips_malta_init(MachineState *machine) isa_get_irq(NULL, 9), NULL, 0, NULL); smbus_eeprom_init(smbus, 8, smbus_eeprom_buf, smbus_eeprom_size); g_free(smbus_eeprom_buf); - pit =3D pit_init(isa_bus, 0x40, 0, NULL); + pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); DMA_init(isa_bus, 0); =20 /* Super I/O */ diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 3bbb1827e1..58d7bac18b 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -272,7 +272,7 @@ void mips_r4k_init(MachineState *machine) =20 rtc_init(isa_bus, 2000, NULL); =20 - pit =3D pit_init(isa_bus, 0x40, 0, NULL); + pit =3D i8254_pit_init(isa_bus, 0x40, 0, NULL); =20 serial_hds_isa_init(isa_bus, 0, MAX_SERIAL_PORTS); =20 diff --git a/hw/timer/i8254.c b/hw/timer/i8254.c index 5e61ad50a8..dbc4a0baec 100644 --- a/hw/timer/i8254.c +++ b/hw/timer/i8254.c @@ -23,7 +23,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index b623c96198..6190b6fc5d 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -24,7 +24,6 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "hw/i386/pc.h" #include "hw/isa/isa.h" #include "qemu/timer.h" #include "hw/timer/i8254.h" --=20 2.15.1