[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/13] mac_oldworld: Drop some variables
From: |
Mark Cave-Ayland |
Subject: |
[PULL 12/13] mac_oldworld: Drop some variables |
Date: |
Sun, 18 Oct 2020 16:59:18 +0100 |
From: BALATON Zoltan <balaton@eik.bme.hu>
Values not used frequently enough may not worth putting in a local
variable, especially with names almost as long as the original value
because that does not improve readability, to the contrary it makes it
harder to see what value is used. Drop a few such variables.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id:
<d67bc8d914a366ca6822b5190c1308d31af5c9b3.1602805637.git.balaton@eik.bme.hu>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/ppc/mac_oldworld.c | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 1abf26b5b4..e34680f980 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -83,14 +83,11 @@ static void ppc_heathrow_reset(void *opaque)
static void ppc_heathrow_init(MachineState *machine)
{
ram_addr_t ram_size = machine->ram_size;
- const char *kernel_filename = machine->kernel_filename;
- const char *kernel_cmdline = machine->kernel_cmdline;
- const char *initrd_filename = machine->initrd_filename;
const char *boot_device = machine->boot_order;
PowerPCCPU *cpu = NULL;
CPUPPCState *env = NULL;
char *filename;
- int linux_boot, i;
+ int i;
MemoryRegion *bios = g_new(MemoryRegion, 1);
uint32_t kernel_base, initrd_base, cmdline_base = 0;
int32_t kernel_size, initrd_size;
@@ -109,8 +106,6 @@ static void ppc_heathrow_init(MachineState *machine)
void *fw_cfg;
uint64_t tbfreq;
- linux_boot = (kernel_filename != NULL);
-
/* init CPUs */
for (i = 0; i < smp_cpus; i++) {
cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
@@ -147,7 +142,7 @@ static void ppc_heathrow_init(MachineState *machine)
bios_addr = (uint32_t)bios_addr;
if (bios_size <= 0) {
- /* or load binary ROM image */
+ /* or if could not load ELF try loading a binary ROM image */
bios_size = load_image_targphys(filename, PROM_BASE, PROM_SIZE);
bios_addr = PROM_BASE;
}
@@ -160,7 +155,7 @@ static void ppc_heathrow_init(MachineState *machine)
exit(1);
}
- if (linux_boot) {
+ if (machine->kernel_filename) {
int bswap_needed;
#ifdef BSWAP_NEEDED
@@ -169,29 +164,32 @@ static void ppc_heathrow_init(MachineState *machine)
bswap_needed = 0;
#endif
kernel_base = KERNEL_LOAD_ADDR;
- kernel_size = load_elf(kernel_filename, NULL,
+ kernel_size = load_elf(machine->kernel_filename, NULL,
translate_kernel_address, NULL, NULL, NULL,
NULL, NULL, 1, PPC_ELF_MACHINE, 0, 0);
if (kernel_size < 0)
- kernel_size = load_aout(kernel_filename, kernel_base,
+ kernel_size = load_aout(machine->kernel_filename, kernel_base,
ram_size - kernel_base, bswap_needed,
TARGET_PAGE_SIZE);
if (kernel_size < 0)
- kernel_size = load_image_targphys(kernel_filename,
+ kernel_size = load_image_targphys(machine->kernel_filename,
kernel_base,
ram_size - kernel_base);
if (kernel_size < 0) {
- error_report("could not load kernel '%s'", kernel_filename);
+ error_report("could not load kernel '%s'",
+ machine->kernel_filename);
exit(1);
}
/* load initrd */
- if (initrd_filename) {
- initrd_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size +
KERNEL_GAP);
- initrd_size = load_image_targphys(initrd_filename, initrd_base,
+ if (machine->initrd_filename) {
+ initrd_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size +
+ KERNEL_GAP);
+ initrd_size = load_image_targphys(machine->initrd_filename,
+ initrd_base,
ram_size - initrd_base);
if (initrd_size < 0) {
error_report("could not load initial ram disk '%s'",
- initrd_filename);
+ machine->initrd_filename);
exit(1);
}
cmdline_base = TARGET_PAGE_ALIGN(initrd_base + initrd_size);
@@ -343,9 +341,10 @@ static void ppc_heathrow_init(MachineState *machine)
fw_cfg_add_i16(fw_cfg, FW_CFG_MACHINE_ID, ARCH_HEATHROW);
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, kernel_base);
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size);
- if (kernel_cmdline) {
+ if (machine->kernel_cmdline) {
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_CMDLINE, cmdline_base);
- pstrcpy_targphys("cmdline", cmdline_base, TARGET_PAGE_SIZE,
kernel_cmdline);
+ pstrcpy_targphys("cmdline", cmdline_base, TARGET_PAGE_SIZE,
+ machine->kernel_cmdline);
} else {
fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_CMDLINE, 0);
}
--
2.20.1
- [PULL 02/13] grackle: use qdev gpios for PCI IRQs, (continued)
- [PULL 02/13] grackle: use qdev gpios for PCI IRQs, Mark Cave-Ayland, 2020/10/18
- [PULL 03/13] uninorth: use qdev gpios for PCI IRQs, Mark Cave-Ayland, 2020/10/18
- [PULL 04/13] m48t59-isa: remove legacy m48t59_init_isa() function, Mark Cave-Ayland, 2020/10/18
- [PULL 05/13] sun4m: use qdev properties instead of legacy m48t59_init() function, Mark Cave-Ayland, 2020/10/18
- [PULL 06/13] sun4u: use qdev properties instead of legacy m48t59_init() function, Mark Cave-Ayland, 2020/10/18
- [PULL 07/13] ppc405_boards: use qdev properties instead of legacy m48t59_init() function, Mark Cave-Ayland, 2020/10/18
- [PULL 08/13] m48t59: remove legacy m48t59_init() function, Mark Cave-Ayland, 2020/10/18
- [PULL 09/13] mac_oldworld: Allow loading binary ROM image, Mark Cave-Ayland, 2020/10/18
- [PULL 10/13] mac_newworld: Allow loading binary ROM image, Mark Cave-Ayland, 2020/10/18
- [PULL 11/13] mac_oldworld: Drop a variable, use get_system_memory() directly, Mark Cave-Ayland, 2020/10/18
- [PULL 12/13] mac_oldworld: Drop some variables,
Mark Cave-Ayland <=
- [PULL 13/13] mac_oldworld: Change PCI address of macio to match real hardware, Mark Cave-Ayland, 2020/10/18
- Re: [PULL 00/13] qemu-macppc queue 20201018, Mark Cave-Ayland, 2020/10/19