Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 02799C433EF for ; Fri, 3 Jun 2022 18:56:10 +0000 (UTC) Received: from localhost ([::1]:57490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nxCSu-000703-8Q for qemu-devel@archiver.kernel.org; Fri, 03 Jun 2022 14:56:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nxCOE-0007Hp-Ge for qemu-devel@nongnu.org; Fri, 03 Jun 2022 14:51:18 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:41783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nxCOC-0004CH-Ld for qemu-devel@nongnu.org; Fri, 03 Jun 2022 14:51:17 -0400 Received: by mail-ej1-x62c.google.com with SMTP id u12so17610052eja.8 for ; Fri, 03 Jun 2022 11:51:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QHXHopLynfUeqrSBaWrq8DdgLg5VwHyVMXO3auGVcqg=; b=H3xiMqPyhHZZi5zDwocEyX7Z8lV8FMMfO4LvC5nWz7njnG1UY+8iY6soXiAdxqUZcj ib7HgYRXPb/f6Wak4bXTMbJF4rKUMuB06s2Xj4rUXNbHOuENYvU/K6i7Ao4tj2vHe9rH iK+bznS7WBdH9+46qAL+CQUpcCWpYiSwEtXLWO3pixlYViVYGeMKNcK8b8IdkafvKcx+ 65fircniyo9XLCI3PkSSkff8ecLmF9dk6iJCHUFrb3RsLTsvoC5x7wzLuZaJMp1gTTed fXaMvGv9mWiQDzH8/YdFXgcQ1kDYUW23faEMmXgUQ1YQ6KBqvA+BmmIOMbiwJK+CqJmG h9/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QHXHopLynfUeqrSBaWrq8DdgLg5VwHyVMXO3auGVcqg=; b=BI+05G6cWmOTwGz8LM5pQDmvEhLtqOpnU4kQVQnj85AAW0/oZ4DaDsT7v71zkJ/C+i ZH9PddwDPsML1W49mvB6HaEMuqYHbxx6KRlfnjhq9rPsBTQzilUHJ1QRePHB/MpKrkns PXsZTqPRp6uQtyuceoC28Dy1aCBVcV15itChsb/vDTuRC26NA1ygz5Cy0uZaBjwIUe1r WxsKb2Ra7GZ2fCPbppos/YkLX+hpBqXUQF/3LoNo3G1SFvtcWqiCrprFEfkEET45fndS 4uGy/LJXFfmNb7pTJnOJ9PfzPSTxLOBaBPuN4QYKSSluWqfxPvKs9omxL4xgt9A68MdF p1GQ== X-Gm-Message-State: AOAM532Uq7t+2+hdHxHVqDAfdZ1hXQWKg65wKmEZIwG7mYdDtA3tuiRd 5KYjR7sISZo2pwVM1dSpJoXpV9mwWooUog== X-Google-Smtp-Source: ABdhPJzw/AXHHEuT4JykRq0JuJnLe5uBPc9/3jO9Dz8K0u2fj3tq8mNhvlQmx9/Dja3n8QvV2j5y+A== X-Received: by 2002:a17:907:7f06:b0:6fe:b81f:f885 with SMTP id qf6-20020a1709077f0600b006feb81ff885mr9999583ejc.621.1654282275117; Fri, 03 Jun 2022 11:51:15 -0700 (PDT) Received: from osoxes.fritz.box (pd9ed79c4.dip0.t-ipconnect.de. [217.237.121.196]) by smtp.gmail.com with ESMTPSA id f25-20020a170906139900b006fe8c831632sm3066160ejc.73.2022.06.03.11.51.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 11:51:14 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , Bernhard Beschow , Mark Cave-Ayland Subject: [PATCH v4 10/11] hw/isa/piix3: Factor out ISABus retrieval from piix3_create() Date: Fri, 3 Jun 2022 20:50:44 +0200 Message-Id: <20220603185045.143789-11-shentey@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603185045.143789-1-shentey@gmail.com> References: <20220603185045.143789-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=shentey@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Modernizes the code. Signed-off-by: Bernhard Beschow Reviewed-by: Mark Cave-Ayland --- hw/i386/pc_piix.c | 3 ++- hw/isa/piix3.c | 3 +-- include/hw/southbridge/piix.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d6668b7c06..c884d1a489 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -207,9 +207,10 @@ static void pc_init1(MachineState *machine, pci_memory, ram_memory); pcms->bus = pci_bus; - piix3 = piix3_create(pci_bus, &isa_bus); + piix3 = piix3_create(pci_bus); piix3->pic = x86ms->gsi; piix3_devfn = piix3->dev.devfn; + isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0")); } else { pci_bus = NULL; i440fx_state = NULL; diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c index de532cc692..c6ff7795f4 100644 --- a/hw/isa/piix3.c +++ b/hw/isa/piix3.c @@ -400,7 +400,7 @@ static void piix3_register_types(void) type_init(piix3_register_types) -PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus) +PIIX3State *piix3_create(PCIBus *pci_bus) { PIIX3State *piix3; PCIDevice *pci_dev; @@ -409,7 +409,6 @@ PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus) pci_dev = pci_create_simple_multifunction(pci_bus, -1, true, type); piix3 = PIIX3_PCI_DEVICE(pci_dev); - *isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0")); return piix3; } diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h index 9a2dd93c2d..f805fb8683 100644 --- a/include/hw/southbridge/piix.h +++ b/include/hw/southbridge/piix.h @@ -68,6 +68,6 @@ DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE, #define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen" #define TYPE_PIIX4_PCI_DEVICE "piix4-isa" -PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus); +PIIX3State *piix3_create(PCIBus *pci_bus); #endif -- 2.36.1