Skip to contentSkip to conversation

remove unmodified_drivers directory

PATCH In review Juergen Gross 3 participants 3 messages Jan 14, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remove unmodified_drivers directory

Having Linux kernel drivers for 2.6 based kernels in the Xen tree is not really needed any longer. So remove them from the tree.

In case anyone wants to look at them they are still available in older branches.

---
 .gitignore                                         |   4 -
 .hgignore                                          |   4 -
 MAINTAINERS                                        |   6 -
 unmodified_drivers/linux-2.6/Makefile              |   8 -
 unmodified_drivers/linux-2.6/README                |  24 -
 unmodified_drivers/linux-2.6/balloon/Kbuild        |   8 -
 unmodified_drivers/linux-2.6/balloon/Makefile      |   3 -
 unmodified_drivers/linux-2.6/blkfront/Kbuild       |   5 -
 unmodified_drivers/linux-2.6/blkfront/Makefile     |   3 -
 .../compat-include/asm-generic/pgtable-nopmd.h     |  14 -
 .../compat-include/asm-generic/pgtable-nopud.h     |  15 -
 .../linux-2.6/compat-include/linux/io.h            |  10 -
 .../linux-2.6/compat-include/linux/mutex.h         |  31 --
 .../linux-2.6/compat-include/linux/scatterlist.h   |  10 -
 .../linux-2.6/compat-include/xen/platform-compat.h | 183 -------
 unmodified_drivers/linux-2.6/mkbuildtree           | 100 ----
 unmodified_drivers/linux-2.6/netfront/Kbuild       |   5 -
 unmodified_drivers/linux-2.6/netfront/Makefile     |   3 -
 unmodified_drivers/linux-2.6/overrides.mk          |  18 -
 unmodified_drivers/linux-2.6/platform-pci/Kbuild   |  22 -
 unmodified_drivers/linux-2.6/platform-pci/Makefile |   3 -
 unmodified_drivers/linux-2.6/platform-pci/evtchn.c | 362 --------------
 .../linux-2.6/platform-pci/machine_reboot.c        | 114 -----
 .../linux-2.6/platform-pci/panic-handler.c         |  42 --
 .../linux-2.6/platform-pci/platform-compat.c       | 147 ------
 .../linux-2.6/platform-pci/platform-pci.c          | 531 ---------------------
 .../linux-2.6/platform-pci/platform-pci.h          |  31 --
 .../linux-2.6/platform-pci/xen_support.c           |  73 ---
 unmodified_drivers/linux-2.6/scsifront/Kbuild      |   6 -
 unmodified_drivers/linux-2.6/scsifront/Makefile    |   3 -
 unmodified_drivers/linux-2.6/usbfront/Kbuild       |   7 -
 unmodified_drivers/linux-2.6/usbfront/Makefile     |   3 -
 .../linux-2.6/xenbus/empty_directory               |   0
 33 files changed, 1798 deletions(-)
 delete mode 100644 unmodified_drivers/linux-2.6/Makefile
 delete mode 100644 unmodified_drivers/linux-2.6/README
 delete mode 100644 unmodified_drivers/linux-2.6/balloon/Kbuild
 delete mode 100644 unmodified_drivers/linux-2.6/balloon/Makefile
 delete mode 100644 unmodified_drivers/linux-2.6/blkfront/Kbuild
 delete mode 100644 unmodified_drivers/linux-2.6/blkfront/Makefile
 delete mode 100644 unmodified_drivers/linux-2.6/compat-include/asm-generic/pgtable-nopmd.h
 delete mode 100644 unmodified_drivers/linux-2.6/compat-include/asm-generic/pgtable-nopud.h
 delete mode 100644 unmodified_drivers/linux-2.6/compat-include/linux/io.h
 delete mode 100644 unmodified_drivers/linux-2.6/compat-include/linux/mutex.h
 delete mode 100644 unmodified_drivers/linux-2.6/compat-include/linux/scatterlist.h
 delete mode 100644 unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
 delete mode 100755 unmodified_drivers/linux-2.6/mkbuildtree
 delete mode 100644 unmodified_drivers/linux-2.6/netfront/Kbuild
 delete mode 100644 unmodified_drivers/linux-2.6/netfront/Makefile
 delete mode 100644 unmodified_drivers/linux-2.6/overrides.mk
 delete mode 100644 unmodified_drivers/linux-2.6/platform-pci/Kbuild
 delete mode 100644 unmodified_drivers/linux-2.6/platform-pci/Makefile
 delete mode 100644 unmodified_drivers/linux-2.6/platform-pci/evtchn.c
 delete mode 100644 unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
 delete mode 100644 unmodified_drivers/linux-2.6/platform-pci/panic-handler.c
 delete mode 100644 unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
 delete mode 100644 unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
 delete mode 100644 unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
 delete mode 100644 unmodified_drivers/linux-2.6/platform-pci/xen_support.c
 delete mode 100644 unmodified_drivers/linux-2.6/scsifront/Kbuild
 delete mode 100644 unmodified_drivers/linux-2.6/scsifront/Makefile
 delete mode 100644 unmodified_drivers/linux-2.6/usbfront/Kbuild
 delete mode 100644 unmodified_drivers/linux-2.6/usbfront/Makefile
 delete mode 100644 unmodified_drivers/linux-2.6/xenbus/empty_directory
