[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/20] hw/sh4: Use MachineClass->default_nic in the sh4 r2d machin
From: |
Thomas Huth |
Subject: |
[PULL 07/20] hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine |
Date: |
Mon, 22 May 2023 13:50:01 +0200 |
Mark the default NIC via the new MachineClass->default_nic setting
so that the machine-defaults code in vl.c can decide whether the
default NIC is usable or not (for example when compiling with the
"--without-default-devices" configure switch).
Message-Id: <20230512124033.502654-8-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/sh4/r2d.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 826a0a31b5..4944994e9c 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -232,6 +232,7 @@ static void r2d_init(MachineState *machine)
const char *kernel_filename = machine->kernel_filename;
const char *kernel_cmdline = machine->kernel_cmdline;
const char *initrd_filename = machine->initrd_filename;
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
SuperHCPU *cpu;
CPUSH4State *env;
ResetData *reset_info;
@@ -310,7 +311,7 @@ static void r2d_init(MachineState *machine)
/* NIC: rtl8139 on-board, and 2 slots. */
for (i = 0; i < nb_nics; i++)
pci_nic_init_nofail(&nd_table[i], pci_bus,
- "rtl8139", i == 0 ? "2" : NULL);
+ mc->default_nic, i == 0 ? "2" : NULL);
/* USB keyboard */
usb_create_simple(usb_bus_find(-1), "usb-kbd");
@@ -375,6 +376,7 @@ static void r2d_machine_init(MachineClass *mc)
mc->init = r2d_init;
mc->block_default_type = IF_IDE;
mc->default_cpu_type = TYPE_SH7751R_CPU;
+ mc->default_nic = "rtl8139";
}
DEFINE_MACHINE("r2d", r2d_machine_init)
--
2.31.1
- [PULL 00/20] Allow "make check" with "--without-default-devices", Thomas Huth, 2023/05/22
- [PULL 04/20] softmmu/vl.c: Disable default NIC if it has not been compiled into the binary, Thomas Huth, 2023/05/22
- [PULL 01/20] hw/i386/Kconfig: ISAPC works fine without VGA_ISA, Thomas Huth, 2023/05/22
- [PULL 03/20] hw: Move the default NIC machine class setting from the x86 to the generic one, Thomas Huth, 2023/05/22
- [PULL 07/20] hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine,
Thomas Huth <=
- [PULL 05/20] hw/ppc: Use MachineClass->default_nic in the ppc machines, Thomas Huth, 2023/05/22
- [PULL 11/20] tests/qtest/readconfig-test: Check for the availability of USB controllers, Thomas Huth, 2023/05/22
- [PULL 08/20] hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file, Thomas Huth, 2023/05/22
- [PULL 09/20] hw/i386: Ignore the default parallel port if it has not been compiled into QEMU, Thomas Huth, 2023/05/22
- [PULL 06/20] hw/s390x: Use MachineClass->default_nic in the s390x machine, Thomas Huth, 2023/05/22
- [PULL 17/20] tests/qemu-iotests/172: Run QEMU with -vga none and -nic none, Thomas Huth, 2023/05/22
- [PULL 16/20] tests/qtest/meson.build: Run the net filter tests only with default devices, Thomas Huth, 2023/05/22
- [PULL 20/20] memory: stricter checks prior to unsetting engaged_in_io, Thomas Huth, 2023/05/22
- [PULL 13/20] tests/qtest/cdrom-test: Fix the test to also work without optional devices, Thomas Huth, 2023/05/22
- [PULL 10/20] hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel, Thomas Huth, 2023/05/22