From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Helge Deller <deller@gmx.de>,
Xiaojuan Yang <yangxiaojuan@loongson.cn>,
Song Gao <gaosong@loongson.cn>, Max Filippov <jcmvbkbc@gmail.com>,
Jason Wang <jasowang@redhat.com>
Subject: [PATCH 2/5] hw/alpha: Use MachineClass->default_nic in the alpha machine
Date: Tue, 23 May 2023 13:04:32 +0200 [thread overview]
Message-ID: <20230523110435.1375774-3-thuth@redhat.com> (raw)
In-Reply-To: <20230523110435.1375774-1-thuth@redhat.com>
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
next prev parent reply other threads:[~2023-05-23 11:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 11:04 [PATCH 0/5] Use MachineClass->default_nic in more machines Thomas Huth
2023-05-23 11:04 ` [PATCH 1/5] hw/hppa: Use MachineClass->default_nic in the hppa machine Thomas Huth
2023-05-23 11:04 ` Thomas Huth [this message]
2023-05-23 11:04 ` [PATCH 3/5] hw/arm: Use MachineClass->default_nic in the virt machine Thomas Huth
2023-05-23 11:04 ` [PATCH 4/5] hw/loongarch64: " Thomas Huth
2023-05-25 12:56 ` Song Gao
2023-05-23 11:04 ` [PATCH 5/5] hw/xtensa: " Thomas Huth
2023-05-23 15:03 ` [PATCH 0/5] Use MachineClass->default_nic in more machines Richard Henderson
2023-05-24 13:55 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230523110435.1375774-3-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=deller@gmx.de \
--cc=gaosong@loongson.cn \
--cc=jasowang@redhat.com \
--cc=jcmvbkbc@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=yangxiaojuan@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).