From owner-svn-src-user@FreeBSD.ORG  Tue Nov 25 05:53:40 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 826044E0;
 Tue, 25 Nov 2014 05:53:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6FC67FBD;
 Tue, 25 Nov 2014 05:53:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAP5reNl045857;
 Tue, 25 Nov 2014 05:53:40 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAP5rerd045856;
 Tue, 25 Nov 2014 05:53:40 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201411250553.sAP5rerd045856@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 25 Nov 2014 05:53:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r275007 - user/marcel/libvdsk/bhyveload
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Nov 2014 05:53:40 -0000

Author: marcel
Date: Tue Nov 25 05:53:39 2014
New Revision: 275007
URL: https://svnweb.freebsd.org/changeset/base/275007

Log:
  Change the only user of vdsk_read() to vdsk_readv(). This simplifies
  the interface at virtually no cost.

Modified:
  user/marcel/libvdsk/bhyveload/bhyveload.c

Modified: user/marcel/libvdsk/bhyveload/bhyveload.c
==============================================================================
--- user/marcel/libvdsk/bhyveload/bhyveload.c	Tue Nov 25 05:25:12 2014	(r275006)
+++ user/marcel/libvdsk/bhyveload/bhyveload.c	Tue Nov 25 05:53:39 2014	(r275007)
@@ -288,11 +288,15 @@ static int
 cb_diskread(void *arg, int unit, uint64_t from, void *to, size_t size,
 	    size_t *resid)
 {
+	struct iovec iov;
 	ssize_t n;
 
 	if (unit < 0 || unit >= ndisks)
 		return (EIO);
-	n = vdsk_read(disk[unit], to, size, from);
+
+	iov.iov_base = to;
+	iov.iov_len = size;
+	n = vdsk_readv(disk[unit], &iov, 1, from);
 	if (n < 0)
 		return (errno);
 	*resid = size - n;