socsvn commit: r257377 - soc2013/zcore/head/usr.sbin/bhyve

[zcore at FreeBSD.org]

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);
 }