From 7d6bf84a3e4cac485e6f0c5aa2cf00ae91dcc0b1 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Fri, 28 Apr 2023 01:43:22 +0300 Subject: [PATCH] Add scripts/meson-buildoptions.sh to QEMU patches --- patches/qemu-6.2-vitastor.patch | 21 +++++++++++++++++++++ patches/qemu-7.0-vitastor.patch | 21 +++++++++++++++++++++ patches/qemu-7.1-vitastor.patch | 21 +++++++++++++++++++++ patches/qemu-7.2-vitastor.patch | 21 +++++++++++++++++++++ patches/qemu-8.0-vitastor.patch | 21 +++++++++++++++++++++ 5 files changed, 105 insertions(+) diff --git a/patches/qemu-6.2-vitastor.patch b/patches/qemu-6.2-vitastor.patch index effce090..eea649f2 100644 --- a/patches/qemu-6.2-vitastor.patch +++ b/patches/qemu-6.2-vitastor.patch @@ -146,3 +146,24 @@ index 1d3dd9cb48..88453405e5 100644 'vmdk': 'BlockdevCreateOptionsVmdk', 'vpc': 'BlockdevCreateOptionsVpc' } } +diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh +index 7a17ff4218..cdddbf32aa 100644 +--- a/scripts/meson-buildoptions.sh ++++ b/scripts/meson-buildoptions.sh +@@ -69,6 +69,7 @@ meson_options_help() { + printf "%s\n" ' oss OSS sound support' + printf "%s\n" ' pa PulseAudio sound support' + printf "%s\n" ' rbd Ceph block device driver' ++ printf "%s\n" ' vitastor Vitastor block device driver' + printf "%s\n" ' sdl SDL user interface' + printf "%s\n" ' sdl-image SDL Image support for icons' + printf "%s\n" ' seccomp seccomp support' +@@ -210,6 +211,8 @@ _meson_option_parse() { + --disable-pa) printf "%s" -Dpa=disabled ;; + --enable-rbd) printf "%s" -Drbd=enabled ;; + --disable-rbd) printf "%s" -Drbd=disabled ;; ++ --enable-vitastor) printf "%s" -Dvitastor=enabled ;; ++ --disable-vitastor) printf "%s" -Dvitastor=disabled ;; + --enable-sdl) printf "%s" -Dsdl=enabled ;; + --disable-sdl) printf "%s" -Dsdl=disabled ;; + --enable-sdl-image) printf "%s" -Dsdl_image=enabled ;; diff --git a/patches/qemu-7.0-vitastor.patch b/patches/qemu-7.0-vitastor.patch index 99c4febf..a092dbad 100644 --- a/patches/qemu-7.0-vitastor.patch +++ b/patches/qemu-7.0-vitastor.patch @@ -167,3 +167,24 @@ index 9850dd4444..72b1287520 100755 --enable-rdma \ --enable-seccomp \ --enable-snappy \ +diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh +index 1e26f4571e..370898d48c 100644 +--- a/scripts/meson-buildoptions.sh ++++ b/scripts/meson-buildoptions.sh +@@ -98,6 +98,7 @@ meson_options_help() { + printf "%s\n" ' qed qed image format support' + printf "%s\n" ' qga-vss build QGA VSS support (broken with MinGW)' + printf "%s\n" ' rbd Ceph block device driver' ++ printf "%s\n" ' vitastor Vitastor block device driver' + printf "%s\n" ' replication replication support' + printf "%s\n" ' sdl SDL user interface' + printf "%s\n" ' sdl-image SDL Image support for icons' +@@ -289,6 +290,8 @@ _meson_option_parse() { + --disable-qom-cast-debug) printf "%s" -Dqom_cast_debug=false ;; + --enable-rbd) printf "%s" -Drbd=enabled ;; + --disable-rbd) printf "%s" -Drbd=disabled ;; ++ --enable-vitastor) printf "%s" -Dvitastor=enabled ;; ++ --disable-vitastor) printf "%s" -Dvitastor=disabled ;; + --enable-replication) printf "%s" -Dreplication=enabled ;; + --disable-replication) printf "%s" -Dreplication=disabled ;; + --enable-rng-none) printf "%s" -Drng_none=true ;; diff --git a/patches/qemu-7.1-vitastor.patch b/patches/qemu-7.1-vitastor.patch index 72a09e8f..6e335ef4 100644 --- a/patches/qemu-7.1-vitastor.patch +++ b/patches/qemu-7.1-vitastor.patch @@ -167,3 +167,24 @@ index a7f92aff90..53dc55be2e 100755 --enable-rdma \ --enable-seccomp \ --enable-snappy \ +diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh +index 359b04e0e6..f5b85ba78c 100644 +--- a/scripts/meson-buildoptions.sh ++++ b/scripts/meson-buildoptions.sh +@@ -135,6 +135,7 @@ meson_options_help() { + printf "%s\n" ' qed qed image format support' + printf "%s\n" ' qga-vss build QGA VSS support (broken with MinGW)' + printf "%s\n" ' rbd Ceph block device driver' ++ printf "%s\n" ' vitastor Vitastor block device driver' + printf "%s\n" ' rdma Enable RDMA-based migration' + printf "%s\n" ' replication replication support' + printf "%s\n" ' sdl SDL user interface' +@@ -370,6 +371,8 @@ _meson_option_parse() { + --disable-qom-cast-debug) printf "%s" -Dqom_cast_debug=false ;; + --enable-rbd) printf "%s" -Drbd=enabled ;; + --disable-rbd) printf "%s" -Drbd=disabled ;; ++ --enable-vitastor) printf "%s" -Dvitastor=enabled ;; ++ --disable-vitastor) printf "%s" -Dvitastor=disabled ;; + --enable-rdma) printf "%s" -Drdma=enabled ;; + --disable-rdma) printf "%s" -Drdma=disabled ;; + --enable-replication) printf "%s" -Dreplication=enabled ;; diff --git a/patches/qemu-7.2-vitastor.patch b/patches/qemu-7.2-vitastor.patch index 1ccca4f0..c3ea1326 100644 --- a/patches/qemu-7.2-vitastor.patch +++ b/patches/qemu-7.2-vitastor.patch @@ -167,3 +167,24 @@ index a7f92aff90..53dc55be2e 100755 --enable-rdma \ --enable-seccomp \ --enable-snappy \ +diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh +index aa6e30ea91..c45d21c40f 100644 +--- a/scripts/meson-buildoptions.sh ++++ b/scripts/meson-buildoptions.sh +@@ -135,6 +135,7 @@ meson_options_help() { + printf "%s\n" ' qed qed image format support' + printf "%s\n" ' qga-vss build QGA VSS support (broken with MinGW)' + printf "%s\n" ' rbd Ceph block device driver' ++ printf "%s\n" ' vitastor Vitastor block device driver' + printf "%s\n" ' rdma Enable RDMA-based migration' + printf "%s\n" ' replication replication support' + printf "%s\n" ' sdl SDL user interface' +@@ -376,6 +377,8 @@ _meson_option_parse() { + --disable-qom-cast-debug) printf "%s" -Dqom_cast_debug=false ;; + --enable-rbd) printf "%s" -Drbd=enabled ;; + --disable-rbd) printf "%s" -Drbd=disabled ;; ++ --enable-vitastor) printf "%s" -Dvitastor=enabled ;; ++ --disable-vitastor) printf "%s" -Dvitastor=disabled ;; + --enable-rdma) printf "%s" -Drdma=enabled ;; + --disable-rdma) printf "%s" -Drdma=disabled ;; + --enable-replication) printf "%s" -Dreplication=enabled ;; diff --git a/patches/qemu-8.0-vitastor.patch b/patches/qemu-8.0-vitastor.patch index 78733cf1..d838cb15 100644 --- a/patches/qemu-8.0-vitastor.patch +++ b/patches/qemu-8.0-vitastor.patch @@ -167,3 +167,24 @@ index 6e8983f39c..1b0b9fcf3e 100755 --enable-rdma \ --enable-seccomp \ --enable-snappy \ +diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh +index 009fab1515..95914e6ebc 100644 +--- a/scripts/meson-buildoptions.sh ++++ b/scripts/meson-buildoptions.sh +@@ -142,6 +142,7 @@ meson_options_help() { + printf "%s\n" ' qed qed image format support' + printf "%s\n" ' qga-vss build QGA VSS support (broken with MinGW)' + printf "%s\n" ' rbd Ceph block device driver' ++ printf "%s\n" ' vitastor Vitastor block device driver' + printf "%s\n" ' rdma Enable RDMA-based migration' + printf "%s\n" ' replication replication support' + printf "%s\n" ' sdl SDL user interface' +@@ -388,6 +389,8 @@ _meson_option_parse() { + --disable-qom-cast-debug) printf "%s" -Dqom_cast_debug=false ;; + --enable-rbd) printf "%s" -Drbd=enabled ;; + --disable-rbd) printf "%s" -Drbd=disabled ;; ++ --enable-vitastor) printf "%s" -Dvitastor=enabled ;; ++ --disable-vitastor) printf "%s" -Dvitastor=disabled ;; + --enable-rdma) printf "%s" -Drdma=enabled ;; + --disable-rdma) printf "%s" -Drdma=disabled ;; + --enable-replication) printf "%s" -Dreplication=enabled ;;