diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-25 12:09:34 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-25 12:09:34 +0000 |
| commit | e85dda8070b20dd8765d52daf64de70a9ccf395f (patch) | |
| tree | 0229a23a1c9e722570d94c243fc155238e07d17c /include | |
| parent | 1aae36df4b8ed884c6ef6995e70c67fad79b49df (diff) | |
| parent | 22037db38ccfe497bd13a94edead6657781b9b37 (diff) | |
| download | qemu-e85dda8070b20dd8765d52daf64de70a9ccf395f.zip qemu-e85dda8070b20dd8765d52daf64de70a9ccf395f.tar.gz qemu-e85dda8070b20dd8765d52daf64de70a9ccf395f.tar.bz2 | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20151125' into staging
Xen 2015/11/25
# gpg: Signature made Wed 25 Nov 2015 11:19:26 GMT using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
* remotes/sstabellini/tags/xen-20151125:
xen_disk: Remove ioreq.postsync
xen: fix usage of xc_domain_create in domain builder
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/xen/xen_common.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index d7fa6a4..4ac0c6f 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -439,4 +439,20 @@ static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, } #endif +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 470 +static inline int xen_domain_create(XenXC xc, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid) +{ + return xc_domain_create(xc, ssidref, handle, flags, pdomid); +} +#else +static inline int xen_domain_create(XenXC xc, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid) +{ + return xc_domain_create(xc, ssidref, handle, flags, pdomid, NULL); +} +#endif + #endif /* QEMU_HW_XEN_COMMON_H */ |