mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ramfb: move stubs out of stubs/

Browse Source 
Since the ramfb stubs are needed exactly when the Kconfig symbols are not
needed, move them to hw/display/ and compile them when ramfb.c is absent.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240408155330.522792-14-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-04-08 17:53:25 +02:00
parent 5837db4650
commit 5643190b74
3 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/display/meson.build
View File

@ -3,7 +3,7 @@ hw_display_modules = {}
system_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c')) system_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c'))
system_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edid-region.c')) system_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edid-region.c'))
system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c')) system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c'), if_false: files('ramfb-stubs.c'))
system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb-standalone.c')) system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb-standalone.c'))
system_ss.add(when: 'CONFIG_VGA_CIRRUS', if_true: files('cirrus_vga.c')) system_ss.add(when: 'CONFIG_VGA_CIRRUS', if_true: files('cirrus_vga.c'))

0
stubs/ramfb.c → hw/display/ramfb-stubs.c
View File

1
stubs/meson.build
View File

@ -36,7 +36,6 @@ stub_ss.add(files('qmp-command-available.c'))
stub_ss.add(files('qmp-quit.c')) stub_ss.add(files('qmp-quit.c'))
stub_ss.add(files('qtest.c')) stub_ss.add(files('qtest.c'))
stub_ss.add(files('ram-block.c')) stub_ss.add(files('ram-block.c'))
stub_ss.add(files('ramfb.c'))
stub_ss.add(files('replay.c')) stub_ss.add(files('replay.c'))
stub_ss.add(files('runstate-check.c')) stub_ss.add(files('runstate-check.c'))
stub_ss.add(files('sysbus.c')) stub_ss.add(files('sysbus.c'))