ia64/xen-unstable

changeset 2525:fb37bc47ff05

bitkeeper revision 1.1159.83.2 (41531e67elxwliWniLaHV5bOgAsyHQ)

2.4 migration fixes (config options were added to 2.6, but not 2.4, the result being that devices were not reconnected after a migration)
author iap10@labyrinth.cl.cam.ac.uk
date Thu Sep 23 19:05:11 2004 +0000 (2004-09-23)
parents a33e97958db8
children d2d465977f58
files linux-2.4.27-xen-sparse/arch/xen/config.in linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0 linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile linux-2.4.27-xen-sparse/arch/xen/drivers/netif/Makefile
line diff
     1.1 --- a/linux-2.4.27-xen-sparse/arch/xen/config.in	Thu Sep 23 16:27:34 2004 +0000
     1.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/config.in	Thu Sep 23 19:05:11 2004 +0000
     1.3 @@ -17,6 +17,8 @@ comment 'Xen'
     1.4  bool 'Support for privileged operations (domain 0)' CONFIG_XEN_PRIVILEGED_GUEST
     1.5  bool 'Device-driver domain (physical device access)' CONFIG_XEN_PHYSDEV_ACCESS
     1.6  bool 'Scrub memory before freeing it to Xen' CONFIG_XEN_SCRUB_PAGES
     1.7 +bool 'Network-device frontend driver' CONFIG_XEN_NETDEV_FRONTEND
     1.8 +bool 'Block-device frontend driver' CONFIG_XEN_BLKDEV_FRONTEND
     1.9  endmenu
    1.10  # The IBM S/390 patch needs this.
    1.11  define_bool CONFIG_NO_IDLE_HZ y
     2.1 --- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0	Thu Sep 23 16:27:34 2004 +0000
     2.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xen0	Thu Sep 23 19:05:11 2004 +0000
     2.3 @@ -13,6 +13,8 @@ CONFIG_UID16=y
     2.4  CONFIG_XEN_PRIVILEGED_GUEST=y
     2.5  CONFIG_XEN_PHYSDEV_ACCESS=y
     2.6  CONFIG_XEN_SCRUB_PAGES=y
     2.7 +CONFIG_XEN_NETDEV_FRONTEND=y
     2.8 +CONFIG_XEN_BLKDEV_FRONTEND=y
     2.9  CONFIG_NO_IDLE_HZ=y
    2.10  CONFIG_FOREIGN_PAGES=y
    2.11  
     3.1 --- a/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU	Thu Sep 23 16:27:34 2004 +0000
     3.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/defconfig-xenU	Thu Sep 23 19:05:11 2004 +0000
     3.3 @@ -1,5 +1,5 @@
     3.4  #
     3.5 -# Automatically generated make config: don't edit
     3.6 +# Automatically generated by make menuconfig: don't edit
     3.7  #
     3.8  CONFIG_XEN=y
     3.9  CONFIG_X86=y
    3.10 @@ -13,6 +13,8 @@ CONFIG_UID16=y
    3.11  # CONFIG_XEN_PRIVILEGED_GUEST is not set
    3.12  # CONFIG_XEN_PHYSDEV_ACCESS is not set
    3.13  CONFIG_XEN_SCRUB_PAGES=y
    3.14 +CONFIG_XEN_NETDEV_FRONTEND=y
    3.15 +CONFIG_XEN_BLKDEV_FRONTEND=y
    3.16  CONFIG_NO_IDLE_HZ=y
    3.17  # CONFIG_FOREIGN_PAGES is not set
    3.18  CONFIG_NETDEVICES=y
    3.19 @@ -152,10 +154,6 @@ CONFIG_IP_NF_TARGET_ULOG=y
    3.20  # CONFIG_IP_SCTP is not set
    3.21  # CONFIG_ATM is not set
    3.22  # CONFIG_VLAN_8021Q is not set
    3.23 -
    3.24 -#
    3.25 -#  
    3.26 -#
    3.27  # CONFIG_IPX is not set
    3.28  # CONFIG_ATALK is not set
    3.29  
    3.30 @@ -188,20 +186,12 @@ CONFIG_IP_NF_TARGET_ULOG=y
    3.31  # SCSI support
    3.32  #
    3.33  CONFIG_SCSI=y
    3.34 -
    3.35 -#
    3.36 -# SCSI support type (disk, tape, CD-ROM)
    3.37 -#
    3.38  CONFIG_BLK_DEV_SD=y
    3.39  CONFIG_SD_EXTRA_DEVS=40
    3.40  # CONFIG_CHR_DEV_ST is not set
    3.41  # CONFIG_CHR_DEV_OSST is not set
    3.42  # CONFIG_BLK_DEV_SR is not set
    3.43  CONFIG_CHR_DEV_SG=y
    3.44 -
    3.45 -#
    3.46 -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
    3.47 -#
    3.48  # CONFIG_SCSI_DEBUG_QUEUES is not set
    3.49  # CONFIG_SCSI_MULTI_LUN is not set
    3.50  # CONFIG_SCSI_CONSTANTS is not set
    3.51 @@ -313,10 +303,6 @@ CONFIG_PSMOUSE=y
    3.52  # CONFIG_INPUT_EMU10K1 is not set
    3.53  # CONFIG_INPUT_SERIO is not set
    3.54  # CONFIG_INPUT_SERPORT is not set
    3.55 -
    3.56 -#
    3.57 -# Joysticks
    3.58 -#
    3.59  # CONFIG_INPUT_ANALOG is not set
    3.60  # CONFIG_INPUT_A3D is not set
    3.61  # CONFIG_INPUT_ADI is not set
     4.1 --- a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile	Thu Sep 23 16:27:34 2004 +0000
     4.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/Makefile	Thu Sep 23 19:05:11 2004 +0000
     4.3 @@ -1,8 +1,8 @@
     4.4  
     4.5  O_TARGET := drv.o
     4.6  
     4.7 -subdir-y += frontend
     4.8 -obj-y    += frontend/drv.o
     4.9 +subdir-$(CONFIG_XEN_NETDEV_FRONTEND) += frontend
    4.10 +obj-$(CONFIG_XEN_NETDEV_FRONTEND)    += frontend/drv.o
    4.11  
    4.12  subdir-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend
    4.13  obj-$(CONFIG_XEN_PHYSDEV_ACCESS)    += backend/drv.o
     5.1 --- a/linux-2.4.27-xen-sparse/arch/xen/drivers/netif/Makefile	Thu Sep 23 16:27:34 2004 +0000
     5.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/netif/Makefile	Thu Sep 23 19:05:11 2004 +0000
     5.3 @@ -1,8 +1,8 @@
     5.4  
     5.5  O_TARGET := drv.o
     5.6  
     5.7 -subdir-y += frontend
     5.8 -obj-y    += frontend/drv.o
     5.9 +subdir-$(CONFIG_XEN_NETDEV_FRONTEND) += frontend
    5.10 +obj-$(CONFIG_XEN_NETDEV_FRONTEND)    += frontend/drv.o
    5.11  
    5.12  subdir-$(CONFIG_XEN_PHYSDEV_ACCESS) += backend
    5.13  obj-$(CONFIG_XEN_PHYSDEV_ACCESS)    += backend/drv.o