github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-06 12:06:25 +00:00
Code Issues Projects Releases Wiki Activity

handle failure when add/create vcpu for a VM in DM

Browse Source 
when add/create vcpu failed, before it just exits,
and the resource will not released; now if failed,
let DM release the resource.

Signed-off-by: Minggui Cao <minggui.cao@intel.com>
Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Minggui Cao 2018-06-14 15:49:55 +08:00 committed by Jack Ren
parent 098c2e6788
commit a0b8da77fd
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devicemodel/core/main.c
View File

@ -252,7 +252,7 @@ start_thread(void *param)
return NULL; return NULL;
} }
static void static int
add_cpu(struct vmctx *ctx, int guest_ncpus) add_cpu(struct vmctx *ctx, int guest_ncpus)
{ {
int i; int i;
@ -260,8 +260,10 @@ add_cpu(struct vmctx *ctx, int guest_ncpus)
for (i = 0; i < guest_ncpus; i++) { for (i = 0; i < guest_ncpus; i++) {
error = vm_create_vcpu(ctx, i); error = vm_create_vcpu(ctx, i);
if (error != 0) if (error != 0) {
err(EX_OSERR, "could not create CPU %d", i); fprintf(stderr, "ERROR: could not create VCPU %d\n", i);
return error;
}
CPU_SET_ATOMIC(i, &cpumask); CPU_SET_ATOMIC(i, &cpumask);
@ -271,7 +273,8 @@ add_cpu(struct vmctx *ctx, int guest_ncpus)
error = pthread_create(&mt_vmm_info[0].mt_thr, NULL, error = pthread_create(&mt_vmm_info[0].mt_thr, NULL,
start_thread, &mt_vmm_info[0]); start_thread, &mt_vmm_info[0]);
assert(error == 0);
return error;
} }
static int static int
@ -886,7 +889,9 @@ main(int argc, char *argv[])
/* /*
* Add CPU 0 * Add CPU 0
*/ */
add_cpu(ctx, guest_ncpus); error = add_cpu(ctx, guest_ncpus);
if (error)
goto vm_fail;
/* Make a copy for ctx */ /* Make a copy for ctx */
_ctx = ctx; _ctx = ctx;