[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/10] hw/arm/realview: Set MachineClass::default_nic in machine_
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 10/10] hw/arm/realview: Set MachineClass::default_nic in machine_class_init() |
Date: |
Wed, 24 May 2023 16:59:06 +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).
Inspired-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/realview.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index b7bb384000..0b2d6b82c8 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -70,6 +70,7 @@ static void split_irq_from_named(DeviceState *src, const
char* outname,
static void realview_common_machine_init(MachineState *machine)
{
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
RealviewMachineClass *rmc = REALVIEW_MACHINE_GET_CLASS(machine);
ARMCPU *cpu = NULL;
CPUARMState *env;
@@ -274,7 +275,7 @@ static void realview_common_machine_init(MachineState
*machine)
for(n = 0; n < nb_nics; n++) {
nd = &nd_table[n];
- if (!nd->model || strcmp(nd->model, is_pb ? "lan9118" : "smc91c111")
== 0) {
+ if (!nd->model || strcmp(nd->model, mc->default_nic) == 0) {
if (is_pb) {
lan9118_init(nd, 0x4e000000, pic[28]);
} else {
@@ -378,6 +379,7 @@ static void realview_eb_class_init(ObjectClass *oc, void
*data)
mc->desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)";
mc->block_default_type = IF_SCSI;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
+ mc->default_nic = "smc91c111";
rmc->board_id = 0x33b;
}
@@ -390,6 +392,7 @@ static void realview_eb_mpcore_class_init(ObjectClass *oc,
void *data)
mc->block_default_type = IF_SCSI;
mc->max_cpus = 4;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm11mpcore");
+ mc->default_nic = "smc91c111";
rmc->board_id = 0x33b;
rmc->mpcore_periphbase = 0x10100000;
}
@@ -401,6 +404,7 @@ static void realview_pb_a8_class_init(ObjectClass *oc, void
*data)
mc->desc = "ARM RealView Platform Baseboard for Cortex-A8";
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a8");
+ mc->default_nic = "lan9118";
rmc->board_id = 0x769;
rmc->is_pb = true;
rmc->loader_start = 0x70000000;
@@ -414,6 +418,7 @@ static void realview_pbx_a9_class_init(ObjectClass *oc,
void *data)
mc->desc = "ARM RealView Platform Baseboard Explore for Cortex-A9";
mc->max_cpus = 4;
mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a9");
+ mc->default_nic = "lan9118";
rmc->board_id = 0x76d;
rmc->is_pb = true;
rmc->mpcore_periphbase = 0x1f000000;
--
2.38.1
- [PATCH 05/10] hw/arm/realview: Move 'board_id' to RealviewMachineClass, (continued)
- [PATCH 05/10] hw/arm/realview: Move 'board_id' to RealviewMachineClass, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 06/10] hw/arm/realview: Move 'is_pb' to RealviewMachineClass, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 07/10] hw/arm/realview: Move 'mpcore_periphbase' to RealviewMachineClass, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 08/10] hw/arm/realview: Move 'loader_start' to RealviewMachineClass, Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 09/10] hw/arm/realview: Use generic realview_common_machine_init(), Philippe Mathieu-Daudé, 2023/05/24
- [PATCH 10/10] hw/arm/realview: Set MachineClass::default_nic in machine_class_init(),
Philippe Mathieu-Daudé <=