bitkeeper revision 1.329 (3f0d30d74QKz0HxzOWPKez8__UdvjQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/rac61/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/sos22/xeno.bk

BitKeeper/etc/ignore

@@ -358,8 +358,15 @@ xen/drivers/ide/ide-xeno.o
 xen/drivers/ide/ide.o
 xen/drivers/ide/piix.o
 xen/drivers/net/3c59x.o
+xen/drivers/net/8139too.o
 xen/drivers/net/Space.o
 xen/drivers/net/driver.o
+xen/drivers/net/e100/e100.o
+xen/drivers/net/e100/e100_config.o
+xen/drivers/net/e100/e100_eeprom.o
+xen/drivers/net/e100/e100_main.o
+xen/drivers/net/e100/e100_phy.o
+xen/drivers/net/e100/e100_test.o
 xen/drivers/net/e1000/e1000.o
 xen/drivers/net/e1000/e1000_ethtool.o
 xen/drivers/net/e1000/e1000_hw.o
@@ -369,8 +376,19 @@ xen/drivers/net/ne/8390.o
 xen/drivers/net/ne/ne.o
 xen/drivers/net/ne/ne_drv.o
 xen/drivers/net/net_init.o
+xen/drivers/net/pcnet32.o
 xen/drivers/net/setup.o
 xen/drivers/net/tg3.o
+xen/drivers/net/tulip/21142.o
+xen/drivers/net/tulip/eeprom.o
+xen/drivers/net/tulip/interrupt.o
+xen/drivers/net/tulip/media.o
+xen/drivers/net/tulip/pnic.o
+xen/drivers/net/tulip/pnic2.o
+xen/drivers/net/tulip/timer.o
+xen/drivers/net/tulip/tulip.o
+xen/drivers/net/tulip/tulip_core.o
+xen/drivers/net/via-rhine.o
 xen/drivers/pci/classlist.h
 xen/drivers/pci/compat.o
 xen/drivers/pci/devlist.h
@@ -439,21 +457,3 @@ xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_block.c~
 xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c.bak
 xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_physdisk_proc.c~
 xenolinux-2.4.21-sparse/include/linux/blk.h~
-xen/drivers/net/8139too.o
-xen/drivers/net/pcnet32.o
-xen/drivers/net/via-rhine.o
-xen/drivers/net/e100/e100.o
-xen/drivers/net/e100/e100_config.o
-xen/drivers/net/e100/e100_eeprom.o
-xen/drivers/net/e100/e100_main.o
-xen/drivers/net/e100/e100_phy.o
-xen/drivers/net/e100/e100_test.o
-xen/drivers/net/tulip/21142.o
-xen/drivers/net/tulip/eeprom.o
-xen/drivers/net/tulip/interrupt.o
-xen/drivers/net/tulip/media.o
-xen/drivers/net/tulip/pnic.o
-xen/drivers/net/tulip/pnic2.o
-xen/drivers/net/tulip/timer.o
-xen/drivers/net/tulip/tulip.o
-xen/drivers/net/tulip/tulip_core.o

xen/drivers/block/xen_segment.c

@@ -194,16 +194,12 @@ void xen_segment_probe_all(xen_segment_info_t *raw_xsi)
 	if ( xsegments[loop].mode == XEN_SEGMENT_UNUSED )
 	    continue;
 
-        device = MK_VIRTUAL_XENDEV(xsegments[loop].segment_number);
-
-	printk("Doing seg %d.\n", xsi->count);
-	xsi->segments[xsi->count].device = device;
+	xsi->segments[xsi->count].mode = xsegments[loop].mode;
 	xsi->segments[xsi->count].domain = xsegments[loop].domain;
 	memcpy(xsi->segments[xsi->count].key,
 	       xsegments[loop].key,
 	       XEN_SEGMENT_KEYSIZE);
 	xsi->segments[xsi->count].seg_nr = xsegments[loop].segment_number;
-	printk("Done.\n");
         xsi->count++;	
     }
 

xen/include/hypervisor-ifs/segment.h

@@ -3,15 +3,19 @@
 
 #define XEN_MAX_SEGMENTS 100     /* total number of segments across all doms */
 
+#define XEN_SEGMENT_UNUSED 0          /* bzero default */
+#define XEN_SEGMENT_RO XEN_DISK_READ_ONLY
+#define XEN_SEGMENT_RW XEN_DISK_READ_WRITE
+
 typedef struct xen_segment_info
 {
-  int count;
-  struct {
-    unsigned domain;
-    unsigned seg_nr;
-    char key[XEN_SEGMENT_KEYSIZE];
-    unsigned short device;
-  } segments[XEN_MAX_SEGMENTS];
+    int count;
+    struct {
+        unsigned domain;
+        unsigned seg_nr;
+        char key[XEN_SEGMENT_KEYSIZE];
+        unsigned short mode;             /* UNUSED, RO, or RW. */
+    } segments[XEN_MAX_SEGMENTS];
 } xen_segment_info_t;
 
 #endif /* __HYP_IFS_SEGMENT_H__ */

xen/include/xeno/segment.h

@@ -35,10 +35,6 @@ typedef struct extent
     unsigned long size;               /* size of this extent */
 } extent_t;
 
-#define XEN_SEGMENT_UNUSED 0          /* bzero default */
-#define XEN_SEGMENT_RO XEN_DISK_READ_ONLY
-#define XEN_SEGMENT_RW XEN_DISK_READ_WRITE
-
 typedef struct segment
 {
     int mode;                         /* UNUSED, RO, or RW */

xenolinux-2.4.21-sparse/arch/xeno/drivers/block/xl_segment_proc.c

@@ -51,7 +51,7 @@ static int proc_vhd_show(struct seq_file *s, void *v)
 		data->segments[data->count - 1].domain,
 		data->segments[data->count - 1].seg_nr,
 		data->segments[data->count - 1].key,
-		physdev_to_xldev(data->segments[data->count - 1].device));
+		data->segments[data->count - 1].mode);
 
     return 0;
 }