From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: Richard Henderson <richard.henderson@linaro.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Eduardo Habkost <eduardo@habkost.net>,
Bernhard Beschow <shentey@gmail.com>,
Thomas Huth <thuth@redhat.com>
Subject: [PATCH 01/12] hw/i386/pc_q35: Resolve redundant q35_host variable
Date: Tue, 14 Feb 2023 14:14:30 +0100 [thread overview]
Message-ID: <20230214131441.101760-2-shentey@gmail.com> (raw)
In-Reply-To: <20230214131441.101760-1-shentey@gmail.com>
The variable is redundant to "phb" and is never used by its real type.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
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 a5ffb77ed8..1ce9b16c53 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -118,8 +118,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_create_simple_multifunction(host_bus, PCI_DEVFN(ICH9_LPC_DEV,
ICH9_LPC_FUNC), true,
--
2.39.1
next prev parent reply other threads:[~2023-02-14 13:16 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 13:14 [PATCH 00/12] Q35 PCI host fixes and QOM cleanup Bernhard Beschow
2023-02-14 13:14 ` Bernhard Beschow [this message]
2023-02-14 13:14 ` [PATCH 02/12] hw/pci-host/q35: Fix contradicting .endianness assignment Bernhard Beschow
2023-03-01 21:43 ` Michael S. Tsirkin
2023-03-01 21:44 ` Michael S. Tsirkin
2023-02-14 13:14 ` [PATCH 03/12] hw/pci-host/q35: Use memory_region_set_address() also for tseg_blackhole Bernhard Beschow
2023-03-01 21:45 ` Michael S. Tsirkin
2023-02-14 13:14 ` [PATCH 04/12] hw/pci-host/q35: Initialize PCMachineState::bus in board code Bernhard Beschow
2023-02-14 13:14 ` [PATCH 05/12] hw/pci-host/q35: Initialize "bypass-iommu" property from " Bernhard Beschow
2023-03-01 21:46 ` Michael S. Tsirkin
2023-02-14 13:14 ` [PATCH 06/12] hw/pci-host/q35: Initialize properties just once Bernhard Beschow
2023-03-01 21:47 ` Michael S. Tsirkin
2023-02-14 13:14 ` [PATCH 07/12] hw/pci-host/q35: Initialize PCI hole boundaries " Bernhard Beschow
2023-02-14 13:14 ` [PATCH 08/12] hw/pci-host/q35: Turn PCI hole properties into class properties Bernhard Beschow
2023-02-14 13:14 ` [PATCH 09/12] hw/pci-host/q35: Rename local variable to more idiomatic "phb" Bernhard Beschow
2023-02-14 13:14 ` [PATCH 10/12] hw/pci-host/q35: Propagate to errp rather than doing error_fatal Bernhard Beschow
2023-02-14 13:14 ` [PATCH 11/12] hw/pci-host/q35: Merge mch_realize() into q35_host_realize() Bernhard Beschow
2023-02-14 13:14 ` [PATCH 12/12] hw/pci-host/q35: Move MemoryRegion pointers to host device Bernhard Beschow
2023-02-21 15:39 ` [PATCH 00/12] Q35 PCI host fixes and QOM cleanup Bernhard Beschow
2023-03-01 21:49 ` Michael S. Tsirkin
2023-03-02 21:54 ` Bernhard Beschow
2023-03-05 7:41 ` Bernhard Beschow
2023-03-01 21:50 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230214131441.101760-2-shentey@gmail.com \
--to=shentey@gmail.com \
--cc=eduardo@habkost.net \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).