From 858d436665519095eb593081f8efd68ddc579b45 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 24 Oct 2016 10:52:35 +0200 Subject: [PATCH] stubs: group all monitor_fdset_* functions in a single file It makes little sense to implement only one of them, so avoid proliferation of stubs files. Signed-off-by: Paolo Bonzini --- stubs/Makefile.objs | 5 +---- stubs/fdset-add-fd.c | 8 -------- stubs/fdset-find-fd.c | 8 -------- stubs/fdset-get-fd.c | 8 -------- stubs/fdset-remove-fd.c | 7 ------- stubs/fdset.c | 22 ++++++++++++++++++++++ 6 files changed, 23 insertions(+), 35 deletions(-) delete mode 100644 stubs/fdset-add-fd.c delete mode 100644 stubs/fdset-find-fd.c delete mode 100644 stubs/fdset-get-fd.c delete mode 100644 stubs/fdset-remove-fd.c create mode 100644 stubs/fdset.c diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 1eec1fb9a1..40b4e15564 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -10,10 +10,7 @@ stub-obj-y += cpu-get-clock.o stub-obj-y += cpu-get-icount.o stub-obj-y += dump.o stub-obj-y += error-printf.o -stub-obj-y += fdset-add-fd.o -stub-obj-y += fdset-find-fd.o -stub-obj-y += fdset-get-fd.o -stub-obj-y += fdset-remove-fd.o +stub-obj-y += fdset.o stub-obj-y += gdbstub.o stub-obj-y += get-vm-name.o stub-obj-y += iothread.o diff --git a/stubs/fdset-add-fd.c b/stubs/fdset-add-fd.c deleted file mode 100644 index bf9e60aed5..0000000000 --- a/stubs/fdset-add-fd.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "monitor/monitor.h" - -int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd) -{ - return -1; -} diff --git a/stubs/fdset-find-fd.c b/stubs/fdset-find-fd.c deleted file mode 100644 index 1d9caf37ec..0000000000 --- a/stubs/fdset-find-fd.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "monitor/monitor.h" - -int monitor_fdset_dup_fd_find(int dup_fd) -{ - return -1; -} diff --git a/stubs/fdset-get-fd.c b/stubs/fdset-get-fd.c deleted file mode 100644 index 5325044b5a..0000000000 --- a/stubs/fdset-get-fd.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "monitor/monitor.h" - -int monitor_fdset_get_fd(int64_t fdset_id, int flags) -{ - return -1; -} diff --git a/stubs/fdset-remove-fd.c b/stubs/fdset-remove-fd.c deleted file mode 100644 index 47ea297210..0000000000 --- a/stubs/fdset-remove-fd.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu-common.h" -#include "monitor/monitor.h" - -void monitor_fdset_dup_fd_remove(int dupfd) -{ -} diff --git a/stubs/fdset.c b/stubs/fdset.c new file mode 100644 index 0000000000..6020cf28c8 --- /dev/null +++ b/stubs/fdset.c @@ -0,0 +1,22 @@ +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "monitor/monitor.h" + +int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd) +{ + return -1; +} + +int monitor_fdset_dup_fd_find(int dup_fd) +{ + return -1; +} + +int monitor_fdset_get_fd(int64_t fdset_id, int flags) +{ + return -1; +} + +void monitor_fdset_dup_fd_remove(int dupfd) +{ +}