From patchwork Wed May 24 08:39: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: 685309 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp128957wrt; Wed, 24 May 2023 01:40:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6cK0AKwm3TvG+KMD/iWIZAfkt47BnwItct5SOZqClnaM4rObbzHqDskK9u0Cy0MGWdGQfV X-Received: by 2002:a37:6858:0:b0:75b:23a1:d85f with SMTP id d85-20020a376858000000b0075b23a1d85fmr6813965qkc.33.1684917607564; Wed, 24 May 2023 01:40:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684917607; cv=none; d=google.com; s=arc-20160816; b=pNHHi6XcUSFj64CMfGbyWMhZb38k4qmq5rPzNW+IdQpA6Sx17aGItAM6Bd48kEehDR JDRM3Z85wIvGYx5dtinr5TsNuQ57XcAT5LGvqS42uWlqZNMX4zFw/vpCGbn7voPul20n 0WXw/QGG/mv3Vcb8CXJhSzhJE2/tRDm2qykN7UtAV+H5H/30UqodZjAgHvxJEk/H/kjc z0gx98s8S3FMiEnyzKZE+Wvw5eUMcBMdna3MS2kpf9nDzMUGee1eaPI47f+0alp+mXTn wegEKVrv1AemUAmAoZA1m69v3RNc9HY0plP+94b1csFeLdOzR12l1kqToQFPbjDN9d80 tcSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-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=md66Fpx5jJxyGE+bYRDeEx3yevBE4EGfhIEx/ULEAEusR2hnSgmZYLWq5qZqlLeRwo +Z4jhzF2uaYY3jUU0AuM9DwzkG4dGyGq0bNLoQA4SPjdGrLbo2WvQmPXC6IM3VgjwLRB aSAjbq9LduDMTiQQTdp3B8XG6S1emJ67OddvRv4r0DU8iNHfnmhoWSrTOCKgonNeTSvA 81Nqfoi1XIyOk8JK+ndHU1RWSBFfNLydK04T6o28DHzE/qyrWEfyYAKdom6sj/fieDEU qz0T+fidJ8z8WzU6H8fKzIfd59p+Oon++VwITALVrC2smhW5zlJH0d3QnWGKYYmU04Eq 7MCA== 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 z19-20020ae9c113000000b0074a691911e8si5704348qki.648.2023.05.24.01.40.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 May 2023 01:40:07 -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 1q1k1o-00059D-HZ; Wed, 24 May 2023 04:39:28 -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 1q1k1l-00057d-Me; Wed, 24 May 2023 04:39:25 -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 1q1k1j-0000MF-Ve; Wed, 24 May 2023 04:39:25 -0400 Received: from localhost (localhost [127.0.0.1]) by muminek.juszkiewicz.com.pl (Postfix) with ESMTP id F2B62260249; Wed, 24 May 2023 10:39:21 +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 Yf7YzVSS_ZN1; Wed, 24 May 2023 10:39:20 +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 400D6260ACC; Wed, 24 May 2023 10:39:18 +0200 (CEST) From: Marcin Juszkiewicz To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Leif Lindholm , Peter Maydell , Thomas Huth , Marcin Juszkiewicz Subject: [PATCH 3/3] hw/arm/sbsa-ref: use MachineClass->default_display Date: Wed, 24 May 2023 10:39:13 +0200 Message-Id: <20230524083913.696175-3-marcin.juszkiewicz@linaro.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230524083913.696175-1-marcin.juszkiewicz@linaro.org> References: <20230524083913.696175-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: , Reply-To: 20230524082037.1620952-1-thuth@redhat.com 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;