diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-08 17:53:26 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-04-18 11:17:27 +0200 |
| commit | 2c888febdfa0290a9e1d1f2133b2a24de47f6120 (patch) | |
| tree | 7dd42e5148d8e3e401d225c5c06619ff816c26cc | |
| parent | 5643190b74df601719ca713ea21eea4997a26e78 (diff) | |
| download | qemu-2c888febdfa0290a9e1d1f2133b2a24de47f6120.zip qemu-2c888febdfa0290a9e1d1f2133b2a24de47f6120.tar.gz qemu-2c888febdfa0290a9e1d1f2133b2a24de47f6120.tar.bz2 | |
memory-device: move stubs out of stubs/
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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240408155330.522792-15-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/mem/memory-device-stubs.c (renamed from stubs/memory_device.c) | 0 | ||||
| -rw-r--r-- | hw/mem/meson.build | 1 | ||||
| -rw-r--r-- | stubs/meson.build | 1 |
3 files changed, 1 insertions, 1 deletions
diff --git a/stubs/memory_device.c b/hw/mem/memory-device-stubs.c index 15fd93f..15fd93f 100644 --- a/stubs/memory_device.c +++ b/hw/mem/memory-device-stubs.c diff --git a/hw/mem/meson.build b/hw/mem/meson.build index faee1fe..1c1c6da 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 9288766..a4404e7 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')) |