.gitignore +0 -4
index 017856c93e..4ca679ddbc 100644
@@ -326,10 +326,6 @@ xen/xen
 xen/xen-syms
 xen/xen-syms.map
 xen/xen.*
-unmodified_drivers/linux-2.6/.tmp_versions
-unmodified_drivers/linux-2.6/*.cmd
-unmodified_drivers/linux-2.6/*.ko
-unmodified_drivers/linux-2.6/*.mod.c
 LibVNCServer*
 
 tools/qemu-xen-dir-remote
.hgignore +0 -4
index 10025c8793..2d41670632 100644
@@ -326,8 +326,4 @@
 ^xen/xen$
 ^xen/xen-syms$
 ^xen/xen\..*$
-^unmodified_drivers/linux-2.6/\.tmp_versions
-^unmodified_drivers/linux-2.6/.*\.cmd$
-^unmodified_drivers/linux-2.6/.*\.ko$
-^unmodified_drivers/linux-2.6/.*\.mod\.c$
 ^LibVNCServer.*
MAINTAINERS +0 -6
index d5bd83073c..01448b482e 100644
@@ -421,12 +421,6 @@ F:	*/configure
 F:	*/*.ac
 F:	tools/
 
-UNMODIFIED LINUX PV DRIVERS
-M:	Jan Beulich <[email protected]>
-S:	Obsolete
-L:	[email protected]
-F:	unmodified_drivers/linux-2.6/
-
 VM EVENT, MEM ACCESS and MONITOR
 M:	Tamas K Lengyel <[email protected]>
 R:	Alexandru Isaila <[email protected]>
unmodified_drivers/linux-2.6/Makefile deleted +0 -8
deleted file mode 100644
index a5c6967209..0000000000
@@ -1,8 +0,0 @@
-include $(M)/overrides.mk
-
-obj-m += platform-pci/
-obj-m += balloon/
-obj-m += blkfront/
-obj-m += netfront/
-obj-m += scsifront/
-obj-m += usbfront/
unmodified_drivers/linux-2.6/README deleted +0 -24
deleted file mode 100644
index 1d673eb50a..0000000000
@@ -1,24 +0,0 @@
-These drivers provide paravirtualised drivers for pre-PVops Linux
-kernels which have the classic-Xen patches applied. They do not work
-with kernels which are not patched with the classic-Xen patches. In
-particular this includes all PVops kernels.
-
-For 2.6.36 and newer you should use the "PVHVM" functionality which is
-available in the mainline kernel.
-
-To build do one of:
-
-   ./mkbuildtree [<arch>]
-   NB. You can override paths to Xen sources and a (stub) XenLinux
-       build tree via the XEN and XL environment variable.
-
-- or -
-   make -C /path/to/kernel/build M=$PWD modules
-   NB. This is your native kernel build tree (or a distro provided
-       stub), not the XenLinux sources referred to in step 1.
-   NB. If you are cross compiling, you need to set ARCH and
-       CROSS_COMPILE too.
-
-You get four modules, xen-platform-pci.ko, xen-vbd.ko, xen-vnif.ko and
-xen-balloon.ko.  Load xen-platform-pci first, and then
-whichever of xen-vbd, xen-vnif and xen-balloon.ko you happen to need.
unmodified_drivers/linux-2.6/balloon/Kbuild deleted +0 -8
deleted file mode 100644
index 316592d83a..0000000000
@@ -1,8 +0,0 @@
-include $(M)/overrides.mk
-
-obj-m  = xen-balloon.o
-
-EXTRA_CFLAGS += -I$(M)/platform-pci
-
-xen-balloon-y := balloon.o sysfs.o
-xen-balloon-$(CONFIG_XEN_SCRUB_PAGES) += scrub.o
unmodified_drivers/linux-2.6/balloon/Makefile deleted +0 -3
deleted file mode 100644
index 64e7acd194..0000000000
@@ -1,3 +0,0 @@
-ifneq ($(KERNELRELEASE),)
-include $(src)/Kbuild
-endif
unmodified_drivers/linux-2.6/blkfront/Kbuild deleted +0 -5
deleted file mode 100644
index 0a46fb22c3..0000000000
@@ -1,5 +0,0 @@
-include $(M)/overrides.mk
-
-obj-m += xen-vbd.o
-
-xen-vbd-objs := blkfront.o vbd.o
unmodified_drivers/linux-2.6/blkfront/Makefile deleted +0 -3
deleted file mode 100644
index 64e7acd194..0000000000
@@ -1,3 +0,0 @@
-ifneq ($(KERNELRELEASE),)
-include $(src)/Kbuild
-endif
unmodified_drivers/linux-2.6/compat-include/asm-generic/pgtable-nopmd.h deleted +0 -14
deleted file mode 100644
index ebde567575..0000000000
@@ -1,14 +0,0 @@
-#ifndef _PGTABLE_NOPMD_H
-#define _PGTABLE_NOPMD_H
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
-#error "This version of Linux should not need compat pgtable-nopmd.h"
-#endif
-
-#define pud_t             pgd_t
-#define pud_offset(d, va)     d
-#define pud_none(pud)         0
-#define pud_present(pud)      1
-#define PTRS_PER_PUD          1
-
-#endif /* _PGTABLE_NOPMD_H */
unmodified_drivers/linux-2.6/compat-include/asm-generic/pgtable-nopud.h deleted +0 -15
deleted file mode 100644
index 05c9675760..0000000000
@@ -1,15 +0,0 @@
-#ifndef _PGTABLE_NOPUD_H
-#define _PGTABLE_NOPUD_H
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
-#error "This version of Linux should not need compat pgtable-nopud.h"
-#endif
-
-#define pud_t             pgd_t
-#define pud_offset(d, va)     d
-#define pud_none(pud)         0
-#define pud_present(pud)      1
-#define pud_bad(pud)          0
-#define PTRS_PER_PUD          1
-
-#endif /* _PGTABLE_NOPUD_H */
unmodified_drivers/linux-2.6/compat-include/linux/io.h deleted +0 -10
deleted file mode 100644
index 10499023a5..0000000000
@@ -1,10 +0,0 @@
-#ifndef _LINUX_IO_H
-#define _LINUX_IO_H
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#error "This version of Linux should not need compat linux/io.h"
-#endif
-
-#include <asm/io.h>
-
-#endif
unmodified_drivers/linux-2.6/compat-include/linux/mutex.h deleted +0 -31
deleted file mode 100644
index fcb4a899c7..0000000000
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2006 Cisco Systems.  All rights reserved.
- *
- * This file is released under the GPLv2.
- */
-
-/* mutex compatibility for pre-2.6.16 kernels */
-
-#ifndef __LINUX_MUTEX_H
-#define __LINUX_MUTEX_H
-
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
-#error "This version of Linux should not need compat mutex.h"
-#endif
-
-#include <linux/version.h>
-#include <asm/semaphore.h>
-
-#define mutex semaphore
-#define DEFINE_MUTEX(foo) DECLARE_MUTEX(foo)
-#define mutex_init(foo) init_MUTEX(foo)
-#define mutex_lock(foo) down(foo)
-#define mutex_lock_interruptible(foo) down_interruptible(foo)
-/* this function follows the spin_trylock() convention, so        *
- * it is negated to the down_trylock() return values! Be careful  */
-#define mutex_trylock(foo) !down_trylock(foo)
-#define mutex_unlock(foo) up(foo)
-
-#endif /* __LINUX_MUTEX_H */
unmodified_drivers/linux-2.6/compat-include/linux/scatterlist.h deleted +0 -10
deleted file mode 100644
index e26a6acb51..0000000000
@@ -1,10 +0,0 @@
-#ifndef _LINUX_SCATTERLIST_H
-#define _LINUX_SCATTERLIST_H
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
-#error "This version of Linux should not need compat linux/scatterlist.h"
-#endif
-
-#include <asm/scatterlist.h>
-
-#endif /* _LINUX_SCATTERLIST_H */
unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h deleted +0 -183

