From nobody Mon Dec 15 21:27:22 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520983540959144.2985892070052; Tue, 13 Mar 2018 16:25:40 -0700 (PDT) Received: from localhost ([::1]:43490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtIa-00057J-3I for importer@patchew.org; Tue, 13 Mar 2018 19:25:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsiU-00068z-2s for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsiP-0003tT-Uw for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:22 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:38378) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsiP-0003sO-OK for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:17 -0400 Received: by mail-wr0-x241.google.com with SMTP id l8so2547239wrg.5 for ; Tue, 13 Mar 2018 15:48:17 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.48.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:15 -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=upSZFQiKB9xHfBmHKZ7i1f3Kcg0tut1l815AhW7rkcY=; b=YTSsaltGcNKtQJ4H9wEmNt5EXVm8l0kDG6D8jLDT4psCkkJt21TVf9f8mh1+bOecal LOdeTLGC6CVpQUQrT5kOb3/+RL92b8N8MWarSkzC8l4bw3jH0yWsjicjOEr6dVi8DPr4 ZwdAq/QNmuvjdYKWL2QBxaZt6O6/Xk0aIwCyem8G4hjtrO6rnnwP1P0Yl4EPUM+BmQha ca7L+Vf81n2V8WnMagjJNmxldCq7RoPLel+/2wHLjCwL+CNlSU3VBgZE8akoiepFzFCA C3XScXbvgsjHUJjTS3uFvokgK+EKHbkxXvbINDml/I9lW+rZsPj8I9Yd1OZnvpAvP32F MW0w== 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=upSZFQiKB9xHfBmHKZ7i1f3Kcg0tut1l815AhW7rkcY=; b=iUDo2W2lN4QILXt6J+XlovVfFrrXBkZwQJbF2Wrvy35YFPuTpYQQIYGoiLLGEpugzX bZsE5is0s9SdwgUuuH0wY1ioVxaRSzYgv1c0YayUiiIfCdvaBtLVQF2be8IXSWyNcC/g VZMhZqctznq4+wVyBR48kG5ZemH+2ZL0P4RL/tTZUkns2KaIaN1ot9yhMJthWTElF7O7 scsyRethU0/Iv9VKnBDERIYsXwrz0/Cm/OkVbbvWK00AbKap7RwvQ+8IvdSPXAoI7lDt cy7b0kllEMf6bHcPUGU/F2oQJ49NxgtzHIrD0cbMixg/IuyEZvNZy3lZbxe/PfDMkQcL qJCw== X-Gm-Message-State: AElRT7EDtjJLYZcan5JriC1kReExDd7GWh82ogFYpkH8uSZ/8N233jUv BLlGh716pze7LL0ZFg9El4mT0cgo X-Google-Smtp-Source: AG47ELtk5g25N2QH46PHMHhuxZPWZa/QDqM2pSUjYiR9WuxFbTpO6qit9S0PAwn4Tg97KhHI2ZKh1g== X-Received: by 10.223.157.24 with SMTP id k24mr1921760wre.273.1520981296185; Tue, 13 Mar 2018 15:48:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:46:54 +0100 Message-Id: <20180313224719.4954-45-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> 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: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 44/69] hw/isa/vt82c686: Rename vt82c686b_init() -> vt82c686b_isa_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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 This function only initialize the ISA bus. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20180308223946.26784-19-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- hw/isa/vt82c686.c | 2 +- hw/mips/mips_fulong2e.c | 2 +- include/hw/isa/vt82c686.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 070cc1889f..7eaf3c7e8f 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -478,7 +478,7 @@ static void vt82c686b_realize(PCIDevice *d, Error **err= p) qemu_register_reset(vt82c686b_reset, d); } =20 -ISABus *vt82c686b_init(PCIBus *bus, int devfn) +ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn) { PCIDevice *d; =20 diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 2697d772eb..b14dab8781 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -236,7 +236,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus,= int slot, qemu_irq intc, ISABus *isa_bus; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; =20 - isa_bus =3D vt82c686b_init(pci_bus, PCI_DEVFN(slot, 0)); + isa_bus =3D vt82c686b_isa_init(pci_bus, PCI_DEVFN(slot, 0)); if (!isa_bus) { fprintf(stderr, "vt82c686b_init error\n"); exit(1); diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index 471b5e9e53..db97c8ed7a 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -2,7 +2,7 @@ #define HW_VT82C686_H =20 /* vt82c686.c */ -ISABus *vt82c686b_init(PCIBus * bus, int devfn); +ISABus *vt82c686b_isa_init(PCIBus * bus, int devfn); void vt82c686b_ac97_init(PCIBus *bus, int devfn); void vt82c686b_mc97_init(PCIBus *bus, int devfn); I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, --=20 2.14.3