From patchwork Wed May 24 10:27:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 685331 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp168810wrt; Wed, 24 May 2023 03:29:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5rNbzh88Ej80rVw7WF7mLfUXmV1MTUU66DgZtohuoA79qDrnorVQ0TiMKg8xdV9fil24sA X-Received: by 2002:a05:6214:c23:b0:5e3:d150:3168 with SMTP id a3-20020a0562140c2300b005e3d1503168mr24344772qvd.18.1684924144458; Wed, 24 May 2023 03:29:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684924144; cv=none; d=google.com; s=arc-20160816; b=i10+dfzNKLPdQRdDRIQusb9tVdPuOjfMiVoxnSCTuW9hx8ox9CrK569oyUbAUb+NNM AH+plY0xzVeyxRBqqsI7qLADhIOwE46WHQ4+StYFKkQlWAU9nLifR9Vs9tgLvBSfI/4m XMxVUZT25KpHwZfzU57rO+Z1vgho/PcqAdRSFUOeHvHvS8Rfg0dKRyMrkroaxv0HZlDh lJLWSzaWw8xZ30ytraNhEW7QRv2OkMQ5SDc0heOXMhXcditcmYxKj55zuFOP1k159o+Q 4RCfAHMHWIOaEswi5PEj+Hr/UET5QiSN0xYbfxJEeDBNuRFwqA4XHaxdwlPMXvhdvGrU ZerA== 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=YPEkhXOl7IkJen5d6nLzpXVi8FGeBqJQL6W2GKxCY3yj0HCJXW1PHXLpakBZpaC130 BOMp/1ffqGJWkHO9jVGwjBnKWyP0cVyTOuC89IImhiPzQ8W09eL+H3x3uVPo3TIikEmA hCoXd7x8jXN0uv8u+fFCVpbvEpKG3XKRRLzuYGW687O4XIswKGyRsC55AvVIG6qqoJKl Tji6LlwqeWZeEbS6uKFrtJ9EVhB301mBQaANyExBTV3JqcI3SzZjvv/Feo+O7As1Ojjc RaVFG/Ju2PvJLCKwkuWl3W1MK9xatta2BohZ9faqtuIe79WRU9ewbN9fXM2aOR+znfaw BruQ== 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 2-20020a05621420e200b005355bd68bc0si6283629qvk.564.2023.05.24.03.29.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 03:29:04 -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 1q1lis-00082c-Os; Wed, 24 May 2023 06:28:02 -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 1q1liX-0007pl-EC; Wed, 24 May 2023 06:27:42 -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 1q1liU-0000OI-RM; Wed, 24 May 2023 06:27:41 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 95279260BC0; Wed, 24 May 2023 12:27:36 +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 X8FxYvjZTYBK; Wed, 24 May 2023 12:27:34 +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 64814260287; Wed, 24 May 2023 12:27:34 +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 v3 1/5] hw/arm: Use MachineClass->default_nic in the sbsa-ref machine Date: Wed, 24 May 2023 12:27:25 +0200 Message-Id: <20230524102729.810892-2-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524102729.810892-1-marcin.juszkiewicz@linaro.org> References: <20230524102729.810892-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 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 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 = 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:27:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 685330 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp168804wrt; Wed, 24 May 2023 03:29:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Jmc5GmM76tNgHbogXizSVop3nrd8neWj21q2Tp7EkRs4rr+jIQ8dyEaVAExX6K/HxvdKk X-Received: by 2002:ad4:5f4f:0:b0:625:aa1a:9380 with SMTP id p15-20020ad45f4f000000b00625aa1a9380mr1382069qvg.60.1684924142985; Wed, 24 May 2023 03:29:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684924142; cv=none; d=google.com; s=arc-20160816; b=KMJVoBHjFzP4I5G+4YjykU5WbmxRCyZRmEcaKmwF+8UW1v8n16nMdMc0K5owgxL7rk 77mVJQRYt0Q7qZrcsnwihtlU+sZ6SWlnUrg39g/LrtCoLLppZT7fhifndsLQC/hepca/ CMhnwXaQiR9oiTLbZqLEcevZ0sC+fMXaeJ9lUJPTU48ZeWzg/sawEbe8Rjaq+qE1rf7V FRlZfrM/EYKh0/VQKUbTvXsSjbRHyOOjW/4Gjnp5YPaCYbOfougtAeg3rGbex0r8g07l nwA0TmxI+ymJud5G+33Bh9QPkjBWQf5DHjXUaYgtQMhyOqWXrmKiXBQ0TSMXYQ7DSlEN 2kiQ== 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=Q3dhNLoFZ7i2F4h6zTtyK24gT+jeCTHh7cuulVnHNiN22/YqExEy28+v/EvSzHJsyt MQnFTJjWiKyQyDSanCmUOYESJ5Qaj+aZ5FiTN/BSnS4Q6FNSD21Hqvx1JOJWHcL2EBsU J1Ougng9wXxEfasFq4KGcJjWbHXUq0bDeOYbHgikfBcuRAo+Lrsi1CtlZ/mDg5ZSxi0F QTmXDtHl+b9KAOZtuWpcT6WayrN8glis3X4r1afCdIzH0Sq+0uOaROOJksvFITqSuTDj lvgkd1HyasKkOtGORmJblyowNE4uD37FuXsqbOlrp/qRcH9UR3GDtmaFd24Kh77QBJgO 5Pig== 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 j14-20020a05621419ce00b005ef676dbf8dsi6775258qvc.96.2023.05.24.03.29.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 03:29:02 -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 1q1lio-0007yX-1V; Wed, 24 May 2023 06:27:58 -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 1q1lia-0007r4-1a; Wed, 24 May 2023 06:27:46 -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 1q1liX-0000Oo-Ql; Wed, 24 May 2023 06:27:43 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id EFB0B260B8B; Wed, 24 May 2023 12:27:38 +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 0b1UX0hO68vl; Wed, 24 May 2023 12:27:36 +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 DA9622609C0; Wed, 24 May 2023 12:27:34 +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 v3 2/5] Add Bochs to list of vga_interfaces Date: Wed, 24 May 2023 12:27:26 +0200 Message-Id: <20230524102729.810892-3-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524102729.810892-1-marcin.juszkiewicz@linaro.org> References: <20230524102729.810892-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 Reviewed-by: Richard Henderson --- 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:27:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 685333 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp168924wrt; Wed, 24 May 2023 03:29:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4xAmcXpz7x4Oled7yQvVl7TYLF6Lydr2YbHMBDcelfLfndZbQH4jhG5m44qUAUNrIV/g/q X-Received: by 2002:a05:6214:20c5:b0:625:aa49:ceb2 with SMTP id 5-20020a05621420c500b00625aa49ceb2mr1560983qve.59.1684924164672; Wed, 24 May 2023 03:29:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684924164; cv=none; d=google.com; s=arc-20160816; b=NQ5tDJT5EhPr5D4qmAF+OLisT6JTbOV6lOSjtNndZYotiB+GgfsUQ5MJJIX1xFYCn+ makAPyUka3uRlAK+eQqmDgymRoUKzu62go0ZQTA66XOsZ6++fdMTBorqXEK3K7uXVpHm N7G7Wz1sSnQq40U3ABYSw/aUqDXZ546nEZsri0TGT+OXXEu42y33pAinHlmpOruGQp0y D3yQwZ4n7cE+ogL0YrkR9BNIsbhwadCdQp1K1WA7j/WrzxQC+ZlHLW98AAGHZ7bolN/4 +8VExnAJTDg/9XD/7tNDIIhVjM5aMlT5NF5IqBhDUiKsPAvti3lAilgx97mINgZmy+sd QEOw== 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=Jw5j/RJUi8jMDAQI7jHfna0UEHakAaYox3KAbasZvQb7r1SY5uHl6dkhvn2EzAj13X u1VldL71ANN60+ULFprX+7As+NLw1JMbqUKHV1dDT+RKp8SvTyN+wPs3vV7D8lqkuXRO PcGLc592cglDXYBPnmiZ17VNoj0WSBk4ikqWzozkBjg3D7lv41z8ygC5jHpzdd6r34tw 4vUHyCcD6nmIrxS3OR6HlD/w+ABNOhheiwytkK786FLxNtfQeuHN/IXjqeiLWzIyilbd hkKkD2p89L/H18ZC4rRVdDN85QcRZbXc6oa9Z3OLvicXw2fObxxhTgB+ZrOeK/4rGOuh zhRA== 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 gv8-20020a056214262800b0061884d811d2si6483857qvb.270.2023.05.24.03.29.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 03:29:24 -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 1q1lix-0008Gj-AS; Wed, 24 May 2023 06:28:07 -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 1q1lia-0007r3-1H; Wed, 24 May 2023 06:27:45 -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 1q1liX-0000Od-RA; Wed, 24 May 2023 06:27:43 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 5A4BF260287; Wed, 24 May 2023 12:27:38 +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 fBbqNbJIHXzZ; Wed, 24 May 2023 12:27:36 +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 68AD8260B8B; Wed, 24 May 2023 12:27:35 +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 v3 3/5] hw/arm/sbsa-ref: honor "-vga none" argument Date: Wed, 24 May 2023 12:27:27 +0200 Message-Id: <20230524102729.810892-4-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524102729.810892-1-marcin.juszkiewicz@linaro.org> References: <20230524102729.810892-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 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 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); } From patchwork Wed May 24 10:27:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 685332 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp168862wrt; Wed, 24 May 2023 03:29:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6Th/ziTwuaYWsNcqapKBSXpC9rS9vsLes2quCYM51czmpLkv2k2MC7aeF7rc1BpPPtG9qU X-Received: by 2002:a05:622a:44:b0:3f5:2788:8adb with SMTP id y4-20020a05622a004400b003f527888adbmr26109065qtw.7.1684924152129; Wed, 24 May 2023 03:29:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684924152; cv=none; d=google.com; s=arc-20160816; b=zkE2Su5er9jDa3BkIaHOTrkGfGH2nsARw1o1haL3qxgyE85mASY3C0yuk8JBENRSTB rCkZ8hbjitWBYF6bWcxmP07E6JGmxBdg4u82kx4YzdCB7tfobImy85oq/GdLUzDLEtp+ wQFW7Xw196QqPShshEGKMsqZgYQBXveG8qXCDYRTpTV+/xh4ibpWogLm2KTR4EI0Fr39 Znsu5CuvH1h4kEA3upwf0okgMWTG140o9zaW18j+JwA9kY1AaHDpEGHGD0g9eBIRx/wH YAfs2FFWJcMMmfTK26iPf+x4c9Q8H6K5ayPn3PreVKZ6GEOAtuJqjNoruUcQd13dOiO6 7B/A== 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=RFl0lkku0rEx44cSL97n6ibaCEcLL6BIlhLypm/82Mw=; b=WgobBm5SsM+pdoHxC4L/TnKSb1fHopSBb/IIootivKKEDeJB4rb61lWFPbelAh+wPT 1XeHHhpMp3h2HgIPPN9pIAqbUyIqKZF/z+y8N+5fyUJj0Np2pZS7Ukdd3wbi+k3osptX 0mAn8h5Z3meQxnFtSwmcjOWEh0HFT/qeHpWz97B2VE3IDUMrEDvqsBqeT8yxAvS+mADG VvoiGnT2lTQ4Cck894lBLx/pdLaNGnq7H8NIMkRkp5xQ7K3EP+PH2BMUP2ZDps/b+NXJ ADx90m2oMTSD26Hg3xB5eKcUDRdZNYRZMpBQ/XlZUkgUotQJZNeXIYyUWT3irtu1xA0y 9NAA== 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 r11-20020ac85c8b000000b003f52d2f1237si6630536qta.520.2023.05.24.03.29.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 03:29:12 -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 1q1lio-0007zd-Ce; Wed, 24 May 2023 06:27:58 -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 1q1lia-0007ro-Pd; Wed, 24 May 2023 06:27:46 -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 1q1liX-0000Oy-RG; Wed, 24 May 2023 06:27:44 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 303072609C0; Wed, 24 May 2023 12:27:40 +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 D3nAMwFrj-Jh; Wed, 24 May 2023 12:27:38 +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 01221260BBC; Wed, 24 May 2023 12:27:35 +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 v3 4/5] hw/arm/sbsa-ref: add gfx card only if we have pci Date: Wed, 24 May 2023 12:27:28 +0200 Message-Id: <20230524102729.810892-5-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524102729.810892-1-marcin.juszkiewicz@linaro.org> References: <20230524102729.810892-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 Creation of network card is guarded with check do we have pci bus. Do the same with graphics card. Signed-off-by: Marcin Juszkiewicz --- hw/arm/sbsa-ref.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index c540b2f1ba..9a3d77d6b6 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -647,10 +647,10 @@ static void create_pcie(SBSAMachineState *sms) pci_nic_init_nofail(nd, pci->bus, nd->model, NULL); } - } - if (vga_interface_type != VGA_NONE) { - 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); From patchwork Wed May 24 10:27:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 685328 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp168659wrt; Wed, 24 May 2023 03:28:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5+3GUyEhPE+N8WVzRkiCewut3eruQDMVkFub5x3cj/0tMBWhJGwH4KT4sBO2EL56g/muKc X-Received: by 2002:ac8:7f48:0:b0:3f6:c609:e9da with SMTP id g8-20020ac87f48000000b003f6c609e9damr1070247qtk.44.1684924118098; Wed, 24 May 2023 03:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684924118; cv=none; d=google.com; s=arc-20160816; b=mPVhN8rxxOQpdozViXI6iqjCvOrh94bKCrtWatJEKv2V79N8CuffPmwKXZBqkjkEcx zyIGFwKvZBYHhsCNPBoSo8W6jS6UUJLpL6kJSw2J06GmdIm7ubKXDNKMDzIHjjZCy2I7 gw3y3ig8j8sK7O1cqddPF5ZpY5TwkEkjE5zD9lETXskuntkzUN/tdAo0MdmaFrbGyiWs //Xw5MoDQ0zky948h1ICaeQIeqiOIsrFtkGpT4DLEjBDXvMzsctmxtHeKKByXAyJcJaY QWCeHiT4aHfm5v12gjUOFEDqxyBVGeR3mfRu3ZWicsRiQinfTTGfHN3q0RNuCt6ATWDj b5BA== 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=i2eHc6EduuRy9IXt0IrW6LdtP5rNELiZJU7Gubi9OL4=; b=SI1LW5PtELIfaSLY//0k07A81j1ktdJ/FnSSHioK9bqPyrRdtBsPgo6LE58fv07k/p 4J/F+1QkUOyiG5FALvZgLPAKIuveDCWe3fP/pwTSK9xjF+sL3fMkl/9Ap2wAjTVF7TtX jzcOBGYxRC/Z2l6wqkewut+Fr0DIUxuzKMgTafNp8nHi4cDAPF45aU2VKFPL1HIWqwgI wBnE5rpqP/8pMuWz4LIVpXTeo1KVy1IdMITOMqwNNwCNCWRURdiT2wHNlf2PyrFfO/IB /Lx3DtLUQx8373s77ogOiiQXVlB2SH8KSYYDsLD1g6KLMlVoqKjuP5oxic7YZbZ5vrVr Rslg== 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 c12-20020ac85a8c000000b003e6332a70bbsi6436027qtc.512.2023.05.24.03.28.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 03:28: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 1q1lix-0008HP-Eq; Wed, 24 May 2023 06:28:07 -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 1q1lic-0007tV-Os; Wed, 24 May 2023 06:27:47 -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 1q1liY-0000PE-ID; Wed, 24 May 2023 06:27:45 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id B4743260BBC; Wed, 24 May 2023 12:27:40 +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 0v95eSEzGZ7Z; Wed, 24 May 2023 12:27:39 +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 85571260249; Wed, 24 May 2023 12:27:36 +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 v3 5/5] hw/arm/sbsa-ref: use MachineClass->default_display Date: Wed, 24 May 2023 12:27:29 +0200 Message-Id: <20230524102729.810892-6-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524102729.810892-1-marcin.juszkiewicz@linaro.org> References: <20230524102729.810892-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 Mark the default graphica via the new MachineClass->default_display setting so that the machine-defaults code in vl.c can decide whether the default graphics is usable or not (for example when compiling with the "--without-default-devices" configure switch). Signed-off-by: Marcin Juszkiewicz --- hw/arm/sbsa-ref.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 9a3d77d6b6..30ce7f7db4 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -649,7 +649,7 @@ static void create_pcie(SBSAMachineState *sms) } if (vga_interface_type != VGA_NONE) { - pci_create_simple(pci->bus, -1, "bochs-display"); + pci_create_simple(pci->bus, -1, mc->default_display); } } @@ -865,6 +865,7 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data) mc->default_ram_size = 1 * GiB; mc->default_ram_id = "sbsa-ref.ram"; mc->default_cpus = 4; + mc->default_display = "bochs-display"; mc->possible_cpu_arch_ids = sbsa_ref_possible_cpu_arch_ids; mc->cpu_index_to_instance_props = sbsa_ref_cpu_index_to_props; mc->get_default_cpu_node_id = sbsa_ref_get_default_cpu_node_id;