diff mbox series

[v2,09/18] stubs: remove obsolete stubs

Message ID 20240408155330.522792-10-pbonzini@redhat.com
State New
Headers show
Series buildsys: Start shrinking qemu-user build process | expand

Commit Message

Paolo Bonzini April 8, 2024, 3:53 p.m. UTC 
These file define functions are are not called from common code
anymore.  Delete those functions and, if applicable, the entire files.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/sysemu/sysemu.h |  2 --
 stubs/isa-bus.c         |  7 -------
 stubs/module-opts.c     |  2 --
 stubs/monitor-core.c    |  6 ------
 stubs/pci-bus.c         |  7 -------
 stubs/qdev.c            |  6 ------
 stubs/qtest.c           | 10 ----------
 stubs/usb-dev-stub.c    |  5 -----
 stubs/meson.build       |  3 ---
 9 files changed, 48 deletions(-)
 delete mode 100644 stubs/isa-bus.c
 delete mode 100644 stubs/module-opts.c
 delete mode 100644 stubs/pci-bus.c

Comments

Richard Henderson April 8, 2024, 4:46 p.m. UTC | #1 
On 4/8/24 05:53, Paolo Bonzini wrote:
> These file define functions are are not called from common code
> anymore.  Delete those functions and, if applicable, the entire files.
> 
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
>   include/sysemu/sysemu.h |  2 --
>   stubs/isa-bus.c         |  7 -------
>   stubs/module-opts.c     |  2 --
>   stubs/monitor-core.c    |  6 ------
>   stubs/pci-bus.c         |  7 -------
>   stubs/qdev.c            |  6 ------
>   stubs/qtest.c           | 10 ----------
>   stubs/usb-dev-stub.c    |  5 -----
>   stubs/meson.build       |  3 ---
>   9 files changed, 48 deletions(-)
>   delete mode 100644 stubs/isa-bus.c
>   delete mode 100644 stubs/module-opts.c
>   delete mode 100644 stubs/pci-bus.c

Acked-by: Richard Henderson <richard.henderson@linaro.org>

r~
diff mbox series

Patch

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index eb1dc1e4eda..5b4397eeb80 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -71,8 +71,6 @@  Chardev *serial_hd(int i);
 
 extern Chardev *parallel_hds[MAX_PARALLEL_PORTS];
 
-void hmp_info_usb(Monitor *mon, const QDict *qdict);
-
 void add_boot_device_path(int32_t bootindex, DeviceState *dev,
                           const char *suffix);
 char *get_boot_devices_list(size_t *size);
diff --git a/stubs/isa-bus.c b/stubs/isa-bus.c
deleted file mode 100644
index 522f448997d..00000000000
--- a/stubs/isa-bus.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-#include "qemu/osdep.h"
-#include "hw/isa/isa.h"
-
-ISADevice *isa_create_simple(ISABus *bus, const char *name)
-{
-    g_assert_not_reached();
-}
diff --git a/stubs/module-opts.c b/stubs/module-opts.c
deleted file mode 100644
index 5412429ea86..00000000000
--- a/stubs/module-opts.c
+++ /dev/null
@@ -1,2 +0,0 @@ 
-#include "qemu/osdep.h"
-#include "qemu/config-file.h"
diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
index afa477aae65..1894cdfe1f8 100644
--- a/stubs/monitor-core.c
+++ b/stubs/monitor-core.c
@@ -12,10 +12,6 @@  Monitor *monitor_set_cur(Coroutine *co, Monitor *mon)
     return NULL;
 }
 
-void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
-{
-}
-
 void qapi_event_emit(QAPIEvent event, QDict *qdict)
 {
 }
@@ -24,5 +20,3 @@  int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
 {
     abort();
 }
-
-
diff --git a/stubs/pci-bus.c b/stubs/pci-bus.c
deleted file mode 100644
index a8932fa9325..00000000000
--- a/stubs/pci-bus.c
+++ /dev/null
@@ -1,7 +0,0 @@ 
-#include "qemu/osdep.h"
-#include "hw/pci/pci.h"
-
-PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name)
-{
-    g_assert_not_reached();
-}
diff --git a/stubs/qdev.c b/stubs/qdev.c
index 6869f6f90a2..7e957b3e524 100644
--- a/stubs/qdev.c
+++ b/stubs/qdev.c
@@ -20,9 +20,3 @@  void qapi_event_send_device_deleted(const char *device,
 {
     /* Nothing to do. */
 }
-
-void qapi_event_send_device_unplug_guest_error(const char *device,
-                                               const char *path)
-{
-    /* Nothing to do. */
-}
diff --git a/stubs/qtest.c b/stubs/qtest.c
index 4666a49d7d1..39e376eb67d 100644
--- a/stubs/qtest.c
+++ b/stubs/qtest.c
@@ -13,13 +13,3 @@ 
 
 /* Needed for qtest_allowed() */
 bool qtest_allowed;
-
-bool qtest_driver(void)
-{
-    return false;
-}
-
-int64_t qtest_get_virtual_clock(void)
-{
-    return 0;
-}
diff --git a/stubs/usb-dev-stub.c b/stubs/usb-dev-stub.c
index aa557692b71..fcabe8429e6 100644
--- a/stubs/usb-dev-stub.c
+++ b/stubs/usb-dev-stub.c
@@ -26,8 +26,3 @@  HumanReadableText *qmp_x_query_usb(Error **errp)
     error_setg(errp, "Support for USB devices not built-in");
     return NULL;
 }
-
-void hmp_info_usb(Monitor *mon, const QDict *qdict)
-{
-    monitor_printf(mon, "Support for USB devices not built-in\n");
-}
diff --git a/stubs/meson.build b/stubs/meson.build
index f87f5c1110f..aa7120f7110 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -22,13 +22,11 @@  stub_ss.add(files('iothread-lock.c'))
 if have_block
   stub_ss.add(files('iothread-lock-block.c'))
 endif
-stub_ss.add(files('isa-bus.c'))
 stub_ss.add(files('is-daemonized.c'))
 if libaio.found()
   stub_ss.add(files('linux-aio.c'))
 endif
 stub_ss.add(files('migr-blocker.c'))
-stub_ss.add(files('module-opts.c'))
 stub_ss.add(files('monitor.c'))
 stub_ss.add(files('monitor-core.c'))
 stub_ss.add(files('physmem.c'))
@@ -57,7 +55,6 @@  if have_block or have_ga
 endif
 if have_system
   stub_ss.add(files('fw_cfg.c'))
-  stub_ss.add(files('pci-bus.c'))
   stub_ss.add(files('semihost.c'))
   stub_ss.add(files('usb-dev-stub.c'))
   stub_ss.add(files('xen-hw-stub.c'))