[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/32] stubs: group all monitor_fdset_* functions in
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 11/32] stubs: group all monitor_fdset_* functions in a single file |
Date: |
Mon, 16 Jan 2017 17:58:55 +0100 |
It makes little sense to implement only one of them, so avoid
proliferation of stubs files.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 1eec1fb..40b4e15 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 bf9e60a..0000000
--- 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 1d9caf3..0000000
--- 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 5325044..0000000
--- 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 47ea297..0000000
--- 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 0000000..6020cf2
--- /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)
+{
+}
--
2.9.3
- [Qemu-devel] [PULL v2 00/32] Misc patches for 2017-01-11, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 01/32] bugfix: vm halt when in reset looping, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 02/32] megasas: fix guest-triggered memory leak, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 03/32] qom: Make all interface types abstract, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 05/32] stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 04/32] smbios: filter based on CONFIG_SMBIOS rather than TARGET, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 06/32] stubs: move smbios stubs to hw/smbios, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 07/32] stubs: move acpi stubs to hw/acpi, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 08/32] stubs: remove unused stub for serial_hd, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 11/32] stubs: group all monitor_fdset_* functions in a single file,
Paolo Bonzini <=
- [Qemu-devel] [PULL 12/32] stubs: move vhost stubs to stubs/vhost.o, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 10/32] stubs: group stubs for user-mode emulation, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 09/32] hw: move reset handlers from vl.c to hw/core, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 13/32] event_notifier: cleanups around event_notifier_set_handler, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 14/32] build: remove --enable-colo/--disable-colo, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 15/32] stubs: remove stubs/kvm.c, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 16/32] acpi: filter based on CONFIG_ACPI_X86 rather than TARGET, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 20/32] qemu-thread: fix qemu_thread_set_name() race in qemu_thread_create(), Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 17/32] pc: fix crash in rtc_set_memory() if initial cpu is marked as hotplugged, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 18/32] scsi-block: fix direction of BYTCHK test for VERIFY commands, Paolo Bonzini, 2017/01/16