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;