qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Subject: [PULL 06/15] hw/arm: Use MachineClass->default_nic in the sbsa-ref machine
Date: Fri, 26 May 2023 11:08:31 +0200	[thread overview]
Message-ID: <20230526090840.2225958-7-thuth@redhat.com> (raw)
In-Reply-To: <20230526090840.2225958-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).

Message-Id: <20230524082037.1620952-1-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/arm/sbsa-ref.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index 792371fdce..9c3e670ec6 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -596,6 +596,7 @@ static void create_pcie(SBSAMachineState *sms)
     hwaddr size_mmio_high = sbsa_ref_memmap[SBSA_PCIE_MMIO_HIGH].size;
     hwaddr base_pio = sbsa_ref_memmap[SBSA_PCIE_PIO].base;
     int irq = sbsa_ref_irqmap[SBSA_PCIE];
+    MachineClass *mc = MACHINE_GET_CLASS(sms);
     MemoryRegion *mmio_alias, *mmio_alias_high, *mmio_reg;
     MemoryRegion *ecam_alias, *ecam_reg;
     DeviceState *dev;
@@ -641,7 +642,7 @@ static void create_pcie(SBSAMachineState *sms)
             NICInfo *nd = &nd_table[i];
 
             if (!nd->model) {
-                nd->model = g_strdup("e1000e");
+                nd->model = g_strdup(mc->default_nic);
             }
 
             pci_nic_init_nofail(nd, pci->bus, nd->model, NULL);
@@ -858,6 +859,7 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data)
     mc->minimum_page_bits = 12;
     mc->block_default_type = IF_IDE;
     mc->no_cdrom = 1;
+    mc->default_nic = "e1000e";
     mc->default_ram_size = 1 * GiB;
     mc->default_ram_id = "sbsa-ref.ram";
     mc->default_cpus = 4;
-- 
2.31.1



  parent reply	other threads:[~2023-05-26  9:10 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-26  9:08 [PULL 00/15] Improve --without-default-devices testing, fix CVE-2023-0330 Thomas Huth
2023-05-26  9:08 ` [PULL 01/15] hw/hppa: Use MachineClass->default_nic in the hppa machine Thomas Huth
2023-05-26  9:08 ` [PULL 02/15] hw/alpha: Use MachineClass->default_nic in the alpha machine Thomas Huth
2023-05-26  9:08 ` [PULL 03/15] hw/arm: Use MachineClass->default_nic in the virt machine Thomas Huth
2023-05-26  9:08 ` [PULL 04/15] hw/loongarch64: " Thomas Huth
2023-05-26  9:08 ` [PULL 05/15] hw/xtensa: " Thomas Huth
2023-05-26  9:08 ` Thomas Huth [this message]
2023-05-26  9:08 ` [PULL 07/15] hw/mips: " Thomas Huth
2023-05-26  9:08 ` [PULL 08/15] tests/qtest/usb-hcd-uhci-test: Check whether "usb-storage" is available Thomas Huth
2023-05-26  9:08 ` [PULL 09/15] tests/qtest: Check for virtio-blk before using -cdrom with the arm virt machine Thomas Huth
2023-05-26  9:08 ` [PULL 10/15] tests/qtest/rtl8139-test: Check whether the rtl8139 device is available Thomas Huth
2023-05-26  9:08 ` [PULL 11/15] tests/qtest/usb-hcd-ehci-test: Check for EHCI and UHCI HCDs before using them Thomas Huth
2023-05-26  9:08 ` [PULL 12/15] tests/qtest/ac97-test: add up-/downsampling tests Thomas Huth
2023-05-26  9:08 ` [PULL 13/15] machine: do not crash if default RAM backend name has been stolen Thomas Huth
2023-05-26  9:08 ` [PULL 14/15] lsi53c895a: disable reentrancy detection for MMIO region, too Thomas Huth
2023-05-26  9:08 ` [PULL 15/15] hw/scsi/lsi53c895a: Fix reentrancy issues in the LSI controller (CVE-2023-0330) Thomas Huth
2023-05-26 16:17 ` [PULL 00/15] Improve --without-default-devices testing, fix CVE-2023-0330 Richard Henderson

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=20230526090840.2225958-7-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=marcin.juszkiewicz@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.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 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).