From ef4929fb3c25e03deca76c7f5d22fba08edf864f Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 3 Jan 2013 11:56:16 +0100 Subject: dataplane: use linux-headers/ for virtio includes The hw/dataplane/vring.c code includes linux/virtio_ring.h. Ensure that we use linux-headers/ instead of the system-wide headers, which may be out-of-date on older distros. This resolves the following build error on Debian 6: CC hw/dataplane/vring.o cc1: warnings being treated as errors hw/dataplane/vring.c: In function 'vring_enable_notification': hw/dataplane/vring.c:71: error: implicit declaration of function 'vring_avail_event' hw/dataplane/vring.c:71: error: nested extern declaration of 'vring_avail_event' hw/dataplane/vring.c:71: error: lvalue required as left operand of assignment Note that we now build dataplane/ for each target instead of only once. There is no way around this since linux-headers/ is only available for per-target objects - and it's how virtio, vfio, kvm, and friends are built. Signed-off-by: Stefan Hajnoczi Signed-off-by: Anthony Liguori --- hw/dataplane/Makefile.objs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'hw/dataplane/Makefile.objs') diff --git a/hw/dataplane/Makefile.objs b/hw/dataplane/Makefile.objs index 682aa9e7ee..3e47d0537e 100644 --- a/hw/dataplane/Makefile.objs +++ b/hw/dataplane/Makefile.objs @@ -1,3 +1 @@ -ifeq ($(CONFIG_VIRTIO), y) -common-obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += hostmem.o vring.o event-poll.o ioq.o virtio-blk.o -endif +obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += hostmem.o vring.o event-poll.o ioq.o virtio-blk.o -- cgit v1.2.3