From nobody Sat May 18 04:46:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684916495; cv=none; d=zohomail.com; s=zohoarc; b=K/ZGqhOoB2jKFHCuXx49KroFhThwqlcMMaWUspOR8AOH7i8G/FMusSXYuClpQ8P2jK5vDRbuaxMAp1MhNIohpSpMcgoT+FrVufdqpuGBuOjVjJuKDNO9sLg94d0kFxR4slN16L2UQbU9mDLmxT8ritdnF8fXdmpkV81cRwYioBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684916495; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=tKoJGBYIgfApa6z6v9N/YjXhD95adNm6Ki5W9wz0M50=; b=EF3vWBxVG9yMQCCJeegPIqIEu8ew9VxzPgBrT0lnOKJaPUjCg3WMzYy0X5RrzI6alU6tT+jVnxHjzS0Kpx2Mo6b4Xemlv/Y/X5T2XEKm9bd5tB1BCx4qYNauRMoOi2W24pfR/p1mYVhX5hPS3/91dSC719ue0z1BhCg1Ph6tXQE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684916495791135.29624790440494; Wed, 24 May 2023 01:21:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1jjm-0006XS-Vp; Wed, 24 May 2023 04:20:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1jjk-0006X1-4U for qemu-devel@nongnu.org; Wed, 24 May 2023 04:20:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1jji-0005i3-IG for qemu-devel@nongnu.org; Wed, 24 May 2023 04:20:47 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-463-vQKVsVF5N7W2CRucLPEOWA-1; Wed, 24 May 2023 04:20:40 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EC5ED8007D9; Wed, 24 May 2023 08:20:39 +0000 (UTC) Received: from thuth.com (unknown [10.39.194.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3FF37AE4; Wed, 24 May 2023 08:20:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684916445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tKoJGBYIgfApa6z6v9N/YjXhD95adNm6Ki5W9wz0M50=; b=Jwmb3/Z0jduNST48tgS/R1twwscCFSwBbvokAsB6oYy5R6fb7a6baGYbLSNz8cRNJrRNUp 0PV2S/BqKtv0vxsTKPtu4F3J0S42lopzEDm3buLSxuxwifotCFNlBK6LtZlop+opHA86tj KHDDO1X4erzUCHL+zeArsT42C/TPais= X-MC-Unique: vQKVsVF5N7W2CRucLPEOWA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Radoslaw Biernacki , Peter Maydell Cc: qemu-arm@nongnu.org, Marcin Juszkiewicz , Leif Lindholm Subject: [PATCH] hw/arm: Use MachineClass->default_nic in the sbsa-ref machine Date: Wed, 24 May 2023 10:20:37 +0200 Message-Id: <20230524082037.1620952-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684916497890100001 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Richard Henderson --- 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 =3D sbsa_ref_memmap[SBSA_PCIE_MMIO_HIGH].size; hwaddr base_pio =3D sbsa_ref_memmap[SBSA_PCIE_PIO].base; int irq =3D sbsa_ref_irqmap[SBSA_PCIE]; + MachineClass *mc =3D 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 =3D &nd_table[i]; =20 if (!nd->model) { - nd->model =3D g_strdup("e1000e"); + nd->model =3D g_strdup(mc->default_nic); } =20 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 =3D 12; mc->block_default_type =3D IF_IDE; mc->no_cdrom =3D 1; + mc->default_nic =3D "e1000e"; mc->default_ram_size =3D 1 * GiB; mc->default_ram_id =3D "sbsa-ref.ram"; mc->default_cpus =3D 4; --=20 2.31.1