bitkeeper revision 1.559 (3fa8d58fJMWFHK02Nc3nDhxvCmwvXA)

Many files:
  Cleanups -- Xen now doesn't need to know about the start_info structure for anything except DOM0 boot.

3 files changed, 6 insertions, 6 deletions

diff --git a/extras/mini-os/h/hypervisor.h b/extras/mini-os/h/hypervisor.h
index 3afd245fd6..e07018a937 100644
--- a/extras/mini-os/h/hypervisor.h
+++ b/extras/mini-os/h/hypervisor.h
@@ -103,13 +103,13 @@ static inline int HYPERVISOR_set_callbacks(
     return ret;
 }
 
-static inline int HYPERVISOR_net_io_op(unsigned int op, unsigned int idx)
+static inline int HYPERVISOR_net_io_op(netop_t *op)
 {
     int ret;
     __asm__ __volatile__ (
         TRAP_INSTR
         : "=a" (ret) : "0" (__HYPERVISOR_net_io_op),
-        "b" (op), "c" (idx) );
+        "b" (op) );
 
     return ret;
 }
diff --git a/extras/mini-os/head.S b/extras/mini-os/head.S
index 4a2ccbbe1e..5844e296c4 100644
--- a/extras/mini-os/head.S
+++ b/extras/mini-os/head.S
@@ -1,8 +1,8 @@
 #include <os.h>
 
 /* Offsets in start_info structure */
-#define MOD_START    4
-#define MOD_LEN      8
+#define MOD_START 20
+#define MOD_LEN   24
 
 .globl _start, shared_info
                         
diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c
index 0ead3f18d3..d7a6841cd1 100644
--- a/extras/mini-os/kernel.c
+++ b/extras/mini-os/kernel.c
@@ -79,8 +79,6 @@ static shared_info_t *map_shared_info(unsigned long pa)
  */
 void start_kernel(start_info_t *si)
 {
-    int i;
-
     /* Copy the start_info struct to a globally-accessible area. */
     memcpy(&start_info, si, sizeof(*si));
 
@@ -105,11 +103,13 @@ void start_kernel(start_info_t *si)
     printk("  pt_base:    %p",    (void *)si->pt_base); 
     printk("  mod_start:  0x%lx\n", si->mod_start);
     printk("  mod_len:    %lu\n", si->mod_len); 
+#if 0 /* XXX Change to use NETOP_GET_VIF_INFO and BLOCK_IO_OP_RING_ADDRESS */
     printk("  net_rings: ");
     for (i = 0; i < MAX_DOMAIN_VIFS; i++) {
         printk(" %lx", si->net_rings[i]);
     }; printk("\n");
     printk("  blk_ring:   0x%lx\n", si->blk_ring);
+#endif
     printk("  dom_id:     %d\n",  si->dom_id);
     printk("  flags:      0x%lx\n", si->flags);
     printk("  cmd_line:   %s\n",  si->cmd_line ? (const char *)si->cmd_line : "NULL");