From patchwork Sat Jul 12 01:43:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 369268 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 AFD271400BE for ; Sat, 12 Jul 2014 11:44:14 +1000 (EST) Received: from localhost ([::1]:47355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5mMG-0003WJ-Ly for incoming@patchwork.ozlabs.org; Fri, 11 Jul 2014 21:44:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5mLd-0002l3-Pj for qemu-devel@nongnu.org; Fri, 11 Jul 2014 21:43:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5mLX-0001YI-OM for qemu-devel@nongnu.org; Fri, 11 Jul 2014 21:43:33 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:62458) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5mLX-0001Xt-9c for qemu-devel@nongnu.org; Fri, 11 Jul 2014 21:43:27 -0400 Received: by mail-wi0-f177.google.com with SMTP id ho1so76684wib.10 for ; Fri, 11 Jul 2014 18:43:26 -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=HNB8awh7duaoQPsp18zoMNj/2tBeh66ydCqFTO5iiqM=; b=SexTW+zQw5PamaNe0YvBvhfk9wKCak3QEVPahfYUdjVKRGU4OTK+1nlm5aBjdPjZkw Ku8P2Fhzp7ot0+Vv2QfEtmyNWOHwdDXqg22bdd4ZzGTJ1Wm2t9EKVl9l3AEJaAg9BP61 KIwxIcEm6EGdUemnTl+XHYAKghGWSo4I1HJPjpZshpeLNKK+ZolxX7Cy52J/qJimWM0h T++9wene/Rm/luhGopE0V0qr8cKvOxvRkKoaImAUkLkUNBPJ6X2Tw0/7IG8Hlc65zW0V sALOTN0drcLJv3mc4+2Xlg4H6PKKD8+s5pK+b6GgfDgkAlV87/KYVUReqXYy0pmxIeTw 3ctA== X-Gm-Message-State: ALoCoQksrCFlqP7HjP9Z8XrOfgbjZSrynYWwu3p4Q8sva5KX176BmIvAoo/Bz2zVXrugFNBC2ipV X-Received: by 10.180.92.199 with SMTP id co7mr7133638wib.72.1405129406537; Fri, 11 Jul 2014 18:43:26 -0700 (PDT) Received: from [0.0.14.236] ([82.146.27.14]) by mx.google.com with ESMTPSA id v14sm8616499wjw.38.2014.07.11.18.43.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jul 2014 18:43:25 -0700 (PDT) From: Nikolay Nikolaev To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com Date: Sat, 12 Jul 2014 04:43:19 +0300 Message-ID: <20140712014254.10636.31208.stgit@3820> In-Reply-To: <20140712014119.10636.81503.stgit@3820> References: <20140712014119.10636.81503.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.177 Cc: tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com Subject: [Qemu-devel] [PATCH v2 2/2 for-2.1] 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 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);