--- upstream/dynamips-0.2.6-RC1/hv_vm.c 2007/10/06 16:03:58 2 +++ upstream/dynamips-0.2.7/hv_vm.c 2007/10/06 16:29:14 10 @@ -1,5 +1,5 @@ /* - * Cisco 7200 (Predator) simulation platform. + * Cisco router simulation platform. * Copyright (c) 2006 Christophe Fillot (cf@utc.fr) * * Hypervisor generic VM routines. @@ -23,8 +23,8 @@ #include #include -#include "mips64.h" -#include "cp0.h" +#include "cpu.h" +#include "vm.h" #include "dynamips.h" #include "device.h" #include "dev_c7200.h" @@ -43,6 +43,23 @@ #include "registry.h" #include "hypervisor.h" +/* Find the specified CPU */ +static cpu_gen_t *find_cpu(hypervisor_conn_t *conn,vm_instance_t *vm, + u_int cpu_id) +{ + cpu_gen_t *cpu; + + cpu = cpu_group_find_id(vm->cpu_group,cpu_id); + + if (!cpu) { + vm_release(vm); + hypervisor_send_reply(conn,HSC_ERR_BAD_OBJ,1,"Bad CPU specified"); + return NULL; + } + + return cpu; +} + /* Set debugging level */ static int cmd_set_debug_level(hypervisor_conn_t *conn,int argc,char *argv[]) { @@ -146,6 +163,21 @@ return(0); } +/* Enable/disable use of sparse memory */ +static int cmd_set_sparse_mem(hypervisor_conn_t *conn,int argc,char *argv[]) +{ + vm_instance_t *vm; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + vm->sparse_mem = atoi(argv[1]); + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + /* Set the clock divisor */ static int cmd_set_clock_divisor(hypervisor_conn_t *conn,int argc,char *argv[]) { @@ -163,6 +195,22 @@ return(0); } +/* Enable/disable use of block direct jump (compatibility option) */ +static int cmd_set_blk_direct_jump(hypervisor_conn_t *conn, + int argc,char *argv[]) +{ + vm_instance_t *vm; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + vm->exec_blk_direct_jump = atoi(argv[1]); + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + /* Set the idle PC */ static int cmd_set_idle_pc(hypervisor_conn_t *conn,int argc,char *argv[]) { @@ -178,6 +226,141 @@ return(0); } +/* Set the idle PC value when the CPU is online */ +static int cmd_set_idle_pc_online(hypervisor_conn_t *conn, + int argc,char *argv[]) +{ + vm_instance_t *vm; + cpu_gen_t *cpu; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + if (!(cpu = find_cpu(conn,vm,atoi(argv[1])))) + return(-1); + + cpu->set_idle_pc(cpu,strtoull(argv[2],NULL,0)); + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + +/* Get the idle PC proposals */ +static int cmd_get_idle_pc_prop(hypervisor_conn_t *conn,int argc,char *argv[]) +{ + vm_instance_t *vm; + cpu_gen_t *cpu; + int i; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + if (!(cpu = find_cpu(conn,vm,atoi(argv[1])))) + return(-1); + + cpu->get_idling_pc(cpu); + + for(i=0;iidle_pc_prop_count;i++) { + hypervisor_send_reply(conn,HSC_INFO_MSG,0,"0x%llx [%d]", + cpu->idle_pc_prop[i].pc, + cpu->idle_pc_prop[i].count); + } + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + +/* Dump the idle PC proposals */ +static int cmd_show_idle_pc_prop(hypervisor_conn_t *conn,int argc,char *argv[]) +{ + vm_instance_t *vm; + cpu_gen_t *cpu; + int i; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + if (!(cpu = find_cpu(conn,vm,atoi(argv[1])))) + return(-1); + + for(i=0;iidle_pc_prop_count;i++) { + hypervisor_send_reply(conn,HSC_INFO_MSG,0,"0x%llx [%d]", + cpu->idle_pc_prop[i].pc, + cpu->idle_pc_prop[i].count); + } + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + +/* Set CPU idle max value */ +static int cmd_set_idle_max(hypervisor_conn_t *conn,int argc,char *argv[]) +{ + vm_instance_t *vm; + cpu_gen_t *cpu; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + if (!(cpu = find_cpu(conn,vm,atoi(argv[1])))) + return(-1); + + cpu->idle_max = atoi(argv[2]); + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + +/* Set CPU idle sleep time value */ +static int cmd_set_idle_sleep_time(hypervisor_conn_t *conn, + int argc,char *argv[]) +{ + vm_instance_t *vm; + cpu_gen_t *cpu; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + if (!(cpu = find_cpu(conn,vm,atoi(argv[1])))) + return(-1); + + cpu->idle_sleep_time = atoi(argv[2]); + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + +/* Show info about potential timer drift */ +static int cmd_show_timer_drift(hypervisor_conn_t *conn, + int argc,char *argv[]) +{ + vm_instance_t *vm; + cpu_gen_t *cpu; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + if (!(cpu = find_cpu(conn,vm,atoi(argv[1])))) + return(-1); + + if (cpu->type == CPU_TYPE_MIPS64) { + hypervisor_send_reply(conn,HSC_INFO_MSG,0,"Timer Drift: %u", + CPU_MIPS64(cpu)->timer_drift); + + hypervisor_send_reply(conn,HSC_INFO_MSG,0,"Pending Timer IRQ: %u", + CPU_MIPS64(cpu)->timer_irq_pending); + } + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + /* Set the exec area size */ static int cmd_set_exec_area(hypervisor_conn_t *conn,int argc,char *argv[]) { @@ -193,6 +376,37 @@ return(0); } +/* Set ghost RAM file */ +static int cmd_set_ghost_file(hypervisor_conn_t *conn,int argc,char *argv[]) +{ + vm_instance_t *vm; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + vm->ghost_ram_filename = strdup(argv[1]); + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + +/* Set ghost RAM status */ +static int cmd_set_ghost_status(hypervisor_conn_t *conn,int argc,char *argv[]) +{ + vm_instance_t *vm; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + vm->ghost_status = atoi(argv[1]); + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + + /* Set PCMCIA ATA disk0 size */ static int cmd_set_disk0(hypervisor_conn_t *conn,int argc,char *argv[]) { @@ -358,7 +572,7 @@ static int cmd_show_cpu_info(hypervisor_conn_t *conn,int argc,char *argv[]) { vm_instance_t *vm; - cpu_mips_t *cpu; + cpu_gen_t *cpu; if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) return(-1); @@ -366,8 +580,8 @@ cpu = cpu_group_find_id(vm->cpu_group,atoi(argv[1])); if (cpu) { - mips64_dump_regs(cpu); - tlb_dump(cpu); + cpu->reg_dump(cpu); + cpu->mmu_dump(cpu); } vm_release(vm); @@ -405,6 +619,36 @@ return(0); } +/* Send a message on the console */ +static int cmd_send_con_msg(hypervisor_conn_t *conn,int argc,char *argv[]) +{ + vm_instance_t *vm; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + vtty_store_str(vm->vtty_con,argv[1]); + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + +/* Send a message on the AUX port */ +static int cmd_send_aux_msg(hypervisor_conn_t *conn,int argc,char *argv[]) +{ + vm_instance_t *vm; + + if (!(vm = hypervisor_find_object(conn,argv[0],OBJ_TYPE_VM))) + return(-1); + + vtty_store_str(vm->vtty_aux,argv[1]); + + vm_release(vm); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + /* Show info about VM object */ static void cmd_show_vm_list(registry_entry_t *entry,void *opt,int *err) { @@ -424,6 +668,27 @@ return(0); } +/* Show console TCP port info about VM object */ +static void cmd_show_vm_list_con_ports(registry_entry_t *entry,void *opt, + int *err) +{ + hypervisor_conn_t *conn = opt; + vm_instance_t *vm = entry->data; + + if (vm->vtty_con_type == VTTY_TYPE_TCP) + hypervisor_send_reply(conn,HSC_INFO_MSG,0,"%s (%d)", + vm->name,vm->vtty_con_tcp_port); +} + +/* VM console TCP port list */ +static int cmd_vm_list_con_ports(hypervisor_conn_t *conn,int argc,char *argv[]) +{ + int err = 0; + registry_foreach_type(OBJ_TYPE_VM,cmd_show_vm_list_con_ports,conn,&err); + hypervisor_send_reply(conn,HSC_INFO_OK,1,"OK"); + return(0); +} + /* VM commands */ static hypervisor_cmd_t vm_cmd_array[] = { { "set_debug_level", 2, 2, cmd_set_debug_level, NULL }, @@ -432,12 +697,22 @@ { "set_ram", 2, 2, cmd_set_ram, NULL }, { "set_nvram", 2, 2, cmd_set_nvram, NULL }, { "set_ram_mmap", 2, 2, cmd_set_ram_mmap, NULL }, + { "set_sparse_mem", 2, 2, cmd_set_sparse_mem, NULL }, { "set_clock_divisor", 2, 2, cmd_set_clock_divisor, NULL }, + { "set_blk_direct_jump", 2, 2, cmd_set_blk_direct_jump, NULL }, { "set_exec_area", 2, 2, cmd_set_exec_area, NULL }, { "set_disk0", 2, 2, cmd_set_disk0, NULL }, { "set_disk1", 2, 2, cmd_set_disk1, NULL }, { "set_conf_reg", 2, 2, cmd_set_conf_reg, NULL }, { "set_idle_pc", 2, 2, cmd_set_idle_pc, NULL }, + { "set_idle_pc_online", 3, 3, cmd_set_idle_pc_online, NULL }, + { "get_idle_pc_prop", 2, 2, cmd_get_idle_pc_prop, NULL }, + { "show_idle_pc_prop", 2, 2, cmd_show_idle_pc_prop, NULL }, + { "set_idle_max", 3, 3, cmd_set_idle_max, NULL }, + { "set_idle_sleep_time", 3, 3, cmd_set_idle_sleep_time, NULL }, + { "show_timer_drift", 2, 2, cmd_show_timer_drift, NULL }, + { "set_ghost_file", 2, 2, cmd_set_ghost_file, NULL }, + { "set_ghost_status", 2, 2, cmd_set_ghost_status, NULL }, { "set_con_tcp_port", 2, 2, cmd_set_con_tcp_port, NULL }, { "set_aux_tcp_port", 2, 2, cmd_set_aux_tcp_port, NULL }, { "extract_config", 1, 1, cmd_extract_config, NULL }, @@ -445,7 +720,10 @@ { "cpu_info", 2, 2, cmd_show_cpu_info, NULL }, { "suspend", 1, 1, cmd_suspend, NULL }, { "resume", 1, 1, cmd_resume, NULL }, + { "send_con_msg", 2, 2, cmd_send_con_msg, NULL }, + { "send_aux_msg", 2, 2, cmd_send_aux_msg, NULL }, { "list", 0, 0, cmd_vm_list, NULL }, + { "list_con_ports", 0, 0, cmd_vm_list_con_ports, NULL }, { NULL, -1, -1, NULL, NULL }, };