Both monitor-fd.c and monitor-internal.c contain a stub for
monitor_get_fd(), which causes a duplicate symbol linker error when
linking rust-qemu-api-integration. Use monitor-internal.c instead of
monitor-fd.c and remove the latter.
Reported-by: Zhao Liu <zhao1....@intel.com>
Suggested-by: Zhao Liu <zhao1....@intel.com>
Fixes: fccb744f41c6 ("gdbstub: Try unlinking the unix socket before binding")
Signed-off-by: Ilya Leoshkevich <i...@linux.ibm.com>
---
stubs/meson.build | 2 +-
stubs/monitor-fd.c | 9 ---------
2 files changed, 1 insertion(+), 10 deletions(-)
delete mode 100644 stubs/monitor-fd.c
diff --git a/stubs/meson.build b/stubs/meson.build
index b0fee37e059..63392f5e785 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -62,7 +62,7 @@ if have_user
stub_ss.add(files('qdev.c'))
endif
- stub_ss.add(files('monitor-fd.c'))
+ stub_ss.add(files('monitor-internal.c'))
endif
if have_system
diff --git a/stubs/monitor-fd.c b/stubs/monitor-fd.c
deleted file mode 100644
index 9bb67498850..00000000000
--- a/stubs/monitor-fd.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#include "qemu/osdep.h"
-#include "monitor/monitor.h"
-
-int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp)
-{
- abort();
-}
--
2.48.1
