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

hv: dm: Use new VM management ioctls

Browse Source 
IC_CREATE_VM		->	ACRN_IOCTL_CREATE_VM
IC_DESTROY_VM		->	ACRN_IOCTL_DESTROY_VM
IC_START_VM		->	ACRN_IOCTL_START_VM
IC_PAUSE_VM		->	ACRN_IOCTL_PAUSE_VM
IC_RESET_VM		->	ACRN_IOCTL_RESET_VM

struct acrn_create_vm	->	struct acrn_vm_creation

Tracked-On: #6282
Signed-off-by: Shuo A Liu <shuo.a.liu@intel.com>
This commit is contained in:
Shuo A Liu
2021-07-07 13:13:17 +08:00
committed by wenlingz
parent 7efe18a84b
commit f476ca55ab
6 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
devicemodel/core/vmmapi.c
View File

@@ -165,12 +165,12 @@ struct vmctx *
vm_create(const char *name, uint64_t req_buf, int *vcpu_num)
{
struct vmctx *ctx;
struct acrn_create_vm create_vm;
struct acrn_vm_creation create_vm;
int error, retry = 10;
uuid_t vm_uuid;
struct stat tmp_st;
memset(&create_vm, 0, sizeof(struct acrn_create_vm));
memset(&create_vm, 0, sizeof(struct acrn_vm_creation));
ctx = calloc(1, sizeof(struct vmctx) + strnlen(name, PATH_MAX) + 1);
if ((ctx == NULL) || (devfd != -1))
goto err;
@@ -230,9 +230,9 @@ vm_create(const char *name, uint64_t req_buf, int *vcpu_num)
create_vm.vm_flag |= GUEST_FLAG_IO_COMPLETION_POLLING;
}
create_vm.req_buf = req_buf;
create_vm.ioreq_buf = req_buf;
while (retry > 0) {
error = ioctl(ctx->fd, IC_CREATE_VM, &create_vm);
error = ioctl(ctx->fd, ACRN_IOCTL_CREATE_VM, &create_vm);
if (error == 0)
break;
usleep(500000);
@@ -311,7 +311,7 @@ vm_destroy(struct vmctx *ctx)
if (!ctx)
return;
ioctl(ctx->fd, IC_DESTROY_VM, NULL);
ioctl(ctx->fd, ACRN_IOCTL_DESTROY_VM, NULL);
close(ctx->fd);
free(ctx);
devfd = -1;
@@ -468,7 +468,7 @@ vm_run(struct vmctx *ctx)
{
int error;
error = ioctl(ctx->fd, IC_START_VM, &ctx->vmid);
error = ioctl(ctx->fd, ACRN_IOCTL_START_VM, &ctx->vmid);
return error;
}
@@ -476,13 +476,13 @@ vm_run(struct vmctx *ctx)
void
vm_pause(struct vmctx *ctx)
{
ioctl(ctx->fd, IC_PAUSE_VM, &ctx->vmid);
ioctl(ctx->fd, ACRN_IOCTL_PAUSE_VM, &ctx->vmid);
}
void
vm_reset(struct vmctx *ctx)
{
ioctl(ctx->fd, IC_RESET_VM, &ctx->vmid);
ioctl(ctx->fd, ACRN_IOCTL_RESET_VM, &ctx->vmid);
}
void

17
devicemodel/include/public/hsm_ioctl_defs.h
View File

@@ -72,13 +72,18 @@
#define ACRN_IOCTL_GET_PLATFORM_INFO \
_IOR(ACRN_IOCTL_TYPE, 0x03, struct acrn_platform_info)
/* VM management */
#define IC_ID_VM_BASE 0x10UL
#define IC_CREATE_VM _IC_ID(IC_ID, IC_ID_VM_BASE + 0x00)
#define IC_DESTROY_VM _IC_ID(IC_ID, IC_ID_VM_BASE + 0x01)
#define IC_START_VM _IC_ID(IC_ID, IC_ID_VM_BASE + 0x02)
#define IC_PAUSE_VM _IC_ID(IC_ID, IC_ID_VM_BASE + 0x03)
#define IC_RESET_VM _IC_ID(IC_ID, IC_ID_VM_BASE + 0x05)
#define ACRN_IOCTL_CREATE_VM \
_IOWR(ACRN_IOCTL_TYPE, 0x10, struct acrn_vm_creation)
#define ACRN_IOCTL_DESTROY_VM \
_IO(ACRN_IOCTL_TYPE, 0x11)
#define ACRN_IOCTL_START_VM \
_IO(ACRN_IOCTL_TYPE, 0x12)
#define ACRN_IOCTL_PAUSE_VM \
_IO(ACRN_IOCTL_TYPE, 0x13)
#define ACRN_IOCTL_RESET_VM \
_IO(ACRN_IOCTL_TYPE, 0x15)
#define IC_SET_VCPU_REGS _IC_ID(IC_ID, IC_ID_VM_BASE + 0x06)
/* IRQ and Interrupts */