diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-01 10:16:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-01 10:16:49 +0100 |
| commit | 14fc618461c2756a3f0b16bf6af198c5d7731137 (patch) | |
| tree | 3bc4adf6677e1baeae2524678888e49ea6c4a1da /hw/i386/xen/xen-mapcache.c | |
| parent | c181ddaa176856b3cd2dfd12bbcf25fa9c884a97 (diff) | |
| parent | dfb6578d69d60e464be36dafed9741dcfd73d2cf (diff) | |
| download | focaccia-qemu-14fc618461c2756a3f0b16bf6af198c5d7731137.tar.gz focaccia-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 'hw/i386/xen/xen-mapcache.c')
| -rw-r--r-- | hw/i386/xen/xen-mapcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c index efa35dc6e0..12fd932284 100644 --- a/hw/i386/xen/xen-mapcache.c +++ b/hw/i386/xen/xen-mapcache.c @@ -319,7 +319,7 @@ tryagain: mapcache->last_entry = NULL; #ifdef XEN_COMPAT_PHYSMAP if (!translated && mapcache->phys_offset_to_gaddr) { - phys_addr = mapcache->phys_offset_to_gaddr(phys_addr, size, mapcache->opaque); + phys_addr = mapcache->phys_offset_to_gaddr(phys_addr, size); translated = true; goto tryagain; } |