david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtest: Adapt vhost-user-test to latest vhost-user changes

Browse Source 
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 <n.nikolaev@virtualopensystems.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Nikolay Nikolaev 2014-07-12 04:43:19 +03:00 committed by Michael S. Tsirkin
parent f69a28051f
commit d6970e3b00
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/vhost-user-test.c
View File

@ -76,6 +76,7 @@ typedef struct VhostUserMemoryRegion {
uint64_t guest_phys_addr; uint64_t guest_phys_addr;
uint64_t memory_size; uint64_t memory_size;
uint64_t userspace_addr; uint64_t userspace_addr;
uint64_t mmap_offset;
} VhostUserMemoryRegion; } VhostUserMemoryRegion;
typedef struct VhostUserMemory { typedef struct VhostUserMemory {
@ -205,6 +206,7 @@ static void read_guest_mem(void)
uint32_t *guest_mem; uint32_t *guest_mem;
gint64 end_time; gint64 end_time;
int i, j; int i, j;
size_t size;
g_mutex_lock(data_mutex); g_mutex_lock(data_mutex);
@ -231,8 +233,13 @@ static void read_guest_mem(void)
g_assert_cmpint(memory.regions[i].memory_size, >, 1024); g_assert_cmpint(memory.regions[i].memory_size, >, 1024);
guest_mem = mmap(0, memory.regions[i].memory_size, size = memory.regions[i].memory_size + memory.regions[i].mmap_offset;
PROT_READ | PROT_WRITE, MAP_SHARED, fds[i], 0);
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++) { for (j = 0; j < 256; j++) {
uint32_t a = readl(memory.regions[i].guest_phys_addr + j*4); uint32_t a = readl(memory.regions[i].guest_phys_addr + j*4);