From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKmUG-0004n5-6e for qemu-devel@nongnu.org; Fri, 22 Aug 2014 06:54:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKmUA-0004bW-1x for qemu-devel@nongnu.org; Fri, 22 Aug 2014 06:54:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKmU9-0004bP-QY for qemu-devel@nongnu.org; Fri, 22 Aug 2014 06:54:21 -0400 From: Fam Zheng Date: Fri, 22 Aug 2014 18:54:20 +0800 Message-Id: <1408704863-12343-5-git-send-email-famz@redhat.com> In-Reply-To: <1408704863-12343-1-git-send-email-famz@redhat.com> References: <1408704863-12343-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/7] stubs: Merge set-fd-handler.c into iohandler.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, peter.crosthwaite@xilinx.com, mjt@tls.msk.ru, stefanha@redhat.com Signed-off-by: Fam Zheng --- 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