diff mbox series

stub: Remove monitor-fd.c

Message ID 20250217104900.230122-1-iii@linux.ibm.com (mailing list archive)
State New
Headers show
Series stub: Remove monitor-fd.c | expand

Commit Message

Ilya Leoshkevich Feb. 17, 2025, 10:48 a.m. UTC 
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>
---
 stubs/meson.build  | 2 +-
 stubs/monitor-fd.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 stubs/monitor-fd.c

Comments

Zhao Liu Feb. 17, 2025, 12:03 p.m. UTC | #1 
On Mon, Feb 17, 2025 at 11:48:49AM +0100, Ilya Leoshkevich wrote:
> Date: Mon, 17 Feb 2025 11:48:49 +0100
> From: Ilya Leoshkevich <iii@linux.ibm.com>
> Subject: [PATCH] stub: Remove monitor-fd.c
> X-Mailer: git-send-email 2.48.1
> 
> 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>
> ---
>  stubs/meson.build  | 2 +-
>  stubs/monitor-fd.c | 9 ---------
>  2 files changed, 1 insertion(+), 10 deletions(-)
>  delete mode 100644 stubs/monitor-fd.c

Thanks Ilya! LGTM,

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Paolo Bonzini Feb. 17, 2025, 1:42 p.m. UTC | #2 
Queued, thanks.

Paolo
diff mbox series

Patch

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();
-}