compel: plugins -- Merge fds plugin into std

We use fds helpers in std plugin anyway
so just merge it in.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

compel/plugins/Makefile

@@ -34,11 +34,6 @@ asflags-y		+= -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer
 asflags-y		+= -fno-stack-protector
 ldflags-y		+= -z noexecstack
 
-#
-# Fds plugin
-target			+= fds
-fds-obj-y		+= fds/fds.o
-
 #
 # Shmem plugin
 target			+= shmem
@@ -48,6 +43,7 @@ shmem-obj-y		+= shmem/shmem.o
 # STD plugin
 target			+= std
 std-obj-y		+= std/std.o
+std-obj-y		+= std/fds.o
 std-obj-y		+= std/log.o
 std-obj-y		+= std/string.o
 std-obj-y		+= std/infect.o
@@ -71,11 +67,10 @@ $(foreach t,$(target),$(eval $(call syscall-priority,$(t)-obj-y,std-headers-deps
 #
 # FIXME syscall-types.h should be setup earlier
 #
-install: compel/plugins/std.built-in.o compel/plugins/fds.built-in.o
+install: compel/plugins/std.built-in.o
 	$(E) "  INSTALL " compel plugins
 	$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)/compel/
 	$(Q) install -m 0644 compel/plugins/std.built-in.o $(DESTDIR)$(LIBEXECDIR)/compel/
-	$(Q) install -m 0644 compel/plugins/fds.built-in.o $(DESTDIR)$(LIBEXECDIR)/compel/
 	$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)/compel/scripts
 	$(Q) install -m 0644 compel/arch/$(ARCH)/scripts/compel-pack.lds.S $(DESTDIR)$(LIBEXECDIR)/compel/scripts
 	$(E) "  INSTALL " compel plugins uapi
@@ -83,13 +78,11 @@ install: compel/plugins/std.built-in.o compel/plugins/fds.built-in.o
 	$(Q) cp -fr compel/include/uapi/compel/plugins/plugin-std.h $(DESTDIR)$(INCLUDEDIR)/compel/plugins
 	$(Q) cp -fr compel/include/uapi/compel/plugins/std/*.h $(DESTDIR)$(INCLUDEDIR)/compel/plugins/std
 	$(Q) cp -fr compel/arch/$(ARCH)/plugins/include/asm/syscall-types.h $(DESTDIR)$(INCLUDEDIR)/compel/plugins/std/asm
-	$(Q) cp -fr compel/include/uapi/compel/plugins/plugin-fds.h $(DESTDIR)$(INCLUDEDIR)/compel/plugins
 .PHONY: install
 
 uninstall:
 	$(E) " UNINSTALL" compel plugins
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(LIBEXECDIR)/compel/,std.built-in.o)
-	$(Q) $(RM) $(addprefix $(DESTDIR)$(LIBEXECDIR)/compel/,fds.built-in.o)
 	$(Q) $(RM) $(addprefix $(DESTDIR)$(LIBEXECDIR)/compel/scripts,compel-pack.lds.S)
 	$(E) " UNINSTALL" compel and plugins uapi
 	$(Q) $(RM) -rf $(addprefix $(DESTDIR)$(INCLUDEDIR),compel/plugins)

compel/plugins/include/uapi/plugin-fds.h

-/*
- * plugin-fds.h -- API for fds compel plugin
- */
-
-#ifndef __COMPEL_PLUGIN_FDS_H__
-#define __COMPEL_PLUGIN_FDS_H__
-
-#include <sys/un.h>
-
-#include <compel/common/scm.h>
-
-#endif /* __COMPEL_PLUGIN_FDS_H__ */

compel/plugins/include/uapi/plugin-std.h

@@ -5,5 +5,6 @@
 #include <compel/plugins/std/syscall.h>
 #include <compel/plugins/std/string.h>
 #include <compel/plugins/std/infect.h>
+#include <compel/plugins/std/fds.h>
 
 #endif /* COMPEL_PLUGIN_STD_STD_H__ */

compel/plugins/include/uapi/std/fds.h

+#ifndef COMPEL_PLUGIN_STD_FDS_H__
+#define COMPEL_PLUGIN_STD_FDS_H__
+
+#include <sys/un.h>
+#include <compel/common/scm.h>
+
+#endif /* COMPEL_PLUGIN_STD_FDS_H__ */

compel/plugins/fds/fds.c → compel/plugins/std/fds.c

@@ -5,7 +5,7 @@
 #include "uapi/std/syscall.h"
 #include "uapi/std/string.h"
 #include "uapi/std/log.h"
-#include "uapi/plugin-fds.h"
+#include "uapi/std/fds.h"
 
 #include "std-priv.h"
 
@@ -18,5 +18,3 @@
 #define __memcpy	std_memcpy
 
 #include "common/scm-code.c"
-
-PLUGIN_REGISTER_DUMMY(fds)

compel/plugins/std/infect.c

@@ -2,7 +2,7 @@
 #include <compel/plugins/std/infect.h>
 
 #include "common/scm.h"
-#include "uapi/compel/plugins/plugin-fds.h"
+#include "uapi/compel/plugins/std/fds.h"
 #include "uapi/compel/plugins/std/string.h"
 #include "uapi/compel/plugins/std/log.h"
 

compel/src/lib/infect-util.c

@@ -2,7 +2,7 @@
 #include "common/bug.h"
 #include "common/lock.h"
 
-#include "uapi/compel/plugins/plugin-fds.h"
+#include "uapi/compel/plugins/std/fds.h"
 
 #include "infect-rpc.h"
 #include "infect-util.h"