aboutsummaryrefslogtreecommitdiff
path: root/block/Makefile.objs
diff options
context:
space:
mode:
authorPeter Lieven <pl@kamp.de>2017-01-24 13:49:21 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2017-01-27 18:07:58 +0100
commit2deb63c2daa801afce51ee60755c21b3dea8ce8e (patch)
tree1fde5b73de68bd373bce05e1037e88b4c4fe5d9a /block/Makefile.objs
parent0b564e6f53b42cf036d09dafa5037e6be1395bda (diff)
block/iscsi: statically link qemu_iscsi_opts
commit f57b4b5f moved qemu_iscsi_opts into vl.c. This made them invisible for qemu-img, qemu-nbd etc. Fixes: f57b4b5fb127b60e1aade2684a8b16bc4f630b29 Cc: qemu-stable@nongnu.org Signed-off-by: Peter Lieven <pl@kamp.de> Message-Id: <1485262161-18543-1-git-send-email-pl@kamp.de> [Drop useless #ifdef. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'block/Makefile.objs')
-rw-r--r--block/Makefile.objs1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/Makefile.objs b/block/Makefile.objs
index 0b8fd06f27..c6bd14e883 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -14,6 +14,7 @@ block-obj-y += throttle-groups.o
block-obj-y += nbd.o nbd-client.o sheepdog.o
block-obj-$(CONFIG_LIBISCSI) += iscsi.o
+block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o
block-obj-$(CONFIG_LIBNFS) += nfs.o
block-obj-$(CONFIG_CURL) += curl.o
block-obj-$(CONFIG_RBD) += rbd.o