diff options
29 files changed, 137 insertions, 137 deletions
diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 41d6785c00..fc9c2bf733 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -27,8 +27,8 @@ $(TARGET): hypervisor-ifs head.o $(OBJS) # Image will load at 0xC0000000. First bytes from head.o #$(LD) -N -Ttext 0xC0000000 head.o $(OBJS) -o $@.elf $(LD) -N -T minios.lds head.o $(OBJS) -o $@.elf - # Guest OS header -- first 8 bytes are identifier 'XenoGues'. - echo -e -n 'XenoGues' >$@ + # Guest OS header -- first 8 bytes are identifier 'XenGuest'. + echo -e -n 'XenGuest' >$@ # Guest OS header -- next 4 bytes are load address (0xC0000000). echo -e -n '\000\000\000\300' >>$@ # Create a raw bag of bytes from the ELF image. diff --git a/tools/xc/lib/xc_linux_build.c b/tools/xc/lib/xc_linux_build.c index 0659bb99c7..fa388d52ef 100644 --- a/tools/xc/lib/xc_linux_build.c +++ b/tools/xc/lib/xc_linux_build.c @@ -6,7 +6,7 @@ #include <zlib.h> /* This string is written to the head of every guest kernel image. */ -#define GUEST_SIG "XenoGues" +#define GUEST_SIG "XenGuest" #define SIG_LEN 8 #define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED) @@ -56,7 +56,7 @@ static int read_kernel_header(gzFile gfd, long dom_size, return -1; } - /* Read the load address which immediately follows the Xeno signature. */ + /* Read the load address which immediately follows the Xen signature. */ gzread(gfd, load_addr, sizeof(unsigned long)); return 0; diff --git a/xen/common/domain.c b/xen/common/domain.c index b601a5ffb7..32f1840266 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -621,9 +621,9 @@ int setup_guestos(struct task_struct *p, dom0_createdomain_t *params, data_start = map_domain_mem((unsigned long)phy_data_start); - if ( strncmp(data_start, "XenoGues", 8) ) + if ( strncmp(data_start, "XenGuest", 8) ) { - printk("DOM%llu: Invalid guest OS image\n", dom); + printk("DOM%llu: Invalid guest OS image - bad signature\n", dom); unmap_domain_mem(data_start); return -1; } @@ -821,7 +821,7 @@ int setup_guestos(struct task_struct *p, dom0_createdomain_t *params, } *dst = '\0'; - /* NB: Give up the VGA console iff the Xenolinux DOM0 wants it. */ + /* NB: Give up the VGA console if DOM0 is ocnfigured to grab it. */ console_endboot(strstr(cmdline, "tty0") != NULL); /* Reinstate the caller's page tables. */ diff --git a/xen/common/network.c b/xen/common/network.c index e7cc1ac8f9..2f9051d9e5 100644 --- a/xen/common/network.c +++ b/xen/common/network.c @@ -131,9 +131,9 @@ net_vif_t *create_net_vif(domid_t dom) if ( (p->domain == 0) && (idx == 0) ) { /* - * DOM0/VIF0 gets the real physical MAC address, so that users can - * easily get a Xenoserver up and running by using an existing DHCP - * entry. + * DOM0/VIF0 gets the real physical MAC address, so that users can + * easily get a Xen-based machine up and running by using an existing + * DHCP entry. */ memcpy(new_vif->vmac, the_dev->dev_addr, ETH_ALEN); } diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index f7436e31f6..ba9c29dd44 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -1,7 +1,7 @@ /****************************************************************************** * page_alloc.c * - * Simple buddy allocator for Xenoserver hypervisor. + * Simple buddy heap allocator for Xen. * * Copyright (c) 2002 K A Fraser * diff --git a/xen/drivers/message/fusion/linux_compat.h b/xen/drivers/message/fusion/linux_compat.h index cb2a87355b..7662decb6a 100644 --- a/xen/drivers/message/fusion/linux_compat.h +++ b/xen/drivers/message/fusion/linux_compat.h @@ -148,7 +148,7 @@ typedef void (*__cleanup_module_func_t)(void); /* PCI/driver subsystem { */ /* SAE: Why not just use Linux's PCI stuff */ -#if XENO_KILLED +#if XEN_KILLED /*#ifndef pci_for_each_dev*/ #define pci_for_each_dev(dev) for((dev)=pci_devices; (dev)!=NULL; (dev)=(dev)->next) #define pci_peek_next_dev(dev) ((dev)->next ? (dev)->next : NULL) @@ -172,7 +172,7 @@ typedef void (*__cleanup_module_func_t)(void); }) #else /* SAE: Is Linux's PCI stuff not good enough? */ -#if XENO_KILLED +#if XEN_KILLED #define pci_peek_next_dev(dev) ((dev) != pci_dev_g(&pci_devices) ? pci_dev_g((dev)->global_list.next) : NULL) #define PCI_BASEADDR_FLAGS(idx) resource[idx].flags @@ -185,7 +185,7 @@ typedef void (*__cleanup_module_func_t)(void); /* Compatability for the 2.3.x PCI DMA API. */ /* SAE: No need for this */ -#if XENO_KILLED +#if XEN_KILLED /*#ifndef PCI_DMA_BIDIRECTIONAL*/ /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ diff --git a/xen/drivers/message/fusion/mptbase.c b/xen/drivers/message/fusion/mptbase.c index 051357aa1b..1d3232c654 100644 --- a/xen/drivers/message/fusion/mptbase.c +++ b/xen/drivers/message/fusion/mptbase.c @@ -180,7 +180,7 @@ static int last_drv_idx = -1; static int isense_idx = -1; /* SAE: No wait queues or threads */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED static DECLARE_WAIT_QUEUE_HEAD(mpt_waitq); #endif @@ -627,7 +627,7 @@ mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *reply) * Wake up the original calling thread */ pCfg->wait_done = 1; -#ifdef XENO_KILLED +#ifdef XEN_KILLED wake_up(&mpt_waitq); #else mdelay(250); @@ -2194,7 +2194,7 @@ MakeIocReady(MPT_ADAPTER *ioc, int force, int sleepFlag) if (sleepFlag == CAN_SLEEP) { /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); #else @@ -2546,7 +2546,7 @@ SendIocInit(MPT_ADAPTER *ioc, int sleepFlag) while (state != MPI_IOC_STATE_OPERATIONAL && --cntdn) { if (sleepFlag == CAN_SLEEP) { /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); #else @@ -2980,7 +2980,7 @@ mpt_downloadboot(MPT_ADAPTER *ioc, int sleepFlag) /* wait 100 msec */ if (sleepFlag == CAN_SLEEP) { /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(100 * HZ / 1000); #else @@ -3219,7 +3219,7 @@ KickStart(MPT_ADAPTER *ioc, int force, int sleepFlag) if (sleepFlag == CAN_SLEEP) { /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED schedule_timeout(HZ); #else mdelay(1000); @@ -3244,7 +3244,7 @@ KickStart(MPT_ADAPTER *ioc, int force, int sleepFlag) } if (sleepFlag == CAN_SLEEP) { /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); #else @@ -3321,7 +3321,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag) /* wait 100 msec */ if (sleepFlag == CAN_SLEEP) { /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(100 * HZ / 1000); #else @@ -3419,7 +3419,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag) /* wait 1 sec */ if (sleepFlag == CAN_SLEEP) { /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ); #else @@ -3452,7 +3452,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag) /* wait 1 sec */ if (sleepFlag == CAN_SLEEP) { /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ); #else @@ -3491,7 +3491,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag) /* wait 100 msec */ if (sleepFlag == CAN_SLEEP) { /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(100 * HZ / 1000); #else @@ -3591,7 +3591,7 @@ SendIocReset(MPT_ADAPTER *ioc, u8 reset_type, int sleepFlag) if (sleepFlag == CAN_SLEEP) { /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); #else @@ -3930,7 +3930,7 @@ WaitForDoorbellAck(MPT_ADAPTER *ioc, int howlong, int sleepFlag) if (! (intstat & MPI_HIS_IOP_DOORBELL_STATUS)) break; /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); #else @@ -3985,7 +3985,7 @@ WaitForDoorbellInt(MPT_ADAPTER *ioc, int howlong, int sleepFlag) if (intstat & MPI_HIS_DOORBELL_INTERRUPT) break; /* SAE: Can't do this in the hypervisor */ -#if XENO_KILLED +#if XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); #else @@ -4986,7 +4986,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg) mpt_put_msg_frame(mpt_base_index, ioc->id, mf); /* SAE: No wait queues */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED wait_event(mpt_waitq, pCfg->wait_done); #else /* SAE: We'll just wait a bit */ @@ -5080,7 +5080,7 @@ mpt_ioc_reset(MPT_ADAPTER *ioc, int reset_phase) pCfg->status = MPT_CONFIG_ERROR; pCfg->wait_done = 1; -#ifdef XENO_KILLED +#ifdef XEN_KILLED wake_up(&mpt_waitq); #else mdelay(250); diff --git a/xen/drivers/message/fusion/mptscsih.c b/xen/drivers/message/fusion/mptscsih.c index 836905b1f6..8e4b6dd966 100644 --- a/xen/drivers/message/fusion/mptscsih.c +++ b/xen/drivers/message/fusion/mptscsih.c @@ -207,7 +207,7 @@ static void mptscsih_fillbuf(char *buffer, int size, int index, int width); /*static int mptscsih_setup(char *str);*/ static int mptscsih_halt(struct notifier_block *nb, ulong event, void *buf); -#if XENO_KILLED +#if XEN_KILLED /* * Reboot Notification */ @@ -262,7 +262,7 @@ static struct mpt_work_struct mptscsih_dvTask; #endif /* SAE: No wait queues in Xen */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED /* * Wait Queue setup */ @@ -1961,7 +1961,7 @@ mptscsih_detect(Scsi_Host_Template *tpnt) done: if (mpt_scsi_hosts > 0) { /* SAE: */ -#if XENO_KILLED +#if XEN_KILLED register_reboot_notifier(&mptscsih_notifier); #endif } @@ -2020,7 +2020,7 @@ mptscsih_release(struct Scsi_Host *host) while(mytaskQ_bh_active && --count) { /* SAE: */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); #else @@ -2043,7 +2043,7 @@ mptscsih_release(struct Scsi_Host *host) spin_unlock_irqrestore(&dvtaskQ_lock, flags); while(dvtaskQ_active && --count) { /* SAE: */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); #else @@ -2062,7 +2062,7 @@ mptscsih_release(struct Scsi_Host *host) #endif /* SAE: */ -#if XENO_KILLED +#if XEN_KILLED unregister_reboot_notifier(&mptscsih_notifier); #endif @@ -2204,7 +2204,7 @@ mptscsih_halt(struct notifier_block *nb, ulong event, void *buf) } /* SAE: Gone */ -#if XENO_KILLED +#if XEN_KILLED unregister_reboot_notifier(&mptscsih_notifier); #endif return NOTIFY_OK; @@ -3660,7 +3660,7 @@ mptscsih_taskmgmt_bh(void *sc) do { /* SAE: Not in kernel thread */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ/4); #else @@ -4373,7 +4373,7 @@ mptscsih_ioc_reset(MPT_ADAPTER *ioc, int reset_phase) hd->pLocal->completion = MPT_SCANDV_DID_RESET; scandv_wait_done = 1; /* SAE: No wait queues */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED wake_up(&scandv_waitq); #else mdelay(100); @@ -5793,7 +5793,7 @@ wakeup: */ scandv_wait_done = 1; /* SAE: No wait queues */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED wake_up(&scandv_waitq); #else mdelay(100); @@ -5931,7 +5931,7 @@ mptscsih_do_raid(MPT_SCSI_HOST *hd, u8 action, INTERNAL_CMD *io) add_timer(&hd->timer); mptscsih_put_msgframe(ScsiScanDvCtx, hd->ioc->id, mf); /* SAE: No wait queues */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED wait_event(scandv_waitq, scandv_wait_done); #else /* SAE: Decrease the wait time: 100 -> 1 */ @@ -6177,7 +6177,7 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *io) add_timer(&hd->timer); mptscsih_put_msgframe(ScsiScanDvCtx, hd->ioc->id, mf); /* SAE: No wait queues */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED wait_event(scandv_waitq, scandv_wait_done); #else /* SAE: Decrease the wait time: 100 -> 1 */ @@ -6399,7 +6399,7 @@ mptscsih_domainValidation(void *arg) spin_unlock_irqrestore(&dvtaskQ_lock, flags); /* SAE: */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ/4); #else @@ -6454,7 +6454,7 @@ mptscsih_domainValidation(void *arg) hd->ioc->spi_data.dvStatus[id] &= ~MPT_SCSICFG_NEED_DV; /* SAE: */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(HZ/4); #else diff --git a/xen/drivers/message/fusion/mptscsih.h b/xen/drivers/message/fusion/mptscsih.h index 90b87c76e3..4efc5f1451 100644 --- a/xen/drivers/message/fusion/mptscsih.h +++ b/xen/drivers/message/fusion/mptscsih.h @@ -199,7 +199,7 @@ struct mptscsih_driver_setup /* SAE: mdelay */ #define SCHEDULE_TASK(x) mdelay(100) -#if XENO_KILLED +#if XEN_KILLED #define SCHEDULE_TASK(x) \ *MOD_INC_USE_COUNT*; \ diff --git a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c index 25687afd4a..4160261569 100644 --- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c @@ -374,7 +374,7 @@ static void ahd_linux_filter_command(struct ahd_softc*, Scsi_Cmnd*, struct scb*); static void ahd_linux_dev_timed_unfreeze(u_long arg); /* SAE */ -#if XENO_KILLED +#if XEN_KILLED static void ahd_linux_sem_timeout(u_long arg); static int ahd_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag); #endif @@ -1306,7 +1306,7 @@ ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg) ahd_lockinit(ahd); ahd_done_lockinit(ahd); /* SAE */ -#if XENO_KILLED +#if XEN_KILLED #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) init_MUTEX_LOCKED(&ahd->platform_data->eh_sem); #else @@ -1319,7 +1319,7 @@ ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg) #endif ahd->seltime = (aic79xx_seltime & 0x3) << 4; /* SAE */ -#if XENO_KILLED +#if XEN_KILLED if (TAILQ_EMPTY(&ahd_tailq)) register_reboot_notifier(&ahd_linux_notifier); #endif @@ -2106,7 +2106,7 @@ ahd_done(struct ahd_softc *ahd, struct scb * scb) if ((scb->flags & SCB_RECOVERY_SCB) != 0) { printf("Recovery SCB completes\n"); /* SAE: */ -#if XENO_KILLED +#if XEN_KILLED up(&ahd->platform_data->eh_sem); #endif } @@ -2449,7 +2449,7 @@ ahd_release_simq(struct ahd_softc *ahd) } /* SAE */ -#if XENO_KILLED +#if XEN_KILLED static void ahd_linux_sem_timeout(u_long arg) { @@ -2702,7 +2702,7 @@ done: /* SAE */ printf("SAE: aic79xxx: recovery failed\n"); retval=FAILED; -#if XENO_KILLED +#if XEN_KILLED struct timer_list timer; int ret; @@ -2732,7 +2732,7 @@ done: spin_lock_irq(&io_request_lock); return (retval); } -#endif /* XENO_KILLED */ +#endif /* XEN_KILLED */ static void ahd_linux_dev_timed_unfreeze(u_long arg) @@ -2856,19 +2856,19 @@ ahd_linux_biosparam(Disk *disk, kdev_t dev, int geom[]) int sectors; int cylinders; /* SAE */ -#if XENO_KILLED +#if XEN_KILLED int ret; #endif int extended; struct ahd_softc *ahd; /* SAE */ -#if XENO_KILLED +#if XEN_KILLED struct buffer_head *bh; #endif ahd = *((struct ahd_softc **)disk->device->host->hostdata); /* SAE: */ -#if XENO_KILLED +#if XEN_KILLED bh = bread(MKDEV(MAJOR(dev), MINOR(dev) & ~0xf), 0, 1024); if (bh) { diff --git a/xen/drivers/scsi/aic7xxx/aic79xx_osm.h b/xen/drivers/scsi/aic7xxx/aic79xx_osm.h index 6d778e5c00..c17001d25b 100644 --- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.h +++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.h @@ -50,7 +50,7 @@ #include <xen/ioport.h> #include <xen/pci.h> /* SAE */ -#if XENO_KILLED +#if XEN_KILLED #include <xen/version.h> #endif #ifndef AHD_MODVERSION_FILE @@ -151,7 +151,7 @@ extern Scsi_Host_Template* aic79xx_driver_template; /***************************** Bus Space/DMA **********************************/ /* SAE */ typedef dma_addr_t bus_addr_t; -#if XENO_KILLED +#if XEN_KILLED #if LINUX_VERSION_CODE > KERNEL_VERSION(2,2,17) typedef dma_addr_t bus_addr_t; #else @@ -610,7 +610,7 @@ struct scb_platform_data { uint32_t xfer_len; /* SAE */ uint32_t resid; /* Transfer residual */ -#if XENO_KILLED +#if XEN_KILLED #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) uint32_t resid; /* Transfer residual */ #endif @@ -634,7 +634,7 @@ struct ahd_platform_data { /* SAE */ spinlock_t spin_lock; struct tasklet_struct runq_tasklet; -#if XENO_KILLED +#if XEN_KILLED #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0) spinlock_t spin_lock; #endif @@ -645,7 +645,7 @@ struct ahd_platform_data { u_int qfrozen; struct timer_list reset_timer; /* SAE: No semaphores */ -#if XENO_KILLED +#if XEN_KILLED struct semaphore eh_sem; #endif struct Scsi_Host *host; /* pointer to scsi host */ diff --git a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c index 6bb0b2a01a..2d4f18f1cc 100644 --- a/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/xen/drivers/scsi/aic7xxx/aic7xxx_osm.c @@ -721,7 +721,7 @@ ahc_runq_tasklet(unsigned long data) #include <xen/notifier.h> #include <xen/reboot.h> -#if XENO_KILLED +#if XEN_KILLED static struct notifier_block ahc_linux_notifier = { ahc_linux_halt, NULL, 0 }; @@ -1376,7 +1376,7 @@ ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg) #endif ahc->seltime = (aic7xxx_seltime & 0x3) << 4; ahc->seltime_b = (aic7xxx_seltime & 0x3) << 4; -#if XENO_KILLED +#if XEN_KILLED if (TAILQ_EMPTY(&ahc_tailq)) register_reboot_notifier(&ahc_linux_notifier); #endif @@ -1417,7 +1417,7 @@ ahc_platform_free(struct ahc_softc *ahc) free(ahc->platform_data, M_DEVBUF); } if (TAILQ_EMPTY(&ahc_tailq)) { -#ifdef XENO_KILLED +#ifdef XEN_KILLED unregister_reboot_notifier(&ahc_linux_notifier); #endif #ifdef CONFIG_PCI diff --git a/xen/drivers/scsi/megaraid.c b/xen/drivers/scsi/megaraid.c index e12bc4c57b..727f19b28a 100644 --- a/xen/drivers/scsi/megaraid.c +++ b/xen/drivers/scsi/megaraid.c @@ -777,7 +777,7 @@ MODULE_PARM (megaraid, "s"); static int skip_id = -1; static int numCtlrs = 0; static mega_host_config *megaCtlrs[FC_MAX_CHANNELS] = { 0 }; -#if XENO_KILLED +#if XEN_KILLED static struct proc_dir_entry *mega_proc_dir_entry; #endif @@ -786,7 +786,7 @@ static u32 maxCmdTime = 0; #endif static mega_scb *pLastScb = NULL; -#if XENO_KILLED +#if XEN_KILLED static struct notifier_block mega_notifier = { megaraid_reboot_notify, NULL, @@ -801,7 +801,7 @@ struct mega_hbas mega_hbas[MAX_CONTROLLERS]; * The File Operations structure for the serial/ioctl interface of the driver */ /* For controller re-ordering */ -#if XENO_KILLED +#if XEN_KILLED static struct file_operations megadev_fops = { ioctl:megadev_ioctl_entry, open:megadev_open, @@ -818,7 +818,7 @@ static struct mcontroller mcontroller[MAX_CONTROLLERS]; /* The current driver version */ static u32 driver_ver = 0x118C; -#if XENO_KILLED +#if XEN_KILLED /* major number used by the device for character interface */ static int major; @@ -2330,7 +2330,7 @@ static void megaraid_isr (int irq, void *devp, struct pt_regs *regs) if (pScb->SCpnt->cmnd[0] == M_RD_IOCTL_CMD_NEW) { /* save the status byte for the queue routine to use */ pScb->SCpnt->result = qStatus; -#if XENO_KILLED +#if XEN_KILLED up (&pScb->ioctl_sem); #endif } else { @@ -2939,7 +2939,7 @@ static int mega_i_query_adapter (mega_host_config * megaCfg) /*---------------------------------------------------------- * Returns data to be displayed in /proc/scsi/megaraid/X *----------------------------------------------------------*/ -#if XENO_KILLED +#if XEN_KILLED int megaraid_proc_info (char *buffer, char **start, off_t offset, int length, int host_no, int inout) { @@ -3118,7 +3118,7 @@ static int mega_findCard (Scsi_Host_Template * pHostTmpl, megaCfg->lock_pend = SPIN_LOCK_UNLOCKED; megaCfg->lock_scsicmd = SPIN_LOCK_UNLOCKED; megaCfg->flag = flag; -#if XENO_KILLED_DELLOGDRV +#if XEN_KILLED_DELLOGDRV megaCfg->int_qh = NULL; megaCfg->int_qt = NULL; megaCfg->int_qlen = 0; @@ -3326,7 +3326,7 @@ static int mega_findCard (Scsi_Host_Template * pHostTmpl, int megaraid_detect (Scsi_Host_Template * pHostTmpl) { -#if XENO_KILLED +#if XEN_KILLED int ctlridx = 0; #endif int count = 0; @@ -3409,7 +3409,7 @@ int megaraid_detect (Scsi_Host_Template * pHostTmpl) * First argument (major) to register_chrdev implies a dynamic major * number allocation. */ -#if XENO_KILLED +#if XEN_KILLED if (count) { major = register_chrdev (0, "megadev", &megadev_fops); @@ -3499,7 +3499,7 @@ int megaraid_release (struct Scsi_Host *pSHost) * register_chrdev() routine. */ -#if XENO_KILLED +#if XEN_KILLED unregister_chrdev (major, "megadev"); unregister_reboot_notifier (&mega_notifier); #endif @@ -3959,7 +3959,7 @@ int megaraid_queue (Scsi_Cmnd * SCpnt, void (*pktComp) (Scsi_Cmnd *)) * logical drive opertion. If it is, queue the commands in the * internal queue until the delete operation is complete. */ -#if XENO_KILLED_DELLOGDRV +#if XEN_KILLED_DELLOGDRV if( ! megaCfg->quiescent ) { #endif /* Add SCB to the head of the pending queue */ @@ -3976,7 +3976,7 @@ int megaraid_queue (Scsi_Cmnd * SCpnt, void (*pktComp) (Scsi_Cmnd *)) DRIVER_UNLOCK (megaCfg); return 0; } -#if XENO_KILLED_DELLOGDRV +#if XEN_KILLED_DELLOGDRV } else { /* Add SCB to the internal queue */ @@ -3992,11 +3992,11 @@ int megaraid_queue (Scsi_Cmnd * SCpnt, void (*pktComp) (Scsi_Cmnd *)) #endif if (pScb->SCpnt->cmnd[0] == M_RD_IOCTL_CMD_NEW) { -#if XENO_KILLED +#if XEN_KILLED init_MUTEX_LOCKED (&pScb->ioctl_sem); #endif spin_unlock_irq (&io_request_lock); -#if XENO_KILLED +#if XEN_KILLED down (&pScb->ioctl_sem); #endif user_area = (char *)*((u32*)&pScb->SCpnt->cmnd[4]); @@ -4027,7 +4027,7 @@ int megaraid_queue (Scsi_Cmnd * SCpnt, void (*pktComp) (Scsi_Cmnd *)) /*---------------------------------------------------------------------- * Issue a blocking command to the controller *----------------------------------------------------------------------*/ -#if XENO_KILLED +#if XEN_KILLED volatile static int internal_done_flag = 0; volatile static int internal_done_errcode = 0; @@ -4489,7 +4489,7 @@ int megaraid_biosparam (Disk * disk, kdev_t dev, int *geom) static int mega_partsize(Disk * disk, kdev_t dev, int *geom) { -#if XENO_KILLED +#if XEN_KILLED struct buffer_head *bh; struct partition *p, *largest = NULL; int i, largest_cyl; @@ -4731,7 +4731,7 @@ static int megadev_ioctl_entry (struct inode *inode, struct file *filep, /* * We do not allow parallel ioctls to the driver as of now. */ -#if XENO_KILLED // XXX JWS killed the locking! +#if XEN_KILLED // XXX JWS killed the locking! down (&mimd_entry_mtx); ret = megadev_ioctl (inode, filep, cmd, arg); up (&mimd_entry_mtx); @@ -4949,7 +4949,7 @@ static int megadev_ioctl (struct inode *inode, struct file *filep, scsicmd->cmnd[0] = MEGADEVIOC; scsicmd->request_buffer = (void *)&ioc; -#if XENO_KILLED +#if XEN_KILLED init_MUTEX_LOCKED(&mimd_ioctl_sem); #endif @@ -4957,7 +4957,7 @@ static int megadev_ioctl (struct inode *inode, struct file *filep, megaraid_queue(scsicmd, megadev_ioctl_done); IO_UNLOCK; -#if XENO_KILLED +#if XEN_KILLED down(&mimd_ioctl_sem); #endif if( !scsicmd->result && outlen ) { @@ -5104,7 +5104,7 @@ static int megadev_ioctl (struct inode *inode, struct file *filep, scsicmd->cmnd[0] = MEGADEVIOC; scsicmd->request_buffer = (void *) &ioc; -#if XENO_KILLED +#if XEN_KILLED init_MUTEX_LOCKED (&mimd_ioctl_sem); #endif @@ -5112,7 +5112,7 @@ static int megadev_ioctl (struct inode *inode, struct file *filep, megaraid_queue (scsicmd, megadev_ioctl_done); IO_UNLOCK; -#if XENO_KILLED +#if XEN_KILLED down (&mimd_ioctl_sem); #endif @@ -5173,7 +5173,7 @@ static int megadev_ioctl (struct inode *inode, struct file *filep, static void megadev_ioctl_done(Scsi_Cmnd *sc) { -#if XENO_KILLED +#if XEN_KILLED up (&mimd_ioctl_sem); #endif } @@ -5311,7 +5311,7 @@ mega_support_ext_cdb(mega_host_config *this_hba) static int mega_support_random_del(mega_host_config *this_hba) { -#if XENO_KILLED +#if XEN_KILLED mega_mailbox *mboxpnt; unsigned char mbox[16]; int ret; @@ -5337,7 +5337,7 @@ static int mega_del_logdrv(mega_host_config *this_hba, int logdrv) { return -ENOSYS; -#if XENO_KILLED_DELLOGDRV +#if XEN_KILLED_DELLOGDRV int rval; IO_LOCK_T; DECLARE_WAIT_QUEUE_HEAD(wq); @@ -5407,7 +5407,7 @@ mega_del_logdrv(mega_host_config *this_hba, int logdrv) #endif } -#if XENO_KILLED_DELLOGDRV +#if XEN_KILLED_DELLOGDRV static int mega_do_del_logdrv(mega_host_config *this_hba, int logdrv) { diff --git a/xen/drivers/scsi/megaraid.h b/xen/drivers/scsi/megaraid.h index 7e595567d1..ebae1a2790 100644 --- a/xen/drivers/scsi/megaraid.h +++ b/xen/drivers/scsi/megaraid.h @@ -239,9 +239,9 @@ use_new_eh_code: 1, /* Uses new error handling code */\ } #endif -// XENO: REMOVED command: megaraid_command, /* Command Function */ -// XENO: REMOVED proc_info: megaraid_proc_info, /* /proc driver info */ -// XENO: REMOVED highmem_io: 1, /* enable HIGHMEM I/O */ +// XEN: REMOVED command: megaraid_command, /* Command Function */ +// XEN: REMOVED proc_info: megaraid_proc_info, /* /proc driver info */ +// XEN: REMOVED highmem_io: 1, /* enable HIGHMEM I/O */ /*********************************************************************** @@ -784,7 +784,7 @@ typedef struct _mega_host_config { u8 max_cmds; mega_scb scbList[MAX_COMMANDS]; -#if XENO_KILLED +#if XEN_KILLED #define PROCBUFSIZE 4096 char procbuf[PROCBUFSIZE]; int procidx; @@ -803,7 +803,7 @@ typedef struct _mega_host_config { int support_random_del; /* Do we support random deletion of logdrvs */ int read_ldidmap; /* set after logical drive deltion. The logical drive number must be read from the map */ -#if XENO_KILLED_DELLOGDRV +#if XEN_KILLED_DELLOGDRV int quiescent; /* a stage reached when delete logical drive needs to be done. Stop sending requests to the hba till delete operation is completed */ diff --git a/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h b/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h index d2f5c58497..a87b4e9193 100644 --- a/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h +++ b/xen/drivers/scsi/sym53c8xx_2/sym53c8xx.h @@ -122,7 +122,7 @@ int sym53c8xx_release(struct Scsi_Host *); use_clustering: DISABLE_CLUSTERING, \ } /* SAE */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED highmem_io: 1} #endif diff --git a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c index 7ea4a53d7b..7053b458b1 100644 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c @@ -315,7 +315,7 @@ typedef dma_addr_t bus_addr_t; */ struct sym_eh_wait { /* SAE: */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED struct semaphore sem; #endif struct timer_list timer; @@ -1091,7 +1091,7 @@ static void __sym_eh_done(Scsi_Cmnd *cmd, int timed_out) /* Wake up the eh thread if it wants to sleep */ /* SAE: No sleeping... */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED if (ep->to_do == SYM_EH_DO_WAIT) up(&ep->sem); #endif @@ -1160,13 +1160,13 @@ prepare: break; case SYM_EH_DO_WAIT: /* SAE: */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED #if LINUX_VERSION_CODE > LinuxVersionCode(2,3,0) init_MUTEX_LOCKED(&ep->sem); #else ep->sem = MUTEX_LOCKED; #endif -#endif /* XENO_KILLED */ +#endif /* XEN_KILLED */ /* SAE: ??? */ mdelay(10); /* fall through */ @@ -1216,7 +1216,7 @@ finish: /* Wait for completion with locks released, as required by kernel */ if (to_do == SYM_EH_DO_WAIT) { /* SAE: */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED init_timer(&ep->timer); ep->timer.expires = jiffies + (5*HZ); ep->timer.function = sym_eh_timeout; @@ -1955,7 +1955,7 @@ sym_attach (Scsi_Host_Template *tpnt, int unit, sym_device *dev) dev->s.irq); /* SAE: No sparc in Xen... */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED #ifdef __sparc__ "irq %s\n", #else @@ -1969,7 +1969,7 @@ sym_attach (Scsi_Host_Template *tpnt, int unit, sym_device *dev) #else dev->s.irq); #endif -#endif /* XENO_KILLED */ +#endif /* XEN_KILLED */ /* * Get the firmware for this chip. @@ -2171,7 +2171,7 @@ sym_attach (Scsi_Host_Template *tpnt, int unit, sym_device *dev) #endif instance->select_queue_depths = sym53c8xx_select_queue_depths; /* SAE */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED instance->highmem_io = 1; #endif @@ -2771,7 +2771,7 @@ int __init sym53c8xx_detect(Scsi_Host_Template *tpnt) * Initialize driver general stuff. */ /* SAE: No proc */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED #ifdef SYM_LINUX_PROC_INFO_SUPPORT #if LINUX_VERSION_CODE < LinuxVersionCode(2,3,27) tpnt->proc_dir = &proc_scsi_sym53c8xx; @@ -2780,7 +2780,7 @@ int __init sym53c8xx_detect(Scsi_Host_Template *tpnt) #endif tpnt->proc_info = sym53c8xx_proc_info; #endif -#endif /* XENO_KILLED */ +#endif /* XEN_KILLED */ #ifdef SYM_LINUX_BOOT_COMMAND_LINE_SUPPORT #ifdef MODULE diff --git a/xen/drivers/scsi/sym53c8xx_2/sym_glue.h b/xen/drivers/scsi/sym53c8xx_2/sym_glue.h index cc40cc84fe..c60204df10 100644 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.h +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.h @@ -74,7 +74,7 @@ #include <xen/delay.h> /* SAE: Not here... */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED #include <xen/signal.h> #endif @@ -87,7 +87,7 @@ #include <xen/time.h> #include <xen/timer.h> /* SAE */ -#ifdef XENO_KILLED +#ifdef XEN_KILLED #include <xen/stat.h> #endif diff --git a/xen/include/asm-i386/config.h b/xen/include/asm-i386/config.h index 3e70edceca..5c5fa8616b 100644 --- a/xen/include/asm-i386/config.h +++ b/xen/include/asm-i386/config.h @@ -4,8 +4,8 @@ * A Linux-style configuration list. */ -#ifndef __XENO_I386_CONFIG_H__ -#define __XENO_I386_CONFIG_H__ +#ifndef __XEN_I386_CONFIG_H__ +#define __XEN_I386_CONFIG_H__ #define CONFIG_X86 1 @@ -138,4 +138,4 @@ extern void __out_of_line_bug(int line) __attribute__((noreturn)); #define out_of_line_bug() __out_of_line_bug(__LINE__) #endif /* __ASSEMBLY__ */ -#endif /* __XENO_I386_CONFIG_H__ */ +#endif /* __XEN_I386_CONFIG_H__ */ diff --git a/xen/include/asm-x86_64/config.h b/xen/include/asm-x86_64/config.h index 8b7c97612a..1de494f85a 100644 --- a/xen/include/asm-x86_64/config.h +++ b/xen/include/asm-x86_64/config.h @@ -5,8 +5,8 @@ * */ -#ifndef __XENO_X86_64_CONFIG_H__ -#define __XENO_X86_64_CONFIG_H__ +#ifndef __XEN_X86_64_CONFIG_H__ +#define __XEN_X86_64_CONFIG_H__ #define CONFIG_X86 1 #define CONFIG_X86_64BITMODE 1 @@ -290,4 +290,4 @@ extern void __out_of_line_bug(int line) __attribute__((noreturn)); #define out_of_line_bug() __out_of_line_bug(__LINE__) #endif /* __ASSEMBLY__ */ -#endif /* __XENO_X86_64_CONFIG_H__ */ +#endif /* __XEN_X86_64_CONFIG_H__ */ diff --git a/xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h b/xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h index a06020cd96..b1860260e5 100644 --- a/xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h +++ b/xen/include/hypervisor-ifs/arch-i386/hypervisor-if.h @@ -1,7 +1,7 @@ /****************************************************************************** * arch-i386/hypervisor-if.h * - * Interface to x86 32-bit Xeno hypervisor. + * Guest OS interface to x86 32-bit Xen. */ #ifndef __HYPERVISOR_IF_I386_H__ diff --git a/xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h b/xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h index 94c031120a..932efab07d 100644 --- a/xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h +++ b/xen/include/hypervisor-ifs/arch-x86_64/hypervisor-if.h @@ -1,7 +1,7 @@ /****************************************************************************** * arch-x86_64/hypervisor-if.h * - * Interface to AMD x86-64 bit Xeno hypervisor. + * Guest OS interface to AMD x86-64 bit Xen. */ #ifndef __HYPERVISOR_IF_X86_64_H__ diff --git a/xen/include/hypervisor-ifs/hypervisor-if.h b/xen/include/hypervisor-ifs/hypervisor-if.h index 402af3520c..5b15808694 100644 --- a/xen/include/hypervisor-ifs/hypervisor-if.h +++ b/xen/include/hypervisor-ifs/hypervisor-if.h @@ -1,7 +1,7 @@ /****************************************************************************** * hypervisor-if.h * - * Interface to Xeno hypervisor. + * Guest OS interface to Xen. */ #ifndef __HYPERVISOR_IF_H__ @@ -222,8 +222,8 @@ typedef struct shared_info_st { * The following values are updated periodically (and not necessarily * atomically!). The guest OS detects this because 'time_version1' is * incremented just before updating these values, and 'time_version2' is - * incremented immediately after. See Xenolinux code for an example of how - * to read these values safely (arch/xen/kernel/time.c). + * incremented immediately after. See the Xen-specific Linux code for an + * example of how to read these values safely (arch/xen/kernel/time.c). */ unsigned long time_version1; /* A version number for info below. */ unsigned long time_version2; /* A version number for info below. */ diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index a61e347eb9..9af6258200 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -4,8 +4,8 @@ * A Linux-style configuration list. */ -#ifndef __XENO_CONFIG_H__ -#define __XENO_CONFIG_H__ +#ifndef __XEN_CONFIG_H__ +#define __XEN_CONFIG_H__ #include <asm/config.h> @@ -42,4 +42,4 @@ extern unsigned int opt_ser_baud; #define SERIAL_ENABLED (opt_ser_baud != 0) #endif -#endif /* __XENO_CONFIG_H__ */ +#endif /* __XEN_CONFIG_H__ */ diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 7d43f431f9..b24412a3de 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -1,6 +1,6 @@ -#ifndef __XENO_MM_H__ -#define __XENO_MM_H__ +#ifndef __XEN_MM_H__ +#define __XEN_MM_H__ #include <xen/config.h> #include <xen/list.h> @@ -328,4 +328,4 @@ int memguard_is_guarded(void *p); #define memguard_is_guarded(_p) (0) #endif -#endif /* __XENO_MM_H__ */ +#endif /* __XEN_MM_H__ */ diff --git a/xen/include/xen/perfc.h b/xen/include/xen/perfc.h index 757c8bdbe4..ad0b53eeb6 100644 --- a/xen/include/xen/perfc.h +++ b/xen/include/xen/perfc.h @@ -1,6 +1,6 @@ -#ifndef __XENO_PERFC_H__ -#define __XENO_PERFC_H__ +#ifndef __XEN_PERFC_H__ +#define __XEN_PERFC_H__ #include <asm/atomic.h> @@ -53,4 +53,4 @@ extern struct perfcounter_t perfcounters; #define perfc_addc(x,y) atomic_add((y), &perfcounters.x[smp_processor_id()]) #define perfc_adda(x,y,z) atomic_add((z), &perfcounters.x[y]) -#endif /* __XENO_PERFC_H__ */ +#endif /* __XEN_PERFC_H__ */ diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h index f0fcde6b17..367d0e4585 100644 --- a/xen/include/xen/time.h +++ b/xen/include/xen/time.h @@ -24,8 +24,8 @@ -#ifndef __XENO_TIME_H__ -#define __XENO_TIME_H__ +#ifndef __XEN_TIME_H__ +#define __XEN_TIME_H__ #include <asm/ptrace.h> /* XXX Only used for do_timer which should be moved */ #include <asm/time.h> /* pull in architecture specific time definition */ @@ -67,4 +67,4 @@ extern void do_settime(unsigned long secs, unsigned long usecs, u64 system_time_base); extern void do_timer(struct pt_regs *regs); -#endif /* __XENO_TIME_H__ */ +#endif /* __XEN_TIME_H__ */ diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index 187da22d10..00b18b0211 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -18,8 +18,8 @@ * See also common/trace.c and the dom0 op in include/hypervisor-ifs/dom0_ops.h */ -#ifndef __XENO_TRACE_H__ -#define __XENO_TRACE_H__ +#ifndef __XEN_TRACE_H__ +#define __XEN_TRACE_H__ #include <hypervisor-ifs/trace.h> @@ -122,4 +122,4 @@ static inline int trace(u32 event, u32 d1, u32 d2, u32 d3, u32 d4, u32 d5) #endif /* TRACE_BUFFER */ -#endif /* __XENO_TRACE_H__ */ +#endif /* __XEN_TRACE_H__ */ diff --git a/xen/include/xen/vif.h b/xen/include/xen/vif.h index 41d6062da9..71e3a3d2ea 100644 --- a/xen/include/xen/vif.h +++ b/xen/include/xen/vif.h @@ -6,8 +6,8 @@ * Copyright (c) 2002-2003, A K Warfield and K A Fraser */ -#ifndef __XENO_VIF_H__ -#define __XENO_VIF_H__ +#ifndef __XEN_VIF_H__ +#define __XEN_VIF_H__ /* virtual network interface struct and associated defines. */ /* net_vif_st is the larger struct that describes a virtual network interface @@ -112,5 +112,5 @@ void delete_all_domain_vfr_rules(struct task_struct *p); #define VIF_DROP ((net_vif_t *)1) #define VIF_LOCAL(_vif) ((unsigned long)(_vif) > 1) -#endif /* __XENO_VIF_H__ */ +#endif /* __XEN_VIF_H__ */ diff --git a/xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile b/xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile index 290783cc62..0cd954ea7a 100644 --- a/xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile +++ b/xenolinux-2.4.25-sparse/arch/xeno/boot/Makefile @@ -6,8 +6,8 @@ xenolinux.gz: xenolinux gzip -f -9 < $< > $@ xenolinux: $(TOPDIR)/vmlinux - # Guest OS header -- first 8 bytes are identifier 'XenoGues'. - echo -e -n 'XenoGues' >$@ + # Guest OS header -- first 8 bytes are identifier 'XenGuest'. + echo -e -n 'XenGuest' >$@ # Guest OS header -- next 4 bytes are load address (0xC0000000). echo -e -n '\000\000\000\300' >>$@ $(OBJCOPY) $< xenolinux.body |