Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
merge from the java bindings work
authorTakahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Wed, 24 Apr 2013 16:01:23 +0000 (18:01 +0200)
committerTakahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Wed, 24 Apr 2013 16:01:23 +0000 (18:01 +0200)
Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor

1  2 
src/msg/msg_vm.c

diff --combined src/msg/msg_vm.c
@@@ -169,7 -169,7 +169,7 @@@ int MSG_vm_is_restoring(msg_vm_t vm
   *
   */
  msg_vm_t MSG_vm_create(msg_host_t ind_pm, const char *name,
 -                                           int ncpus, int ramsize, int net_cap, char *disk_path, int disksize)
 +                                           int ncpus, long ramsize, long net_cap, char *disk_path, long disksize)
  {
    msg_vm_t vm = MSG_vm_create_core(ind_pm, name);
  
      s_ws_params_t params;
      memset(&params, 0, sizeof(params));
      params.ramsize = ramsize;
-     params.overcommit = 0;
+     //params.overcommit = 0;
      simcall_host_set_params(vm, &params);
    }
  
@@@ -665,7 -665,6 +665,6 @@@ static void do_migration(msg_vm_t vm, m
      argv[2] = xbt_strdup(sg_host_name(src_pm));
      argv[3] = xbt_strdup(sg_host_name(dst_pm));
      argv[4] = NULL;
      msg_process_t pr = MSG_process_create_with_arguments(pr_name, migration_tx_fun, NULL, src_pm, nargvs - 1, argv);
  
      xbt_free(pr_name);