From patchwork Thu Jul 17 23:41:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 371277 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 3BF531400F4 for ; Fri, 18 Jul 2014 09:44:40 +1000 (EST) Received: from localhost ([::1]:47334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7vLn-0001DE-Sp for incoming@patchwork.ozlabs.org; Thu, 17 Jul 2014 19:44:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7vGN-0000ZN-Dz for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:39:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7vGG-0007r6-VF for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:38:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7vGG-0007r1-Lu for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:38:52 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6HNcoUl009948 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 17 Jul 2014 19:38:50 -0400 Received: from redhat.com (ovpn-116-23.ams2.redhat.com [10.36.116.23]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id s6HNcmCA004785; Thu, 17 Jul 2014 19:38:49 -0400 Date: Fri, 18 Jul 2014 02:41:12 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1405640391-8544-8-git-send-email-mst@redhat.com> References: <1405640391-8544-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1405640391-8544-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Peter Maydell , Anthony Liguori Subject: [Qemu-devel] [PULL 7/7] vhost-user: minor cleanups 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 assert to verify cast does not discard information minor style fixup. Signed-off-by: Michael S. Tsirkin --- 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 3d23218..4e88d9c 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -217,7 +217,9 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request, for (i = 0; i < dev->mem->nregions; ++i) { struct vhost_memory_region *reg = dev->mem->regions + i; ram_addr_t ram_addr; - qemu_ram_addr_from_host((void *)reg->userspace_addr, &ram_addr); + + assert((uintptr_t)reg->userspace_addr == reg->userspace_addr); + qemu_ram_addr_from_host((void *)(uintptr_t)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;