aboutsummaryrefslogtreecommitdiffstats
path: root/include/qemu/mmap-alloc.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-12-02 23:11:24 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-12-02 23:11:24 +0000
commitec1b9aa89d7970c7edc9594c33206690f5ba3c87 (patch)
tree91497fbe0db7bfabd0026de9a7ff0b0966c138ac /include/qemu/mmap-alloc.h
parentcf22132367a188426ac07cf1805b214dd2d0cc80 (diff)
parent7197fb4058bcb68986bae2bb2c04d6370f3e7218 (diff)
downloadqemu-ec1b9aa89d7970c7edc9594c33206690f5ba3c87.tar.gz
qemu-ec1b9aa89d7970c7edc9594c33206690f5ba3c87.tar.xz
qemu-ec1b9aa89d7970c7edc9594c33206690f5ba3c87.zip
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio,vhost,mmap fixes for 2.5 vhost test patches to fix the travis build virtio ccw patch to fix virtio 1 virtio pci patch to fix pci express vhost user bridge patch to fix fd leaks mmap-alloc patch to fix hugetlbfs on ppc64 remove dead code for vhost (trivial) Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Wed 02 Dec 2015 20:38:41 GMT using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: util/mmap-alloc: fix hugetlb support on ppc64 virtio-pci: Set the QEMU_PCI_CAP_EXPRESS capability early in its DeviceClass realize method virtio: handle non-virtio-1-capable backend for ccw tests/vhost-user-bridge.c: fix fd leakage vhost: drop dead code vhost-user: verify that number of queues is non-zero vhost-user-test: fix crash with glib < 2.36 vhost-user-test: use unix port for migration vhost-user-test: fix chardriver race Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/mmap-alloc.h')
-rw-r--r--include/qemu/mmap-alloc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h
index 56388e689..0899b2f01 100644
--- a/include/qemu/mmap-alloc.h
+++ b/include/qemu/mmap-alloc.h
@@ -3,6 +3,8 @@
#include "qemu-common.h"
+size_t qemu_fd_getpagesize(int fd);
+
void *qemu_ram_mmap(int fd, size_t size, size_t align, bool shared);
void qemu_ram_munmap(void *ptr, size_t size);