diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-08 17:53:25 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-18 11:17:27 +0200 |
| commit | 5643190b74df601719ca713ea21eea4997a26e78 (patch) | |
| tree | 2382346d8d3875fdb641a36fb8c9912691272898 | |
| parent | 5837db465053f57414f671448b370a4b29250bae (diff) | |
| download | qemu-5643190b74df601719ca713ea21eea4997a26e78.zip qemu-5643190b74df601719ca713ea21eea4997a26e78.tar.gz qemu-5643190b74df601719ca713ea21eea4997a26e78.tar.bz2 | |
ramfb: move stubs out of stubs/
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>
| -rw-r--r-- | hw/display/meson.build | 2 | ||||
| -rw-r--r-- | hw/display/ramfb-stubs.c (renamed from stubs/ramfb.c) | 0 | ||||
| -rw-r--r-- | stubs/meson.build | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/hw/display/meson.build b/hw/display/meson.build index f93a69f..4751aab 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -3,7 +3,7 @@ hw_display_modules = {} 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_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_VGA_CIRRUS', if_true: files('cirrus_vga.c')) diff --git a/stubs/ramfb.c b/hw/display/ramfb-stubs.c index cf64733..cf64733 100644 --- a/stubs/ramfb.c +++ b/hw/display/ramfb-stubs.c diff --git a/stubs/meson.build b/stubs/meson.build index 84ecaa4..9288766 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -36,7 +36,6 @@ stub_ss.add(files('qmp-command-available.c')) stub_ss.add(files('qmp-quit.c')) stub_ss.add(files('qtest.c')) stub_ss.add(files('ram-block.c')) -stub_ss.add(files('ramfb.c')) stub_ss.add(files('replay.c')) stub_ss.add(files('runstate-check.c')) stub_ss.add(files('sysbus.c')) |