1.1 --- a/tools/xenstore/xenstored_domain.c	Tue Jan 24 13:14:42 2006 +0000
     1.2 +++ b/tools/xenstore/xenstored_domain.c	Tue Jan 24 13:21:11 2006 +0000
     1.3 @@ -278,12 +278,12 @@ static struct domain *new_domain(void *c
     1.4  	talloc_set_destructor(domain, destroy_domain);
     1.5  
     1.6  	/* Tell kernel we're interested in this event. */
     1.7 -        bind.remote_domain = domid;
     1.8 -        bind.remote_port   = port;
     1.9 -        rc = ioctl(eventchn_fd, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind);
    1.10 -        if (rc == -1)
    1.11 -            return NULL;
    1.12 -        domain->port = rc;
    1.13 +	bind.remote_domain = domid;
    1.14 +	bind.remote_port   = port;
    1.15 +	rc = ioctl(eventchn_fd, IOCTL_EVTCHN_BIND_INTERDOMAIN, &bind);
    1.16 +	if (rc == -1)
    1.17 +	    return NULL;
    1.18 +	domain->port = rc;
    1.19  
    1.20  	domain->conn = new_connection(writechn, readchn);
    1.21  	domain->conn->domain = domain;
    1.22 @@ -426,10 +426,10 @@ void do_is_domain_introduced(struct conn
    1.23  	int result;
    1.24  	unsigned int domid;
    1.25  
    1.26 -        if (!domid_str) {
    1.27 -                send_error(conn, EINVAL);
    1.28 -                return;
    1.29 -        }
    1.30 +	if (!domid_str) {
    1.31 +		send_error(conn, EINVAL);
    1.32 +		return;
    1.33 +	}
    1.34  
    1.35  	domid = atoi(domid_str);
    1.36  	if (domid == DOMID_SELF)
    1.37 @@ -461,42 +461,42 @@ void restore_existing_connections(void)
    1.38  
    1.39  static int dom0_init(void) 
    1.40  { 
    1.41 -        int rc, fd;
    1.42 +	int rc, fd;
    1.43  	evtchn_port_t port; 
    1.44 -        unsigned long mfn; 
    1.45 -        char str[20]; 
    1.46 -        struct domain *dom0; 
    1.47 -        
    1.48 -        fd = open(XENSTORED_PROC_MFN, O_RDONLY); 
    1.49 +	unsigned long mfn; 
    1.50 +	char str[20]; 
    1.51 +	struct domain *dom0; 
    1.52 +
    1.53 +	fd = open(XENSTORED_PROC_MFN, O_RDONLY); 
    1.54  	if (fd == -1)
    1.55  		return -1;
    1.56 -        
    1.57 -        rc = read(fd, str, sizeof(str)); 
    1.58 +
    1.59 +	rc = read(fd, str, sizeof(str)); 
    1.60  	if (rc == -1)
    1.61  		goto outfd;
    1.62 -        str[rc] = '\0'; 
    1.63 -        mfn = strtoul(str, NULL, 0); 
    1.64 -        
    1.65 -        close(fd); 
    1.66 -        
    1.67 -        fd = open(XENSTORED_PROC_PORT, O_RDONLY); 
    1.68 +	str[rc] = '\0'; 
    1.69 +	mfn = strtoul(str, NULL, 0); 
    1.70 +
    1.71 +	close(fd); 
    1.72 +
    1.73 +	fd = open(XENSTORED_PROC_PORT, O_RDONLY); 
    1.74  	if (fd == -1)
    1.75  		return -1;
    1.76 -        
    1.77 -        rc = read(fd, str, sizeof(str)); 
    1.78 +
    1.79 +	rc = read(fd, str, sizeof(str)); 
    1.80  	if (rc == -1)
    1.81  		goto outfd;
    1.82 -        str[rc] = '\0'; 
    1.83 -        port = strtoul(str, NULL, 0); 
    1.84 -        
    1.85 -        close(fd); 
    1.86 -        
    1.87 -        dom0 = new_domain(NULL, 0, mfn, port); 
    1.88 -        talloc_steal(dom0->conn, dom0); 
    1.89 +	str[rc] = '\0'; 
    1.90 +	port = strtoul(str, NULL, 0); 
    1.91 +
    1.92 +	close(fd); 
    1.93  
    1.94 -        evtchn_notify(dom0->port); 
    1.95 +	dom0 = new_domain(NULL, 0, mfn, port); 
    1.96 +	talloc_steal(dom0->conn, dom0); 
    1.97  
    1.98 -        return 0; 
    1.99 +	evtchn_notify(dom0->port); 
   1.100 +
   1.101 +	return 0; 
   1.102  outfd:
   1.103  	close(fd);
   1.104  	return -1;
   1.105 @@ -549,9 +549,9 @@ int domain_init(void)
   1.106  	if (eventchn_fd < 0)
   1.107  		barf_perror("Failed to open evtchn device");
   1.108  
   1.109 -        if (dom0_init() != 0) 
   1.110 -                barf_perror("Failed to initialize dom0 state"); 
   1.111 -     
   1.112 +	if (dom0_init() != 0) 
   1.113 +		barf_perror("Failed to initialize dom0 state"); 
   1.114 +
   1.115  	bind.virq = VIRQ_DOM_EXC;
   1.116  	rc = ioctl(eventchn_fd, IOCTL_EVTCHN_BIND_VIRQ, &bind);
   1.117  	if (rc == -1)