From nobody Wed Nov 27 04:54:54 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=1700563314; cv=none; d=zohomail.com; s=zohoarc; b=PEXbyY55z8YY7k8/hbA0ZKJuF+VhRKPJz7XRrmH4AisprC01dKW6kz1rUEBFbdu1RULSYlyS4HA+4N9I9cphXZyGH+wPWb93T912zb/gjT4G3AMBLlvoP0/y5ssYv/18uh7t+nQoeSoHoWUkg62b6teJXy99Li+fm+P2RULqd/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700563314; 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=FZJKMbLl8A/862T8WLyQkf84kZPRj/oD13dJCBI1o+s=; b=fvu/Z2OghKR+tr0yP08sn9prIxwo0ohtWLzv/q6ss15XaD+bYAtqeqT5hBsauc1a4LLl6sXuXiR1jrNTQNmaPt6x+rmvqzhD0l6kafalQ9oyewgJPI0k2nepXsYQstdqthyGoY9RW6J8XnbyzrI0VsJJjmC6KZJIIa/btAjuZdY= 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 1700563314636488.7126542495821; Tue, 21 Nov 2023 02:41:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5OBK-0007cW-3g; Tue, 21 Nov 2023 05:40:38 -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 1r5OBI-0007bo-86 for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:40:36 -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 1r5OBF-0003DF-WB for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:40:35 -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-489-We90AhYRPzuojk51jPjNyw-1; Tue, 21 Nov 2023 05:40:28 -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 C0F353C025CC; Tue, 21 Nov 2023 10:40:27 +0000 (UTC) Received: from localhost (unknown [10.39.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E9F020268D0; Tue, 21 Nov 2023 10:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700563232; 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=FZJKMbLl8A/862T8WLyQkf84kZPRj/oD13dJCBI1o+s=; b=DkARh4FqWp5FIq8ep+rPNurNIEsAuWZQ8C/EbL4yzb2Ww8wmHxV0Fx7CmXYLqiyZEGhzUS JW1qbTxTKwHXGgtFtjWBkRFgUEAQbG7Dvq2TDbFabQNwpHfUuRyw698lehuShIuUUp6K8E G/HpB6zdjW/O7kyyNVxYAf+fYfD1HEU= X-MC-Unique: We90AhYRPzuojk51jPjNyw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , peter.maydell@linaro.org, dwmw@amazon.co.uk Subject: [PULL 1/5] vl: revert behaviour for -display none Date: Tue, 21 Nov 2023 14:40:16 +0400 Message-ID: <20231121104020.2209345-2-marcandre.lureau@redhat.com> In-Reply-To: <20231121104020.2209345-1-marcandre.lureau@redhat.com> References: <20231121104020.2209345-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.035, 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: 1700563316864100004 From: Marc-Andr=C3=A9 Lureau Commit 1bec1cc0d ("ui/console: allow to override the default VC") changed the behaviour of the "-display none" option, so that it now creates a QEMU monitor on the terminal. "-display none" should not be tangled up with whether we create a monitor or a serial terminal; it should purely and only disable the graphical window. Changing its behaviour like this breaks command lines which, for example, use semihosting for their output and don't want a graphical window, as they now get a monitor they never asked for. It also breaks the command line we document for Xen in docs/system/i386/xen.html: $ ./qemu-system-x86_64 --accel kvm,xen-version=3D0x40011,kernel-irqchip=3D= split \ -display none -chardev stdio,mux=3Don,id=3Dchar0,signal=3Doff -mon char= 0 \ -device xen-console,chardev=3Dchar0 -drive file=3D${GUEST_IMAGE},if=3D= xen qemu-system-x86_64: cannot use stdio by multiple character devices qemu-system-x86_64: could not connect serial device to character backend 'stdio' When qemu is compiled without PIXMAN, by default the serials aren't muxed with the monitor anymore on stdio. The serials are redirected to "null" instead, and the monitor isn't set up. Fixes: commit 1bec1cc0d ("ui/console: allow to override the default VC") Signed-off-by: Marc-Andr=C3=A9 Lureau Tested-by: Peter Maydell Reviewed-by: Peter Maydell Tested-by: David Woodhouse Reviewed-by: David Woodhouse --- system/vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/vl.c b/system/vl.c index 5af7ced2a1..14bf0cf0bf 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1391,7 +1391,7 @@ static void qemu_create_default_devices(void) } } =20 - if (nographic || (!vc && !is_daemonized() && isatty(STDOUT_FILENO))) { + if (nographic) { if (default_parallel) { add_device_config(DEV_PARALLEL, "null"); } --=20 2.42.0 From nobody Wed Nov 27 04:54:54 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=1700563301; cv=none; d=zohomail.com; s=zohoarc; b=c+UQA9glnr/NqNfcaB2EtVyGPWA4014bhIohAGY0Nz81gVyXlRK0Cbnvh/MMdLbDmpUZ0vNbzNxeR686uvPGkoPjzV6kwSEvAXx03K78xTY2oJTwQeFJ1cSWg81LOaNJMSuO34H8SnD8dE3IP8JBSy92LgI6PwsH5SGPTk0p8O8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700563301; 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=/lZDWtU9dA1Ia3oluK8elzKYgftQTPR7WpSwNCX+HpI=; b=hxmPGc+HjwPph5imDciguul6aJZ3Eb/BA5T/TVAY/fdvHm3FUNs0Z+r62GMG/LJnXEtFYM0+jgBtSuSo8LJ6a96ICIhd3OYJfWc0x2U1BDE6NwYrbhxPdKlGYC65434vKoz68N/J5EcXzrkk7GyN9aCgqY9rJY25ukVjgzMPc+w= 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 1700563301364286.438032229402; Tue, 21 Nov 2023 02:41:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5OBM-0007d5-U7; Tue, 21 Nov 2023 05:40:40 -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 1r5OBL-0007cs-Lb for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:40:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5OBK-0003Fk-0H for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:40:39 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-202-7PHe_H1jMEaoU4KIdGl7tA-1; Tue, 21 Nov 2023 05:40:32 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (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 A666785C1A0; Tue, 21 Nov 2023 10:40:31 +0000 (UTC) Received: from localhost (unknown [10.39.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7F651121306; Tue, 21 Nov 2023 10:40:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700563237; 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=/lZDWtU9dA1Ia3oluK8elzKYgftQTPR7WpSwNCX+HpI=; b=E4+vjx27bumxNpYOCZV26nv5ZQ3hJZszWDR5P5G4mtHxBW90+FgFb0fJ6w2OB3NfVrNh/p XHLygwtg1cnJkJUPXU1wTvGZNFSPWdKullJlPrRay/jxSnn+VZpsPCg/OjXPhsjhZxmvr3 t2EKUtJZ6FtIWzZF+mYW44uDGBs9/As= X-MC-Unique: 7PHe_H1jMEaoU4KIdGl7tA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , peter.maydell@linaro.org, dwmw@amazon.co.uk Subject: [PULL 2/5] ui: use "vc" chardev for dbus, gtk & spice-app Date: Tue, 21 Nov 2023 14:40:17 +0400 Message-ID: <20231121104020.2209345-3-marcandre.lureau@redhat.com> In-Reply-To: <20231121104020.2209345-1-marcandre.lureau@redhat.com> References: <20231121104020.2209345-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.3 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.133.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.035, 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_H3=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: 1700563302239100002 From: Marc-Andr=C3=A9 Lureau Those display have their own implementation of "vc" chardev, which doesn't use pixman. They also don't implement the width/height/cols/rows options, so qemu_display_get_vc() should return a compatible argument. This patch was meant to be with the pixman series, when the "vc" field was introduced. It fixes a regression where VC are created on the tty (or null) instead of the display own "vc" implementation. Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Thomas Huth --- ui/dbus.c | 1 + ui/gtk.c | 1 + ui/spice-app.c | 1 + 3 files changed, 3 insertions(+) diff --git a/ui/dbus.c b/ui/dbus.c index 866467ad2e..e08b5de064 100644 --- a/ui/dbus.c +++ b/ui/dbus.c @@ -518,6 +518,7 @@ static QemuDisplay qemu_display_dbus =3D { .type =3D DISPLAY_TYPE_DBUS, .early_init =3D early_dbus_init, .init =3D dbus_init, + .vc =3D "vc", }; =20 static void register_dbus(void) diff --git a/ui/gtk.c b/ui/gtk.c index be047a41ad..810d7fc796 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -2534,6 +2534,7 @@ static QemuDisplay qemu_display_gtk =3D { .type =3D DISPLAY_TYPE_GTK, .early_init =3D early_gtk_display_init, .init =3D gtk_display_init, + .vc =3D "vc", }; =20 static void register_gtk(void) diff --git a/ui/spice-app.c b/ui/spice-app.c index 405fb7f9f5..a10b4a58fe 100644 --- a/ui/spice-app.c +++ b/ui/spice-app.c @@ -220,6 +220,7 @@ static QemuDisplay qemu_display_spice_app =3D { .type =3D DISPLAY_TYPE_SPICE_APP, .early_init =3D spice_app_display_early_init, .init =3D spice_app_display_init, + .vc =3D "vc", }; =20 static void register_spice_app(void) --=20 2.42.0 From nobody Wed Nov 27 04:54:54 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=1700563301; cv=none; d=zohomail.com; s=zohoarc; b=Vr/XgL/vtfslH5FLunAa5ttOkpCZYSiqMmYqThSZ2ZKVE1eRIvZ5UfbuQ+uefHMse0YLYCV7l6IBIobe4kA71aKbu6yhuHwQYvKk2zerWuDij7tIXV5eBzOgrR0zUdaa/2A86WYnWHA4nmOQnbWmrboKWoRF3ZKDJvxqiGXEjiA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700563301; 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=9JT5zFuC7oqj6UW3VAGVzElRtLR9xFuKN2cEei4sh+I=; b=fUsXxQlgMs9obQugKB4+lKSdZQuUXXKn10fH0CE8QKvEpoEF4kfNdOIw2S/iNObfoxHhCVYoMGLhvM09rg6pTZFjAqQWgrMs5RhdEM6l8Tt8lsb777YELDbK0Dudk2slCDpXOQ/GMlMsqNxqv6zgtHN7foQrtUgnYAE6jq/jdgM= 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 1700563301385618.8715630718616; Tue, 21 Nov 2023 02:41:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5OBR-0007dj-TW; Tue, 21 Nov 2023 05:40:45 -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 1r5OBQ-0007dS-U3 for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:40:44 -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 1r5OBM-0003Fu-6D for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:40:44 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-437-ZV52MlFiMS6wHSVXeQgMEQ-1; Tue, 21 Nov 2023 05:40:35 -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 88F1A85C1A0; Tue, 21 Nov 2023 10:40:35 +0000 (UTC) Received: from localhost (unknown [10.39.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD2A920268D0; Tue, 21 Nov 2023 10:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700563239; 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=9JT5zFuC7oqj6UW3VAGVzElRtLR9xFuKN2cEei4sh+I=; b=hHjES5qzVZUAv4e7F544kZ+E7dEETiLzaomWF95QSLIq8PxudQj+B1RzBjwMIE0R1+k1QW A0MhvEa1SguCMRMMWFmDPpjyiSCUgVUJO9fOtldJ61YRYcYiYcpEbLj6sAji8iDCW72w6z m4olHhZTUq6QKqd7t0pv19lxx4t8/rU= X-MC-Unique: ZV52MlFiMS6wHSVXeQgMEQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , peter.maydell@linaro.org, dwmw@amazon.co.uk Subject: [PULL 3/5] ui/console: fix default VC when there are no display Date: Tue, 21 Nov 2023 14:40:18 +0400 Message-ID: <20231121104020.2209345-4-marcandre.lureau@redhat.com> In-Reply-To: <20231121104020.2209345-1-marcandre.lureau@redhat.com> References: <20231121104020.2209345-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, 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, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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: 1700563302246100003 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: https://gitlab.com/qemu-project/qemu/-/issues/1989 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.42.0 From nobody Wed Nov 27 04:54:54 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=1700563301; cv=none; d=zohomail.com; s=zohoarc; b=gPBkGuutvvUkZWlwIjS7sDffPR0xkb7CXLFybThHs++2I4loV70yy6hY/MalPTKx7Gu2YOYzk1oBgiDsG19+c8Ur0mvsURtwKx7MRxqlzUadXcHWolgAIWB+40fs1lLMh2crbq9wdu2dj2odEYGa1DT2Jd8t4LznTeBMzXF1b28= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700563301; 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=axn6nnTAUbHi2JFtucXKIDiamPS3DqXPTcu4AQADkEw=; b=hfIOmgCa9x57t2xv9PcygPdd1otBy0hR07JMyv9qXfbpxyVBTCMSoqe1vBwkO43SR5MP5rN5hhIRsjlo/iUKJdiUVX746dczvTJ6zI9zlMg9tUSVHlvXsBj99Pt3OEWJOP0jrfZdaToiL0rKZz4gmAHzZiEQq48yGZBtx8HPsbg= 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 1700563301115959.3962889999362; Tue, 21 Nov 2023 02:41:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5OBS-0007eE-Hd; Tue, 21 Nov 2023 05:40:46 -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 1r5OBR-0007da-4c for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:40:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5OBP-0003GS-JE for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:40:44 -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-244-QLCkeohSP4qso8SJAZy4Tg-1; Tue, 21 Nov 2023 05:40:39 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 0322A3C100C4; Tue, 21 Nov 2023 10:40:39 +0000 (UTC) Received: from localhost (unknown [10.39.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 46AC0492BE7; Tue, 21 Nov 2023 10:40:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700563243; 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=axn6nnTAUbHi2JFtucXKIDiamPS3DqXPTcu4AQADkEw=; b=fTGW6tXIMQ2LRn17nKoPOsKpBKbo9qVTOHjee+YhvW+oxncmLlqKLhvDOnSMuqiDpm7iBi 64+4LHbocgpPTCgTOTjiZQTv/wvQxp7x6KZ6sqcw+fd3Kv1i9FANMsGmt8pyd5Ld6nPruO jrwERR5pxuDMqUSPIb8XTtfzNCPGcCA= X-MC-Unique: QLCkeohSP4qso8SJAZy4Tg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , peter.maydell@linaro.org, dwmw@amazon.co.uk Subject: [PULL 4/5] vl: add missing display_remote++ Date: Tue, 21 Nov 2023 14:40:19 +0400 Message-ID: <20231121104020.2209345-5-marcandre.lureau@redhat.com> In-Reply-To: <20231121104020.2209345-1-marcandre.lureau@redhat.com> References: <20231121104020.2209345-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.9 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.133.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.035, 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_H3=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: 1700563302236100001 From: Marc-Andr=C3=A9 Lureau We should also consider -display vnc=3D as setting up a remote display, and not attempt to add another default one. The display_remote++ in qemu_setup_display() isn't necessary at this point, but is there for completeness and further usages of the variable. Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1988 Fixes: commit 484629fc81 ("vl: simplify display_remote logic ") Signed-off-by: Marc-Andr=C3=A9 Lureau --- system/vl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/vl.c b/system/vl.c index 14bf0cf0bf..da2654aa77 100644 --- a/system/vl.c +++ b/system/vl.c @@ -1110,6 +1110,7 @@ static void parse_display(const char *p) */ if (*opts =3D=3D '=3D') { vnc_parse(opts + 1); + display_remote++; } else { error_report("VNC requires a display argument vnc=3D"= ); exit(1); @@ -1359,6 +1360,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 } } --=20 2.42.0 From nobody Wed Nov 27 04:54:54 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=1700563301; cv=none; d=zohomail.com; s=zohoarc; b=hxLbdCprDY/jd97moib99WVLcds56WphtlyD7Xn+Kpngrm6qNQH9cfcUTGLRxOM6DOL+ky6uZ+IbxjSCVQorQYiLhjNr9+Avi52dAFB+Vv/OttPweHDsDZ4dT8OdSmeGzhV7X6q+6HaZ73n0BmiVpE3ruO2AsrUcEdbaDuCsm/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700563301; 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=xcSybLVQML97R4ifQxa3cpKai5dO7+D+ef9nCuYM/6s=; b=mNCDMFgdDjCaNCZUxKvpxbPmYGsXuJIcQfZusf3x0fqtZa24iwlhoeJxtaG0SZM+uu4IDyrDrcX2cdijdsJlbDbdSbOypbSitXv9H6O+N0+1x5NOar1GklY8ckPXQyJdKEUcJEEMRRpnBPOfDLDsBWpE6i2n5jv6pr9L7QUAvDc= 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 1700563301211878.0243856043766; Tue, 21 Nov 2023 02:41:41 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r5OBU-0007eZ-F2; Tue, 21 Nov 2023 05:40:48 -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 1r5OBS-0007eG-Uf for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:40:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r5OBR-0003Gl-E1 for qemu-devel@nongnu.org; Tue, 21 Nov 2023 05:40:46 -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-516-SfJ4gcIQOSazrJCdGOOvIw-1; Tue, 21 Nov 2023 05:40:43 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 ED10438107A3; Tue, 21 Nov 2023 10:40:42 +0000 (UTC) Received: from localhost (unknown [10.39.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 238E9492BE0; Tue, 21 Nov 2023 10:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700563244; 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=xcSybLVQML97R4ifQxa3cpKai5dO7+D+ef9nCuYM/6s=; b=V4oTs7JhT7g78LtcGZZRGsjkPt6BcQyKhfUCXcVnwlevZEQoXUgAp8B9ypE9IRi30CPGcb qF3gp8T+jLa0zp389JQRnepmiY0k3Sjh0l8FmmMzPDWjs8N7DskbWJORZ45ZnnT4gJZIcm Da8ZQN2WjKAE1BUuBmAyMlgw/o2omNE= X-MC-Unique: SfJ4gcIQOSazrJCdGOOvIw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , peter.maydell@linaro.org, dwmw@amazon.co.uk, Manos Pitsidianakis Subject: [PULL 5/5] ui/pixman-minimal.h: fix empty allocation Date: Tue, 21 Nov 2023 14:40:20 +0400 Message-ID: <20231121104020.2209345-6-marcandre.lureau@redhat.com> In-Reply-To: <20231121104020.2209345-1-marcandre.lureau@redhat.com> References: <20231121104020.2209345-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.9 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.133.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.035, 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_H3=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: 1700563302286100004 From: Manos Pitsidianakis In the minimal pixman API stub that is used when the real pixman dependency is missing a NULL dereference happens when virtio-gpu-rutabaga allocates a pixman image with bits =3D NULL and rowstride_bytes =3D zero. A buffer of rowstride_bytes * height is allocated which is NULL. However, in that scenario pixman calculates a new stride value based on given width, height and format size. This commit adds a helper function that performs the same logic as pixman. Signed-off-by: Manos Pitsidianakis Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20231121093840.2121195-1-manos.pitsidianakis@linaro.org> --- include/ui/pixman-minimal.h | 48 +++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/include/ui/pixman-minimal.h b/include/ui/pixman-minimal.h index efcf570c9e..6dd7de1c7e 100644 --- a/include/ui/pixman-minimal.h +++ b/include/ui/pixman-minimal.h @@ -113,6 +113,45 @@ typedef struct pixman_color { uint16_t alpha; } pixman_color_t; =20 +static inline uint32_t *create_bits(pixman_format_code_t format, + int width, + int height, + int *rowstride_bytes) +{ + int stride =3D 0; + size_t buf_size =3D 0; + int bpp =3D PIXMAN_FORMAT_BPP(format); + + /* + * Calculate the following while checking for overflow truncation: + * stride =3D ((width * bpp + 0x1f) >> 5) * sizeof(uint32_t); + */ + + if (unlikely(__builtin_mul_overflow(width, bpp, &stride))) { + return NULL; + } + + if (unlikely(__builtin_add_overflow(stride, 0x1f, &stride))) { + return NULL; + } + + stride >>=3D 5; + + stride *=3D sizeof(uint32_t); + + if (unlikely(__builtin_mul_overflow((size_t) height, + (size_t) stride, + &buf_size))) { + return NULL; + } + + if (rowstride_bytes) { + *rowstride_bytes =3D stride; + } + + return g_malloc0(buf_size); +} + static inline pixman_image_t *pixman_image_create_bits(pixman_format_code_= t format, int width, int height, @@ -123,13 +162,18 @@ static inline pixman_image_t *pixman_image_create_bit= s(pixman_format_code_t form =20 i->width =3D width; i->height =3D height; - i->stride =3D rowstride_bytes ?: width * DIV_ROUND_UP(PIXMAN_FORMAT_BP= P(format), 8); i->format =3D format; if (bits) { i->data =3D bits; } else { - i->free_me =3D i->data =3D g_malloc0(rowstride_bytes * height); + i->free_me =3D i->data =3D + create_bits(format, width, height, &rowstride_bytes); + if (width && height) { + assert(i->data); + } } + i->stride =3D rowstride_bytes ? rowstride_bytes : + width * DIV_ROUND_UP(PIXMAN_FORMAT_BPP(format)= , 8); i->ref_count =3D 1; =20 return i; --=20 2.42.0