From: Takahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Date: Wed, 24 Apr 2013 16:01:23 +0000 (+0200)
Subject: merge from the java bindings work
X-Git-Tag: v3_11_beta~297^2^2~40
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c078a363724fe8ef749dfbda30f09b5f471643f7?hp=2489210b4ea8d03fbece8db288ef9e3ff6725723

merge from the java bindings work

Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
---

diff --git a/include/msg/msg.h b/include/msg/msg.h
index 54da595ec4..cf912376c5 100644
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -381,7 +381,7 @@ XBT_PUBLIC(const char*) MSG_vm_get_name(msg_vm_t);
 // TODO add VDI later
 XBT_PUBLIC(msg_vm_t) MSG_vm_create_core(msg_host_t location, const char *name);
 XBT_PUBLIC(msg_vm_t) MSG_vm_create(msg_host_t ind_pm, const char *name,
-    int core_nb, int mem_cap, int net_cap, char *disk_path, int disk_size);
+    int core_nb, long mem_cap, long net_cap, char *disk_path, long disk_size);
 
 XBT_PUBLIC(void) MSG_vm_destroy(msg_vm_t vm);
 
diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index d3aee81525..a5331a5e88 100644
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -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);