From patchwork Sat Jul 12 01:42:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Nikolaev X-Patchwork-Id: 369267 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 3D95B1400E1 for ; Sat, 12 Jul 2014 11:43:25 +1000 (EST) Received: from localhost ([::1]:47351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5mLT-0002Zd-Ho for incoming@patchwork.ozlabs.org; Fri, 11 Jul 2014 21:43:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5mL2-0001w4-9i for qemu-devel@nongnu.org; Fri, 11 Jul 2014 21:43:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5mKw-0001CB-82 for qemu-devel@nongnu.org; Fri, 11 Jul 2014 21:42:56 -0400 Received: from mail-we0-f181.google.com ([74.125.82.181]:60579) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5mKv-0001Bn-Pl for qemu-devel@nongnu.org; Fri, 11 Jul 2014 21:42:49 -0400 Received: by mail-we0-f181.google.com with SMTP id q59so1823461wes.40 for ; Fri, 11 Jul 2014 18:42:49 -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=vMD1WV1WlKNLwfxifDl2fxzb6gdIW1jlOv4mZMgCC34=; b=Pm8CIBSc8XQvqFmgBCAxp8pgUIdfei0QGvaXjYiHEHP51NBKgfBQJBy6AVd7T0dvZz 9NMzJg+ARP2XoNsk5/TtxLlv2MuAvXUUQTqEfm0yGim0mC3I41+UkQSMEv2dRmPHlEnK axEEJU6k/zUWJ9EC4TQ3qaakQpxrlONpfy9SwyKPLJtIdc+1ICgO0gNMfSrptKXSlNdE A6YQI5KRTDJvay6YD1wWj6h1u/Qjc/gE/2HlPzvbvjKSjCaLmenjTBeRiF7nuD1aIc0F j9eSDw60j46DZF8Q2StTSQ70jO/wZUHVm8VkZLX40dQHFCrUKyYB4LcXY9UYFv6832cX oF9g== X-Gm-Message-State: ALoCoQmob2m5NgUXdR/dTx+lSdJaMx+ntTNxlGjyhi1sEgWFS8KO88qC7plRsSJbxZzWC3y16tYo X-Received: by 10.194.90.106 with SMTP id bv10mr3562268wjb.20.1405129368995; Fri, 11 Jul 2014 18:42:48 -0700 (PDT) Received: from [0.0.14.236] ([82.146.27.14]) by mx.google.com with ESMTPSA id fb8sm1083775wib.15.2014.07.11.18.42.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jul 2014 18:42:42 -0700 (PDT) From: Nikolay Nikolaev To: snabb-devel@googlegroups.com, qemu-devel@nongnu.org, mst@redhat.com Date: Sat, 12 Jul 2014 04:42:35 +0300 Message-ID: <20140712014215.10636.60876.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: 74.125.82.181 Cc: tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com Subject: [Qemu-devel] [PATCH v2 1/2 for-2.1] vhost-user: Fix VHOST_SET_MEM_TABLE processing 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 qemu_get_ram_fd doesn't accept a guest physical address. ram_addr_t are opaque values that are assigned in qemu_ram_alloc. Find the ram_addr_t corresponding to the userspace_addr using qemu_ram_addr_from_host, and then call qemu_get_ram_fd on it. Thanks to Paolo Bonzini Signed-off-by: Nikolay Nikolaev Reviewed-by: Paolo Bonzini --- hw/virtio/vhost-user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 38e5806..d610aa4 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -216,7 +216,9 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request, case VHOST_SET_MEM_TABLE: for (i = 0; i < dev->mem->nregions; ++i) { struct vhost_memory_region *reg = dev->mem->regions + i; - fd = qemu_get_ram_fd(reg->guest_phys_addr); + ram_addr_t ram_addr; + qemu_ram_addr_from_host((void*)reg->userspace_addr, &ram_addr); + fd = qemu_get_ram_fd(ram_addr); if (fd > 0) { msg.memory.regions[fd_num].userspace_addr = reg->userspace_addr; msg.memory.regions[fd_num].memory_size = reg->memory_size;