From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Nicholas Piggin" <npiggin@gmail.com>,
qemu-block@nongnu.org, "Bin Meng" <bmeng.cn@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Jason Wang" <jasowang@redhat.com>,
"Bernhard Beschow" <shentey@gmail.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
qemu-ppc@nongnu.org, "Corey Minyard" <cminyard@mvista.com>
Subject: [PATCH v3 02/26] hw/ppc/e500: Remove firstenv variable
Date: Sat, 2 Nov 2024 14:16:51 +0100 [thread overview]
Message-ID: <20241102131715.548849-3-shentey@gmail.com> (raw)
In-Reply-To: <20241102131715.548849-1-shentey@gmail.com>
The firstenv variable is never read, so remove it. The env variable is then only
used inside the loop, so move it there to restrict its scope.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/ppc/e500.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index ba83f33033..0683629ac0 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -899,7 +899,6 @@ void ppce500_init(MachineState *machine)
const PPCE500MachineClass *pmc = PPCE500_MACHINE_GET_CLASS(machine);
MachineClass *mc = MACHINE_CLASS(pmc);
PCIBus *pci_bus;
- CPUPPCState *env = NULL;
uint64_t loadaddr;
hwaddr kernel_base = -1LL;
int kernel_size = 0;
@@ -921,7 +920,6 @@ void ppce500_init(MachineState *machine)
IrqLines *irqs;
DeviceState *dev, *mpicdev;
DriveInfo *dinfo;
- CPUPPCState *firstenv = NULL;
MemoryRegion *ccsr_addr_space;
SysBusDevice *s;
PPCE500CCSRState *ccsr;
@@ -930,6 +928,7 @@ void ppce500_init(MachineState *machine)
irqs = g_new0(IrqLines, smp_cpus);
for (i = 0; i < smp_cpus; i++) {
PowerPCCPU *cpu;
+ CPUPPCState *env;
CPUState *cs;
cpu = POWERPC_CPU(object_new(machine->cpu_type));
@@ -950,10 +949,6 @@ void ppce500_init(MachineState *machine)
&error_abort);
qdev_realize_and_unref(DEVICE(cs), NULL, &error_fatal);
- if (!firstenv) {
- firstenv = env;
- }
-
irqs[i].irq[OPENPIC_OUTPUT_INT] =
qdev_get_gpio_in(DEVICE(cpu), PPCE500_INPUT_INT);
irqs[i].irq[OPENPIC_OUTPUT_CINT] =
@@ -974,8 +969,6 @@ void ppce500_init(MachineState *machine)
}
}
- env = firstenv;
-
if (!QEMU_IS_ALIGNED(machine->ram_size, RAM_SIZES_ALIGN)) {
error_report("RAM size must be multiple of %" PRIu64, RAM_SIZES_ALIGN);
exit(EXIT_FAILURE);
--
2.47.0
next prev parent reply other threads:[~2024-11-02 13:18 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-02 13:16 [PATCH v3 00/26] E500 Cleanup Bernhard Beschow
2024-11-02 13:16 ` [PATCH v3 01/26] hw/ppc/e500: Do not leak struct boot_info Bernhard Beschow
2024-11-02 13:16 ` Bernhard Beschow [this message]
2024-11-02 13:16 ` [PATCH v3 03/26] hw/ppc/e500: Prefer QOM cast Bernhard Beschow
2024-11-02 13:16 ` [PATCH v3 04/26] hw/ppc/e500: Remove unused "irqs" parameter Bernhard Beschow
2024-11-02 13:16 ` [PATCH v3 05/26] hw/ppc/e500: Add missing device tree properties to i2c controller node Bernhard Beschow
2024-11-02 13:16 ` [PATCH v3 06/26] hw/ppc/e500: Reuse TYPE_GPIO_PWR Bernhard Beschow
2024-11-02 13:16 ` [PATCH v3 07/26] hw/ppc/e500: Use SysBusDevice API to access TYPE_CCSR's internal resources Bernhard Beschow
2024-11-02 13:16 ` [PATCH v3 08/26] hw/ppc/e500: Extract ppce500_ccsr.c Bernhard Beschow
2024-11-02 13:16 ` [PATCH v3 09/26] hw/ppc/ppce500_ccsr: Trace access to CCSR region Bernhard Beschow
2024-11-02 13:16 ` [PATCH v3 10/26] hw/ppc/mpc8544_guts: Populate POR PLL ratio status register Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 11/26] hw/i2c/mpc_i2c: Convert DPRINTF to trace events for register access Bernhard Beschow
2024-11-02 17:25 ` Corey Minyard
2024-11-02 23:08 ` BALATON Zoltan
2024-11-03 1:11 ` Corey Minyard
2024-11-02 13:17 ` [PATCH v3 12/26] hw/i2c/mpc_i2c: Prefer DEFINE_TYPES() macro Bernhard Beschow
2024-11-02 17:26 ` Corey Minyard
2024-11-02 13:17 ` [PATCH v3 13/26] hw/pci-host/ppce500: Reuse TYPE_PPC_E500_PCI_BRIDGE define Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 14/26] hw/pci-host/ppce500: Prefer DEFINE_TYPES() macro Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 15/26] hw/net/fsl_etsec/miim: Reuse MII constants Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 16/26] hw/net/fsl_etsec/etsec: Prefer DEFINE_TYPES() macro Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 17/26] hw/gpio/mpc8xxx: " Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 18/26] hw/ppc/mpc8544_guts: " Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 19/26] hw/intc: Guard openpic_kvm.c by dedicated OPENPIC_KVM Kconfig switch Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 20/26] hw/sd/sdhci: Prefer DEFINE_TYPES() macro Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 21/26] hw/block/pflash_cfi01: " Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 22/26] hw/i2c/smbus_eeprom: " Bernhard Beschow
2024-11-02 17:24 ` Corey Minyard
2024-11-03 7:51 ` Bernhard Beschow
2024-11-03 11:52 ` Bernhard Beschow
2024-11-03 13:06 ` Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 23/26] hw/rtc/ds1338: " Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 24/26] hw/usb/hcd-ehci-sysbus: " Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 25/26] hw/vfio/platform: Let vfio_start_eventfd_injection() take VFIOPlatformDevice pointer Bernhard Beschow
2024-11-02 13:17 ` [PATCH v3 26/26] MAINTAINERS: Add hw/gpio/gpio_pwr.c Bernhard Beschow
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=20241102131715.548849-3-shentey@gmail.com \
--to=shentey@gmail.com \
--cc=alex.williamson@redhat.com \
--cc=bmeng.cn@gmail.com \
--cc=clg@redhat.com \
--cc=cminyard@mvista.com \
--cc=danielhb413@gmail.com \
--cc=hreitz@redhat.com \
--cc=jasowang@redhat.com \
--cc=kwolf@redhat.com \
--cc=npiggin@gmail.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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).