From nobody Wed Nov 27 06:28:25 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1700231770; cv=none; d=zohomail.com; s=zohoarc; b=nVD5m87W6QcPPt2MMwwqVQM8HdDsuNfNCu5snP4C3SeGwzsQ1cpevEatgEW0hggk8XL6mwOGpEfoGXOX1B5uGshUMixojhoSFK0IX0miujQyxCHXVSfiPe3NqJ6c/q7+JR0nmWeOvGJTDWURVuBywz26zgi5Q6KlUF+iZzWWGRU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700231770; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=SfE/db6pwj15Lm9HfrTK67Zz09JNzdHM5g2lqHiPaqE=; b=ktCKxw6iw6w0tDJFcNH3VpKHWju94t0APHjH1+nvG3NlgptFC9ST5xJ8qhZNXfVSlo7Vzkr39UXbN8ZBlJjxIxFCWJLcqhM58krCsWwzBocGkjPmi0bsNNqE3h7litNY732qohgj3/QLnq3bMgsW86uiNZKRSmJr5WGviJRA1Zk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700231770968564.9915747650192; Fri, 17 Nov 2023 06:36:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3zwR-00052V-GI; Fri, 17 Nov 2023 09:35:31 -0500 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 1r3zwM-00050g-Mn for qemu-devel@nongnu.org; Fri, 17 Nov 2023 09:35:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3zwJ-00030K-4W for qemu-devel@nongnu.org; Fri, 17 Nov 2023 09:35:25 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-349-fEkLwuqHNYmWJdxOpFz0Mw-1; Fri, 17 Nov 2023 09:35:21 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C066C280D473; Fri, 17 Nov 2023 14:35:20 +0000 (UTC) Received: from localhost (unknown [10.39.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3CF6492B2E; Fri, 17 Nov 2023 14:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700231722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SfE/db6pwj15Lm9HfrTK67Zz09JNzdHM5g2lqHiPaqE=; b=OrhILsEmrnqnnvBaRrhchPMAvH0ilvpSw7DcwEV3gKlaXbFay+J6TTWjENFk5x1o54gWVJ Q4ISInUfv+1vWHTG4kWvOStudYEArQpwOG8Yr4NJdGRVW4mDaMPZYzmcg/3tTUAe7wMXPb NEYULlxGvkUha3GRz6tFuCAOLznElPk= X-MC-Unique: fEkLwuqHNYmWJdxOpFz0Mw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , dwmw@amazon.co.uk Subject: [PATCH for-8.2 3/3] ui/console: fix default VC when there are no display Date: Fri, 17 Nov 2023 18:35:05 +0400 Message-ID: <20231117143506.1521718-4-marcandre.lureau@redhat.com> In-Reply-To: <20231117143506.1521718-1-marcandre.lureau@redhat.com> References: <20231117143506.1521718-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1700231772242100002 From: Marc-Andr=C3=A9 Lureau When display is "none", we may still have remote displays (I think it would be simpler if VNC/Spice were regular display btw). Return the default VC then, and set them up to fix a regression when using remote display and it used the TTY instead. Fixes: commit 1bec1cc0d ("ui/console: allow to override the default VC") Reported-by: German Maglione Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Thomas Huth --- ui/console.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ui/console.c b/ui/console.c index 8e688d3569..7db921e3b7 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1679,19 +1679,17 @@ void qemu_display_init(DisplayState *ds, DisplayOpt= ions *opts) =20 const char *qemu_display_get_vc(DisplayOptions *opts) { - assert(opts->type < DISPLAY_TYPE__MAX); - if (opts->type =3D=3D DISPLAY_TYPE_NONE) { - return NULL; - } - assert(dpys[opts->type] !=3D NULL); - if (dpys[opts->type]->vc) { - return dpys[opts->type]->vc; - } else { #ifdef CONFIG_PIXMAN - return "vc:80Cx24C"; + const char *vc =3D "vc:80Cx24C"; +#else + const char *vc =3D NULL; #endif + + assert(opts->type < DISPLAY_TYPE__MAX); + if (dpys[opts->type] && dpys[opts->type]->vc) { + vc =3D dpys[opts->type]->vc; } - return NULL; + return vc; } =20 void qemu_display_help(void) --=20 2.41.0