github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-19 01:40:17 +00:00
Code Issues Projects Releases Wiki Activity

acrn/dm: gvt returns negative errno to terminate the initialization

Browse Source 
When the "i915.enable_gvt=0" is added for SOS kernel boot args, ACRN-DM will
fail in course of gvt initialization and errno is returned directly.
As the errno defined in linux/errno.h is positive, it will continue
the unexpected initialization in ACRN-DM and then the segment fault is
triggered.
So negative errno is returned in order to terminate the initialization.

Tracked-On: #2584
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Reviewed-by: He, Min <min.he@intel.com>
Acked-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Zhao Yakui 2019-04-24 15:36:40 +08:00 committed by ACRN System Integration
parent 0b37fc0b17
commit 7ef9498fe0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devicemodel/hw/pci/gvt.c
View File

@ -170,7 +170,7 @@ gvt_create_instance(struct pci_gvt *gvt)
gvt->gvt_file = fopen(path, "w"); gvt->gvt_file = fopen(path, "w");
if (gvt->gvt_file == NULL) { if (gvt->gvt_file == NULL) {
WPRINTF(("GVT: open %s failed\n", path)); WPRINTF(("GVT: open %s failed\n", path));
return errno; return -errno;
} }
DPRINTF(("GVT: %s: domid=%d, low_gm_sz=%dMB, high_gm_sz=%dMB, " DPRINTF(("GVT: %s: domid=%d, low_gm_sz=%dMB, high_gm_sz=%dMB, "
@ -189,10 +189,10 @@ gvt_create_instance(struct pci_gvt *gvt)
*/ */
if (fprintf(gvt->gvt_file, "%d,%u,%u,%u\n", guest_domid, if (fprintf(gvt->gvt_file, "%d,%u,%u,%u\n", guest_domid,
gvt_low_gm_sz, gvt_high_gm_sz, gvt_fence_sz) < 0) gvt_low_gm_sz, gvt_high_gm_sz, gvt_fence_sz) < 0)
ret = errno; ret = -errno;
if (fclose(gvt->gvt_file) != 0) if (fclose(gvt->gvt_file) != 0)
return errno; return -errno;
if (!ret) if (!ret)
gvt->instance_created = 1; gvt->instance_created = 1;
@ -210,17 +210,17 @@ gvt_destroy_instance(struct pci_gvt *gvt)
gvt->gvt_file = fopen(path, "w"); gvt->gvt_file = fopen(path, "w");
if (gvt->gvt_file == NULL) { if (gvt->gvt_file == NULL) {
WPRINTF(("gvt: error: open %s failed", path)); WPRINTF(("gvt: error: open %s failed", path));
return errno; return -errno;
} }
/* -domid means we want the gvt driver to free the gvt instance /* -domid means we want the gvt driver to free the gvt instance
* of Domain domid. * of Domain domid.
**/ **/
if (fprintf(gvt->gvt_file, "%d\n", -guest_domid) < 0) if (fprintf(gvt->gvt_file, "%d\n", -guest_domid) < 0)
ret = errno; ret = -errno;
if (fclose(gvt->gvt_file) != 0) if (fclose(gvt->gvt_file) != 0)
return errno; return -errno;
if (!ret) if (!ret)
gvt->instance_created = 0; gvt->instance_created = 0;