[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/18] ramfb: move stubs out of stubs/
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 13/18] ramfb: move stubs out of stubs/ |
Date: |
Mon, 8 Apr 2024 17:53:25 +0200 |
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>
---
stubs/ramfb.c => hw/display/ramfb-stubs.c | 0
hw/display/meson.build | 2 +-
stubs/meson.build | 1 -
3 files changed, 1 insertion(+), 2 deletions(-)
rename stubs/ramfb.c => hw/display/ramfb-stubs.c (100%)
diff --git a/stubs/ramfb.c b/hw/display/ramfb-stubs.c
similarity index 100%
rename from stubs/ramfb.c
rename to hw/display/ramfb-stubs.c
diff --git a/hw/display/meson.build b/hw/display/meson.build
index f93a69f70f4..4751aab3ba9 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/meson.build b/stubs/meson.build
index 84ecaa4daa1..92887660e41 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'))
--
2.44.0
- Re: [PATCH v2 07/18] hw/core: Move system emulation files to system_ss, (continued)
- [PATCH v2 09/18] stubs: remove obsolete stubs, Paolo Bonzini, 2024/04/08
- [PATCH v2 10/18] hw/usb: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 06/18] util/qemu-config: Extract QMP commands to qemu-config-qmp.c, Paolo Bonzini, 2024/04/08
- [PATCH v2 11/18] hw/virtio: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 12/18] semihosting: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 13/18] ramfb: move stubs out of stubs/,
Paolo Bonzini <=
- [PATCH v2 14/18] memory-device: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 15/18] colo: move stubs out of stubs/, Paolo Bonzini, 2024/04/08
- [PATCH v2 17/18] stubs: include stubs only if needed, Paolo Bonzini, 2024/04/08
- [PATCH v2 16/18] stubs: split record/replay stubs further, Paolo Bonzini, 2024/04/08