From mboxrd@z Thu Jan 1 00:00:00 1970 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 B7A21C64EC4 for ; Sat, 4 Mar 2023 15:28:04 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pYTmq-0003Ej-El; Sat, 04 Mar 2023 10:27:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYTmo-0003Di-MH for qemu-devel@nongnu.org; Sat, 04 Mar 2023 10:27:02 -0500 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pYTmm-000895-04 for qemu-devel@nongnu.org; Sat, 04 Mar 2023 10:27:01 -0500 Received: by mail-ed1-x534.google.com with SMTP id x3so21499171edb.10 for ; Sat, 04 Mar 2023 07:26:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677943618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pAZdPdXH6dA81Hhbh5bcVsNSvCbhTiA/oPg+FNbaYfI=; b=psaxpml40sreHFjOt9OtVhfjMQ/tNnlinB8R3JMIA0FDFkiXQc5mX4+AB3mYi5EBYw +rfmcKoj6AaoVGKDHF/ihynOhdoMoHI7ErUUaQoz3doAlfUrGNLocm+XA7ijqQ3aWwdK fa9wgL0ghB18SE2GDzzV0S/D5FVo+CPfb5bJ3xNJpI91KzsiPCaugnxsQu4SRXsi8zRg F3w9LkHDKHvxjPCDjV3TqgDsYJdePdTczWvlA7+wFsaiD5pWiShVu9BY1tqlhM7V4Nl9 pBTJkCoBm6ItqiUFwMd8bhR0gkBtst968rrxTT27662cQgt7KSoN6NXggi2ZaTrUe8UR yFvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677943618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pAZdPdXH6dA81Hhbh5bcVsNSvCbhTiA/oPg+FNbaYfI=; b=3BztbOXyw296l8qKVdbmlq9l0HptdZ/KCv4wUTP5nLCwZHNkAL55KP3GWXfkUU+amj Dw+BX7nPEzeWOh5ky3b+f/WC99Z0hw2sprUraEzEZ8OvVN0CsNnErLpYw//a2dpJjlkh co4xofahwB2SioC5xlp/R/xtlZ7F34b60OYnmoUORydc/pnIklXZ5YPyaYTW2W8nwZZA fJ9+6XzbA8XE00MuoFXeCJkvXG1dZjqDrcadT97NQLIH5eft/V9Vo9A7ax0Wru+E1Q6Q nIiuotQM3MwKOnDtpj1T2f/DGadcRH6f9He7pMTox+ecB4GNkKg/Ld7yTydqDLGplu2m Ml2A== X-Gm-Message-State: AO0yUKX7mboRMS4DWx0CsbwJlupn4QP4YI0f438urcQQa/wVPR2IkYyR aiJ/ri0AvGhnC9yJ7UCR2Tv6ZCaZ3YY= X-Google-Smtp-Source: AK7set8BYleT4+kPG7KbjLgTdNit4zDjOCoZl5JsG8HcGe9W7Ke9d63uAx/BDYq8Q5uCfkLGlWyf8Q== X-Received: by 2002:a17:907:6092:b0:888:b471:8e46 with SMTP id ht18-20020a170907609200b00888b4718e46mr7026882ejc.50.1677943617980; Sat, 04 Mar 2023 07:26:57 -0800 (PST) Received: from Provence.localdomain (dynamic-077-183-004-175.77.183.pool.telefonica.de. [77.183.4.175]) by smtp.gmail.com with ESMTPSA id h7-20020a170906398700b008dd6bf721c2sm2170540eje.106.2023.03.04.07.26.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Mar 2023 07:26:57 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Eduardo Habkost , "Michael S. Tsirkin" , Paolo Bonzini , Richard Henderson , Marcel Apfelbaum , Bernhard Beschow , Thomas Huth Subject: [PATCH v2 01/13] hw/i386/pc_q35: Resolve redundant q35_host variable Date: Sat, 4 Mar 2023 16:26:36 +0100 Message-Id: <20230304152648.103749-2-shentey@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230304152648.103749-1-shentey@gmail.com> References: <20230304152648.103749-1-shentey@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=shentey@gmail.com; helo=mail-ed1-x534.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 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org The variable is redundant to "phb" and is never used by its real type. Signed-off-by: Bernhard Beschow Reviewed-by: Thomas Huth --- hw/i386/pc_q35.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 5a1e4976ce..68097bea55 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -119,8 +119,7 @@ static void pc_q35_init(MachineState *machine) PCMachineState *pcms = PC_MACHINE(machine); PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); X86MachineState *x86ms = X86_MACHINE(machine); - Q35PCIHost *q35_host; - PCIHostState *phb; + Object *phb; PCIBus *host_bus; PCIDevice *lpc; DeviceState *lpc_dev; @@ -206,10 +205,10 @@ static void pc_q35_init(MachineState *machine) } /* create pci host bus */ - q35_host = Q35_HOST_DEVICE(qdev_new(TYPE_Q35_HOST_DEVICE)); + phb = OBJECT(qdev_new(TYPE_Q35_HOST_DEVICE)); if (pcmc->pci_enabled) { - pci_hole64_size = object_property_get_uint(OBJECT(q35_host), + pci_hole64_size = object_property_get_uint(phb, PCI_HOST_PROP_PCI_HOLE64_SIZE, &error_abort); } @@ -217,25 +216,25 @@ static void pc_q35_init(MachineState *machine) /* allocate ram and load rom/bios */ pc_memory_init(pcms, system_memory, rom_memory, pci_hole64_size); - object_property_add_child(OBJECT(machine), "q35", OBJECT(q35_host)); - object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_RAM_MEM, + object_property_add_child(OBJECT(machine), "q35", phb); + object_property_set_link(phb, MCH_HOST_PROP_RAM_MEM, OBJECT(machine->ram), NULL); - object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_SMRAM_MEM, + object_property_set_link(phb, MCH_HOST_PROP_SMRAM_MEM, OBJECT(&x86ms->smram), NULL); - object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_PCI_MEM, + object_property_set_link(phb, MCH_HOST_PROP_PCI_MEM, OBJECT(pci_memory), NULL); - object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_SYSTEM_MEM, + object_property_set_link(phb, MCH_HOST_PROP_SYSTEM_MEM, OBJECT(system_memory), NULL); - object_property_set_link(OBJECT(q35_host), MCH_HOST_PROP_IO_MEM, + object_property_set_link(phb, MCH_HOST_PROP_IO_MEM, OBJECT(system_io), NULL); - object_property_set_int(OBJECT(q35_host), PCI_HOST_BELOW_4G_MEM_SIZE, + object_property_set_int(phb, PCI_HOST_BELOW_4G_MEM_SIZE, x86ms->below_4g_mem_size, NULL); - object_property_set_int(OBJECT(q35_host), PCI_HOST_ABOVE_4G_MEM_SIZE, + object_property_set_int(phb, PCI_HOST_ABOVE_4G_MEM_SIZE, x86ms->above_4g_mem_size, NULL); + /* pci */ - sysbus_realize_and_unref(SYS_BUS_DEVICE(q35_host), &error_fatal); - phb = PCI_HOST_BRIDGE(q35_host); - host_bus = phb->bus; + sysbus_realize_and_unref(SYS_BUS_DEVICE(phb), &error_fatal); + host_bus = PCI_BUS(qdev_get_child_bus(DEVICE(phb), "pcie.0")); /* create ISA bus */ lpc = pci_new_multifunction(PCI_DEVFN(ICH9_LPC_DEV, ICH9_LPC_FUNC), true, TYPE_ICH9_LPC_DEVICE); -- 2.39.2