commit 1533b3ad6f215e3727ba081ebf6c170c22794c3c
author Jean-Baptiste Queru <jbq@google.com> Thu Feb 23 07:25:04 2012 -0800
committer android code review <noreply-gerritcodereview@google.com> Thu Feb 23 07:25:06 2012 -0800
tree 199f65b84486a09397f29c94e9bb87e329aeee06
parent a3338e7214cd0c69912866c6d71d8700c6ab35e2
parent 1d1280d7d347bb9467bfe9c161cba254f9e55d1c

Merge "Fix the vmid issue in HAX"

target-i386/hax-all.c

diff --git a/target-i386/hax-all.c b/target-i386/hax-all.c
index 18d65d0..c8f4cec 100644
--- a/target-i386/hax-all.c
+++ b/target-i386/hax-all.c
@@ -258,8 +258,7 @@
     if (!vm)
         return NULL;
     memset(vm, 0, sizeof(struct hax_vm));
-
-    ret = hax_host_create_vm(hax, vm_id);
+    ret = hax_host_create_vm(hax, &vm_id);
     if (ret) {
         dprint("Failed to create vm %x\n", ret);
         goto error;

target-i386/hax-darwin.c

diff --git a/target-i386/hax-darwin.c b/target-i386/hax-darwin.c
index b6d27c3..45c781b 100644
--- a/target-i386/hax-darwin.c
+++ b/target-i386/hax-darwin.c
@@ -136,9 +136,10 @@
     return name;
 }
 
-int hax_host_create_vm(struct hax_state *hax, int vm_id)
+int hax_host_create_vm(struct hax_state *hax, int *vmid)
 {
     int ret;
+    int vm_id = 0;
 
     if (hax_invalid_fd(hax->fd))
         return -EINVAL;
@@ -147,7 +148,7 @@
         return 0;
 
     ret = ioctl(hax->fd, HAX_IOCTL_CREATE_VM, &vm_id);
-
+    *vmid = vm_id;
     return ret;
 }
 

target-i386/hax-i386.h

diff --git a/target-i386/hax-i386.h b/target-i386/hax-i386.h
index e55e584..5ad22ad 100644
--- a/target-i386/hax-i386.h
+++ b/target-i386/hax-i386.h
@@ -69,7 +69,7 @@
 int hax_vm_destroy(struct hax_vm *vm);
 
 /* Common host function */
-int hax_host_create_vm(struct hax_state *hax, int vm_id);
+int hax_host_create_vm(struct hax_state *hax, int *vm_id);
 hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id);
 int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid);
 hax_fd hax_host_open_vcpu(int vmid, int vcpuid);

target-i386/hax-windows.c

diff --git a/target-i386/hax-windows.c b/target-i386/hax-windows.c
index 683a227..d66ec4a 100644
--- a/target-i386/hax-windows.c
+++ b/target-i386/hax-windows.c
@@ -198,9 +198,10 @@
     return name;
 }
 
-int hax_host_create_vm(struct hax_state *hax, int vm_id)
+int hax_host_create_vm(struct hax_state *hax, int *vmid)
 {
     int ret;
+    int vm_id = 0;
     DWORD dSize = 0;
 
     if (hax_invalid_fd(hax->fd))
@@ -219,7 +220,7 @@
         dprint("error code:%d", GetLastError());
         return -1;
     }
-
+    *vmid = vm_id;
     return 0;
 }