Index: pve-qemu-kvm-5.1.0/qapi/block-core.json =================================================================== --- pve-qemu-kvm-5.1.0.orig/qapi/block-core.json +++ pve-qemu-kvm-5.1.0/qapi/block-core.json @@ -3041,7 +3041,7 @@ 'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd', { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' }, - 'sheepdog', 'pbs', + 'sheepdog', 'pbs', 'vitastor', 'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] } ## @@ -3889,6 +3889,28 @@ '*tag': 'str' } } ## +# @BlockdevOptionsVitastor: +# +# Driver specific block device options for vitastor +# +# @image: Image name +# @inode: Inode number +# @pool: Pool ID +# @size: Desired image size in bytes +# @config-path: Path to Vitastor configuration +# @etcd-host: etcd connection address(es) +# @etcd-prefix: etcd key/value prefix +## +{ 'struct': 'BlockdevOptionsVitastor', + 'data': { '*inode': 'uint64', + '*pool': 'uint64', + '*size': 'uint64', + '*image': 'str', + '*config-path': 'str', + '*etcd-host': 'str', + '*etcd-prefix': 'str' } } + +## # @ReplicationMode: # # An enumeration of replication modes. @@ -4234,6 +4256,7 @@ 'replication': { 'type': 'BlockdevOptionsReplication', 'if': 'defined(CONFIG_REPLICATION)' }, 'sheepdog': 'BlockdevOptionsSheepdog', + 'vitastor': 'BlockdevOptionsVitastor', 'ssh': 'BlockdevOptionsSsh', 'throttle': 'BlockdevOptionsThrottle', 'vdi': 'BlockdevOptionsGenericFormat', @@ -4623,6 +4646,17 @@ '*cluster-size' : 'size' } } ## +# @BlockdevCreateOptionsVitastor: +# +# Driver specific image creation options for Vitastor. +# +# @size: Size of the virtual disk in bytes +## +{ 'struct': 'BlockdevCreateOptionsVitastor', + 'data': { 'location': 'BlockdevOptionsVitastor', + 'size': 'size' } } + +## # @BlockdevVmdkSubformat: # # Subformat options for VMDK images @@ -4884,6 +4918,7 @@ 'qed': 'BlockdevCreateOptionsQed', 'rbd': 'BlockdevCreateOptionsRbd', 'sheepdog': 'BlockdevCreateOptionsSheepdog', + 'vitastor': 'BlockdevCreateOptionsVitastor', 'ssh': 'BlockdevCreateOptionsSsh', 'vdi': 'BlockdevCreateOptionsVdi', 'vhdx': 'BlockdevCreateOptionsVhdx', Index: pve-qemu-kvm-5.1.0/configure =================================================================== --- pve-qemu-kvm-5.1.0.orig/configure +++ pve-qemu-kvm-5.1.0/configure @@ -446,6 +446,7 @@ trace_backends="log" trace_file="trace" spice="" rbd="" +vitastor="" smartcard="" libusb="" usb_redir="" @@ -1383,6 +1384,10 @@ for opt do ;; --enable-rbd) rbd="yes" ;; + --disable-vitastor) vitastor="no" + ;; + --enable-vitastor) vitastor="yes" + ;; --disable-xfsctl) xfs="no" ;; --enable-xfsctl) xfs="yes" @@ -1901,6 +1906,7 @@ disabled with --disable-FEATURE, default vhost-vdpa vhost-vdpa kernel backend support spice spice rbd rados block device (rbd) + vitastor vitastor block device libiscsi iscsi support libnfs nfs support smartcard smartcard support (libcacard) @@ -4234,6 +4240,27 @@ EOF fi ########################################## +# vitastor probe +if test "$vitastor" != "no" ; then + cat > $TMPC < +int main(void) { + vitastor_c_create_qemu(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + return 0; +} +EOF + vitastor_libs="-lvitastor_client" + if compile_prog "" "$vitastor_libs" ; then + vitastor=yes + else + if test "$vitastor" = "yes" ; then + feature_not_found "vitastor block device" "Install vitastor-client-dev" + fi + vitastor=no + fi +fi + +########################################## # libssh probe if test "$libssh" != "no" ; then if $pkg_config --exists libssh; then @@ -6969,6 +6996,7 @@ echo "Trace output file $trace_file-> $config_host_mak echo "RBD_LIBS=$rbd_libs" >> $config_host_mak fi +if test "$vitastor" = "yes" ; then + echo "CONFIG_VITASTOR=y" >> $config_host_mak + echo "VITASTOR_LIBS=$vitastor_libs" >> $config_host_mak +fi echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak if test "$coroutine_pool" = "yes" ; then Index: pve-qemu-kvm-5.1.0/block/Makefile.objs =================================================================== --- pve-qemu-kvm-5.1.0.orig/block/Makefile.objs +++ pve-qemu-kvm-5.1.0/block/Makefile.objs @@ -32,6 +32,7 @@ block-obj-$(if $(CONFIG_LIBISCSI),y,n) + block-obj-$(CONFIG_LIBNFS) += nfs.o block-obj-$(CONFIG_CURL) += curl.o block-obj-$(CONFIG_RBD) += rbd.o +block-obj-$(CONFIG_VITASTOR) += vitastor.o block-obj-$(CONFIG_GLUSTERFS) += gluster.o block-obj-$(CONFIG_LIBSSH) += ssh.o block-obj-y += backup-dump.o @@ -61,6 +62,8 @@ curl.o-cflags := $(CURL_CFLAGS) curl.o-libs := $(CURL_LIBS) rbd.o-cflags := $(RBD_CFLAGS) rbd.o-libs := $(RBD_LIBS) +vitastor.o-cflags := $(VITASTOR_CFLAGS) +vitastor.o-libs := $(VITASTOR_LIBS) gluster.o-cflags := $(GLUSTERFS_CFLAGS) gluster.o-libs := $(GLUSTERFS_LIBS) ssh.o-cflags := $(LIBSSH_CFLAGS)