From 07381888d39b835c82b3f799de07e864bcea443e Mon Sep 17 00:00:00 2001 From: Shuo A Liu Date: Wed, 7 Jul 2021 21:16:49 +0800 Subject: [PATCH] dm: Use the new HSM eventfd ioctls IC_EVENT_IOEVENTFD -> ACRN_IOCTL_IOEVENTFD IC_EVENT_IRQFD -> ACRN_IOCTL_IRQFD Tracked-On: #6282 Signed-off-by: Shuo A Liu --- devicemodel/core/vmmapi.c | 4 ++-- devicemodel/include/public/hsm_ioctl_defs.h | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/devicemodel/core/vmmapi.c b/devicemodel/core/vmmapi.c index 3c9d62c70..72641d8c0 100644 --- a/devicemodel/core/vmmapi.c +++ b/devicemodel/core/vmmapi.c @@ -661,13 +661,13 @@ vm_intr_monitor(struct vmctx *ctx, void *intr_buf) int vm_ioeventfd(struct vmctx *ctx, struct acrn_ioeventfd *args) { - return ioctl(ctx->fd, IC_EVENT_IOEVENTFD, args); + return ioctl(ctx->fd, ACRN_IOCTL_IOEVENTFD, args); } int vm_irqfd(struct vmctx *ctx, struct acrn_irqfd *args) { - return ioctl(ctx->fd, IC_EVENT_IRQFD, args); + return ioctl(ctx->fd, ACRN_IOCTL_IRQFD, args); } int diff --git a/devicemodel/include/public/hsm_ioctl_defs.h b/devicemodel/include/public/hsm_ioctl_defs.h index 0ca6826fc..853bb1ec0 100644 --- a/devicemodel/include/public/hsm_ioctl_defs.h +++ b/devicemodel/include/public/hsm_ioctl_defs.h @@ -133,10 +133,11 @@ #define ACRN_IOCTL_PM_GET_CPU_STATE \ _IOWR(ACRN_IOCTL_TYPE, 0x60, __u64) -/* VHM eventfd */ -#define IC_ID_EVENT_BASE 0x70UL -#define IC_EVENT_IOEVENTFD _IC_ID(IC_ID, IC_ID_EVENT_BASE + 0x00) -#define IC_EVENT_IRQFD _IC_ID(IC_ID, IC_ID_EVENT_BASE + 0x01) +/* HSM eventfd */ +#define ACRN_IOCTL_IOEVENTFD \ + _IOW(ACRN_IOCTL_TYPE, 0x70, struct acrn_ioeventfd) +#define ACRN_IOCTL_IRQFD \ + _IOW(ACRN_IOCTL_TYPE, 0x71, struct acrn_irqfd) #define ACRN_MEM_ACCESS_RIGHT_MASK 0x00000007U