[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/7] stubs: Merge set-fd-handler.c into iohandler
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v2 4/7] stubs: Merge set-fd-handler.c into iohandler.c |
Date: |
Fri, 22 Aug 2014 18:54:20 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
stubs/Makefile.objs | 1 -
stubs/iohandler.c | 9 +++++++++
stubs/set-fd-handler.c | 11 -----------
3 files changed, 9 insertions(+), 12 deletions(-)
delete mode 100644 stubs/set-fd-handler.c
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index d9cad1b..2489c17 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -29,7 +29,6 @@ stub-obj-$(CONFIG_SPICE) += qemu-chr-open-spice.o
stub-obj-y += qtest.o
stub-obj-y += reset.o
stub-obj-y += runstate-check.o
-stub-obj-y += set-fd-handler.o
stub-obj-y += slirp.o
stub-obj-y += sysbus.o
stub-obj-y += uuid.o
diff --git a/stubs/iohandler.c b/stubs/iohandler.c
index 97c0ce5..31b8b0f 100644
--- a/stubs/iohandler.c
+++ b/stubs/iohandler.c
@@ -18,3 +18,12 @@ int qemu_set_fd_handler(int fd,
{
abort();
}
+
+int qemu_set_fd_handler2(int fd,
+ IOCanReadHandler *fd_read_poll,
+ IOHandler *fd_read,
+ IOHandler *fd_write,
+ void *opaque)
+{
+ abort();
+}
diff --git a/stubs/set-fd-handler.c b/stubs/set-fd-handler.c
deleted file mode 100644
index fc874d3..0000000
--- a/stubs/set-fd-handler.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "qemu-common.h"
-#include "qemu/main-loop.h"
-
-int qemu_set_fd_handler2(int fd,
- IOCanReadHandler *fd_read_poll,
- IOHandler *fd_read,
- IOHandler *fd_write,
- void *opaque)
-{
- abort();
-}
--
2.0.3
- [Qemu-devel] [PATCH v2 0/7] build-sys: Fix iscsi module loading failure, Fam Zheng, 2014/08/22
- [Qemu-devel] [PATCH v2 1/7] build-sys: Move fifo8.c to hw/misc, Fam Zheng, 2014/08/22
- [Qemu-devel] [PATCH v2 2/7] configure: Add -lutil to libs_qga if necessary, Fam Zheng, 2014/08/22
- [Qemu-devel] [PATCH v2 3/7] stubs: Add iohandler.c, Fam Zheng, 2014/08/22
- [Qemu-devel] [PATCH v2 4/7] stubs: Merge set-fd-handler.c into iohandler.c,
Fam Zheng <=
- [Qemu-devel] [PATCH v2 6/7] build-sys: Change libqemuutil.a to qemuutil.o and link whole object, Fam Zheng, 2014/08/22
- [Qemu-devel] [PATCH v2 5/7] util: Move throttle.c out to top level, Fam Zheng, 2014/08/22
- [Qemu-devel] [PATCH v2 7/7] iscsi: Move iqn generation code to util, Fam Zheng, 2014/08/22
- Re: [Qemu-devel] [PATCH v2 0/7] build-sys: Fix iscsi module loading failure, Stefan Hajnoczi, 2014/08/22