Release 0.6.9

New features: - Build Vitastor driver as part of QEMU - Implement renaming images in CLI (vitastor-cli modify --rename) - Add vitastor-cli alloc-osd and simple-offsets commands and use them in make-osd, thus removing the dependency on etcdctl - Make monitor remove stale deleted inode statistics from etcd automatically - Implement OSD address selection from a subnet, thus removing the need to specify OSD addresses in startup scripts explicitly Bug fixes: - Fix client failover in case of etcd shutdown or crash (make client survive etcd failures) - Stick to the last live etcd in OSD and mon to prevent random failures when one of etcds is down - Fix incorrect copying of data from journal to the data device which could lead to data corruption - Prefer local etcd IPs in OSD - Remove the total PG count restriction in optimize_change which was sometimes leading to inability to redistribute PGs over OSDs - Fix error response parsing on a failed pg state report - Fix slow linear writes with RDMA by changing default buffer settings - Fix possible 'TypeError' in openstack nova when using Vitastor cinder driver - Fix bugs in vitastor-cli create, ls, rm, modify commands Patch changes: - Add a patch for libvirt 7.6 - Add patches for QEMU 6.0 and 6.1 - Fix config file path XML location parsing in libvirt patches - Replace _ with - in QEMU options - Fix possible 'TypeError' in openstack nova when using Vitastor cinder driver - Fix possible crashes of QEMU block driver in case of incorrect options
Remove +deb10u1 from libvirt version
2021-12-03 10:58:54 +03:00 · 2021-12-03 10:56:44 +03:00 · 2021-12-03 03:00:10 +03:00 · 2021-12-03 00:41:49 +03:00 · 2021-12-03 00:22:17 +03:00 · 2021-12-03 00:04:18 +03:00
66 changed files with 2597 additions and 786 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 2.8)

 project(vitastor)

-set(VERSION "0.6.8")
+set(VERSION "0.6.9")

 add_subdirectory(src)
--- a/README-ru.md
+++ b/README-ru.md
@@ -403,12 +403,21 @@ Vitastor с однопоточной NBD прокси на том же стен
  в этом случае пострадает.
 - Быстрая сеть, минимум 10 гбит/с
 - Для наилучшей производительности нужно отключить энергосбережение CPU: `cpupower idle-set -D 0 && cpupower frequency-set -g performance`.
- Пропишите нужные вам значения вверху файлов `/usr/lib/vitastor/mon/make-units.sh` и `/usr/lib/vitastor/mon/make-osd.sh`.
- Создайте юниты systemd для etcd и мониторов: `/usr/lib/vitastor/mon/make-units.sh`
- Создайте юниты для OSD: `/usr/lib/vitastor/mon/make-osd.sh /dev/disk/by-partuuid/XXX [/dev/disk/by-partuuid/YYY ...]`
- Вы можете поменять параметры OSD в юнитах systemd. Смысл некоторых параметров:
+- На хостах мониторов:
+  - Пропишите нужные вам значения в файле `/usr/lib/vitastor/mon/make-units.sh`
+  - Создайте юниты systemd для etcd и мониторов: `/usr/lib/vitastor/mon/make-units.sh`
+- Пропишите etcd_address и osd_network в `/etc/vitastor/vitastor.conf`. Например:
+  ```
+  {
+    "etcd_address": ["10.200.1.10:2379","10.200.1.11:2379","10.200.1.12:2379"],
+    "osd_network": "10.200.1.0/24"
+  }
+  ```
+- Создайте юниты systemd для OSD: `/usr/lib/vitastor/make-osd.sh /dev/disk/by-partuuid/XXX [/dev/disk/by-partuuid/YYY ...]`
+- Вы можете менять параметры OSD в юнитах systemd или в `vitastor.conf`. Смысл некоторых параметров:
  - `disable_data_fsync 1` - отключает fsync, используется с SSD с конденсаторами.
  - `immediate_commit all` - используется с SSD с конденсаторами.
+    Внимание: если установлено, также нужно установить его в то же значение в etcd в /vitastor/config/global
  - `disable_device_lock 1` - отключает блокировку файла устройства, нужно, только если вы запускаете
    несколько OSD на одном блочном устройстве.
  - `flusher_count 256` - "flusher" - микропоток, удаляющий старые данные из журнала.
--- a/README.md
+++ b/README.md
@@ -356,13 +356,21 @@ and calculate disk offsets almost by hand. This will be fixed in near future.
  with lazy fsync, but prepare for inferior single-thread latency.
 - Get a fast network (at least 10 Gbit/s).
 - Disable CPU powersaving: `cpupower idle-set -D 0 && cpupower frequency-set -g performance`.
- Check `/usr/lib/vitastor/mon/make-units.sh` and `/usr/lib/vitastor/mon/make-osd.sh` and
-  put desired values into the variables at the top of these files.
- Create systemd units for the monitor and etcd: `/usr/lib/vitastor/mon/make-units.sh`
+- On the monitor hosts:
+  - Edit variables at the top of `/usr/lib/vitastor/mon/make-units.sh` to desired values.
+  - Create systemd units for the monitor and etcd: `/usr/lib/vitastor/mon/make-units.sh`
+- Put etcd_address and osd_network into `/etc/vitastor/vitastor.conf`. Example:
+  ```
+  {
+    "etcd_address": ["10.200.1.10:2379","10.200.1.11:2379","10.200.1.12:2379"],
+    "osd_network": "10.200.1.0/24"
+  }
+  ```
 - Create systemd units for your OSDs: `/usr/lib/vitastor/mon/make-osd.sh /dev/disk/by-partuuid/XXX [/dev/disk/by-partuuid/YYY ...]`
- You can edit the units and change OSD configuration. Notable configuration variables:
+- You can change OSD configuration in units or in `vitastor.conf`. Notable configuration variables:
  - `disable_data_fsync 1` - only safe with server-grade drives with capacitors.
  - `immediate_commit all` - use this if all your drives are server-grade.
+    If all OSDs have it set to all then you should also put the same value in etcd into /vitastor/config/global
  - `disable_device_lock 1` - only required if you run multiple OSDs on one block device.
  - `flusher_count 256` - flusher is a micro-thread that removes old data from the journal.
    You don't have to worry about this parameter anymore, 256 is enough.
--- a/csi/Makefile
+++ b/csi/Makefile
@@ -1,4 +1,4 @@
-VERSION ?= v0.6.8
+VERSION ?= v0.6.9

 all: build push

--- a/csi/deploy/004-csi-nodeplugin.yaml
+++ b/csi/deploy/004-csi-nodeplugin.yaml
@@ -49,7 +49,7 @@ spec:
            capabilities:
              add: ["SYS_ADMIN"]
            allowPrivilegeEscalation: true
-          image: vitalif/vitastor-csi:v0.6.8
+          image: vitalif/vitastor-csi:v0.6.9
          args:
            - "--node=$(NODE_ID)"
            - "--endpoint=$(CSI_ENDPOINT)"
--- a/csi/deploy/007-csi-provisioner.yaml
+++ b/csi/deploy/007-csi-provisioner.yaml
@@ -116,7 +116,7 @@ spec:
            privileged: true
            capabilities:
              add: ["SYS_ADMIN"]
-          image: vitalif/vitastor-csi:v0.6.8
+          image: vitalif/vitastor-csi:v0.6.9
          args:
            - "--node=$(NODE_ID)"
            - "--endpoint=$(CSI_ENDPOINT)"
--- a/csi/src/config.go
+++ b/csi/src/config.go
@@ -5,7 +5,7 @@ package vitastor

 const (
    vitastorCSIDriverName    = "csi.vitastor.io"
-    vitastorCSIDriverVersion = "0.6.8"
+    vitastorCSIDriverVersion = "0.6.9"
 )

 // Config struct fills the parameters of request or user input
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-vitastor (0.6.8-1) unstable; urgency=medium
+vitastor (0.6.9-1) unstable; urgency=medium

  * RDMA support
  * Bugfixes
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Rules-Requires-Root: no

 Package: vitastor
 Architecture: amd64
-Depends: vitastor-osd, vitastor-mon, vitastor-client, vitastor-client-dev, vitastor-fio, vitastor-qemu
+Depends: vitastor-osd, vitastor-mon, vitastor-client, vitastor-client-dev, vitastor-fio
 Description: Vitastor, a fast software-defined clustered block storage
 Vitastor is a small, simple and fast clustered block storage (storage for VM drives),
 architecturally similar to Ceph which means strong consistency, primary-replication,
@@ -47,9 +47,3 @@ Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client (= ${binary:Version}), fio (= ${dep:fio})
 Description: Vitastor, a fast software-defined clustered block storage - fio drivers
 Vitastor fio drivers for benchmarking.
-
-Package: vitastor-qemu
-Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}, vitastor-client (= ${binary:Version}), qemu (= ${dep:qemu})
-Description: Vitastor, a fast software-defined clustered block storage - QEMU driver
- Vitastor QEMU block device driver.
--- a/debian/libvirt.Dockerfile
+++ b/debian/libvirt.Dockerfile
@@ -0,0 +1,40 @@
+# Build patched libvirt for Debian Buster or Bullseye/Sid inside a container
+# cd ..; podman build --build-arg REL=bullseye -v `pwd`/packages:/root/packages -f debian/libvirt.Dockerfile .
+
+ARG REL=
+FROM debian:$REL
+ARG REL=
+
+WORKDIR /root
+
+RUN if [ "$REL" = "buster" -o "$REL" = "bullseye" ]; then \
+        echo "deb http://deb.debian.org/debian $REL-backports main" >> /etc/apt/sources.list; \
+        echo >> /etc/apt/preferences; \
+        echo 'Package: *' >> /etc/apt/preferences; \
+        echo "Pin: release a=$REL-backports" >> /etc/apt/preferences; \
+        echo 'Pin-Priority: 500' >> /etc/apt/preferences; \
+    fi; \
+    grep '^deb ' /etc/apt/sources.list | perl -pe 's/^deb/deb-src/' >> /etc/apt/sources.list; \
+    echo 'APT::Install-Recommends false;' >> /etc/apt/apt.conf; \
+    echo 'APT::Install-Suggests false;' >> /etc/apt/apt.conf
+
+RUN apt-get update; apt-get -y install devscripts
+RUN apt-get -y build-dep libvirt0
+RUN apt-get -y install libglusterfs-dev
+RUN apt-get --download-only source libvirt
+
+ADD patches/libvirt-5.0-vitastor.diff patches/libvirt-7.0-vitastor.diff patches/libvirt-7.5-vitastor.diff patches/libvirt-7.6-vitastor.diff /root
+RUN set -e; \
+    mkdir -p /root/packages/libvirt-$REL; \
+    rm -rf /root/packages/libvirt-$REL/*; \
+    cd /root/packages/libvirt-$REL; \
+    dpkg-source -x /root/libvirt*.dsc; \
+    D=$(ls -d libvirt-*/); \
+    V=$(ls -d libvirt-*/ | perl -pe 's/libvirt-(\d+\.\d+).*/$1/'); \
+    cp /root/libvirt-$V-vitastor.diff $D/debian/patches; \
+    echo libvirt-$V-vitastor.diff >> $D/debian/patches/series; \
+    cd $D; \
+    V=$(head -n1 debian/changelog | perl -pe 's/^.*\((.*?)(~bpo[\d\+]*)?(\+deb[u\d]+)?\).*$/$1/')+vitastor2; \
+    DEBEMAIL="Vitaliy Filippov <vitalif@yourcmc.ru>" dch -D $REL -v $V 'Add Vitastor support'; \
+    DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage --jobs=auto -sa; \
+    rm -rf /root/packages/libvirt-$REL/$D
--- a/debian/patched-qemu.Dockerfile
+++ b/debian/patched-qemu.Dockerfile
@@ -21,14 +21,18 @@ RUN if [ "$REL" = "buster" -o "$REL" = "bullseye" ]; then \
 RUN apt-get update
 RUN apt-get -y install qemu fio liburing1 liburing-dev libgoogle-perftools-dev devscripts
 RUN apt-get -y build-dep qemu
-RUN apt-get -y build-dep fio
 # To build a custom version
 #RUN cp /root/packages/qemu-orig/* /root
 RUN apt-get --download-only source qemu
-RUN apt-get --download-only source fio

-ADD patches/qemu-5.0-vitastor.patch patches/qemu-5.1-vitastor.patch patches/qemu-6.1-vitastor.patch /root/vitastor/patches/
+ADD patches/qemu-5.0-vitastor.patch patches/qemu-5.1-vitastor.patch patches/qemu-6.1-vitastor.patch src/qemu_driver.c /root/vitastor/patches/
 RUN set -e; \
+    apt-get install -y wget; \
+    wget -q -O /etc/apt/trusted.gpg.d/vitastor.gpg https://vitastor.io/debian/pubkey.gpg; \
+    (echo deb http://vitastor.io/debian $REL main > /etc/apt/sources.list.d/vitastor.list); \
+    (echo "APT::Install-Recommends false;" > /etc/apt/apt.conf) && \
+    apt-get update; \
+    apt-get install -y vitastor-client vitastor-client-dev quilt; \
    mkdir -p /root/packages/qemu-$REL; \
    rm -rf /root/packages/qemu-$REL/*; \
    cd /root/packages/qemu-$REL; \
@@ -47,7 +51,11 @@ RUN set -e; \
        echo qemu-5.1-vitastor.patch >> $P/series; \
    fi; \
    cd /root/packages/qemu-$REL/qemu-*/; \
+    quilt push -a; \
+    quilt add block/vitastor.c; \
+    cp /root/vitastor/patches/qemu_driver.c block/vitastor.c; \
+    quilt refresh; \
    V=$(head -n1 debian/changelog | perl -pe 's/^.*\((.*?)(~bpo[\d\+]*)?\).*$/$1/')+vitastor1; \
-    DEBFULLNAME="Vitaliy Filippov <vitalif@yourcmc.ru>" dch -D $REL -v $V 'Plug Vitastor block driver'; \
+    DEBEMAIL="Vitaliy Filippov <vitalif@yourcmc.ru>" dch -D $REL -v $V 'Plug Vitastor block driver'; \
    DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage --jobs=auto -sa; \
    rm -rf /root/packages/qemu-$REL/qemu-*/
--- a/debian/qemu_version
+++ b/debian/qemu_version
@@ -1 +0,0 @@
-dep:qemu=1:5.2+dfsg-10+vitastor1
--- a/debian/raw.h
+++ b/debian/raw.h
@@ -0,0 +1,19 @@
+/* Removed in Linux 5.14 */
+
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef __LINUX_RAW_H
+#define __LINUX_RAW_H
+
+#include <linux/types.h>
+
+#define RAW_SETBIND	_IO( 0xac, 0 )
+#define RAW_GETBIND	_IO( 0xac, 1 )
+
+struct raw_config_request 
+{
+	int	raw_minor;
+	__u64	block_major;
+	__u64	block_minor;
+};
+
+#endif /* __LINUX_RAW_H */
--- a/debian/rules
+++ b/debian/rules
@@ -6,5 +6,5 @@ export DH_VERBOSE = 1

 override_dh_installdeb:
 	cat debian/fio_version >> debian/vitastor-fio.substvars
-	cat debian/qemu_version >> debian/vitastor-qemu.substvars
+	[ -f debian/qemu_version ] && (cat debian/qemu_version >> debian/vitastor-qemu.substvars) || true
 	dh_installdeb
--- a/debian/vitastor-client.install
+++ b/debian/vitastor-client.install
@@ -3,3 +3,4 @@ usr/bin/vitastor-cli
 usr/bin/vitastor-rm
 usr/bin/vitastor-nbd
 usr/lib/*/libvitastor*.so*
+mon/make-osd.sh /usr/lib/vitastor
--- a/debian/vitastor-osd.install
+++ b/debian/vitastor-osd.install
@@ -1,3 +1,2 @@
 usr/bin/vitastor-osd
 usr/bin/vitastor-dump-journal
-mon/make-osd.sh /usr/lib/vitastor
--- a/debian/vitastor-qemu.install
+++ b/debian/vitastor-qemu.install
@@ -1 +0,0 @@
-usr/lib/*/qemu/*
--- a/debian/vitastor.Dockerfile
+++ b/debian/vitastor.Dockerfile
@@ -7,11 +7,11 @@ ARG REL=

 WORKDIR /root

-RUN if [ "$REL" = "buster" ]; then \
-        echo 'deb http://deb.debian.org/debian buster-backports main' >> /etc/apt/sources.list; \
+RUN if [ "$REL" = "buster" -o "$REL" = "bullseye" ]; then \
+        echo "deb http://deb.debian.org/debian $REL-backports main" >> /etc/apt/sources.list; \
        echo >> /etc/apt/preferences; \
        echo 'Package: *' >> /etc/apt/preferences; \
-        echo 'Pin: release a=buster-backports' >> /etc/apt/preferences; \
+        echo "Pin: release a=$REL-backports" >> /etc/apt/preferences; \
        echo 'Pin-Priority: 500' >> /etc/apt/preferences; \
    fi; \
    grep '^deb ' /etc/apt/sources.list | perl -pe 's/^deb/deb-src/' >> /etc/apt/sources.list; \
@@ -19,10 +19,8 @@ RUN if [ "$REL" = "buster" ]; then \
    echo 'APT::Install-Suggests false;' >> /etc/apt/apt.conf

 RUN apt-get update
-RUN apt-get -y install qemu fio liburing1 liburing-dev libgoogle-perftools-dev devscripts
-RUN apt-get -y build-dep qemu
+RUN apt-get -y install fio liburing1 liburing-dev libgoogle-perftools-dev devscripts
 RUN apt-get -y build-dep fio
-RUN apt-get --download-only source qemu
 RUN apt-get --download-only source fio
 RUN apt-get update && apt-get -y install libjerasure-dev cmake libibverbs-dev

@@ -32,37 +30,25 @@ RUN set -e -x; \
    cd /root/fio-build/; \
    rm -rf /root/fio-build/*; \
    dpkg-source -x /root/fio*.dsc; \
-    cd /root/packages/qemu-$REL/; \
-    rm -rf qemu*/; \
-    dpkg-source -x qemu*.dsc; \
-    cd /root/packages/qemu-$REL/qemu*/; \
-    debian/rules b/configure-stamp; \
-    cd b/qemu; \
-    make -j8 qapi/qapi-builtin-types.h; \
    mkdir -p /root/packages/vitastor-$REL; \
    rm -rf /root/packages/vitastor-$REL/*; \
    cd /root/packages/vitastor-$REL; \
-    cp -r /root/vitastor vitastor-0.6.8; \
-    ln -s /root/packages/qemu-$REL/qemu-*/ vitastor-0.6.8/qemu; \
-    ln -s /root/fio-build/fio-*/ vitastor-0.6.8/fio; \
-    cd vitastor-0.6.8; \
+    cp -r /root/vitastor vitastor-0.6.9; \
+    cd vitastor-0.6.9; \
+    ln -s /root/fio-build/fio-*/ ./fio; \
    FIO=$(head -n1 fio/debian/changelog | perl -pe 's/^.*\((.*?)\).*$/$1/'); \
-    QEMU=$(head -n1 qemu/debian/changelog | perl -pe 's/^.*\((.*?)\).*$/$1/'); \
-    sh copy-qemu-includes.sh; \
+    ls /usr/include/linux/raw.h || cp ./debian/raw.h /usr/include/linux/raw.h; \
    sh copy-fio-includes.sh; \
-    rm qemu fio; \
+    rm fio; \
    mkdir -p a b debian/patches; \
-    mv qemu-copy b/qemu; \
    mv fio-copy b/fio; \
-    diff -NaurpbB a b > debian/patches/qemu-fio-headers.patch || true; \
-    echo qemu-fio-headers.patch >> debian/patches/series; \
+    diff -NaurpbB a b > debian/patches/fio-headers.patch || true; \
+    echo fio-headers.patch >> debian/patches/series; \
    rm -rf a b; \
-    rm -rf /root/packages/qemu-$REL/qemu*/; \
    echo "dep:fio=$FIO" > debian/fio_version; \
-    echo "dep:qemu=$QEMU" > debian/qemu_version; \
    cd /root/packages/vitastor-$REL; \
-    tar --sort=name --mtime='2020-01-01' --owner=0 --group=0 --exclude=debian -cJf vitastor_0.6.8.orig.tar.xz vitastor-0.6.8; \
-    cd vitastor-0.6.8; \
+    tar --sort=name --mtime='2020-01-01' --owner=0 --group=0 --exclude=debian -cJf vitastor_0.6.9.orig.tar.xz vitastor-0.6.9; \
+    cd vitastor-0.6.9; \
    V=$(head -n1 debian/changelog | perl -pe 's/^.*\((.*?)\).*$/$1/'); \
    DEBFULLNAME="Vitaliy Filippov <vitalif@yourcmc.ru>" dch -D $REL -v "$V""$REL" "Rebuild for $REL"; \
    DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage --jobs=auto -sa; \
--- a/mon/lp-optimizer.js
+++ b/mon/lp-optimizer.js
@@ -293,11 +293,6 @@ async function optimize_change({ prev_pgs: prev_int_pgs, osd_tree, pg_size = 3,
    lp += 'max: '+all_pg_names.map(pg_name => (
        prev_weights[pg_name] ? `${pg_size+1}*add_${pg_name} - ${pg_size+1}*del_${pg_name}` : `${pg_size+1-move_weights[pg_name]}*${pg_name}`
    )).join(' + ')+';\n';
-    lp += all_pg_names
-        .map(pg_name => (prev_weights[pg_name] ? `add_${pg_name} - del_${pg_name}` : `${pg_name}`))
-        .join(' + ')+' = '+(pg_count
-            - Object.keys(prev_weights).reduce((a, old_pg_name) => (a + (all_pgs_hash[old_pg_name] ? prev_weights[old_pg_name] : 0)), 0)
-        )+';\n';
    for (const osd in pg_per_osd)
    {
        if (osd !== NO_OSD)
--- a/mon/make-osd.sh
+++ b/mon/make-osd.sh
@@ -4,18 +4,16 @@
 # Copyright (c) Vitaliy Filippov, 2019+
 # License: MIT

-# USAGE: ./make-osd.sh /dev/disk/by-partuuid/xxx [ /dev/disk/by-partuuid/yyy]...
-
-IP_SUBSTR="10.200.1."
-ETCD_HOSTS="etcd0=http://10.200.1.10:2380,etcd1=http://10.200.1.11:2380,etcd2=http://10.200.1.12:2380"
+# USAGE:
+# 1) Put etcd_address and osd_network into /etc/vitastor/vitastor.conf. Example:
+#    {
+#        "etcd_address":["http://10.200.1.10:2379/v3","http://10.200.1.11:2379/v3","http://10.200.1.12:2379/v3"],
+#        "osd_network":"10.200.1.0/24"
+#    }
+# 2) Run ./make-osd.sh /dev/disk/by-partuuid/xxx [ /dev/disk/by-partuuid/yyy]...

 set -e -x

-IP=`ip -json a s | jq -r '.[].addr_info[] | select(.local | startswith("'$IP_SUBSTR'")) | .local'`
-[ "$IP" != "" ] || exit 1
-ETCD_MON=$(echo $ETCD_HOSTS | perl -pe 's/:2380/:2379/g; s/etcd\d*=//g;')
-D=`dirname $0`
-
 # Create OSDs on all passed devices
 for DEV in $*; do

@@ -39,8 +37,6 @@ LimitNOFILE=1048576
 LimitNPROC=1048576
 LimitMEMLOCK=infinity
 ExecStart=/usr/bin/vitastor-osd \\
-    --etcd_address $IP:2379/v3 \\
-    --bind_address $IP \\
    --osd_num $OSD_NUM \\
    --disable_data_fsync 1 \\
    --immediate_commit all \\
--- a/mon/mon-main.js
+++ b/mon/mon-main.js
@@ -9,17 +9,18 @@ const options = {};

 for (let i = 2; i < process.argv.length; i++)
 {
-    if (process.argv[i].substr(0, 2) == '--')
+    if (process.argv[i] === '-h' || process.argv[i] === '--help')
+    {
+        console.error('USAGE: '+process.argv[0]+' '+process.argv[1]+' [--verbose 1]'+
+            ' [--etcd_address "http://127.0.0.1:2379,..."] [--config_file /etc/vitastor/vitastor.conf]'+
+            ' [--etcd_prefix "/vitastor"] [--etcd_start_timeout 5]');
+        process.exit();
+    }
+    else if (process.argv[i].substr(0, 2) == '--')
    {
        options[process.argv[i].substr(2)] = process.argv[i+1];
        i++;
    }
 }

-if (!options.etcd_url)
-{
-    console.error('USAGE: '+process.argv[0]+' '+process.argv[1]+' --etcd_url "http://127.0.0.1:2379,..." --etcd_prefix "/vitastor" --etcd_start_timeout 5 [--verbose 1]');
-    process.exit();
-}
-
-new Mon(options).start().catch(e => { console.error(e); process.exit(); });
+new Mon(options).start().catch(e => { console.error(e); process.exit(1); });
--- a/mon/mon.js
+++ b/mon/mon.js
@@ -1,6 +1,7 @@
 // Copyright (c) Vitaliy Filippov, 2019+
 // License: VNPL-1.1 (see README.md for details)

+const fs = require('fs');
 const http = require('http');
 const crypto = require('crypto');
 const os = require('os');
@@ -85,6 +86,7 @@ const etcd_tree = {
            // osd
            etcd_report_interval: 5,
            run_primary: true,
+            osd_network: null, // "192.168.7.0/24" or an array of masks
            bind_address: "0.0.0.0",
            bind_port: 0,
            autosync_interval: 5,
@@ -322,24 +324,53 @@ class Mon
 {
    constructor(config)
    {
-        // FIXME: Maybe prefer local etcd
-        this.etcd_urls = [];
-        for (let url of config.etcd_url.split(/,/))
+        this.die = (e) => this._die(e);
+        if (fs.existsSync(config.config_path||'/etc/vitastor/vitastor.conf'))
        {
-            let scheme = 'http';
-            url = url.trim().replace(/^(https?):\/\//, (m, m1) => { scheme = m1; return ''; });
-            if (!/\/[^\/]/.exec(url))
-                url += '/v3';
-            this.etcd_urls.push(scheme+'://'+url);
+            config = {
+                ...JSON.parse(fs.readFileSync(config.config_path||'/etc/vitastor/vitastor.conf', { encoding: 'utf-8' })),
+                ...config,
+            };
        }
+        this.parse_etcd_addresses(config.etcd_address||config.etcd_url);
        this.verbose = config.verbose || 0;
+        this.initConfig = config;
        this.config = {};
        this.etcd_prefix = config.etcd_prefix || '/vitastor';
        this.etcd_prefix = this.etcd_prefix.replace(/\/\/+/g, '/').replace(/^\/?(.*[^\/])\/?$/, '/$1');
        this.etcd_start_timeout = (config.etcd_start_timeout || 5) * 1000;
        this.state = JSON.parse(JSON.stringify(this.constructor.etcd_tree));
        this.signals_set = false;
-        this.on_stop_cb = () => this.on_stop().catch(console.error);
+        this.on_stop_cb = () => this.on_stop(0).catch(console.error);
+    }
+
+    parse_etcd_addresses(addrs)
+    {
+        const is_local_ip = this.local_ips(true).reduce((a, c) => { a[c] = true; return a; }, {});
+        this.etcd_local = [];
+        this.etcd_urls = [];
+        this.selected_etcd_url = null;
+        this.etcd_urls_to_try = [];
+        if (!(addrs instanceof Array))
+            addrs = addrs ? (''+(addrs||'')).split(/,/) : [];
+        if (!addrs.length)
+        {
+            console.error('Vitastor etcd address(es) not specified. Please set on the command line or in the config file');
+            process.exit(1);
+        }
+        for (let url of addrs)
+        {
+            let scheme = 'http';
+            url = url.trim().replace(/^(https?):\/\//, (m, m1) => { scheme = m1; return ''; });
+            const slash = url.indexOf('/');
+            const colon = url.indexOf(':');
+            const is_local = is_local_ip[colon >= 0 ? url.substr(0, colon) : (slash >= 0 ? url.substr(0, slash) : url)];
+            url = scheme+'://'+(slash >= 0 ? url : url+'/v3');
+            if (is_local)
+                this.etcd_local.push(url);
+            else
+                this.etcd_urls.push(url);
+        }
    }

    async start()
@@ -410,6 +441,31 @@ class Mon
        }
    }

+    pick_next_etcd()
+    {
+        if (this.selected_etcd_url)
+            return this.selected_etcd_url;
+        if (!this.etcd_urls_to_try || !this.etcd_urls_to_try.length)
+        {
+            this.etcd_urls_to_try = [ ...this.etcd_local ];
+            const others = [ ...this.etcd_urls ];
+            while (others.length)
+            {
+                const url = others.splice(0|(others.length*Math.random()), 1);
+                this.etcd_urls_to_try.push(url[0]);
+            }
+        }
+        this.selected_etcd_url = this.etcd_urls_to_try.shift();
+        return this.selected_etcd_url;
+    }
+
+    restart_watcher(cur_addr)
+    {
+        if (this.selected_etcd_url == cur_addr)
+            this.selected_etcd_url = null;
+        this.start_watcher(this.config.etcd_mon_retries).catch(this.die);
+    }
+
    async start_watcher(retries)
    {
        let retry = 0;
@@ -419,7 +475,8 @@ class Mon
        }
        while (retries < 0 || retry < retries)
        {
-            const base = 'ws'+this.etcd_urls[Math.floor(Math.random()*this.etcd_urls.length)].substr(4);
+            const cur_addr = this.pick_next_etcd();
+            const base = 'ws'+cur_addr.substr(4);
            const ok = await new Promise((ok, no) =>
            {
                const timer_id = setTimeout(() =>
@@ -442,9 +499,9 @@ class Mon
                });
            });
            if (ok)
-            {
                break;
-            }
+            if (this.selected_etcd_url == cur_addr)
+                this.selected_etcd_url = null;
            this.ws = null;
            retry++;
        }
@@ -452,6 +509,8 @@ class Mon
        {
            this.die('Failed to open etcd watch websocket');
        }
+        const cur_addr = this.selected_etcd_url;
+        this.ws.on('error', () => this.restart_watcher(cur_addr));
        this.ws.send(JSON.stringify({
            create_request: {
                key: b64(this.etcd_prefix+'/'),
@@ -471,12 +530,25 @@ class Mon
            catch (e)
            {
            }
-            if (!data || !data.result || !data.result.events)
+            if (!data || !data.result)
            {
-                if (!data || !data.result || !data.result.watch_id)
+                console.error('Unknown message received from watch websocket: '+msg);
+            }
+            else if (data.result.canceled)
+            {
+                // etcd watch canceled
+                if (data.result.compact_revision)
                {
-                    console.error('Garbage received from watch websocket: '+msg);
+                    // we may miss events if we proceed
+                    console.error('Revisions before '+data.result.compact_revision+' were compacted by etcd, exiting');
+                    this.on_stop(1);
                }
+                console.error('Watch canceled by etcd, reason: '+data.result.cancel_reason+', exiting');
+                this.on_stop(1);
+            }
+            else if (data.result.created)
+            {
+                // etcd watch created
            }
            else
            {
@@ -509,7 +581,7 @@ class Mon
                }
                if (pg_states_changed)
                {
-                    this.save_last_clean().catch(console.error);
+                    this.save_last_clean().catch(this.die);
                }
                if (stats_changed)
                {
@@ -580,11 +652,11 @@ class Mon
        }
    }

-    async on_stop()
+    async on_stop(status)
    {
        clearInterval(this.lease_timer);
        await this.etcd_call('/lease/revoke', { ID: this.etcd_lease_id }, this.config.etcd_mon_timeout, this.config.etcd_mon_retries);
-        process.exit(0);
+        process.exit(status);
    }

    async become_master()
@@ -1195,7 +1267,7 @@ class Mon
        this.recheck_timer = setTimeout(() =>
        {
            this.recheck_timer = null;
-            this.recheck_pgs().catch(console.error);
+            this.recheck_pgs().catch(this.die);
        }, this.config.mon_change_timeout || 1000);
    }

@@ -1342,6 +1414,7 @@ class Mon
        {
            for (const inode_num in inode_stats[pool_id])
            {
+                let nonzero = inode_stats[pool_id][inode_num].raw_used > 0;
                for (const op of [ 'read', 'write', 'delete' ])
                {
                    const op_st = inode_stats[pool_id][inode_num][op];
@@ -1349,6 +1422,13 @@ class Mon
                    op_st.bps = prev_st ? (op_st.bytes - prev_st.bytes) * 1000n / tm : 0;
                    op_st.iops = prev_st ? (op_st.count - prev_st.count) * 1000n / tm : 0;
                    op_st.lat = prev_st ? (op_st.usec - prev_st.usec) / ((op_st.count - prev_st.count) || 1n) : 0;
+                    if (op_st.bps > 0 || op_st.iops > 0 || op_st.lat > 0)
+                        nonzero = true;
+                }
+                if (!nonzero && (!this.state.config.inode[pool_id] || !this.state.config.inode[pool_id][inode_num]))
+                {
+                    // Deleted inode (no data, no I/O, no config)
+                    delete inode_stats[pool_id][inode_num];
                }
            }
        }
@@ -1397,6 +1477,18 @@ class Mon
                } });
            }
        }
+        for (const pool_id in this.state.inode.stats)
+        {
+            for (const inode_num in this.state.inode.stats[pool_id])
+            {
+                if (!inode_stats[pool_id] || !inode_stats[pool_id][inode_num])
+                {
+                    txn.push({ requestDeleteRange: {
+                        key: b64(this.etcd_prefix+'/inode/stats/'+pool_id+'/'+inode_num),
+                    } });
+                }
+            }
+        }
        for (const pool_id in this.state.pool.stats)
        {
            const pool_stats = { ...this.state.pool.stats[pool_id] };
@@ -1462,7 +1554,7 @@ class Mon
        cur[key_parts[key_parts.length-1]] = kv.value;
        if (key === 'config/global')
        {
-            this.config = this.state.config.global;
+            this.config = { ...this.initConfig, ...this.state.config.global };
            this.check_config();
            for (const osd_num in this.state.osd.stats)
            {
@@ -1499,12 +1591,15 @@ class Mon
        }
        while (retries < 0 || retry < retries)
        {
-            const base = this.etcd_urls[Math.floor(Math.random()*this.etcd_urls.length)];
+            retry++;
+            const base = this.pick_next_etcd();
            const res = await POST(base+path, body, timeout);
            if (res.error)
            {
-                console.error('etcd returned error: '+res.error);
-                break;
+                if (this.selected_etcd_url == base)
+                    this.selected_etcd_url = null;
+                console.error('failed to query etcd: '+res.error);
+                continue;
            }
            if (res.json)
            {
@@ -1513,26 +1608,20 @@ class Mon
                    console.error('etcd returned error: '+res.json.error);
                    break;
                }
-                if (this.etcd_urls.length > 1)
-                {
-                    // Stick to the same etcd for the rest of calls
-                    this.etcd_urls = [ base ];
-                }
                return res.json;
            }
-            retry++;
        }
        this.die();
    }

-    die(err)
+    _die(err)
    {
        // In fact we can just try to rejoin
        console.error(new Error(err || 'Cluster connection failed'));
        process.exit(1);
    }

-    local_ips()
+    local_ips(all)
    {
        const ips = [];
        const ifaces = os.networkInterfaces();
@@ -1540,7 +1629,7 @@ class Mon
        {
            for (const iface of ifaces[ifname])
            {
-                if (iface.family == 'IPv4' && !iface.internal)
+                if (iface.family == 'IPv4' && !iface.internal || all)
                {
                    ips.push(iface.address);
                }
--- a/mon/test-optimize-unfeasible.js
+++ b/mon/test-optimize-unfeasible.js
@@ -0,0 +1,33 @@
+// Copyright (c) Vitaliy Filippov, 2019+
+// License: VNPL-1.1 (see README.md for details)
+
+const LPOptimizer = require('./lp-optimizer.js');
+
+const osd_tree = {
+    100: {
+        1: 0.1,
+        2: 0.1,
+        3: 0.1,
+    },
+    200: {
+        4: 0.1,
+        5: 0.1,
+        6: 0.1,
+    },
+};
+
+async function run()
+{
+    let res;
+    console.log('256 PGs, 3+3 OSDs, size=2');
+    res = await LPOptimizer.optimize_initial({ osd_tree, pg_size: 2, pg_count: 256 });
+    LPOptimizer.print_change_stats(res, false);
+
+    // Should NOT fail with the "unfeasible or unbounded" exception
+    console.log('\nRemoving osd.2');
+    delete osd_tree[100][2];
+    res = await LPOptimizer.optimize_change({ prev_pgs: res.int_pgs, osd_tree, pg_size: 2 });
+    LPOptimizer.print_change_stats(res, false);
+}
+
+run().catch(console.error);
--- a/patches/cinder-vitastor.py
+++ b/patches/cinder-vitastor.py
@@ -50,7 +50,7 @@ from cinder.volume import configuration
 from cinder.volume import driver
 from cinder.volume import volume_utils

-VERSION = '0.6.8'
+VERSION = '0.6.9'

 LOG = logging.getLogger(__name__)

@@ -658,8 +658,8 @@ class VitastorDriver(driver.CloneableImageVD,
                'etcd_address': self.configuration.vitastor_etcd_address,
                'etcd_prefix': self.configuration.vitastor_etcd_prefix,
                'name': volume.name,
-                'logical_block_size': 512,
-                'physical_block_size': 4096,
+                'logical_block_size': '512',
+                'physical_block_size': '4096',
            }
        }
        LOG.debug('connection data: %s', data)
--- a/patches/libvirt-5.0-vitastor.diff
+++ b/patches/libvirt-5.0-vitastor.diff
@@ -1,4 +1,4 @@
-commit bd283191b3e7a4c6d1c100d3d96e348a1ebffe55
+commit 7f01510ef207940b07fac4f5fc8b9f1580b443aa
 Author: Vitaliy Filippov <vitalif@yourcmc.ru>
 Date:   Sun Jun 27 12:52:40 2021 +0300

@@ -65,10 +65,38 @@ index 4bf2b5f..dbc011b 100644
 
 int                     virConnectListAllStoragePools(virConnectPtr conn,
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 222bb8c..685d255 100644
+index 222bb8c..2c30c55 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -8653,6 +8653,10 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
+@@ -4667,8 +4667,7 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev,
+     if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
+         virDomainDiskDefPtr disk = dev->data.disk;
+ 
+-        /* internal snapshots and config files are currently supported
+-         * only with rbd: */
+        /* internal snapshots are currently supported only with rbd: */
+         if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_NETWORK &&
+             disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD) {
+             if (disk->src->snapshot) {
+@@ -4677,11 +4676,15 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev,
+                                  "only with 'rbd' disks"));
+                 return -1;
+             }
+-
+        }
+        /* config files are currently supported only with rbd and vitastor: */
+        if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_NETWORK &&
+            disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD &&
+            disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_VITASTOR) {
+             if (disk->src->configFile) {
+                 virReportError(VIR_ERR_XML_ERROR, "%s",
+                                _("<config> element is currently supported "
+-                                 "only with 'rbd' disks"));
+                                 "only with 'rbd' and 'vitastor' disks"));
+                 return -1;
+             }
+         }
+@@ -8653,6 +8656,10 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
         goto cleanup;
     }
 