183 lines not on this page · raw message

unmodified_drivers/linux-2.6/mkbuildtree deleted +0 -100

100 lines not on this page · raw message

unmodified_drivers/linux-2.6/netfront/Kbuild deleted +0 -5
deleted file mode 100644
index 486c2a0a77..0000000000
@@ -1,5 +0,0 @@
-include $(M)/overrides.mk
-
-obj-m  = xen-vnif.o
-xen-vnif-objs	:= netfront.o
-xen-vnif-objs	+= accel.o
unmodified_drivers/linux-2.6/netfront/Makefile deleted +0 -3
deleted file mode 100644
index 64e7acd194..0000000000
@@ -1,3 +0,0 @@
-ifneq ($(KERNELRELEASE),)
-include $(src)/Kbuild
-endif
unmodified_drivers/linux-2.6/overrides.mk deleted +0 -18
deleted file mode 100644
index 803eccd3be..0000000000
@@ -1,18 +0,0 @@
-# Hack: we need to use the config which was used to build the kernel,
-# except that that won't have the right headers etc., so duplicate
-# some of the mach-xen infrastructure in here.
-#
-# (i.e. we need the native config for things like -mregparm, but
-# a Xen kernel to find the right headers)
-_XEN_CPPFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030205
-_XEN_CPPFLAGS += -DCONFIG_XEN_COMPAT=0xffffff
-_XEN_CPPFLAGS += -I$(M)/include -I$(M)/compat-include -DHAVE_XEN_PLATFORM_COMPAT_H
-ifeq ($(ARCH),ia64)
-  _XEN_CPPFLAGS += -DCONFIG_VMX_GUEST
-endif
-
-_XEN_CPPFLAGS += -include $(wildcard $(objtree)/include/*/autoconf.h)
-
-EXTRA_CFLAGS += $(_XEN_CPPFLAGS)
-EXTRA_AFLAGS += $(_XEN_CPPFLAGS)
-CPPFLAGS := -I$(M)/include $(CPPFLAGS)
unmodified_drivers/linux-2.6/platform-pci/Kbuild deleted +0 -22
deleted file mode 100644
index 7b332ee804..0000000000
@@ -1,22 +0,0 @@
-include $(M)/overrides.mk
-
-obj-m := xen-platform-pci.o
-
-EXTRA_CFLAGS += -I$(M)/platform-pci
-
-xen-platform-pci-objs := evtchn.o platform-pci.o gnttab.o xen_support.o
-xen-platform-pci-objs += features.o platform-compat.o
-xen-platform-pci-objs += reboot.o machine_reboot.o
-xen-platform-pci-objs += panic-handler.o
-
-xen-platform-pci-objs += ../xenbus/xenbus_comms.o
-xen-platform-pci-objs += ../xenbus/xenbus_xs.o
-xen-platform-pci-objs += ../xenbus/xenbus_probe.o 
-xen-platform-pci-objs += ../xenbus/xenbus_dev.o 
-xen-platform-pci-objs += ../xenbus/xenbus_client.o 
-xen-platform-pci-objs += ../xenbus/xen_proc.o
-
-# Can we do better ?
-ifeq ($(ARCH),ia64)
-  xen-platform-pci-objs += xencomm.o xencomm_arch.o xcom_hcall.o xcom_asm.o
-endif
unmodified_drivers/linux-2.6/platform-pci/Makefile deleted +0 -3
deleted file mode 100644
index 64e7acd194..0000000000
@@ -1,3 +0,0 @@
-ifneq ($(KERNELRELEASE),)
-include $(src)/Kbuild
-endif
unmodified_drivers/linux-2.6/platform-pci/evtchn.c deleted +0 -362

362 lines not on this page · raw message

unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c deleted +0 -114

114 lines not on this page · raw message

unmodified_drivers/linux-2.6/platform-pci/panic-handler.c deleted +0 -42

42 lines not on this page · raw message

unmodified_drivers/linux-2.6/platform-pci/platform-compat.c deleted +0 -147

147 lines not on this page · raw message

unmodified_drivers/linux-2.6/platform-pci/platform-pci.c deleted +0 -531

531 lines not on this page · raw message

unmodified_drivers/linux-2.6/platform-pci/platform-pci.h deleted +0 -31
deleted file mode 100644
index b834700f97..0000000000
@@ -1,31 +0,0 @@
-/******************************************************************************
- * platform-pci.h
- * 
- * Xen platform PCI device driver
- * Copyright (c) 2004, Intel Corporation. <[email protected]>
- * Copyright (c) 2007, XenSource Inc.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _XEN_PLATFORM_PCI_H
-#define _XEN_PLATFORM_PCI_H
-
-#include <linux/pci.h>
-
-unsigned long alloc_xen_mmio(unsigned long len);
-void platform_pci_resume(void);
-
-extern struct pci_dev *xen_platform_pdev;
-
-#endif /* _XEN_PLATFORM_PCI_H */
unmodified_drivers/linux-2.6/platform-pci/xen_support.c deleted +0 -73

73 lines not on this page · raw message

unmodified_drivers/linux-2.6/scsifront/Kbuild deleted +0 -6
deleted file mode 100644
index 14875b3bca..0000000000
@@ -1,6 +0,0 @@
-include $(M)/overrides.mk
-
-obj-m += xen-scsi.o
-
-xen-scsi-objs := scsifront.o xenbus.o
-
unmodified_drivers/linux-2.6/scsifront/Makefile deleted +0 -3
deleted file mode 100644
index 64e7acd194..0000000000
@@ -1,3 +0,0 @@
-ifneq ($(KERNELRELEASE),)
-include $(src)/Kbuild
-endif
unmodified_drivers/linux-2.6/usbfront/Kbuild deleted +0 -7
deleted file mode 100644
index 321a35a122..0000000000
@@ -1,7 +0,0 @@
-include $(M)/overrides.mk
-
-obj-m += $(if $(shell grep '^\#include "\.\./\.\./' $(obj)/usbfront.h), \
-	      $(warning usbfront cannot be built), \
-	      xen-usb.o)
-
-xen-usb-objs := usbfront-hcd.o xenbus.o
unmodified_drivers/linux-2.6/usbfront/Makefile deleted +0 -3
deleted file mode 100644
index 64e7acd194..0000000000
@@ -1,3 +0,0 @@
-ifneq ($(KERNELRELEASE),)
-include $(src)/Kbuild
-endif
unmodified_drivers/linux-2.6/xenbus/empty_directory deleted +0 -0
deleted file mode 100644
index e69de29bb2..0000000000
Signature · 7 lines
2.16.4


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#1 lore raw
Quoted 7 lines · Juergen Gross

Having Linux kernel drivers for 2.6 based kernels in the Xen tree is not really needed any longer. So remove them from the tree.

In case anyone wants to look at them they are still available in older branches.

Nice diffstat. ;-)

Ultimately I think Jan is the one who needs to ack this patch.

Wei.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

Acked-by on v1 1/1
#2 lore raw
In reply to Juergen Gross
Quoted 7 lines · Juergen Gross

Having Linux kernel drivers for 2.6 based kernels in the Xen tree is not really needed any longer. So remove them from the tree.

In case anyone wants to look at them they are still available in older branches.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel