summaryrefslogtreecommitdiffstats
path: root/include/exec
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2014-06-26 23:01:32 +0200
committerMichael S. Tsirkin <mst@redhat.com>2014-06-29 19:39:40 +0300
commit3fd74b84076488ae44ba5f3cfed22ff056c5199c (patch)
tree5780453adca5f1b8f6ad52b572d06330c323f873 /include/exec
parent12d6e4640ce28d002e96d58c31cd5e7256258626 (diff)
downloadhqemu-3fd74b84076488ae44ba5f3cfed22ff056c5199c.zip
hqemu-3fd74b84076488ae44ba5f3cfed22ff056c5199c.tar.gz
vhost-user: fix regions provied with VHOST_USER_SET_MEM_TABLE message
Old code was affected by memory gaps which resulted in buffer pointers pointing to address outside of the mapped regions. Here we are introducing following changes: - new function qemu_get_ram_block_host_ptr() returns host pointer to the ram block, it is needed to calculate offset of specific region in the host memory - new field mmap_offset is added to the VhostUserMemoryRegion. It contains offset where specific region starts in the mapped memory. As there is stil no wider adoption of vhost-user agreement was made that we will not bump version number due to this change - other fileds in VhostUserMemoryRegion struct are not changed, as they are all needed for usermode app implementation - region data is not taken from ram_list.blocks anymore, instead we use region data which is alredy calculated for use in vhost-net - Now multiple regions can have same FD and user applicaton can call mmap() multiple times with the same FD but with different offset (user needs to take care for offset page alignment) Signed-off-by: Damjan Marion <damarion@cisco.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'include/exec')
-rw-r--r--include/exec/ram_addr.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index 55ca676..e9eb831 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -29,6 +29,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
MemoryRegion *mr);
ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr);
int qemu_get_ram_fd(ram_addr_t addr);
+void *qemu_get_ram_block_host_ptr(ram_addr_t addr);
void *qemu_get_ram_ptr(ram_addr_t addr);
void qemu_ram_free(ram_addr_t addr);
void qemu_ram_free_from_ptr(ram_addr_t addr);
OpenPOWER on IntegriCloud