From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Stefano Stabellini" <sstabellini@kernel.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paul Durrant" <paul@xen.org>,
xen-devel@lists.xenproject.org,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Anthony PERARD" <anthony@xenproject.org>
Subject: [PATCH v3 2/3] ui+display: rename is_placeholder() -> surface_is_placeholder()
Date: Wed, 5 Jun 2024 15:14:42 +0200 [thread overview]
Message-ID: <20240605131444.797896-3-kraxel@redhat.com> (raw)
In-Reply-To: <20240605131444.797896-1-kraxel@redhat.com>
No functional change.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
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 *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 1b2cd0c7365d..c2173fc0b1e5 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 && !is_buffer_shared(surface) && !is_placeholder(surface))) &&
+ (surface && !is_buffer_shared(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);
--
2.45.1
next prev parent reply other threads:[~2024-06-05 13:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-05 13:14 [PATCH v3 0/3] stdvga: fix screen blanking Gerd Hoffmann
2024-06-05 13:14 ` [PATCH v3 1/3] " Gerd Hoffmann
2024-06-05 13:14 ` Gerd Hoffmann [this message]
2024-06-18 11:02 ` [PATCH v3 2/3] ui+display: rename is_placeholder() -> surface_is_placeholder() Philippe Mathieu-Daudé
2024-06-05 13:14 ` [PATCH v3 3/3] ui+display: rename is_buffer_shared() -> surface_is_allocated() Gerd Hoffmann
2024-06-06 8:36 ` Paul Durrant
2024-06-05 13:26 ` [PATCH v3 0/3] stdvga: fix screen blanking Marc-André Lureau
2024-06-18 11:08 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240605131444.797896-3-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=anthony@xenproject.org \
--cc=marcandre.lureau@redhat.com \
--cc=paul@xen.org \
--cc=qemu-devel@nongnu.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).