dm: Use new interrupt management ioctls

IC_INJECT_MSI		->	ACRN_IOCTL_INJECT_MSI
IC_SET_IRQLINE		->	ACRN_IOCTL_SET_IRQLINE
IC_VM_INTR_MONITOR	->	ACRN_IOCTL_VM_INTR_MONITOR

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 14:14:04 +08:00 committed by wenlingz
parent 107cae316a
commit 3c66ba7ef5
2 changed files with 9 additions and 7 deletions

View File

@ -525,7 +525,7 @@ vm_lapic_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg)
msi.msi_addr = addr;
msi.msi_data = msg;
return ioctl(ctx->fd, IC_INJECT_MSI, &msi);
return ioctl(ctx->fd, ACRN_IOCTL_INJECT_MSI, &msi);
}
int
@ -537,7 +537,7 @@ vm_set_gsi_irq(struct vmctx *ctx, int gsi, uint32_t operation)
op.op = operation;
op.gsi = (uint32_t)gsi;
return ioctl(ctx->fd, IC_SET_IRQLINE, *req);
return ioctl(ctx->fd, ACRN_IOCTL_SET_IRQLINE, *req);
}
int
@ -656,7 +656,7 @@ vm_get_cpu_state(struct vmctx *ctx, void *state_buf)
int
vm_intr_monitor(struct vmctx *ctx, void *intr_buf)
{
return ioctl(ctx->fd, IC_VM_INTR_MONITOR, intr_buf);
return ioctl(ctx->fd, ACRN_IOCTL_VM_INTR_MONITOR, intr_buf);
}
int

View File

@ -86,10 +86,12 @@
_IOW(ACRN_IOCTL_TYPE, 0x16, struct acrn_vcpu_regs)
/* IRQ and Interrupts */
#define IC_ID_IRQ_BASE 0x20UL
#define IC_INJECT_MSI _IC_ID(IC_ID, IC_ID_IRQ_BASE + 0x03)
#define IC_VM_INTR_MONITOR _IC_ID(IC_ID, IC_ID_IRQ_BASE + 0x04)
#define IC_SET_IRQLINE _IC_ID(IC_ID, IC_ID_IRQ_BASE + 0x05)
#define ACRN_IOCTL_INJECT_MSI \
_IOW(ACRN_IOCTL_TYPE, 0x23, struct acrn_msi_entry)
#define ACRN_IOCTL_VM_INTR_MONITOR \
_IOW(ACRN_IOCTL_TYPE, 0x24, unsigned long)
#define ACRN_IOCTL_SET_IRQLINE \
_IOW(ACRN_IOCTL_TYPE, 0x25, __u64)
/* DM ioreq management */
#define IC_ID_IOREQ_BASE 0x30UL