From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Wed, 30 Aug 2023 09:37:48 +0000 (+0400)
Subject: ui/vc: fold text_update_xy()
X-Git-Tag: v8.2.0-rc0~142^2~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7c634aadf83e029b70b5d508fbfda4671e206d6;p=thirdparty%2Fqemu.git

ui/vc: fold text_update_xy()

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230830093843.3531473-15-marcandre.lureau@redhat.com>
---

diff --git a/ui/console.c b/ui/console.c
index d1855f3fcf0..405aedfcbdc 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -425,14 +425,6 @@ static void text_console_resize(QemuConsole *s)
     s->cells = cells;
 }
 
-static inline void text_update_xy(QemuConsole *s, int x, int y)
-{
-    s->text_x[0] = MIN(s->text_x[0], x);
-    s->text_x[1] = MAX(s->text_x[1], x);
-    s->text_y[0] = MIN(s->text_y[0], y);
-    s->text_y[1] = MAX(s->text_y[1], y);
-}
-
 static void invalidate_xy(QemuConsole *s, int x, int y)
 {
     if (!qemu_console_is_visible(s)) {
@@ -453,7 +445,10 @@ static void update_xy(QemuConsole *s, int x, int y)
     TextCell *c;
     int y1, y2;
 
-    text_update_xy(s, x, y);
+    s->text_x[0] = MIN(s->text_x[0], x);
+    s->text_x[1] = MAX(s->text_x[1], x);
+    s->text_y[0] = MIN(s->text_y[0], y);
+    s->text_y[1] = MAX(s->text_y[1], y);
 
     y1 = (s->y_base + y) % s->total_height;
     y2 = y1 - s->y_displayed;