From nobody Tue Feb 10 01:15:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) 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=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508200185723245.17586779229293; Mon, 16 Oct 2017 17:29:45 -0700 (PDT) Received: from localhost ([::1]:35795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FlG-0002Pj-2z for importer@patchew.org; Mon, 16 Oct 2017 20:29:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e4FW5-0006to-Qv for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e4FW4-0004hl-B3 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 20:13:53 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:45635) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e4FW4-0004hB-6L; Mon, 16 Oct 2017 20:13:52 -0400 Received: by mail-qk0-x241.google.com with SMTP id f199so31933qke.2; Mon, 16 Oct 2017 17:13:52 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id r6sm5409043qkh.22.2017.10.16.17.13.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Oct 2017 17:13:51 -0700 (PDT) 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=CriTZop5//4NRL+V/LDPCcYnfDX8w9Or8e5FjaPVaI8=; b=mBClRKTQqQ1q+USDJ9pmwmeJOoc29hlrlg/sLu4e2bZ4iZgynyL+Nbd7ISZ/yDueR4 KTLExMDIb0Uqowxc0AaW2CZfbwuppbUsfA80Xhd2mr+OhnspyV8xeprtJQvpClXsYJN7 7aKPR7JxUCTd6pq963FxToMF80oHhOK7zzyBFXb3eoHC8Xl+KOZyimd83WY21+RxrnNK TUUcw/x+EFAHaN7SEVQzvxdBqhQV0pd9RVMBfmL/Kc+1JKbavlO/UQGDD3ScJc5xAKS2 whO5776OExBGTmq8U6w3YnmAQhTFUFihPTI4wva4+8MGqvrkWWrY337L70pG2ofOSw1T eYVg== 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=CriTZop5//4NRL+V/LDPCcYnfDX8w9Or8e5FjaPVaI8=; b=nXZTPgC6+TMjI/lZh6U5MU1LmHPGBPxFiQveU64cc0kKV5Y0u6kRoszchOBuw4v3Cj S67wiDEv6znTGG4goWlXCls1p6E2BLseUYx5ZB7q9yFDu0Jciw8DlHjKvpfvsD5RDhLZ krmXUtGH2UfEqm1qd2+4FcD0+ij6bSm7trTEbwBGdoYF8NbSinUPyNoF5B4CzNf2yQDM d24C4w5poDivycFWYEMm0JfiAZ96S5j+thxibFBJyTi0ymbPlcPVRfN5xmvpx80bweNY /wAqfyvpyz8owZwY/iXiqAQhws8UedaaEyeAbH7pi/Ljq0DifcldegTdCCaPWRIyK9vF MGlA== X-Gm-Message-State: AMCzsaXQXTn0vU/vBYb2iVsxgbhMJ3A45WDn6RBhzT2lqQ64w9zHz25x SaEohAAQiUUWfA/EMa8hEqU= X-Google-Smtp-Source: ABhQp+QceMq2EdWLrVZ6IpwdI+6l1gSGdAAx1zoegR1knA4VwYaujBqLbpZNFZB+T8GAG8Zr8V40Bw== X-Received: by 10.55.27.91 with SMTP id b88mr16644755qkb.0.1508199231677; Mon, 16 Oct 2017 17:13:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Michael Tokarev Date: Mon, 16 Oct 2017 21:11:59 -0300 Message-Id: <20171017001209.32276-30-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc0 In-Reply-To: <20171017001209.32276-1-f4bug@amsat.org> References: <20171017001209.32276-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:c09::241 Subject: [Qemu-devel] [PATCH v2 29/39] 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: qemu-trivial@nongnu.org, qemu-ppc@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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_0 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 1b121306c2..1bd5243648 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -81,7 +81,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 05985d4927..b565c6086c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1551,7 +1551,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 75318680e1..22e6c05fb5 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -363,7 +363,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 7e6626dc88..5f37852499 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -222,7 +222,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 2adb9bcf89..de547d732f 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1217,7 +1217,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 1272d4ef9d..48fad52540 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -280,7 +280,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.0.rc0