From nobody Sun Nov 24 17:01:41 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=1717427960; cv=none; d=zohomail.com; s=zohoarc; b=E5Y2heo+7qx52gWSnQ7K5ucmLC9+24ze1JUCnXg+1VPTAR0rqsSGJjoxQ4H6B8gpwI58x6SasRQbM2T51Rpk+tnKa34y8kiCEyiZlu9KlkmLE9PjYuGclJxSI6NtQ4OXnz0jhf+Ws2My0BqxCu5M2Lst1CyDUPt8nbrZs91pI1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717427960; h=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=vkSiq4a30KX/BtKlzALhqQstMUl79qOxtGFoh3xybvE=; b=cKxwM27pkIpfse35jl8OC2dq/k0HOgnBddIv0/Og8OjucWt/63C3XSzEDrzZchg8tEscNLXdAcOKJQcYMhSg3/8bEAJv+A5rjuIVuG8oSDoUYCz+GZQ/IsKRXPMBWSQJToNgewqiHp4h2s1hCtV8kAfsyegoHqioku7DFwW6fu4= 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 1717427960510613.4004904906539; Mon, 3 Jun 2024 08:19:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sE9SH-0006iY-Tl; Mon, 03 Jun 2024 11:18:37 -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 1sE9SG-0006hz-6n for qemu-devel@nongnu.org; Mon, 03 Jun 2024 11:18:36 -0400 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 1sE9SE-0005qz-EU for qemu-devel@nongnu.org; Mon, 03 Jun 2024 11:18:35 -0400 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-126-Iy7WdosbNt6_HMy2-StTTQ-1; Mon, 03 Jun 2024 11:18:28 -0400 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 B2E04185AD2C; Mon, 3 Jun 2024 15:18:27 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.239]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC73F1050176; Mon, 3 Jun 2024 15:18:26 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0C05718009AD; Mon, 3 Jun 2024 17:18:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717427911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vkSiq4a30KX/BtKlzALhqQstMUl79qOxtGFoh3xybvE=; b=hlQm+ZufPAUlPSnq9HOYeYL1yl5XrVdUg5QHNPLfvGUK6MV0jrxJ8Jvwr2uHJcZ6PMEeac JGDgkFUmchW1yJfSUvbLebcmTB1i6q3kQBaWICKUBpf1rbjULyvsXnSvbcaxUCG0WqqeA3 /Mp3DzK9p5963Lv8FVnlbQabAcsauBM= X-MC-Unique: Iy7WdosbNt6_HMy2-StTTQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Anthony PERARD , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paul Durrant , xen-devel@lists.xenproject.org, Stefano Stabellini , qemu-stable@nongnu.org Subject: [PATCH v2 1/3] stdvga: fix screen blanking Date: Mon, 3 Jun 2024 17:18:23 +0200 Message-ID: <20240603151825.188353-2-kraxel@redhat.com> In-Reply-To: <20240603151825.188353-1-kraxel@redhat.com> References: <20240603151825.188353-1-kraxel@redhat.com> MIME-Version: 1.0 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=kraxel@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: 1717427961707100004 Content-Type: text/plain; charset="utf-8" In case the display surface uses a shared buffer (i.e. uses vga vram directly instead of a shadow) go unshare the buffer before clearing it. This avoids vga memory corruption, which in turn fixes unblanking not working properly with X11. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2067 Signed-off-by: Gerd Hoffmann --- hw/display/vga.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/display/vga.c b/hw/display/vga.c index 30facc6c8e33..474b6b14c327 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1762,6 +1762,12 @@ static void vga_draw_blank(VGACommonState *s, int fu= ll_update) if (s->last_scr_width <=3D 0 || s->last_scr_height <=3D 0) return; =20 + if (is_buffer_shared(surface)) { + /* unshare buffer, otherwise the blanking corrupts vga vram */ + surface =3D qemu_create_displaysurface(s->last_scr_width, s->last_= scr_height); + dpy_gfx_replace_surface(s->con, surface); + } + w =3D s->last_scr_width * surface_bytes_per_pixel(surface); d =3D surface_data(surface); for(i =3D 0; i < s->last_scr_height; i++) { --=20 2.45.1 From nobody Sun Nov 24 17:01:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717427947; cv=none; d=zohomail.com; s=zohoarc; b=Qj5dcEgNLwHAIjmYdvZ2DbquntLMJ4dZEbZPQHm2mextYO5iIKTVp56qqNHSKK74GUjGj1e5hr3r6g0K1RkC0Z5C8OSSvDeGF+9KdLZ07+GfCzz/GiL5SW/ZgaqngzX/q1JvF3/WhkLu0jVAcBg7MyYKxJkzy08vP9QZ9FdcE6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717427947; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=i8kzX9DrYOhcqIvJMNJmWCuMKiFj8etOtZj3EnRy0I8=; b=cwdtb5jg6osNyl7zTwDFd7hw+enH81rNmuvGh87B/vsTcVIIEnpmiw6HcBexC8qWZN3o5o1qITZfdIIFcG3mtC5T88oJGeEN4+Sycx/Fxng4oyUHEMJn6v01pSf7VI6KlngCNyu5/yfjgm7ZbqidS70rHuaYuvVK70XeH1Gd8/o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1717427947080264.694246294707; Mon, 3 Jun 2024 08:19:07 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.734955.1141102 (Exim 4.92) (envelope-from ) id 1sE9SH-0003Fp-2r; Mon, 03 Jun 2024 15:18:37 +0000 Received: by outflank-mailman (output) from mailman id 734955.1141102; Mon, 03 Jun 2024 15:18:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sE9SG-0003FU-Te; Mon, 03 Jun 2024 15:18:36 +0000 Received: by outflank-mailman (input) for mailman id 734955; Mon, 03 Jun 2024 15:18:36 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sE9SF-00030f-Uq for xen-devel@lists.xenproject.org; Mon, 03 Jun 2024 15:18:35 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8ad6c8c0-21bc-11ef-90a1-e314d9c70b13; Mon, 03 Jun 2024 17:18:35 +0200 (CEST) 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-391-On8TU32lNrWFK8D0XWJUxg-1; Mon, 03 Jun 2024 11:18:30 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 EDB9D85A58C; Mon, 3 Jun 2024 15:18:29 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.239]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9BC29C15C05; Mon, 3 Jun 2024 15:18:28 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2456C1801F28; Mon, 3 Jun 2024 17:18:26 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8ad6c8c0-21bc-11ef-90a1-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717427913; 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=i8kzX9DrYOhcqIvJMNJmWCuMKiFj8etOtZj3EnRy0I8=; b=KXPNlJd0dPNGAyLTTPnQJdbWxIZg0IVS5BACVvB7Et5xtwkDB2JLk6+aAlgNVJ0AKgps2W 6vI0SrYd6fqGqggHovJbyZIRWiifwasDBsbJb7ofLw5Q0S+cf17vKW1qdIJr59HHui23jd DfoOgNvzkTdervHZe+fij4wUFD2QLvw= X-MC-Unique: On8TU32lNrWFK8D0XWJUxg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Anthony PERARD , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paul Durrant , xen-devel@lists.xenproject.org, Stefano Stabellini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 2/3] ui+display: rename is_buffer_shared() -> surface_is_borrowed() Date: Mon, 3 Jun 2024 17:18:24 +0200 Message-ID: <20240603151825.188353-3-kraxel@redhat.com> In-Reply-To: <20240603151825.188353-1-kraxel@redhat.com> References: <20240603151825.188353-1-kraxel@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.8 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717427947642100001 No functional change. Suggested-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Gerd Hoffmann --- include/ui/surface.h | 2 +- hw/display/qxl-render.c | 2 +- hw/display/vga.c | 10 +++++----- hw/display/xenfb.c | 4 ++-- ui/console.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/ui/surface.h b/include/ui/surface.h index 4244e0ca4a32..96f9b1611c1c 100644 --- a/include/ui/surface.h +++ b/include/ui/surface.h @@ -45,7 +45,7 @@ void qemu_displaysurface_win32_set_handle(DisplaySurface = *surface, DisplaySurface *qemu_create_displaysurface(int width, int height); void qemu_free_displaysurface(DisplaySurface *surface); =20 -static inline int is_buffer_shared(DisplaySurface *surface) +static inline int surface_is_borrowed(DisplaySurface *surface) { return !(surface->flags & QEMU_ALLOCATED_FLAG); } diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index ec99ec887a6e..bfdf2c59bdbe 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -31,7 +31,7 @@ static void qxl_blit(PCIQXLDevice *qxl, QXLRect *rect) uint8_t *src; int len, i; =20 - if (is_buffer_shared(surface)) { + if (surface_is_borrowed(surface)) { return; } trace_qxl_render_blit(qxl->guest_primary.qxl_stride, diff --git a/hw/display/vga.c b/hw/display/vga.c index 474b6b14c327..bd800a683e45 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1620,7 +1620,7 @@ static void vga_draw_graphic(VGACommonState *s, int f= ull_update) height !=3D s->last_height || s->last_depth !=3D depth || s->last_byteswap !=3D byteswap || - share_surface !=3D is_buffer_shared(surface)) { + share_surface !=3D surface_is_borrowed(surface)) { /* display parameters changed -> need new display surface */ s->last_scr_width =3D disp_width; s->last_scr_height =3D height; @@ -1635,7 +1635,7 @@ static void vga_draw_graphic(VGACommonState *s, int f= ull_update) full_update =3D 1; } if (surface_data(surface) !=3D s->vram_ptr + (s->params.start_addr * 4) - && is_buffer_shared(surface)) { + && surface_is_borrowed(surface)) { /* base address changed (page flip) -> shared display surfaces * must be updated with the new base address */ full_update =3D 1; @@ -1655,7 +1655,7 @@ static void vga_draw_graphic(VGACommonState *s, int f= ull_update) =20 vga_draw_line =3D vga_draw_line_table[v]; =20 - if (!is_buffer_shared(surface) && s->cursor_invalidate) { + if (!surface_is_borrowed(surface) && s->cursor_invalidate) { s->cursor_invalidate(s); } =20 @@ -1707,7 +1707,7 @@ static void vga_draw_graphic(VGACommonState *s, int f= ull_update) if (update) { if (y_start < 0) y_start =3D y; - if (!(is_buffer_shared(surface))) { + if (!(surface_is_borrowed(surface))) { uint8_t *p; p =3D vga_draw_line(s, d, addr, width, hpel); if (p) { @@ -1762,7 +1762,7 @@ static void vga_draw_blank(VGACommonState *s, int ful= l_update) if (s->last_scr_width <=3D 0 || s->last_scr_height <=3D 0) return; =20 - if (is_buffer_shared(surface)) { + if (surface_is_borrowed(surface)) { /* unshare buffer, otherwise the blanking corrupts vga vram */ surface =3D qemu_create_displaysurface(s->last_scr_width, s->last_= scr_height); dpy_gfx_replace_surface(s->con, surface); diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 27536bfce0cb..a9bc5a08cdc2 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -637,7 +637,7 @@ static void xenfb_guest_copy(struct XenFB *xenfb, int x= , int y, int w, int h) int linesize =3D surface_stride(surface); uint8_t *data =3D surface_data(surface); =20 - if (!is_buffer_shared(surface)) { + if (!surface_is_borrowed(surface)) { switch (xenfb->depth) { case 8: if (bpp =3D=3D 16) { @@ -755,7 +755,7 @@ static void xenfb_update(void *opaque) xen_pv_printf(&xenfb->c.xendev, 1, "update: resizing: %dx%d @ %d bpp%s\n", xenfb->width, xenfb->height, xenfb->depth, - is_buffer_shared(surface) ? " (shared)" : ""); + surface_is_borrowed(surface) ? " (borrowed)" : ""); xenfb->up_fullscreen =3D 1; } =20 diff --git a/ui/console.c b/ui/console.c index 1b2cd0c7365d..d7967ddb0d1a 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1510,7 +1510,7 @@ void qemu_console_resize(QemuConsole *s, int width, i= nt height) assert(QEMU_IS_GRAPHIC_CONSOLE(s)); =20 if ((s->scanout.kind !=3D SCANOUT_SURFACE || - (surface && !is_buffer_shared(surface) && !is_placeholder(surface= ))) && + (surface && !surface_is_borrowed(surface) && !is_placeholder(surf= ace))) && qemu_console_get_width(s, -1) =3D=3D width && qemu_console_get_height(s, -1) =3D=3D height) { return; --=20 2.45.1 From nobody Sun Nov 24 17:01:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717427933; cv=none; d=zohomail.com; s=zohoarc; b=nf6KBTl6SyOtwN8W8oa78E1jsfi1c11NRpJePsArbs19JpfW8VdfAArMjhzQMf9RxfcngJfsAecdVzLLIDmPQT2eenjFSGvjsmWEEUqn6APsX6lsQpBsBVspDapPjLJOsZxdz2GKMwRzMj0MYutoytwiM5zf5eYG/P9qmJzGgE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717427933; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iOjw8WHuKXRxil9Kra4lnYZ4J/Am36P/OUiaBQSEgzM=; b=XMQi+xYU+WEEG+Pm16xDgsx21tWvoWpwtaNskaPhI7Pktfvdj6ClCmdyy4J0qn7dT+7f4VE6GW8HTj0M9ZQtZFZIQAHcJgbQaUnZNHgT6s/pP36iVSpgB/sK+xdWAIdOAFJYx2spBRt9eGtLQjX5EKGyh5rNvp1drTM1wNn6lvY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1717427933911865.9739706355334; Mon, 3 Jun 2024 08:18:53 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.734956.1141109 (Exim 4.92) (envelope-from ) id 1sE9SH-0003OL-Dx; Mon, 03 Jun 2024 15:18:37 +0000 Received: by outflank-mailman (output) from mailman id 734956.1141109; Mon, 03 Jun 2024 15:18:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sE9SH-0003N1-84; Mon, 03 Jun 2024 15:18:37 +0000 Received: by outflank-mailman (input) for mailman id 734956; Mon, 03 Jun 2024 15:18:36 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sE9SG-00030f-Jv for xen-devel@lists.xenproject.org; Mon, 03 Jun 2024 15:18:36 +0000 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8b0febaf-21bc-11ef-90a1-e314d9c70b13; Mon, 03 Jun 2024 17:18:35 +0200 (CEST) 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-423-PXlMk71_P76Ne_v4g56O5A-1; Mon, 03 Jun 2024 11:18:30 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 C21E6800CAC; Mon, 3 Jun 2024 15:18:29 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.239]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2FC58200C7E4; Mon, 3 Jun 2024 15:18:29 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3947B1801F2C; Mon, 3 Jun 2024 17:18:26 +0200 (CEST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8b0febaf-21bc-11ef-90a1-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717427913; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iOjw8WHuKXRxil9Kra4lnYZ4J/Am36P/OUiaBQSEgzM=; b=RZor1nEUcfmVcmlwWgxeR7adys+ZH4GwivoHx7qCeeBIoZb/byKhDD301HJjhcA7iWe8vW zLSSTbgb4tBhoL1Cb0e2ykF44Y3pd0/M9oQuzU+WJ02yGzHq5k/KZqP6OZHGuOe9sbSzLm nyWUZuNeHaluN1g+OiJrcBbKpcNkUEU= X-MC-Unique: PXlMk71_P76Ne_v4g56O5A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Anthony PERARD , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paul Durrant , xen-devel@lists.xenproject.org, Stefano Stabellini Subject: [PATCH v2 3/3] ui+display: rename is_placeholder -> surface_is_placeholder Date: Mon, 3 Jun 2024 17:18:25 +0200 Message-ID: <20240603151825.188353-4-kraxel@redhat.com> In-Reply-To: <20240603151825.188353-1-kraxel@redhat.com> References: <20240603151825.188353-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717427935656100001 Content-Type: text/plain; charset="utf-8" No functional change. Signed-off-by: Gerd Hoffmann --- include/ui/surface.h | 2 +- ui/console.c | 2 +- ui/sdl2-2d.c | 2 +- ui/sdl2-gl.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/ui/surface.h b/include/ui/surface.h index 96f9b1611c1c..60416a451901 100644 --- a/include/ui/surface.h +++ b/include/ui/surface.h @@ -50,7 +50,7 @@ static inline int surface_is_borrowed(DisplaySurface *sur= face) return !(surface->flags & QEMU_ALLOCATED_FLAG); } =20 -static inline int is_placeholder(DisplaySurface *surface) +static inline int surface_is_placeholder(DisplaySurface *surface) { return surface->flags & QEMU_PLACEHOLDER_FLAG; } diff --git a/ui/console.c b/ui/console.c index d7967ddb0d1a..3bd2adcc33c3 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1510,7 +1510,7 @@ void qemu_console_resize(QemuConsole *s, int width, i= nt height) assert(QEMU_IS_GRAPHIC_CONSOLE(s)); =20 if ((s->scanout.kind !=3D SCANOUT_SURFACE || - (surface && !surface_is_borrowed(surface) && !is_placeholder(surf= ace))) && + (surface && !surface_is_borrowed(surface) && !surface_is_placehol= der(surface))) && qemu_console_get_width(s, -1) =3D=3D width && qemu_console_get_height(s, -1) =3D=3D height) { return; diff --git a/ui/sdl2-2d.c b/ui/sdl2-2d.c index 06468cd493ea..73052383c2e0 100644 --- a/ui/sdl2-2d.c +++ b/ui/sdl2-2d.c @@ -72,7 +72,7 @@ void sdl2_2d_switch(DisplayChangeListener *dcl, scon->texture =3D NULL; } =20 - if (is_placeholder(new_surface) && qemu_console_get_index(dcl->con)) { + if (surface_is_placeholder(new_surface) && qemu_console_get_index(dcl-= >con)) { sdl2_window_destroy(scon); return; } diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c index 28d796607c08..91b7ee2419b7 100644 --- a/ui/sdl2-gl.c +++ b/ui/sdl2-gl.c @@ -89,7 +89,7 @@ void sdl2_gl_switch(DisplayChangeListener *dcl, =20 scon->surface =3D new_surface; =20 - if (is_placeholder(new_surface) && qemu_console_get_index(dcl->con)) { + if (surface_is_placeholder(new_surface) && qemu_console_get_index(dcl-= >con)) { qemu_gl_fini_shader(scon->gls); scon->gls =3D NULL; sdl2_window_destroy(scon); --=20 2.45.1