From owner-svn-soc-all@FreeBSD.ORG Sun Sep 15 14:58:07 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8718E155 for ; Sun, 15 Sep 2013 14:58:07 +0000 (UTC) (envelope-from zcore@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5A2212585 for ; Sun, 15 Sep 2013 14:58:07 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FEw7R7040751 for ; Sun, 15 Sep 2013 14:58:07 GMT (envelope-from zcore@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r8FEw7Sv040740 for svn-soc-all@FreeBSD.org; Sun, 15 Sep 2013 14:58:07 GMT (envelope-from zcore@FreeBSD.org) Date: Sun, 15 Sep 2013 14:58:07 GMT Message-Id: <201309151458.r8FEw7Sv040740@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to zcore@FreeBSD.org using -f From: zcore@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r257377 - soc2013/zcore/head/usr.sbin/bhyve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2013 14:58:07 -0000 Author: zcore Date: Sun Sep 15 14:58:07 2013 New Revision: 257377 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257377 Log: fix bug in last commit Modified: soc2013/zcore/head/usr.sbin/bhyve/block_if.c soc2013/zcore/head/usr.sbin/bhyve/block_if.h soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c Modified: soc2013/zcore/head/usr.sbin/bhyve/block_if.c ============================================================================== --- soc2013/zcore/head/usr.sbin/bhyve/block_if.c Sun Sep 15 14:30:23 2013 (r257376) +++ soc2013/zcore/head/usr.sbin/bhyve/block_if.c Sun Sep 15 14:58:07 2013 (r257377) @@ -304,11 +304,11 @@ } int -blockif_flush(struct blockif_ctxt *bc) +blockif_flush(struct blockif_ctxt *bc, struct blockif_req *breq) { assert(bc->bc_magic == BLOCKIF_SIG); - return (blockif_request(bc, NULL, BOP_FLUSH)); + return (blockif_request(bc, breq, BOP_FLUSH)); } int Modified: soc2013/zcore/head/usr.sbin/bhyve/block_if.h ============================================================================== --- soc2013/zcore/head/usr.sbin/bhyve/block_if.h Sun Sep 15 14:30:23 2013 (r257376) +++ soc2013/zcore/head/usr.sbin/bhyve/block_if.h Sun Sep 15 14:58:07 2013 (r257377) @@ -52,7 +52,7 @@ int blockif_is_ro(struct blockif_ctxt *bc); int blockif_read(struct blockif_ctxt *bc, struct blockif_req *breq); int blockif_write(struct blockif_ctxt *bc, struct blockif_req *breq); -int blockif_flush(struct blockif_ctxt *bc); +int blockif_flush(struct blockif_ctxt *bc, struct blockif_req *breq); int blockif_cancel(struct blockif_ctxt *bc, struct blockif_req *breq); int blockif_close(struct blockif_ctxt *bc); Modified: soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c ============================================================================== --- soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c Sun Sep 15 14:30:23 2013 (r257376) +++ soc2013/zcore/head/usr.sbin/bhyve/pci_ahci.c Sun Sep 15 14:58:07 2013 (r257377) @@ -452,6 +452,7 @@ { int err; struct ahci_ioreq *aior; + struct blockif_req *breq; /* * Pull request off free list @@ -462,8 +463,9 @@ aior->cfis = cfis; aior->slot = slot; aior->len = 0; + breq = &aior->io_req; - err = blockif_flush(p->bctx); + err = blockif_flush(p->bctx, breq); assert(err == 0); }