ia64/xen-unstable

changeset 1551:f023d40722e4

bitkeeper revision 1.1004 (40d9962b6c-Z9R9FquPba7TS8wG_1w)

Cleanups.
author kaf24@scramble.cl.cam.ac.uk
date Wed Jun 23 14:39:39 2004 +0000 (2004-06-23)
parents f9d7fa707de4
children e9509ea8fb90
files extras/mini-os/h/hypervisor.h extras/mini-os/kernel.c extras/mini-os/lib/printf.c linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/common.h linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c xen/arch/x86/entry.S xen/drivers/char/console.c xen/include/hypervisor-ifs/hypervisor-if.h xen/include/xen/sched.h
line diff
     1.1 --- a/extras/mini-os/h/hypervisor.h	Tue Jun 22 22:55:24 2004 +0000
     1.2 +++ b/extras/mini-os/h/hypervisor.h	Wed Jun 23 14:39:39 2004 +0000
     1.3 @@ -61,18 +61,6 @@ static __inline__ int HYPERVISOR_mmu_upd
     1.4      return ret;
     1.5  }
     1.6  
     1.7 -static __inline__ int HYPERVISOR_console_write(const char *str, int count)
     1.8 -{
     1.9 -    int ret;
    1.10 -    __asm__ __volatile__ (
    1.11 -        TRAP_INSTR
    1.12 -        : "=a" (ret) : "0" (__HYPERVISOR_console_write), 
    1.13 -        "b" (str), "c" (count) : "memory" );
    1.14 -
    1.15 -
    1.16 -    return ret;
    1.17 -}
    1.18 -
    1.19  static __inline__ int HYPERVISOR_set_gdt(unsigned long *frame_list, int entries)
    1.20  {
    1.21      int ret;
    1.22 @@ -142,7 +130,7 @@ static __inline__ int HYPERVISOR_block(v
    1.23      return ret;
    1.24  }
    1.25  
    1.26 -static inline int HYPERVISOR_shutdown(void)
    1.27 +static __inline__ int HYPERVISOR_shutdown(void)
    1.28  {
    1.29      int ret;
    1.30      __asm__ __volatile__ (
    1.31 @@ -154,7 +142,7 @@ static inline int HYPERVISOR_shutdown(vo
    1.32      return ret;
    1.33  }
    1.34  
    1.35 -static inline int HYPERVISOR_reboot(void)
    1.36 +static __inline__ int HYPERVISOR_reboot(void)
    1.37  {
    1.38      int ret;
    1.39      __asm__ __volatile__ (
    1.40 @@ -166,7 +154,7 @@ static inline int HYPERVISOR_reboot(void
    1.41      return ret;
    1.42  }
    1.43  
    1.44 -static inline int HYPERVISOR_suspend(unsigned long srec)
    1.45 +static __inline__ int HYPERVISOR_suspend(unsigned long srec)
    1.46  {
    1.47      int ret;
    1.48      /* NB. On suspend, control software expects a suspend record in %esi. */
    1.49 @@ -280,4 +268,26 @@ static __inline__ int HYPERVISOR_update_
    1.50      return ret;
    1.51  }
    1.52  
    1.53 +static __inline__ int HYPERVISOR_xen_version(int cmd)
    1.54 +{
    1.55 +    int ret;
    1.56 +    __asm__ __volatile__ (
    1.57 +        TRAP_INSTR
    1.58 +        : "=a" (ret) : "0" (__HYPERVISOR_xen_version), 
    1.59 +        "b" (cmd) : "memory" );
    1.60 +
    1.61 +    return ret;
    1.62 +}
    1.63 +
    1.64 +static __inline__ int HYPERVISOR_console_io(int cmd, int count, char *str)
    1.65 +{
    1.66 +    int ret;
    1.67 +    __asm__ __volatile__ (
    1.68 +        TRAP_INSTR
    1.69 +        : "=a" (ret) : "0" (__HYPERVISOR_console_io),
    1.70 +        "b" (cmd), "c" (count), "d" (str) : "memory" );
    1.71 +
    1.72 +    return ret;
    1.73 +}
    1.74 +
    1.75  #endif /* __HYPERVISOR_H__ */
     2.1 --- a/extras/mini-os/kernel.c	Tue Jun 22 22:55:24 2004 +0000
     2.2 +++ b/extras/mini-os/kernel.c	Wed Jun 23 14:39:39 2004 +0000
     2.3 @@ -97,22 +97,15 @@ void start_kernel(start_info_t *si)
     2.4      
     2.5      /* print out some useful information  */
     2.6      printk("Xen Minimal OS!\n");
     2.7 -    printk("start_info:   %p\n",  si);
     2.8 +    printk("start_info:   %p\n",    si);
     2.9      printk("  nr_pages:   %lu",     si->nr_pages);
    2.10      printk("  shared_inf: %08lx\n", si->shared_info);
    2.11 -    printk("  pt_base:    %p",    (void *)si->pt_base); 
    2.12 +    printk("  pt_base:    %p",      (void *)si->pt_base); 
    2.13      printk("  mod_start:  0x%lx\n", si->mod_start);
    2.14 -    printk("  mod_len:    %lu\n", si->mod_len); 
    2.15 -#if 0 /* XXX Change to use NETOP_GET_VIF_INFO and BLOCK_IO_OP_RING_ADDRESS */
    2.16 -    printk("  net_rings: ");
    2.17 -    for (i = 0; i < MAX_DOMAIN_VIFS; i++) {
    2.18 -        printk(" %lx", si->net_rings[i]);
    2.19 -    }; printk("\n");
    2.20 -    printk("  blk_ring:   0x%lx\n", si->blk_ring);
    2.21 -    printk("  dom_id:     %ld\n",  si->dom_id);
    2.22 -#endif
    2.23 -    printk("  flags:      0x%lx\n", si->flags);
    2.24 -    printk("  cmd_line:   %s\n",  si->cmd_line ? (const char *)si->cmd_line : "NULL");
    2.25 +    printk("  mod_len:    %lu\n",   si->mod_len); 
    2.26 +    printk("  flags:      0x%x\n",  (unsigned int)si->flags);
    2.27 +    printk("  cmd_line:   %s\n",  
    2.28 +           si->cmd_line ? (const char *)si->cmd_line : "NULL");
    2.29  
    2.30  
    2.31      /*
    2.32 @@ -126,7 +119,12 @@ void start_kernel(start_info_t *si)
    2.33      /* set up events */
    2.34      init_events();
    2.35  
    2.36 -    /* install some handlers */
    2.37 +    /*
    2.38 +     * These need to be replaced with event-channel/control-interface
    2.39 +     * equivalents.
    2.40 +     */
    2.41 +#if 0
    2.42 +    /* Install some handlers. */
    2.43      add_ev_action(EV_DIE, &exit_handler);
    2.44      enable_ev_action(EV_DIE);
    2.45      enable_hypervisor_event(EV_DIE);
    2.46 @@ -134,6 +132,7 @@ void start_kernel(start_info_t *si)
    2.47      add_ev_action(EV_DEBUG, &debug_handler);
    2.48      enable_ev_action(EV_DEBUG);
    2.49      enable_hypervisor_event(EV_DEBUG);
    2.50 +#endif
    2.51  
    2.52      /* init time and timers */
    2.53      init_time();
     3.1 --- a/extras/mini-os/lib/printf.c	Tue Jun 22 22:55:24 2004 +0000
     3.2 +++ b/extras/mini-os/lib/printf.c	Wed Jun 23 14:39:39 2004 +0000
     3.3 @@ -84,7 +84,8 @@ printf(const char *fmt, ...)
     3.4  	retval = kvprintf(fmt, printk_buf, 10, ap);
     3.5      printk_buf[retval] = '\0';
     3.6  	va_end(ap);
     3.7 -    (void)HYPERVISOR_console_write(printk_buf, strlen(printk_buf));
     3.8 +    (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(printk_buf), 
     3.9 +                                printk_buf);
    3.10  	return retval;
    3.11  }
    3.12  
    3.13 @@ -95,7 +96,8 @@ vprintf(const char *fmt, va_list ap)
    3.14      static char printk_buf[1024];
    3.15  	retval = kvprintf(fmt, printk_buf, 10, ap);
    3.16      printk_buf[retval] = '\0';
    3.17 -    (void)HYPERVISOR_console_write(printk_buf, strlen(printk_buf));
    3.18 +    (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(printk_buf),
    3.19 +                                printk_buf);
    3.20  	return retval;
    3.21  }
    3.22  
     4.1 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h	Tue Jun 22 22:55:24 2004 +0000
     4.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h	Wed Jun 23 14:39:39 2004 +0000
     4.3 @@ -15,7 +15,7 @@
     4.4  #include <asm/io.h>
     4.5  #include "../blkif.h"
     4.6  
     4.7 -#ifndef NDEBUG
     4.8 +#if 0
     4.9  #define ASSERT(_p) \
    4.10      if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
    4.11      __LINE__, __FILE__); *(int*)0=0; }
     5.1 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/common.h	Tue Jun 22 22:55:24 2004 +0000
     5.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/common.h	Wed Jun 23 14:39:39 2004 +0000
     5.3 @@ -16,9 +16,8 @@
     5.4  #include <asm/ctrl_if.h>
     5.5  #include <asm/io.h>
     5.6  #include "../netif.h"
     5.7 -#include "../../../../../net/bridge/br_private.h"
     5.8  
     5.9 -#ifndef NDEBUG
    5.10 +#if 0
    5.11  #define ASSERT(_p) \
    5.12      if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
    5.13      __LINE__, __FILE__); *(int*)0=0; }
     6.1 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c	Tue Jun 22 22:55:24 2004 +0000
     6.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c	Wed Jun 23 14:39:39 2004 +0000
     6.3 @@ -13,10 +13,6 @@
     6.4  #define NETIF_HASH(_d,_h) (((int)(_d)^(int)(_h))&(NETIF_HASHSZ-1))
     6.5  
     6.6  static netif_t *netif_hash[NETIF_HASHSZ];
     6.7 -#ifdef XEN_BRIDGE
     6.8 -static struct net_device *bridge_dev;
     6.9 -static struct net_bridge *bridge_br;
    6.10 -#endif
    6.11  
    6.12  netif_t *netif_find_by_handle(domid_t domid, unsigned int handle)
    6.13  {
    6.14 @@ -40,9 +36,6 @@ void __netif_disconnect_complete(netif_t
    6.15      unbind_evtchn_from_irq(netif->evtchn);
    6.16      vfree(netif->tx); /* Frees netif->rx as well. */
    6.17      rtnl_lock();
    6.18 -#ifdef XEN_BRIDGE
    6.19 -    (void)br_del_if(bridge_br, netif->dev);
    6.20 -#endif
    6.21      (void)dev_close(netif->dev);
    6.22      rtnl_unlock();
    6.23  
    6.24 @@ -125,12 +118,13 @@ void netif_create(netif_be_create_t *cre
    6.25      /* Disable queuing. */
    6.26      dev->tx_queue_len = 0;
    6.27  
    6.28 -    /* XXX In bridge mode we should force a different MAC from remote end. */
    6.29 +    /* Force a different MAC from remote end. */
    6.30      dev->dev_addr[2] ^= 1;
    6.31  
    6.32 -    err = register_netdev(dev);
    6.33 -    if (err) {
    6.34 -        DPRINTK("Could not register new net device %s: err=%d\n", dev->name, err);
    6.35 +    if ( (err = register_netdev(dev)) != 0 )
    6.36 +    {
    6.37 +        DPRINTK("Could not register new net device %s: err=%d\n",
    6.38 +                dev->name, err);
    6.39          create->status = NETIF_BE_STATUS_OUT_OF_MEMORY;
    6.40          kfree(dev);
    6.41          return;
    6.42 @@ -242,25 +236,7 @@ void netif_connect(netif_be_connect_t *c
    6.43      netif_get(netif);
    6.44  
    6.45      rtnl_lock();
    6.46 -
    6.47      (void)dev_open(netif->dev);
    6.48 -#ifdef XEN_BRIDGE
    6.49 -    (void)br_add_if(bridge_br, netif->dev);
    6.50 -
    6.51 -    /*
    6.52 -     * The default config is a very simple binding to eth0.
    6.53 -     * If eth0 is being used as an IP interface by this OS then someone
    6.54 -     * must add eth0's IP address to nbe-br, and change the routing table
    6.55 -     * to refer to nbe-br instead of eth0.
    6.56 -     */
    6.57 -    (void)dev_open(bridge_dev);
    6.58 -    if ( (eth0_dev = __dev_get_by_name("eth0")) != NULL )
    6.59 -    {
    6.60 -        (void)dev_open(eth0_dev);
    6.61 -        (void)br_add_if(bridge_br, eth0_dev);
    6.62 -    }
    6.63 -#endif
    6.64 -
    6.65      rtnl_unlock();
    6.66  
    6.67      (void)request_irq(netif->irq, netif_be_int, 0, netif->dev->name, netif);
    6.68 @@ -301,25 +277,4 @@ int netif_disconnect(netif_be_disconnect
    6.69  void netif_interface_init(void)
    6.70  {
    6.71      memset(netif_hash, 0, sizeof(netif_hash));
    6.72 -#ifdef XEN_BRIDGE
    6.73 -    if ( br_add_bridge("nbe-br") != 0 )
    6.74 -        BUG();
    6.75 -    bridge_dev = __dev_get_by_name("nbe-br");
    6.76 -    bridge_br  = (struct net_bridge *)bridge_dev->priv;
    6.77 -    bridge_br->bridge_hello_time = bridge_br->hello_time = 0;
    6.78 -    bridge_br->bridge_forward_delay = bridge_br->forward_delay = 0;
    6.79 -    bridge_br->stp_enabled = 0;
    6.80 -#endif
    6.81  }
    6.82 -
    6.83 -#ifndef CONFIG_BRIDGE
    6.84 -#error Must configure Ethernet bridging in Network Options
    6.85 -#endif
    6.86 -#ifndef XEN_BRIDGE
    6.87 -EXPORT_SYMBOL(br_add_bridge);
    6.88 -EXPORT_SYMBOL(br_del_bridge);
    6.89 -EXPORT_SYMBOL(br_add_if);
    6.90 -EXPORT_SYMBOL(br_del_if);
    6.91 -EXPORT_SYMBOL(br_get_bridge_ifindices);
    6.92 -EXPORT_SYMBOL(br_get_port_ifindices);
    6.93 -#endif
     7.1 --- a/xen/arch/x86/entry.S	Tue Jun 22 22:55:24 2004 +0000
     7.2 +++ b/xen/arch/x86/entry.S	Wed Jun 23 14:39:39 2004 +0000
     7.3 @@ -697,30 +697,25 @@ nmi_io_err:
     7.4  ENTRY(hypervisor_call_table)
     7.5          .long SYMBOL_NAME(do_set_trap_table)     /*  0 */
     7.6          .long SYMBOL_NAME(do_mmu_update)
     7.7 -        .long SYMBOL_NAME(do_console_write)
     7.8          .long SYMBOL_NAME(do_set_gdt)
     7.9          .long SYMBOL_NAME(do_stack_switch)
    7.10 -        .long SYMBOL_NAME(do_set_callbacks)      /*  5 */
    7.11 -        .long SYMBOL_NAME(do_ni_syscall)                    # do_net_io_op
    7.12 -        .long SYMBOL_NAME(do_fpu_taskswitch)
    7.13 +        .long SYMBOL_NAME(do_set_callbacks)
    7.14 +        .long SYMBOL_NAME(do_fpu_taskswitch)     /*  5 */
    7.15          .long SYMBOL_NAME(do_sched_op)
    7.16          .long SYMBOL_NAME(do_dom0_op)
    7.17 -        .long SYMBOL_NAME(do_ni_syscall)         /* 10 */   # do_network_op
    7.18 -        .long SYMBOL_NAME(do_ni_syscall)                    # do_block_io_op
    7.19          .long SYMBOL_NAME(do_set_debugreg)
    7.20          .long SYMBOL_NAME(do_get_debugreg)
    7.21 -        .long SYMBOL_NAME(do_update_descriptor)
    7.22 -        .long SYMBOL_NAME(do_set_fast_trap)      /* 15 */
    7.23 +        .long SYMBOL_NAME(do_update_descriptor)  /* 10 */
    7.24 +        .long SYMBOL_NAME(do_set_fast_trap)
    7.25          .long SYMBOL_NAME(do_dom_mem_op)
    7.26          .long SYMBOL_NAME(do_multicall)
    7.27 -        .long SYMBOL_NAME(do_ni_syscall)                    # do_kbd_op
    7.28          .long SYMBOL_NAME(do_update_va_mapping)
    7.29 -        .long SYMBOL_NAME(do_set_timer_op)       /* 20 */
    7.30 +        .long SYMBOL_NAME(do_set_timer_op)       /* 15 */
    7.31          .long SYMBOL_NAME(do_event_channel_op)
    7.32          .long SYMBOL_NAME(do_xen_version)
    7.33          .long SYMBOL_NAME(do_console_io)
    7.34          .long SYMBOL_NAME(do_physdev_op)
    7.35 -        .long SYMBOL_NAME(do_update_va_mapping_otherdomain) /* 25 */
    7.36 +        .long SYMBOL_NAME(do_update_va_mapping_otherdomain) /* 20 */
    7.37          .rept NR_syscalls-((.-hypervisor_call_table)/4)
    7.38          .long SYMBOL_NAME(do_ni_syscall)
    7.39          .endr
     8.1 --- a/xen/drivers/char/console.c	Tue Jun 22 22:55:24 2004 +0000
     8.2 +++ b/xen/drivers/char/console.c	Wed Jun 23 14:39:39 2004 +0000
     8.3 @@ -393,69 +393,6 @@ void set_printk_prefix(const char *prefi
     8.4      strcpy(printk_prefix, prefix);
     8.5  }
     8.6  
     8.7 -/*
     8.8 - * This hypercall is deprecated. Only permit its use in debug environments.
     8.9 - */
    8.10 -long do_console_write(char *str, unsigned int count)
    8.11 -{
    8.12 -#ifndef NDEBUG
    8.13 -#define SIZEOF_BUF 256
    8.14 -    unsigned char safe_str[SIZEOF_BUF+1];
    8.15 -    unsigned char single_line[SIZEOF_BUF+2];
    8.16 -    unsigned char line_header[30];
    8.17 -    unsigned char *p;
    8.18 -    unsigned char  c;
    8.19 -    unsigned long flags;
    8.20 -    int            j;
    8.21 -    
    8.22 -    if ( count == 0 )
    8.23 -        return 0;
    8.24 -
    8.25 -    if ( count > SIZEOF_BUF ) 
    8.26 -        count = SIZEOF_BUF;
    8.27 -    
    8.28 -    if ( copy_from_user(safe_str, str, count) )
    8.29 -        return -EFAULT;
    8.30 -    safe_str[count] = '\0';
    8.31 -    
    8.32 -    sprintf(line_header, "DOM%u: ", current->domain);
    8.33 -    
    8.34 -    p = safe_str;
    8.35 -    while ( *p != '\0' )
    8.36 -    {
    8.37 -        j = 0;
    8.38 -
    8.39 -        while ( (c = *p++) != '\0' )
    8.40 -        {
    8.41 -            if ( c == '\n' )
    8.42 -                break;
    8.43 -            if ( (c < 32) || (c > 126) )
    8.44 -                continue;
    8.45 -            single_line[j++] = c;
    8.46 -        }
    8.47 -
    8.48 -        single_line[j++] = '\n';
    8.49 -        single_line[j++] = '\0';
    8.50 -
    8.51 -        spin_lock_irqsave(&console_lock, flags);
    8.52 -        __putstr(line_header);
    8.53 -        __putstr(single_line);
    8.54 -        spin_unlock_irqrestore(&console_lock, flags);
    8.55 -    }
    8.56 -
    8.57 -    return 0;
    8.58 -#else
    8.59 -    if ( !test_and_set_bit(DF_CONWRITEBUG, &current->flags) )
    8.60 -    {
    8.61 -        printk("DOM%u is attempting to use the deprecated "
    8.62 -               "HYPERVISOR_console_write() interface.\n", current->domain);
    8.63 -        printk(" - For testing, create a debug build of Xen\n");
    8.64 -        printk(" - For production, your OS must use the new console model\n");
    8.65 -    }
    8.66 -    return -ENOSYS;
    8.67 -#endif
    8.68 -}
    8.69 -
    8.70  void init_console(void)
    8.71  {
    8.72      extern unsigned char opt_console[];
     9.1 --- a/xen/include/hypervisor-ifs/hypervisor-if.h	Tue Jun 22 22:55:24 2004 +0000
     9.2 +++ b/xen/include/hypervisor-ifs/hypervisor-if.h	Wed Jun 23 14:39:39 2004 +0000
     9.3 @@ -25,26 +25,25 @@
     9.4  /* EAX = vector; EBX, ECX, EDX, ESI, EDI = args 1, 2, 3, 4, 5. */
     9.5  #define __HYPERVISOR_set_trap_table        0
     9.6  #define __HYPERVISOR_mmu_update            1
     9.7 -#define __HYPERVISOR_console_write         2 /* DEPRECATED */
     9.8 -#define __HYPERVISOR_set_gdt               3
     9.9 -#define __HYPERVISOR_stack_switch          4
    9.10 -#define __HYPERVISOR_set_callbacks         5
    9.11 -#define __HYPERVISOR_fpu_taskswitch        7
    9.12 -#define __HYPERVISOR_sched_op              8
    9.13 -#define __HYPERVISOR_dom0_op               9
    9.14 -#define __HYPERVISOR_set_debugreg         12
    9.15 -#define __HYPERVISOR_get_debugreg         13
    9.16 -#define __HYPERVISOR_update_descriptor    14
    9.17 -#define __HYPERVISOR_set_fast_trap        15
    9.18 -#define __HYPERVISOR_dom_mem_op           16
    9.19 -#define __HYPERVISOR_multicall            17
    9.20 -#define __HYPERVISOR_update_va_mapping    19
    9.21 -#define __HYPERVISOR_set_timer_op         20
    9.22 -#define __HYPERVISOR_event_channel_op     21
    9.23 -#define __HYPERVISOR_xen_version          22
    9.24 -#define __HYPERVISOR_console_io           23
    9.25 -#define __HYPERVISOR_physdev_op           24
    9.26 -#define __HYPERVISOR_update_va_mapping_otherdomain 25
    9.27 +#define __HYPERVISOR_set_gdt               2
    9.28 +#define __HYPERVISOR_stack_switch          3
    9.29 +#define __HYPERVISOR_set_callbacks         4
    9.30 +#define __HYPERVISOR_fpu_taskswitch        5
    9.31 +#define __HYPERVISOR_sched_op              6
    9.32 +#define __HYPERVISOR_dom0_op               7
    9.33 +#define __HYPERVISOR_set_debugreg          8
    9.34 +#define __HYPERVISOR_get_debugreg          9
    9.35 +#define __HYPERVISOR_update_descriptor    10
    9.36 +#define __HYPERVISOR_set_fast_trap        11
    9.37 +#define __HYPERVISOR_dom_mem_op           12
    9.38 +#define __HYPERVISOR_multicall            13
    9.39 +#define __HYPERVISOR_update_va_mapping    14
    9.40 +#define __HYPERVISOR_set_timer_op         15
    9.41 +#define __HYPERVISOR_event_channel_op     16
    9.42 +#define __HYPERVISOR_xen_version          17
    9.43 +#define __HYPERVISOR_console_io           18
    9.44 +#define __HYPERVISOR_physdev_op           19
    9.45 +#define __HYPERVISOR_update_va_mapping_otherdomain 20
    9.46  
    9.47  /*
    9.48   * MULTICALLS
    10.1 --- a/xen/include/xen/sched.h	Tue Jun 22 22:55:24 2004 +0000
    10.2 +++ b/xen/include/xen/sched.h	Wed Jun 23 14:39:39 2004 +0000
    10.3 @@ -247,15 +247,14 @@ extern struct domain *task_list;
    10.4  #define DF_CONSTRUCTED  3 /* Has the guest OS been fully built yet?         */
    10.5  #define DF_IDLETASK     4 /* Is this one of the per-CPU idle domains?       */
    10.6  #define DF_PRIVILEGED   5 /* Is this domain privileged?                     */
    10.7 -#define DF_CONWRITEBUG  6 /* Has this domain used the obsolete console?     */
    10.8 -#define DF_PHYSDEV      7 /* May this domain do IO to physical devices?     */
    10.9 -#define DF_BLOCKED      8 /* Domain is blocked waiting for an event.        */
   10.10 -#define DF_CTRLPAUSE    9 /* Domain is paused by controller software.       */
   10.11 -#define DF_SHUTDOWN    10 /* Guest shut itself down for some reason.        */
   10.12 -#define DF_CRASHED     11 /* Domain crashed inside Xen, cannot continue.    */
   10.13 -#define DF_DYING       12 /* Death rattle.                                  */
   10.14 -#define DF_RUNNING     13 /* Currently running on a CPU.                    */
   10.15 -#define DF_CPUPINNED   14 /* Disables auto-migration.                       */
   10.16 +#define DF_PHYSDEV      6 /* May this domain do IO to physical devices?     */
   10.17 +#define DF_BLOCKED      7 /* Domain is blocked waiting for an event.        */
   10.18 +#define DF_CTRLPAUSE    8 /* Domain is paused by controller software.       */
   10.19 +#define DF_SHUTDOWN     9 /* Guest shut itself down for some reason.        */
   10.20 +#define DF_CRASHED     10 /* Domain crashed inside Xen, cannot continue.    */
   10.21 +#define DF_DYING       11 /* Death rattle.                                  */
   10.22 +#define DF_RUNNING     12 /* Currently running on a CPU.                    */
   10.23 +#define DF_CPUPINNED   13 /* Disables auto-migration.                       */
   10.24  
   10.25  static inline int domain_runnable(struct domain *d)
   10.26  {