174 lines
5.8 KiB
Diff
174 lines
5.8 KiB
Diff
diff -NaurpbB qemu-4.2.0/block/Makefile.objs qemu-4.2.0-vitastor/block/Makefile.objs
|
|
--- qemu-4.2.0/block/Makefile.objs 2019-12-12 18:20:47.000000000 +0000
|
|
+++ qemu-4.2.0-vitastor/block/Makefile.objs 2021-12-01 21:28:47.342341760 +0000
|
|
@@ -29,6 +29,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_VXHS) += vxhs.o
|
|
block-obj-$(CONFIG_LIBSSH) += ssh.o
|
|
@@ -53,6 +54,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)
|
|
vxhs.o-libs := $(VXHS_LIBS)
|
|
diff -NaurpbB qemu-4.2.0/configure qemu-4.2.0-vitastor/configure
|
|
--- qemu-4.2.0/configure 2019-12-12 18:20:47.000000000 +0000
|
|
+++ qemu-4.2.0-vitastor/configure 2021-12-01 21:30:24.605237562 +0000
|
|
@@ -435,6 +435,7 @@ trace_backends="log"
|
|
trace_file="trace"
|
|
spice=""
|
|
rbd=""
|
|
+vitastor=""
|
|
smartcard=""
|
|
libusb=""
|
|
usb_redir=""
|
|
@@ -1312,6 +1313,10 @@ for opt do
|
|
;;
|
|
--enable-rbd) rbd="yes"
|
|
;;
|
|
+ --disable-vitastor) vitastor="no"
|
|
+ ;;
|
|
+ --enable-vitastor) vitastor="yes"
|
|
+ ;;
|
|
--disable-xfsctl) xfs="no"
|
|
;;
|
|
--enable-xfsctl) xfs="yes"
|
|
@@ -1782,6 +1787,7 @@ disabled with --disable-FEATURE, default
|
|
vhost-user vhost-user backend support
|
|
spice spice
|
|
rbd rados block device (rbd)
|
|
+ vitastor vitastor block device
|
|
libiscsi iscsi support
|
|
libnfs nfs support
|
|
smartcard smartcard support (libcacard)
|
|
@@ -3980,6 +3986,27 @@ EOF
|
|
fi
|
|
|
|
##########################################
|
|
+# vitastor probe
|
|
+if test "$vitastor" != "no" ; then
|
|
+ cat > $TMPC <<EOF
|
|
+#include <vitastor_c.h>
|
|
+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
|
|
@@ -6549,6 +6576,7 @@ echo "Trace output file $trace_file-<pid
|
|
fi
|
|
echo "spice support $spice $(echo_version $spice $spice_protocol_version/$spice_server_version)"
|
|
echo "rbd support $rbd"
|
|
+echo "vitastor support $vitastor"
|
|
echo "xfsctl support $xfs"
|
|
echo "smartcard support $smartcard"
|
|
echo "libusb $libusb"
|
|
@@ -7182,6 +7210,11 @@ if test "$rbd" = "yes" ; then
|
|
echo "RBD_CFLAGS=$rbd_cflags" >> $config_host_mak
|
|
echo "RBD_LIBS=$rbd_libs" >> $config_host_mak
|
|
fi
|
|
+if test "$vitastor" = "yes" ; then
|
|
+ echo "CONFIG_VITASTOR=m" >> $config_host_mak
|
|
+ echo "VITASTOR_CFLAGS=$vitastor_cflags" >> $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
|
|
diff -NaurpbB qemu-4.2.0/qapi/block-core.json qemu-4.2.0-vitastor/qapi/block-core.json
|
|
--- qemu-4.2.0/qapi/block-core.json 2019-12-12 18:20:48.000000000 +0000
|
|
+++ qemu-4.2.0-vitastor/qapi/block-core.json 2021-12-01 21:27:49.213574396 +0000
|
|
@@ -2894,7 +2894,7 @@
|
|
'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow',
|
|
'qcow2', 'qed', 'quorum', 'raw', 'rbd',
|
|
{ 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
|
|
- 'sheepdog',
|
|
+ 'sheepdog', 'vitastor',
|
|
'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
|
|
|
|
##
|
|
@@ -3712,6 +3712,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.
|
|
@@ -4071,6 +4093,7 @@
|
|
'replication': { 'type': 'BlockdevOptionsReplication',
|
|
'if': 'defined(CONFIG_REPLICATION)' },
|
|
'sheepdog': 'BlockdevOptionsSheepdog',
|
|
+ 'vitastor': 'BlockdevOptionsVitastor',
|
|
'ssh': 'BlockdevOptionsSsh',
|
|
'throttle': 'BlockdevOptionsThrottle',
|
|
'vdi': 'BlockdevOptionsGenericFormat',
|
|
@@ -4441,6 +4464,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
|
|
@@ -4702,6 +4736,7 @@
|
|
'qed': 'BlockdevCreateOptionsQed',
|
|
'rbd': 'BlockdevCreateOptionsRbd',
|
|
'sheepdog': 'BlockdevCreateOptionsSheepdog',
|
|
+ 'vitastor': 'BlockdevCreateOptionsVitastor',
|
|
'ssh': 'BlockdevCreateOptionsSsh',
|
|
'vdi': 'BlockdevCreateOptionsVdi',
|
|
'vhdx': 'BlockdevCreateOptionsVhdx',
|