diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-02-07 18:37:38 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-03-07 21:45:53 +0100 |
| commit | a02c0edb35662de38d400f42b68845540669ca3d (patch) | |
| tree | 78a103d7d33109e699d8cd557e971cdd1315f3a8 | |
| parent | d6e9c470fc91f75db1785f17a9d3567d5a27953d (diff) | |
block: fix recursion in hw/block/dataplane
There are Xen files in hw/block/dataplane that should be compiled even if
virtio-blk is disabled.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/block/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/block/dataplane/Makefile.objs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs index e206b8e712..f5f643f0cc 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -12,5 +12,6 @@ common-obj-$(CONFIG_NVME_PCI) += nvme.o obj-$(CONFIG_SH4) += tc58128.o obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o -obj-$(CONFIG_VIRTIO_BLK) += dataplane/ obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o + +obj-y += dataplane/ diff --git a/hw/block/dataplane/Makefile.objs b/hw/block/dataplane/Makefile.objs index c6c68dbc00..0c5270268e 100644 --- a/hw/block/dataplane/Makefile.objs +++ b/hw/block/dataplane/Makefile.objs @@ -1,2 +1,2 @@ -obj-y += virtio-blk.o +obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o obj-$(CONFIG_XEN) += xen-block.o |