From patchwork Mon Jun 3 15:18:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 13683909 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B4F1C25B75 for ; Mon, 3 Jun 2024 15:18:49 +0000 (UTC) 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 X-Outflank-Mailman: Message body and most headers restored to incoming version 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-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_Lureau?= , 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 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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 *surface) return !(surface->flags & QEMU_ALLOCATED_FLAG); } -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, int height) assert(QEMU_IS_GRAPHIC_CONSOLE(s)); if ((s->scanout.kind != SCANOUT_SURFACE || - (surface && !surface_is_borrowed(surface) && !is_placeholder(surface))) && + (surface && !surface_is_borrowed(surface) && !surface_is_placeholder(surface))) && qemu_console_get_width(s, -1) == width && qemu_console_get_height(s, -1) == 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 = NULL; } - 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, scon->surface = new_surface; - 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 = NULL; sdl2_window_destroy(scon);