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

acrn/dm: Add the check of acrn_vhm/acrn_hsm to open the VHM driver

Browse Source 
Currently VHM driver is opened by using the device file of /dev/acrn_vhm.
But for the upstream purpose it is renamed to /dev/acrn_hsm.
So we need to check that the device file is acrn_vhm or acrn_hsm and then
open the VHM driver.

Tracked-On: projectacrn/acrn-hypervisor#2356
Acked-by: Anthony Xu <anthony.xu@intel.com>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
This commit is contained in:
Zhao Yakui 2019-01-18 09:04:08 +08:00 committed by wenlingz
parent e4a3a63496
commit ca32881666
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devicemodel/core/vmmapi.c
View File

@ -37,7 +37,8 @@
#include <ctype.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "vmmapi.h"
@ -91,13 +92,20 @@ vm_create(const char *name, uint64_t req_buf)
struct acrn_create_vm create_vm;
int error, retry = 10;
uuid_t vm_uuid;
struct stat tmp_st;
memset(&create_vm, 0, sizeof(struct acrn_create_vm));
ctx = calloc(1, sizeof(struct vmctx) + strnlen(name, PATH_MAX) + 1);
assert(ctx != NULL);
assert(devfd == -1);
devfd = open("/dev/acrn_vhm", O_RDWR|O_CLOEXEC);
if (stat("/dev/acrn_vhm", &tmp_st) == 0) {
devfd = open("/dev/acrn_vhm", O_RDWR|O_CLOEXEC);
} else if (stat("/dev/acrn_hsm", &tmp_st) == 0) {
devfd = open("/dev/acrn_hsm", O_RDWR|O_CLOEXEC);
} else {
devfd = -1;
}
if (devfd == -1) {
fprintf(stderr, "Could not open /dev/acrn_vhm\n");
goto err;