diff options
| author | Peter Maydell | 2018-06-01 11:16:48 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-01 11:16:49 +0200 |
| commit | 14fc618461c2756a3f0b16bf6af198c5d7731137 (patch) | |
| tree | 3bc4adf6677e1baeae2524678888e49ea6c4a1da /include | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180531-... (diff) | |
| parent | xen-hvm: stop faking I/O to access PCI config space (diff) | |
| download | qemu-14fc618461c2756a3f0b16bf6af198c5d7731137.tar.gz qemu-14fc618461c2756a3f0b16bf6af198c5d7731137.tar.xz qemu-14fc618461c2756a3f0b16bf6af198c5d7731137.zip | |
Merge remote-tracking branch 'remotes/sstabellini-http/tags/xen-20180531-tag' into staging
Xen 2018/05/31
# gpg: Signature made Thu 31 May 2018 20:05:49 BST
# gpg: using RSA key 894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# gpg: aka "Stefano Stabellini <sstabellini@kernel.org>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90
* remotes/sstabellini-http/tags/xen-20180531-tag:
xen-hvm: stop faking I/O to access PCI config space
xen-hvm: try to use xenforeignmemory_map_resource() to map ioreq pages
xen/hvm: correct reporting of modified memory under physmap during migration
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/xen/xen_common.h | 16 | ||||
| -rw-r--r-- | include/sysemu/xen-mapcache.h | 5 |
2 files changed, 18 insertions, 3 deletions
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index bbf207dcef..93f631e5bf 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -119,6 +119,22 @@ static inline int xendevicemodel_pin_memory_cacheattr( return xc_domain_pin_memory_cacheattr(xen_xc, domid, start, end, type); } +typedef void xenforeignmemory_resource_handle; + +#define XENMEM_resource_ioreq_server 0 + +#define XENMEM_resource_ioreq_server_frame_bufioreq 0 +#define XENMEM_resource_ioreq_server_frame_ioreq(n) (1 + (n)) + +static inline xenforeignmemory_resource_handle *xenforeignmemory_map_resource( + xenforeignmemory_handle *fmem, domid_t domid, unsigned int type, + unsigned int id, unsigned long frame, unsigned long nr_frames, + void **paddr, int prot, int flags) +{ + errno = EOPNOTSUPP; + return NULL; +} + #endif /* CONFIG_XEN_CTRL_INTERFACE_VERSION < 41100 */ #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41000 diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h index bd4d49e0a4..a03e2f1878 100644 --- a/include/sysemu/xen-mapcache.h +++ b/include/sysemu/xen-mapcache.h @@ -9,9 +9,8 @@ #ifndef XEN_MAPCACHE_H #define XEN_MAPCACHE_H -typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr start_addr, - ram_addr_t size, - void *opaque); +typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset, + ram_addr_t size); #ifdef CONFIG_XEN void xen_map_cache_init(phys_offset_to_gaddr_t f, |