ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Xen: Fix xen_set_irq() and xendevicemodel_set_irq_level() 

Remove '=' from 'if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41500'.
Because xendevicemodel_set_irq_level() was introduced in 4.15 version.

Also, update xendevicemodel_set_irq_level() to return -1 for older versions.

Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
This commit is contained in:
Vikram Garhwal 2023-11-01 14:07:23 -07:00 committed by Stefano Stabellini
parent 462ad017ed
commit 01bb72afbb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/arm/xen_arm.c
View File

@ -75,7 +75,9 @@ static MemoryRegion ram_lo, ram_hi;
static void xen_set_irq(void *opaque, int irq, int level)
{
xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level);
if (xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level)) {
error_report("xendevicemodel_set_irq_level failed");
}
}
static void xen_create_virtio_mmio_devices(XenArmState *xam)

4
include/hw/xen/xen_native.h
View File

@ -523,12 +523,12 @@ static inline int xen_set_ioreq_server_state(domid_t dom,
enable);
}
#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41500
#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41500
static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
domid_t domid, uint32_t irq,
unsigned int level)
{
return 0;
return -1;
}
#endif