aboutsummaryrefslogtreecommitdiff
path: root/hw/Makefile.objs
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2013-01-03 11:56:16 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-03 07:13:25 -0600
commitef4929fb3c25e03deca76c7f5d22fba08edf864f (patch)
treee2149691452c9b2503573d21bc434a788ec09c40 /hw/Makefile.objs
parentdbd99ae302be8f51b547fb6283c91d0c9859b7d5 (diff)
downloadqemu-ef4929fb3c25e03deca76c7f5d22fba08edf864f.zip
qemu-ef4929fb3c25e03deca76c7f5d22fba08edf864f.tar.gz
qemu-ef4929fb3c25e03deca76c7f5d22fba08edf864f.tar.bz2
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 <stefanha@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/Makefile.objs')
-rw-r--r--hw/Makefile.objs3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 5ac4913..b8bbed3 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,4 +1,4 @@
-common-obj-y = usb/ ide/ pci/ dataplane/
+common-obj-y = usb/ ide/ pci/
common-obj-y += loader.o
common-obj-$(CONFIG_VIRTIO) += virtio-console.o
common-obj-$(CONFIG_VIRTIO) += virtio-rng.o
@@ -191,6 +191,7 @@ common-obj-$(CONFIG_XEN_BACKEND) += xen_console.o xenfb.o xen_disk.o xen_nic.o
# Per-target files
# virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly
+obj-$(CONFIG_VIRTIO) += dataplane/
obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o
obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o virtio-scsi.o
obj-$(CONFIG_SOFTMMU) += vhost_net.o