Now that all targets have the graphic dimension variables initialized the same way, we can move them to the common file unit, having them built once. Remove the now empty globals-target.c file. The command line '-g WxH[xD]' option is not changed and behaves the same.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Pierrick Bouvier <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Message-Id: <[email protected]> --- system/globals-target.c | 14 -------------- system/globals.c | 3 +++ system/meson.build | 1 - 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 system/globals-target.c diff --git a/system/globals-target.c b/system/globals-target.c deleted file mode 100644 index ffa6c308b59..00000000000 --- a/system/globals-target.c +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Global variables that should not exist (target specific) - * - * Copyright (c) 2003-2008 Fabrice Bellard - * - * SPDX-License-Identifier: MIT - */ - -#include "qemu/osdep.h" -#include "system/system.h" - -int graphic_width; -int graphic_height; -int graphic_depth; diff --git a/system/globals.c b/system/globals.c index c33f6ed3902..34fd3ce9c72 100644 --- a/system/globals.c +++ b/system/globals.c @@ -49,6 +49,9 @@ bool enable_cpu_pm; int autostart = 1; int vga_interface_type = VGA_NONE; bool vga_interface_created; +int graphic_width; +int graphic_height; +int graphic_depth; Chardev *parallel_hds[MAX_PARALLEL_PORTS]; QEMUOptionRom option_rom[MAX_OPTION_ROMS]; int nb_option_roms; diff --git a/system/meson.build b/system/meson.build index 4b69ef0f5fb..035f0ae7de4 100644 --- a/system/meson.build +++ b/system/meson.build @@ -1,6 +1,5 @@ specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', - 'globals-target.c', )]) system_ss.add(files( -- 2.52.0
