--- upstream/dynamips-0.2.7/hv_c2600.c	2007/10/06 16:29:14	10
+++ upstream/dynamips-0.2.8-RC1/hv_c2600.c	2007/10/06 16:33:40	11
@@ -41,49 +41,12 @@
 #include "registry.h"
 #include "hypervisor.h"
 
-/* Create a C2600 instance */
-static int cmd_create(hypervisor_conn_t *conn,int argc,char *argv[])
-{
-   c2600_t *router;
-
-   if (!(router = c2600_create_instance(argv[0],atoi(argv[1])))) {
-      hypervisor_send_reply(conn,HSC_ERR_CREATE,1,
-                            "unable to create C2600 instance '%s'",
-                            argv[0]);
-      return(-1);
-   }
-
-   router->vm->vtty_con_type = VTTY_TYPE_NONE;
-   router->vm->vtty_aux_type = VTTY_TYPE_NONE;
-   
-   vm_release(router->vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"C2600 '%s' created",argv[0]);
-   return(0);
-}
-
-/* Delete a C2600 instance */
-static int cmd_delete(hypervisor_conn_t *conn,int argc,char *argv[])
-{
-   int res;
-
-   res = c2600_delete_instance(argv[0]);
-
-   if (res == 1) {
-      hypervisor_send_reply(conn,HSC_INFO_OK,1,"C2600 '%s' deleted",argv[0]);
-   } else {
-      hypervisor_send_reply(conn,HSC_ERR_DELETE,1,
-                            "unable to delete C2600 '%s'",argv[0]);
-   }
-
-   return(res);
-}
-
 /* Set the chassis type */
 static int cmd_set_chassis(hypervisor_conn_t *conn,int argc,char *argv[])
 {
    vm_instance_t *vm;
 
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
+   if (!(vm = hypervisor_find_vm(conn,argv[0])))
       return(-1);
 
    if ((c2600_mainboard_set_type(VM_C2600(vm),argv[1])) == -1) {
@@ -104,10 +67,10 @@
 {
    vm_instance_t *vm;
 
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
+   if (!(vm = hypervisor_find_vm(conn,argv[0])))
       return(-1);
 
-   VM_C2600(vm)->nm_iomem_size = 0x8000 | atoi(optarg);
+   vm->nm_iomem_size = 0x8000 | atoi(argv[1]);
 
    vm_release(vm);
    hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
@@ -119,7 +82,7 @@
 {
    vm_instance_t *vm;
 
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
+   if (!(vm = hypervisor_find_vm(conn,argv[0])))
       return(-1);
 
    if ((c2600_chassis_set_mac_addr(VM_C2600(vm),argv[1])) == -1) {
@@ -135,287 +98,13 @@
    return(0);
 }
 
-/* Start a C2600 instance */
-static int cmd_start(hypervisor_conn_t *conn,int argc,char *argv[])
-{
-   vm_instance_t *vm;
-   c2600_t *router;
-
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
-      return(-1);
-
-   router = VM_C2600(vm);
-
-   if (router->vm->vtty_con_type == VTTY_TYPE_NONE) {
-      hypervisor_send_reply(conn,HSC_INFO_MSG,0,
-                            "Warning: no console port defined for "
-                            "C2600 '%s'",argv[0]);
-   }
-
-   if (c2600_init_instance(router) == -1) {
-      vm_release(vm);
-      hypervisor_send_reply(conn,HSC_ERR_START,1,
-                            "unable to start instance '%s'",
-                            argv[0]);
-      return(-1);
-   }
-   
-   vm_release(vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"C2600 '%s' started",argv[0]);
-   return(0);
-}
-
-/* Stop a C2600 instance */
-static int cmd_stop(hypervisor_conn_t *conn,int argc,char *argv[])
-{
-   vm_instance_t *vm;
-   c2600_t *router;
-
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
-      return(-1);
-
-   router = VM_C2600(vm);
-
-   if (c2600_stop_instance(router) == -1) {
-      vm_release(vm);
-      hypervisor_send_reply(conn,HSC_ERR_STOP,1,
-                            "unable to stop instance '%s'",
-                            argv[0]);
-      return(-1);
-   }
-   
-   vm_release(vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"C2600 '%s' stopped",argv[0]);
-   return(0);
-}
-
-/* Show NM bindings */
-static int cmd_nm_bindings(hypervisor_conn_t *conn,int argc,char *argv[])
-{
-   vm_instance_t *vm;
-   c2600_t *router;
-   char *nm_type;
-   int i;
-
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
-      return(-1);
-
-   router = VM_C2600(vm);
-
-   for(i=0;i<C2600_MAX_NM_BAYS;i++) {
-      nm_type = c2600_nm_get_type(router,i);
-      if (nm_type)
-         hypervisor_send_reply(conn,HSC_INFO_MSG,0,"%u: %s",i,nm_type);
-   }
-   
-   vm_release(vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
-   return(0);
-}
-
-/* Show NM NIO bindings */
-static int cmd_nm_nio_bindings(hypervisor_conn_t *conn,int argc,char *argv[])
-{
-   struct c2600_nio_binding *nb;
-   struct c2600_nm_bay *bay;
-   vm_instance_t *vm;
-   c2600_t *router;
-   u_int nm_bay;
-
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
-      return(-1);
-
-   router = VM_C2600(vm);
-   nm_bay = atoi(argv[1]);
-
-   if (!(bay = c2600_nm_get_info(router,nm_bay))) {
-      vm_release(vm);
-      hypervisor_send_reply(conn,HSC_ERR_UNK_OBJ,1,"Invalid slot %u",nm_bay);
-      return(-1);
-   }
-
-   for(nb=bay->nio_list;nb;nb=nb->next)
-      hypervisor_send_reply(conn,HSC_INFO_MSG,0,"%u: %s",
-                            nb->port_id,nb->nio->name);
-   
-   vm_release(vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
-   return(0);
-}
-
-/* Add a NM binding for the specified slot */
-static int cmd_add_nm_binding(hypervisor_conn_t *conn,int argc,char *argv[])
-{   
-   vm_instance_t *vm;
-   c2600_t *router;
-   u_int nm_bay;
-
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
-      return(-1);
-
-   router = VM_C2600(vm);
-   nm_bay = atoi(argv[1]);
-
-   if (c2600_nm_add_binding(router,argv[2],nm_bay) == -1) {
-      vm_release(vm);
-      hypervisor_send_reply(conn,HSC_ERR_BINDING,1,
-                            "C2600 %s: unable to add NM binding for slot %u",
-                            argv[0],nm_bay);
-      return(-1);
-   }
-
-   vm_release(vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
-   return(0);
-}
-
-/* Remove a NM binding for the specified slot */
-static int cmd_remove_nm_binding(hypervisor_conn_t *conn,int argc,char *argv[])
-{
-   vm_instance_t *vm;
-   c2600_t *router;
-   u_int nm_bay;
-
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
-      return(-1);
-
-   router = VM_C2600(vm);
-   nm_bay = atoi(argv[1]);
-
-   if (c2600_nm_remove_binding(router,nm_bay) == -1) {
-      vm_release(vm);
-      hypervisor_send_reply(conn,HSC_ERR_BINDING,1,
-                            "C2600 %s: unable to remove NM binding for "
-                            "slot %u",argv[0],nm_bay);
-      return(-1);
-   }
-
-   vm_release(vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
-   return(0);
-}
-
-/* Add a NIO binding to the specified slot/port */
-static int cmd_add_nio_binding(hypervisor_conn_t *conn,int argc,char *argv[])
-{  
-   u_int nm_bay,port_id;
-   vm_instance_t *vm;
-   c2600_t *router;
-
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
-      return(-1);
-
-   router = VM_C2600(vm);
-
-   nm_bay = atoi(argv[1]);
-   port_id = atoi(argv[2]);
-
-   if (c2600_nm_add_nio_binding(router,nm_bay,port_id,argv[3]) == -1) {
-      vm_release(vm);
-      hypervisor_send_reply(conn,HSC_ERR_BINDING,1,
-                            "C2600 %s: unable to add NIO binding for "
-                            "interface %u/%u",argv[0],nm_bay,port_id);
-      return(-1);
-   }
-
-   vm_release(vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
-   return(0);
-}
-
-/* Remove a NIO binding from the specified slot/port */
-static int cmd_remove_nio_binding(hypervisor_conn_t *conn,
-                                  int argc,char *argv[])
-{
-   u_int nm_bay,port_id;
-   vm_instance_t *vm;
-   c2600_t *router;
-
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
-      return(-1);
-
-   router = VM_C2600(vm);
-
-   nm_bay = atoi(argv[1]);
-   port_id = atoi(argv[2]);
-
-   if (c2600_nm_remove_nio_binding(router,nm_bay,port_id) == -1) {
-      vm_release(vm);
-      hypervisor_send_reply(conn,HSC_ERR_BINDING,1,
-                            "C2600 %s: unable to remove NIO binding for "
-                            "interface %u/%u",argv[0],nm_bay,port_id);
-      return(-1);
-   }
-
-   vm_release(vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
-   return(0);
-}
-
-/* Enable NIO of the specified slot/port */
-static int cmd_nm_enable_nio(hypervisor_conn_t *conn,int argc,char *argv[])
-{  
-   u_int nm_bay,port_id;
-   vm_instance_t *vm;
-   c2600_t *router;
-
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
-      return(-1);
-
-   router = VM_C2600(vm);
-
-   nm_bay = atoi(argv[1]);
-   port_id = atoi(argv[2]);
-
-   if (c2600_nm_enable_nio(router,nm_bay,port_id) == -1) {
-      vm_release(vm);
-      hypervisor_send_reply(conn,HSC_ERR_BINDING,1,
-                            "C2600 %s: unable to enable NIO for "
-                            "interface %u/%u",argv[0],nm_bay,port_id);
-      return(-1);
-   }
-
-   vm_release(vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
-   return(0);
-}
-
-/* Disable NIO of the specified slot/port */
-static int cmd_nm_disable_nio(hypervisor_conn_t *conn,int argc,char *argv[])
-{  
-   u_int nm_bay,port_id;
-   vm_instance_t *vm;
-   c2600_t *router;
-
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
-      return(-1);
-
-   router = VM_C2600(vm);
-
-   nm_bay = atoi(argv[1]);
-   port_id = atoi(argv[2]);
-
-   if (c2600_nm_disable_nio(router,nm_bay,port_id) == -1) {
-      vm_release(vm);
-      hypervisor_send_reply(conn,HSC_ERR_BINDING,1,
-                            "C2600 %s: unable to unset NIO for "
-                            "interface %u/%u",
-                            argv[0],nm_bay,port_id);
-      return(-1);
-   }
-
-   vm_release(vm);
-   hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK");
-   return(0);
-}
-
 /* Show C2600 hardware */
 static int cmd_show_hardware(hypervisor_conn_t *conn,int argc,char *argv[])
 {
    vm_instance_t *vm;
    c2600_t *router;
 
-   if (!(vm = hypervisor_find_vm(conn,argv[0],VM_TYPE_C2600)))
+   if (!(vm = hypervisor_find_vm(conn,argv[0])))
       return(-1);
 
    router = VM_C2600(vm);
@@ -432,7 +121,7 @@
    hypervisor_conn_t *conn = opt;
    vm_instance_t *vm = entry->data;
 
-   if (vm->type == VM_TYPE_C2600)
+   if (vm->platform == conn->cur_module->opt)
       hypervisor_send_reply(conn,HSC_INFO_MSG,0,"%s",entry->name);
 }
 
@@ -447,32 +136,20 @@
 
 /* C2600 commands */
 static hypervisor_cmd_t c2600_cmd_array[] = {
-   { "create", 2, 2, cmd_create, NULL },
-   { "delete", 1, 1, cmd_delete, NULL },
    { "set_chassis", 2, 2, cmd_set_chassis, NULL },
    { "set_iomem", 2, 2, cmd_set_iomem, NULL },
    { "set_mac_addr", 2, 2, cmd_set_mac_addr, NULL },
-   { "start", 1, 1, cmd_start, NULL },
-   { "stop", 1, 1, cmd_stop, NULL },
-   { "nm_bindings", 1, 1, cmd_nm_bindings, NULL },
-   { "nm_nio_bindings", 2, 2, cmd_nm_nio_bindings, NULL },
-   { "add_nm_binding", 3, 3, cmd_add_nm_binding, NULL },
-   { "remove_nm_binding", 2, 2, cmd_remove_nm_binding, NULL },
-   { "add_nio_binding", 4, 4, cmd_add_nio_binding, NULL },
-   { "remove_nio_binding", 3, 3, cmd_remove_nio_binding, NULL },
-   { "nm_enable_nio", 3, 3, cmd_nm_enable_nio, NULL },
-   { "nm_disable_nio", 3, 3, cmd_nm_disable_nio, NULL },
    { "show_hardware", 1, 1, cmd_show_hardware, NULL },
    { "list", 0, 0, cmd_c2600_list, NULL },
    { NULL, -1, -1, NULL, NULL },
 };
 
 /* Hypervisor C2600 initialization */
-int hypervisor_c2600_init(void)
+int hypervisor_c2600_init(vm_platform_t *platform)
 {
    hypervisor_module_t *module;
 
-   module = hypervisor_register_module("c2600");
+   module = hypervisor_register_module(platform->name,platform);
    assert(module != NULL);
 
    hypervisor_register_cmd_array(module,c2600_cmd_array);