[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/5] hw/alpha: Use MachineClass->default_nic in the alpha machine
From: |
Thomas Huth |
Subject: |
[PATCH 2/5] hw/alpha: Use MachineClass->default_nic in the alpha machine |
Date: |
Tue, 23 May 2023 13:04:32 +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).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/alpha/dp264.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c
index 4161f559a7..03495e1e60 100644
--- a/hw/alpha/dp264.c
+++ b/hw/alpha/dp264.c
@@ -49,6 +49,7 @@ static void clipper_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);
AlphaCPU *cpus[4];
PCIBus *pci_bus;
PCIDevice *pci_dev;
@@ -124,7 +125,7 @@ static void clipper_init(MachineState *machine)
/* Network setup. e1000 is good enough, failing Tulip support. */
for (i = 0; i < nb_nics; i++) {
- pci_nic_init_nofail(&nd_table[i], pci_bus, "e1000", NULL);
+ pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
}
/* Super I/O */
@@ -213,6 +214,7 @@ static void clipper_machine_init(MachineClass *mc)
mc->is_default = true;
mc->default_cpu_type = ALPHA_CPU_TYPE_NAME("ev67");
mc->default_ram_id = "ram";
+ mc->default_nic = "e1000";
}
DEFINE_MACHINE("clipper", clipper_machine_init)
--
2.31.1
- [PATCH 0/5] Use MachineClass->default_nic in more machines, Thomas Huth, 2023/05/23
- [PATCH 1/5] hw/hppa: Use MachineClass->default_nic in the hppa machine, Thomas Huth, 2023/05/23
- [PATCH 3/5] hw/arm: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/23
- [PATCH 2/5] hw/alpha: Use MachineClass->default_nic in the alpha machine,
Thomas Huth <=
- [PATCH 4/5] hw/loongarch64: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/23
- [PATCH 5/5] hw/xtensa: Use MachineClass->default_nic in the virt machine, Thomas Huth, 2023/05/23
- Re: [PATCH 0/5] Use MachineClass->default_nic in more machines, Richard Henderson, 2023/05/23
- Re: [PATCH 0/5] Use MachineClass->default_nic in more machines, Philippe Mathieu-Daudé, 2023/05/24