From: Jack Lange Date: Wed, 5 May 2010 22:24:18 +0000 (-0500) Subject: removed ugly module support X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=a2a0fa76463240ad880131840bd2073b71a6aee1;hp=6a831c7687ac2c0fb2d94a2c5d3911ad1bcafc85;p=palacios.git removed ugly module support --- diff --git a/Kconfig b/Kconfig index fbed666..913dd5e 100644 --- a/Kconfig +++ b/Kconfig @@ -210,13 +210,6 @@ menuconfig SYMMOD help Enable Symbiotic module loading -if SYMMOD - -source "modules/Kconfig" - -endif - - endmenu diff --git a/modules/Kconfig b/modules/Kconfig deleted file mode 100644 index 11cdb34..0000000 --- a/modules/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -source "./modules/linux_mods/Kconfig" -source "./modules/v3_mods/Kconfig" \ No newline at end of file diff --git a/modules/linux_mods/Kconfig b/modules/linux_mods/Kconfig deleted file mode 100644 index 3869f46..0000000 --- a/modules/linux_mods/Kconfig +++ /dev/null @@ -1,31 +0,0 @@ - - - -config LNX_KERN_MODS - bool "Linux kernel modules" - select LNX_MOD_32BIT - select LNX_MOD_64BIT - - - - - -config LNX_MOD_32BIT - bool "32 bit modules" - depends on LNX_KERN_MODS - -config LNX_MOD_32BIT_TEST - bool "Linux (i386) test module" - default y if SYMMOD - depends on LNX_MOD_32BIT - help - This is a simple 32 bit test Linux kernel module - - - - -config LNX_MOD_64BIT - bool "64 bit modules" - depends on LNX_KERN_MODS - default y - diff --git a/modules/linux_mods/i386/Kconfig b/modules/linux_mods/i386/Kconfig deleted file mode 100644 index 28ed4da..0000000 --- a/modules/linux_mods/i386/Kconfig +++ /dev/null @@ -1,20 +0,0 @@ - - - -config LINUX_KERN_MODS - bool "Include Linux kernel modules" - depends on SYMMOD - -if LINUX_KERN_MODS - -config LINUX_TEST_MODULE - bool "Linux test module" - default y if SYMMOD - depends on SYMMOD - help - This is a simple test linux kernel module - - - - -endif diff --git a/modules/linux_mods/i386/Makefile b/modules/linux_mods/i386/Makefile deleted file mode 100644 index cdcc933..0000000 --- a/modules/linux_mods/i386/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_LNX_MOD_32BIT) += binaries.o headers.o \ No newline at end of file diff --git a/modules/linux_mods/i386/binaries.S b/modules/linux_mods/i386/binaries.S deleted file mode 100644 index 753b01b..0000000 --- a/modules/linux_mods/i386/binaries.S +++ /dev/null @@ -1,35 +0,0 @@ -#; -*- fundamental -*- - -/* - * This file is part of the Palacios Virtual Machine Monitor developed - * by the V3VEE Project with funding from the United States National - * Science Foundation and the Department of Energy. - * - * The V3VEE Project is a joint project between Northwestern University - * and the University of New Mexico. You can find out more at - * http://www.v3vee.org - * - * Copyright (c) 2010, Jack Lange - * Copyright (c) 2010, The V3VEE Project - * All rights reserved. - * - * Author: Jack Lange - * - * This is free software. You are permitted to use, - * redistribute, and modify it as specified in the file "V3VEE_LICENSE". - */ - -.data - -#define TOSTR(str) #str -#define MOD_DIR(name) TOSTR(./modules/linux_mods/i386/binaries/name) - - -#ifdef CONFIG_LNX_MOD_32BIT_TEST -.globl v3_lnx_mod_32bit_test_start -v3_lnx_mod_32bit_test_start: -.incbin MOD_DIR(test.ko) -.globl v3_lnx_mod_32bit_test_stop -v3_lnx_mod_32bit_test_stop: -#endif - diff --git a/modules/linux_mods/i386/binaries/test.ko b/modules/linux_mods/i386/binaries/test.ko deleted file mode 100644 index e5af2d2..0000000 Binary files a/modules/linux_mods/i386/binaries/test.ko and /dev/null differ diff --git a/modules/linux_mods/i386/headers.c b/modules/linux_mods/i386/headers.c deleted file mode 100644 index 83b5317..0000000 --- a/modules/linux_mods/i386/headers.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the Palacios Virtual Machine Monitor developed - * by the V3VEE Project with funding from the United States National - * Science Foundation and the Department of Energy. - * - * The V3VEE Project is a joint project between Northwestern University - * and the University of New Mexico. You can find out more at - * http://www.v3vee.org - * - * Copyright (c) 2010, Jack Lange - * Copyright (c) 2010, The V3VEE Project - * All rights reserved. - * - * Author: Jack Lange - * - * This is free software. You are permitted to use, - * redistribute, and modify it as specified in the file "V3VEE_LICENSE". - */ - -#include - - - -#ifdef CONFIG_LNX_MOD_32BIT_TEST -extern uint8_t v3_lnx_mod_32bit_test_start[]; -extern uint8_t v3_lnx_mod_32bit_test_stop[]; - -register_module("test_32", v3_lnx_mod_32bit_test_start, v3_lnx_mod_32bit_test_stop, V3_SYMMOD_LNX); -#endif diff --git a/modules/v3_mods/Kconfig b/modules/v3_mods/Kconfig deleted file mode 100644 index 5003358..0000000 --- a/modules/v3_mods/Kconfig +++ /dev/null @@ -1,31 +0,0 @@ - - - -config V3_MODS - bool "V3VEE Symbiotic modules" - select V3_MOD_32BIT - select V3_MOD_64BIT - - - - - -config V3_MOD_32BIT - bool "32 bit modules" - depends on V3_MODS - -config V3_MOD_32BIT_TEST - bool "V3 Sym (i386) test module" - default y if SYMMOD - depends on V3_MOD_32BIT - help - This is a simple 32 bit test Symbiotic Module - - - - -config V3_MOD_64BIT - bool "64 bit modules" - depends on V3_MODS - default y - diff --git a/modules/v3_mods/i386/Kconfig b/modules/v3_mods/i386/Kconfig deleted file mode 100644 index 28ed4da..0000000 --- a/modules/v3_mods/i386/Kconfig +++ /dev/null @@ -1,20 +0,0 @@ - - - -config LINUX_KERN_MODS - bool "Include Linux kernel modules" - depends on SYMMOD - -if LINUX_KERN_MODS - -config LINUX_TEST_MODULE - bool "Linux test module" - default y if SYMMOD - depends on SYMMOD - help - This is a simple test linux kernel module - - - - -endif diff --git a/modules/v3_mods/i386/Makefile b/modules/v3_mods/i386/Makefile deleted file mode 100644 index cdcc933..0000000 --- a/modules/v3_mods/i386/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_LNX_MOD_32BIT) += binaries.o headers.o \ No newline at end of file diff --git a/modules/v3_mods/i386/binaries.S b/modules/v3_mods/i386/binaries.S deleted file mode 100644 index 90c2ea3..0000000 --- a/modules/v3_mods/i386/binaries.S +++ /dev/null @@ -1,35 +0,0 @@ -#; -*- fundamental -*- - -/* - * This file is part of the Palacios Virtual Machine Monitor developed - * by the V3VEE Project with funding from the United States National - * Science Foundation and the Department of Energy. - * - * The V3VEE Project is a joint project between Northwestern University - * and the University of New Mexico. You can find out more at - * http://www.v3vee.org - * - * Copyright (c) 2010, Jack Lange - * Copyright (c) 2010, The V3VEE Project - * All rights reserved. - * - * Author: Jack Lange - * - * This is free software. You are permitted to use, - * redistribute, and modify it as specified in the file "V3VEE_LICENSE". - */ - -.data - -#define TOSTR(str) #str -#define MOD_DIR(name) TOSTR(./modules/v3_mods/i386/binaries/name) - - -#ifdef CONFIG_V3_MOD_32BIT_TEST -.globl v3_mod_32bit_test_start -v3_mod_32bit_test_start: -.incbin MOD_DIR(test.vo) -.globl v3_mod_32bit_test_stop -v3_mod_32bit_test_stop: -#endif - diff --git a/modules/v3_mods/i386/headers.c b/modules/v3_mods/i386/headers.c deleted file mode 100644 index e9daaa5..0000000 --- a/modules/v3_mods/i386/headers.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This file is part of the Palacios Virtual Machine Monitor developed - * by the V3VEE Project with funding from the United States National - * Science Foundation and the Department of Energy. - * - * The V3VEE Project is a joint project between Northwestern University - * and the University of New Mexico. You can find out more at - * http://www.v3vee.org - * - * Copyright (c) 2010, Jack Lange - * Copyright (c) 2010, The V3VEE Project - * All rights reserved. - * - * Author: Jack Lange - * - * This is free software. You are permitted to use, - * redistribute, and modify it as specified in the file "V3VEE_LICENSE". - */ - -#include - - - -#ifdef CONFIG_V3_MOD_32BIT_TEST -extern uint8_t v3_mod_32bit_test_start[]; -extern uint8_t v3_mod_32bit_test_stop[]; - -register_module("v3_test_32", v3_mod_32bit_test_start, v3_mod_32bit_test_stop, V3_SYMMOD_MOD); -#endif