From nobody Mon Nov 25 04:30:16 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=1717593358; cv=none; d=zohomail.com; s=zohoarc; b=MWSpy1tlFsRyi9fmlaiyGqZv8mFRRICTKxZy+8MEUmu1qhmVHGbreSapu13D8HIoDXiTGwChERDCZQ7HGv3sQxAuCg/Le1Q6LaTkaONScyKTdmbJWaXjrXDd8qUUEtHA7I9ION4PswgKM64aKoZNHHdFzeUw+Peu0Qg4geU/6fU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717593358; 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=ZzhPwfoH1SErdzaNq4zX0FAoHyesUw7dSQsAWnH09DA=; b=WVHI3tZk9a3ewlMKZSy8iGerCyPcE9DfgbupZ4mK2mqotvXXNA2mghNT/Y0IwXmgvcVaPkVW4L6UMZT0ZwyYJyBVkMZuReZ0KogkyU/OFG15NTsfK0q7v4xEP4oI5yAC5iBRzWacHPb1fau+cHrXoePuvLhg+9xs1FlLPxG/WIg= 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 1717593358594680.9225586329895; Wed, 5 Jun 2024 06:15:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEqTk-0008IK-Bc; Wed, 05 Jun 2024 09:15:00 -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 1sEqTj-0008GA-3T for qemu-devel@nongnu.org; Wed, 05 Jun 2024 09:14:59 -0400 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 1sEqTh-0006Fb-DQ for qemu-devel@nongnu.org; Wed, 05 Jun 2024 09:14:58 -0400 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-97-vsGxsQoUPgaw-ZwqovnG_w-1; Wed, 05 Jun 2024 09:14:50 -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 CB7CB29ABA03; Wed, 5 Jun 2024 13:14:49 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.217]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 01A992166AF7; Wed, 5 Jun 2024 13:14:48 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 58C141800DD4; Wed, 5 Jun 2024 15:14:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717593296; 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=ZzhPwfoH1SErdzaNq4zX0FAoHyesUw7dSQsAWnH09DA=; b=OsCCIttCnUpyjaPjI8fOOun45lfbTQ+5ilJRuHDCPKrLAP8MXM3x0RGAq3k0JWMYkmrsm4 Q+MYitW+4qgIqZoYP+vtacFxH0bgCO3Gw6qd62ah9n/5d8WfCpVmEL9l6GzK/ROfCy5Hhf LF4onVypR/cd4krAxhJqe/fcJhijr1c= X-MC-Unique: vsGxsQoUPgaw-ZwqovnG_w-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Stefano Stabellini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paul Durrant , xen-devel@lists.xenproject.org, Gerd Hoffmann , Anthony PERARD Subject: [PATCH v3 2/3] ui+display: rename is_placeholder() -> surface_is_placeholder() Date: Wed, 5 Jun 2024 15:14:42 +0200 Message-ID: <20240605131444.797896-3-kraxel@redhat.com> In-Reply-To: <20240605131444.797896-1-kraxel@redhat.com> References: <20240605131444.797896-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 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=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: 1717593359179100009 Content-Type: text/plain; charset="utf-8" No functional change. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 4244e0ca4a32..273bb4769a02 100644 --- a/include/ui/surface.h +++ b/include/ui/surface.h @@ -50,7 +50,7 @@ static inline int is_buffer_shared(DisplaySurface *surfac= e) 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 1b2cd0c7365d..c2173fc0b1e5 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 && !is_buffer_shared(surface) && !surface_is_placeholder= (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