diff options
| author | Thomas Huth <thuth@redhat.com> | 2023-05-23 13:04:32 +0200 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2023-05-26 09:10:49 +0200 |
| commit | cdd684b8e1cb7cfa5818d9eb7b9eaa9b7b4d717e (patch) | |
| tree | fc5cabee480f3b4944c9da7408dd8962d39753b1 | |
| parent | 9f8981a91d9016a0e556d153b2a815f89f9096f0 (diff) | |
| download | focaccia-qemu-cdd684b8e1cb7cfa5818d9eb7b9eaa9b7b4d717e.tar.gz focaccia-qemu-cdd684b8e1cb7cfa5818d9eb7b9eaa9b7b4d717e.zip | |
hw/alpha: Use MachineClass->default_nic in the alpha machine
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: <20230523110435.1375774-3-thuth@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | hw/alpha/dp264.c | 4 |
1 files changed, 3 insertions, 1 deletions
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) |