All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Fabiano Rosas" <farosas@suse.de>
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 07/18] hw/sh4: Use MachineClass->default_nic in the sh4 r2d machine
Date: Fri, 12 May 2023 14:40:22 +0200	[thread overview]
Message-ID: <20230512124033.502654-8-thuth@redhat.com> (raw)
In-Reply-To: <20230512124033.502654-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/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



  parent reply	other threads:[~2023-05-12 12:42 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-12 12:40 [PATCH 00/18] Allow qtests with --without-default-devices (part 1) Thomas Huth
2023-05-12 12:40 ` [PATCH 01/18] hw/i386/Kconfig: ISAPC works fine without VGA_ISA Thomas Huth
2023-05-12 12:40 ` [PATCH 02/18] softmmu/vl.c: Check for the availability of the VGA device before using it Thomas Huth
2023-05-12 12:40 ` [PATCH 03/18] hw: Move the default NIC machine class setting from the x86 to the generic one Thomas Huth
2023-05-12 12:40 ` [PATCH 04/18] softmmu/vl.c: Disable default NIC if it has not been compiled into the binary Thomas Huth
2023-05-12 12:40 ` [PATCH 05/18] hw/ppc: Use MachineClass->default_nic in the ppc machines Thomas Huth
2023-05-12 12:40 ` [PATCH 06/18] hw/s390x: Use MachineClass->default_nic in the s390x machine Thomas Huth
2023-05-12 12:40 ` Thomas Huth [this message]
2023-05-12 12:40 ` [PATCH 08/18] hw/char/parallel: Move TYPE_ISA_PARALLEL to the header file Thomas Huth
2023-05-12 12:40 ` [PATCH 09/18] hw/i386: Ignore the default parallel port if it has not been compiled into QEMU Thomas Huth
2023-05-12 12:40 ` [PATCH 10/18] hw/sparc64/sun4u: Use MachineClass->default_nic and MachineClass->no_parallel Thomas Huth
2023-05-12 12:40 ` [PATCH 11/18] tests/qtest/readconfig-test: Check for the availability of USB controllers Thomas Huth
2023-05-12 12:40 ` [PATCH 12/18] tests/qtest/usb-hcd-uhci-test: Skip test if UHCI controller is not available Thomas Huth
2023-05-12 12:40 ` [PATCH 13/18] tests/qtest/cdrom-test: Fix the test to also work without optional devices Thomas Huth
2023-05-12 12:40 ` [PATCH 14/18] tests/qtest/virtio-ccw-test: Remove superfluous tests Thomas Huth
2023-05-12 12:40 ` [PATCH 15/18] tests/qtest: Check for the availability of virtio-ccw devices before using them Thomas Huth
2023-05-12 12:40 ` [PATCH 16/18] tests/qtest/meson.build: Run the net filter tests only with default devices Thomas Huth
2023-05-14 20:31   ` Paolo Bonzini
2023-05-15  9:46     ` Thomas Huth
2023-05-15 10:42       ` Paolo Bonzini
2023-05-12 12:40 ` [PATCH 17/18] tests/qemu-iotests/172: Run QEMU with -vga none and -nic none Thomas Huth
2023-05-12 12:40 ` [PATCH 18/18] .gitlab-ci.d/buildtest.yml: Run full "make check" with --without-default-devices Thomas Huth

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=20230512124033.502654-8-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=farosas@suse.de \
    --cc=pbonzini@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.