From nobody Wed Nov 27 09:37:28 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=1699450711; cv=none; d=zohomail.com; s=zohoarc; b=gzQ19E4wzsmgU0nLVfP1YHO4f/mhGgJM1O0nt4aWZ4dhMH6FI6k4PBzMXPpUaL30JBpCl7nMiGRbBaOCyE3XpOxmTwmY0DdThgoqWaE7uLtcAT53z7MO4C7BIrXTdBQvkWOb6TkgR0WeEdhIP2bh39nFGOCA9t8hdak7rBkAxk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699450711; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uJzNJoOqDMqfvzyrIYQYNxE/gbq1OD1wy3miEHjhrmI=; b=ZRgrGS8JaQgossrSXuABxKtuJ8o7tQKTTKPOBBs6I1KeMAWqlsyo43sJCVl6UHDV6cc6/zPROG9Vd4MPf9IfqUERJ3BsphyO3uNB2DXtCEd6kp7WpIFNbFE2Jko8zOeqkdw5TCVyLvU7eXFi/oRmFfWF/GGSQKKhv6zfslHEI84= 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 1699450711137196.03807718841676; Wed, 8 Nov 2023 05:38:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0ikM-0004Xh-67; Wed, 08 Nov 2023 08:37:30 -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 1r0ikL-0004XY-8U for qemu-devel@nongnu.org; Wed, 08 Nov 2023 08:37:29 -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 1r0ikJ-0002on-5E for qemu-devel@nongnu.org; Wed, 08 Nov 2023 08:37:29 -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-595-wegBcMJDOTq_H-6-Fk-n8Q-1; Wed, 08 Nov 2023 08:37:23 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 292901C05136 for ; Wed, 8 Nov 2023 13:37:23 +0000 (UTC) Received: from localhost (unknown [10.39.208.35]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AD3B2026D68; Wed, 8 Nov 2023 13:37:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699450645; 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; bh=uJzNJoOqDMqfvzyrIYQYNxE/gbq1OD1wy3miEHjhrmI=; b=cWmvbEEBxf3Y2Cm+qnmfYaikJDdZHHfkNGAVFLs6qSndsB7vh/4oc7zNrJdKUScX5ovP5x m4fT0LDdB6ZC+lKPMFNLeUAVhOsIOnZ5mNsAduCHY+b1CWNMGpnV8nBu0ZkqutWHPJDMiu T0z0y29Q1wWoFbSqFZpRbTRmDgOPn6A= X-MC-Unique: wegBcMJDOTq_H-6-Fk-n8Q-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, gmaglione@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Subject: [PATCH] ui/console: fix default VC when there are no display Date: Wed, 8 Nov 2023 17:37:19 +0400 Message-ID: <20231108133719.113217-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.4 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: 1699450713281100003 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 --- system/vl.c | 4 +++- ui/console.c | 14 ++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/system/vl.c b/system/vl.c index bd7fad770b..8c522a07da 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1359,6 +1359,7 @@ static void qemu_setup_display(void) dpy.type =3D DISPLAY_TYPE_NONE; #if defined(CONFIG_VNC) vnc_parse("localhost:0,to=3D99,id=3Ddefault"); + display_remote++; #endif } } @@ -1391,7 +1392,8 @@ static void qemu_create_default_devices(void) } } =20 - if (nographic || (!vc && !is_daemonized() && isatty(STDOUT_FILENO))) { + if (nographic || + ((!display_remote || !vc) && !is_daemonized() && isatty(STDOUT_FIL= ENO))) { if (default_parallel) { add_device_config(DEV_PARALLEL, "null"); } diff --git a/ui/console.c b/ui/console.c index 8e688d3569..f08c8365b0 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1679,19 +1679,21 @@ void qemu_display_init(DisplayState *ds, DisplayOpt= ions *opts) =20 const char *qemu_display_get_vc(DisplayOptions *opts) { +#ifdef CONFIG_PIXMAN + const char *vc =3D "vc:80Cx24C"; +#else + const char *vc =3D NULL; +#endif + assert(opts->type < DISPLAY_TYPE__MAX); if (opts->type =3D=3D DISPLAY_TYPE_NONE) { - return NULL; + return vc; } assert(dpys[opts->type] !=3D NULL); if (dpys[opts->type]->vc) { return dpys[opts->type]->vc; - } else { -#ifdef CONFIG_PIXMAN - return "vc:80Cx24C"; -#endif } - return NULL; + return vc; } =20 void qemu_display_help(void) --=20 2.41.0