From patchwork Wed May 24 10:18:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 685327 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp165758wrt; Wed, 24 May 2023 03:20:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ405LlRCe0DwyKtlYItmfi3rgGLKDeqbTj3FbNIJahLaMPQzt6wYz8b+9sUinyK7lPAZ2M7 X-Received: by 2002:a05:6214:27e6:b0:61e:800b:4fcc with SMTP id jt6-20020a05621427e600b0061e800b4fccmr27534167qvb.25.1684923601176; Wed, 24 May 2023 03:20:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684923601; cv=none; d=google.com; s=arc-20160816; b=DdyRofdCFe+NT5tXnkT17OVj9JRXQrX1NfkhPFg0JsE3ScGlk4dDPRZwMZFFqb02o/ Y3Q8m1LP8N9T1GSzv6wdgwZqZ3pvTuL8catkU9DflhkoTviiXLdBPtLkxNviHtHsYIQA z8Fig/KAdGbO4h1IulNfmJht6VyaA4RKevdQRZPzNYYzAMbz6EGrmLC9EcVG35f0sFIQ BWf8mvuiemAA96vQhpnl6tyAtpdFg7oMPOiUSESudxKi3Obg7mdysMSbKRLSmMssYrsM cwAvEerkjlSvuK/bbmvXbnDhPVaWdC6bJo/2RUTxlSBUpNxJO8dcn23KhzuKDtT+WGK0 qvbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=3e9LymC1Yc9KvB15ELruVVHR08VNyMQ7IqdBakyZxug=; b=CrwuzLxB6Wd9BXJ4K4cFQojk1AlJmYvqDVgX6hsweULL7ty11ckALa2wbY3UE6zuEl QgeAViL0RTzqtojuJ5AbAryCaiaKDpoVc4xHXefWhY3BB5gkhl/CoFKstt9kzQ/oAmjt GeS2EiftiR6GMY87RztXgZGmjV8vDxq+NEY1JiY1B2PmPnf3zWZkmXWO3eJAqU8k+idR KE3729fdYs4bfk+WmSQNIvIyoMB9KgKtCU51W6WpRPRfsyiw0GpWlewIvMeWDIxmH59V Ski+YxY3YaLy92tDxIBJDsfXfEddqorpoT33Iorn1bbmuIJt2bSJWuC6v4Qlbe2mB6N4 iY5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k13-20020ae9f10d000000b0075783b0d4f6si6076980qkg.442.2023.05.24.03.20.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 03:20:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1lZv-0003Rn-FR; Wed, 24 May 2023 06:18:47 -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 1q1lZn-0003Pq-H6; Wed, 24 May 2023 06:18:39 -0400 Received: from muminek.juszkiewicz.com.pl ([213.251.184.221]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1lZh-0006cb-Pg; Wed, 24 May 2023 06:18:36 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 0CE9A260BC0; Wed, 24 May 2023 12:18:31 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at juszkiewicz.com.pl Received: from muminek.juszkiewicz.com.pl ([127.0.0.1]) by localhost (muminek.juszkiewicz.com.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id on9A4neb-3d6; Wed, 24 May 2023 12:18:29 +0200 (CEST) Received: from applejack.lan (83.21.125.167.ipv4.supernova.orange.pl [83.21.125.167]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTPSA id B0374260249; Wed, 24 May 2023 12:18:28 +0200 (CEST) From: Marcin Juszkiewicz To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Leif Lindholm , Peter Maydell , Thomas Huth , Paolo Bonzini Subject: [PATCH v2 1/5] hw/arm: Use MachineClass->default_nic in the sbsa-ref machine Date: Wed, 24 May 2023 12:18:19 +0200 Message-Id: <20230524101823.810737-1-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: softfail client-ip=213.251.184.221; envelope-from=marcin.juszkiewicz@linaro.org; helo=muminek.juszkiewicz.com.pl X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth 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 --- 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; From patchwork Wed May 24 10:18:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 685325 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp165587wrt; Wed, 24 May 2023 03:19:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4089afsaivdejFp7QKbA/anRm5BUapGNTJ0/lW3sM3cFiPH8js5DtkDu7J20SsG1klHW8X X-Received: by 2002:a05:6214:27ce:b0:61f:1a72:6c89 with SMTP id ge14-20020a05621427ce00b0061f1a726c89mr26070919qvb.34.1684923578720; Wed, 24 May 2023 03:19:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684923578; cv=none; d=google.com; s=arc-20160816; b=q8hlqKO5oo2f2TbN166IyJ3CeMjJy6lzafRj1a0Wv7sq0rqkqLn/hZZEKwxI5H8xzR u3KAYLgmJA1G+mGmDyQYnmozj2/QFgy910lV2bKAfzWrJPs95e39lq7tJGcv2PGd29WJ S6lrYWhYc77gGSxkBPc4JDCPldE9CV+1CQ8SVPqmyHed+gKD5gv65PTNIqgkkmn6OiSO sxDVTKHqViYcwRSMv1Y36u7cnzTEuQydAcfeRmBwaCWaEiedtj4oJSc4Smu+qGsv29uy 4Lmo9rvltv4qX2yEE+OWSeMh2+L5bZghdNemCeIYmXyIvobF4IYXp6pNCEbXUi3ipu0i FyHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=tYTsUw7KNn2lQnQnvusuvifxoOlVpO/oRfijUf023Wo=; b=WJRWhBKYwxdn99EuPUMwkYF/TSVStp2EZ1RNVT/rtZIWGPTOMQwu+E4/3v/uJQidoR 3YZunsmm/eyyxvcnLHE1ogJAoOoYWdOdMpzPC6iWyUmgzwgKybCVRKWCXQCTYh9T2SNO OhjDYlLRZ0sU0/hMRXK+62KPIwU/3YmZl8OvP/+UMNEzcqP4rzwcGPBuBZ4D0jqd2AFc 8ggY+RX8s1yqpqERgnyGudf5DIeMT1i64YJafay1GV0W8jni6UyXCYQWyNoeBPZspH/1 r4diqdfyUO2hYy9ZdGPg9N/SoyVLiPkSI9Esm7Aj30UajVZxOkHQgfVHbhkmr1NUXKP2 ezHw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r20-20020a056214125400b005ef6b8eb781si6428820qvv.453.2023.05.24.03.19.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 03:19:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1lZz-0003Vv-Ng; Wed, 24 May 2023 06:18: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 1q1lZo-0003Py-1V; Wed, 24 May 2023 06:18:40 -0400 Received: from muminek.juszkiewicz.com.pl ([213.251.184.221]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1lZk-0006ce-01; Wed, 24 May 2023 06:18:39 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 632A1260249; Wed, 24 May 2023 12:18:31 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at juszkiewicz.com.pl Received: from muminek.juszkiewicz.com.pl ([127.0.0.1]) by localhost (muminek.juszkiewicz.com.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H4v4b2P0Q0xE; Wed, 24 May 2023 12:18:29 +0200 (CEST) Received: from applejack.lan (83.21.125.167.ipv4.supernova.orange.pl [83.21.125.167]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTPSA id 35D4D260287; Wed, 24 May 2023 12:18:29 +0200 (CEST) From: Marcin Juszkiewicz To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Leif Lindholm , Peter Maydell , Thomas Huth , Paolo Bonzini , Marcin Juszkiewicz Subject: [PATCH v2 2/5] Add Bochs to list of vga_interfaces Date: Wed, 24 May 2023 12:18:20 +0200 Message-Id: <20230524101823.810737-2-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524101823.810737-1-marcin.juszkiewicz@linaro.org> References: <20230524101823.810737-1-marcin.juszkiewicz@linaro.org> MIME-Version: 1.0 Received-SPF: softfail client-ip=213.251.184.221; envelope-from=marcin.juszkiewicz@linaro.org; helo=muminek.juszkiewicz.com.pl X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org arm/sbsa-ref uses Bochs-display graphics card and without it being present in vga_interfaces "-vga none" argument handling cannot be added. Signed-off-by: Marcin Juszkiewicz --- include/sysemu/sysemu.h | 2 +- softmmu/vl.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 25be2a692e..9713a1b470 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -29,7 +29,7 @@ extern int autostart; typedef enum { VGA_NONE, VGA_STD, VGA_CIRRUS, VGA_VMWARE, VGA_XENFB, VGA_QXL, - VGA_TCX, VGA_CG3, VGA_DEVICE, VGA_VIRTIO, + VGA_TCX, VGA_CG3, VGA_DEVICE, VGA_VIRTIO, VGA_BOCHS, VGA_TYPE_MAX, } VGAInterfaceType; diff --git a/softmmu/vl.c b/softmmu/vl.c index b0b96f67fa..07e6030875 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -216,6 +216,7 @@ static struct { { .driver = "ati-vga", .flag = &default_vga }, { .driver = "vhost-user-vga", .flag = &default_vga }, { .driver = "virtio-vga-gl", .flag = &default_vga }, + { .driver = "bochs-display", .flag = &default_vga }, }; static QemuOptsList qemu_rtc_opts = { @@ -935,6 +936,11 @@ static const VGAInterfaceInfo vga_interfaces[VGA_TYPE_MAX] = { .name = "CG3 framebuffer", .class_names = { "cgthree" }, }, + [VGA_BOCHS] = { + .opt_name = "bochs-display", + .name = "Bochs framebuffer", + .class_names = { "bochs-display" }, + }, #ifdef CONFIG_XEN_BACKEND [VGA_XENFB] = { .opt_name = "xenfb", From patchwork Wed May 24 10:18:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 685326 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp165589wrt; Wed, 24 May 2023 03:19:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6vC6UW9DyS99ImML0AQRAg2ULxnWG7wzu8bhjdzLc48ETF0FdBKail6n14n2/241HpEKxP X-Received: by 2002:a05:620a:4918:b0:75b:23a0:e7b4 with SMTP id ed24-20020a05620a491800b0075b23a0e7b4mr6629017qkb.21.1684923579110; Wed, 24 May 2023 03:19:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684923579; cv=none; d=google.com; s=arc-20160816; b=fD3Fqd/hx15XNaOBreFuW+qsXMmV2E22s0/R+0EBLGhs0AdJg9W8nhbD0/raUKhynI aG/kEiJI2IGV9UpWy8yt0FPMe3VV23kD1VVMOZetFBnnzh9n1C7trUrL9kAqmBeffdCu DSyQgtQah/DII+kYwhyPiLjGmZdKoly3+QLtwX8pb6S5iPHGJBBoDOw+VhOQ3q5uGAwN fX9ZNatfg4evGAAO8+kIIBnWtsGXUriBuQ7ELONlXbTYwMaksORzSgIdnOlXQv+t9sHB Q5E0MzkFoUDEYe3HNxlT/CLBhJ5yVpuSRDhiycpC1Qwk4AOrxtK0+3E2NMrbgDteZl0/ Z2RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=5iCtZ0zw0D63rzvbOkNUh8jiYEVh9oIGUX5sYXb6FkE=; b=m6ZOqb9asNIl80I5y838w/HrP9UlnuNKoqYrhOIPfDtww6CThVfvUK0+0IV1ET7mVA tHIiMPl33HM1y0/+9482FJ1glL10I/eR5w7BQkA81bsStBuhSU7K0V4/ax3TQwIIL6RH GcOSPT1RGL0At+W1MPixpXE3pqTt77GuyaMKIvp47h4Qa9EWLfcmNFwF1wQwZGtFamyZ ZcfsDIoo93NxVxhiA7s5rs0zqC5AwWSwtWoGCqZ+CB/OcHAbIvhMN+c8Uop9JGDtVyi3 6eQ4e0dHklxiyWApEZvCiCZqxYgi/WWwKRV/a+Je36J8Jibt1bGZPezSl904tEbVyigI J7Ew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d10-20020a05620a158a00b00728811980bbsi6136210qkk.532.2023.05.24.03.19.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 03:19:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q1lZw-0003U8-Ej; Wed, 24 May 2023 06:18:48 -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 1q1lZo-0003Q1-3x; Wed, 24 May 2023 06:18:41 -0400 Received: from muminek.juszkiewicz.com.pl ([213.251.184.221]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q1lZk-0006cn-1B; Wed, 24 May 2023 06:18:39 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id E34E5260287; Wed, 24 May 2023 12:18:32 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at juszkiewicz.com.pl Received: from muminek.juszkiewicz.com.pl ([127.0.0.1]) by localhost (muminek.juszkiewicz.com.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bsqOaSAfmlQY; Wed, 24 May 2023 12:18:31 +0200 (CEST) Received: from applejack.lan (83.21.125.167.ipv4.supernova.orange.pl [83.21.125.167]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTPSA id B5997260B8B; Wed, 24 May 2023 12:18:29 +0200 (CEST) From: Marcin Juszkiewicz To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Leif Lindholm , Peter Maydell , Thomas Huth , Paolo Bonzini , Marcin Juszkiewicz Subject: [PATCH v2 3/5] hw/arm/sbsa-ref: honor "-vga none" argument Date: Wed, 24 May 2023 12:18:21 +0200 Message-Id: <20230524101823.810737-3-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524101823.810737-1-marcin.juszkiewicz@linaro.org> References: <20230524101823.810737-1-marcin.juszkiewicz@linaro.org> MIME-Version: 1.0 Received-SPF: softfail client-ip=213.251.184.221; envelope-from=marcin.juszkiewicz@linaro.org; helo=muminek.juszkiewicz.com.pl X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In case someone wants to run without graphics card. Signed-off-by: Marcin Juszkiewicz --- 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 9c3e670ec6..c540b2f1ba 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -649,7 +649,9 @@ static void create_pcie(SBSAMachineState *sms) } } - pci_create_simple(pci->bus, -1, "bochs-display"); + if (vga_interface_type != VGA_NONE) { + pci_create_simple(pci->bus, -1, "bochs-display"); + } create_smmu(sms, pci->bus); }