Commit 2f740136 authored by Jeff Cody's avatar Jeff Cody Committed by Max Reitz
Browse files

block: Make more block drivers compile-time configurable 



This adds configure options to control the following block drivers:

* Bochs
* Cloop
* Dmg
* Qcow (V1)
* Vdi
* Vvfat
* qed
* parallels
* sheepdog

Each of these defaults to being enabled.

Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-id: 20181107063644.2254-1-armbru@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent aef96d7d

block/Makefile.objs

+16 −6
Original line number Diff line number Diff line 
block-obj-y += raw-format.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o dmg.o

block-obj-y += raw-format.o vmdk.o vpc.o

block-obj-$(CONFIG_QCOW1) += qcow.o

block-obj-$(CONFIG_VDI) += vdi.o

block-obj-$(CONFIG_CLOOP) += cloop.o

block-obj-$(CONFIG_BOCHS) += bochs.o

block-obj-$(CONFIG_VVFAT) += vvfat.o

block-obj-$(CONFIG_DMG) += dmg.o



block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o qcow2-bitmap.o

block-obj-y += qed.o qed-l2-cache.o qed-table.o qed-cluster.o

block-obj-y += qed-check.o

block-obj-$(CONFIG_QED) += qed.o qed-l2-cache.o qed-table.o qed-cluster.o

block-obj-$(CONFIG_QED) += qed-check.o

block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o

block-obj-y += quorum.o

block-obj-y += parallels.o blkdebug.o blkverify.o blkreplay.o

block-obj-y += blkdebug.o blkverify.o blkreplay.o

block-obj-$(CONFIG_PARALLELS) += parallels.o

block-obj-y += blklogwrites.o

block-obj-y += block-backend.o snapshot.o qapi.o

block-obj-$(CONFIG_WIN32) += file-win32.o win32-aio.o
@@ -14,7 +22,8 @@ block-obj-y += null.o mirror.o commit.o io.o create.o 
block-obj-y += throttle-groups.o

block-obj-$(CONFIG_LINUX) += nvme.o



block-obj-y += nbd.o nbd-client.o sheepdog.o

block-obj-y += nbd.o nbd-client.o

block-obj-$(CONFIG_SHEEPDOG) += sheepdog.o

block-obj-$(CONFIG_LIBISCSI) += iscsi.o

block-obj-$(if $(CONFIG_LIBISCSI),y,n) += iscsi-opts.o

block-obj-$(CONFIG_LIBNFS) += nfs.o
@@ -45,7 +54,8 @@ gluster.o-libs := $(GLUSTERFS_LIBS) 
vxhs.o-libs        := $(VXHS_LIBS)

ssh.o-cflags       := $(LIBSSH2_CFLAGS)

ssh.o-libs         := $(LIBSSH2_LIBS)

block-obj-$(if $(CONFIG_BZIP2),m,n) += dmg-bz2.o

block-obj-dmg-bz2-$(CONFIG_BZIP2) += dmg-bz2.o

block-obj-$(if $(CONFIG_DMG),m,n) += $(block-obj-dmg-bz2-y)

dmg-bz2.o-libs     := $(BZIP2_LIBS)

qcow.o-libs        := -lz

linux-aio.o-libs   := -laio

configure

+91 −0
Original line number Diff line number Diff line
@@ -470,6 +470,15 @@ tcmalloc="no" 
jemalloc="no"

replication="yes"

vxhs=""

bochs="yes"

cloop="yes"

dmg="yes"

qcow1="yes"

vdi="yes"

vvfat="yes"

qed="yes"

parallels="yes"

sheepdog="yes"

libxml2=""

docker="no"

debug_mutex="no"
@@ -1416,6 +1425,42 @@ for opt do 
  ;;

  --enable-vxhs) vxhs="yes"

  ;;

  --disable-bochs) bochs="no"

  ;;

  --enable-bochs) bochs="yes"

  ;;

  --disable-cloop) cloop="no"

  ;;

  --enable-cloop) cloop="yes"

  ;;

  --disable-dmg) dmg="no"

  ;;

  --enable-dmg) dmg="yes"

  ;;

  --disable-qcow1) qcow1="no"

  ;;

  --enable-qcow1) qcow1="yes"

  ;;

  --disable-vdi) vdi="no"

  ;;

  --enable-vdi) vdi="yes"

  ;;

  --disable-vvfat) vvfat="no"

  ;;

  --enable-vvfat) vvfat="yes"

  ;;

  --disable-qed) qed="no"

  ;;

  --enable-qed) qed="yes"

  ;;

  --disable-parallels) parallels="no"

  ;;

  --enable-parallels) parallels="yes"

  ;;

  --disable-sheepdog) sheepdog="no"

  ;;

  --enable-sheepdog) sheepdog="yes"

  ;;

  --disable-vhost-user) vhost_user="no"

  ;;

  --enable-vhost-user)
@@ -1718,6 +1763,15 @@ disabled with --disable-FEATURE, default is enabled if available: 
  qom-cast-debug  cast debugging support

  tools           build qemu-io, qemu-nbd and qemu-image tools

  vxhs            Veritas HyperScale vDisk backend support

  bochs           bochs image format support

  cloop           cloop image format support

  dmg             dmg image format support

  qcow1           qcow v1 image format support

  vdi             vdi image format support

  vvfat           vvfat image format support

  qed             qed image format support

  parallels       parallels image format support

  sheepdog        sheepdog block driver support

  crypto-afalg    Linux AF_ALG crypto backend driver

  vhost-user      vhost-user support

  capstone        capstone disassembler support
@@ -6043,6 +6097,15 @@ echo "jemalloc support $jemalloc" 
echo "avx2 optimization $avx2_opt"

echo "replication support $replication"

echo "VxHS block device $vxhs"

echo "bochs support     $bochs"

echo "cloop support     $cloop"

echo "dmg support       $dmg"

echo "qcow v1 support   $qcow1"

echo "vdi support       $vdi"

echo "vvfat support     $vvfat"

echo "qed support       $qed"

echo "parallels support $parallels"

echo "sheepdog support  $sheepdog"

echo "capstone          $capstone"

echo "docker            $docker"

echo "libpmem support   $libpmem"
@@ -6799,6 +6862,34 @@ if test "$libpmem" = "yes" ; then 
  echo "CONFIG_LIBPMEM=y" >> $config_host_mak

fi



if test "$bochs" = "yes" ; then

  echo "CONFIG_BOCHS=y" >> $config_host_mak

fi

if test "$cloop" = "yes" ; then

  echo "CONFIG_CLOOP=y" >> $config_host_mak

fi

if test "$dmg" = "yes" ; then

  echo "CONFIG_DMG=y" >> $config_host_mak

fi

if test "$qcow1" = "yes" ; then

  echo "CONFIG_QCOW1=y" >> $config_host_mak

fi

if test "$vdi" = "yes" ; then

  echo "CONFIG_VDI=y" >> $config_host_mak

fi

if test "$vvfat" = "yes" ; then

  echo "CONFIG_VVFAT=y" >> $config_host_mak

fi

if test "$qed" = "yes" ; then

  echo "CONFIG_QED=y" >> $config_host_mak

fi

if test "$parallels" = "yes" ; then

  echo "CONFIG_PARALLELS=y" >> $config_host_mak

fi

if test "$sheepdog" = "yes" ; then

  echo "CONFIG_SHEEPDOG=y" >> $config_host_mak

fi



if test "$tcg_interpreter" = "yes"; then

  QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/tci $QEMU_INCLUDES"

elif test "$ARCH" = "sparc64" ; then