github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-05-24 16:14:39 +00:00
Code Issues Projects Releases Wiki Activity

DM: deinit initialized pci device when failed

Browse Source 
if some pci devices behind gvt got failures when initlizing at init_pci(), gvt
instance have no chance to be destroied even acrn-dm exits.

NOTE: this patch can not work standalone, a following patch to kernel
side(643d40961cf: "vhm: init client->kthread_exit true") is requied as well,
otherwise it will stucks during destroying gvt instance.

Tracked-On: #1141
Signed-off-by: Li Zhijian <zhijianli88@163.com>
This commit is contained in:
Li Zhijian 2018-08-20 18:14:27 +00:00 committed by lijinxia
parent 99285f844a
commit bcfe447f5c
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
devicemodel/hw/pci/core.c
View File

@ -1150,6 +1150,7 @@ init_pci(struct vmctx *ctx)
struct funcinfo *fi; struct funcinfo *fi;
size_t lowmem; size_t lowmem;
int bus, slot, func; int bus, slot, func;
int success_cnt = 0;
int error; int error;
pci_emul_iobase = PCI_EMUL_IOBASE; pci_emul_iobase = PCI_EMUL_IOBASE;
@ -1181,7 +1182,8 @@ init_pci(struct vmctx *ctx)
error = pci_emul_init(ctx, ops, bus, slot, error = pci_emul_init(ctx, ops, bus, slot,
func, fi); func, fi);
if (error) if (error)
return error; goto pci_emul_init_fail;
success_cnt++;
} }
} }
@ -1207,7 +1209,7 @@ init_pci(struct vmctx *ctx)
error = check_gsi_sharing_violation(); error = check_gsi_sharing_violation();
if (error < 0) if (error < 0)
return error; goto pci_emul_init_fail;
/* /*
* PCI backends are initialized before routing INTx interrupts * PCI backends are initialized before routing INTx interrupts
@ -1270,6 +1272,29 @@ init_pci(struct vmctx *ctx)
assert(error == 0); assert(error == 0);
return 0; return 0;
pci_emul_init_fail:
for (bus = 0; bus < MAXBUSES && success_cnt > 0; bus++) {
bi = pci_businfo[bus];
if (bi == NULL)
continue;
for (slot = 0; slot < MAXSLOTS && success_cnt > 0; slot++) {
si = &bi->slotinfo[slot];
for (func = 0; func < MAXFUNCS; func++) {
fi = &si->si_funcs[func];
if (fi->fi_name == NULL)
continue;
if (success_cnt-- <= 0)
break;
ops = pci_emul_finddev(fi->fi_name);
assert(ops != NULL);
pci_emul_deinit(ctx, ops, bus, slot,
func, fi);
}
}
}
return error;
} }
void void