From patchwork Wed May 24 11:14:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Juszkiewicz X-Patchwork-Id: 685334 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp186877wrt; Wed, 24 May 2023 04:15:25 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7uJhLj3ZB5ZKOcjU7jOwP0ajfvI4BvHiBdpRqGVaBh4h/XGgKuqk8PJE8CsUV2AslZtoVT X-Received: by 2002:ad4:5948:0:b0:61b:5ca6:b7ef with SMTP id eo8-20020ad45948000000b0061b5ca6b7efmr23986650qvb.42.1684926924809; 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=pfRnyxhhw4GYFa9B9R0TfO7ZZP4jMfqooQ2DHutoD9SuY/cyAyoMHvpdFUHmgOa3XO 0kvG8sMZrohQM+Sj6d1OsfVYdqw+/aRrxfefPurb3Gc5Wmp2bJBYBmTtlmCzqxeIQdHf Jbfw9wcO58sZBhg/dcbcqr8+a/nQZfaNRuRXProWR5GCmOOIH+ZYmtOZTpiCYORg4dcU XgXGzbxnlDygcCqwKw/YqNj+kuycNEzB6CqzFIxbQfK9qvRZsz3D7fcq6ftnVxfLhzCP h9uOgb9ZRUG20jhvJeLABgQASYLjz+9QxXR9buvx+7Y4wGRuQkpzr+gvNE6B+9CNvdVO /ufw== 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=NTrC6Ys5TbvxcXDUHwaPNVHFGnprqGp6mr6qhXhoj1E=; b=ogSV0MGY1L2zBrV+ldgNF0LifAqvpQDdcKaG9yl7OQy4sqj8FLhh297yQD3Jj+o1OP dUOQehH1U0wWzIzw4rd3HpvtMbFNBKV8JF8oLecoOZRAuiHt0Wdddpp4GBSCRzBKYPBS nEjSAVWnDD0nGhLjG6BVqrPAEKYd30a6BKnlrEQVBTxF7GHHpNqi8C4LhUmiUnEI516j Utyj1M/bVCVqbnwM8Rvil6A4KioZQjc+S4aYabX19uChha4Yk/ArlfBLI8ITrAhzaK99 hAh4F2QPO5Aa+E7nafyU1AEAlDtpyOEjMz+5kn975KMbVxZl76ZTQxXgFOGqiLUKJ0T0 Y1PA== 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 m7-20020a0562141bc700b006259da1e87asi1973807qvc.424.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 1q1mSB-0006X2-GV; Wed, 24 May 2023 07:14: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 1q1mS6-0006Pq-9Q; 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-0003vx-GY; 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 6A9632609C0; 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 eBWoya-aSsRS; 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 BC882260B8B; 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 3/3] hw/arm/sbsa-ref: set default display to Bochs Date: Wed, 24 May 2023 13:14:13 +0200 Message-Id: <20230524111413.833912-4-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 This way we can use pci_vga_init() and have Bochs by default while still have an option to run with other VGA cards. Signed-off-by: Marcin Juszkiewicz Reviewed-by: Thomas Huth --- hw/arm/sbsa-ref.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 9c3e670ec6..ed7ed00b3d 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -647,9 +647,9 @@ static void create_pcie(SBSAMachineState *sms) pci_nic_init_nofail(nd, pci->bus, nd->model, NULL); } - } - pci_create_simple(pci->bus, -1, "bochs-display"); + pci_vga_init(pci->bus); + } create_smmu(sms, pci->bus); } @@ -863,6 +863,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;