From: Venkatesh Srinivas <vsrinivas@ops101.org>
Date: Sat, 5 Jan 2013 17:40:37 +0000 (-0500)
Subject: Build fixes.
X-Git-Tag: v3.4.0rc~535
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/dcbcbc86f5f730e981a7a785095e721ef72ad1c4

Build fixes.
---

diff --git a/sys/dev/virtual/virtio/block/Makefile b/sys/dev/virtual/virtio/block/Makefile
index a3cac9873a..2cdc1a0231 100644
--- a/sys/dev/virtual/virtio/block/Makefile
+++ b/sys/dev/virtual/virtio/block/Makefile
@@ -28,6 +28,4 @@ SRCS=	virtio_blk.c
 SRCS+=	virtio_bus_if.h virtio_if.h
 SRCS+=	bus_if.h device_if.h 
 
-CFLAGS+=	-I${.CURDIR}/..
-
 .include <bsd.kmod.mk>
diff --git a/sys/dev/virtual/virtio/block/virtio_blk.c b/sys/dev/virtual/virtio/block/virtio_blk.c
index 61c4759c55..68680dc90b 100644
--- a/sys/dev/virtual/virtio/block/virtio_blk.c
+++ b/sys/dev/virtual/virtio/block/virtio_blk.c
@@ -48,8 +48,8 @@
 #include <sys/spinlock2.h>
 #include <sys/devicestat.h>
 
-#include <virtio/virtio.h>
-#include <virtio/virtqueue.h>
+#include <dev/virtual/virtio/virtio/virtio.h>
+#include <dev/virtual/virtio/virtio/virtqueue.h>
 #include "virtio_blk.h"
 
 struct vtblk_request {
@@ -469,10 +469,6 @@ vtblk_strategy(struct dev_strategy_args *ap)
 	struct bio *bio = ap->a_bio;
 	struct buf *bp = bio->bio_buf;
 
-	if (bp->b_cmd == BUF_CMD_READ || bp->b_cmd == BUF_CMD_WRITE) {
-		KKASSERT(bp->b_count > 0);
-	}
-
 	if (sc == NULL) {
 		vtblk_bio_error(bio, EINVAL);
 		return EINVAL;
diff --git a/sys/dev/virtual/virtio/pci/Makefile b/sys/dev/virtual/virtio/pci/Makefile
index 8453bc5d17..851e7ef009 100644
--- a/sys/dev/virtual/virtio/pci/Makefile
+++ b/sys/dev/virtual/virtio/pci/Makefile
@@ -23,8 +23,6 @@
 # SUCH DAMAGE.
 #
 
-CFLAGS+=	-I${.CURDIR}/..
-
 KMOD=	virtio_pci
 SRCS=	virtio_pci.c
 SRCS+=	virtio_bus_if.h virtio_if.h
diff --git a/sys/dev/virtual/virtio/pci/virtio_pci.c b/sys/dev/virtual/virtio/pci/virtio_pci.c
index b59c6e7f36..ad330371cf 100644
--- a/sys/dev/virtual/virtio/pci/virtio_pci.c
+++ b/sys/dev/virtual/virtio/pci/virtio_pci.c
@@ -44,13 +44,11 @@
 #include <sys/param.h>
 #include <sys/rman.h>
 
-
-#include <virtio/virtio.h>
-#include <virtio/virtqueue.h>
+#include <dev/virtual/virtio/virtio/virtio.h>
+#include <dev/virtual/virtio/virtio/virtqueue.h>
 #include "virtio_pci.h"
-
-#include "virtio_bus_if.h"
 #include "virtio_if.h"
+#include "virtio_bus_if.h"
 
 struct vtpci_softc {
 	device_t			 vtpci_dev;