From patchwork Tue Jul 8 14:06:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 367926 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 28D181400A3 for ; Wed, 9 Jul 2014 00:59:51 +1000 (EST) Received: from localhost ([::1]:56054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Ws1-0001Sw-HP for incoming@patchwork.ozlabs.org; Tue, 08 Jul 2014 10:59:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4W2b-00012j-UX for qemu-devel@nongnu.org; Tue, 08 Jul 2014 10:06:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4W2V-00040v-6t for qemu-devel@nongnu.org; Tue, 08 Jul 2014 10:06:41 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:51964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4W2V-00040l-0i for qemu-devel@nongnu.org; Tue, 08 Jul 2014 10:06:35 -0400 Received: by mail-wi0-f175.google.com with SMTP id ho1so1069860wib.2 for ; Tue, 08 Jul 2014 07:06:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=6lFp4DVm1nt90xlmfOGVylcQ+U9Pdg6H1rUX6WINOfM=; b=idkyRFyA0JjAiBiZensIFqBbaaib+Ss964m9bhRUO7FQ6RMv9H9yi19pyRWITYiSVh i2Rbz31OiArVkxFXQu2Ork2eOudnW/BMMcjznCUE4OLMyLyNK2brOq2Cle8pLtyrE6Ox JSipsx0V2txIrySi73C/XyDPveoj62E24Zp4QGuMwnbVMDTQ/sOMlvAdkNtxzD2frLDk 7T527ejBjd0O7QIH89+0E/yqjjsUfRz4KH4PXnp0/9igd8xe2MHfezAYjrZwxX99Rq2o ykmTr7N3RcT60Ok+ucQU4yWIu+EXb1W4vQyh8djqe1iBSe+pVfuoHXjm6vYN5wgtnJNq zGKA== X-Gm-Message-State: ALoCoQnbgEURrohyfaVKEFmxnhCdNQ99wwrq2CKYPaMu3Qdcofv/yufXZpAU3SI/ngzYFhoWz5yl X-Received: by 10.180.13.139 with SMTP id h11mr4284928wic.40.1404828394226; Tue, 08 Jul 2014 07:06:34 -0700 (PDT) Received: from [0.0.14.236] ([82.146.27.14]) by mx.google.com with ESMTPSA id de6sm15794082wjc.16.2014.07.08.07.06.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jul 2014 07:06:33 -0700 (PDT) From: Nikolay Nikolaev To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com Date: Tue, 08 Jul 2014 17:06:27 +0300 Message-ID: <20140708140620.7314.49455.stgit@3820> In-Reply-To: <20140708140447.7314.87628.stgit@3820> References: <20140708140447.7314.87628.stgit@3820> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.175 Cc: tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com Subject: [Qemu-devel] [PATCH 3/3] qtest: Adapt vhost-user-test to latehs vhost-user changes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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 2af2381..b9dcec1 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -72,6 +72,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 { @@ -201,6 +202,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); @@ -227,8 +229,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);