diff options
| author | Ilya Leoshkevich <iii@linux.ibm.com> | 2025-02-17 11:48:49 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2025-02-25 16:18:11 +0100 |
| commit | 5384d92e22577306408cefff887bc5a4b154f470 (patch) | |
| tree | d506b8cc3f9bb345a08aab994effbe34830313cf | |
| parent | 29b9a66f9186f028ec46b58c9914d2da68c25c2c (diff) | |
| download | focaccia-qemu-5384d92e22577306408cefff887bc5a4b154f470.tar.gz focaccia-qemu-5384d92e22577306408cefff887bc5a4b154f470.zip | |
stub: Remove monitor-fd.c
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.liu@intel.com>
Suggested-by: Zhao Liu <zhao1.liu@intel.com>
Fixes: fccb744f41c6 ("gdbstub: Try unlinking the unix socket before binding")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/r/20250217104900.230122-1-iii@linux.ibm.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | stubs/meson.build | 2 | ||||
| -rw-r--r-- | stubs/monitor-fd.c | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/stubs/meson.build b/stubs/meson.build index b0fee37e05..63392f5e78 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 9bb6749885..0000000000 --- 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(); -} |