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>

diff --git a/hw/display/meson.build b/hw/display/meson.build
index f93a69f70f4f3d2577fa69de3349d98e2bc9501c..4751aab3ba98735e773a474690b26d627f90b498 100644 (file)
--- 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/hw/display/ramfb-stubs.c b/hw/display/ramfb-stubs.c
new file mode 100644 (file)
index 0000000..cf64733
--- /dev/null
+++ b/hw/display/ramfb-stubs.c
@@ -0,0 +1,15 @@
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/display/ramfb.h"
+
+const VMStateDescription ramfb_vmstate = {};
+
+void ramfb_display_update(QemuConsole *con, RAMFBState *s)
+{
+}
+
+RAMFBState *ramfb_setup(Error **errp)
+{
+    error_setg(errp, "ramfb support not available");
+    return NULL;
+}

diff --git a/stubs/meson.build b/stubs/meson.build
index 84ecaa4daa1bdb653d50b87e9ef941568155b24b..92887660e41c605014195e80de93456f0f45403b 100644 (file)
--- 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'))

diff --git a/stubs/ramfb.c b/stubs/ramfb.c
deleted file mode 100644 (file)
index cf64733..0000000
--- a/stubs/ramfb.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "hw/display/ramfb.h"
-
-const VMStateDescription ramfb_vmstate = {};
-
-void ramfb_display_update(QemuConsole *con, RAMFBState *s)
-{
-}
-
-RAMFBState *ramfb_setup(Error **errp)
-{
-    error_setg(errp, "ramfb support not available");
-    return NULL;
-}