@@ -79,7 +107,7 @@ index 222bb8c..685d255 100644
     if ((haveTLS = virXMLPropString(node, "tls")) &&
         (src->haveTLS = virTristateBoolTypeFromString(haveTLS)) <= 0) {
         virReportError(VIR_ERR_XML_ERROR,
-@@ -23849,6 +23853,10 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
+@@ -23849,6 +23856,10 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
 
     virBufferEscapeString(attrBuf, " name='%s'", path ? path : src->path);
 
@@ -90,7 +118,7 @@ index 222bb8c..685d255 100644
     VIR_FREE(path);
 
     if (src->haveTLS != VIR_TRISTATE_BOOL_ABSENT &&
-@@ -30930,6 +30938,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+@@ -30930,6 +30941,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
 
     case VIR_STORAGE_POOL_MPATH:
     case VIR_STORAGE_POOL_RBD:
@@ -216,7 +244,7 @@ index 73e988a..ab7bb81 100644
     case VIR_STORAGE_NET_PROTOCOL_NONE:
         virReportError(VIR_ERR_NO_SUPPORT,
 diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
-index cbf0aa4..096700d 100644
+index cbf0aa4..f0ca9e7 100644
 --- a/src/qemu/qemu_block.c
 +++ b/src/qemu/qemu_block.c
@@ -959,6 +959,42 @@ qemuBlockStorageSourceGetRBDProps(virStorageSourcePtr src)
@@ -275,7 +303,7 @@ index cbf0aa4..096700d 100644
             if (!(fileprops = qemuBlockStorageSourceGetSheepdogProps(src)))
                 return NULL;
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 822d5f8..e375cef 100644
+index 822d5f8..abec34e 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
@@ -975,6 +975,43 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src,
@@ -387,7 +415,7 @@ index 4a13e90..33301c7 100644
             ignore_value(VIR_STRDUP(stable_path, data->path));
             break;
 diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
-index bd4b027..b323cd6 100644
+index bd4b027..8454906 100644
 --- a/src/util/virstoragefile.c
 +++ b/src/util/virstoragefile.c
@@ -84,7 +84,8 @@ VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST,
--- a/patches/libvirt-7.0-vitastor.diff
+++ b/patches/libvirt-7.0-vitastor.diff
@@ -1,4 +1,4 @@
-commit 41cdfe8317d98f70aadedfdbb381effed2641bdd
+commit 4e74c622884e2585b2cfcdf322fbd2bff6de41ca
 Author: Vitaliy Filippov <vitalif@yourcmc.ru>
 Date:   Fri Jul 9 01:31:57 2021 +0300

@@ -65,10 +65,38 @@ index 089e1e0..d7e7ef4 100644
 
 int                     virConnectListAllStoragePools(virConnectPtr conn,
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 01b7187..c6e9702 100644
+index 01b7187..645c758 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -8261,7 +8261,8 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
+@@ -5230,8 +5230,7 @@ virDomainDiskDefPostParse(virDomainDiskDefPtr disk,
+                           const virDomainDef *def,
+                           virDomainXMLOptionPtr xmlopt)
+ {
+-    /* internal snapshots and config files are currently supported
+-     * only with rbd: */
+    /* internal snapshots are currently supported only with rbd: */
+     if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_NETWORK &&
+         disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD) {
+         if (disk->src->snapshot) {
+@@ -5240,11 +5239,15 @@ virDomainDiskDefPostParse(virDomainDiskDefPtr disk,
+                              "only with 'rbd' disks"));
+             return -1;
+         }
+-
+    }
+    /* config files are currently supported only with rbd and vitastor: */
+    if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_NETWORK &&
+        disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD &&
+        disk->src->protocol != VIR_STORAGE_NET_PROTOCOL_VITASTOR) {
+         if (disk->src->configFile) {
+             virReportError(VIR_ERR_XML_ERROR, "%s",
+                            _("<config> element is currently supported "
+-                             "only with 'rbd' disks"));
+                             "only with 'rbd' and 'vitastor' disks"));
+             return -1;
+         }
+     }
+@@ -8261,7 +8264,8 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
     src->configFile = virXPathString("string(./config/@file)", ctxt);
 
     if (src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTP ||
@@ -78,7 +106,7 @@ index 01b7187..c6e9702 100644
         src->query = virXMLPropString(node, "query");
 
     if (virDomainStorageNetworkParseHosts(node, ctxt, &src->hosts, &src->nhosts) < 0)
-@@ -31392,6 +31393,7 @@ virDomainStorageSourceTranslateSourcePool(virStorageSourcePtr src,
+@@ -31392,6 +31396,7 @@ virDomainStorageSourceTranslateSourcePool(virStorageSourcePtr src,
 
     case VIR_STORAGE_POOL_MPATH:
     case VIR_STORAGE_POOL_RBD:
@@ -216,7 +244,7 @@ index 17b93d0..c5a0084 100644
     case VIR_STORAGE_NET_PROTOCOL_NONE:
         virReportError(VIR_ERR_NO_SUPPORT,
 diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
-index f9c6da2..922dde5 100644
+index f9c6da2..d837a05 100644
 --- a/src/qemu/qemu_block.c
 +++ b/src/qemu/qemu_block.c
@@ -938,6 +938,38 @@ qemuBlockStorageSourceGetRBDProps(virStorageSourcePtr src,
@@ -293,7 +321,7 @@ index f9c6da2..922dde5 100644
             driver = "sheepdog";
             if (!(location = qemuBlockStorageSourceGetSheepdogProps(src)))
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 6f970a3..10b39ca 100644
+index 6f970a3..4c03fb8 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
@@ -1034,6 +1034,43 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src,
@@ -415,7 +443,7 @@ index 29c4c86..a27ad94 100644
     case VIR_STORAGE_POOL_LOGICAL:
     case VIR_STORAGE_POOL_DISK:
 diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
-index 0d3c2af..36e3afc 100644
+index 0d3c2af..edb7f9e 100644
 --- a/src/util/virstoragefile.c
 +++ b/src/util/virstoragefile.c
@@ -91,6 +91,7 @@ VIR_ENUM_IMPL(virStorageNetProtocol,
--- a/patches/libvirt-7.5-vitastor.diff
+++ b/patches/libvirt-7.5-vitastor.diff
@@ -1,4 +1,4 @@
-commit c6e1958a1b4974828e8e5852beb252ce6594e670
+commit c97d7f2bfb7798f0d68bdba2646245dcfb940efa
 Author: Vitaliy Filippov <vitalif@yourcmc.ru>
 Date:   Mon Jun 28 01:20:19 2021 +0300

@@ -86,6 +86,37 @@ index d78f846..f7222e3 100644
     case VIR_STORAGE_POOL_SHEEPDOG:
     case VIR_STORAGE_POOL_GLUSTER:
     case VIR_STORAGE_POOL_LAST:
+diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
+index 2124d25..6acc6fa 100644
+--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
+@@ -470,7 +470,7 @@ virDomainDiskDefValidateSourceChainOne(const virStorageSource *src)
+         }
+     }
+ 
+-    /* internal snapshots and config files are currently supported only with rbd: */
+    /* internal snapshots are currently supported only with rbd: */
+     if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK &&
+         src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD) {
+         if (src->snapshot) {
+@@ -479,11 +479,15 @@ virDomainDiskDefValidateSourceChainOne(const virStorageSource *src)
+                              "only with 'rbd' disks"));
+             return -1;
+         }
+-
+    }
+    /* config files are currently supported only with rbd and vitastor: */
+    if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK &&
+        src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD &&
+        src->protocol != VIR_STORAGE_NET_PROTOCOL_VITASTOR) {
+         if (src->configFile) {
+             virReportError(VIR_ERR_XML_ERROR, "%s",
+                            _("<config> element is currently supported "
+-                             "only with 'rbd' disks"));
+                             "only with 'rbd' and 'vitastor' disks"));
+             return -1;
+         }
+     }
 diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
 index 2aa9a3d..166ca1f 100644
 --- a/src/conf/storage_conf.c
