From owner-svn-src-head@FreeBSD.ORG  Mon Apr 16 18:29:14 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DBD1C106576A;
	Mon, 16 Apr 2012 18:29:13 +0000 (UTC)
	(envelope-from grehan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 633608FC14;
	Mon, 16 Apr 2012 18:29:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3GITDng045225;
	Mon, 16 Apr 2012 18:29:13 GMT (envelope-from grehan@svn.freebsd.org)
Received: (from grehan@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3GITDmV045223;
	Mon, 16 Apr 2012 18:29:13 GMT (envelope-from grehan@svn.freebsd.org)
Message-Id: <201204161829.q3GITDmV045223@svn.freebsd.org>
From: Peter Grehan <grehan@FreeBSD.org>
Date: Mon, 16 Apr 2012 18:29:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234349 - head/sys/dev/virtio/block
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2012 18:29:15 -0000

Author: grehan
Date: Mon Apr 16 18:29:12 2012
New Revision: 234349
URL: http://svn.freebsd.org/changeset/base/234349

Log:
  Sync with Bryan Venteicher's virtio git repo:
  
  d04e609bdd1973cc7d2e8b38b7dcfae057b0962d
  	virtio_blk: Use correct temporary variable in vtblk_poll_request
  
  Obtained from:	Bryan Venteicher  bryanv at daemoninthecloset dot org

Modified:
  head/sys/dev/virtio/block/virtio_blk.c

Modified: head/sys/dev/virtio/block/virtio_blk.c
==============================================================================
--- head/sys/dev/virtio/block/virtio_blk.c	Mon Apr 16 18:29:07 2012	(r234348)
+++ head/sys/dev/virtio/block/virtio_blk.c	Mon Apr 16 18:29:12 2012	(r234349)
@@ -997,6 +997,7 @@ vtblk_poll_request(struct vtblk_softc *s
 {
 	device_t dev;
 	struct virtqueue *vq;
+	struct vtblk_request *r;
 	int error;
 
 	dev = sc->vtblk_dev;
@@ -1011,7 +1012,8 @@ vtblk_poll_request(struct vtblk_softc *s
 
 	virtqueue_notify(vq);
 
-	req = virtqueue_poll(vq, NULL);
+	r = virtqueue_poll(vq, NULL);
+	KASSERT(r == req, ("unexpected request response"));
 
 	error = vtblk_request_error(req);
 	if (error && bootverbose) {