Page MenuHomeFreeBSD

D41752.diff
No OneTemporary

D41752.diff

diff --git a/lib/libvmmapi/aarch64/vmmapi_machdep.c b/lib/libvmmapi/aarch64/vmmapi_machdep.c
--- a/lib/libvmmapi/aarch64/vmmapi_machdep.c
+++ b/lib/libvmmapi/aarch64/vmmapi_machdep.c
@@ -99,8 +99,8 @@
}
int
-vm_raise_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg, int bus, int slot,
- int func)
+vm_raise_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg,
+ int bus, int slot, int func)
{
struct vm_msi vmsi;
diff --git a/lib/libvmmapi/amd64/vmmapi_machdep.c b/lib/libvmmapi/amd64/vmmapi_machdep.c
--- a/lib/libvmmapi/amd64/vmmapi_machdep.c
+++ b/lib/libvmmapi/amd64/vmmapi_machdep.c
@@ -166,6 +166,13 @@
return (ioctl(ctx->fd, VM_LAPIC_MSI, &vmmsi));
}
+int
+vm_raise_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg,
+ int bus __unused, int slot __unused, int func __unused)
+{
+ return (vm_lapic_msi(ctx, addr, msg));
+}
+
int
vm_apicid2vcpu(struct vmctx *ctx __unused, int apicid)
{
diff --git a/lib/libvmmapi/vmmapi.h b/lib/libvmmapi/vmmapi.h
--- a/lib/libvmmapi/vmmapi.h
+++ b/lib/libvmmapi/vmmapi.h
@@ -157,17 +157,17 @@
int vm_run(struct vcpu *vcpu, struct vm_run *vmrun);
int vm_suspend(struct vmctx *ctx, enum vm_suspend_how how);
int vm_reinit(struct vmctx *ctx);
-int vm_apicid2vcpu(struct vmctx *ctx, int apicid);
+int vm_raise_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg,
+ int bus, int slot, int func);
#ifdef __aarch64__
int vm_attach_vgic(struct vmctx *ctx, uint64_t dist_start, size_t dist_size,
uint64_t redist_start, size_t redist_size);
int vm_assert_irq(struct vmctx *ctx, uint32_t irq);
int vm_deassert_irq(struct vmctx *ctx, uint32_t irq);
-int vm_raise_msi(struct vmctx *ctx, uint64_t addr, uint64_t msg, int bus,
- int slot, int func);
int vm_inject_exception(struct vcpu *vcpu, uint64_t esr, uint64_t far);
#endif
#ifdef __amd64__
+int vm_apicid2vcpu(struct vmctx *ctx, int apicid);
int vm_inject_exception(struct vcpu *vcpu, int vector,
int errcode_valid, uint32_t errcode, int restart_instruction);
int vm_lapic_irq(struct vcpu *vcpu, int vector);

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 26, 6:34 AM (21 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
12814762
Default Alt Text
D41752.diff (1 KB)

Event Timeline