From patchwork Wed May 24 11:14:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 685335 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp186884wrt; Wed, 24 May 2023 04:15:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ76gTxCCXbf27mScuNE9RojZckBtfkMMNI5sbc9K0g72MmtuTilKyx5W/J9GuX0xPSXam3C X-Received: by 2002:ac8:5c07:0:b0:3d8:2352:a661 with SMTP id i7-20020ac85c07000000b003d82352a661mr25648540qti.3.1684926924867; Wed, 24 May 2023 04:15:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684926924; cv=none; d=google.com; s=arc-20160816; b=Kh05611r2gS/cj7sGJwmuqEu/1rFvI+u9lPX2nNwfPf6nW0n/aqtEHpm1N7fe/B+bd p1ofOzVwGkxv+RqC2zIV4IzRID7ZcuMjc1J/mgc0f0DlU8myfV62dOBck50O/ar9lgWu o/LAtgRuFYDXZuof2PYyGkgpOy7Cp/rzuAhx6D71YbPXXrewo8/TMQC6DShmcR6vsqQ+ Rn6MbyY88/FMk6f3HnsMQaAZVidiQDongw2NtM0KzjtFCrEyJ8F4chgDrMGdxCP+IvZ0 ADyk0A2xwOnbd8KKaTeSGiNf5E0GJNi+1KHoYbQcsg985CjvM8goYXlMEXFmPSUQo71s TUTg== 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=zX2g3mQuGuktTa98vlDECCIPffFrXMJWgfKHjvSuB3s=; b=ti9TgVadOY/xg625se2mSTJjUj6uzMi7lpYzQfs1CXU53qmBtU5ozsH1zOPhycbyZe TViLYKSOG3R08jZRMfyuVsJZS+VVAWaV+m6mNss+mTQqwZGZxzZsQgHIuLisXKGyzia3 0j6V8+/YW0On9c/I36nc7mC2maSRnqmIDanNhIGh6G9/iFYnsRGiuLtLx5qltZBsxFyD 2L2tSONn7eV6CHPLbAa2sjEs3hFpgY8mMggiOTgxGA0tAsBRAJIgomgObUfBmDWSYWJl 7/iJLrQXCd+HlHMpcairz9GmiOB04cUf3PIrB5xToiY+9sD2y1XXpjYMC7K9LI4bdyEL mD2Q== 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 h3-20020ac87d43000000b003e651ef42c3si6454621qtb.112.2023.05.24.04.15.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 04:15: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 1q1mS9-0006UA-Ul; Wed, 24 May 2023 07:14:49 -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 1q1mS6-0006Pr-A0; Wed, 24 May 2023 07:14: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 1q1mS3-0003vo-1E; Wed, 24 May 2023 07:14:45 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id 119952602AC; Wed, 24 May 2023 13:14:41 +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 ohnQ23sV1NUL; Wed, 24 May 2023 13:14: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 3B2972609C0; Wed, 24 May 2023 13:14:37 +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 v4 2/3] Add Bochs to list of vga_interfaces Date: Wed, 24 May 2023 13:14:12 +0200 Message-Id: <20230524111413.833912-3-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524111413.833912-1-marcin.juszkiewicz@linaro.org> References: <20230524111413.833912-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: Thomas Huth --- hw/pci/pci.c | 2 ++ include/sysemu/sysemu.h | 2 +- softmmu/vl.c | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 1cc7c89036..edac76ea15 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1937,6 +1937,8 @@ PCIDevice *pci_vga_init(PCIBus *bus) return pci_create_simple(bus, -1, "vmware-svga"); case VGA_VIRTIO: return pci_create_simple(bus, -1, "virtio-vga"); + case VGA_BOCHS: + return pci_create_simple(bus, -1, "bochs-display"); case VGA_NONE: default: /* Other non-PCI types. Checking for unsupported types is already done in vl.c. */ 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",