ia64/xen-unstable

changeset 1479:268d475892cc

bitkeeper revision 1.967 (40ceeb92vNfaaKBynIvwxTk_bFH78w)

Change default unprivileged linux-xen config.
author iap10@labyrinth.cl.cam.ac.uk
date Tue Jun 15 12:29:06 2004 +0000 (2004-06-15)
parents b442c789c93e
children fc5d9f57f546 72b8fe8a4636
files linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU linux-2.4.26-xen-sparse/arch/xen/drivers/console/console.c
line diff
     1.1 --- a/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU	Tue Jun 15 09:59:37 2004 +0000
     1.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/defconfig-xenU	Tue Jun 15 12:29:06 2004 +0000
     1.3 @@ -10,14 +10,14 @@ CONFIG_UID16=y
     1.4  #
     1.5  # Xen
     1.6  #
     1.7 -CONFIG_XEN_PRIVILEGED_GUEST=y
     1.8 +# CONFIG_XEN_PRIVILEGED_GUEST is not set
     1.9  # CONFIG_XEN_PHYSDEV_ACCESS is not set
    1.10  CONFIG_NO_IDLE_HZ=y
    1.11  
    1.12  #
    1.13  # Code maturity level options
    1.14  #
    1.15 -# CONFIG_EXPERIMENTAL is not set
    1.16 +CONFIG_EXPERIMENTAL=y
    1.17  
    1.18  #
    1.19  # Loadable module support
    1.20 @@ -85,6 +85,7 @@ CONFIG_IP_PNP_DHCP=y
    1.21  # CONFIG_IP_PNP_RARP is not set
    1.22  # CONFIG_NET_IPIP is not set
    1.23  # CONFIG_NET_IPGRE is not set
    1.24 +# CONFIG_ARPD is not set
    1.25  # CONFIG_INET_ECN is not set
    1.26  # CONFIG_SYN_COOKIES is not set
    1.27  
    1.28 @@ -96,6 +97,7 @@ CONFIG_IP_NF_FTP=y
    1.29  # CONFIG_IP_NF_AMANDA is not set
    1.30  CONFIG_IP_NF_TFTP=y
    1.31  CONFIG_IP_NF_IRC=y
    1.32 +# CONFIG_IP_NF_QUEUE is not set
    1.33  CONFIG_IP_NF_IPTABLES=y
    1.34  # CONFIG_IP_NF_MATCH_LIMIT is not set
    1.35  # CONFIG_IP_NF_MATCH_MAC is not set
    1.36 @@ -113,13 +115,17 @@ CONFIG_IP_NF_IPTABLES=y
    1.37  # CONFIG_IP_NF_MATCH_HELPER is not set
    1.38  CONFIG_IP_NF_MATCH_STATE=y
    1.39  CONFIG_IP_NF_MATCH_CONNTRACK=y
    1.40 +# CONFIG_IP_NF_MATCH_UNCLEAN is not set
    1.41 +# CONFIG_IP_NF_MATCH_OWNER is not set
    1.42  CONFIG_IP_NF_FILTER=y
    1.43  CONFIG_IP_NF_TARGET_REJECT=y
    1.44 +# CONFIG_IP_NF_TARGET_MIRROR is not set
    1.45  CONFIG_IP_NF_NAT=y
    1.46  CONFIG_IP_NF_NAT_NEEDED=y
    1.47  CONFIG_IP_NF_TARGET_MASQUERADE=y
    1.48  CONFIG_IP_NF_TARGET_REDIRECT=y
    1.49  # CONFIG_IP_NF_NAT_LOCAL is not set
    1.50 +# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
    1.51  CONFIG_IP_NF_NAT_IRC=y
    1.52  CONFIG_IP_NF_NAT_FTP=y
    1.53  CONFIG_IP_NF_NAT_TFTP=y
    1.54 @@ -133,6 +139,14 @@ CONFIG_IP_NF_TARGET_ULOG=y
    1.55  #   IP: Virtual Server Configuration
    1.56  #
    1.57  # CONFIG_IP_VS is not set
    1.58 +# CONFIG_IPV6 is not set
    1.59 +# CONFIG_KHTTPD is not set
    1.60 +
    1.61 +#
    1.62 +#    SCTP Configuration (EXPERIMENTAL)
    1.63 +#
    1.64 +# CONFIG_IP_SCTP is not set
    1.65 +# CONFIG_ATM is not set
    1.66  # CONFIG_VLAN_8021Q is not set
    1.67  
    1.68  #
    1.69 @@ -147,6 +161,14 @@ CONFIG_IP_NF_TARGET_ULOG=y
    1.70  # CONFIG_DEV_APPLETALK is not set
    1.71  # CONFIG_DECNET is not set
    1.72  # CONFIG_BRIDGE is not set
    1.73 +# CONFIG_X25 is not set
    1.74 +# CONFIG_LAPB is not set
    1.75 +# CONFIG_LLC is not set
    1.76 +# CONFIG_NET_DIVERT is not set
    1.77 +# CONFIG_ECONET is not set
    1.78 +# CONFIG_WAN_ROUTER is not set
    1.79 +# CONFIG_NET_FASTROUTE is not set
    1.80 +# CONFIG_NET_HW_FLOWCONTROL is not set
    1.81  
    1.82  #
    1.83  # QoS and/or fair queueing
    1.84 @@ -172,7 +194,7 @@ CONFIG_SD_EXTRA_DEVS=40
    1.85  # CONFIG_CHR_DEV_ST is not set
    1.86  # CONFIG_CHR_DEV_OSST is not set
    1.87  # CONFIG_BLK_DEV_SR is not set
    1.88 -# CONFIG_CHR_DEV_SG is not set
    1.89 +CONFIG_CHR_DEV_SG=y
    1.90  
    1.91  #
    1.92  # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
    1.93 @@ -190,6 +212,7 @@ CONFIG_SD_EXTRA_DEVS=40
    1.94  # CONFIG_SCSI_AHA152X is not set
    1.95  # CONFIG_SCSI_AHA1542 is not set
    1.96  # CONFIG_SCSI_AHA1740 is not set
    1.97 +# CONFIG_SCSI_AACRAID is not set
    1.98  # CONFIG_SCSI_AIC7XXX is not set
    1.99  # CONFIG_SCSI_AIC79XX is not set
   1.100  # CONFIG_SCSI_AIC7XXX_OLD is not set
   1.101 @@ -227,6 +250,7 @@ CONFIG_SD_EXTRA_DEVS=40
   1.102  # CONFIG_SCSI_U14_34F is not set
   1.103  # CONFIG_SCSI_ULTRASTOR is not set
   1.104  # CONFIG_SCSI_NSP32 is not set
   1.105 +# CONFIG_SCSI_DEBUG is not set
   1.106  
   1.107  #
   1.108  # Block devices
   1.109 @@ -324,6 +348,7 @@ CONFIG_PSMOUSE=y
   1.110  # CONFIG_DTLK is not set
   1.111  # CONFIG_R3964 is not set
   1.112  # CONFIG_APPLICOM is not set
   1.113 +# CONFIG_SONYPI is not set
   1.114  
   1.115  #
   1.116  # Ftape, the floppy tape device driver
   1.117 @@ -495,7 +520,7 @@ CONFIG_NLS_ISO8859_1=y
   1.118  # Console drivers
   1.119  #
   1.120  CONFIG_XEN_CONSOLE=y
   1.121 -CONFIG_VGA_CONSOLE=y
   1.122 +# CONFIG_VGA_CONSOLE is not set
   1.123  CONFIG_DUMMY_CONSOLE=y
   1.124  
   1.125  #
   1.126 @@ -506,7 +531,7 @@ CONFIG_DEBUG_KERNEL=y
   1.127  # CONFIG_DEBUG_HIGHMEM is not set
   1.128  # CONFIG_DEBUG_SLAB is not set
   1.129  # CONFIG_DEBUG_IOVIRT is not set
   1.130 -CONFIG_MAGIC_SYSRQ=y
   1.131 +# CONFIG_MAGIC_SYSRQ is not set
   1.132  # CONFIG_DEBUG_SPINLOCK is not set
   1.133  # CONFIG_DEBUG_BUGVERBOSE is not set
   1.134  CONFIG_KALLSYMS=y
     2.1 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/console/console.c	Tue Jun 15 09:59:37 2004 +0000
     2.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/console/console.c	Tue Jun 15 12:29:06 2004 +0000
     2.3 @@ -585,7 +585,7 @@ static int __init xencons_init(void)
     2.4      xencons_driver.wait_until_sent = xencons_wait_until_sent;
     2.5  
     2.6      if ( tty_register_driver(&xencons_driver) )
     2.7 -        panic("Couldn't register Xen virtual console driver\n");
     2.8 +        panic("Couldn't register Xen virtual console driver as %s\n",xencons_driver.name);
     2.9  
    2.10      if ( start_info.flags & SIF_INITDOMAIN )
    2.11      {
    2.12 @@ -598,7 +598,7 @@ static int __init xencons_init(void)
    2.13          (void)ctrl_if_register_receiver(CMSG_CONSOLE, xencons_rx, 0);
    2.14      }
    2.15  
    2.16 -    printk("Xen virtual console successfully installed\n");
    2.17 +    printk("Xen virtual console successfully installed as %s\n",xencons_driver.name);
    2.18      
    2.19      return 0;
    2.20  }