@@ -248,7 +279,7 @@ index c0905b0..c172378 100644
     case VIR_STORAGE_NET_PROTOCOL_NONE:
         virReportError(VIR_ERR_NO_SUPPORT,
 diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
-index 6627d04..c33f428 100644
+index 6627d04..f769d24 100644
 --- a/src/qemu/qemu_block.c
 +++ b/src/qemu/qemu_block.c
@@ -928,6 +928,38 @@ qemuBlockStorageSourceGetRBDProps(virStorageSource *src,
@@ -325,7 +356,7 @@ index 6627d04..c33f428 100644
             driver = "sheepdog";
             if (!(location = qemuBlockStorageSourceGetSheepdogProps(src)))
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index ea51369..8258632 100644
+index ea51369..d714597 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
@@ -1074,6 +1074,43 @@ qemuBuildNetworkDriveStr(virStorageSource *src,
@@ -435,7 +466,7 @@ index c2ff4b8..70d0689 100644
         case VIR_STORAGE_POOL_ZFS:
         case VIR_STORAGE_POOL_LAST:
 diff --git a/src/storage_file/storage_source_backingstore.c b/src/storage_file/storage_source_backingstore.c
-index e48ae72..d7a9b72 100644
+index e48ae72..2017ccc 100644
 --- a/src/storage_file/storage_source_backingstore.c
 +++ b/src/storage_file/storage_source_backingstore.c
@@ -284,6 +284,75 @@ virStorageSourceParseRBDColonString(const char *rbdstr,
--- a/patches/libvirt-7.6-vitastor.diff
+++ b/patches/libvirt-7.6-vitastor.diff
@@ -0,0 +1,692 @@
+commit c97d7f2bfb7798f0d68bdba2646245dcfb940efa
+Author: Vitaliy Filippov <vitalif@yourcmc.ru>
+Date:   Mon Jun 28 01:20:19 2021 +0300
+
+    Add Vitastor support
+
+Index: libvirt-7.6.0/docs/schemas/domaincommon.rng
+===================================================================
+--- libvirt-7.6.0.orig/docs/schemas/domaincommon.rng
+++ libvirt-7.6.0/docs/schemas/domaincommon.rng
+@@ -1877,6 +1877,35 @@
+     </element>
+   </define>
+ 
+  <define name="diskSourceNetworkProtocolVitastor">
+    <element name="source">
+      <interleave>
+        <attribute name="protocol">
+          <value>vitastor</value>
+        </attribute>
+        <ref name="diskSourceCommon"/>
+        <optional>
+          <attribute name="name"/>
+        </optional>
+        <optional>
+          <attribute name="query"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="diskSourceNetworkHost"/>
+        </zeroOrMore>
+        <optional>
+          <element name="config">
+            <attribute name="file">
+              <ref name="absFilePath"/>
+            </attribute>
+            <empty/>
+          </element>
+        </optional>
+        <empty/>
+      </interleave>
+    </element>
+  </define>
+
+   <define name="diskSourceNetworkProtocolISCSI">
+     <element name="source">
+       <attribute name="protocol">
+@@ -2133,6 +2162,7 @@
+       <ref name="diskSourceNetworkProtocolSimple"/>
+       <ref name="diskSourceNetworkProtocolVxHS"/>
+       <ref name="diskSourceNetworkProtocolNFS"/>
+      <ref name="diskSourceNetworkProtocolVitastor"/>
+     </choice>
+   </define>
+ 
+Index: libvirt-7.6.0/include/libvirt/libvirt-storage.h
+===================================================================
+--- libvirt-7.6.0.orig/include/libvirt/libvirt-storage.h
+++ libvirt-7.6.0/include/libvirt/libvirt-storage.h
+@@ -245,6 +245,7 @@ typedef enum {
+     VIR_CONNECT_LIST_STORAGE_POOLS_ZFS           = 1 << 17,
+     VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE      = 1 << 18,
+     VIR_CONNECT_LIST_STORAGE_POOLS_ISCSI_DIRECT  = 1 << 19,
+    VIR_CONNECT_LIST_STORAGE_POOLS_VITASTOR      = 1 << 20,
+ } virConnectListAllStoragePoolsFlags;
+ 
+ int                     virConnectListAllStoragePools(virConnectPtr conn,
+Index: libvirt-7.6.0/src/conf/domain_conf.c
+===================================================================
+--- libvirt-7.6.0.orig/src/conf/domain_conf.c
+++ libvirt-7.6.0/src/conf/domain_conf.c
+@@ -8268,7 +8268,8 @@ virDomainDiskSourceNetworkParse(xmlNodeP
+     src->configFile = virXPathString("string(./config/@file)", ctxt);
+ 
+     if (src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTP ||
+-        src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS)
+        src->protocol == VIR_STORAGE_NET_PROTOCOL_HTTPS ||
+        src->protocol == VIR_STORAGE_NET_PROTOCOL_VITASTOR)
+         src->query = virXMLPropString(node, "query");
+ 
+     if (virDomainStorageNetworkParseHosts(node, ctxt, &src->hosts, &src->nhosts) < 0)
+@@ -30831,6 +30832,7 @@ virDomainStorageSourceTranslateSourcePoo
+ 
+     case VIR_STORAGE_POOL_MPATH:
+     case VIR_STORAGE_POOL_RBD:
+    case VIR_STORAGE_POOL_VITASTOR:
+     case VIR_STORAGE_POOL_SHEEPDOG:
+     case VIR_STORAGE_POOL_GLUSTER:
+     case VIR_STORAGE_POOL_LAST:
+Index: libvirt-7.6.0/src/conf/domain_validate.c
+===================================================================
+--- libvirt-7.6.0.orig/src/conf/domain_validate.c
+++ libvirt-7.6.0/src/conf/domain_validate.c
+@@ -470,7 +470,7 @@ virDomainDiskDefValidateSourceChainOne(c
+         }
+     }
+ 
+-    /* internal snapshots and config files are currently supported only with rbd: */
+    /* internal snapshots are currently supported only with rbd: */
+     if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK &&
+         src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD) {
+         if (src->snapshot) {
+@@ -479,11 +479,15 @@ virDomainDiskDefValidateSourceChainOne(c
+                              "only with 'rbd' disks"));
+             return -1;
+         }
+-
+    }
+    /* config files are currently supported only with rbd and vitastor: */
+    if (virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK &&
+        src->protocol != VIR_STORAGE_NET_PROTOCOL_RBD &&
+        src->protocol != VIR_STORAGE_NET_PROTOCOL_VITASTOR) {
+         if (src->configFile) {
+             virReportError(VIR_ERR_XML_ERROR, "%s",
+                            _("<config> element is currently supported "
+-                             "only with 'rbd' disks"));
+                             "only with 'rbd' and 'vitastor' disks"));
+             return -1;
+         }
+     }
+Index: libvirt-7.6.0/src/conf/storage_conf.c
+===================================================================
+--- libvirt-7.6.0.orig/src/conf/storage_conf.c
+++ libvirt-7.6.0/src/conf/storage_conf.c
+@@ -60,7 +60,7 @@ VIR_ENUM_IMPL(virStoragePool,
+               "logical", "disk", "iscsi",
+               "iscsi-direct", "scsi", "mpath",
+               "rbd", "sheepdog", "gluster",
+-              "zfs", "vstorage",
+              "zfs", "vstorage", "vitastor",
+ );
+ 
+ VIR_ENUM_IMPL(virStoragePoolFormatFileSystem,
+@@ -246,6 +246,18 @@ static virStoragePoolTypeInfo poolTypeIn
+           .formatToString = virStorageFileFormatTypeToString,
+       }
+     },
+    {.poolType = VIR_STORAGE_POOL_VITASTOR,
+     .poolOptions = {
+         .flags = (VIR_STORAGE_POOL_SOURCE_HOST |
+                   VIR_STORAGE_POOL_SOURCE_NETWORK |
+                   VIR_STORAGE_POOL_SOURCE_NAME),
+      },
+      .volOptions = {
+          .defaultFormat = VIR_STORAGE_FILE_RAW,
+          .formatFromString = virStorageVolumeFormatFromString,
+          .formatToString = virStorageFileFormatTypeToString,
+      }
+    },
+     {.poolType = VIR_STORAGE_POOL_SHEEPDOG,
+      .poolOptions = {
+          .flags = (VIR_STORAGE_POOL_SOURCE_HOST |
+@@ -546,6 +558,11 @@ virStoragePoolDefParseSource(xmlXPathCon
+                        _("element 'name' is mandatory for RBD pool"));
+         return -1;
+     }
+    if (pool_type == VIR_STORAGE_POOL_VITASTOR && source->name == NULL) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("element 'name' is mandatory for Vitastor pool"));
+        return -1;
+    }
+ 
+     if (options->formatFromString) {
+         g_autofree char *format = NULL;
+@@ -1182,6 +1199,7 @@ virStoragePoolDefFormatBuf(virBuffer *bu
+     /* RBD, Sheepdog, Gluster and Iscsi-direct devices are not local block devs nor
+      * files, so they don't have a target */
+     if (def->type != VIR_STORAGE_POOL_RBD &&
+        def->type != VIR_STORAGE_POOL_VITASTOR &&
+         def->type != VIR_STORAGE_POOL_SHEEPDOG &&
+         def->type != VIR_STORAGE_POOL_GLUSTER &&
+         def->type != VIR_STORAGE_POOL_ISCSI_DIRECT) {
+Index: libvirt-7.6.0/src/conf/storage_conf.h
+===================================================================
+--- libvirt-7.6.0.orig/src/conf/storage_conf.h
+++ libvirt-7.6.0/src/conf/storage_conf.h
+@@ -106,6 +106,7 @@ typedef enum {
+     VIR_STORAGE_POOL_GLUSTER,  /* Gluster device */
+     VIR_STORAGE_POOL_ZFS,      /* ZFS */
+     VIR_STORAGE_POOL_VSTORAGE, /* Virtuozzo Storage */
+    VIR_STORAGE_POOL_VITASTOR, /* Vitastor */
+ 
+     VIR_STORAGE_POOL_LAST,
+ } virStoragePoolType;
+@@ -465,6 +466,7 @@ VIR_ENUM_DECL(virStoragePartedFs);
+                  VIR_CONNECT_LIST_STORAGE_POOLS_SCSI     | \
+                  VIR_CONNECT_LIST_STORAGE_POOLS_MPATH    | \
+                  VIR_CONNECT_LIST_STORAGE_POOLS_RBD      | \
+                 VIR_CONNECT_LIST_STORAGE_POOLS_VITASTOR | \
+                  VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG | \
+                  VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER  | \
+                  VIR_CONNECT_LIST_STORAGE_POOLS_ZFS      | \
+Index: libvirt-7.6.0/src/conf/storage_source_conf.c
+===================================================================
+--- libvirt-7.6.0.orig/src/conf/storage_source_conf.c
+++ libvirt-7.6.0/src/conf/storage_source_conf.c
+@@ -85,6 +85,7 @@ VIR_ENUM_IMPL(virStorageNetProtocol,
+               "ssh",
+               "vxhs",
+               "nfs",
+              "vitastor",
+ );
+ 
+ 
+@@ -1262,6 +1263,7 @@ virStorageSourceNetworkDefaultPort(virSt
+         case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
+             return 24007;
+ 
+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+         case VIR_STORAGE_NET_PROTOCOL_RBD:
+             /* we don't provide a default for RBD */
+             return 0;
+Index: libvirt-7.6.0/src/conf/storage_source_conf.h
+===================================================================
+--- libvirt-7.6.0.orig/src/conf/storage_source_conf.h
+++ libvirt-7.6.0/src/conf/storage_source_conf.h
+@@ -127,6 +127,7 @@ typedef enum {
+     VIR_STORAGE_NET_PROTOCOL_SSH,
+     VIR_STORAGE_NET_PROTOCOL_VXHS,
+     VIR_STORAGE_NET_PROTOCOL_NFS,
+    VIR_STORAGE_NET_PROTOCOL_VITASTOR,
+ 
+     VIR_STORAGE_NET_PROTOCOL_LAST
+ } virStorageNetProtocol;
+Index: libvirt-7.6.0/src/conf/virstorageobj.c
+===================================================================
+--- libvirt-7.6.0.orig/src/conf/virstorageobj.c
+++ libvirt-7.6.0/src/conf/virstorageobj.c
+@@ -1481,6 +1481,7 @@ virStoragePoolObjSourceFindDuplicateCb(c
+             return 1;
+         break;
+ 
+    case VIR_STORAGE_POOL_VITASTOR:
+     case VIR_STORAGE_POOL_RBD:
+     case VIR_STORAGE_POOL_LAST:
+         break;
+@@ -1980,6 +1981,8 @@ virStoragePoolObjMatch(virStoragePoolObj
+                (obj->def->type == VIR_STORAGE_POOL_MPATH))   ||
+               (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_RBD) &&
+                (obj->def->type == VIR_STORAGE_POOL_RBD))     ||
+              (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_VITASTOR) &&
+               (obj->def->type == VIR_STORAGE_POOL_VITASTOR)) ||
+               (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG) &&
+                (obj->def->type == VIR_STORAGE_POOL_SHEEPDOG)) ||
+               (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER) &&
+Index: libvirt-7.6.0/src/libvirt-storage.c
+===================================================================
+--- libvirt-7.6.0.orig/src/libvirt-storage.c
+++ libvirt-7.6.0/src/libvirt-storage.c
+@@ -92,6 +92,7 @@ virStoragePoolGetConnect(virStoragePoolP
+  * VIR_CONNECT_LIST_STORAGE_POOLS_SCSI
+  * VIR_CONNECT_LIST_STORAGE_POOLS_MPATH
+  * VIR_CONNECT_LIST_STORAGE_POOLS_RBD
+ * VIR_CONNECT_LIST_STORAGE_POOLS_VITASTOR
+  * VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG
+  * VIR_CONNECT_LIST_STORAGE_POOLS_GLUSTER
+  * VIR_CONNECT_LIST_STORAGE_POOLS_ZFS
+Index: libvirt-7.6.0/src/libxl/libxl_conf.c
+===================================================================
+--- libvirt-7.6.0.orig/src/libxl/libxl_conf.c
+++ libvirt-7.6.0/src/libxl/libxl_conf.c
+@@ -972,6 +972,7 @@ libxlMakeNetworkDiskSrcStr(virStorageSou
+     case VIR_STORAGE_NET_PROTOCOL_SSH:
+     case VIR_STORAGE_NET_PROTOCOL_VXHS:
+     case VIR_STORAGE_NET_PROTOCOL_NFS:
+    case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+     case VIR_STORAGE_NET_PROTOCOL_LAST:
+     case VIR_STORAGE_NET_PROTOCOL_NONE:
+         virReportError(VIR_ERR_NO_SUPPORT,
+Index: libvirt-7.6.0/src/libxl/xen_xl.c
+===================================================================
+--- libvirt-7.6.0.orig/src/libxl/xen_xl.c
+++ libvirt-7.6.0/src/libxl/xen_xl.c
+@@ -1540,6 +1540,7 @@ xenFormatXLDiskSrcNet(virStorageSource *
+     case VIR_STORAGE_NET_PROTOCOL_SSH:
+     case VIR_STORAGE_NET_PROTOCOL_VXHS:
+     case VIR_STORAGE_NET_PROTOCOL_NFS:
+    case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+     case VIR_STORAGE_NET_PROTOCOL_LAST:
+     case VIR_STORAGE_NET_PROTOCOL_NONE:
+         virReportError(VIR_ERR_NO_SUPPORT,
+Index: libvirt-7.6.0/src/qemu/qemu_block.c
+===================================================================
+--- libvirt-7.6.0.orig/src/qemu/qemu_block.c
+++ libvirt-7.6.0/src/qemu/qemu_block.c
+@@ -916,6 +916,38 @@ qemuBlockStorageSourceGetRBDProps(virSto
+ 
+ 
+ static virJSONValue *
+qemuBlockStorageSourceGetVitastorProps(virStorageSource *src)
+{
+    virJSONValue *ret = NULL;
+    virStorageNetHostDef *host;
+    size_t i;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+    g_autofree char *etcd = NULL;
+
+    for (i = 0; i < src->nhosts; i++) {
+        host = src->hosts + i;
+        if ((virStorageNetHostTransport)host->transport != VIR_STORAGE_NET_HOST_TRANS_TCP) {
+            return NULL;
+        }
+        virBufferAsprintf(&buf, i > 0 ? ",%s:%u" : "%s:%u", host->name, host->port);
+    }
+    if (src->nhosts > 0) {
+        etcd = virBufferContentAndReset(&buf);
+    }
+
+    if (virJSONValueObjectCreate(&ret,
+                                 "S:etcd-host", etcd,
+                                 "S:etcd-prefix", src->query,
+                                 "S:config-path", src->configFile,
+                                 "s:image", src->path,
+                                 NULL) < 0)
+        return NULL;
+
+    return ret;
+}
+
+
+static virJSONValue *
+ qemuBlockStorageSourceGetSheepdogProps(virStorageSource *src)
+ {
+     g_autoptr(virJSONValue) serverprops = NULL;
+@@ -1205,6 +1237,12 @@ qemuBlockStorageSourceGetBackendProps(vi
+                 return NULL;
+             break;
+ 
+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+            driver = "vitastor";
+            if (!(fileprops = qemuBlockStorageSourceGetVitastorProps(src)))
+                return NULL;
+            break;
+
+         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
+             driver = "sheepdog";
+             if (!(fileprops = qemuBlockStorageSourceGetSheepdogProps(src)))
+@@ -2219,6 +2257,7 @@ qemuBlockGetBackingStoreString(virStorag
+ 
+             case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
+             case VIR_STORAGE_NET_PROTOCOL_RBD:
+            case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+             case VIR_STORAGE_NET_PROTOCOL_VXHS:
+             case VIR_STORAGE_NET_PROTOCOL_NFS:
+             case VIR_STORAGE_NET_PROTOCOL_SSH:
+@@ -2596,6 +2635,12 @@ qemuBlockStorageSourceCreateGetStoragePr
+                 return -1;
+             break;
+ 
+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+            driver = "vitastor";
+            if (!(location = qemuBlockStorageSourceGetVitastorProps(src)))
+                return -1;
+            break;
+
+         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
+             driver = "sheepdog";
+             if (!(location = qemuBlockStorageSourceGetSheepdogProps(src)))
+Index: libvirt-7.6.0/src/qemu/qemu_command.c
+===================================================================
+--- libvirt-7.6.0.orig/src/qemu/qemu_command.c
+++ libvirt-7.6.0/src/qemu/qemu_command.c
+@@ -1074,6 +1074,43 @@ qemuBuildNetworkDriveStr(virStorageSourc
+             ret = virBufferContentAndReset(&buf);
+             break;
+ 
+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+            if (strchr(src->path, ':')) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("':' not allowed in Vitastor source volume name '%s'"),
+                               src->path);
+                return NULL;
+            }
+
+            virBufferStrcat(&buf, "vitastor:image=", src->path, NULL);
+
+            if (src->nhosts > 0) {
+                virBufferAddLit(&buf, ":etcd-host=");
+                for (i = 0; i < src->nhosts; i++) {
+                    if (i)
+                        virBufferAddLit(&buf, ",");
+
+                    /* assume host containing : is ipv6 */
+                    if (strchr(src->hosts[i].name, ':'))
+                        virBufferEscape(&buf, '\\', ":", "[%s]",
+                                        src->hosts[i].name);
+                    else
+                        virBufferAsprintf(&buf, "%s", src->hosts[i].name);
+
+                    if (src->hosts[i].port)
+                        virBufferAsprintf(&buf, "\\:%u", src->hosts[i].port);
+                }
+            }
+
+            if (src->configFile)
+                virBufferEscape(&buf, '\\', ":", ":config-path=%s", src->configFile);
+
+            if (src->query)
+                virBufferEscape(&buf, '\\', ":", ":etcd-prefix=%s", src->query);
+
+            ret = virBufferContentAndReset(&buf);
+            break;
+
+         case VIR_STORAGE_NET_PROTOCOL_VXHS:
+             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                            _("VxHS protocol does not support URI syntax"));
+Index: libvirt-7.6.0/src/qemu/qemu_domain.c
+===================================================================
+--- libvirt-7.6.0.orig/src/qemu/qemu_domain.c
+++ libvirt-7.6.0/src/qemu/qemu_domain.c
+@@ -4900,7 +4900,8 @@ qemuDomainValidateStorageSource(virStora
+     if (src->query &&
+         (actualType != VIR_STORAGE_TYPE_NETWORK ||
+          (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS &&
+-          src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTP))) {
+          src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTP &&
+          src->protocol != VIR_STORAGE_NET_PROTOCOL_VITASTOR))) {
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                        _("query is supported only with HTTP(S) protocols"));
+         return -1;
+@@ -10102,6 +10103,7 @@ qemuDomainPrepareStorageSourceTLS(virSto
+         break;
+ 
+     case VIR_STORAGE_NET_PROTOCOL_RBD:
+    case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+     case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
+     case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
+     case VIR_STORAGE_NET_PROTOCOL_ISCSI:
+Index: libvirt-7.6.0/src/qemu/qemu_snapshot.c
+===================================================================
+--- libvirt-7.6.0.orig/src/qemu/qemu_snapshot.c
+++ libvirt-7.6.0/src/qemu/qemu_snapshot.c
+@@ -402,6 +402,7 @@ qemuSnapshotPrepareDiskExternalInactive(
+         case VIR_STORAGE_NET_PROTOCOL_NONE:
+         case VIR_STORAGE_NET_PROTOCOL_NBD:
+         case VIR_STORAGE_NET_PROTOCOL_RBD:
+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
+         case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
+         case VIR_STORAGE_NET_PROTOCOL_ISCSI:
+@@ -494,6 +495,7 @@ qemuSnapshotPrepareDiskExternalActive(vi
+         case VIR_STORAGE_NET_PROTOCOL_NONE:
+         case VIR_STORAGE_NET_PROTOCOL_NBD:
+         case VIR_STORAGE_NET_PROTOCOL_RBD:
+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
+         case VIR_STORAGE_NET_PROTOCOL_ISCSI:
+         case VIR_STORAGE_NET_PROTOCOL_HTTP:
+@@ -647,6 +649,7 @@ qemuSnapshotPrepareDiskInternal(virDomai
+         case VIR_STORAGE_NET_PROTOCOL_NONE:
+         case VIR_STORAGE_NET_PROTOCOL_NBD:
+         case VIR_STORAGE_NET_PROTOCOL_RBD:
+        case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+         case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
+         case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
+         case VIR_STORAGE_NET_PROTOCOL_ISCSI:
+Index: libvirt-7.6.0/src/storage/storage_driver.c
+===================================================================
+--- libvirt-7.6.0.orig/src/storage/storage_driver.c
+++ libvirt-7.6.0/src/storage/storage_driver.c
+@@ -1644,6 +1644,7 @@ storageVolLookupByPathCallback(virStorag
+ 
+         case VIR_STORAGE_POOL_GLUSTER:
+         case VIR_STORAGE_POOL_RBD:
+        case VIR_STORAGE_POOL_VITASTOR:
+         case VIR_STORAGE_POOL_SHEEPDOG:
+         case VIR_STORAGE_POOL_ZFS:
+         case VIR_STORAGE_POOL_LAST:
+Index: libvirt-7.6.0/src/storage_file/storage_source_backingstore.c
+===================================================================
+--- libvirt-7.6.0.orig/src/storage_file/storage_source_backingstore.c
+++ libvirt-7.6.0/src/storage_file/storage_source_backingstore.c
+@@ -285,6 +285,75 @@ virStorageSourceParseRBDColonString(cons
+ 
+ 
+ static int
+virStorageSourceParseVitastorColonString(const char *colonstr,
+                                         virStorageSource *src)
+{
+    char *p, *e, *next;
+    g_autofree char *options = NULL;
+
+    /* optionally skip the "vitastor:" prefix if provided */
+    if (STRPREFIX(colonstr, "vitastor:"))
+        colonstr += strlen("vitastor:");
+
+    options = g_strdup(colonstr);
+
+    p = options;
+    while (*p) {
+        /* find : delimiter or end of string */
+        for (e = p; *e && *e != ':'; ++e) {
+            if (*e == '\\') {
+                e++;
+                if (*e == '\0')
+                    break;
+            }
+        }
+        if (*e == '\0') {
+            next = e;    /* last kv pair */
+        } else {
+            next = e + 1;
+            *e = '\0';
+        }
+
+        if (STRPREFIX(p, "image=")) {
+            src->path = g_strdup(p + strlen("image="));
+        } else if (STRPREFIX(p, "etcd-prefix=")) {
+            src->query = g_strdup(p + strlen("etcd-prefix="));
+        } else if (STRPREFIX(p, "config-path=")) {
+            src->configFile = g_strdup(p + strlen("config-path="));
+        } else if (STRPREFIX(p, "etcd-host=")) {
+            char *h, *sep;
+
+            h = p + strlen("etcd-host=");
+            while (h < e) {
+                for (sep = h; sep < e; ++sep) {
+                    if (*sep == '\\' && (sep[1] == ',' ||
+                                         sep[1] == ';' ||
+                                         sep[1] == ' ')) {
+                        *sep = '\0';
+                        sep += 2;
+                        break;
+                    }
+                }
+
+                if (virStorageSourceRBDAddHost(src, h) < 0)
+                    return -1;
+
+                h = sep;
+            }
+        }
+
+        p = next;
+    }
+
+    if (!src->path) {
+        return -1;
+    }
+
+    return 0;
+}
+
+
+static int
+ virStorageSourceParseNBDColonString(const char *nbdstr,
+                                     virStorageSource *src)
+ {
+@@ -396,6 +465,11 @@ virStorageSourceParseBackingColon(virSto
+             return -1;
+         break;
+ 
+    case VIR_STORAGE_NET_PROTOCOL_VITASTOR:
+        if (virStorageSourceParseVitastorColonString(path, src) < 0)
+            return -1;
+        break;
+
+     case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
+     case VIR_STORAGE_NET_PROTOCOL_LAST:
+     case VIR_STORAGE_NET_PROTOCOL_NONE:
+@@ -985,6 +1059,54 @@ virStorageSourceParseBackingJSONRBD(virS
+ }
+ 
+ static int
+virStorageSourceParseBackingJSONVitastor(virStorageSource *src,
+                                         virJSONValue *json,
+                                         const char *jsonstr G_GNUC_UNUSED,
+                                         int opaque G_GNUC_UNUSED)
+{
+    const char *filename;
+    const char *image = virJSONValueObjectGetString(json, "image");
+    const char *conf = virJSONValueObjectGetString(json, "config-path");
+    const char *etcd_prefix = virJSONValueObjectGetString(json, "etcd-prefix");
+    virJSONValue *servers = virJSONValueObjectGetArray(json, "server");
+    size_t nservers;
+    size_t i;
+
+    src->type = VIR_STORAGE_TYPE_NETWORK;
+    src->protocol = VIR_STORAGE_NET_PROTOCOL_VITASTOR;
+
+    /* legacy syntax passed via 'filename' option */
+    if ((filename = virJSONValueObjectGetString(json, "filename")))
+        return virStorageSourceParseVitastorColonString(filename, src);
+
+    if (!image) {
+        virReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("missing image name in Vitastor backing volume "
+                         "JSON specification"));
+        return -1;
+    }
+
+    src->path = g_strdup(image);
+    src->configFile = g_strdup(conf);
+    src->query = g_strdup(etcd_prefix);
+
+    if (servers) {
+        nservers = virJSONValueArraySize(servers);
+
+        src->hosts = g_new0(virStorageNetHostDef, nservers);
+        src->nhosts = nservers;
+
+        for (i = 0; i < nservers; i++) {
+            if (virStorageSourceParseBackingJSONInetSocketAddress(src->hosts + i,
+                                                                  virJSONValueArrayGet(servers, i)) < 0)
+                return -1;
+        }
+    }
+
+    return 0;
+}
+
+static int
+ virStorageSourceParseBackingJSONRaw(virStorageSource *src,
+                                     virJSONValue *json,
+                                     const char *jsonstr,
+@@ -1162,6 +1284,7 @@ static const struct virStorageSourceJSON
+     {"sheepdog", false, virStorageSourceParseBackingJSONSheepdog, 0},
+     {"ssh", false, virStorageSourceParseBackingJSONSSH, 0},
+     {"rbd", false, virStorageSourceParseBackingJSONRBD, 0},
+    {"vitastor", false, virStorageSourceParseBackingJSONVitastor, 0},
+     {"raw", true, virStorageSourceParseBackingJSONRaw, 0},
+     {"nfs", false, virStorageSourceParseBackingJSONNFS, 0},
+     {"vxhs", false, virStorageSourceParseBackingJSONVxHS, 0},
+Index: libvirt-7.6.0/src/test/test_driver.c
+===================================================================
+--- libvirt-7.6.0.orig/src/test/test_driver.c
+++ libvirt-7.6.0/src/test/test_driver.c
+@@ -7193,6 +7193,7 @@ testStorageVolumeTypeForPool(int pooltyp
+     case VIR_STORAGE_POOL_ISCSI_DIRECT:
+     case VIR_STORAGE_POOL_GLUSTER:
+     case VIR_STORAGE_POOL_RBD:
+    case VIR_STORAGE_POOL_VITASTOR:
+         return VIR_STORAGE_VOL_NETWORK;
+     case VIR_STORAGE_POOL_LOGICAL:
+     case VIR_STORAGE_POOL_DISK:
+Index: libvirt-7.6.0/tests/storagepoolcapsschemadata/poolcaps-fs.xml
+===================================================================
+--- libvirt-7.6.0.orig/tests/storagepoolcapsschemadata/poolcaps-fs.xml
+++ libvirt-7.6.0/tests/storagepoolcapsschemadata/poolcaps-fs.xml
+@@ -204,4 +204,11 @@
+       </enum>
+     </volOptions>
+   </pool>
+  <pool type='vitastor' supported='no'>
+    <volOptions>
+      <defaultFormat type='raw'/>
+      <enum name='targetFormatType'>
+      </enum>
+    </volOptions>
+  </pool>
+ </storagepoolCapabilities>
+Index: libvirt-7.6.0/tests/storagepoolcapsschemadata/poolcaps-full.xml
+===================================================================
+--- libvirt-7.6.0.orig/tests/storagepoolcapsschemadata/poolcaps-full.xml
+++ libvirt-7.6.0/tests/storagepoolcapsschemadata/poolcaps-full.xml
+@@ -204,4 +204,11 @@
+       </enum>
+     </volOptions>
+   </pool>
+  <pool type='vitastor' supported='yes'>
+    <volOptions>
+      <defaultFormat type='raw'/>
+      <enum name='targetFormatType'>
+      </enum>
+    </volOptions>
+  </pool>
+ </storagepoolCapabilities>
+Index: libvirt-7.6.0/tests/storagepoolxml2argvtest.c
+===================================================================
+--- libvirt-7.6.0.orig/tests/storagepoolxml2argvtest.c
+++ libvirt-7.6.0/tests/storagepoolxml2argvtest.c
+@@ -68,6 +68,7 @@ testCompareXMLToArgvFiles(bool shouldFai
+     case VIR_STORAGE_POOL_GLUSTER:
+     case VIR_STORAGE_POOL_ZFS:
+     case VIR_STORAGE_POOL_VSTORAGE:
+    case VIR_STORAGE_POOL_VITASTOR:
+     case VIR_STORAGE_POOL_LAST:
+     default:
+         VIR_TEST_DEBUG("pool type '%s' has no xml2argv test", defTypeStr);
+Index: libvirt-7.6.0/tools/virsh-pool.c
+===================================================================
+--- libvirt-7.6.0.orig/tools/virsh-pool.c
+++ libvirt-7.6.0/tools/virsh-pool.c
+@@ -1231,6 +1231,9 @@ cmdPoolList(vshControl *ctl, const vshCm
+             case VIR_STORAGE_POOL_VSTORAGE:
+                 flags |= VIR_CONNECT_LIST_STORAGE_POOLS_VSTORAGE;
+                 break;
+            case VIR_STORAGE_POOL_VITASTOR:
+                flags |= VIR_CONNECT_LIST_STORAGE_POOLS_VITASTOR;
+                break;
+             case VIR_STORAGE_POOL_LAST:
+                 break;
+             }
--- a/patches/libvirt-example.xml
+++ b/patches/libvirt-example.xml
@@ -15,9 +15,10 @@
      <target dev='vda' bus='virtio' />
      <driver name='qemu' type='raw' />
      <!-- name is Vitastor image name -->
-      <!-- config (optional) is the path to Vitastor's configuration file -->
      <!-- query (optional) is Vitastor's etcd_prefix -->
-      <source protocol='vitastor' name='debian9' query='/vitastor' config='/etc/vitastor/vitastor.conf'>
+      <source protocol='vitastor' name='debian9' query='/vitastor'>
+        <!-- config (optional) is the path to Vitastor's configuration file -->
+        <config file='/etc/vitastor/vitastor.conf' />
        <!-- hosts = etcd addresses -->
        <host name='192.168.7.2' port='2379' />
      </source>
--- a/patches/nova-23.diff
+++ b/patches/nova-23.diff
@@ -1,5 +1,5 @@
 diff --git a/nova/virt/image/model.py b/nova/virt/image/model.py
-index 971f7e9c07..70ed70d5e2 100644
+index 971f7e9c07..ec3fca72cb 100644
 --- a/nova/virt/image/model.py
 +++ b/nova/virt/image/model.py
@@ -129,3 +129,22 @@ class RBDImage(Image):
@@ -19,7 +19,7 @@ index 971f7e9c07..70ed70d5e2 100644
 +        :param etcd_prefix: etcd prefix (optional)
 +        :param config_path: path to the configuration (optional)
 +        """
-+        super(RBDImage, self).__init__(FORMAT_RAW)
+        super(VitastorImage, self).__init__(FORMAT_RAW)
 +
 +        self.name = name
 +        self.etcd_address = etcd_address
@@ -48,7 +48,7 @@ index 5358f3766a..ebe3d6effb 100644
 
     info = nova.privsep.qemu.privileged_qemu_img_info(path, format=format)
 diff --git a/nova/virt/libvirt/config.py b/nova/virt/libvirt/config.py
-index f9475776b3..51573fe41d 100644
+index f9475776b3..a2e18aab67 100644
 --- a/nova/virt/libvirt/config.py
 +++ b/nova/virt/libvirt/config.py
@@ -1060,6 +1060,8 @@ class LibvirtConfigGuestDisk(LibvirtConfigGuestDevice):
@@ -60,18 +60,19 @@ index f9475776b3..51573fe41d 100644
         self.source_name = None
         self.source_hosts = []
         self.source_ports = []
-@@ -1186,7 +1188,8 @@ class LibvirtConfigGuestDisk(LibvirtConfigGuestDevice):
-         elif self.source_type == "mount":
-             dev.append(etree.Element("source", dir=self.source_path))
-         elif self.source_type == "network" and self.source_protocol:
-            source = etree.Element("source", protocol=self.source_protocol)
-+            source = etree.Element("source", protocol=self.source_protocol,
-+                query=self.source_query, config=self.source_config)
+@@ -1189,6 +1191,10 @@ class LibvirtConfigGuestDisk(LibvirtConfigGuestDevice):
+             source = etree.Element("source", protocol=self.source_protocol)
             if self.source_name is not None:
                 source.set('name', self.source_name)
+            if self.source_query is not None:
+                source.set('query', self.source_query)
+            if self.source_config is not None:
+                source.append(etree.Element('config', file=self.source_config))
             hosts_info = zip(self.source_hosts, self.source_ports)
+             for name, port in hosts_info:
+                 host = etree.Element('host', name=name)
 diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
-index 391231c527..34dc60dcdd 100644
+index 391231c527..f38faa1608 100644
 --- a/nova/virt/libvirt/driver.py
 +++ b/nova/virt/libvirt/driver.py
@@ -179,6 +179,7 @@ VOLUME_DRIVERS = {
--- a/patches/qemu-3.1-vitastor.patch
+++ b/patches/qemu-3.1-vitastor.patch
@@ -1,7 +1,107 @@
-Index: qemu-3.1+dfsg/qapi/block-core.json
-===================================================================
--- qemu-3.1+dfsg.orig/qapi/block-core.json
-+++ qemu-3.1+dfsg/qapi/block-core.json
+diff --git a/block/Makefile.objs b/block/Makefile.objs
+index 46d585cfd0..62222f25fe 100644
+--- a/block/Makefile.objs
+++ b/block/Makefile.objs
+@@ -29,6 +29,7 @@ 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
+block-obj-$(CONFIG_VITASTOR) += vitastor.o
+ block-obj-$(CONFIG_GLUSTERFS) += gluster.o
+ block-obj-$(CONFIG_VXHS) += vxhs.o
+ block-obj-$(CONFIG_LIBSSH2) += ssh.o
+@@ -49,6 +50,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 --git a/configure b/configure
+index 1c9f6090e8..25ef89c33a 100755
+--- a/configure
+++ b/configure
+@@ -422,6 +422,7 @@ trace_backends="log"
+ trace_file="trace"
+ spice=""
+ rbd=""
+vitastor=""
+ smartcard=""
+ libusb=""
+ usb_redir=""
+@@ -1282,6 +1283,10 @@ for opt do
+   ;;
+   --enable-rbd) rbd="yes"
+   ;;
+  --disable-vitastor) vitastor="no"
+  ;;
+  --enable-vitastor) vitastor="yes"
+  ;;
+   --disable-xfsctl) xfs="no"
+   ;;
+   --enable-xfsctl) xfs="yes"
+@@ -1737,6 +1742,7 @@ disabled with --disable-FEATURE, default is enabled if available:
+   vhost-crypto    vhost-crypto acceleration support
+   spice           spice
+   rbd             rados block device (rbd)
+  vitastor        vitastor block device
+   libiscsi        iscsi support
+   libnfs          nfs support
+   smartcard       smartcard support (libcacard)
+@@ -3722,6 +3728,27 @@ EOF
+   fi
+ 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
+
+ ##########################################
+ # libssh2 probe
+ min_libssh2_version=1.2.8
+@@ -6109,6 +6136,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"
+@@ -6694,6 +6722,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 --git a/qapi/block-core.json b/qapi/block-core.json
+index d4fe710836..dbad3327b3 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2617,7 +2617,7 @@
 ##
 { 'enum': 'BlockdevDriver',
@@ -11,10 +111,11 @@ Index: qemu-3.1+dfsg/qapi/block-core.json
             'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks',
             'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow',
             'qcow2', 'qed', 'quorum', 'raw', 'rbd', 'replication', 'sheepdog',
-@@ -3367,6 +3367,28 @@
+@@ -3366,6 +3366,28 @@
+             '*snap-id': 'uint32',
             '*tag': 'str' } }
 
- ##
+##
 +# @BlockdevOptionsVitastor:
 +#
 +# Driver specific block device options for vitastor
@@ -36,11 +137,10 @@ Index: qemu-3.1+dfsg/qapi/block-core.json
 +            '*etcd-host': 'str',
 +            '*etcd-prefix': 'str' } }
 +
-+##
+ ##
 # @ReplicationMode:
 #
- # An enumeration of replication modes.
-@@ -3713,6 +3731,7 @@
+@@ -3713,6 +3735,7 @@
       'rbd':        'BlockdevOptionsRbd',
       'replication':'BlockdevOptionsReplication',
       'sheepdog':   'BlockdevOptionsSheepdog',
@@ -48,10 +148,11 @@ Index: qemu-3.1+dfsg/qapi/block-core.json
       'ssh':        'BlockdevOptionsSsh',
       'throttle':   'BlockdevOptionsThrottle',
       'vdi':        'BlockdevOptionsGenericFormat',
-@@ -4158,6 +4177,17 @@
+@@ -4157,6 +4180,17 @@
+             '*subformat':           'BlockdevVhdxSubformat',
             '*block-state-zero':    'bool' } }
 
- ##
+##
 +# @BlockdevCreateOptionsVitastor:
 +#
 +# Driver specific image creation options for Vitastor.
@@ -62,11 +163,10 @@ Index: qemu-3.1+dfsg/qapi/block-core.json
 +  'data': { 'location':         'BlockdevOptionsVitastor',
 +            'size':             'size' } }
 +
-+##
+ ##
 # @BlockdevVpcSubformat:
 #
- # @dynamic: Growing image file
-@@ -4212,6 +4242,7 @@
+@@ -4212,6 +4246,7 @@
       'qed':            'BlockdevCreateOptionsQed',
       'rbd':            'BlockdevCreateOptionsRbd',
       'sheepdog':       'BlockdevCreateOptionsSheepdog',
@@ -74,15 +174,3 @@ Index: qemu-3.1+dfsg/qapi/block-core.json
       'ssh':            'BlockdevCreateOptionsSsh',
       'vdi':            'BlockdevCreateOptionsVdi',
       'vhdx':           'BlockdevCreateOptionsVhdx',
-Index: qemu-3.1+dfsg/scripts/modules/module_block.py
-===================================================================
--- qemu-3.1+dfsg.orig/scripts/modules/module_block.py
-+++ qemu-3.1+dfsg/scripts/modules/module_block.py
-@@ -88,6 +88,7 @@ def print_bottom(fheader):
- output_file = sys.argv[1]
- with open(output_file, 'w') as fheader:
-     print_top(fheader)
-+    add_module(fheader, "vitastor", "vitastor", "vitastor")
- 
-     for filename in sys.argv[2:]:
-         if os.path.isfile(filename):
--- a/patches/qemu-4.2-vitastor.patch
+++ b/patches/qemu-4.2-vitastor.patch
@@ -1,8 +1,105 @@
-Index: qemu/qapi/block-core.json
-===================================================================
--- qemu.orig/qapi/block-core.json	2020-11-07 22:57:38.932613674 +0000
-+++ qemu.orig/qapi/block-core.json	2020-11-07 22:59:49.890722862 +0000
-@@ -2907,7 +2907,7 @@
+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)' },
@@ -11,7 +108,7 @@ Index: qemu/qapi/block-core.json
             'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
 
 ##
-@@ -3725,6 +3725,28 @@
+@@ -3712,6 +3712,28 @@
             '*tag': 'str' } }
 
 ##
@@ -40,7 +137,7 @@ Index: qemu/qapi/block-core.json
 # @ReplicationMode:
 #
 # An enumeration of replication modes.
-@@ -4084,6 +4102,7 @@
+@@ -4071,6 +4093,7 @@
       'replication': { 'type': 'BlockdevOptionsReplication',
                        'if': 'defined(CONFIG_REPLICATION)' },
       'sheepdog':   'BlockdevOptionsSheepdog',
@@ -48,7 +145,7 @@ Index: qemu/qapi/block-core.json
       'ssh':        'BlockdevOptionsSsh',
       'throttle':   'BlockdevOptionsThrottle',
       'vdi':        'BlockdevOptionsGenericFormat',
-@@ -4461,6 +4480,17 @@
+@@ -4441,6 +4464,17 @@
             '*cluster-size' :   'size' } }
 
 ##
@@ -66,7 +163,7 @@ Index: qemu/qapi/block-core.json
 # @BlockdevVmdkSubformat:
 #
 # Subformat options for VMDK images
-@@ -4722,6 +4752,7 @@
+@@ -4702,6 +4736,7 @@
       'qed':            'BlockdevCreateOptionsQed',
       'rbd':            'BlockdevCreateOptionsRbd',
       'sheepdog':       'BlockdevCreateOptionsSheepdog',
@@ -74,15 +171,3 @@ Index: qemu/qapi/block-core.json
       'ssh':            'BlockdevCreateOptionsSsh',
       'vdi':            'BlockdevCreateOptionsVdi',
       'vhdx':           'BlockdevCreateOptionsVhdx',
-Index: qemu/scripts/modules/module_block.py
-===================================================================
--- qemu.orig/scripts/modules/module_block.py	2020-11-07 22:57:38.936613739 +0000
-+++ qemu/scripts/modules/module_block.py	2020-11-07 22:59:49.890722862 +0000
-@@ -86,6 +86,7 @@ def print_bottom(fheader):
- output_file = sys.argv[1]
- with open(output_file, 'w') as fheader:
-     print_top(fheader)
-+    add_module(fheader, "vitastor", "vitastor", "vitastor")
- 
-     for filename in sys.argv[2:]:
-         if os.path.isfile(filename):
--- a/patches/qemu-5.0-vitastor.patch
+++ b/patches/qemu-5.0-vitastor.patch
@@ -1,7 +1,107 @@
-Index: qemu/qapi/block-core.json
-===================================================================
--- qemu.orig/qapi/block-core.json
-+++ qemu/qapi/block-core.json
+diff --git a/block/Makefile.objs b/block/Makefile.objs
+index 3635b6b4c1..6cdf6df6ff 100644
+--- a/block/Makefile.objs
+++ b/block/Makefile.objs
+@@ -30,6 +30,7 @@ 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
+block-obj-$(CONFIG_VITASTOR) += vitastor.o
+ block-obj-$(CONFIG_GLUSTERFS) += gluster.o
+ block-obj-$(CONFIG_VXHS) += vxhs.o
+ block-obj-$(CONFIG_LIBSSH) += ssh.o
+@@ -58,6 +59,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 --git a/configure b/configure
+index 23b5e93752..7400cb9546 100755
+--- a/configure
+++ b/configure
+@@ -438,6 +438,7 @@ trace_backends="log"
+ trace_file="trace"
+ spice=""
+ rbd=""
+vitastor=""
+ smartcard=""
+ libusb=""
+ usb_redir=""
+@@ -1355,6 +1356,10 @@ for opt do
+   ;;
+   --enable-rbd) rbd="yes"
+   ;;
+  --disable-vitastor) vitastor="no"
+  ;;
+  --enable-vitastor) vitastor="yes"
+  ;;
+   --disable-xfsctl) xfs="no"
+   ;;
+   --enable-xfsctl) xfs="yes"
+@@ -1848,6 +1853,7 @@ disabled with --disable-FEATURE, default is enabled if available:
+   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)
+@@ -4088,6 +4094,27 @@ EOF
+   fi
+ 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
+@@ -6679,6 +6706,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"
+@@ -7329,6 +7357,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 --git a/qapi/block-core.json b/qapi/block-core.json
+index 943df1926a..c4f23230a3 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2798,7 +2798,7 @@
             'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
             'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
@@ -11,10 +111,11 @@ Index: qemu/qapi/block-core.json
             'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
 
 ##
-@@ -3635,6 +3635,28 @@
+@@ -3634,6 +3634,28 @@
+             '*snap-id': 'uint32',
             '*tag': 'str' } }
 
- ##
+##
 +# @BlockdevOptionsVitastor:
 +#
 +# Driver specific block device options for vitastor
@@ -36,11 +137,10 @@ Index: qemu/qapi/block-core.json
 +            '*etcd-host': 'str',
 +            '*etcd-prefix': 'str' } }
 +
-+##
+ ##
 # @ReplicationMode:
 #
- # An enumeration of replication modes.
-@@ -3995,6 +4013,7 @@
+@@ -3995,6 +4017,7 @@
       'replication': { 'type': 'BlockdevOptionsReplication',
                        'if': 'defined(CONFIG_REPLICATION)' },
       'sheepdog':   'BlockdevOptionsSheepdog',
@@ -48,10 +148,11 @@ Index: qemu/qapi/block-core.json
       'ssh':        'BlockdevOptionsSsh',
       'throttle':   'BlockdevOptionsThrottle',
       'vdi':        'BlockdevOptionsGenericFormat',
-@@ -4365,6 +4384,17 @@
+@@ -4364,6 +4387,17 @@
+             'size':             'size',
             '*cluster-size' :   'size' } }
 
- ##
+##
 +# @BlockdevCreateOptionsVitastor:
 +#
 +# Driver specific image creation options for Vitastor.
@@ -62,11 +163,10 @@ Index: qemu/qapi/block-core.json
 +  'data': { 'location':         'BlockdevOptionsVitastor',
 +            'size':             'size' } }
 +
-+##
+ ##
 # @BlockdevVmdkSubformat:
 #
- # Subformat options for VMDK images
-@@ -4626,6 +4656,7 @@
+@@ -4626,6 +4660,7 @@
       'qed':            'BlockdevCreateOptionsQed',
       'rbd':            'BlockdevCreateOptionsRbd',
       'sheepdog':       'BlockdevCreateOptionsSheepdog',
@@ -74,15 +174,3 @@ Index: qemu/qapi/block-core.json
       'ssh':            'BlockdevCreateOptionsSsh',
       'vdi':            'BlockdevCreateOptionsVdi',
       'vhdx':           'BlockdevCreateOptionsVhdx',
-Index: qemu/scripts/modules/module_block.py
-===================================================================
--- qemu.orig/scripts/modules/module_block.py
-+++ qemu/scripts/modules/module_block.py
-@@ -85,6 +85,7 @@ def print_bottom(fheader):
- output_file = sys.argv[1]
- with open(output_file, 'w') as fheader:
-     print_top(fheader)
-+    add_module(fheader, "vitastor", "vitastor", "vitastor")
- 
-     for filename in sys.argv[2:]:
-         if os.path.isfile(filename):
--- a/patches/qemu-5.1-vitastor.patch
+++ b/patches/qemu-5.1-vitastor.patch
@@ -1,8 +1,8 @@
-Index: qemu-5.1+dfsg/qapi/block-core.json
+Index: qemu-5.2+dfsg/qapi/block-core.json
 ===================================================================
--- qemu-5.1+dfsg.orig/qapi/block-core.json
-+++ qemu-5.1+dfsg/qapi/block-core.json
-@@ -2807,7 +2807,7 @@
+--- qemu-5.2+dfsg.orig/qapi/block-core.json
+++ qemu-5.2+dfsg/qapi/block-core.json
+@@ -2831,7 +2831,7 @@
             'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
             'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
             { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
@@ -11,7 +11,7 @@ Index: qemu-5.1+dfsg/qapi/block-core.json
             'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
 
 ##
-@@ -3644,6 +3644,28 @@
+@@ -3668,6 +3668,28 @@
             '*tag': 'str' } }
 
 ##
@@ -40,7 +40,7 @@ Index: qemu-5.1+dfsg/qapi/block-core.json
 # @ReplicationMode:
 #
 # An enumeration of replication modes.
-@@ -3988,6 +4006,7 @@
+@@ -4015,6 +4037,7 @@
       'replication': { 'type': 'BlockdevOptionsReplication',
                        'if': 'defined(CONFIG_REPLICATION)' },
       'sheepdog':   'BlockdevOptionsSheepdog',
@@ -48,7 +48,7 @@ Index: qemu-5.1+dfsg/qapi/block-core.json
       'ssh':        'BlockdevOptionsSsh',
       'throttle':   'BlockdevOptionsThrottle',
       'vdi':        'BlockdevOptionsGenericFormat',
-@@ -4376,6 +4395,17 @@
+@@ -4404,6 +4427,17 @@
             '*cluster-size' :   'size' } }
 
 ##
@@ -66,7 +66,7 @@ Index: qemu-5.1+dfsg/qapi/block-core.json
 # @BlockdevVmdkSubformat:
 #
 # Subformat options for VMDK images
-@@ -4637,6 +4667,7 @@
+@@ -4665,6 +4699,7 @@
       'qed':            'BlockdevCreateOptionsQed',
       'rbd':            'BlockdevCreateOptionsRbd',
       'sheepdog':       'BlockdevCreateOptionsSheepdog',
@@ -74,15 +74,108 @@ Index: qemu-5.1+dfsg/qapi/block-core.json
       'ssh':            'BlockdevCreateOptionsSsh',
       'vdi':            'BlockdevCreateOptionsVdi',
       'vhdx':           'BlockdevCreateOptionsVhdx',
-Index: qemu-5.1+dfsg/scripts/modules/module_block.py
+Index: qemu-5.2+dfsg/block/meson.build
 ===================================================================
--- qemu-5.1+dfsg.orig/scripts/modules/module_block.py
-+++ qemu-5.1+dfsg/scripts/modules/module_block.py
-@@ -86,6 +86,7 @@ if __name__ == '__main__':
-     output_file = sys.argv[1]
-     with open(output_file, 'w') as fheader:
-         print_top(fheader)
-+        add_module(fheader, "vitastor", "vitastor", "vitastor")
+--- qemu-5.2+dfsg.orig/block/meson.build
+++ qemu-5.2+dfsg/block/meson.build
+@@ -76,6 +76,7 @@ foreach m : [
+   ['CONFIG_LIBNFS', 'nfs', libnfs, 'nfs.c'],
+   ['CONFIG_LIBSSH', 'ssh', libssh, 'ssh.c'],
+   ['CONFIG_RBD', 'rbd', rbd, 'rbd.c'],
+  ['CONFIG_VITASTOR', 'vitastor', vitastor, 'vitastor.c'],
+ ]
+   if config_host.has_key(m[0])
+     if enable_modules
+Index: qemu-5.2+dfsg/configure
+===================================================================
+--- qemu-5.2+dfsg.orig/configure
+++ qemu-5.2+dfsg/configure
+@@ -372,6 +372,7 @@ trace_backends="log"
+ trace_file="trace"
+ spice=""
+ rbd=""
+vitastor=""
+ smartcard=""
+ u2f="auto"
+ libusb=""
+@@ -1263,6 +1264,10 @@ for opt do
+   ;;
+   --enable-rbd) rbd="yes"
+   ;;
+  --disable-vitastor) vitastor="no"
+  ;;
+  --enable-vitastor) vitastor="yes"
+  ;;
+   --disable-xfsctl) xfs="no"
+   ;;
+   --enable-xfsctl) xfs="yes"
+@@ -1827,6 +1832,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)
+@@ -3719,6 +3725,27 @@ EOF
+ fi
 
-         for filename in sys.argv[2:]:
-             if os.path.isfile(filename):
+ ##########################################
+# 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
+@@ -6456,6 +6483,10 @@ if test "$rbd" = "yes" ; then
+   echo "CONFIG_RBD=y" >> $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: qemu-5.2+dfsg/meson.build
+===================================================================
+--- qemu-5.2+dfsg.orig/meson.build
+++ qemu-5.2+dfsg/meson.build
+@@ -596,6 +596,10 @@ rbd = not_found
+ if 'CONFIG_RBD' in config_host
+   rbd = declare_dependency(link_args: config_host['RBD_LIBS'].split())
+ endif
+vitastor = not_found
+if 'CONFIG_VITASTOR' in config_host
+  vitastor = declare_dependency(link_args: config_host['VITASTOR_LIBS'].split())
+endif
+ glusterfs = not_found
+ if 'CONFIG_GLUSTERFS' in config_host
+   glusterfs = declare_dependency(compile_args: config_host['GLUSTERFS_CFLAGS'].split(),
+@@ -2145,6 +2149,7 @@ endif
+ # TODO: add back protocol and server version
+ summary_info += {'spice support':     config_host.has_key('CONFIG_SPICE')}
+ summary_info += {'rbd support':       config_host.has_key('CONFIG_RBD')}
+summary_info += {'vitastor support':  config_host.has_key('CONFIG_VITASTOR')}
+ summary_info += {'xfsctl support':    config_host.has_key('CONFIG_XFS')}
+ summary_info += {'smartcard support': config_host.has_key('CONFIG_SMARTCARD')}
+ summary_info += {'U2F support':       u2f.found()}
--- a/patches/qemu-6.0-vitastor.patch
+++ b/patches/qemu-6.0-vitastor.patch
@@ -0,0 +1,188 @@
+diff --git a/block/meson.build b/block/meson.build
+index d21990ec95..385ac37732 100644
+--- a/block/meson.build
+++ b/block/meson.build
+@@ -78,6 +78,7 @@ foreach m : [
+   [libnfs, 'nfs', libnfs, 'nfs.c'],
+   [libssh, 'ssh', libssh, 'ssh.c'],
+   [rbd, 'rbd', rbd, 'rbd.c'],
+  [vitastor, 'vitastor', vitastor, 'vitastor.c'],
+ ]
+   if m[0].found()
+     if enable_modules
+diff --git a/configure b/configure
+index c77f7b1020..5f534e8484 100755
+--- a/configure
+++ b/configure
+@@ -389,6 +389,7 @@ trace_backends="log"
+ trace_file="trace"
+ spice="$default_feature"
+ rbd="auto"
+vitastor="auto"
+ smartcard="$default_feature"
+ u2f="auto"
+ libusb="$default_feature"
+@@ -1280,6 +1281,10 @@ for opt do
+   ;;
+   --enable-rbd) rbd="enabled"
+   ;;
+  --disable-vitastor) vitastor="disabled"
+  ;;
+  --enable-vitastor) vitastor="enabled"
+  ;;
+   --disable-xfsctl) xfs="no"
+   ;;
+   --enable-xfsctl) xfs="yes"
+@@ -1867,6 +1872,7 @@ disabled with --disable-FEATURE, default is enabled if available
+   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)
+@@ -6423,7 +6429,7 @@ NINJA=$ninja $meson setup \
+         -Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt -Dbrlapi=$brlapi \
+         -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \
+         -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
+-        -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \
+        -Drbd=$rbd -Dvitastor=$vitastor -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse \
+         -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
+         -Dattr=$attr -Ddefault_devices=$default_devices \
+         -Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
+diff --git a/meson.build b/meson.build
+index c6f4b0cf5e..3dc7f7b463 100644
+--- a/meson.build
+++ b/meson.build
+@@ -720,6 +720,26 @@ if not get_option('rbd').auto() or have_block
+   endif
+ endif
+ 
+vitastor = not_found
+if not get_option('vitastor').auto() or have_block
+  libvitastor_client = cc.find_library('vitastor_client', has_headers: ['vitastor_c.h'],
+    required: get_option('vitastor'), kwargs: static_kwargs)
+  if libvitastor_client.found()
+    if cc.links('''
+      #include <vitastor_c.h>
+      int main(void) {
+        vitastor_c_create_qemu(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        return 0;
+      }''', dependencies: libvitastor_client)
+      vitastor = declare_dependency(dependencies: libvitastor_client)
+    elif get_option('vitastor').enabled()
+      error('could not link libvitastor_client')
+    else
+      warning('could not link libvitastor_client, disabling')
+    endif
+  endif
+endif
+
+ glusterfs = not_found
+ glusterfs_ftruncate_has_stat = false
+ glusterfs_iocb_has_stat = false
+@@ -1118,6 +1138,7 @@ config_host_data.set('CONFIG_LIBCAP_NG', libcap_ng.found())
+ config_host_data.set('CONFIG_LIBISCSI', libiscsi.found())
+ config_host_data.set('CONFIG_LIBNFS', libnfs.found())
+ config_host_data.set('CONFIG_RBD', rbd.found())
+config_host_data.set('CONFIG_VITASTOR', vitastor.found())
+ config_host_data.set('CONFIG_SDL', sdl.found())
+ config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
+ config_host_data.set('CONFIG_SECCOMP', seccomp.found())
+@@ -2683,6 +2704,7 @@ summary_info += {'libcap-ng support': libcap_ng.found()}
+ # TODO: add back protocol and server version
+ summary_info += {'spice support':     config_host.has_key('CONFIG_SPICE')}
+ summary_info += {'rbd support':       rbd.found()}
+summary_info += {'vitastor support':  vitastor.found()}
+ summary_info += {'xfsctl support':    config_host.has_key('CONFIG_XFS')}
+ summary_info += {'smartcard support': config_host.has_key('CONFIG_SMARTCARD')}
+ summary_info += {'U2F support':       u2f.found()}
+diff --git a/meson_options.txt b/meson_options.txt
+index 9734019995..bc93963b27 100644
+--- a/meson_options.txt
+++ b/meson_options.txt
+@@ -80,6 +80,8 @@ option('lzo', type : 'feature', value : 'auto',
+        description: 'lzo compression support')
+ option('rbd', type : 'feature', value : 'auto',
+        description: 'Ceph block device driver')
+option('vitastor', type : 'feature', value : 'auto',
+       description: 'Vitastor block device driver')
+ option('gtk', type : 'feature', value : 'auto',
+        description: 'GTK+ user interface')
+ option('sdl', type : 'feature', value : 'auto',
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 6d227924d0..d14b29aa43 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -2819,7 +2819,7 @@
+             'preallocate', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
+             { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' },
+             'sheepdog',
+-            'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
+            'ssh', 'throttle', 'vdi', 'vhdx', 'vitastor', 'vmdk', 'vpc', 'vvfat' ] }
+ 
+ ##
+ # @BlockdevOptionsFile:
+@@ -3671,6 +3671,28 @@
+             '*snap-id': 'uint32',
+             '*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:
+ #
+@@ -4042,6 +4064,7 @@
+       'throttle':   'BlockdevOptionsThrottle',
+       'vdi':        'BlockdevOptionsGenericFormat',
+       'vhdx':       'BlockdevOptionsGenericFormat',
+      'vitastor':   'BlockdevOptionsVitastor',
+       'vmdk':       'BlockdevOptionsGenericCOWFormat',
+       'vpc':        'BlockdevOptionsGenericFormat',
+       'vvfat':      'BlockdevOptionsVVFAT'
+@@ -4426,6 +4449,17 @@
+             'size':             'size',
+             '*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:
+ #
+@@ -4691,6 +4725,7 @@
+       'ssh':            'BlockdevCreateOptionsSsh',
+       'vdi':            'BlockdevCreateOptionsVdi',
+       'vhdx':           'BlockdevCreateOptionsVhdx',
+      'vitastor':       'BlockdevCreateOptionsVitastor',
+       'vmdk':           'BlockdevCreateOptionsVmdk',
+       'vpc':            'BlockdevCreateOptionsVpc'
+   } }
--- a/patches/qemu-6.1-vitastor.patch
+++ b/patches/qemu-6.1-vitastor.patch
@@ -74,15 +74,115 @@ Index: qemu-6.1+dfsg/qapi/block-core.json
       'vmdk':           'BlockdevCreateOptionsVmdk',
       'vpc':            'BlockdevCreateOptionsVpc'
   } }
-Index: qemu-6.1+dfsg/scripts/modules/module_block.py
+Index: qemu-6.1+dfsg/block/meson.build
 ===================================================================
--- qemu-6.1+dfsg.orig/scripts/modules/module_block.py
-+++ qemu-6.1+dfsg/scripts/modules/module_block.py
-@@ -86,6 +86,7 @@ if __name__ == '__main__':
-     output_file = sys.argv[1]
-     with open(output_file, 'w') as fheader:
-         print_top(fheader)
-+        add_module(fheader, "vitastor", "vitastor", "vitastor")
+--- qemu-6.1+dfsg.orig/block/meson.build
+++ qemu-6.1+dfsg/block/meson.build
+@@ -78,6 +78,7 @@ foreach m : [
+   [libnfs, 'nfs', files('nfs.c')],
+   [libssh, 'ssh', files('ssh.c')],
+   [rbd, 'rbd', files('rbd.c')],
+  [vitastor, 'vitastor', files('vitastor.c')],
+ ]
+   if m[0].found()
+     module_ss = ss.source_set()
+Index: qemu-6.1+dfsg/configure
+===================================================================
+--- qemu-6.1+dfsg.orig/configure
+++ qemu-6.1+dfsg/configure
+@@ -375,6 +375,7 @@ trace_file="trace"
+ spice="$default_feature"
+ spice_protocol="auto"
+ rbd="auto"
+vitastor="auto"
+ smartcard="auto"
+ u2f="auto"
+ libusb="auto"
+@@ -1292,6 +1293,10 @@ for opt do
+   ;;
+   --enable-rbd) rbd="enabled"
+   ;;
+  --disable-vitastor) vitastor="disabled"
+  ;;
+  --enable-vitastor) vitastor="enabled"
+  ;;
+   --disable-xfsctl) xfs="no"
+   ;;
+   --enable-xfsctl) xfs="yes"
+@@ -1916,6 +1921,7 @@ disabled with --disable-FEATURE, default
+   spice           spice
+   spice-protocol  spice-protocol
+   rbd             rados block device (rbd)
+  vitastor        vitastor block device
+   libiscsi        iscsi support
+   libnfs          nfs support
+   smartcard       smartcard support (libcacard)
+@@ -5202,7 +5208,7 @@ if test "$skip_meson" = no; then
+         -Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt -Dbrlapi=$brlapi \
+         -Dcurl=$curl -Dglusterfs=$glusterfs -Dbzip2=$bzip2 -Dlibiscsi=$libiscsi \
+         -Dlibnfs=$libnfs -Diconv=$iconv -Dcurses=$curses -Dlibudev=$libudev\
+-        -Drbd=$rbd -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse -Dlibxml2=$libxml2 \
+        -Drbd=$rbd -Dvitastor=$vitastor -Dlzo=$lzo -Dsnappy=$snappy -Dlzfse=$lzfse -Dlibxml2=$libxml2 \
+         -Dlibdaxctl=$libdaxctl -Dlibpmem=$libpmem -Dlinux_io_uring=$linux_io_uring \
+         -Dgnutls=$gnutls -Dnettle=$nettle -Dgcrypt=$gcrypt -Dauth_pam=$auth_pam \
+         -Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
+Index: qemu-6.1+dfsg/meson.build
+===================================================================
+--- qemu-6.1+dfsg.orig/meson.build
+++ qemu-6.1+dfsg/meson.build
+@@ -729,6 +729,26 @@ if not get_option('rbd').auto() or have_
+   endif
+ endif
 
-         for filename in sys.argv[2:]:
-             if os.path.isfile(filename):
+vitastor = not_found
+if not get_option('vitastor').auto() or have_block
+  libvitastor_client = cc.find_library('vitastor_client', has_headers: ['vitastor_c.h'],
+    required: get_option('vitastor'), kwargs: static_kwargs)
+  if libvitastor_client.found()
+    if cc.links('''
+      #include <vitastor_c.h>
+      int main(void) {
+        vitastor_c_create_qemu(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        return 0;
+      }''', dependencies: libvitastor_client)
+      vitastor = declare_dependency(dependencies: libvitastor_client)
+    elif get_option('vitastor').enabled()
+      error('could not link libvitastor_client')
+    else
+      warning('could not link libvitastor_client, disabling')
+    endif
+  endif
+endif
+
+ glusterfs = not_found
+ glusterfs_ftruncate_has_stat = false
+ glusterfs_iocb_has_stat = false
+@@ -1264,6 +1284,7 @@ config_host_data.set('CONFIG_LIBNFS', li
+ config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found())
+ config_host_data.set('CONFIG_LIBPMEM', libpmem.found())
+ config_host_data.set('CONFIG_RBD', rbd.found())
+config_host_data.set('CONFIG_VITASTOR', vitastor.found())
+ config_host_data.set('CONFIG_SDL', sdl.found())
+ config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found())
+ config_host_data.set('CONFIG_SECCOMP', seccomp.found())
+@@ -3075,6 +3096,7 @@ summary_info += {'bpf support': libbpf.f
+ # TODO: add back protocol and server version
+ summary_info += {'spice support':     config_host.has_key('CONFIG_SPICE')}
+ summary_info += {'rbd support':       rbd.found()}
+summary_info += {'vitastor support':  vitastor.found()}
+ summary_info += {'xfsctl support':    config_host.has_key('CONFIG_XFS')}
+ summary_info += {'smartcard support': cacard.found()}
+ summary_info += {'U2F support':       u2f.found()}
+Index: qemu-6.1+dfsg/meson_options.txt
+===================================================================
+--- qemu-6.1+dfsg.orig/meson_options.txt
+++ qemu-6.1+dfsg/meson_options.txt
+@@ -102,6 +102,8 @@ option('lzo', type : 'feature', value :
+        description: 'lzo compression support')
+ option('rbd', type : 'feature', value : 'auto',
+        description: 'Ceph block device driver')
+option('vitastor', type : 'feature', value : 'auto',
+       description: 'Vitastor block device driver')
+ option('gtk', type : 'feature', value : 'auto',
+        description: 'GTK+ user interface')
+ option('sdl', type : 'feature', value : 'auto',
--- a/rpm/build-tarball.sh
+++ b/rpm/build-tarball.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Vitastor depends on QEMU and FIO headers, but QEMU and FIO don't have -devel packages
+# Vitastor depends on QEMU and/or FIO headers, but QEMU and FIO don't have -devel packages
 # So we have to copy their headers into the source tarball

 set -e
@@ -18,34 +18,11 @@ else
 fi
 cd ~/rpmbuild/SPECS
 rpmbuild -bp fio.spec
-perl -i -pe 's/^make V=1/exit 0; make V=1/' qemu*.spec
-rpmbuild -bc qemu*.spec
-perl -i -pe 's/^exit 0; make V=1/make V=1/' qemu*.spec
-cd ~/rpmbuild/BUILD/qemu*/
-rm -rf $VITASTOR/qemu $VITASTOR/fio
-mkdir -p $VITASTOR/qemu/b/qemu
-make -j8 config-host.h
-cp config-host.h $VITASTOR/qemu/b/qemu
-cp -r include $VITASTOR/qemu
-if [ -f qapi-schema.json ]; then
-    # QEMU 2.0
-    make qapi-types.h
-    cp qapi-types.h $VITASTOR/qemu/b/qemu
-else
-    # QEMU 3.0+
-    make qapi
-    cp -r qapi $VITASTOR/qemu/b/qemu
-fi
 cd $VITASTOR
-sh copy-qemu-includes.sh
-rm -rf qemu
-mv qemu-copy qemu
 ln -s ~/rpmbuild/BUILD/fio*/ fio
 sh copy-fio-includes.sh
 rm fio
 mv fio-copy fio
 FIO=`rpm -qi fio | perl -e 'while(<>) { /^Epoch[\s:]+(\S+)/ && print "$1:"; /^Version[\s:]+(\S+)/ && print $1; /^Release[\s:]+(\S+)/ && print "-$1"; }'`
-QEMU=`rpm -qi qemu qemu-kvm | perl -e 'while(<>) { /^Epoch[\s:]+(\S+)/ && print "$1:"; /^Version[\s:]+(\S+)/ && print $1; /^Release[\s:]+(\S+)/ && print "-$1"; }'`
 perl -i -pe 's/(Requires:\s*fio)([^\n]+)?/$1 = '$FIO'/' $VITASTOR/rpm/vitastor-el$EL.spec
-perl -i -pe 's/(Requires:\s*qemu(?:-kvm)?)([^\n]+)?/$1 = '$QEMU'/' $VITASTOR/rpm/vitastor-el$EL.spec
-tar --transform 's#^#vitastor-0.6.8/#' --exclude 'rpm/*.rpm' -czf $VITASTOR/../vitastor-0.6.8$(rpm --eval '%dist').tar.gz *
+tar --transform 's#^#vitastor-0.6.9/#' --exclude 'rpm/*.rpm' -czf $VITASTOR/../vitastor-0.6.9$(rpm --eval '%dist').tar.gz *
--- a/rpm/qemu-el8.Dockerfile
+++ b/rpm/qemu-el8.Dockerfile
@@ -1,3 +1,6 @@
+# This is an attempt to automatically build patched RPM specs
+# More or less broken, better use *.spec.patch for now (and copy src/qemu_driver.c to SOURCES/qemu-vitastor.c)
+
 # Build packages for CentOS 8 inside a container
 # cd ..; podman build -t qemu-el8 -v `pwd`/packages:/root/packages -f rpm/qemu-el8.Dockerfile .

--- a/rpm/qemu-kvm-4.2-el7.spec.patch
+++ b/rpm/qemu-kvm-4.2-el7.spec.patch
@@ -1,5 +1,5 @@
 --- qemu-kvm.spec.orig	2020-11-09 23:41:03.000000000 +0000
-+++ qemu-kvm.spec	2020-12-06 10:44:24.207640963 +0000
+++ qemu-kvm.spec	2021-12-01 21:53:30.895747529 +0000
@@ -2,7 +2,7 @@
 %global SLOF_gittagcommit 899d9883
 
@@ -9,25 +9,24 @@
 %global have_opengl   1
 %global have_fdt      0
 %global have_gluster  1
-@@ -56,7 +56,7 @@ Requires: %{name}-block-curl = %{epoch}:
- Requires: %{name}-block-gluster = %{epoch}:%{version}-%{release} \
+@@ -57,6 +57,7 @@ Requires: %{name}-block-gluster = %{epoc
 %endif                                                           \
 Requires: %{name}-block-iscsi = %{epoch}:%{version}-%{release}   \
-Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
-+#Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
+ Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
+Requires: %{name}-block-vitastor = %{epoch}:%{version}-%{release}\
 Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
 
 # Macro to properly setup RHEL/RHEV conflict handling
-@@ -67,7 +67,7 @@ Obsoletes: %1-rhev
+@@ -67,7 +68,7 @@ Obsoletes: %1-rhev
 Summary: QEMU is a machine emulator and virtualizer
 Name: qemu-kvm
 Version: 4.2.0
 -Release: 29.vitastor%{?dist}.6
-+Release: 30.vitastor%{?dist}.6
+Release: 32.vitastor%{?dist}.6
 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
 Epoch: 15
 License: GPLv2 and GPLv2+ and CC-BY
-@@ -99,8 +99,8 @@ Source30: kvm-s390x.conf
+@@ -99,9 +100,10 @@ Source30: kvm-s390x.conf
 Source31: kvm-x86.conf
 Source32: qemu-pr-helper.service
 Source33: qemu-pr-helper.socket
@@ -36,9 +35,11 @@
 +#Source34: 81-kvm-rhel.rules
 +#Source35: udev-kvm-check.c
 Source36: README.tests
+Source37: qemu-vitastor.c
 
 
-@@ -825,7 +825,9 @@ Patch331: kvm-Drop-bogus-IPv6-messages.p
+ Patch0005: 0005-Initial-redhat-build.patch
+@@ -825,7 +827,9 @@ Patch331: kvm-Drop-bogus-IPv6-messages.p
 Patch333: kvm-virtiofsd-Whitelist-fchmod.patch
 # For bz#1883869 - virtiofsd core dump in KATA Container [rhel-8.2.1.z]
 Patch334: kvm-virtiofsd-avoid-proc-self-fd-tempdir.patch
@@ -49,7 +50,7 @@
 
 BuildRequires: wget
 BuildRequires: rpm-build
-@@ -842,7 +844,8 @@ BuildRequires: pciutils-devel
+@@ -842,7 +846,8 @@ BuildRequires: pciutils-devel
 BuildRequires: libiscsi-devel
 BuildRequires: ncurses-devel
 BuildRequires: libattr-devel
@@ -59,7 +60,7 @@
 %if %{have_usbredir}
 BuildRequires: usbredir-devel >= 0.7.1
 %endif
-@@ -856,12 +859,12 @@ BuildRequires: virglrenderer-devel
+@@ -856,12 +861,13 @@ BuildRequires: virglrenderer-devel
 # For smartcard NSS support
 BuildRequires: nss-devel
 %endif
@@ -70,12 +71,13 @@
 BuildRequires: libssh-devel
 -BuildRequires: librados-devel
 -BuildRequires: librbd-devel
-+#BuildRequires: librados-devel
-+#BuildRequires: librbd-devel
+BuildRequires: librados2-devel
+BuildRequires: librbd1-devel
+BuildRequires: vitastor-client-devel
 %if %{have_gluster}
 # For gluster block driver
 BuildRequires: glusterfs-api-devel
-@@ -955,25 +958,25 @@ hardware for a full system such as a PC
+@@ -955,25 +961,25 @@ hardware for a full system such as a PC
 
 %package -n qemu-kvm-core
 Summary: qemu-kvm core components
@@ -105,38 +107,35 @@
 # For compressed guest memory dumps
 Requires: lzo snappy
 %if %{have_kvm_setup}
-@@ -1085,15 +1088,15 @@ This package provides the additional iSC
- Install this package if you want to access iSCSI volumes.
- 
- 
-%package  block-rbd
-Summary: QEMU Ceph/RBD block driver
-Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-
-%description block-rbd
-This package provides the additional Ceph/RBD block driver for QEMU.
-
-Install this package if you want to access remote Ceph volumes
-using the rbd protocol.
-+#%package  block-rbd
-+#Summary: QEMU Ceph/RBD block driver
-+#Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
-+#
-+#%description block-rbd
-+#This package provides the additional Ceph/RBD block driver for QEMU.
-+#
-+#Install this package if you want to access remote Ceph volumes
-+#using the rbd protocol.
+@@ -1096,6 +1102,14 @@ Install this package if you want to acce
+ using the rbd protocol.
 
 
+%package  block-vitastor
+Summary: QEMU Vitastor block driver
+Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description block-vitastor
+This package provides the additional Vitastor block driver for QEMU.
+
+
 %package  block-ssh
-@@ -1117,12 +1120,14 @@ the Secure Shell (SSH) protocol.
+ Summary: QEMU SSH block driver
+ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
+@@ -1110,6 +1124,7 @@ the Secure Shell (SSH) protocol.
+ %prep
+ %setup -n qemu-%{version}
+ %autopatch -p1
+cp %{SOURCE37} ./block/vitastor.c
+ 
+ %build
+ %global buildarch %{kvm_target}-softmmu
+@@ -1117,12 +1132,13 @@ the Secure Shell (SSH) protocol.
 # --build-id option is used for giving info to the debug packages.
 buildldflags="VL_LDFLAGS=-Wl,--build-id"
 
 -%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle
-+#%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle
-+%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,blkdebug,luks,null-co,nvme,copy-on-read,throttle
+%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,vitastor,blkdebug,luks,null-co,nvme,copy-on-read,throttle
 
 %if 0%{have_gluster}
     %global block_drivers_list %{block_drivers_list},gluster
@@ -146,12 +145,20 @@
 ./configure  \
  --prefix="%{_prefix}" \
  --libdir="%{_libdir}" \
-@@ -1152,15 +1157,15 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
- %else
+@@ -1132,7 +1148,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+  --docdir="%{qemudocdir}" \
+  --libexecdir="%{_libexecdir}" \
+  --extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \
+- --extra-cflags="%{optflags}" \
+ --extra-cflags="%{optflags} -DRHEL_BDRV_CO_TRUNCATE_FLAGS" \
+  --with-pkgversion="%{name}-%{version}-%{release}" \
+  --with-confsuffix=/"%{name}" \
+  --firmwarepath=%{_prefix}/share/qemu-firmware \
+@@ -1153,14 +1169,15 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
   --disable-numa \
 %endif
-  --enable-rbd \
-+  --disable-rbd \
+   --enable-rbd \
+  --enable-vitastor \
 %if 0%{have_librdma}
   --enable-rdma \
 %else
@@ -165,7 +172,7 @@
   --enable-spice \
   --enable-smartcard \
   --enable-virglrenderer \
-@@ -1179,7 +1184,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+@@ -1179,7 +1196,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
 %else
   --disable-usb-redir \
 %endif
@@ -174,7 +181,7 @@
 %ifarch x86_64
   --enable-libpmem \
 %else
-@@ -1193,9 +1198,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+@@ -1193,9 +1210,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
 %endif
   --python=%{__python3} \
   --target-list="%{buildarch}" \
@@ -184,7 +191,7 @@
   --with-coroutine=ucontext \
   --tls-priority=NORMAL \
   --disable-bluez \
-@@ -1262,7 +1265,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+@@ -1262,7 +1277,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
   --disable-sanitizers \
   --disable-hvf \
   --disable-whpx \
@@ -193,7 +200,7 @@
   --disable-membarrier \
   --disable-vhost-crypto \
   --disable-libxml2 \
-@@ -1308,7 +1311,7 @@ make V=1 %{?_smp_mflags} $buildldflags
+@@ -1308,7 +1323,7 @@ make V=1 %{?_smp_mflags} $buildldflags
 cp -a %{kvm_target}-softmmu/qemu-system-%{kvm_target} qemu-kvm
 
 gcc %{SOURCE6} $RPM_OPT_FLAGS $RPM_LD_FLAGS -o ksmctl
@@ -202,7 +209,7 @@
 
 %install
 %define _udevdir %(pkg-config --variable=udevdir udev)
-@@ -1343,8 +1346,8 @@ mkdir -p $RPM_BUILD_ROOT%{testsdir}/test
+@@ -1343,8 +1358,8 @@ mkdir -p $RPM_BUILD_ROOT%{testsdir}/test
 mkdir -p $RPM_BUILD_ROOT%{testsdir}/tests/qemu-iotests
 mkdir -p $RPM_BUILD_ROOT%{testsdir}/scripts/qmp
 
@@ -213,7 +220,7 @@
 
 install -m 0644 scripts/dump-guest-memory.py \
                 $RPM_BUILD_ROOT%{_datadir}/%{name}
-@@ -1562,6 +1565,8 @@ rm -rf $RPM_BUILD_ROOT%{qemudocdir}/inte
+@@ -1562,6 +1577,8 @@ rm -rf $RPM_BUILD_ROOT%{qemudocdir}/inte
 # Remove spec
 rm -rf $RPM_BUILD_ROOT%{qemudocdir}/specs
 
@@ -222,7 +229,7 @@
 %check
 export DIFF=diff; make check V=1
 
-@@ -1645,8 +1650,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
+@@ -1645,8 +1662,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
 %config(noreplace) %{_sysconfdir}/sysconfig/ksm
 %{_unitdir}/ksmtuned.service
 %{_sbindir}/ksmtuned
@@ -233,7 +240,7 @@
 %ghost %{_sysconfdir}/kvm
 %config(noreplace) %{_sysconfdir}/ksmtuned.conf
 %dir %{_sysconfdir}/%{name}
-@@ -1711,8 +1716,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
+@@ -1711,8 +1728,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
 %{_libexecdir}/vhost-user-gpu
 %{_datadir}/%{name}/vhost-user/50-qemu-gpu.json
 %endif
@@ -244,14 +251,13 @@
 
 %files -n qemu-img
 %defattr(-,root,root)
-@@ -1748,8 +1753,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
- %files block-iscsi
- %{_libdir}/qemu-kvm/block-iscsi.so
- 
-%files block-rbd
-%{_libdir}/qemu-kvm/block-rbd.so
-+#%files block-rbd
-+#%{_libdir}/qemu-kvm/block-rbd.so
+@@ -1751,6 +1768,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
+ %files block-rbd
+ %{_libdir}/qemu-kvm/block-rbd.so
 
+%files block-vitastor
+%{_libdir}/qemu-kvm/block-vitastor.so
+
 %files block-ssh
 %{_libdir}/qemu-kvm/block-ssh.so
+ 
--- a/rpm/qemu-kvm-4.2-el8.spec.patch
+++ b/rpm/qemu-kvm-4.2-el8.spec.patch
@@ -0,0 +1,112 @@
+--- qemu-kvm.spec.orig	2021-12-01 22:10:58.967935539 +0000
+++ qemu-kvm.spec	2021-12-01 22:14:38.530117175 +0000
+@@ -57,6 +57,7 @@ Requires: %{name}-block-gluster = %{epoc
+ %endif                                                           \
+ Requires: %{name}-block-iscsi = %{epoch}:%{version}-%{release}   \
+ Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
+Requires: %{name}-block-vitastor = %{epoch}:%{version}-%{release}\
+ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
+ 
+ # Macro to properly setup RHEL/RHEV conflict handling
+@@ -67,7 +68,7 @@ Obsoletes: %1-rhev
+ Summary: QEMU is a machine emulator and virtualizer
+ Name: qemu-kvm
+ Version: 4.2.0
+-Release: 29%{?dist}.6
+Release: 32.vitastor%{?dist}.6
+ # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
+ Epoch: 15
+ License: GPLv2 and GPLv2+ and CC-BY
+@@ -102,6 +103,7 @@ Source33: qemu-pr-helper.socket
+ Source34: 81-kvm-rhel.rules
+ Source35: udev-kvm-check.c
+ Source36: README.tests
+Source37: qemu-vitastor.c
+ 
+ 
+ Patch0005: 0005-Initial-redhat-build.patch
+@@ -825,6 +827,7 @@ Patch331: kvm-Drop-bogus-IPv6-messages.p
+ Patch333: kvm-virtiofsd-Whitelist-fchmod.patch
+ # For bz#1883869 - virtiofsd core dump in KATA Container [rhel-8.2.1.z]
+ Patch334: kvm-virtiofsd-avoid-proc-self-fd-tempdir.patch
+Patch335: qemu-4.2-vitastor.patch
+ 
+ BuildRequires: wget
+ BuildRequires: rpm-build
+@@ -861,6 +864,7 @@ BuildRequires: libcurl-devel
+ BuildRequires: libssh-devel
+ BuildRequires: librados-devel
+ BuildRequires: librbd-devel
+BuildRequires: vitastor-client-devel
+ %if %{have_gluster}
+ # For gluster block driver
+ BuildRequires: glusterfs-api-devel
+@@ -1095,6 +1099,14 @@ Install this package if you want to acce
+ using the rbd protocol.
+ 
+ 
+%package  block-vitastor
+Summary: QEMU Vitastor block driver
+Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description block-vitastor
+This package provides the additional Vitastor block driver for QEMU.
+
+
+ %package  block-ssh
+ Summary: QEMU SSH block driver
+ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
+@@ -1109,6 +1121,7 @@ the Secure Shell (SSH) protocol.
+ %prep
+ %setup -n qemu-%{version}
+ %autopatch -p1
+cp %{SOURCE37} ./block/vitastor.c
+ 
+ %build
+ %global buildarch %{kvm_target}-softmmu
+@@ -1116,7 +1129,7 @@ the Secure Shell (SSH) protocol.
+ # --build-id option is used for giving info to the debug packages.
+ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+ 
+-%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle
+%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,vitastor,blkdebug,luks,null-co,nvme,copy-on-read,throttle
+ 
+ %if 0%{have_gluster}
+     %global block_drivers_list %{block_drivers_list},gluster
+@@ -1131,7 +1144,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+  --docdir="%{qemudocdir}" \
+  --libexecdir="%{_libexecdir}" \
+  --extra-ldflags="-Wl,--build-id -Wl,-z,relro -Wl,-z,now" \
+- --extra-cflags="%{optflags}" \
+ --extra-cflags="%{optflags} -DRHEL_BDRV_CO_TRUNCATE_FLAGS" \
+  --with-pkgversion="%{name}-%{version}-%{release}" \
+  --with-confsuffix=/"%{name}" \
+  --firmwarepath=%{_prefix}/share/qemu-firmware \
+@@ -1152,6 +1165,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+   --disable-numa \
+ %endif
+   --enable-rbd \
+  --enable-vitastor \
+ %if 0%{have_librdma}
+   --enable-rdma \
+ %else
+@@ -1192,9 +1206,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+ %endif
+   --python=%{__python3} \
+   --target-list="%{buildarch}" \
+-  --block-drv-rw-whitelist=%{block_drivers_list} \
+   --audio-drv-list= \
+-  --block-drv-ro-whitelist=vmdk,vhdx,vpc,https,ssh \
+   --with-coroutine=ucontext \
+   --tls-priority=NORMAL \
+   --disable-bluez \
+@@ -1750,6 +1762,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s
+ %files block-rbd
+ %{_libdir}/qemu-kvm/block-rbd.so
+ 
+%files block-vitastor
+%{_libdir}/qemu-kvm/block-vitastor.so
+
+ %files block-ssh
+ %{_libdir}/qemu-kvm/block-ssh.so
+ 
--- a/rpm/qemu-kvm-6.0-el8.spec.patch
+++ b/rpm/qemu-kvm-6.0-el8.spec.patch
@@ -0,0 +1,103 @@
+--- qemu-kvm_6.0.spec.orig	2021-10-22 13:22:07.000000000 +0000
+++ qemu-kvm_6.0.spec	2021-12-01 22:43:26.095508618 +0000
+@@ -67,6 +67,7 @@ Requires: %{name}-hw-usbredir = %{epoch}
+ %endif                                                           \
+ Requires: %{name}-block-iscsi = %{epoch}:%{version}-%{release}   \
+ Requires: %{name}-block-rbd = %{epoch}:%{version}-%{release}     \
+Requires: %{name}-block-vitastor = %{epoch}:%{version}-%{release}\
+ Requires: %{name}-block-ssh = %{epoch}:%{version}-%{release}
+ 
+ # Macro to properly setup RHEL/RHEV conflict handling
+@@ -77,7 +78,7 @@ Obsoletes: %1-rhev <= %{epoch}:%{version
+ Summary: QEMU is a machine emulator and virtualizer
+ Name: qemu-kvm
+ Version: 6.0.0
+-Release: 33%{?dist}
+Release: 33.vitastor%{?dist}
+ # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
+ Epoch: 15
+ License: GPLv2 and GPLv2+ and CC-BY
+@@ -112,6 +113,7 @@ Source33: qemu-pr-helper.socket
+ Source34: 81-kvm-rhel.rules
+ Source35: udev-kvm-check.c
+ Source36: README.tests
+Source37: qemu-vitastor.c
+ 
+ 
+ Patch0001: 0001-redhat-Adding-slirp-to-the-exploded-tree.patch
+@@ -342,6 +344,7 @@ Patch109: kvm-virtio-balloon-Fix-page-po
+ Patch110: kvm-virtio-net-fix-use-after-unmap-free-for-sg.patch
+ # For bz#1999141 - migration fails with: "qemu-kvm: get_pci_config_device: Bad config data: i=0x9a read: 3 device: 2 cmask: ff wmask: 0 w1cmask:0"
+ Patch111: kvm-Fix-virtio-net-pci-vectors-compat.patch
+Patch112: qemu-6.0-vitastor.patch
+ 
+ BuildRequires: wget
+ BuildRequires: rpm-build
+@@ -379,6 +382,7 @@ BuildRequires: libcurl-devel
+ BuildRequires: libssh-devel
+ BuildRequires: librados-devel
+ BuildRequires: librbd-devel
+BuildRequires: vitastor-client-devel
+ %if %{have_gluster}
+ # For gluster block driver
+ BuildRequires: glusterfs-api-devel
+@@ -625,6 +629,14 @@ Install this package if you want to acce
+ using the rbd protocol.
+ 
+ 
+%package  block-vitastor
+Summary: QEMU Vitastor block driver
+Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description block-vitastor
+This package provides the additional Vitastor block driver for QEMU.
+
+
+ %package  block-ssh
+ Summary: QEMU SSH block driver
+ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
+@@ -678,6 +690,7 @@ This package provides usbredir support.
+ rm -fr slirp
+ mkdir slirp
+ %autopatch -p1
+cp %{SOURCE37} ./block/vitastor.c
+ 
+ %global qemu_kvm_build qemu_kvm_build
+ %global qemu_kiwi_build qemu_kiwi_src/build
+@@ -701,7 +714,7 @@ mkdir -p %{qemu_kvm_build}
+ # --build-id option is used for giving info to the debug packages.
+ buildldflags="VL_LDFLAGS=-Wl,--build-id"
+ 
+-%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,blkdebug,luks,null-co,nvme,copy-on-read,throttle
+%global block_drivers_list qcow2,raw,file,host_device,nbd,iscsi,rbd,vitastor,blkdebug,luks,null-co,nvme,copy-on-read,throttle
+ 
+ %if 0%{have_gluster}
+     %global block_drivers_list %{block_drivers_list},gluster
+@@ -894,6 +907,7 @@ pushd %{qemu_kvm_build}
+ %endif
+   --enable-pie \
+   --enable-rbd \
+  --enable-vitastor \
+ %if 0%{have_librdma}
+   --enable-rdma \
+ %endif
+@@ -977,9 +991,7 @@ find ../default-configs -name "*-rh-devi
+   --firmwarepath=%{_prefix}/share/qemu-firmware \
+   --meson="%{__meson}" \
+   --target-list="%{buildarch}" \
+-  --block-drv-rw-whitelist=%{block_drivers_list} \
+   --audio-drv-list= \
+-  --block-drv-ro-whitelist=vmdk,vhdx,vpc,https,ssh \
+   --with-coroutine=ucontext \
+   --with-git=git \
+   --tls-priority=@QEMU,SYSTEM \
+@@ -1584,6 +1596,9 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.
+ %files block-rbd
+ %{_libdir}/qemu-kvm/block-rbd.so
+ 
+%files block-vitastor
+%{_libdir}/qemu-kvm/block-vitastor.so
+
+ %files block-ssh
+ %{_libdir}/qemu-kvm/block-ssh.so
+ 
--- a/rpm/qemu-kvm.spec.patch
+++ b/rpm/qemu-kvm.spec.patch
@@ -1,29 +0,0 @@
--- qemu-kvm.spec	2020-12-05 13:13:54.388623517 +0000
-+++ qemu-kvm.spec	2020-12-05 13:13:58.728696598 +0000
-@@ -67,7 +67,7 @@ Obsoletes: %1-rhev
- Summary: QEMU is a machine emulator and virtualizer
- Name: qemu-kvm
- Version: 4.2.0
-Release: 29%{?dist}.6
-+Release: 29.vitastor%{?dist}.6
- # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
- Epoch: 15
- License: GPLv2 and GPLv2+ and CC-BY
-@@ -825,6 +825,7 @@ Patch331: kvm-Drop-bogus-IPv6-messages.p
- Patch333: kvm-virtiofsd-Whitelist-fchmod.patch
- # For bz#1883869 - virtiofsd core dump in KATA Container [rhel-8.2.1.z]
- Patch334: kvm-virtiofsd-avoid-proc-self-fd-tempdir.patch
-+Patch335: qemu-4.2-vitastor.patch
- 
- BuildRequires: wget
- BuildRequires: rpm-build
-@@ -1192,9 +1193,7 @@ buildldflags="VL_LDFLAGS=-Wl,--build-id"
- %endif
-   --python=%{__python3} \
-   --target-list="%{buildarch}" \
-  --block-drv-rw-whitelist=%{block_drivers_list} \
-   --audio-drv-list= \
-  --block-drv-ro-whitelist=vmdk,vhdx,vpc,https,ssh \
-   --with-coroutine=ucontext \
-   --tls-priority=NORMAL \
-   --disable-bluez \
--- a/rpm/vitastor-el7.Dockerfile
+++ b/rpm/vitastor-el7.Dockerfile
@@ -9,15 +9,11 @@ WORKDIR /root
 RUN rm -f /etc/yum.repos.d/CentOS-Media.repo
 RUN yum -y --enablerepo=extras install centos-release-scl epel-release yum-utils rpm-build
 RUN yum -y install https://vitastor.io/rpms/centos/7/vitastor-release-1.0-1.el7.noarch.rpm
-RUN yum -y install devtoolset-9-gcc-c++ devtoolset-9-libatomic-devel gperftools-devel qemu-kvm fio rh-nodejs12 jerasure-devel gf-complete-devel
-RUN yumdownloader --disablerepo=centos-sclo-rh --source qemu-kvm
+RUN yum -y install devtoolset-9-gcc-c++ devtoolset-9-libatomic-devel gcc make cmake gperftools-devel fio rh-nodejs12 jerasure-devel gf-complete-devel rdma-core-devel
 RUN yumdownloader --disablerepo=centos-sclo-rh --source fio
-RUN rpm --nomd5 -i qemu*.src.rpm
 RUN rpm --nomd5 -i fio*.src.rpm
 RUN rm -f /etc/yum.repos.d/CentOS-Media.repo
-RUN cd ~/rpmbuild/SPECS && yum-builddep -y qemu-kvm.spec
 RUN cd ~/rpmbuild/SPECS && yum-builddep -y fio.spec
-RUN yum -y install rdma-core-devel

 ADD https://vitastor.io/rpms/liburing-el7/liburing-0.7-2.el7.src.rpm /root

@@ -38,7 +34,7 @@ ADD . /root/vitastor
 RUN set -e; \
    cd /root/vitastor/rpm; \
    sh build-tarball.sh; \
-    cp /root/vitastor-0.6.8.el7.tar.gz ~/rpmbuild/SOURCES; \
+    cp /root/vitastor-0.6.9.el7.tar.gz ~/rpmbuild/SOURCES; \
    cp vitastor-el7.spec ~/rpmbuild/SPECS/vitastor.spec; \
    cd ~/rpmbuild/SPECS/; \
    rpmbuild -ba vitastor.spec; \
--- a/rpm/vitastor-el7.spec
+++ b/rpm/vitastor-el7.spec
@@ -1,11 +1,11 @@
 Name:           vitastor
-Version:        0.6.8
+Version:        0.6.9
 Release:        1%{?dist}
 Summary:        Vitastor, a fast software-defined clustered block storage

 License:        Vitastor Network Public License 1.1
 URL:            https://vitastor.io/
-Source0:        vitastor-0.6.8.el7.tar.gz
+Source0:        vitastor-0.6.9.el7.tar.gz

 BuildRequires:  liburing-devel >= 0.6
 BuildRequires:  gperftools-devel
@@ -21,7 +21,6 @@ Requires:       vitastor-mon = %{version}-%{release}
 Requires:       vitastor-client = %{version}-%{release}
 Requires:       vitastor-client-devel = %{version}-%{release}
 Requires:       vitastor-fio = %{version}-%{release}
-Requires:       vitastor-qemu = %{version}-%{release}

 %description
 Vitastor is a small, simple and fast clustered block storage (storage for VM drives),
@@ -83,24 +82,13 @@ Requires:       fio = 3.7-1.el7
 Vitastor fio drivers for benchmarking.


-%package -n vitastor-qemu
-Summary:        Vitastor - QEMU driver
-Group:          Development/Libraries
-Requires:       vitastor-client = %{version}-%{release}
-Requires:       qemu-kvm = 2.0.0-1.el7.6
-
-
-%description -n vitastor-qemu
-Vitastor QEMU block device driver.
-
-
 %prep
 %setup -q


 %build
 . /opt/rh/devtoolset-9/enable
-%cmake . -DQEMU_PLUGINDIR=qemu-kvm
+%cmake .
 %make_build


@@ -123,7 +111,6 @@ cp -r mon %buildroot/usr/lib/vitastor
 %files -n vitastor-osd
 %_bindir/vitastor-osd
 %_bindir/vitastor-dump-journal
-/usr/lib/vitastor/make-osd.sh


 %files -n vitastor-mon
@@ -137,6 +124,7 @@ cp -r mon %buildroot/usr/lib/vitastor
 %_bindir/vita
 %_libdir/libvitastor_blk.so*
 %_libdir/libvitastor_client.so*
+/usr/lib/vitastor/make-osd.sh


 %files -n vitastor-client-devel
@@ -150,8 +138,4 @@ cp -r mon %buildroot/usr/lib/vitastor
 %_libdir/libfio_vitastor_sec.so


-%files -n vitastor-qemu
-%_libdir/qemu-kvm/block-vitastor.so
-
-
 %changelog
--- a/rpm/vitastor-el8.Dockerfile
+++ b/rpm/vitastor-el8.Dockerfile
@@ -8,14 +8,11 @@ WORKDIR /root
 RUN rm -f /etc/yum.repos.d/CentOS-Media.repo
 RUN dnf -y install centos-release-advanced-virtualization epel-release dnf-plugins-core
 RUN yum -y install https://vitastor.io/rpms/centos/8/vitastor-release-1.0-1.el8.noarch.rpm
-RUN dnf --enablerepo='centos-advanced-virtualization' -y install gcc-toolset-9 gcc-toolset-9-gcc-c++ gperftools-devel qemu-kvm fio nodejs rpm-build jerasure-devel gf-complete-devel
-RUN rm -rf /var/lib/dnf/*; dnf download --disablerepo='*' --enablerepo='vitastor' --source qemu-kvm
+RUN dnf -y install gcc-toolset-9 gcc-toolset-9-gcc-c++ gperftools-devel \
+    fio nodejs rpm-build jerasure-devel gf-complete-devel libibverbs-devel libarchive cmake
 RUN dnf download --source fio
-RUN rpm --nomd5 -i qemu*.src.rpm
 RUN rpm --nomd5 -i fio*.src.rpm
-RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec qemu-kvm.spec
-RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec fio.spec && dnf install -y cmake
-RUN yum -y install libibverbs-devel libarchive
+RUN cd ~/rpmbuild/SPECS && dnf builddep -y --enablerepo=powertools --spec fio.spec

 ADD https://vitastor.io/rpms/liburing-el7/liburing-0.7-2.el7.src.rpm /root

@@ -29,14 +26,14 @@ RUN set -e; \
    cp ~/rpmbuild/RPMS/*/liburing* /root/packages/liburing-el8/; \
    cp ~/rpmbuild/SRPMS/liburing* /root/packages/liburing-el8/

-RUN rpm -i `ls /root/packages/liburing-el7/liburing-*.x86_64.rpm | grep -v debug`
+RUN rpm -i `ls /root/packages/liburing-el8/liburing-*.x86_64.rpm | grep -v debug`

 ADD . /root/vitastor

 RUN set -e; \
    cd /root/vitastor/rpm; \
    sh build-tarball.sh; \
-    cp /root/vitastor-0.6.8.el8.tar.gz ~/rpmbuild/SOURCES; \
+    cp /root/vitastor-0.6.9.el8.tar.gz ~/rpmbuild/SOURCES; \
    cp vitastor-el8.spec ~/rpmbuild/SPECS/vitastor.spec; \
    cd ~/rpmbuild/SPECS/; \
    rpmbuild -ba vitastor.spec; \
--- a/rpm/vitastor-el8.spec
+++ b/rpm/vitastor-el8.spec
@@ -1,11 +1,11 @@
 Name:           vitastor
-Version:        0.6.8
+Version:        0.6.9
 Release:        1%{?dist}
 Summary:        Vitastor, a fast software-defined clustered block storage

 License:        Vitastor Network Public License 1.1
 URL:            https://vitastor.io/
-Source0:        vitastor-0.6.8.el8.tar.gz
+Source0:        vitastor-0.6.9.el8.tar.gz

 BuildRequires:  liburing-devel >= 0.6
 BuildRequires:  gperftools-devel
@@ -20,7 +20,6 @@ Requires:       vitastor-mon = %{version}-%{release}
 Requires:       vitastor-client = %{version}-%{release}
 Requires:       vitastor-client-devel = %{version}-%{release}
 Requires:       vitastor-fio = %{version}-%{release}
-Requires:       vitastor-qemu = %{version}-%{release}

 %description
 Vitastor is a small, simple and fast clustered block storage (storage for VM drives),
@@ -81,24 +80,13 @@ Requires:       fio = 3.7-3.el8
 Vitastor fio drivers for benchmarking.


-%package -n vitastor-qemu
-Summary:        Vitastor - QEMU driver
-Group:          Development/Libraries
-Requires:       vitastor-client = %{version}-%{release}
-Requires:       qemu-kvm = 4.2.0-29.el8.6
-
-
-%description -n vitastor-qemu
-Vitastor QEMU block device driver.
-
-
 %prep
 %setup -q


 %build
 . /opt/rh/gcc-toolset-9/enable
-%cmake . -DQEMU_PLUGINDIR=qemu-kvm
+%cmake .
 %make_build


@@ -120,7 +108,6 @@ cp -r mon %buildroot/usr/lib/vitastor
 %files -n vitastor-osd
 %_bindir/vitastor-osd
 %_bindir/vitastor-dump-journal
-/usr/lib/vitastor/make-osd.sh


 %files -n vitastor-mon
@@ -134,6 +121,7 @@ cp -r mon %buildroot/usr/lib/vitastor
 %_bindir/vita
 %_libdir/libvitastor_blk.so*
 %_libdir/libvitastor_client.so*
+/usr/lib/vitastor/make-osd.sh


 %files -n vitastor-client-devel
@@ -147,8 +135,4 @@ cp -r mon %buildroot/usr/lib/vitastor
 %_libdir/libfio_vitastor_sec.so


-%files -n vitastor-qemu
-%_libdir/qemu-kvm/block-vitastor.so
-
-
 %changelog
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ project(vitastor)

 include(GNUInstallDirs)

-set(WITH_QEMU true CACHE BOOL "Build QEMU driver")
+set(WITH_QEMU false CACHE BOOL "Build QEMU driver inside Vitastor source tree")
 set(WITH_FIO true CACHE BOOL "Build FIO driver")
 set(QEMU_PLUGINDIR qemu CACHE STRING "QEMU plugin directory suffix (qemu-kvm on RHEL)")
 set(WITH_ASAN false CACHE BOOL "Build with AddressSanitizer")
@@ -15,7 +15,7 @@ if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$")
 	set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 endif()

-add_definitions(-DVERSION="0.6.8")
+add_definitions(-DVERSION="0.6.9")
 add_definitions(-Wall -Wno-sign-compare -Wno-comment -Wno-parentheses -Wno-pointer-arith -fdiagnostics-color=always -I ${CMAKE_SOURCE_DIR}/src)
 if (${WITH_ASAN})
 	add_definitions(-fsanitize=address -fno-omit-frame-pointer)
@@ -145,7 +145,7 @@ endif (${WITH_FIO})

 # vitastor-nbd
 add_executable(vitastor-nbd
-	nbd_proxy.cpp mmap_manager.cpp
+	nbd_proxy.cpp
 )
 target_link_libraries(vitastor-nbd
 	vitastor_client
@@ -171,6 +171,7 @@ if (${WITH_QEMU})
 	add_library(qemu_vitastor SHARED
 		qemu_driver.c
 	)
+	target_compile_options(qemu_vitastor PUBLIC -DVITASTOR_SOURCE_TREE)
 	target_include_directories(qemu_vitastor PUBLIC
 		../qemu/b/qemu
 		../qemu/include
@@ -188,7 +189,7 @@ endif (${WITH_QEMU})
 ### Test stubs

 # stub_osd, stub_bench, osd_test
-add_executable(stub_osd stub_osd.cpp rw_blocking.cpp mmap_manager.cpp)
+add_executable(stub_osd stub_osd.cpp rw_blocking.cpp)
 target_link_libraries(stub_osd tcmalloc_minimal)
 add_executable(stub_bench stub_bench.cpp rw_blocking.cpp)
 target_link_libraries(stub_bench tcmalloc_minimal)
--- a/src/blockstore_flush.cpp
+++ b/src/blockstore_flush.cpp
@@ -743,12 +743,15 @@ bool journal_flusher_co::scan_dirty(int wait_base)
                offset = dirty_it->second.offset;
                end_offset = dirty_it->second.offset + dirty_it->second.len;
                it = v.begin();
-                while (1)
+                while (end_offset > offset)
                {
                    for (; it != v.end(); it++)
-                        if (it->offset >= offset)
+                        if (it->offset+it->len > offset)
                            break;
-                    if (it == v.end() || it->offset > offset && it->len > 0)
+                    // If all items end before offset or if the found item starts after end_offset, just insert the buffer
+                    // If (offset < it->offset < end_offset) insert (offset..it->offset) part
+                    // If (it->offset <= offset <= it->offset+it->len) then just skip to it->offset+it->len
+                    if (it == v.end() || it->offset > offset)
                    {
                        submit_offset = dirty_it->second.location + offset - dirty_it->second.offset;
                        submit_len = it == v.end() || it->offset >= end_offset ? end_offset-offset : it->offset-offset;
@@ -772,7 +775,7 @@ bool journal_flusher_co::scan_dirty(int wait_base)
                        }
                    }
                    offset = it->offset+it->len;
-                    if (it == v.end() || offset >= end_offset)
+                    if (it == v.end())
                        break;
                }
            }
--- a/src/cli.cpp
+++ b/src/cli.cpp
@@ -103,8 +103,8 @@ void cli_tool_t::help()
        "%s snap-create [-p|--pool <id|name>] <image>@<snapshot>\n"
        "  Create a snapshot of image <name>. May be used live if only a single writer is active.\n"
        "\n"
-        "%s modify <name> [-s|--size <size>] [--readonly | --readwrite] [-f|--force]\n"
-        "  Resize image or change its readonly status. Images with children can't be made read-write.\n"
+        "%s modify <name> [--rename <new-name>] [-s|--size <size>] [--readonly | --readwrite] [-f|--force]\n"
+        "  Rename, resize image or change its readonly status. Images with children can't be made read-write.\n"
        "  If the new size is smaller than the old size, extra data will be purged.\n"
        "  You should resize file system in the image, if present, before shrinking it.\n"
        "  -f|--force  Proceed with shrinking or setting readwrite flag even if the image has children.\n"
--- a/src/cli_alloc_osd.cpp
+++ b/src/cli_alloc_osd.cpp
@@ -124,7 +124,7 @@ std::function<bool(void)> cli_tool_t::start_alloc_osd(json11::Json cfg, uint64_t
    json11::Json::array cmd = cfg["command"].array_items();
    auto alloc_osd = new alloc_osd_t();
    alloc_osd->parent = this;
-    return [alloc_osd, &out]()
+    return [alloc_osd, out]()
    {
        alloc_osd->loop();
        if (alloc_osd->is_done())
--- a/src/cli_create.cpp
+++ b/src/cli_create.cpp
@@ -49,7 +49,8 @@ struct image_creator_t
            auto & pools = parent->cli->st_cli.pool_config;
            if (pools.find(new_pool_id) == pools.end())
            {
-                new_pool_id = 0;
+                fprintf(stderr, "Pool %u does not exist\n", new_pool_id);
+                exit(1);
            }
        }
        else if (new_pool_name != "")
@@ -62,24 +63,17 @@ struct image_creator_t
                    break;
                }
            }
+            if (!new_pool_id)
+            {
+                fprintf(stderr, "Pool %s does not exist\n", new_pool_name.c_str());
+                exit(1);
+            }
        }
        else if (parent->cli->st_cli.pool_config.size() == 1)
        {
            auto it = parent->cli->st_cli.pool_config.begin();
            new_pool_id = it->first;
        }
-        if (!new_pool_id)
-        {
-            if (new_pool_name == "")
-            {
-                fprintf(stderr, "Pool name or ID is missing\n");
-            }
-            else
-            {
-                fprintf(stderr, "Pool %s does not exist\n", new_pool_name.c_str());
-            }
-            exit(1);
-        }
        state = 1;
    resume_1:
        if (new_snap == "")
@@ -94,6 +88,11 @@ struct image_creator_t
            goto resume_2;
        else if (state == 3)
            goto resume_3;
+        if (!new_pool_id)
+        {
+            fprintf(stderr, "Pool name or ID is missing\n");
+            exit(1);
+        }
        if (!size)
        {
            fprintf(stderr, "Image size is missing\n");
@@ -165,6 +164,11 @@ resume_3:
                fprintf(stderr, "Image %s does not exist\n", image_name.c_str());
                exit(1);
            }
+            if (!new_pool_id)
+            {
+                // Create snapshot in the same pool by default
+                new_pool_id = old_pool_id;
+            }
            attempt_create();
            state = 4;
 resume_4:
--- a/src/cli_modify.cpp
+++ b/src/cli_modify.cpp
@@ -5,12 +5,13 @@
 #include "cluster_client.h"
 #include "base64.h"

-// Resize image (purging extra data on shrink) or change its readonly status
+// Rename, resize image (and purge extra data on shrink) or change its readonly status
 struct image_changer_t
 {
    cli_tool_t *parent;

    std::string image_name;
+    std::string new_name;
    uint64_t new_size = 0;
    bool set_readonly = false, set_readwrite = false, force = false;
    // interval between fsyncs
@@ -18,7 +19,7 @@ struct image_changer_t

    uint64_t inode_num = 0;
    inode_config_t cfg;
-    std::string cur_cfg_key;
+    json11::Json::array checks, success;
    bool has_children = false;

    int state = 0;
@@ -43,6 +44,11 @@ struct image_changer_t
                cfg = ic.second;
                break;
            }
+            if (new_name != "" && ic.second.name == new_name)
+            {
+                fprintf(stderr, "Image %s already exists\n", new_name.c_str());
+                exit(1);
+            }
        }
        if (!inode_num)
        {
@@ -61,10 +67,10 @@ struct image_changer_t
        {
            if (cfg.size >= new_size)
            {
-                // Check confirmation if trimming an image with children
+                // Check confirmation when trimming an image with children
                if (has_children && !force)
                {
-                    fprintf(stderr, "Image %s has children. Refusing to shrink it without --force", image_name.c_str());
+                    fprintf(stderr, "Image %s has children. Refusing to shrink it without --force\n", image_name.c_str());
                    exit(1);
                }
                // Shrink the image first
@@ -91,36 +97,74 @@ resume_1:
        if (set_readwrite)
        {
            cfg.readonly = false;
-            // Check confirmation if trimming an image with children
-            if (!force)
+            // Check confirmation when making an image with children read-write
+            if (has_children && !force)
            {
-                fprintf(stderr, "Image %s has children. Refusing to make it read-write without --force", image_name.c_str());
+                fprintf(stderr, "Image %s has children. Refusing to make it read-write without --force\n", image_name.c_str());
                exit(1);
            }
        }
-        cur_cfg_key = base64_encode(parent->cli->st_cli.etcd_prefix+
-            "/config/inode/"+std::to_string(INODE_POOL(inode_num))+
-            "/"+std::to_string(INODE_NO_POOL(inode_num)));
+        if (new_name != "")
+        {
+            cfg.name = new_name;
+        }
+        {
+            std::string cur_cfg_key = base64_encode(parent->cli->st_cli.etcd_prefix+
+                "/config/inode/"+std::to_string(INODE_POOL(inode_num))+
+                "/"+std::to_string(INODE_NO_POOL(inode_num)));
+            checks.push_back(json11::Json::object {
+                { "target", "MOD" },
+                { "key", cur_cfg_key },
+                { "result", "LESS" },
+                { "mod_revision", cfg.mod_revision+1 },
+            });
+            success.push_back(json11::Json::object {
+                { "request_put", json11::Json::object {
+                    { "key", cur_cfg_key },
+                    { "value", base64_encode(json11::Json(
+                        parent->cli->st_cli.serialize_inode_cfg(&cfg)
+                    ).dump()) },
+                } }
+            });
+        }
+        if (new_name != "")
+        {
+            std::string old_idx_key = base64_encode(
+                parent->cli->st_cli.etcd_prefix+"/index/image/"+image_name
+            );
+            std::string new_idx_key = base64_encode(
+                parent->cli->st_cli.etcd_prefix+"/index/image/"+new_name
+            );
+            checks.push_back(json11::Json::object {
+                { "target", "MOD" },
+                { "key", old_idx_key },
+                { "result", "LESS" },
+                { "mod_revision", cfg.mod_revision+1 },
+            });
+            checks.push_back(json11::Json::object {
+                { "target", "VERSION" },
+                { "version", 0 },
+                { "key", new_idx_key },
+            });
+            success.push_back(json11::Json::object {
+                { "request_delete_range", json11::Json::object {
+                    { "key", old_idx_key },
+                } }
+            });
+            success.push_back(json11::Json::object {
+                { "request_put", json11::Json::object {
+                    { "key", new_idx_key },
+                    { "value", base64_encode(json11::Json(json11::Json::object{
+                        { "id", INODE_NO_POOL(inode_num) },
+                        { "pool_id", (uint64_t)INODE_POOL(inode_num) },
+                    }).dump()) },
+                } }
+            });
+        }
        parent->waiting++;
        parent->cli->st_cli.etcd_txn(json11::Json::object {
-            { "compare", json11::Json::array {
-                json11::Json::object {
-                    { "target", "MOD" },
-                    { "key", cur_cfg_key },
-                    { "result", "LESS" },
-                    { "mod_revision", cfg.mod_revision+1 },
-                },
-            } },
-            { "success", json11::Json::array {
-                json11::Json::object {
-                    { "request_put", json11::Json::object {
-                        { "key", cur_cfg_key },
-                        { "value", base64_encode(json11::Json(
-                            parent->cli->st_cli.serialize_inode_cfg(&cfg)
-                        ).dump()) },
-                    } }
-                },
-            } },
+            { "compare", checks },
+            { "success", success },
        }, ETCD_SLOW_TIMEOUT, [this](std::string err, json11::Json res)
        {
            if (err != "")
@@ -140,7 +184,7 @@ resume_1:
 resume_2:
        if (parent->waiting > 0)
            return;
-        printf("Image %s changed\n", image_name.c_str());
+        printf("Image %s modified\n", image_name.c_str());
        state = 100;
    }
 };
@@ -156,6 +200,11 @@ std::function<bool(void)> cli_tool_t::start_modify(json11::Json cfg)
        fprintf(stderr, "Image name is missing\n");
        exit(1);
    }
+    changer->new_name = cfg["rename"].string_value();
+    if (changer->new_name == changer->image_name)
+    {
+        changer->new_name = "";
+    }
    changer->new_size = cfg["size"].uint64_value();
    if (changer->new_size != 0 && (changer->new_size % 4096))
    {
--- a/src/cli_snap_rm.cpp
+++ b/src/cli_snap_rm.cpp
@@ -468,6 +468,8 @@ resume_9:
                    { "request_delete_range", json11::Json::object {
                        { "key", cur_cfg_key },
                    } },
+                },
+                json11::Json::object {
                    { "request_delete_range", json11::Json::object {
                        { "key", base64_encode(parent->cli->st_cli.etcd_prefix+"/index/image/"+cur_name) },
                    } },
--- a/src/cluster_client.cpp
+++ b/src/cluster_client.cpp
@@ -64,6 +64,7 @@ cluster_client_t::cluster_client_t(ring_loop_t *ringloop, timerfd_manager_t *tfd
    st_cli.on_change_osd_state_hook = [this](uint64_t peer_osd) { on_change_osd_state_hook(peer_osd); };
    st_cli.on_change_hook = [this](std::map<std::string, etcd_kv_t> & changes) { on_change_hook(changes); };
    st_cli.on_load_pgs_hook = [this](bool success) { on_load_pgs_hook(success); };
+    st_cli.on_reload_hook = [this]() { st_cli.load_global_config(); };

    st_cli.parse_config(config);
    st_cli.load_global_config();
--- a/src/etcd_state_client.cpp
+++ b/src/etcd_state_client.cpp
@@ -17,6 +17,11 @@ etcd_state_client_t::~etcd_state_client_t()
    }
    watches.clear();
    etcd_watches_initialised = -1;
+    if (ws_keepalive_timer >= 0)
+    {
+        tfd->clear_timer(ws_keepalive_timer);
+        ws_keepalive_timer = -1;
+    }
 #ifndef __MOCK__
    if (etcd_watch_ws)
    {
@@ -50,12 +55,13 @@ void etcd_state_client_t::etcd_txn(json11::Json txn, int timeout, std::function<

 void etcd_state_client_t::etcd_call(std::string api, json11::Json payload, int timeout, std::function<void(std::string, json11::Json)> callback)
 {
-    if (!etcd_addresses.size())
+    if (!etcd_addresses.size() && !etcd_local.size())
    {
        fprintf(stderr, "etcd_address is missing in Vitastor configuration\n");
        exit(1);
    }
-    std::string etcd_address = etcd_addresses[rand() % etcd_addresses.size()];
+    pick_next_etcd();
+    std::string etcd_address = selected_etcd_address;
    std::string etcd_api_path;
    int pos = etcd_address.find('/');
    if (pos >= 0)
@@ -70,7 +76,12 @@ void etcd_state_client_t::etcd_call(std::string api, json11::Json payload, int t
        "Content-Length: "+std::to_string(req.size())+"\r\n"
        "Connection: close\r\n"
        "\r\n"+req;
-    http_request_json(tfd, etcd_address, req, timeout, callback);
+    http_request_json(tfd, etcd_address, req, timeout, [this, cur_addr = selected_etcd_address, callback](std::string err, json11::Json data)
+    {
+        if (err != "" && cur_addr == selected_etcd_address)
+            selected_etcd_address = "";
+        callback(err, data);
+    });
 }

 void etcd_state_client_t::add_etcd_url(std::string addr)
@@ -84,9 +95,30 @@ void etcd_state_client_t::add_etcd_url(std::string addr)
            fprintf(stderr, "HTTPS is unsupported for etcd. Either use plain HTTP or setup a local proxy for etcd interaction\n");
            exit(1);
        }
-        if (addr.find('/') == std::string::npos)
+        if (!local_ips.size())
+            local_ips = getifaddr_list();
+        std::string check_addr;
+        int pos = addr.find('/');
+        int pos2 = addr.find(':');
+        if (pos2 >= 0)
+            check_addr = addr.substr(0, pos2);
+        else if (pos >= 0)
+            check_addr = addr.substr(0, pos);
+        else
+            check_addr = addr;
+        if (pos == std::string::npos)
            addr += "/v3";
-        this->etcd_addresses.push_back(addr);
+        int i;
+        for (i = 0; i < local_ips.size(); i++)
+        {
+            if (local_ips[i] == check_addr)
+            {
+                this->etcd_local.push_back(addr);
+                break;
+            }
+        }
+        if (i >= local_ips.size())
+            this->etcd_addresses.push_back(addr);
    }
 }

@@ -125,14 +157,38 @@ void etcd_state_client_t::parse_config(const json11::Json & config)
    this->log_level = config["log_level"].int64_value();
 }

+void etcd_state_client_t::pick_next_etcd()
+{
+    if (selected_etcd_address != "")
+        return;
+    if (addresses_to_try.size() == 0)
+    {
+        // Prefer local etcd, if any
+        for (int i = 0; i < etcd_local.size(); i++)
+            addresses_to_try.push_back(etcd_local[i]);
+        std::vector<int> ns;
+        for (int i = 0; i < etcd_addresses.size(); i++)
+            ns.push_back(i);
+        while (ns.size())
+        {
+            int i = rand() % ns.size();
+            addresses_to_try.push_back(etcd_addresses[ns[i]]);
+            ns.erase(ns.begin()+i, ns.begin()+i+1);
+        }
+    }
+    selected_etcd_address = addresses_to_try[0];
+    addresses_to_try.erase(addresses_to_try.begin(), addresses_to_try.begin()+1);
+}
+
 void etcd_state_client_t::start_etcd_watcher()
 {
-    if (!etcd_addresses.size())
+    if (!etcd_addresses.size() && !etcd_local.size())
    {
        fprintf(stderr, "etcd_address is missing in Vitastor configuration\n");
        exit(1);
    }
-    std::string etcd_address = etcd_addresses[rand() % etcd_addresses.size()];
+    pick_next_etcd();
+    std::string etcd_address = selected_etcd_address;
    std::string etcd_api_path;
    int pos = etcd_address.find('/');
    if (pos >= 0)
@@ -141,10 +197,18 @@ void etcd_state_client_t::start_etcd_watcher()
        etcd_address = etcd_address.substr(0, pos);
    }
    etcd_watches_initialised = 0;
-    etcd_watch_ws = open_websocket(tfd, etcd_address, etcd_api_path+"/watch", ETCD_SLOW_TIMEOUT, [this](const http_response_t *msg)
+    ws_alive = 1;
+    if (etcd_watch_ws)
+    {
+        etcd_watch_ws->close();
+        etcd_watch_ws = NULL;
+    }
+    etcd_watch_ws = open_websocket(tfd, etcd_address, etcd_api_path+"/watch", ETCD_SLOW_TIMEOUT,
+        [this, cur_addr = selected_etcd_address](const http_response_t *msg)
    {
        if (msg->body.length())
        {
+            ws_alive = 1;
            std::string json_err;
            json11::Json data = json11::Json::parse(msg->body, json_err);
            if (json_err != "")
@@ -157,9 +221,39 @@ void etcd_state_client_t::start_etcd_watcher()
                {
                    etcd_watches_initialised++;
                }
+                if (data["result"]["canceled"].bool_value())
+                {
+                    // etcd watch canceled, maybe because the revision was compacted
+                    if (data["result"]["compact_revision"].uint64_value())
+                    {
+                        // we may miss events if we proceed
+                        // so we should restart from the beginning if we can
+                        if (on_reload_hook != NULL)
+                        {
+                            fprintf(stderr, "Revisions before %lu were compacted by etcd, reloading state\n",
+                                data["result"]["compact_revision"].uint64_value());
+                            etcd_watch_ws->close();
+                            etcd_watch_ws = NULL;
+                            etcd_watch_revision = 0;
+                            on_reload_hook();
+                        }
+                        else
+                        {
+                            fprintf(stderr, "Revisions before %lu were compacted by etcd, exiting\n",
+                                data["result"]["compact_revision"].uint64_value());
+                            exit(1);
+                        }
+                    }
+                    else
+                    {
+                        fprintf(stderr, "Watch canceled by etcd, reason: %s, exiting\n", data["result"]["cancel_reason"].string_value().c_str());
+                        exit(1);
+                    }
+                }
                if (etcd_watches_initialised == 4)
                {
-                    etcd_watch_revision = data["result"]["header"]["revision"].uint64_value();
+                    etcd_watch_revision = data["result"]["header"]["revision"].uint64_value()+1;
+                    addresses_to_try.clear();
                }
                // First gather all changes into a hash to remove multiple overwrites
                std::map<std::string, etcd_kv_t> changes;
@@ -188,11 +282,15 @@ void etcd_state_client_t::start_etcd_watcher()
        }
        if (msg->eof)
        {
+            if (cur_addr == selected_etcd_address)
+            {
+                selected_etcd_address = "";
+            }
            etcd_watch_ws = NULL;
            if (etcd_watches_initialised == 0)
            {
-                // Connection not established, retry in <ETCD_SLOW_TIMEOUT>
-                tfd->set_timer(ETCD_SLOW_TIMEOUT, false, [this](int)
+                // Connection not established, retry in <ETCD_QUICK_TIMEOUT>
+                tfd->set_timer(ETCD_QUICK_TIMEOUT, false, [this](int)
                {
                    start_etcd_watcher();
                });
@@ -208,7 +306,7 @@ void etcd_state_client_t::start_etcd_watcher()
        { "create_request", json11::Json::object {
            { "key", base64_encode(etcd_prefix+"/config/") },
            { "range_end", base64_encode(etcd_prefix+"/config0") },
-            { "start_revision", etcd_watch_revision+1 },
+            { "start_revision", etcd_watch_revision },
            { "watch_id", ETCD_CONFIG_WATCH_ID },
            { "progress_notify", true },
        } }
@@ -217,7 +315,7 @@ void etcd_state_client_t::start_etcd_watcher()
        { "create_request", json11::Json::object {
            { "key", base64_encode(etcd_prefix+"/osd/state/") },
            { "range_end", base64_encode(etcd_prefix+"/osd/state0") },
-            { "start_revision", etcd_watch_revision+1 },
+            { "start_revision", etcd_watch_revision },
            { "watch_id", ETCD_OSD_STATE_WATCH_ID },
            { "progress_notify", true },
        } }
@@ -226,7 +324,7 @@ void etcd_state_client_t::start_etcd_watcher()
        { "create_request", json11::Json::object {
            { "key", base64_encode(etcd_prefix+"/pg/state/") },
            { "range_end", base64_encode(etcd_prefix+"/pg/state0") },
-            { "start_revision", etcd_watch_revision+1 },
+            { "start_revision", etcd_watch_revision },
            { "watch_id", ETCD_PG_STATE_WATCH_ID },
            { "progress_notify", true },
        } }
@@ -235,11 +333,34 @@ void etcd_state_client_t::start_etcd_watcher()
        { "create_request", json11::Json::object {
            { "key", base64_encode(etcd_prefix+"/pg/history/") },
            { "range_end", base64_encode(etcd_prefix+"/pg/history0") },
-            { "start_revision", etcd_watch_revision+1 },
+            { "start_revision", etcd_watch_revision },
            { "watch_id", ETCD_PG_HISTORY_WATCH_ID },
            { "progress_notify", true },
        } }
    }).dump());
+    if (ws_keepalive_timer < 0)
+    {
+        ws_keepalive_timer = tfd->set_timer(ETCD_KEEPALIVE_TIMEOUT, true, [this](int)
+        {
+            if (!etcd_watch_ws)
+            {
+                // Do nothing
+            }
+            else if (!ws_alive)
+            {
+                etcd_watch_ws->close();
+                etcd_watch_ws = NULL;
+                start_etcd_watcher();
+            }
+            else
+            {
+                ws_alive = 0;
+                etcd_watch_ws->post_message(WS_TEXT, json11::Json(json11::Json::object {
+                    { "progress_request", json11::Json::object { } }
+                }).dump());
+            }
+        });
+    }
 }

 void etcd_state_client_t::load_global_config()
@@ -337,7 +458,7 @@ void etcd_state_client_t::load_pgs()
        }
        if (!etcd_watch_revision)
        {
-            etcd_watch_revision = data["header"]["revision"].uint64_value();
+            etcd_watch_revision = data["header"]["revision"].uint64_value()+1;
        }
        for (auto & res: data["responses"].array_items())
        {
@@ -784,3 +905,8 @@ json11::Json::object etcd_state_client_t::serialize_inode_cfg(inode_config_t *cf
    }
    return new_cfg;
 }
+
+int etcd_state_client_t::address_count()
+{
+    return etcd_addresses.size() + etcd_local.size();
+}
--- a/src/etcd_state_client.h
+++ b/src/etcd_state_client.h
@@ -15,6 +15,7 @@
 #define MAX_ETCD_ATTEMPTS 5
 #define ETCD_SLOW_TIMEOUT 5000
 #define ETCD_QUICK_TIMEOUT 1000
+#define ETCD_KEEPALIVE_TIMEOUT 30000

 #define DEFAULT_BLOCK_SIZE 128*1024

@@ -75,12 +76,19 @@ struct websocket_t;
 struct etcd_state_client_t
 {
 protected:
+    std::vector<std::string> local_ips;
+    std::vector<std::string> etcd_addresses;
+    std::vector<std::string> etcd_local;
+    std::string selected_etcd_address;
+    std::vector<std::string> addresses_to_try;
    std::vector<inode_watch_t*> watches;
    websocket_t *etcd_watch_ws = NULL;
+    int ws_keepalive_timer = -1;
+    int ws_alive = 0;
    uint64_t bs_block_size = DEFAULT_BLOCK_SIZE;
    void add_etcd_url(std::string);
+    void pick_next_etcd();
 public:
-    std::vector<std::string> etcd_addresses;
    std::string etcd_prefix;
    int log_level = 0;
    timerfd_manager_t *tfd = NULL;
@@ -98,6 +106,7 @@ public:
    std::function<void(bool)> on_load_pgs_hook;
    std::function<void(pool_id_t, pg_num_t)> on_change_pg_history_hook;
    std::function<void(osd_num_t)> on_change_osd_state_hook;
+    std::function<void()> on_reload_hook;

    json11::Json::object serialize_inode_cfg(inode_config_t *cfg);
    etcd_kv_t parse_etcd_kv(const json11::Json & kv_json);
@@ -110,5 +119,6 @@ public:
    void parse_config(const json11::Json & config);
    inode_watch_t* watch_inode(std::string name);
    void close_watch(inode_watch_t* watch);
+    int address_count();
    ~etcd_state_client_t();
 };
--- a/src/http_client.cpp
+++ b/src/http_client.cpp
@@ -451,7 +451,11 @@ bool http_co_t::handle_read()
        }
        if (want_streaming && parsed.body.size() > 0)
        {
-            callback(&parsed);
+            if (!ended)
+            {
+                // Don't deliver additional events after close()
+                callback(&parsed);
+            }
            parsed.body = "";
        }
    }
@@ -459,7 +463,11 @@ bool http_co_t::handle_read()
    {
        while (ws_parse_frame(response, parsed.ws_msg_type, parsed.body))
        {
-            callback(&parsed);
+            if (!ended)
+            {
+                // Don't deliver additional events after close()
+                callback(&parsed);
+            }
            parsed.body = "";
        }
    }
@@ -621,8 +629,82 @@ static bool ws_parse_frame(std::string & buf, int & type, std::string & res)
    return true;
 }

-std::vector<std::string> getifaddr_list(bool include_v6)
+static bool cidr_match(const in_addr &addr, const in_addr &net, uint8_t bits)
 {
+    if (bits == 0)
+    {
+        // C99 6.5.7 (3): u32 << 32 is undefined behaviour
+        return true;
+    }
+    return !((addr.s_addr ^ net.s_addr) & htonl(0xFFFFFFFFu << (32 - bits)));
+}
+
+static bool cidr6_match(const in6_addr &address, const in6_addr &network, uint8_t bits)
+{
+    const uint32_t *a = address.s6_addr32;
+    const uint32_t *n = network.s6_addr32;
+    int bits_whole, bits_incomplete;
+    bits_whole = bits >> 5;         // number of whole u32
+    bits_incomplete = bits & 0x1F;  // number of bits in incomplete u32
+    if (bits_whole && memcmp(a, n, bits_whole << 2))
+        return false;
+    if (bits_incomplete)
+    {
+        uint32_t mask = htonl((0xFFFFFFFFu) << (32 - bits_incomplete));
+        if ((a[bits_whole] ^ n[bits_whole]) & mask)
+            return false;
+    }
+    return true;
+}
+
+struct addr_mask_t
+{
+    sa_family_t family;
+    in_addr ipv4;
+    in6_addr ipv6;
+    uint8_t bits;
+};
+
+std::vector<std::string> getifaddr_list(json11::Json mask_cfg, bool include_v6)
+{
+    std::vector<addr_mask_t> masks;
+    if (mask_cfg.is_string())
+    {
+        mask_cfg = json11::Json::array{ mask_cfg };
+    }
+    for (auto mask_json: mask_cfg.array_items())
+    {
+        std::string mask = mask_json.string_value();
+        unsigned bits = 0;
+        int p = mask.find('/');
+        if (p != std::string::npos)
+        {
+            char null_byte = 0;
+            if (sscanf(mask.c_str()+p+1, "%u%c", &bits, &null_byte) != 1 || bits > 128)
+            {
+                throw std::runtime_error((include_v6 ? "Invalid IPv4 address mask: " : "Invalid IP address mask: ") + mask);
+            }
+            mask = mask.substr(0, p);
+        }
+        in_addr ipv4;
+        in6_addr ipv6;
+        if (inet_pton(AF_INET, mask.c_str(), &ipv4) == 1)
+        {
+            if (bits > 32)
+            {
+                throw std::runtime_error((include_v6 ? "Invalid IPv4 address mask: " : "Invalid IP address mask: ") + mask);
+            }
+            masks.push_back((addr_mask_t){ .family = AF_INET, .ipv4 = ipv4, .bits = (uint8_t)bits });
+        }
+        else if (include_v6 && inet_pton(AF_INET6, mask.c_str(), &ipv6) == 1)
+        {
+            masks.push_back((addr_mask_t){ .family = AF_INET6, .ipv6 = ipv6, .bits = (uint8_t)bits });
+        }
+        else
+        {
+            throw std::runtime_error((include_v6 ? "Invalid IPv4 address mask: " : "Invalid IP address mask: ") + mask);
+        }
+    }
    std::vector<std::string> addresses;
    ifaddrs *list, *ifa;
    if (getifaddrs(&list) == -1)
@@ -641,9 +723,30 @@ std::vector<std::string> getifaddr_list(bool include_v6)
        {
            void *addr_ptr;
            if (family == AF_INET)
+            {
                addr_ptr = &((sockaddr_in *)ifa->ifa_addr)->sin_addr;
+            }
            else
+            {
                addr_ptr = &((sockaddr_in6 *)ifa->ifa_addr)->sin6_addr;
+            }
+            if (masks.size() > 0)
+            {
+                int i;
+                for (i = 0; i < masks.size(); i++)
+                {
+                    if (masks[i].family == family && (family == AF_INET
+                        ? cidr_match(*(in_addr*)addr_ptr, masks[i].ipv4, masks[i].bits)
+                        : cidr6_match(*(in6_addr*)addr_ptr, masks[i].ipv6, masks[i].bits)))
+                    {
+                        break;
+                    }
+                }
+                if (i >= masks.size())
+                {
+                    continue;
+                }
+            }
            char addr[INET6_ADDRSTRLEN];
            if (!inet_ntop(family, addr_ptr, addr, INET6_ADDRSTRLEN))
            {
--- a/src/http_client.h
+++ b/src/http_client.h
@@ -45,7 +45,7 @@ struct websocket_t

 void parse_http_headers(std::string & res, http_response_t *parsed);

-std::vector<std::string> getifaddr_list(bool include_v6 = false);
+std::vector<std::string> getifaddr_list(json11::Json mask_cfg = json11::Json(), bool include_v6 = false);

 uint64_t stoull_full(const std::string & str, int base = 10);

--- a/src/mmap_manager.cpp
+++ b/src/mmap_manager.cpp
@@ -1,82 +0,0 @@
-#include <stdexcept>
-#include <cassert>
-#include <sys/mman.h>
-#include "mmap_manager.h"
-
-mmap_manager_t::mmap_manager_t(uint64_t mmap_size)
-{
-    this->mmap_size = mmap_size;
-}
-
-mmap_manager_t::~mmap_manager_t()
-{
-    for (auto & kv: past_buffers)
-    {
-        munmap(kv.second.addr, kv.second.size);
-    }
-    if (active_buffer.addr != NULL)
-    {
-        munmap(active_buffer.addr, active_buffer.size);
-    }
-}
-
-void *mmap_manager_t::alloc(uint64_t size)
-{
-    if (!active_buffer.addr || (active_buffer.pos + size) > active_buffer.size)
-    {
-        if (active_buffer.addr)
-        {
-            if (active_buffer.freed >= active_buffer.pos)
-                munmap(active_buffer.addr, active_buffer.size);
-            else
-                past_buffers[active_buffer.addr] = active_buffer;
-            active_buffer = { 0 };
-        }
-        uint64_t new_size = size < mmap_size ? mmap_size : size;
-        void *buf = mmap(NULL, new_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-        if (!buf)
-            throw std::runtime_error(std::string("can't mmap "+std::to_string(new_size)+" bytes"));
-        active_buffer = {
-            .addr = buf,
-            .size = new_size,
-            .freed = 0,
-            .pos = 0,
-        };
-    }
-    void *res = active_buffer.addr + active_buffer.pos;
-    active_buffer.pos += size;
-    return res;
-}
-
-void mmap_manager_t::free(void *addr, uint64_t size)
-{
-    auto it = past_buffers.upper_bound(addr);
-    if (it != past_buffers.begin())
-    {
-        if (it == past_buffers.end())
-        {
-            it--;
-            if (addr < it->second.addr || addr >= it->second.addr+it->second.size)
-                it = past_buffers.end();
-        }
-        else
-            it--;
-    }
-    else
-        it = past_buffers.end();
-    if (it != past_buffers.end())
-    {
-        assert(addr >= it->second.addr && addr+size <= it->second.addr+it->second.size);
-        it->second.freed += size;
-        if (it->second.freed >= it->second.pos)
-        {
-            munmap(it->second.addr, it->second.size);
-            past_buffers.erase(it);
-        }
-    }
-    else
-    {
-        assert(addr < active_buffer.addr+active_buffer.size);
-        active_buffer.freed += size;
-    }
-}
--- a/src/mmap_manager.h
+++ b/src/mmap_manager.h
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <map>
-
-struct mmap_buffer_t
-{
-    void *addr = NULL;
-    uint64_t size = 0;
-    uint64_t freed = 0;
-    uint64_t pos = 0;
-};
-
-class mmap_manager_t
-{
-protected:
-    uint64_t mmap_size = 32*1024*1024;
-    std::map<void*, mmap_buffer_t> past_buffers;
-    mmap_buffer_t active_buffer;
-
-public:
-    mmap_manager_t(uint64_t mmap_size = 32*1024*1024);
-    ~mmap_manager_t();
-    void *alloc(uint64_t size);
-    void free(void *addr, uint64_t size);
-};
--- a/src/nbd_proxy.cpp
+++ b/src/nbd_proxy.cpp
@@ -17,8 +17,6 @@

 #include "epoll_manager.h"
 #include "cluster_client.h"
-#include "mmap_manager.h"
-#include <stdexcept>

 #ifndef MSG_ZEROCOPY
 #define MSG_ZEROCOPY 0
@@ -26,24 +24,6 @@

 const char *exe_name = NULL;

-static inline void my_uring_prep_splice(struct io_uring_sqe *sqe,
-					int fd_in, int64_t off_in,
-					int fd_out, int64_t off_out,
-					unsigned int nbytes,
-					unsigned int splice_flags)
-{
-	my_uring_prep_rw(IORING_OP_SPLICE, sqe, fd_out, NULL, nbytes, (__u64) off_out);
-	sqe->splice_off_in = (__u64) off_in;
-	sqe->splice_fd_in = fd_in;
-	sqe->splice_flags = splice_flags;
-}
-
-struct buf_to_free_t
-{
-    void *buf = NULL;
-    uint64_t unmap = 0;
-};
-
 class nbd_proxy
 {
 protected:
@@ -58,7 +38,7 @@ protected:
    ring_consumer_t consumer;

    std::vector<iovec> send_list, next_send_list;
-    std::vector<buf_to_free_t> to_free;
+    std::vector<void*> to_free;
    int nbd_fd = -1;
    void *recv_buf = NULL;
    int receive_buffer_size = 9000;
@@ -71,10 +51,6 @@ protected:
    msghdr read_msg = { 0 }, send_msg = { 0 };
    iovec read_iov = { 0 };

-    mmap_manager_t mm;
-    int pipe_fd[2];
-    int vmspliced = 0;
-
 public:
    static json11::Json::object parse_args(int narg, const char *args[])
    {
@@ -198,12 +174,6 @@ public:
                exit(1);
            }
        }
-        // Create pipe for splicing
-        if (pipe(pipe_fd) < 0)
-        {
-            fprintf(stderr, "pipe failed: %s\n", strerror(errno));
-            exit(1);
-        }
        // Create client
        ringloop = new ring_loop_t(512);
        epmgr = new epoll_manager_t(ringloop);
@@ -552,76 +522,16 @@ protected:
        {
            return;
        }
-        int i;
-        //uint64_t len = 0;
-        for (i = 0; i < send_list.size(); i++)
+        io_uring_sqe* sqe = ringloop->get_sqe();
+        if (!sqe)
        {
-            if (to_free[i].unmap)
-            {
-                break;
-            }
-            //len += send_list[i].iov_len;
-        }
-        //if (true)
-        if (i > 0)
-        {
-            /*io_uring_sqe* sqe = ringloop->get_sqe();
-            if (!sqe)
-            {
-                return;
-            }
-            ring_data_t* data = ((ring_data_t*)sqe->user_data);
-            data->callback = [this](ring_data_t *data) { handle_send(data->res); };*/
-            send_msg.msg_iov = send_list.data();
-            //send_msg.msg_iovlen = send_list.size();
-            send_msg.msg_iovlen = i;
-            //my_uring_prep_sendmsg(sqe, nbd_fd, &send_msg, MSG_ZEROCOPY);
-            int res = sendmsg(nbd_fd, &send_msg, MSG_ZEROCOPY);
-            if (res < 0)
-                res = -errno;
-            handle_send(res);
-            //int r = sendmsg(int sockfd, const struct msghdr *msg, int flags);
-        }
-        else
-        {
-            io_uring_sqe* sqe = ringloop->get_sqe();
-            if (!sqe)
-            {
-                return;
-            }
-            if (vmspliced <= 0)
-            {
-                vmspliced = vmsplice(pipe_fd[1], send_list.data(), 1, SPLICE_F_GIFT);
-                if (vmspliced < 0)
-                {
-                    throw std::runtime_error(std::string("vmsplice: ")+strerror(errno));
-                }
-            }
-            send_msg.msg_iovlen = 1;
-            ring_data_t* data = ((ring_data_t*)sqe->user_data);
-            data->callback = [this](ring_data_t *data)
-            {
-                if (data->res > 0)
-                    vmspliced -= data->res;
-                handle_send(data->res);
-            };
-            my_uring_prep_splice(sqe, pipe_fd[0], -1l, nbd_fd, -1l, vmspliced, SPLICE_F_MOVE);
-            /*int sent = res, spl = res;
-            while (spl > 0)
-            {
-                res = splice(pipe_fd[0], NULL, nbd_fd, NULL, spl, SPLICE_F_MOVE);
-                if (res < 0)
-                {
-                    if (errno != EAGAIN)
-                        throw std::runtime_error(std::string("splice: ")+strerror(errno));
-                }
-                else
-                {
-                    spl -= res;
-                }
-            }
-            handle_send(sent);*/
+            return;
        }
+        ring_data_t* data = ((ring_data_t*)sqe->user_data);
+        data->callback = [this](ring_data_t *data) { handle_send(data->res); };
+        send_msg.msg_iov = send_list.data();
+        send_msg.msg_iovlen = send_list.size();
+        my_uring_prep_sendmsg(sqe, nbd_fd, &send_msg, MSG_ZEROCOPY);
    }

    void handle_send(int result)
@@ -637,10 +547,7 @@ protected:
        {
            if (result >= send_list[to_eat].iov_len)
            {
-                if (to_free[to_eat].unmap)
-                    mm.free(to_free[to_eat].buf, to_free[to_eat].unmap);
-                else
-                    free(to_free[to_eat].buf);
+                free(to_free[to_eat]);
                result -= send_list[to_eat].iov_len;
                to_eat++;
            }
@@ -752,7 +659,6 @@ protected:
            printf("request %lx +%x %lx\n", be64toh(cur_req.from), be32toh(cur_req.len), handle);
 #endif
            void *buf = NULL;
-            nbd_reply *reply = NULL;
            cluster_op_t *op = new cluster_op_t;
            if (req_type == NBD_CMD_READ || req_type == NBD_CMD_WRITE)
            {
@@ -760,51 +666,36 @@ protected:
                op->inode = inode ? inode : watch->cfg.num;
                op->offset = be64toh(cur_req.from);
                op->len = be32toh(cur_req.len);
-                if (req_type == NBD_CMD_WRITE)
-                {
-                    buf = malloc_or_die(sizeof(nbd_reply) + op->len);
-                    reply = (nbd_reply*)buf;
-                    op->iov.push_back(buf + sizeof(nbd_reply), op->len);
-                }
-                else
-                {
-                    buf = mm.alloc(op->len);
-                    reply = (nbd_reply*)malloc_or_die(sizeof(nbd_reply));
-                    op->iov.push_back(buf, op->len);
-                }
+                buf = malloc_or_die(sizeof(nbd_reply) + op->len);
+                op->iov.push_back(buf + sizeof(nbd_reply), op->len);
            }
            else if (req_type == NBD_CMD_FLUSH)
            {
                op->opcode = OSD_OP_SYNC;
-                reply = (nbd_reply*)malloc_or_die(sizeof(nbd_reply));
+                buf = malloc_or_die(sizeof(nbd_reply));
            }
-            op->callback = [this, buf, reply, handle](cluster_op_t *op)
+            op->callback = [this, buf, handle](cluster_op_t *op)
            {
 #ifdef DEBUG
                printf("reply %lx e=%d\n", handle, op->retval);
 #endif
+                nbd_reply *reply = (nbd_reply*)buf;
                reply->magic = htobe32(NBD_REPLY_MAGIC);
                memcpy(reply->handle, &handle, 8);
                reply->error = htobe32(op->retval < 0 ? -op->retval : 0);
                auto & to_list = send_msg.msg_iovlen > 0 ? next_send_list : send_list;
-                to_list.push_back((iovec){ .iov_base = reply, .iov_len = sizeof(nbd_reply) });
-                to_free.push_back((buf_to_free_t){ .buf = reply, .unmap = 0 });
-                if (op->retval >= 0 && op->opcode == OSD_OP_READ)
-                {
-                    to_list.push_back((iovec){ .iov_base = buf, .iov_len = op->len });
-                    to_free.push_back((buf_to_free_t){ .buf = buf, .unmap = op->len });
-                }
-                else if (op->opcode == OSD_OP_READ)
-                {
-                    mm.free(buf, op->len);
-                }
+                if (op->retval < 0 || op->opcode != OSD_OP_READ)
+                    to_list.push_back({ .iov_base = buf, .iov_len = sizeof(nbd_reply) });
+                else
+                    to_list.push_back({ .iov_base = buf, .iov_len = sizeof(nbd_reply) + op->len });
+                to_free.push_back(buf);
                delete op;
                ringloop->wakeup();
            };
            if (req_type == NBD_CMD_WRITE)
            {
                cur_op = op;
-                cur_buf = buf;
+                cur_buf = buf + sizeof(nbd_reply);
                cur_left = op->len;
                read_state = CL_READ_DATA;
            }
--- a/src/osd.cpp
+++ b/src/osd.cpp
@@ -164,6 +164,26 @@ void osd_t::bind_socket()
    int enable = 1;
    setsockopt(listen_fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));

+    if (config["osd_network"].is_string() ||
+        config["osd_network"].is_array())
+    {
+        std::vector<std::string> mask;
+        if (config["osd_network"].is_string())
+            mask.push_back(config["osd_network"].string_value());
+        else
+            for (auto v: config["osd_network"].array_items())
+                mask.push_back(v.string_value());
+        auto matched_addrs = getifaddr_list(mask, false);
+        if (matched_addrs.size() > 1)
+        {
+            fprintf(stderr, "More than 1 address matches requested network(s): %s\n", json11::Json(matched_addrs).dump().c_str());
+            force_stop(1);
+        }
+        bind_address = matched_addrs[0];
+    }
+
+    // FIXME Support multiple listening sockets
+
    sockaddr_in addr;
    int r;
    if ((r = inet_pton(AF_INET, bind_address.c_str(), &addr.sin_addr)) != 1)
--- a/src/osd_cluster.cpp
+++ b/src/osd_cluster.cpp
@@ -15,7 +15,7 @@
 //   Peer connection is lost -> Reload connection data -> Try to reconnect
 void osd_t::init_cluster()
 {
-    if (!st_cli.etcd_addresses.size())
+    if (!st_cli.address_count())
    {
        if (run_primary)
        {
@@ -711,7 +711,7 @@ struct reporting_pg_t

 void osd_t::report_pg_states()
 {
-    if (etcd_reporting_pg_state || !this->pg_state_dirty.size() || !st_cli.etcd_addresses.size())
+    if (etcd_reporting_pg_state || !this->pg_state_dirty.size() || !st_cli.address_count())
    {
        return;
    }
@@ -845,10 +845,10 @@ void osd_t::report_pg_states()
            }
            for (auto & res: data["responses"].array_items())
            {
-                if (res["kvs"].array_items().size())
+                if (res["response_range"]["kvs"].array_items().size())
                {
-                    auto kv = st_cli.parse_etcd_kv(res["kvs"][0]);
-                    if (kv.key.substr(st_cli.etcd_prefix.length()+10) == st_cli.etcd_prefix+"/pg/state/")
+                    auto kv = st_cli.parse_etcd_kv(res["response_range"]["kvs"][0]);
+                    if (kv.key.substr(0, st_cli.etcd_prefix.length()+10) == st_cli.etcd_prefix+"/pg/state/")
                    {
                        pool_id_t pool_id = 0;
                        pg_num_t pg_num = 0;
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -3,9 +3,12 @@

 // QEMU block driver

+#ifdef VITASTOR_SOURCE_TREE
 #define BUILD_DSO
 #define _GNU_SOURCE
+#endif
 #include "qemu/osdep.h"
+#include "qemu/main-loop.h"
 #include "block/block_int.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
@@ -32,6 +35,7 @@

 #include "vitastor_c.h"

+#ifdef VITASTOR_SOURCE_TREE
 void qemu_module_dummy(void)
 {
 }
@@ -39,6 +43,7 @@ void qemu_module_dummy(void)
 void DSO_STAMP_FUN(void)
 {
 }
+#endif

 typedef struct VitastorClient
 {
@@ -125,6 +130,7 @@ static void vitastor_parse_filename(const char *filename, QDict *options, Error
    // The following are all key/value pairs
    while (p)
    {
+        int i;
        char *name, *value;
        name = qemu_vitastor_next_tok(p, '=', &p);
        if (!p)
@@ -132,7 +138,7 @@ static void vitastor_parse_filename(const char *filename, QDict *options, Error
            error_setg(errp, "conf option %s has no value", name);
            break;
        }
-        for (int i = 0; i < strlen(name); i++)
+        for (i = 0; i < strlen(name); i++)
            if (name[i] == '_')
                name[i] = '-';
        qemu_vitastor_unescape(name);
@@ -242,22 +248,23 @@ static int vitastor_file_open(BlockDriverState *bs, QDict *options, int flags, E
        {
            error_setg(errp, "image does not exist");
            vitastor_close(bs);
+            return -1;
        }
        if (!client->size)
        {
-            client->size = qdict_get_int(options, "size");
+            client->size = qdict_get_try_int(options, "size", 0);
        }
    }
    else
    {
        client->watch = NULL;
-        client->inode = qdict_get_int(options, "inode");
-        client->pool = qdict_get_int(options, "pool");
+        client->inode = qdict_get_try_int(options, "inode", 0);
+        client->pool = qdict_get_try_int(options, "pool", 0);
        if (client->pool)
        {
            client->inode = (client->inode & ((1l << (64-POOL_ID_BITS)) - 1)) | (client->pool << (64-POOL_ID_BITS));
        }
-        client->size = qdict_get_int(options, "size");
+        client->size = qdict_get_try_int(options, "size", 0);
    }
    if (!client->size)
    {
@@ -306,7 +313,7 @@ static int vitastor_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz)
 }
 #endif

-#if QEMU_VERSION_MAJOR >= 3
+#if QEMU_VERSION_MAJOR >= 3 || QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 12
 static int coroutine_fn vitastor_co_create_opts(
 #if QEMU_VERSION_MAJOR >= 4
    BlockDriver *drv,
@@ -339,7 +346,7 @@ static int coroutine_fn vitastor_co_truncate(BlockDriverState *bs, int64_t offse
    bool exact,
 #endif
    PreallocMode prealloc,
-#if QEMU_VERSION_MAJOR >= 5 && QEMU_VERSION_MINOR >= 1 || QEMU_VERSION_MAJOR > 5
+#if QEMU_VERSION_MAJOR >= 5 && QEMU_VERSION_MINOR >= 1 || QEMU_VERSION_MAJOR > 5 || defined RHEL_BDRV_CO_TRUNCATE_FLAGS
    BdrvRequestFlags flags,
 #endif
    Error **errp)
@@ -387,10 +394,10 @@ static int vitastor_refresh_limits(BlockDriverState *bs)
 #endif
 }

-static int64_t vitastor_get_allocated_file_size(BlockDriverState *bs)
-{
-    return 0;
-}
+//static int64_t vitastor_get_allocated_file_size(BlockDriverState *bs)
+//{
+//    return 0;
+//}

 static void vitastor_co_init_task(BlockDriverState *bs, VitastorRPC *task)
 {
@@ -461,7 +468,7 @@ static int coroutine_fn vitastor_co_pwritev(BlockDriverState *bs, uint64_t offse
    return task.ret;
 }

-#if QEMU_VERSION_MAJOR < 3
+#if !( QEMU_VERSION_MAJOR >= 3 || QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 7 )
 static int coroutine_fn vitastor_co_readv(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *iov)
 {
    return vitastor_co_preadv(bs, sector_num*BDRV_SECTOR_SIZE, nb_sectors*BDRV_SECTOR_SIZE, iov, 0);
@@ -515,6 +522,7 @@ static QEMUOptionParameter vitastor_create_opts[] = {
 };
 #endif

+#if QEMU_VERSION_MAJOR >= 4
 static const char *vitastor_strong_runtime_opts[] = {
    "inode",
    "pool",
@@ -524,6 +532,7 @@ static const char *vitastor_strong_runtime_opts[] = {

    NULL
 };
+#endif

 static BlockDriver bdrv_vitastor = {
    .format_name                    = "vitastor",
@@ -557,12 +566,16 @@ static BlockDriver bdrv_vitastor = {
    // Requires patching QAPI IDL, thus unimplemented
    //.bdrv_co_create                 = vitastor_co_create,

-#if QEMU_VERSION_MAJOR >= 3
+#if QEMU_VERSION_MAJOR >= 3 || QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 12
    // For bdrv_create(), used by qemu-img
    .bdrv_co_create_opts            = vitastor_co_create_opts,
+#endif

+#if QEMU_VERSION_MAJOR >= 3
    .bdrv_co_truncate               = vitastor_co_truncate,
+#endif

+#if QEMU_VERSION_MAJOR >= 3 || QEMU_VERSION_MAJOR == 2 && QEMU_VERSION_MINOR >= 7
    .bdrv_co_preadv                 = vitastor_co_preadv,
    .bdrv_co_pwritev                = vitastor_co_pwritev,
 #else
--- a/src/stub_osd.cpp
+++ b/src/stub_osd.cpp
@@ -37,7 +37,6 @@

 #include <stdexcept>

-#include "mmap_manager.h"
 #include "rw_blocking.h"
 #include "osd_ops.h"

@@ -116,12 +115,6 @@ int bind_stub(const char *bind_address, int bind_port)

 void run_stub(int peer_fd)
 {
-    mmap_manager_t mm;
-    int pipe_fd[2];
-    if (pipe(pipe_fd) < 0)
-    {
-        throw std::runtime_error(std::string("pipe: ") + strerror(errno));
-    }
    osd_any_op_t op;
    osd_any_reply_t reply;
    void *buf = NULL;
@@ -143,39 +136,11 @@ void run_stub(int peer_fd)
        if (op.hdr.opcode == OSD_OP_SEC_READ)
        {
            reply.hdr.retval = op.sec_rw.len;
-            //buf = malloc(op.sec_rw.len);
-            buf = mm.alloc(op.sec_rw.len);
+            buf = malloc(op.sec_rw.len);
            r = write_blocking(peer_fd, reply.buf, OSD_PACKET_SIZE);
            if (r == OSD_PACKET_SIZE)
-            {
-                size_t offset = 0;
-                while (offset < op.sec_rw.len)
-                {
-                    iovec iov = { .iov_base = buf+offset, .iov_len = op.sec_rw.len-offset };
-                    int vmspliced = vmsplice(pipe_fd[1], &iov, 1, SPLICE_F_GIFT);
-                    if (vmspliced < 0)
-                    {
-                        throw std::runtime_error(std::string("vmsplice: ")+strerror(errno));
-                    }
-                    int spliced = 0;
-                    while (spliced < vmspliced)
-                    {
-                        int r2 = splice(pipe_fd[0], NULL, peer_fd, NULL, vmspliced-spliced, SPLICE_F_MOVE);
-                        if (r2 < 0)
-                        {
-                            if (errno != EAGAIN)
-                                throw std::runtime_error(std::string("splice: ")+strerror(errno));
-                        }
-                        else
-                            spliced += r2;
-                    }
-                    offset += vmspliced;
-                }
-                r = offset;
-                //r = write_blocking(peer_fd, &buf, op.sec_rw.len);
-            }
-            mm.free(buf, op.sec_rw.len);
-            buf = NULL;
+                r = write_blocking(peer_fd, &buf, op.sec_rw.len);
+            free(buf);
            if (r < op.sec_rw.len)
                break;
        }
@@ -205,6 +170,5 @@ void run_stub(int peer_fd)
            break;
        }
    }
-    close(pipe_fd[0]);
-    close(pipe_fd[1]);
+    free(buf);
 }
--- a/src/vitastor.pc.in
+++ b/src/vitastor.pc.in
@@ -6,7 +6,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

 Name: Vitastor
 Description: Vitastor client library
-Version: 0.6.8
+Version: 0.6.9
 Libs: -L${libdir} -lvitastor_client
 Cflags: -I${includedir}
Author	SHA1	Message	Date
Vitaliy Filippov	aa1e21dd99	Release 0.6.9 New features: - Build Vitastor driver as part of QEMU - Implement renaming images in CLI (vitastor-cli modify --rename) - Add vitastor-cli alloc-osd and simple-offsets commands and use them in make-osd, thus removing the dependency on etcdctl - Make monitor remove stale deleted inode statistics from etcd automatically - Implement OSD address selection from a subnet, thus removing the need to specify OSD addresses in startup scripts explicitly Bug fixes: - Fix client failover in case of etcd shutdown or crash (make client survive etcd failures) - Stick to the last live etcd in OSD and mon to prevent random failures when one of etcds is down - Fix incorrect copying of data from journal to the data device which could lead to data corruption - Prefer local etcd IPs in OSD - Remove the total PG count restriction in optimize_change which was sometimes leading to inability to redistribute PGs over OSDs - Fix error response parsing on a failed pg state report - Fix slow linear writes with RDMA by changing default buffer settings - Fix possible 'TypeError' in openstack nova when using Vitastor cinder driver - Fix bugs in vitastor-cli create, ls, rm, modify commands Patch changes: - Add a patch for libvirt 7.6 - Add patches for QEMU 6.0 and 6.1 - Fix config file path XML location parsing in libvirt patches - Replace _ with - in QEMU options - Fix possible 'TypeError' in openstack nova when using Vitastor cinder driver - Fix possible crashes of QEMU block driver in case of incorrect options	2021-12-03 10:58:54 +03:00
Vitaliy Filippov	f4b57d487f	Remove +deb10u1 from libvirt version	2021-12-03 10:56:44 +03:00
Vitaliy Filippov	711ecd2f8e	Add a Dockerfile to build libvirt	2021-12-03 03:00:10 +03:00
Vitaliy Filippov	9fca01dc62	Add a forgotten return statement	2021-12-03 00:41:49 +03:00
Vitaliy Filippov	0bd3a94efd	Use qdict_get_try_int because qdict_get_int may segfault on a missing key	2021-12-03 00:22:17 +03:00
Vitaliy Filippov	9ffdeef93b	Install the built liburing version in el8 dockerfile	2021-12-03 00:04:18 +03:00
Vitaliy Filippov	589892d501	Fix rpm dockerfiles	2021-12-02 10:19:47 +03:00
Vitaliy Filippov	5fe3a40416	More fixes for QEMU 2.x :)	2021-12-02 02:25:50 +03:00
Vitaliy Filippov	a453db9c8e	An attempt to automatically build patched specs inside Docker is mostly broken for now	2021-12-02 01:51:48 +03:00
Vitaliy Filippov	e6498a52ca	Rename 4.2 el7 spec patch	2021-12-02 01:47:44 +03:00
Vitaliy Filippov	4bc41aed9d	Add patches for QEMU 6.0 and for 6.0 RPM spec	2021-12-02 01:47:20 +03:00
Vitaliy Filippov	4da51f9c4c	Update QEMU 3.1 patch	2021-12-02 01:29:21 +03:00
Vitaliy Filippov	c6cee6f734	Update QEMU 5.0 patch	2021-12-02 01:27:00 +03:00
Vitaliy Filippov	6fc08f5581	Update CentOS 8 QEMU 4.2 spec patch	2021-12-02 01:23:43 +03:00
Vitaliy Filippov	15957b7d13	Update QEMU 4.2 patch and CentOS 7 QEMU 4.2 spec patch	2021-12-02 01:03:19 +03:00
Vitaliy Filippov	09a3987e83	Remove vitastor-qemu from RPM specs	2021-12-01 23:42:20 +03:00
Vitaliy Filippov	cd6820c439	Update QEMU 5.1/5.2 patch to include internal vitastor driver	2021-12-01 02:08:02 +03:00
Vitaliy Filippov	dcd8f5e76c	Remove qemu shenanigans from vitastor build dockerfile	2021-12-01 02:00:14 +03:00
Vitaliy Filippov	5859f913fc	Fix client failover in case of etcd shutdown or crash	2021-12-01 00:33:02 +03:00
Vitaliy Filippov	cac6a1d8d1	Don't need to download fio in qemu dockerfile anymore	2021-11-30 22:24:48 +03:00
Vitaliy Filippov	a0c32e7de9	Update patch for libvirt 7.6	2021-11-30 10:23:51 +03:00
Vitaliy Filippov	8b37610dd0	Rename patch to Nova 23 because it's actually closer	2021-11-30 02:05:24 +03:00
Vitaliy Filippov	ae82ca3b08	Pass config path in <config file="" /> element instead of an attribute libvirt has always had config in the element for Ceph, we don't want to break it	2021-11-30 02:02:07 +03:00
Vitaliy Filippov	92362027a8	Build vitastor driver as part of the QEMU package by default Old behaviour can be restored with cmake var WITH_QEMU=true	2021-11-29 02:05:26 +03:00
Vitaliy Filippov	c4aeeda143	Fix index removal in vitastor-cli rm	2021-11-29 02:00:05 +03:00
Vitaliy Filippov	24f0f8278a	Fix modify --readwrite	2021-11-29 01:52:21 +03:00
Vitaliy Filippov	95496d0845	Implement renaming images in CLI (vitastor-cli modify --rename)	2021-11-28 22:38:57 +03:00
Vitaliy Filippov	94b1f09ef2	Create snapshots in the same pool by default	2021-11-28 21:50:42 +03:00
Vitaliy Filippov	32b1312abb	Remove stale deleted inode statistics in monitor	2021-11-28 21:02:05 +03:00
Vitaliy Filippov	d5c8fde5de	Remove kludgy $IP and $ETCD_MON parsing from make-osd.sh, suggest to use vitastor.conf	2021-11-28 18:27:05 +03:00
Vitaliy Filippov	7a0b5212fe	Exit if unable to restart watches FIXME: It's probably not OK for the client to exit in this case	2021-11-28 01:43:31 +03:00
Vitaliy Filippov	a8f5c71ae8	Use the same etcd address selection algorithm in the monitor	2021-11-28 01:19:42 +03:00
Vitaliy Filippov	ce5b6253ab	Make OSDs stick to the last successful etcd address Previously OSDs were selecting a new random etcd from the cluster on every request so they were failing randomly when part of etcds was down	2021-11-27 23:48:56 +03:00
Vitaliy Filippov	8398ad0117	Fix #36 - Fix old version data sometimes overriding new version data Reproduction case: - v3 = (offset 4kb, length 16kb) - v2 = (offset 24kb, length 16kb) - v1 = (offset 16kb, length 16kb) - At the third step it was inserting 16..24kb instead of 20..24kb	2021-11-27 01:17:45 +03:00
Vitaliy Filippov	fea451b4db	Prefer local etcd in OSD	2021-11-27 00:36:53 +03:00
Vitaliy Filippov	6e12aca53b	Remove the total PG count restriction in optimize_change which was leading to unfeasible problems sometimes	2021-11-26 23:05:37 +03:00
Vitaliy Filippov	8b007d531f	Merge pull request #33 from moly7x/fix-TypeError Fixed TypeError	2021-11-25 14:47:31 +03:00
Vitaliy Filippov	7b7f20fb89	Merge pull request #34 from mirrorll/master report pg state failed	2021-11-25 10:26:42 +03:00
Vitaliy Filippov	300d507026	Fix capture of out in alloc_osd	2021-11-25 10:20:01 +03:00
harley	6886171289	report pg state failed after report pg state failed parse response error	2021-11-25 09:34:34 +08:00
Vitaliy Filippov	43f8ea47a0	Ok, something is not allowed somewhere in C99	2021-11-24 11:28:10 +03:00
Vitaliy Filippov	6e0e172e15	Implement OSD address selection from a specified subnet	2021-11-23 21:59:26 +03:00
Vitaliy Filippov	655a2c871d	Move make-osd.sh into vitastor-client package	2021-11-21 16:33:33 +03:00
Vitaliy Filippov	879fe9b2b4	Add a patch for qemu 6.1 and replace _ with - in qemu options	2021-11-21 16:24:30 +03:00
Tân Lê	b4235b4edf	Fixed TypeError Fix `TypeError: Argument must be bytes or unicode, got 'int'` in nova-compute.	2021-11-19 13:37:47 +07:00