OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

xen: add a dummy xc_hvm_inject_msi for Xen < 4.2

Browse Source 
xc_hvm_inject_msi is only available on Xen >= 4.2: add a dummy
compatibility function for Xen < 4.2.

Also enable msi support only on Xen >= 4.2.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
This commit is contained in:
Stefano Stabellini 2012-04-17 16:56:51 +00:00
parent 8688e0652d
commit 4c9f8d1b4e
4 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/pc.c
View File

@ -916,7 +916,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id)
msi_supported = true;
}
if (xen_enabled()) {
if (xen_msi_support()) {
msi_supported = true;
}

10
hw/xen.h
View File

@ -57,4 +57,14 @@ void xen_register_framebuffer(struct MemoryRegion *mr);
# define HVM_MAX_VCPUS 32
#endif
static inline int xen_msi_support(void)
{
#if defined(CONFIG_XEN_CTRL_INTERFACE_VERSION) \
&& CONFIG_XEN_CTRL_INTERFACE_VERSION >= 420
return xen_enabled();
#else
return 0;
#endif
}
#endif /* QEMU_HW_XEN_H */

15
hw/xen_common.h
View File

@ -133,6 +133,21 @@ static inline int xc_fd(xc_interface *xen_xc)
}
#endif
/* Xen before 4.2 */
#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
uint64_t addr, uint32_t data)
{
return -ENOSYS;
}
#else
static inline int xen_xc_hvm_inject_msi(XenXC xen_xc, domid_t dom,
uint64_t addr, uint32_t data)
{
return xc_hvm_inject_msi(xen_xc, dom, addr, data);
}
#endif
void destroy_hvm_domain(void);
#endif /* QEMU_HW_XEN_COMMON_H */

2
xen-all.c
View File

@ -129,7 +129,7 @@ void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len)
void xen_hvm_inject_msi(uint64_t addr, uint32_t data)
{
xc_hvm_inject_msi(xen_xc, xen_domid, addr, data);
xen_xc_hvm_inject_msi(xen_xc, xen_domid, addr, data);
}
static void xen_suspend_notifier(Notifier *notifier, void *data)