ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/mips/jazz: Simplify the NIC setup code 

The for-loop does not make much sense here - it is always left after
the first iteration, so we can also check for nb_nics == 1 instead
which is way easier to understand.

Also, the checks for nd->model are superfluous since the code in
mips_jazz_init_net() calls qemu_check_nic_model() that already
takes care of this (i.e. initializing nd->model if it has not been
set yet, and checking whether it is the "help" option or the
supported NIC model).

Message-ID: <20230913160922.355640-3-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2023-09-13 18:09:22 +02:00
parent 4032f04c63
commit c9daa685cb
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/mips/jazz.c
View File

@ -172,7 +172,6 @@ static void mips_jazz_init(MachineState *machine,
MemoryRegion *rtc = g_new(MemoryRegion, 1); MemoryRegion *rtc = g_new(MemoryRegion, 1);
MemoryRegion *dma_dummy = g_new(MemoryRegion, 1); MemoryRegion *dma_dummy = g_new(MemoryRegion, 1);
MemoryRegion *dp8393x_prom = g_new(MemoryRegion, 1); MemoryRegion *dp8393x_prom = g_new(MemoryRegion, 1);
NICInfo *nd;
DeviceState *dev, *rc4030; DeviceState *dev, *rc4030;
MMIOKBDState *i8042; MMIOKBDState *i8042;
SysBusDevice *sysbus; SysBusDevice *sysbus;
@ -315,21 +314,11 @@ static void mips_jazz_init(MachineState *machine,
} }
/* Network controller */ /* Network controller */
for (n = 0; n < nb_nics; n++) { if (nb_nics == 1) {
nd = &nd_table[n]; mips_jazz_init_net(&nd_table[0], rc4030_dma_mr, rc4030, dp8393x_prom);
if (!nd->model) { } else if (nb_nics > 1) {
nd->model = g_strdup("dp83932"); error_report("This machine only supports one NIC");
} exit(1);
if (strcmp(nd->model, "dp83932") == 0) {
mips_jazz_init_net(nd, rc4030_dma_mr, rc4030, dp8393x_prom);
break;
} else if (is_help_option(nd->model)) {
error_report("Supported NICs: dp83932");
exit(1);
} else {
error_report("Unsupported NIC: %s", nd->model);
exit(1);
}
} }
/* SCSI adapter */ /* SCSI adapter */