[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/18] memory-device: move stubs out of stubs/
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 14/18] memory-device: move stubs out of stubs/ |
Date: |
Mon, 8 Apr 2024 17:53:26 +0200 |
Since the memory-device stubs are needed exactly when the Kconfig symbols are
not
needed, move them to hw/mem/.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
stubs/memory_device.c => hw/mem/memory-device-stubs.c | 0
hw/mem/meson.build | 1 +
stubs/meson.build | 1 -
3 files changed, 1 insertion(+), 1 deletion(-)
rename stubs/memory_device.c => hw/mem/memory-device-stubs.c (100%)
diff --git a/stubs/memory_device.c b/hw/mem/memory-device-stubs.c
similarity index 100%
rename from stubs/memory_device.c
rename to hw/mem/memory-device-stubs.c
diff --git a/hw/mem/meson.build b/hw/mem/meson.build
index faee1fe9360..1c1c6da24b5 100644
--- a/hw/mem/meson.build
+++ b/hw/mem/meson.build
@@ -6,6 +6,7 @@ mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c'))
mem_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_true: files('cxl_type3.c'))
system_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_false:
files('cxl_type3_stubs.c'))
+system_ss.add(when: 'CONFIG_MEM_DEVICE', if_false:
files('memory-device-stubs.c'))
system_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss)
system_ss.add(when: 'CONFIG_SPARSE_MEM', if_true: files('sparse-mem.c'))
diff --git a/stubs/meson.build b/stubs/meson.build
index 92887660e41..a4404e765ab 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -31,7 +31,6 @@ stub_ss.add(files('monitor.c'))
stub_ss.add(files('monitor-core.c'))
stub_ss.add(files('physmem.c'))
stub_ss.add(files('qemu-timer-notify-cb.c'))
-stub_ss.add(files('memory_device.c'))
stub_ss.add(files('qmp-command-available.c'))
stub_ss.add(files('qmp-quit.c'))
stub_ss.add(files('qtest.c'))
--
2.44.0
- Re: [PATCH v2 10/18] hw/usb: move stubs out of stubs/, (continued)
- [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, 2024/04/08
- [PATCH v2 14/18] memory-device: move stubs out of stubs/,
Paolo Bonzini <=
- [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
- [PATCH v2 18/18] stubs: move monitor_fdsets_cleanup with other fdset stubs, Paolo Bonzini, 2024/04/08