diff options
| author | Thomas Huth <thuth@redhat.com> | 2023-09-13 18:09:22 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2023-09-25 07:58:14 +0200 |
| commit | c9daa685cb69dddfe8082f09fd26728e98a66102 (patch) | |
| tree | 5d0e5189fa4e6e97d604eeb7f319dfe83408d8ba /hw/mips | |
| parent | 4032f04c638ff852fa6f2d274f8dc2402b965ca9 (diff) | |
| download | qemu-c9daa685cb69dddfe8082f09fd26728e98a66102.zip qemu-c9daa685cb69dddfe8082f09fd26728e98a66102.tar.gz qemu-c9daa685cb69dddfe8082f09fd26728e98a66102.tar.bz2 | |
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>
Diffstat (limited to 'hw/mips')
| -rw-r--r-- | hw/mips/jazz.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 829c924..c32d2b0 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -172,7 +172,6 @@ static void mips_jazz_init(MachineState *machine, MemoryRegion *rtc = g_new(MemoryRegion, 1); MemoryRegion *dma_dummy = g_new(MemoryRegion, 1); MemoryRegion *dp8393x_prom = g_new(MemoryRegion, 1); - NICInfo *nd; DeviceState *dev, *rc4030; MMIOKBDState *i8042; SysBusDevice *sysbus; @@ -315,21 +314,11 @@ static void mips_jazz_init(MachineState *machine, } /* Network controller */ - for (n = 0; n < nb_nics; n++) { - nd = &nd_table[n]; - if (!nd->model) { - nd->model = g_strdup("dp83932"); - } - 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); - } + if (nb_nics == 1) { + mips_jazz_init_net(&nd_table[0], rc4030_dma_mr, rc4030, dp8393x_prom); + } else if (nb_nics > 1) { + error_report("This machine only supports one NIC"); + exit(1); } /* SCSI adapter */ |