ui: move FONT_WIDTH/HEIGHT to vgafont.h
Since those values are related to the VGA font, it make sense to move them here. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Marc-André Lureau committed
Feb 23, 2026 at 15:52 UTC
690fbfcd981399d82c740fe2125d3d5a9397ec55
4 files changed
+7
-6
ui/console-priv.h
-5
@@ -9,11 +9,6 @@
9
#include "qemu/coroutine.h"
10
#include "qemu/timer.h"
11
12
-#include "vgafont.h"
13
-
14
-#define FONT_HEIGHT 16
15
-#define FONT_WIDTH 8
16
-
12
struct QemuConsole {
13
Object parent;
14
ui/console-vc.c
+1
@@ -10,6 +10,7 @@
10
#include "qemu/option.h"
11
#include "qemu/queue.h"
12
#include "ui/console.h"
13
+#include "ui/vgafont.h"
14
15
#include "pixman.h"
16
#include "trace.h"
ui/console.c
+1
@@ -24,6 +24,7 @@
24
25
#include "qemu/osdep.h"
26
#include "ui/console.h"
27
+#include "ui/vgafont.h"
28
#include "hw/core/qdev.h"
29
#include "qapi/error.h"
30
#include "qapi/qapi-commands-ui.h"
ui/vgafont.h
+5
-1
@@ -6,6 +6,10 @@
6
7
#include <stdint.h>
8
9
-extern const uint8_t vgafont16[256 * 16];
9
+/* supports only vga 8x16 */
10
+#define FONT_WIDTH 8
11
+#define FONT_HEIGHT 16
12
+
13
+extern const uint8_t vgafont16[256 * FONT_HEIGHT];
14
15
#endif