[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] qtest: Adapt vhost-user-test to latest vhost-use
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 6/7] qtest: Adapt vhost-user-test to latest vhost-user changes |
Date: |
Fri, 18 Jul 2014 02:41:09 +0300 |
From: Nikolay Nikolaev <address@hidden>
A new field mmap_offset was added in the vhost-user message, we need to reflect
this change in the test too.
Signed-off-by: Nikolay Nikolaev <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
tests/vhost-user-test.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 406ba70..75fedf0 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -76,6 +76,7 @@ typedef struct VhostUserMemoryRegion {
uint64_t guest_phys_addr;
uint64_t memory_size;
uint64_t userspace_addr;
+ uint64_t mmap_offset;
} VhostUserMemoryRegion;
typedef struct VhostUserMemory {
@@ -205,6 +206,7 @@ static void read_guest_mem(void)
uint32_t *guest_mem;
gint64 end_time;
int i, j;
+ size_t size;
g_mutex_lock(data_mutex);
@@ -231,8 +233,13 @@ static void read_guest_mem(void)
g_assert_cmpint(memory.regions[i].memory_size, >, 1024);
- guest_mem = mmap(0, memory.regions[i].memory_size,
- PROT_READ | PROT_WRITE, MAP_SHARED, fds[i], 0);
+ size = memory.regions[i].memory_size + memory.regions[i].mmap_offset;
+
+ guest_mem = mmap(0, size, PROT_READ | PROT_WRITE,
+ MAP_SHARED, fds[i], 0);
+
+ g_assert(guest_mem != MAP_FAILED);
+ guest_mem += (memory.regions[i].mmap_offset / sizeof(*guest_mem));
for (j = 0; j < 256; j++) {
uint32_t a = readl(memory.regions[i].guest_phys_addr + j*4);
--
MST
- [Qemu-devel] [PULL 0/7] pc,vhost,virtio fixes, test, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 4/7] qtest: fix vhost-user-test compilation with old GLib, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 1/7] pc: fix qemu exiting with error when -m X < 128 with old machines types, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 2/7] pc_piix: Reuse pc_compat_1_2() for pc-0.1[0123], Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 3/7] fix typo: apci -> acpi, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 6/7] qtest: Adapt vhost-user-test to latest vhost-user changes,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 7/7] vhost-user: minor cleanups, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL 5/7] vhost-user: Fix VHOST_SET_MEM_TABLE processing, Michael S. Tsirkin, 2014/07/17