ia64/xen-unstable

changeset 1211:a235ded07b12

bitkeeper revision 1.822 (40600a0a9K2f7dR0Ky2OCGfBDHTTmQ)

Many files:
xeno -> xen renames.
author kaf24@scramble.cl.cam.ac.uk
date Tue Mar 23 09:57:30 2004 +0000 (2004-03-23)
parents 9f85adafc1e1
children b57df4362261
files extras/mini-os/Makefile tools/xc/lib/xc_linux_build.c xen/common/domain.c xen/common/network.c xen/common/page_alloc.c xen/drivers/message/fusion/linux_compat.h xen/drivers/message/fusion/mptbase.c xen/drivers/message/fusion/mptscsih.c xen/drivers/message/fusion/mptscsih.h xen/drivers/scsi/aic7xxx/aic79xx_osm.c xen/drivers/scsi/aic7xxx/aic79xx_osm.h xen/drivers/scsi/aic7xxx/aic7xxx_osm.c xen/drivers/scsi/megaraid.c xen/drivers/scsi/megaraid.h xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h xen/drivers/scsi/sym53c8xx_2/sym_glue.c xen/drivers/scsi/sym53c8xx_2/sym_glue.h xen/include/asm-i386/config.h xen/include/asm-x86_64/config.h xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h xen/include/hypervisor-ifs/hypervisor-if.h xen/include/xen/config.h xen/include/xen/mm.h xen/include/xen/perfc.h xen/include/xen/time.h xen/include/xen/trace.h xen/include/xen/vif.h xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile
line diff
     1.1 --- a/extras/mini-os/Makefile	Tue Mar 23 09:48:06 2004 +0000
     1.2 +++ b/extras/mini-os/Makefile	Tue Mar 23 09:57:30 2004 +0000
     1.3 @@ -27,8 +27,8 @@ hypervisor-ifs:
     1.4  	# Image will load at 0xC0000000. First bytes from head.o
     1.5  	#$(LD) -N -Ttext 0xC0000000 head.o $(OBJS) -o $@.elf
     1.6  	$(LD) -N -T minios.lds head.o $(OBJS) -o $@.elf
     1.7 -	# Guest OS header -- first 8 bytes are identifier 'XenoGues'.
     1.8 -	echo -e -n 'XenoGues' >$@ 
     1.9 +	# Guest OS header -- first 8 bytes are identifier 'XenGuest'.
    1.10 +	echo -e -n 'XenGuest' >$@ 
    1.11  	# Guest OS header -- next 4 bytes are load address (0xC0000000).
    1.12  	echo -e -n '\000\000\000\300' >>$@
    1.13  	# Create a raw bag of bytes from the ELF image.
     2.1 --- a/tools/xc/lib/xc_linux_build.c	Tue Mar 23 09:48:06 2004 +0000
     2.2 +++ b/tools/xc/lib/xc_linux_build.c	Tue Mar 23 09:57:30 2004 +0000
     2.3 @@ -6,7 +6,7 @@
     2.4  #include <zlib.h>
     2.5  
     2.6  /* This string is written to the head of every guest kernel image. */
     2.7 -#define GUEST_SIG   "XenoGues"
     2.8 +#define GUEST_SIG   "XenGuest"
     2.9  #define SIG_LEN    8
    2.10  
    2.11  #define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED)
    2.12 @@ -56,7 +56,7 @@ static int read_kernel_header(gzFile gfd
    2.13          return -1;
    2.14      }
    2.15  
    2.16 -    /* Read the load address which immediately follows the Xeno signature. */
    2.17 +    /* Read the load address which immediately follows the Xen signature. */
    2.18      gzread(gfd, load_addr, sizeof(unsigned long));
    2.19  
    2.20      return 0;
     3.1 --- a/xen/common/domain.c	Tue Mar 23 09:48:06 2004 +0000
     3.2 +++ b/xen/common/domain.c	Tue Mar 23 09:57:30 2004 +0000
     3.3 @@ -621,9 +621,9 @@ int setup_guestos(struct task_struct *p,
     3.4  
     3.5      data_start = map_domain_mem((unsigned long)phy_data_start);
     3.6  
     3.7 -    if ( strncmp(data_start, "XenoGues", 8) )
     3.8 +    if ( strncmp(data_start, "XenGuest", 8) )
     3.9      {
    3.10 -        printk("DOM%llu: Invalid guest OS image\n", dom);
    3.11 +        printk("DOM%llu: Invalid guest OS image - bad signature\n", dom);
    3.12          unmap_domain_mem(data_start);
    3.13          return -1;
    3.14      }
    3.15 @@ -821,7 +821,7 @@ int setup_guestos(struct task_struct *p,
    3.16      }
    3.17      *dst = '\0';
    3.18  
    3.19 -    /* NB: Give up the VGA console iff the Xenolinux DOM0 wants it. */
    3.20 +    /* NB: Give up the VGA console if DOM0 is ocnfigured to grab it. */
    3.21      console_endboot(strstr(cmdline, "tty0") != NULL);
    3.22  
    3.23      /* Reinstate the caller's page tables. */
     4.1 --- a/xen/common/network.c	Tue Mar 23 09:48:06 2004 +0000
     4.2 +++ b/xen/common/network.c	Tue Mar 23 09:57:30 2004 +0000
     4.3 @@ -131,9 +131,9 @@ net_vif_t *create_net_vif(domid_t dom)
     4.4      if ( (p->domain == 0) && (idx == 0) )
     4.5      {
     4.6          /*
     4.7 -         * DOM0/VIF0 gets the real physical MAC address, so that users can 
     4.8 -         * easily get a Xenoserver up and running by using an existing DHCP 
     4.9 -         * entry.
    4.10 +         * DOM0/VIF0 gets the real physical MAC address, so that users can
    4.11 +         * easily get a Xen-based machine up and running by using an existing
    4.12 +         * DHCP entry.
    4.13           */
    4.14          memcpy(new_vif->vmac, the_dev->dev_addr, ETH_ALEN);
    4.15      }
     5.1 --- a/xen/common/page_alloc.c	Tue Mar 23 09:48:06 2004 +0000
     5.2 +++ b/xen/common/page_alloc.c	Tue Mar 23 09:57:30 2004 +0000
     5.3 @@ -1,7 +1,7 @@
     5.4  /******************************************************************************
     5.5   * page_alloc.c
     5.6   * 
     5.7 - * Simple buddy allocator for Xenoserver hypervisor.
     5.8 + * Simple buddy heap allocator for Xen.
     5.9   * 
    5.10   * Copyright (c) 2002 K A Fraser
    5.11   * 
     6.1 --- a/xen/drivers/message/fusion/linux_compat.h	Tue Mar 23 09:48:06 2004 +0000
     6.2 +++ b/xen/drivers/message/fusion/linux_compat.h	Tue Mar 23 09:57:30 2004 +0000
     6.3 @@ -148,7 +148,7 @@ typedef void (*__cleanup_module_func_t)(
     6.4  
     6.5  /* PCI/driver subsystem { */
     6.6  /* SAE: Why not just use Linux's PCI stuff */
     6.7 -#if XENO_KILLED
     6.8 +#if XEN_KILLED
     6.9  /*#ifndef pci_for_each_dev*/
    6.10  #define pci_for_each_dev(dev)		for((dev)=pci_devices; (dev)!=NULL; (dev)=(dev)->next)
    6.11  #define pci_peek_next_dev(dev)		((dev)->next ? (dev)->next : NULL)
    6.12 @@ -172,7 +172,7 @@ typedef void (*__cleanup_module_func_t)(
    6.13  })
    6.14  #else
    6.15  /* SAE: Is Linux's PCI stuff not good enough? */
    6.16 -#if XENO_KILLED
    6.17 +#if XEN_KILLED
    6.18  
    6.19  #define pci_peek_next_dev(dev)		((dev) != pci_dev_g(&pci_devices) ? pci_dev_g((dev)->global_list.next) : NULL)
    6.20  #define PCI_BASEADDR_FLAGS(idx)         resource[idx].flags
    6.21 @@ -185,7 +185,7 @@ typedef void (*__cleanup_module_func_t)(
    6.22  
    6.23  /* Compatability for the 2.3.x PCI DMA API. */
    6.24  /* SAE: No need for this */
    6.25 -#if XENO_KILLED
    6.26 +#if XEN_KILLED
    6.27  /*#ifndef PCI_DMA_BIDIRECTIONAL*/
    6.28  /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
    6.29  
     7.1 --- a/xen/drivers/message/fusion/mptbase.c	Tue Mar 23 09:48:06 2004 +0000
     7.2 +++ b/xen/drivers/message/fusion/mptbase.c	Tue Mar 23 09:57:30 2004 +0000
     7.3 @@ -180,7 +180,7 @@ static int	last_drv_idx = -1;
     7.4  static int	isense_idx = -1;
     7.5  
     7.6  /* SAE: No wait queues or threads */
     7.7 -#ifdef XENO_KILLED
     7.8 +#ifdef XEN_KILLED
     7.9  static DECLARE_WAIT_QUEUE_HEAD(mpt_waitq);
    7.10  #endif
    7.11  
    7.12 @@ -627,7 +627,7 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRA
    7.13  			 *	Wake up the original calling thread
    7.14  			 */
    7.15  			pCfg->wait_done = 1;
    7.16 -#ifdef XENO_KILLED
    7.17 +#ifdef XEN_KILLED
    7.18  			 wake_up(&mpt_waitq);
    7.19  #else
    7.20  			mdelay(250);
    7.21 @@ -2194,7 +2194,7 @@ MakeIocReady(MPT_ADAPTER *ioc, int force
    7.22  
    7.23  		if (sleepFlag == CAN_SLEEP) {
    7.24  /* SAE: Can't do this in the hypervisor */
    7.25 -#if XENO_KILLED
    7.26 +#if XEN_KILLED
    7.27  			set_current_state(TASK_INTERRUPTIBLE);
    7.28  			schedule_timeout(1);
    7.29  #else
    7.30 @@ -2546,7 +2546,7 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepF
    7.31  	while (state != MPI_IOC_STATE_OPERATIONAL && --cntdn) {
    7.32  		if (sleepFlag == CAN_SLEEP) {
    7.33  /* SAE: Can't do this in the hypervisor */
    7.34 -#if XENO_KILLED
    7.35 +#if XEN_KILLED
    7.36  			set_current_state(TASK_INTERRUPTIBLE);
    7.37  			schedule_timeout(1);
    7.38  #else
    7.39 @@ -2980,7 +2980,7 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int s
    7.40  		/* wait 100 msec */
    7.41  		if (sleepFlag == CAN_SLEEP) {
    7.42  /* SAE: Can't do this in the hypervisor */
    7.43 -#if XENO_KILLED
    7.44 +#if XEN_KILLED
    7.45  			set_current_state(TASK_INTERRUPTIBLE);
    7.46  			schedule_timeout(100 * HZ / 1000);
    7.47  #else
    7.48 @@ -3219,7 +3219,7 @@ KickStart(MPT_ADAPTER *ioc, int force, i
    7.49  
    7.50  		if (sleepFlag == CAN_SLEEP) {
    7.51  /* SAE: Can't do this in the hypervisor */
    7.52 -#if XENO_KILLED
    7.53 +#if XEN_KILLED
    7.54  			schedule_timeout(HZ);
    7.55  #else
    7.56  			mdelay(1000);
    7.57 @@ -3244,7 +3244,7 @@ KickStart(MPT_ADAPTER *ioc, int force, i
    7.58  		}
    7.59  		if (sleepFlag == CAN_SLEEP) {
    7.60  /* SAE: Can't do this in the hypervisor */
    7.61 -#if XENO_KILLED
    7.62 +#if XEN_KILLED
    7.63  			set_current_state(TASK_INTERRUPTIBLE);
    7.64  			schedule_timeout(1);
    7.65  #else
    7.66 @@ -3321,7 +3321,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ign
    7.67  			/* wait 100 msec */
    7.68  			if (sleepFlag == CAN_SLEEP) {
    7.69  /* SAE: Can't do this in the hypervisor */
    7.70 -#if XENO_KILLED
    7.71 +#if XEN_KILLED
    7.72  				set_current_state(TASK_INTERRUPTIBLE);
    7.73  				schedule_timeout(100 * HZ / 1000);
    7.74  #else
    7.75 @@ -3419,7 +3419,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ign
    7.76  				/* wait 1 sec */
    7.77  				if (sleepFlag == CAN_SLEEP) {
    7.78  /* SAE: Can't do this in the hypervisor */
    7.79 -#if XENO_KILLED
    7.80 +#if XEN_KILLED
    7.81  					set_current_state(TASK_INTERRUPTIBLE);
    7.82  					schedule_timeout(HZ);
    7.83  #else
    7.84 @@ -3452,7 +3452,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ign
    7.85  				/* wait 1 sec */
    7.86  				if (sleepFlag == CAN_SLEEP) {
    7.87  /* SAE: Can't do this in the hypervisor */
    7.88 -#if XENO_KILLED
    7.89 +#if XEN_KILLED
    7.90  					set_current_state(TASK_INTERRUPTIBLE);
    7.91  					schedule_timeout(HZ);
    7.92  #else
    7.93 @@ -3491,7 +3491,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ign
    7.94  		/* wait 100 msec */
    7.95  		if (sleepFlag == CAN_SLEEP) {
    7.96  /* SAE: Can't do this in the hypervisor */
    7.97 -#if XENO_KILLED
    7.98 +#if XEN_KILLED
    7.99  			set_current_state(TASK_INTERRUPTIBLE);
   7.100  			schedule_timeout(100 * HZ / 1000);
   7.101  #else
   7.102 @@ -3591,7 +3591,7 @@ SendIocReset(MPT_ADAPTER *ioc, u8 reset_
   7.103  
   7.104  		if (sleepFlag == CAN_SLEEP) {
   7.105  /* SAE: Can't do this in the hypervisor */
   7.106 -#if XENO_KILLED
   7.107 +#if XEN_KILLED
   7.108  			set_current_state(TASK_INTERRUPTIBLE);
   7.109  			schedule_timeout(1);
   7.110  #else
   7.111 @@ -3930,7 +3930,7 @@ WaitForDoorbellAck(MPT_ADAPTER *ioc, int
   7.112  			if (! (intstat & MPI_HIS_IOP_DOORBELL_STATUS))
   7.113  				break;
   7.114  /* SAE: Can't do this in the hypervisor */
   7.115 -#if XENO_KILLED
   7.116 +#if XEN_KILLED
   7.117  			set_current_state(TASK_INTERRUPTIBLE);
   7.118  			schedule_timeout(1);
   7.119  #else
   7.120 @@ -3985,7 +3985,7 @@ WaitForDoorbellInt(MPT_ADAPTER *ioc, int
   7.121  			if (intstat & MPI_HIS_DOORBELL_INTERRUPT)
   7.122  				break;
   7.123  /* SAE: Can't do this in the hypervisor */
   7.124 -#if XENO_KILLED
   7.125 +#if XEN_KILLED
   7.126  			set_current_state(TASK_INTERRUPTIBLE);
   7.127  			schedule_timeout(1);
   7.128  #else
   7.129 @@ -4986,7 +4986,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS
   7.130  
   7.131  	mpt_put_msg_frame(mpt_base_index, ioc->id, mf);
   7.132  /* SAE: No wait queues */
   7.133 -#ifdef XENO_KILLED
   7.134 +#ifdef XEN_KILLED
   7.135  	wait_event(mpt_waitq, pCfg->wait_done);
   7.136  #else
   7.137  	/* SAE: We'll just wait a bit */
   7.138 @@ -5080,7 +5080,7 @@ mpt_ioc_reset(MPT_ADAPTER *ioc, int rese
   7.139  
   7.140  				pCfg->status = MPT_CONFIG_ERROR;
   7.141  				pCfg->wait_done = 1;
   7.142 -#ifdef XENO_KILLED
   7.143 +#ifdef XEN_KILLED
   7.144  				wake_up(&mpt_waitq);
   7.145  #else
   7.146  				mdelay(250);
     8.1 --- a/xen/drivers/message/fusion/mptscsih.c	Tue Mar 23 09:48:06 2004 +0000
     8.2 +++ b/xen/drivers/message/fusion/mptscsih.c	Tue Mar 23 09:57:30 2004 +0000
     8.3 @@ -207,7 +207,7 @@ static void	mptscsih_fillbuf(char *buffe
     8.4  /*static int	mptscsih_setup(char *str);*/
     8.5  static int	mptscsih_halt(struct notifier_block *nb, ulong event, void *buf);
     8.6  
     8.7 -#if XENO_KILLED
     8.8 +#if XEN_KILLED
     8.9  /*
    8.10   *	Reboot Notification
    8.11   */
    8.12 @@ -262,7 +262,7 @@ static struct mpt_work_struct	mptscsih_d
    8.13  #endif
    8.14  
    8.15  /* SAE: No wait queues in Xen */
    8.16 -#ifdef XENO_KILLED
    8.17 +#ifdef XEN_KILLED
    8.18  /*
    8.19   * Wait Queue setup
    8.20   */
    8.21 @@ -1961,7 +1961,7 @@ mptscsih_detect(Scsi_Host_Template *tpnt
    8.22  done:
    8.23  	if (mpt_scsi_hosts > 0) {
    8.24  /* SAE: */
    8.25 -#if XENO_KILLED
    8.26 +#if XEN_KILLED
    8.27  		register_reboot_notifier(&mptscsih_notifier);
    8.28  #endif
    8.29  	}
    8.30 @@ -2020,7 +2020,7 @@ mptscsih_release(struct Scsi_Host *host)
    8.31  
    8.32  		while(mytaskQ_bh_active && --count) {
    8.33  /* SAE: */
    8.34 -#ifdef XENO_KILLED
    8.35 +#ifdef XEN_KILLED
    8.36  			set_current_state(TASK_INTERRUPTIBLE);
    8.37  			schedule_timeout(1);
    8.38  #else
    8.39 @@ -2043,7 +2043,7 @@ mptscsih_release(struct Scsi_Host *host)
    8.40  		spin_unlock_irqrestore(&dvtaskQ_lock, flags);
    8.41  		while(dvtaskQ_active && --count) {
    8.42  /* SAE: */
    8.43 -#ifdef XENO_KILLED
    8.44 +#ifdef XEN_KILLED
    8.45  			set_current_state(TASK_INTERRUPTIBLE);
    8.46  			schedule_timeout(1);
    8.47  #else
    8.48 @@ -2062,7 +2062,7 @@ mptscsih_release(struct Scsi_Host *host)
    8.49  #endif
    8.50  
    8.51  /* SAE: */
    8.52 -#if XENO_KILLED
    8.53 +#if XEN_KILLED
    8.54  	unregister_reboot_notifier(&mptscsih_notifier);
    8.55  #endif
    8.56  
    8.57 @@ -2204,7 +2204,7 @@ mptscsih_halt(struct notifier_block *nb,
    8.58  	}
    8.59  
    8.60  /* SAE: Gone */
    8.61 -#if XENO_KILLED 
    8.62 +#if XEN_KILLED 
    8.63  	unregister_reboot_notifier(&mptscsih_notifier);
    8.64  #endif
    8.65  	return NOTIFY_OK;
    8.66 @@ -3660,7 +3660,7 @@ mptscsih_taskmgmt_bh(void *sc)
    8.67  
    8.68  	do {
    8.69  /* SAE: Not in kernel thread */
    8.70 -#ifdef XENO_KILLED
    8.71 +#ifdef XEN_KILLED
    8.72  		set_current_state(TASK_INTERRUPTIBLE);
    8.73  		schedule_timeout(HZ/4);
    8.74  #else
    8.75 @@ -4373,7 +4373,7 @@ mptscsih_ioc_reset(MPT_ADAPTER *ioc, int
    8.76  			hd->pLocal->completion = MPT_SCANDV_DID_RESET;
    8.77  			scandv_wait_done = 1;
    8.78  /* SAE: No wait queues */
    8.79 -#ifdef XENO_KILLED
    8.80 +#ifdef XEN_KILLED
    8.81  			wake_up(&scandv_waitq);
    8.82  #else
    8.83  			mdelay(100);
    8.84 @@ -5793,7 +5793,7 @@ wakeup:
    8.85  	 */
    8.86  	scandv_wait_done = 1;
    8.87  /* SAE: No wait queues */
    8.88 -#ifdef XENO_KILLED
    8.89 +#ifdef XEN_KILLED
    8.90  	wake_up(&scandv_waitq);
    8.91  #else
    8.92  	mdelay(100);
    8.93 @@ -5931,7 +5931,7 @@ mptscsih_do_raid(MPT_SCSI_HOST *hd, u8 a
    8.94  	add_timer(&hd->timer);
    8.95  	mptscsih_put_msgframe(ScsiScanDvCtx, hd->ioc->id, mf);
    8.96  /* SAE: No wait queues */
    8.97 -#ifdef XENO_KILLED
    8.98 +#ifdef XEN_KILLED
    8.99  	wait_event(scandv_waitq, scandv_wait_done);
   8.100  #else
   8.101  	/* SAE: Decrease the wait time: 100 -> 1 */
   8.102 @@ -6177,7 +6177,7 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTER
   8.103  	add_timer(&hd->timer);
   8.104  	mptscsih_put_msgframe(ScsiScanDvCtx, hd->ioc->id, mf);
   8.105  /* SAE: No wait queues */
   8.106 -#ifdef XENO_KILLED
   8.107 +#ifdef XEN_KILLED
   8.108  	wait_event(scandv_waitq, scandv_wait_done);
   8.109  #else
   8.110  	/* SAE: Decrease the wait time: 100 -> 1 */
   8.111 @@ -6399,7 +6399,7 @@ mptscsih_domainValidation(void *arg)
   8.112  			spin_unlock_irqrestore(&dvtaskQ_lock, flags);
   8.113  
   8.114  /* SAE: */
   8.115 -#ifdef XENO_KILLED
   8.116 +#ifdef XEN_KILLED
   8.117  			set_current_state(TASK_INTERRUPTIBLE);
   8.118  			schedule_timeout(HZ/4);
   8.119  #else
   8.120 @@ -6454,7 +6454,7 @@ mptscsih_domainValidation(void *arg)
   8.121  					hd->ioc->spi_data.dvStatus[id] &= ~MPT_SCSICFG_NEED_DV;
   8.122  
   8.123  /* SAE: */
   8.124 -#ifdef XENO_KILLED
   8.125 +#ifdef XEN_KILLED
   8.126  					set_current_state(TASK_INTERRUPTIBLE);
   8.127  					schedule_timeout(HZ/4);
   8.128  #else
     9.1 --- a/xen/drivers/message/fusion/mptscsih.h	Tue Mar 23 09:48:06 2004 +0000
     9.2 +++ b/xen/drivers/message/fusion/mptscsih.h	Tue Mar 23 09:57:30 2004 +0000
     9.3 @@ -199,7 +199,7 @@ struct mptscsih_driver_setup
     9.4  /* SAE: mdelay */
     9.5  #define SCHEDULE_TASK(x) mdelay(100)
     9.6  
     9.7 -#if XENO_KILLED
     9.8 +#if XEN_KILLED
     9.9  
    9.10  #define SCHEDULE_TASK(x)		\
    9.11  	*MOD_INC_USE_COUNT*;		\
    10.1 --- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c	Tue Mar 23 09:48:06 2004 +0000
    10.2 +++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c	Tue Mar 23 09:57:30 2004 +0000
    10.3 @@ -374,7 +374,7 @@ static void ahd_linux_filter_command(str
    10.4  				     struct scb*);
    10.5  static void ahd_linux_dev_timed_unfreeze(u_long arg);
    10.6  /* SAE */
    10.7 -#if XENO_KILLED
    10.8 +#if XEN_KILLED
    10.9  static void ahd_linux_sem_timeout(u_long arg);
   10.10  static int  ahd_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag);
   10.11  #endif
   10.12 @@ -1306,7 +1306,7 @@ ahd_platform_alloc(struct ahd_softc *ahd
   10.13  	ahd_lockinit(ahd);
   10.14  	ahd_done_lockinit(ahd);
   10.15  /* SAE */
   10.16 -#if XENO_KILLED
   10.17 +#if XEN_KILLED
   10.18  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
   10.19  	init_MUTEX_LOCKED(&ahd->platform_data->eh_sem);
   10.20  #else
   10.21 @@ -1319,7 +1319,7 @@ ahd_platform_alloc(struct ahd_softc *ahd
   10.22  #endif
   10.23  	ahd->seltime = (aic79xx_seltime & 0x3) << 4;
   10.24  /* SAE */
   10.25 -#if XENO_KILLED
   10.26 +#if XEN_KILLED
   10.27  	if (TAILQ_EMPTY(&ahd_tailq))
   10.28  		register_reboot_notifier(&ahd_linux_notifier);
   10.29  #endif
   10.30 @@ -2106,7 +2106,7 @@ ahd_done(struct ahd_softc *ahd, struct s
   10.31  	if ((scb->flags & SCB_RECOVERY_SCB) != 0) {
   10.32  		printf("Recovery SCB completes\n");
   10.33  /* SAE: */
   10.34 -#if XENO_KILLED
   10.35 +#if XEN_KILLED
   10.36  		up(&ahd->platform_data->eh_sem);
   10.37  #endif
   10.38  	}
   10.39 @@ -2449,7 +2449,7 @@ ahd_release_simq(struct ahd_softc *ahd)
   10.40  }
   10.41  
   10.42  /* SAE */
   10.43 -#if XENO_KILLED
   10.44 +#if XEN_KILLED
   10.45  static void
   10.46  ahd_linux_sem_timeout(u_long arg)
   10.47  {
   10.48 @@ -2702,7 +2702,7 @@ done:
   10.49  /* SAE */
   10.50  		printf("SAE: aic79xxx: recovery failed\n");
   10.51  		retval=FAILED;
   10.52 -#if XENO_KILLED
   10.53 +#if XEN_KILLED
   10.54  		struct timer_list timer;
   10.55  		int ret;
   10.56  
   10.57 @@ -2732,7 +2732,7 @@ done:
   10.58  	spin_lock_irq(&io_request_lock);
   10.59  	return (retval);
   10.60  }
   10.61 -#endif /* XENO_KILLED */
   10.62 +#endif /* XEN_KILLED */
   10.63  
   10.64  static void
   10.65  ahd_linux_dev_timed_unfreeze(u_long arg)
   10.66 @@ -2856,19 +2856,19 @@ ahd_linux_biosparam(Disk *disk, kdev_t d
   10.67  	int	sectors;
   10.68  	int	cylinders;
   10.69  /* SAE */
   10.70 -#if XENO_KILLED
   10.71 +#if XEN_KILLED
   10.72  	int	ret;
   10.73  #endif
   10.74  	int	extended;
   10.75  	struct	ahd_softc *ahd;
   10.76  /* SAE */
   10.77 -#if XENO_KILLED
   10.78 +#if XEN_KILLED
   10.79  	struct	buffer_head *bh;
   10.80  #endif
   10.81  
   10.82  	ahd = *((struct ahd_softc **)disk->device->host->hostdata);
   10.83  /* SAE: */
   10.84 -#if XENO_KILLED
   10.85 +#if XEN_KILLED
   10.86  	bh = bread(MKDEV(MAJOR(dev), MINOR(dev) & ~0xf), 0, 1024);
   10.87  
   10.88  	if (bh) {
    11.1 --- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.h	Tue Mar 23 09:48:06 2004 +0000
    11.2 +++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.h	Tue Mar 23 09:57:30 2004 +0000
    11.3 @@ -50,7 +50,7 @@
    11.4  #include <xen/ioport.h>
    11.5  #include <xen/pci.h>
    11.6  /* SAE */
    11.7 -#if XENO_KILLED
    11.8 +#if XEN_KILLED
    11.9  #include <xen/version.h>
   11.10  #endif
   11.11  #ifndef AHD_MODVERSION_FILE
   11.12 @@ -151,7 +151,7 @@ extern Scsi_Host_Template* aic79xx_drive
   11.13  /***************************** Bus Space/DMA **********************************/
   11.14  /* SAE */
   11.15  typedef dma_addr_t bus_addr_t;
   11.16 -#if XENO_KILLED
   11.17 +#if XEN_KILLED
   11.18  #if LINUX_VERSION_CODE > KERNEL_VERSION(2,2,17)
   11.19  typedef dma_addr_t bus_addr_t;
   11.20  #else
   11.21 @@ -610,7 +610,7 @@ struct scb_platform_data {
   11.22  	uint32_t		 xfer_len;
   11.23  /* SAE */
   11.24  	uint32_t		 resid;		/* Transfer residual */
   11.25 -#if XENO_KILLED
   11.26 +#if XEN_KILLED
   11.27  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
   11.28  	uint32_t		 resid;		/* Transfer residual */
   11.29  #endif
   11.30 @@ -634,7 +634,7 @@ struct ahd_platform_data {
   11.31  /* SAE */
   11.32  	spinlock_t		 spin_lock;
   11.33  	struct tasklet_struct	 runq_tasklet;
   11.34 -#if XENO_KILLED
   11.35 +#if XEN_KILLED
   11.36  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
   11.37  	spinlock_t		 spin_lock;
   11.38  #endif
   11.39 @@ -645,7 +645,7 @@ struct ahd_platform_data {
   11.40  	u_int			 qfrozen;
   11.41  	struct timer_list	 reset_timer;
   11.42  /* SAE: No semaphores */
   11.43 -#if XENO_KILLED
   11.44 +#if XEN_KILLED
   11.45  	struct semaphore	 eh_sem;
   11.46  #endif
   11.47  	struct Scsi_Host        *host;		/* pointer to scsi host */
    12.1 --- a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c	Tue Mar 23 09:48:06 2004 +0000
    12.2 +++ b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c	Tue Mar 23 09:57:30 2004 +0000
    12.3 @@ -721,7 +721,7 @@ ahc_runq_tasklet(unsigned long data)
    12.4  #include <xen/notifier.h>
    12.5  #include <xen/reboot.h>
    12.6  
    12.7 -#if XENO_KILLED
    12.8 +#if XEN_KILLED
    12.9  static struct notifier_block ahc_linux_notifier = {
   12.10  	ahc_linux_halt, NULL, 0
   12.11  };
   12.12 @@ -1376,7 +1376,7 @@ ahc_platform_alloc(struct ahc_softc *ahc
   12.13  #endif
   12.14  	ahc->seltime = (aic7xxx_seltime & 0x3) << 4;
   12.15  	ahc->seltime_b = (aic7xxx_seltime & 0x3) << 4;
   12.16 -#if XENO_KILLED
   12.17 +#if XEN_KILLED
   12.18  	if (TAILQ_EMPTY(&ahc_tailq))
   12.19  		register_reboot_notifier(&ahc_linux_notifier);
   12.20  #endif
   12.21 @@ -1417,7 +1417,7 @@ ahc_platform_free(struct ahc_softc *ahc)
   12.22  		free(ahc->platform_data, M_DEVBUF);
   12.23  	}
   12.24  	if (TAILQ_EMPTY(&ahc_tailq)) {
   12.25 -#ifdef XENO_KILLED
   12.26 +#ifdef XEN_KILLED
   12.27  	  unregister_reboot_notifier(&ahc_linux_notifier);
   12.28  #endif
   12.29  #ifdef CONFIG_PCI
    13.1 --- a/xen/drivers/scsi/megaraid.c	Tue Mar 23 09:48:06 2004 +0000
    13.2 +++ b/xen/drivers/scsi/megaraid.c	Tue Mar 23 09:57:30 2004 +0000
    13.3 @@ -777,7 +777,7 @@ MODULE_PARM (megaraid, "s");
    13.4  static int skip_id = -1;
    13.5  static int numCtlrs = 0;
    13.6  static mega_host_config *megaCtlrs[FC_MAX_CHANNELS] = { 0 };
    13.7 -#if XENO_KILLED
    13.8 +#if XEN_KILLED
    13.9  static struct proc_dir_entry *mega_proc_dir_entry;
   13.10  #endif
   13.11  
   13.12 @@ -786,7 +786,7 @@ static u32 maxCmdTime = 0;
   13.13  #endif
   13.14  
   13.15  static mega_scb *pLastScb = NULL;
   13.16 -#if XENO_KILLED
   13.17 +#if XEN_KILLED
   13.18  static struct notifier_block mega_notifier = {
   13.19  	megaraid_reboot_notify,
   13.20  	NULL,
   13.21 @@ -801,7 +801,7 @@ struct mega_hbas mega_hbas[MAX_CONTROLLE
   13.22   * The File Operations structure for the serial/ioctl interface of the driver
   13.23   */
   13.24  /* For controller re-ordering */ 
   13.25 -#if XENO_KILLED
   13.26 +#if XEN_KILLED
   13.27  static struct file_operations megadev_fops = {
   13.28  	ioctl:megadev_ioctl_entry,
   13.29  	open:megadev_open,
   13.30 @@ -818,7 +818,7 @@ static struct mcontroller mcontroller[MA
   13.31  /* The current driver version */
   13.32  static u32 driver_ver = 0x118C;
   13.33  
   13.34 -#if XENO_KILLED
   13.35 +#if XEN_KILLED
   13.36  /* major number used by the device for character interface */
   13.37  static int major;
   13.38  
   13.39 @@ -2330,7 +2330,7 @@ static void megaraid_isr (int irq, void 
   13.40  				if (pScb->SCpnt->cmnd[0] == M_RD_IOCTL_CMD_NEW) {
   13.41  					/* save the status byte for the queue routine to use */
   13.42  					pScb->SCpnt->result = qStatus;
   13.43 -#if XENO_KILLED
   13.44 +#if XEN_KILLED
   13.45  					up (&pScb->ioctl_sem);
   13.46  #endif
   13.47  				} else {
   13.48 @@ -2939,7 +2939,7 @@ static int mega_i_query_adapter (mega_ho
   13.49  /*----------------------------------------------------------
   13.50   * Returns data to be displayed in /proc/scsi/megaraid/X
   13.51   *----------------------------------------------------------*/
   13.52 -#if XENO_KILLED
   13.53 +#if XEN_KILLED
   13.54  int megaraid_proc_info (char *buffer, char **start, off_t offset,
   13.55  		    int length, int host_no, int inout)
   13.56  {
   13.57 @@ -3118,7 +3118,7 @@ static int mega_findCard (Scsi_Host_Temp
   13.58  		megaCfg->lock_pend = SPIN_LOCK_UNLOCKED;
   13.59  		megaCfg->lock_scsicmd = SPIN_LOCK_UNLOCKED;
   13.60  		megaCfg->flag = flag;
   13.61 -#if XENO_KILLED_DELLOGDRV
   13.62 +#if XEN_KILLED_DELLOGDRV
   13.63  		megaCfg->int_qh = NULL;
   13.64  		megaCfg->int_qt = NULL;
   13.65  		megaCfg->int_qlen = 0;
   13.66 @@ -3326,7 +3326,7 @@ static int mega_findCard (Scsi_Host_Temp
   13.67  
   13.68  int megaraid_detect (Scsi_Host_Template * pHostTmpl)
   13.69  {
   13.70 -#if XENO_KILLED
   13.71 +#if XEN_KILLED
   13.72    int ctlridx = 0;
   13.73  #endif
   13.74    int count = 0;
   13.75 @@ -3409,7 +3409,7 @@ int megaraid_detect (Scsi_Host_Template 
   13.76  	 * First argument (major) to register_chrdev implies a dynamic major
   13.77  	 * number allocation.
   13.78  	 */
   13.79 -#if XENO_KILLED
   13.80 +#if XEN_KILLED
   13.81  	if (count) {
   13.82  		major = register_chrdev (0, "megadev", &megadev_fops);
   13.83  
   13.84 @@ -3499,7 +3499,7 @@ int megaraid_release (struct Scsi_Host *
   13.85  	 * register_chrdev() routine.
   13.86  	 */
   13.87  
   13.88 -#if XENO_KILLED
   13.89 +#if XEN_KILLED
   13.90  	unregister_chrdev (major, "megadev");
   13.91  	unregister_reboot_notifier (&mega_notifier);
   13.92  #endif
   13.93 @@ -3959,7 +3959,7 @@ int megaraid_queue (Scsi_Cmnd * SCpnt, v
   13.94  		 * logical drive opertion. If it is, queue the commands in the
   13.95  		 * internal queue until the delete operation is complete.
   13.96  		 */
   13.97 -#if XENO_KILLED_DELLOGDRV
   13.98 +#if XEN_KILLED_DELLOGDRV
   13.99  		if( ! megaCfg->quiescent ) {
  13.100  #endif
  13.101  			/* Add SCB to the head of the pending queue */
  13.102 @@ -3976,7 +3976,7 @@ int megaraid_queue (Scsi_Cmnd * SCpnt, v
  13.103  				DRIVER_UNLOCK (megaCfg);
  13.104  				return 0;
  13.105  			}
  13.106 -#if XENO_KILLED_DELLOGDRV
  13.107 +#if XEN_KILLED_DELLOGDRV
  13.108  		}
  13.109  		else {
  13.110  			/* Add SCB to the internal queue */
  13.111 @@ -3992,11 +3992,11 @@ int megaraid_queue (Scsi_Cmnd * SCpnt, v
  13.112  #endif
  13.113  
  13.114  		if (pScb->SCpnt->cmnd[0] == M_RD_IOCTL_CMD_NEW) {
  13.115 -#if XENO_KILLED
  13.116 +#if XEN_KILLED
  13.117  			init_MUTEX_LOCKED (&pScb->ioctl_sem);
  13.118  #endif
  13.119  			spin_unlock_irq (&io_request_lock);
  13.120 -#if XENO_KILLED
  13.121 +#if XEN_KILLED
  13.122  			down (&pScb->ioctl_sem);
  13.123  #endif
  13.124      		user_area = (char *)*((u32*)&pScb->SCpnt->cmnd[4]);
  13.125 @@ -4027,7 +4027,7 @@ int megaraid_queue (Scsi_Cmnd * SCpnt, v
  13.126  /*----------------------------------------------------------------------
  13.127   * Issue a blocking command to the controller
  13.128   *----------------------------------------------------------------------*/
  13.129 -#if XENO_KILLED
  13.130 +#if XEN_KILLED
  13.131  volatile static int internal_done_flag = 0;
  13.132  volatile static int internal_done_errcode = 0;
  13.133  
  13.134 @@ -4489,7 +4489,7 @@ int megaraid_biosparam (Disk * disk, kde
  13.135  static int
  13.136  mega_partsize(Disk * disk, kdev_t dev, int *geom)
  13.137  {
  13.138 -#if XENO_KILLED
  13.139 +#if XEN_KILLED
  13.140  	struct buffer_head *bh;
  13.141  	struct partition *p, *largest = NULL;
  13.142  	int i, largest_cyl;
  13.143 @@ -4731,7 +4731,7 @@ static int megadev_ioctl_entry (struct i
  13.144  	/*
  13.145  	 * We do not allow parallel ioctls to the driver as of now.
  13.146  	 */
  13.147 -#if XENO_KILLED // XXX JWS killed the locking!
  13.148 +#if XEN_KILLED // XXX JWS killed the locking!
  13.149  	down (&mimd_entry_mtx);
  13.150  	ret = megadev_ioctl (inode, filep, cmd, arg);
  13.151  	up (&mimd_entry_mtx);
  13.152 @@ -4949,7 +4949,7 @@ static int megadev_ioctl (struct inode *
  13.153  		scsicmd->cmnd[0] = MEGADEVIOC;
  13.154  		scsicmd->request_buffer = (void *)&ioc;
  13.155  
  13.156 -#if XENO_KILLED
  13.157 +#if XEN_KILLED
  13.158  		init_MUTEX_LOCKED(&mimd_ioctl_sem);
  13.159  #endif
  13.160  
  13.161 @@ -4957,7 +4957,7 @@ static int megadev_ioctl (struct inode *
  13.162  		megaraid_queue(scsicmd, megadev_ioctl_done);
  13.163  
  13.164  		IO_UNLOCK;
  13.165 -#if XENO_KILLED
  13.166 +#if XEN_KILLED
  13.167  		down(&mimd_ioctl_sem);
  13.168  #endif
  13.169  		if( !scsicmd->result && outlen ) {
  13.170 @@ -5104,7 +5104,7 @@ static int megadev_ioctl (struct inode *
  13.171  		scsicmd->cmnd[0] = MEGADEVIOC;
  13.172  		scsicmd->request_buffer = (void *) &ioc;
  13.173  
  13.174 -#if XENO_KILLED
  13.175 +#if XEN_KILLED
  13.176  		init_MUTEX_LOCKED (&mimd_ioctl_sem);
  13.177  #endif
  13.178  
  13.179 @@ -5112,7 +5112,7 @@ static int megadev_ioctl (struct inode *
  13.180  		megaraid_queue (scsicmd, megadev_ioctl_done);
  13.181  
  13.182  		IO_UNLOCK;
  13.183 -#if XENO_KILLED
  13.184 +#if XEN_KILLED
  13.185  		down (&mimd_ioctl_sem);
  13.186  #endif
  13.187  
  13.188 @@ -5173,7 +5173,7 @@ static int megadev_ioctl (struct inode *
  13.189  static void
  13.190  megadev_ioctl_done(Scsi_Cmnd *sc)
  13.191  {
  13.192 -#if XENO_KILLED
  13.193 +#if XEN_KILLED
  13.194  	up (&mimd_ioctl_sem);
  13.195  #endif
  13.196  }
  13.197 @@ -5311,7 +5311,7 @@ mega_support_ext_cdb(mega_host_config *t
  13.198  static int
  13.199  mega_support_random_del(mega_host_config *this_hba)
  13.200  {
  13.201 -#if XENO_KILLED
  13.202 +#if XEN_KILLED
  13.203  	mega_mailbox *mboxpnt;
  13.204  	unsigned char mbox[16];
  13.205  	int ret;
  13.206 @@ -5337,7 +5337,7 @@ static int
  13.207  mega_del_logdrv(mega_host_config *this_hba, int logdrv)
  13.208  {
  13.209    return -ENOSYS;
  13.210 -#if XENO_KILLED_DELLOGDRV
  13.211 +#if XEN_KILLED_DELLOGDRV
  13.212  	int		rval;
  13.213  	IO_LOCK_T;
  13.214  	DECLARE_WAIT_QUEUE_HEAD(wq);
  13.215 @@ -5407,7 +5407,7 @@ mega_del_logdrv(mega_host_config *this_h
  13.216  #endif
  13.217  }
  13.218  
  13.219 -#if XENO_KILLED_DELLOGDRV
  13.220 +#if XEN_KILLED_DELLOGDRV
  13.221  static int
  13.222  mega_do_del_logdrv(mega_host_config *this_hba, int logdrv)
  13.223  {
    14.1 --- a/xen/drivers/scsi/megaraid.h	Tue Mar 23 09:48:06 2004 +0000
    14.2 +++ b/xen/drivers/scsi/megaraid.h	Tue Mar 23 09:57:30 2004 +0000
    14.3 @@ -239,9 +239,9 @@
    14.4      use_new_eh_code:    1,                      /* Uses new error handling code */\
    14.5    }
    14.6  #endif
    14.7 -// XENO: REMOVED     command:	  	megaraid_command,	/* Command Function		*/
    14.8 -// XENO: REMOVED     proc_info:		megaraid_proc_info,     /* /proc driver info		*/
    14.9 -// XENO: REMOVED	highmem_io:		1, /* enable HIGHMEM I/O */ 
   14.10 +// XEN: REMOVED     command:	  	megaraid_command,	/* Command Function		*/
   14.11 +// XEN: REMOVED     proc_info:		megaraid_proc_info,     /* /proc driver info		*/
   14.12 +// XEN: REMOVED	highmem_io:		1, /* enable HIGHMEM I/O */ 
   14.13  
   14.14  
   14.15  /***********************************************************************
   14.16 @@ -784,7 +784,7 @@ typedef struct _mega_host_config {
   14.17  	u8 max_cmds;
   14.18  	mega_scb scbList[MAX_COMMANDS];
   14.19  
   14.20 -#if XENO_KILLED
   14.21 +#if XEN_KILLED
   14.22  #define PROCBUFSIZE 4096
   14.23  	char procbuf[PROCBUFSIZE];
   14.24  	int procidx;
   14.25 @@ -803,7 +803,7 @@ typedef struct _mega_host_config {
   14.26  	int		support_random_del;	/* Do we support random deletion of logdrvs */
   14.27  	int		read_ldidmap;	/* set after logical drive deltion. The logical
   14.28  								drive number must be read from the map */
   14.29 -#if XENO_KILLED_DELLOGDRV
   14.30 +#if XEN_KILLED_DELLOGDRV
   14.31  	int		quiescent;	/* a stage reached when delete logical drive needs to
   14.32  						   be done. Stop sending requests to the hba till
   14.33  						   delete operation is completed */
    15.1 --- a/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h	Tue Mar 23 09:48:06 2004 +0000
    15.2 +++ b/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h	Tue Mar 23 09:57:30 2004 +0000
    15.3 @@ -122,7 +122,7 @@ int sym53c8xx_release(struct Scsi_Host *
    15.4  	use_clustering:		DISABLE_CLUSTERING,			\
    15.5  	}
    15.6  /* SAE */
    15.7 -#ifdef XENO_KILLED
    15.8 +#ifdef XEN_KILLED
    15.9  	highmem_io:		1}
   15.10  #endif
   15.11  
    16.1 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c	Tue Mar 23 09:48:06 2004 +0000
    16.2 +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c	Tue Mar 23 09:57:30 2004 +0000
    16.3 @@ -315,7 +315,7 @@ typedef dma_addr_t	bus_addr_t;
    16.4   */
    16.5  struct sym_eh_wait {
    16.6  /* SAE: */
    16.7 -#ifdef XENO_KILLED
    16.8 +#ifdef XEN_KILLED
    16.9  	struct semaphore sem;
   16.10  #endif
   16.11  	struct timer_list timer;
   16.12 @@ -1091,7 +1091,7 @@ static void __sym_eh_done(Scsi_Cmnd *cmd
   16.13  
   16.14  	/* Wake up the eh thread if it wants to sleep */
   16.15  /* SAE: No sleeping... */
   16.16 -#ifdef XENO_KILLED
   16.17 +#ifdef XEN_KILLED
   16.18  	if (ep->to_do == SYM_EH_DO_WAIT)
   16.19  		up(&ep->sem);
   16.20  #endif
   16.21 @@ -1160,13 +1160,13 @@ prepare:
   16.22  		break;
   16.23  	case SYM_EH_DO_WAIT:
   16.24  /* SAE: */
   16.25 -#ifdef XENO_KILLED
   16.26 +#ifdef XEN_KILLED
   16.27  #if LINUX_VERSION_CODE > LinuxVersionCode(2,3,0)
   16.28  		init_MUTEX_LOCKED(&ep->sem);
   16.29  #else
   16.30  		ep->sem = MUTEX_LOCKED;
   16.31  #endif
   16.32 -#endif /* XENO_KILLED */
   16.33 +#endif /* XEN_KILLED */
   16.34  		/* SAE: ??? */	
   16.35  		mdelay(10); 
   16.36  		/* fall through */
   16.37 @@ -1216,7 +1216,7 @@ finish:
   16.38  	/* Wait for completion with locks released, as required by kernel */
   16.39  	if (to_do == SYM_EH_DO_WAIT) {
   16.40  /* SAE: */
   16.41 -#ifdef XENO_KILLED
   16.42 +#ifdef XEN_KILLED
   16.43  		init_timer(&ep->timer);
   16.44  		ep->timer.expires = jiffies + (5*HZ);
   16.45  		ep->timer.function = sym_eh_timeout;
   16.46 @@ -1955,7 +1955,7 @@ sym_attach (Scsi_Host_Template *tpnt, in
   16.47  		dev->s.irq);
   16.48  
   16.49  /* SAE: No sparc in Xen... */
   16.50 -#ifdef XENO_KILLED
   16.51 +#ifdef XEN_KILLED
   16.52  #ifdef __sparc__
   16.53  		"irq %s\n",
   16.54  #else
   16.55 @@ -1969,7 +1969,7 @@ sym_attach (Scsi_Host_Template *tpnt, in
   16.56  #else
   16.57  		dev->s.irq);
   16.58  #endif
   16.59 -#endif /* XENO_KILLED */
   16.60 +#endif /* XEN_KILLED */
   16.61  
   16.62  	/*
   16.63  	 *  Get the firmware for this chip.
   16.64 @@ -2171,7 +2171,7 @@ sym_attach (Scsi_Host_Template *tpnt, in
   16.65  #endif
   16.66  	instance->select_queue_depths = sym53c8xx_select_queue_depths;
   16.67  /* SAE */
   16.68 -#ifdef XENO_KILLED
   16.69 +#ifdef XEN_KILLED
   16.70  	instance->highmem_io	= 1;
   16.71  #endif
   16.72  
   16.73 @@ -2771,7 +2771,7 @@ int __init sym53c8xx_detect(Scsi_Host_Te
   16.74  	 *    Initialize driver general stuff.
   16.75  	 */
   16.76  /* SAE: No proc */
   16.77 -#ifdef XENO_KILLED
   16.78 +#ifdef XEN_KILLED
   16.79  #ifdef SYM_LINUX_PROC_INFO_SUPPORT
   16.80  #if LINUX_VERSION_CODE < LinuxVersionCode(2,3,27)
   16.81       tpnt->proc_dir  = &proc_scsi_sym53c8xx;
   16.82 @@ -2780,7 +2780,7 @@ int __init sym53c8xx_detect(Scsi_Host_Te
   16.83  #endif
   16.84       tpnt->proc_info = sym53c8xx_proc_info;
   16.85  #endif
   16.86 -#endif /* XENO_KILLED */
   16.87 +#endif /* XEN_KILLED */
   16.88  
   16.89  #ifdef SYM_LINUX_BOOT_COMMAND_LINE_SUPPORT
   16.90  #ifdef MODULE
    17.1 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.h	Tue Mar 23 09:48:06 2004 +0000
    17.2 +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.h	Tue Mar 23 09:57:30 2004 +0000
    17.3 @@ -74,7 +74,7 @@
    17.4  #include <xen/delay.h>
    17.5  
    17.6  /* SAE: Not here... */
    17.7 -#ifdef XENO_KILLED
    17.8 +#ifdef XEN_KILLED
    17.9  #include <xen/signal.h>
   17.10  #endif
   17.11  
   17.12 @@ -87,7 +87,7 @@
   17.13  #include <xen/time.h>
   17.14  #include <xen/timer.h>
   17.15  /* SAE */
   17.16 -#ifdef XENO_KILLED
   17.17 +#ifdef XEN_KILLED
   17.18  #include <xen/stat.h>
   17.19  #endif
   17.20  
    18.1 --- a/xen/include/asm-i386/config.h	Tue Mar 23 09:48:06 2004 +0000
    18.2 +++ b/xen/include/asm-i386/config.h	Tue Mar 23 09:57:30 2004 +0000
    18.3 @@ -4,8 +4,8 @@
    18.4   * A Linux-style configuration list.
    18.5   */
    18.6  
    18.7 -#ifndef __XENO_I386_CONFIG_H__
    18.8 -#define __XENO_I386_CONFIG_H__
    18.9 +#ifndef __XEN_I386_CONFIG_H__
   18.10 +#define __XEN_I386_CONFIG_H__
   18.11  
   18.12  #define CONFIG_X86 1
   18.13  
   18.14 @@ -138,4 +138,4 @@ extern void __out_of_line_bug(int line) 
   18.15  #define out_of_line_bug() __out_of_line_bug(__LINE__)
   18.16  #endif /* __ASSEMBLY__ */
   18.17  
   18.18 -#endif /* __XENO_I386_CONFIG_H__ */
   18.19 +#endif /* __XEN_I386_CONFIG_H__ */
    19.1 --- a/xen/include/asm-x86_64/config.h	Tue Mar 23 09:48:06 2004 +0000
    19.2 +++ b/xen/include/asm-x86_64/config.h	Tue Mar 23 09:57:30 2004 +0000
    19.3 @@ -5,8 +5,8 @@
    19.4   * 
    19.5   */
    19.6  
    19.7 -#ifndef __XENO_X86_64_CONFIG_H__
    19.8 -#define __XENO_X86_64_CONFIG_H__
    19.9 +#ifndef __XEN_X86_64_CONFIG_H__
   19.10 +#define __XEN_X86_64_CONFIG_H__
   19.11  
   19.12  #define CONFIG_X86    1
   19.13  #define CONFIG_X86_64BITMODE 1
   19.14 @@ -290,4 +290,4 @@ extern void __out_of_line_bug(int line) 
   19.15  #define out_of_line_bug() __out_of_line_bug(__LINE__)
   19.16  #endif /* __ASSEMBLY__ */
   19.17  
   19.18 -#endif /* __XENO_X86_64_CONFIG_H__ */
   19.19 +#endif /* __XEN_X86_64_CONFIG_H__ */
    20.1 --- a/xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h	Tue Mar 23 09:48:06 2004 +0000
    20.2 +++ b/xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h	Tue Mar 23 09:57:30 2004 +0000
    20.3 @@ -1,7 +1,7 @@
    20.4  /******************************************************************************
    20.5   * arch-i386/hypervisor-if.h
    20.6   * 
    20.7 - * Interface to x86 32-bit Xeno hypervisor.
    20.8 + * Guest OS interface to x86 32-bit Xen.
    20.9   */
   20.10  
   20.11  #ifndef __HYPERVISOR_IF_I386_H__
    21.1 --- a/xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h	Tue Mar 23 09:48:06 2004 +0000
    21.2 +++ b/xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h	Tue Mar 23 09:57:30 2004 +0000
    21.3 @@ -1,7 +1,7 @@
    21.4  /******************************************************************************
    21.5   * arch-x86_64/hypervisor-if.h
    21.6   * 
    21.7 - * Interface to AMD x86-64 bit Xeno hypervisor.
    21.8 + * Guest OS interface to AMD x86-64 bit Xen.
    21.9   */
   21.10  
   21.11  #ifndef __HYPERVISOR_IF_X86_64_H__
    22.1 --- a/xen/include/hypervisor-ifs/hypervisor-if.h	Tue Mar 23 09:48:06 2004 +0000
    22.2 +++ b/xen/include/hypervisor-ifs/hypervisor-if.h	Tue Mar 23 09:57:30 2004 +0000
    22.3 @@ -1,7 +1,7 @@
    22.4  /******************************************************************************
    22.5   * hypervisor-if.h
    22.6   * 
    22.7 - * Interface to Xeno hypervisor.
    22.8 + * Guest OS interface to Xen.
    22.9   */
   22.10  
   22.11  #ifndef __HYPERVISOR_IF_H__
   22.12 @@ -222,8 +222,8 @@ typedef struct shared_info_st {
   22.13       * The following values are updated periodically (and not necessarily
   22.14       * atomically!). The guest OS detects this because 'time_version1' is
   22.15       * incremented just before updating these values, and 'time_version2' is
   22.16 -     * incremented immediately after. See Xenolinux code for an example of how 
   22.17 -     * to read these values safely (arch/xen/kernel/time.c).
   22.18 +     * incremented immediately after. See the Xen-specific Linux code for an
   22.19 +     * example of how to read these values safely (arch/xen/kernel/time.c).
   22.20       */
   22.21      unsigned long      time_version1;   /* A version number for info below.  */
   22.22      unsigned long      time_version2;   /* A version number for info below.  */
    23.1 --- a/xen/include/xen/config.h	Tue Mar 23 09:48:06 2004 +0000
    23.2 +++ b/xen/include/xen/config.h	Tue Mar 23 09:57:30 2004 +0000
    23.3 @@ -4,8 +4,8 @@
    23.4   * A Linux-style configuration list.
    23.5   */
    23.6  
    23.7 -#ifndef __XENO_CONFIG_H__
    23.8 -#define __XENO_CONFIG_H__
    23.9 +#ifndef __XEN_CONFIG_H__
   23.10 +#define __XEN_CONFIG_H__
   23.11  
   23.12  #include <asm/config.h>
   23.13  
   23.14 @@ -42,4 +42,4 @@ extern unsigned int opt_ser_baud;
   23.15  #define SERIAL_ENABLED (opt_ser_baud != 0)
   23.16  #endif
   23.17  
   23.18 -#endif /* __XENO_CONFIG_H__ */
   23.19 +#endif /* __XEN_CONFIG_H__ */
    24.1 --- a/xen/include/xen/mm.h	Tue Mar 23 09:48:06 2004 +0000
    24.2 +++ b/xen/include/xen/mm.h	Tue Mar 23 09:57:30 2004 +0000
    24.3 @@ -1,6 +1,6 @@
    24.4  
    24.5 -#ifndef __XENO_MM_H__
    24.6 -#define __XENO_MM_H__
    24.7 +#ifndef __XEN_MM_H__
    24.8 +#define __XEN_MM_H__
    24.9  
   24.10  #include <xen/config.h>
   24.11  #include <xen/list.h>
   24.12 @@ -328,4 +328,4 @@ int memguard_is_guarded(void *p);
   24.13  #define memguard_is_guarded(_p)        (0)
   24.14  #endif
   24.15  
   24.16 -#endif /* __XENO_MM_H__ */
   24.17 +#endif /* __XEN_MM_H__ */
    25.1 --- a/xen/include/xen/perfc.h	Tue Mar 23 09:48:06 2004 +0000
    25.2 +++ b/xen/include/xen/perfc.h	Tue Mar 23 09:57:30 2004 +0000
    25.3 @@ -1,6 +1,6 @@
    25.4  
    25.5 -#ifndef __XENO_PERFC_H__
    25.6 -#define __XENO_PERFC_H__
    25.7 +#ifndef __XEN_PERFC_H__
    25.8 +#define __XEN_PERFC_H__
    25.9  
   25.10  #include <asm/atomic.h>
   25.11  
   25.12 @@ -53,4 +53,4 @@ extern struct perfcounter_t perfcounters
   25.13  #define perfc_addc(x,y)   atomic_add((y), &perfcounters.x[smp_processor_id()])
   25.14  #define perfc_adda(x,y,z) atomic_add((z), &perfcounters.x[y])
   25.15  
   25.16 -#endif /* __XENO_PERFC_H__ */
   25.17 +#endif /* __XEN_PERFC_H__ */
    26.1 --- a/xen/include/xen/time.h	Tue Mar 23 09:48:06 2004 +0000
    26.2 +++ b/xen/include/xen/time.h	Tue Mar 23 09:57:30 2004 +0000
    26.3 @@ -24,8 +24,8 @@
    26.4  
    26.5  
    26.6  
    26.7 -#ifndef __XENO_TIME_H__
    26.8 -#define __XENO_TIME_H__
    26.9 +#ifndef __XEN_TIME_H__
   26.10 +#define __XEN_TIME_H__
   26.11  
   26.12  #include <asm/ptrace.h>  /* XXX Only used for do_timer which should be moved */
   26.13  #include <asm/time.h>    /* pull in architecture specific time definition */
   26.14 @@ -67,4 +67,4 @@ extern void do_settime(unsigned long sec
   26.15                         u64 system_time_base);
   26.16  extern void do_timer(struct pt_regs *regs);
   26.17  
   26.18 -#endif /* __XENO_TIME_H__ */
   26.19 +#endif /* __XEN_TIME_H__ */
    27.1 --- a/xen/include/xen/trace.h	Tue Mar 23 09:48:06 2004 +0000
    27.2 +++ b/xen/include/xen/trace.h	Tue Mar 23 09:57:30 2004 +0000
    27.3 @@ -18,8 +18,8 @@
    27.4   * See also common/trace.c and the dom0 op in include/hypervisor-ifs/dom0_ops.h
    27.5   */
    27.6  
    27.7 -#ifndef __XENO_TRACE_H__
    27.8 -#define __XENO_TRACE_H__
    27.9 +#ifndef __XEN_TRACE_H__
   27.10 +#define __XEN_TRACE_H__
   27.11  
   27.12  #include <hypervisor-ifs/trace.h>
   27.13  
   27.14 @@ -122,4 +122,4 @@ static inline int trace(u32 event, u32 d
   27.15  
   27.16  #endif /* TRACE_BUFFER */
   27.17  
   27.18 -#endif /* __XENO_TRACE_H__ */
   27.19 +#endif /* __XEN_TRACE_H__ */
    28.1 --- a/xen/include/xen/vif.h	Tue Mar 23 09:48:06 2004 +0000
    28.2 +++ b/xen/include/xen/vif.h	Tue Mar 23 09:57:30 2004 +0000
    28.3 @@ -6,8 +6,8 @@
    28.4   * Copyright (c) 2002-2003, A K Warfield and K A Fraser
    28.5   */
    28.6  
    28.7 -#ifndef __XENO_VIF_H__
    28.8 -#define __XENO_VIF_H__
    28.9 +#ifndef __XEN_VIF_H__
   28.10 +#define __XEN_VIF_H__
   28.11  
   28.12  /* virtual network interface struct and associated defines. */
   28.13  /* net_vif_st is the larger struct that describes a virtual network interface
   28.14 @@ -112,5 +112,5 @@ void delete_all_domain_vfr_rules(struct 
   28.15  #define VIF_DROP  ((net_vif_t *)1)
   28.16  #define VIF_LOCAL(_vif) ((unsigned long)(_vif) > 1)
   28.17  
   28.18 -#endif /* __XENO_VIF_H__ */
   28.19 +#endif /* __XEN_VIF_H__ */
   28.20  
    29.1 --- a/xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile	Tue Mar 23 09:48:06 2004 +0000
    29.2 +++ b/xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile	Tue Mar 23 09:57:30 2004 +0000
    29.3 @@ -6,8 +6,8 @@ xenolinux.gz: xenolinux
    29.4  	gzip -f -9 < $< > $@
    29.5  
    29.6  xenolinux: $(TOPDIR)/vmlinux
    29.7 -	# Guest OS header -- first 8 bytes are identifier 'XenoGues'.
    29.8 -	echo -e -n 'XenoGues' >$@ 
    29.9 +	# Guest OS header -- first 8 bytes are identifier 'XenGuest'.
   29.10 +	echo -e -n 'XenGuest' >$@ 
   29.11  	# Guest OS header -- next 4 bytes are load address (0xC0000000).
   29.12  	echo -e -n '\000\000\000\300' >>$@
   29.13  	$(OBJCOPY) $< xenolinux.body